Skip to content

Commit

Permalink
use google federated credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
floreks committed Nov 27, 2024
1 parent 6ab02bb commit c617d47
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
2 changes: 0 additions & 2 deletions test/plural/lib/gcloud-setup.yml
Original file line number Diff line number Diff line change
@@ -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..." ;\
Expand Down
4 changes: 1 addition & 3 deletions test/plural/lib/gcloud-teardown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions test/plural/up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -94,7 +92,6 @@ testcases:
steps:
- type: gcloud-setup
email: {{ .gcpEmail }}
saKeyFile: {{ .gcpSAKeyFile }}
orgID: {{ .gcpOrgID }}
billingID: {{ .gcpBillingID }}
project: {{ .project }}
Expand All @@ -120,7 +117,6 @@ testcases:
steps:
- type: gcloud-teardown
email: {{ .gcpEmail }}
saKeyFile: {{ .gcpSAKeyFile }}
project: {{ .project }}

- name: Git teardown
Expand Down

0 comments on commit c617d47

Please sign in to comment.