From c617d47b3281ba379dc966d2e1173b20184e81c8 Mon Sep 17 00:00:00 2001
From: Sebastian Florek <sebastian@plural.sh>
Date: Wed, 27 Nov 2024 11:35:39 +0100
Subject: [PATCH] use google federated credentials

---
 Makefile                            | 1 -
 test/plural/lib/gcloud-setup.yml    | 2 --
 test/plural/lib/gcloud-teardown.yml | 4 +---
 test/plural/up.yml                  | 4 ----
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index c97a4853..5ca1eaab 100644
--- a/Makefile
+++ b/Makefile
@@ -209,7 +209,6 @@ e2e: --ensure-venom
 	VENOM_VAR_azureSubscriptionId=${PLRL_CLI_E2E_AZURE_SUBSCRIPTION_ID} \
 	VENOM_VAR_azureTenantId=${PLRL_CLI_E2E_AZURE_TENANT_ID} \
 	VENOM_VAR_azureStorageAccount=${PLRL_CLI_E2E_AZURE_STORAGE_ACCOUNT}${TIMESTAMP} \
-	VENOM_VAR_gcpSAKeyFile=${PLRL_CLI_E2E_GCLOUD_KEY_FILE} \
 	VENOM_VAR_gcpEmail=${PLRL_CLI_E2E_GCLOUD_EMAIL} \
 	VENOM_VAR_gcpOrgID=${PLRL_CLI_E2E_GCLOUD_ORG_ID} \
 	VENOM_VAR_gcpBillingID=${PLRL_CLI_E2E_GCLOUD_BILLING_ID} \
diff --git a/test/plural/lib/gcloud-setup.yml b/test/plural/lib/gcloud-setup.yml
index 751bfc9b..87ffceb3 100644
--- a/test/plural/lib/gcloud-setup.yml
+++ b/test/plural/lib/gcloud-setup.yml
@@ -1,14 +1,12 @@
 executor: gcloud-setup
 input:
   email: ''
-  saKeyFile: ''
   orgID: ''
   project: ''
   billingID: ''
 
 steps:
   - script: |
-#      gcloud auth activate-service-account {{ .input.email }} --key-file={{ .input.saKeyFile }} ;\
       gcloud projects describe {{ .input.project }} ;\
       if [ $? -eq 1 ]; then \
         echo "Project does not exist. Creating..." ;\
diff --git a/test/plural/lib/gcloud-teardown.yml b/test/plural/lib/gcloud-teardown.yml
index 632d04ac..b4eac5a6 100644
--- a/test/plural/lib/gcloud-teardown.yml
+++ b/test/plural/lib/gcloud-teardown.yml
@@ -5,9 +5,7 @@ input:
   project: ''
 
 steps:
-  - script: |
-      gcloud auth activate-service-account {{ .input.email }} --key-file={{ .input.saKeyFile }} ;\
-      gcloud -q projects delete {{ .input.project }}
+  - script: gcloud -q projects delete {{ .input.project }}
     retry: 3
     retry_if:
       - result.code ShouldNotEqual 0
diff --git a/test/plural/up.yml b/test/plural/up.yml
index 336cd008..99046010 100644
--- a/test/plural/up.yml
+++ b/test/plural/up.yml
@@ -36,8 +36,6 @@ vars:
   ### GCP variables
   # Google Service Account email
   gcpEmail: ''
-  # Google Service Account key file
-  gcpSAKeyFile: ''
   # Google organization ID
   gcpOrgID: ''
   # Google billing account ID
@@ -94,7 +92,6 @@ testcases:
     steps:
       - type: gcloud-setup
         email: {{ .gcpEmail }}
-        saKeyFile: {{ .gcpSAKeyFile }}
         orgID: {{ .gcpOrgID }}
         billingID: {{ .gcpBillingID }}
         project: {{ .project }}
@@ -120,7 +117,6 @@ testcases:
     steps:
       - type: gcloud-teardown
         email: {{ .gcpEmail }}
-        saKeyFile: {{ .gcpSAKeyFile }}
         project: {{ .project }}
 
   - name: Git teardown