add more configuration for git checkout

jtarchie · jtarchie · commit a97fb8e17c54 · 2016-07-23T17:53:35.000-06:00
diff --git a/README.md b/README.md
@@ -55,6 +55,23 @@ resource_types:
 through, without relying on a status being on it. This feature should only be used in
 concourse version 1.2.x and higher and the [`version: every`](http://concourse.ci/get-step.html#get-version).
 
+* `username`: *Optional.* Username for HTTP(S) auth when pulling/pushing.
+  This is needed when only HTTP/HTTPS protocol for git is available (which does not support private key auth)
+  and auth is required.
+
+* `password`: *Optional.* Password for HTTP(S) auth when pulling/pushing.
+
+* `skip_ssl_verification`: *Optional.* Skips git ssl verification by exporting
+  `GIT_SSL_NO_VERIFY=true`.
+
+* `git_config`: *Optional*. If specified as (list of pairs `name` and `value`)
+  it will configure git global options, setting each name with each value.
+
+  This can be useful to set options like `credential.helper` or similar.
+
+  See the [`git-config(1)` manual page](https://www.kernel.org/pub/software/scm/git/docs/git-config.html)
+  for more information and documentation of existing git options.
+
 ## Behavior
 
 ### `check`: Check for new pull requests
diff --git a/assets/check b/assets/check
@@ -5,10 +5,7 @@ set -e
 exec 3>&1 # make stdout available as fd 3 for the result
 exec 1>&2 # redirect all output to stderr for logging
 
-. $(dirname $0)/common.sh
-
 payload=$(mktemp $TMPDIR/pullrequest-resource.XXXXXX)
 cat > $payload <&0
-load_pubkey $payload
 
 $(dirname $0)/lib/check.rb $1 >&3 < $payload
diff --git a/assets/common.sh b/assets/common.sh
@@ -11,7 +11,7 @@ load_pubkey() {
     eval $(ssh-agent) >/dev/null 2>&1
     trap "kill $SSH_AGENT_PID" 0
 
-    ssh-add $private_key_path >/dev/null 2>&1
+    SSH_ASKPASS=/opt/resource/askpass.sh DISPLAY= ssh-add $private_key_path >/dev/null
 
     mkdir -p ~/.ssh
     cat > ~/.ssh/config <<EOF
@@ -21,3 +21,26 @@ EOF
     chmod 0600 ~/.ssh/config
   fi
 }
+
+configure_git_ssl_verification() {
+  skip_ssl_verification=$(jq -r '.source.skip_ssl_verification // false' < $1)
+  if [ "$skip_ssl_verification" = "true" ]; then
+    export GIT_SSL_NO_VERIFY=true
+  fi
+}
+
+configure_credentials() {
+  local username=$(jq -r '.source.username // ""' < $1)
+  local password=$(jq -r '.source.password // ""' < $1)
+
+  rm -f $HOME/.netrc
+  if [ "$username" != "" -a "$password" != "" ]; then
+    echo "default login $username password $password" > $HOME/.netrc
+  fi
+}
+
+configure_git_global() {
+  local git_config_payload="$1"
+  eval $(echo "$git_config_payload" | \
+    jq -r ".[] | \"git config --global '\\(.name)' '\\(.value)'; \"")
+}
diff --git a/assets/in b/assets/in
@@ -10,5 +10,10 @@ exec 1>&2 # redirect all output to stderr for logging
 payload=$(mktemp $TMPDIR/pullrequest-resource.XXXXXX)
 cat > $payload <&0
 load_pubkey $payload
+configure_git_ssl_verification $payload
+configure_credentials $payload
+
+git_config_payload=$(jq -r '.source.git_config // []' < $payload)
+configure_git_global "${git_config_payload}"
 
 $(dirname $0)/lib/in.rb $1 >&3 < $payload
diff --git a/assets/out b/assets/out
@@ -10,5 +10,10 @@ exec 1>&2 # redirect all output to stderr for logging
 payload=$(mktemp $TMPDIR/pullrequest-resource.XXXXXX)
 cat > $payload <&0
 load_pubkey $payload
+configure_git_ssl_verification $payload
+configure_credentials $payload
+
+git_config_payload=$(jq -r '.source.git_config // []' < $payload)
+configure_git_global "${git_config_payload}"
 
 $(dirname $0)/lib/out.rb $1 >&3 < $payload
