Merge pull request #321 from Scalr/SCALRCORE-28542

SCALRCORE-30933: SRE: Terraformize Variable Definitions in terraform-…

.github/workflows/upstream.yml

@@ -33,7 +33,6 @@ jobs:
       group: ${{ github.workflow }}-${{ inputs.pr-id }}
       cancel-in-progress: true
     env:
-      ORG_ADMIN_TOKEN: ${{ secrets.ORG_ADMIN_TOKEN }}
       SCALR_TOKEN: ${{ secrets.SCALR_TOKEN }}
       API_BRANCH: ${{ github.event.inputs.api-branch }}
       PY_REQ: ${{ github.event.inputs.py-req }}
@@ -49,7 +48,7 @@ jobs:
           private_key: ${{secrets.SUDO_GHA_APP_PRIVATE_KEY}}
       - uses: actions/checkout@v4
       - name: Notify Upstream about Pending
-        run: make notify-upstream upstream_sha=${{ github.event.inputs.upstream-sha }} state=pending run_id=${{ github.run_id }}
+        run: make notify-upstream org_admin_token=${{steps.generate_token.outputs.token}} upstream_sha=${{ github.event.inputs.upstream-sha }} state=pending run_id=${{ github.run_id }}
       - uses: actions/setup-go@v5
         with:
           go-version: "1.19"

GNUmakefile

@@ -28,7 +28,7 @@ testacc:
 notify-upstream:
 	curl -X POST \
 	-H "Accept: application/vnd.github.v3+json" \
-	-H "Authorization: token $(ORG_ADMIN_TOKEN)" \
+	-H "Authorization: token $(org_admin_token)" \
 	https://api.github.com/repos/Scalr/fatmouse/statuses/$(upstream_sha) \
 	-d '{"context":"downstream/provider", "state":"$(state)", "description": $(UPSTREAM_COMMIT_DESCRIPTION), "target_url": $(UPSTREAM_COMMIT_TARGET_URL)}'