Add actions var check

treeverse · Aug 9, 2021 · 05405ba · 05405ba
1 parent bd86d5f
commit 05405ba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/nessie.yaml b/.github/workflows/nessie.yaml
@@ -375,6 +375,7 @@ jobs:
       TAG: ${{ needs.deploy-image.outputs.tag }}
       # Setting Account_ID as a secret as a way to avoid specifying it here
       REPO: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com
+      ACTIONS_VAR: "this_is_actions_var"
     steps:
       - name: Retrieve generated code
         uses: actions/download-artifact@v2
@@ -446,6 +447,7 @@ jobs:
       TAG: ${{ needs.deploy-image.outputs.tag }}
       # Setting Account_ID as a secret as a way to avoid specifying it here
       REPO: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com
+      ACTIONS_VAR: "this_is_actions_var"
     steps:
       - name: Retrieve generated code
         uses: actions/download-artifact@v2
@@ -489,6 +491,7 @@ jobs:
       TAG: ${{ needs.deploy-image.outputs.tag }}
       # Setting Account_ID as a secret as a way to avoid specifying it here
       REPO: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.us-east-1.amazonaws.com
+      ACTIONS_VAR: "this_is_actions_var"
     steps:
       - name: Retrieve generated code
         uses: actions/download-artifact@v2

diff --git a/nessie/hooks_test.go b/nessie/hooks_test.go
@@ -41,6 +41,8 @@ hooks:
     description: Check webhooks for pre-commit works
     properties:
       url: "{{.URL}}/pre-commit"
+	  query_params:
+        check_env_vars: {{ ENV.ACTIONS_VAR }}
 `
 
 const actionPostCommitYaml = `
@@ -119,6 +121,9 @@ func TestHooksSuccess(t *testing.T) {
 	require.Equal(t, commitRecord.Message, preCommitEvent.CommitMessage)
 	require.Equal(t, branch, preCommitEvent.SourceRef)
 	require.Equal(t, commitRecord.Metadata.AdditionalProperties, preCommitEvent.Metadata)
+	require.NotNil(t, webhookData.queryParams)
+	require.Contains(t, webhookData.queryParams, "check_env_vars")
+	require.Equal(t, webhookData.queryParams["check_env_vars"], []string{"this_is_actions_var"})
 
 	webhookData, err = responseWithTimeout(server, 1*time.Minute)
 	require.NoError(t, err)

diff --git a/nessie/webhook_server_test.go b/nessie/webhook_server_test.go
@@ -13,9 +13,10 @@ import (
 )
 
 type hookResponse struct {
-	path string
-	err  error
-	data []byte
+	path        string
+	err         error
+	data        []byte
+	queryParams map[string][]string
 }
 
 type webhookServer struct {
@@ -95,7 +96,8 @@ func hookHandlerFunc(respCh chan hookResponse) func(http.ResponseWriter, *http.R
 			writer.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-		respCh <- hookResponse{path: request.URL.Path, data: data}
+
+		respCh <- hookResponse{path: request.URL.Path, data: data, queryParams: request.URL.Query()}
 		_, _ = io.WriteString(writer, "OK")
 		writer.WriteHeader(http.StatusOK)
 	}