Use commit sha as part of the resource version

Author: dpb587

bin/check

@@ -8,5 +8,5 @@ load_source
 curlgh "$source_endpoint/repos/$source_repository/commits/$source_branch/status" \
   | jq -c \
     --arg context "$source_context" \
-    '.statuses | map(select( $context == .context )) | map({ "ref": ( .id | tostring ) })' \
+    '.sha as $commit | .statuses | map(select( $context == .context )) | map({ "commit": $commit, "status": ( .id | tostring ) })' \
   >&3

bin/in

@@ -7,20 +7,21 @@ in_dir="$1"
 load_source
 
 eval $( jq -r '{
-  "version_ref": .version.ref
+  "version_commit": .version.commit,
+  "version_status": .version.status
 } | to_entries[] | .key + "=" + @sh "\(.value)"' < /tmp/stdin )
 
 
 #
 # lookup
 #
 
-curlgh "$source_endpoint/repos/$source_repository/commits/$source_branch/status" \
+curlgh "$source_endpoint/repos/$source_repository/commits/$version_commit/status" \
   | jq -c \
-    --arg ref "$version_ref" \
+    --arg status "$version_status" \
     '{
       "sha": .sha,
-      "status": ( .statuses | map(select( $ref == ( .id | tostring ) )) | .[0] )
+      "status": ( .statuses | map(select( $status == ( .id | tostring ) )) | .[0] )
     }' \
     > /tmp/status
 
@@ -44,10 +45,12 @@ jq -j -r '.status.target_url // ""' < /tmp/status > "$in_dir/target_url"
 jq -j -r '.status.updated_at' < /tmp/status > "$in_dir/updated_at"
 
 jq -c \
-  --arg ref "$version_ref" \
+  --arg commit "$version_commit" \
+  --arg status "$version_status" \
   '{
     "version": {
-      "ref": ( $ref | tostring )
+      "commit": ( $commit | tostring ),
+      "status": ( $status | tostring )
     },
     "metadata": [
       {

bin/out

@@ -115,9 +115,11 @@ done
 #
 
 jq -c \
+  --arg commit "$commit" \
   '{
     "version": {
-      "ref": ( .id | tostring )
+      "commit": $commit,
+      "status": ( .id | tostring )
     },
     "metadata": [
       {

test/check/simple.sh

@@ -54,7 +54,7 @@ if ! grep -q '^GET /repos/dpb587/test-repo/commits/pr-test/status ' $TMPDIR/http
   exit 1
 fi
 
-if ! [[ '[{"ref":"2"}]' == "$( cat $TMPDIR/resource-$$ )" ]] ; then
+if ! [[ '[{"commit":"6dcb09b5b57875f334f61aebed695e2e4193db5e","status":"2"}]' == "$( cat $TMPDIR/resource-$$ )" ]] ; then
   echo "FAILURE: Unexpected version output"
   cat $TMPDIR/resource-$$
   exit 1

test/in/missing-status.sh

@@ -22,7 +22,8 @@ set +e
 $DIR/bin/in "$in_dir" > $TMPDIR/resource-$$ 2>&1 <<EOF
 {
   "version": {
-    "ref": "2"
+    "commit": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+    "status": "2"
   },
   "source": {
     "access_token": "test-token",

test/in/simple.sh

@@ -46,7 +46,8 @@ mkdir $in_dir
 $DIR/bin/in "$in_dir" > $TMPDIR/resource-$$ <<EOF
 {
   "version": {
-    "ref": "2"
+    "commit": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+    "status": "2"
   },
   "source": {
     "access_token": "test-token",
@@ -57,7 +58,7 @@ $DIR/bin/in "$in_dir" > $TMPDIR/resource-$$ <<EOF
 }
 EOF
 
-if ! grep -q '^GET /repos/dpb587/test-repo/commits/master/status ' $TMPDIR/http.req-$$ ; then
+if ! grep -q '^GET /repos/dpb587/test-repo/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e/status ' $TMPDIR/http.req-$$ ; then
   echo "FAILURE: Invalid HTTP method or URI"
   cat $TMPDIR/http.req-$$
   exit 1
@@ -93,7 +94,7 @@ if ! [[ "2012-08-20T01:19:13Z" == "$( cat $in_dir/updated_at )" ]] ; then
   exit 1
 fi
 
-if ! grep -q '"version":{"ref":"2"}' $TMPDIR/resource-$$ ; then
+if ! grep -q '"version":{"commit":"6dcb09b5b57875f334f61aebed695e2e4193db5e","status":"2"}' $TMPDIR/resource-$$ ; then
   echo "FAILURE: Unexpected version output"
   cat $TMPDIR/resource-$$
   exit 1

test/out/simple.sh

@@ -69,7 +69,7 @@ if ! grep -q '^{"context":"test-context","description":"test-description","state
   exit 1
 fi
 
-if ! grep -q '"version":{"ref":"1"}' $TMPDIR/resource-$$ ; then
+if ! grep -q '"version":{"commit":"a1b2c3d4e5","status":"1"}' $TMPDIR/resource-$$ ; then
   echo "FAILURE: Unexpected version output"
   cat $TMPDIR/resource-$$
   exit 1

test/out/wait-for-status.sh

@@ -144,7 +144,7 @@ if ! grep -q '^{"context":"test-context","description":"test-description","state
   exit 1
 fi
 
-if ! grep -q '"version":{"ref":"1"}' $TMPDIR/resource-$$ ; then
+if ! grep -q '"version":{"commit":"a1b2c3d4e5","status":"1"}' $TMPDIR/resource-$$ ; then
   echo "FAILURE: Unexpected version output"
   cat $TMPDIR/resource-$$
   exit 1