Added filter to GC trigger and trigger push event after webhook creation

Author: dysrama

createWebhook.sh

@@ -51,7 +51,8 @@ gcloud alpha builds triggers create webhook \
     --name=${TRIGGER_NAME} \
     --inline-config=$BUILD_YAML_PATH \
     --secret=${SECRET_PATH} \
-    --substitutions="_APP_ID=${APP_ID},_REGION=${REGION}"',_APP_REPO=$(body.repository.html_url),_REF=$(body.ref),_SHA=$(body.after)'
+    --substitutions="_APP_ID=${APP_ID},_REGION=${REGION}"',_APP_REPO=$(body.repository.html_url),_REF=$(body.ref),_SHA=$(body.after)' \
+    --subscription-filter="_REF != '\$(body.ref)'"
 
 ## Retrieve the URL 
 WEBHOOK_URL="https://cloudbuild.googleapis.com/v1/projects/${PROJECT_ID}/triggers/${TRIGGER_NAME}:webhook?key=${API_KEY_VALUE}&secret=${SECRET_VALUE}"

git/gh.sh

@@ -47,9 +47,17 @@ export GIT_ASKPASS=$BASE_DIR/common/ghp.sh
 
 ## Execution
 create_webhook () {
-  curl -H "Authorization: token ${GIT_TOKEN}" \
+  response=$(curl -H "Authorization: token ${GIT_TOKEN}" \
     -d '{"config": {"url": "'${WEBHOOK_URL}'", "content_type": "json"}}' \
-    -X POST ${GIT_API_BASE}/repos/${GIT_USERNAME}/${repo}/hooks 
+    -X POST ${GIT_API_BASE}/repos/${GIT_USERNAME}/${repo}/hooks)
+
+  hook_id=`echo "$response" | grep -o '"id": [0-9]*' | grep -o '[0-9]*$'`
+
+  # Trigger webhook using the hook id returned by the create webhook call to ensure a payload with ref and sha is sent
+  curl -L \
+       -X POST \
+       -H "Authorization: token ${GIT_TOKEN}" \
+       -H "X-GitHub-Api-Version: 2022-11-28" ${GIT_API_BASE}/repos/${GIT_USERNAME}/${repo}/hooks/$hook_id/tests
 }