Skip to content

Commit 1fdb7e4

Browse files
Merge pull request #7901 from 2i2c-org/revert-7900-uptime-checks-fix
Attempt to fix uptime checks again
2 parents 833b5bf + eff4b48 commit 1fdb7e4

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/ensure-uptime-checks.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ jobs:
3838
- name: Install sops
3939
uses: mdgreenwald/mozilla-sops-action@v1.6.0
4040

41+
# Authenticate with the correct KMS key that sops will use.
42+
- name: Setup sops credentials to decrypt repo secrets
43+
uses: google-github-actions/auth@v3
44+
with:
45+
credentials_json: ${{ secrets.GCP_KMS_DECRYPTOR_KEY }}
46+
4147
- name: ensure uptime checks are set up
4248
run: |
4349
cd terraform/uptime-checks
4450
# Decrypt the GCP ServiceAccount key with permissions to run terraform
45-
sops -d \
46-
--gcp-kms-service-account ${{ secrets.GCP_KMS_DECRYPTOR_KEY }} \
47-
secret/enc-service-account-key.secret.json > service-account-key.json
51+
sops -d secret/enc-service-account-key.secret.json > service-account-key.json
4852
export GOOGLE_APPLICATION_CREDENTIALS=service-account-key.json
4953
# Setup Terraform
5054
terraform init

terraform/uptime-checks/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ terraform {
1818
sops = {
1919
# ref: https://registry.terraform.io/providers/carlpett/sops/latest
2020
source = "carlpett/sops"
21-
version = "~> 1.1"
21+
version = "1.3.0"
2222
}
2323
}
2424
}

0 commit comments

Comments
 (0)