Fix to pass access token

pulsate-dev · Sep 26, 2023 · b857d76 · b857d76
1 parent dc746be
commit b857d76
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/staging-apply.yaml b/.github/workflows/staging-apply.yaml
@@ -77,6 +77,7 @@ jobs:
         with:
           workload_identity_provider: "projects/1065320521129/locations/global/workloadIdentityPools/ci-pool/providers/ci-provider"
           service_account: "staging-deploy-from-github-act@pulsate-staging-400117.iam.gserviceaccount.com"
+          token_format: "access_token"
 
       - name: Upload Configuration
         uses: "hashicorp/tfc-workflows-github/actions/upload-configuration@v1.0.4"
@@ -90,6 +91,8 @@ jobs:
         with:
           workspace: ${{ env.TF_WORKSPACE }}
           configuration_version: ${{ steps.apply-upload.outputs.configuration_version_id }}
+        env:
+          TF_VAR_access_token: ${{ steps.auth.outputs.access_token }}
       - name: Apply
         uses: "hashicorp/tfc-workflows-github/actions/apply-run@v1.0.4"
         if: fromJSON(steps.apply-run.outputs.payload).data.attributes.actions.IsConfirmable

diff --git a/.github/workflows/staging-plan.yml b/.github/workflows/staging-plan.yml
@@ -28,6 +28,7 @@ jobs:
         with:
           workload_identity_provider: "projects/1065320521129/locations/global/workloadIdentityPools/ci-pool/providers/ci-provider"
           service_account: "staging-deploy-from-github-act@pulsate-staging-400117.iam.gserviceaccount.com"
+          token_format: "access_token"
 
       - name: Upload Configuration
         uses: "hashicorp/tfc-workflows-github/actions/upload-configuration@v1.0.4"
@@ -43,6 +44,8 @@ jobs:
           workspace: ${{ env.TF_WORKSPACE }}
           configuration_version: ${{ steps.plan-upload.outputs.configuration_version_id }}
           plan_only: true
+        env:
+          TF_VAR_access_token: ${{ steps.auth.outputs.access_token }}
       - name: Get Plan Output
         uses: "hashicorp/tfc-workflows-github/actions/plan-output@v1.0.0"
         id: plan-output

diff --git a/staging/main.tf b/staging/main.tf
@@ -12,8 +12,9 @@ terraform {
 }
 
 provider "google" {
-  project = var.project
-  region  = var.location
+  project      = var.project
+  region       = var.location
+  access_token = var.access_token
 }
 
 resource "google_project_service" "default" {

diff --git a/staging/variables.tf b/staging/variables.tf
@@ -1,3 +1,9 @@
+variable "access_token" {
+  description = "An acceess token for login to GCP"
+  type        = string
+  default     = null
+}
+
 variable "project" {
   description = "A name of a GCP project"
   type        = string