From 83b26fa68e4b9050182077ae187de8f317993d63 Mon Sep 17 00:00:00 2001 From: Shuya Ma Date: Mon, 6 Mar 2023 12:05:52 -0800 Subject: [PATCH 1/3] switch ci secrets to use secret manager --- .ci/gcb-generate-diffs.yml | 39 +++++++++++++++++++++++-------------- .ci/gcb-push-downstream.yml | 7 ++----- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.ci/gcb-generate-diffs.yml b/.ci/gcb-generate-diffs.yml index d272a3be014e..7b2fe632e9d9 100644 --- a/.ci/gcb-generate-diffs.yml +++ b/.ci/gcb-generate-diffs.yml @@ -255,18 +255,27 @@ availableSecrets: secretManager: - versionName: projects/673497134629/secrets/github-magician-token/versions/latest env: GITHUB_TOKEN - inline: - - kmsKeyName: projects/graphite-docker-images/locations/global/keyRings/environment-keyring/cryptoKeys/ci-project-key - envMap: - GOOGLE_BILLING_ACCOUNT: CiQAis6xrGyvnmGipEEjCQVUzu3o1H4XRJSsp/B8A0IFqwRwnogSPQDOc1nLdG/+VCWpKtYtbEl12+luWkHmOYn/VtkDuMkz3bCj2DNbcuLw2fgvmkha1IjnouGPIah0qLkDmTU= - GOOGLE_CUST_ID: CiQAis6xrAfbX3gtctcnZnt8n5DDZjercDObUGlyN4CqIpWKu5kSMgDOc1nLhLObfpnlhaUxdZ6Aoo38TBtRXoXAW5W4dbdyP+8ILKjtx1+zVL5WV641NM90 - GOOGLE_FIRESTORE_PROJECT: CiQAis6xrGkbSHeyBpgJg7/DkxNbHgqVJn3iaMYL7ybzkvDUzLESQgDOc1nLn0yUyrqLVfEujlbJEO4HDsk+o+6w608UfOXExJ3v3CTL+DwVwhXqIK/Vbo7UIMUyuP+Lu497BlcDIYyOwQ== - GOOGLE_IDENTITY_USER: CiQAis6xrIAUUrjZprRYZbrKhXrJfDbPrS1U70QL0jjgpiasNKUSOwDOc1nLX7ZFC5iLlRrapGh6ochTC81Qdy8z3IU6z4su2KRXp1ZXV6jQMl1FYkowHbM25+3biRPeIgGb - GOOGLE_MASTER_BILLING_ACCOUNT: CiQAis6xrNBeiUd50+56ELaUrfTT3Hdh78S/OP+3CHXbxPVQDecSPQDOc1nLVf8kgra2dt7uuX7pj1nyJR2qBFnzhi7xhJ7hywQouWI3FQCQaXX3MnuCWpYm8wt8Sa1GO1isi08= - GOOGLE_ORG: CiQAis6xrHFon9Jttc+4n2yYzZ92kaX5vPnz80NJrctWOq9BN+USNQDOc1nLiPHtfp1feWj8fS/dg3X9gOKB9NrthAv2BfJq3ZTg2YGNMLKzoYbvnxFigd1TWMbS - GOOGLE_ORG_2: CiQAis6xrLvdsAHjiguVOgyUoWzK5Y6wJ7cXBx68i4zbn6Yoey8SNADOc1nL66f7SmZLL/v6Dosd9+1Q/W7HYLSoVf4IYKGljgd/ifsZ+SV7TF3c+Oa/BdClnz8= - GOOGLE_ORG_DOMAIN: CiQAis6xrGrkuYXv9D9yng1BQ5RIt2vm59GMjKgJd3NU5eQDf/4SSwDOc1nLZlvBClvdGK+BJ69RTnLxa8dgkIQBL2euwFscEcen3fNJGKnQSNldBEXjX7Gb6YfsMe2Hh7cLoHFZddz7TLnbSE/que9jGA== - GOOGLE_PROJECT: CiQAis6xrDDU4Wcxn5s8Y790IMxTUEe2d3SaYEXUGScHfaLjOw8SPwDOc1nLe6Yz0zzA0mcYTsXaeGSFYu7uQ5+QCtTProJWRv2ITrNwCS3AF/kvMCrHvltx7O1CZnJveutlVpZH3w== - GOOGLE_PROJECT_NUMBER: CiQAis6xrI1acdU70fzEoGjhHjY8pkaxe70elqTta/DNunxU/WMSNgDOc1nLcMorWf2UmT286zagIsEBc2uliBqC/95aqG1gMpWY9FA74UY/F//4nf1uQS6CIpbymQ== - GOOGLE_SERVICE_ACCOUNT: CiQAis6xrMybAFX/c/b8yIaJ9eVJeSRnNUDqMIpmiRzE147JKiQSbQDOc1nL37iIT0wK6ih6ftYYrybF0WmaV/b1/loPKwkQ7ESXCrmviHmjAofa4o/B3MlrEOvUE1Kc3Pxzz+Uia/OD6lqpsxbf787UdocfkAkQXRDLEc7Xv01nYHCtRkYHlPrFAAyvietTjbzW+zw= - SA_KEY: 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 \ No newline at end of file + - versionName: projects/673497134629/secrets/ci-test-billing-account/versions/latest + env: GOOGLE_BILLING_ACCOUNT + - versionName: projects/673497134629/secrets/ci-test-cust-id/versions/latest + env: GOOGLE_CUST_ID + - versionName: projects/673497134629/secrets/ci-test-firestore-project/versions/latest + env: GOOGLE_FIRESTORE_PROJECT + - versionName: projects/673497134629/secrets/ci-test-identity-user/versions/latest + env: GOOGLE_IDENTITY_USER + - versionName: projects/673497134629/secrets/ci-test-master-billing-account/versions/latest + env: GOOGLE_MASTER_BILLING_ACCOUNT + - versionName: projects/673497134629/secrets/ci-test-org/versions/latest + env: GOOGLE_ORG + - versionName: projects/673497134629/secrets/ci-test-org-2/versions/latest + env: GOOGLE_ORG_2 + - versionName: projects/673497134629/secrets/ci-test-org-domain/versions/latest + env: GOOGLE_ORG_DOMAIN + - versionName: projects/673497134629/secrets/ci-test-project/versions/latest + env: GOOGLE_PROJECT + - versionName: projects/673497134629/secrets/ci-test-project-number/versions/latest + env: GOOGLE_PROJECT_NUMBER + - versionName: projects/673497134629/secrets/ci-test-service-account/versions/latest + env: GOOGLE_SERVICE_ACCOUNT + - versionName: projects/673497134629/secrets/ci-test-service-account-key/versions/latest + env: SA_KEY \ No newline at end of file diff --git a/.ci/gcb-push-downstream.yml b/.ci/gcb-push-downstream.yml index 0eb90ea677d3..100c04ffede5 100644 --- a/.ci/gcb-push-downstream.yml +++ b/.ci/gcb-push-downstream.yml @@ -152,8 +152,5 @@ availableSecrets: secretManager: - versionName: projects/673497134629/secrets/github-magician-token/versions/latest env: GITHUB_TOKEN - inline: -# This is the ciphertext of the token, encrypted using the above KMS key. - - kmsKeyName: projects/graphite-docker-images/locations/global/keyRings/environment-keyring/cryptoKeys/ci-project-key - envMap: - GOOGLE_PROJECT: CiQAis6xrDDU4Wcxn5s8Y790IMxTUEe2d3SaYEXUGScHfaLjOw8SPwDOc1nLe6Yz0zzA0mcYTsXaeGSFYu7uQ5+QCtTProJWRv2ITrNwCS3AF/kvMCrHvltx7O1CZnJveutlVpZH3w== + - versionName: projects/673497134629/secrets/ci-test-project/versions/latest + env: GOOGLE_PROJECT From 12bd041ef94ef57d786c79c72e541580614de76c Mon Sep 17 00:00:00 2001 From: Shuya Ma Date: Mon, 6 Mar 2023 12:37:22 -0800 Subject: [PATCH 2/3] trigger build --- .../terraform/tests/resource_cloud_run_v2_job_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go b/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go index d6f4714ae29b..a637afbb549a 100644 --- a/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go +++ b/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go @@ -47,7 +47,7 @@ func testAccCloudRunV2Job_cloudrunv2JobFull(context map[string]interface{}) stri location = "us-central1" launch_stage = "BETA" labels = { - label-1 = "value-1" + label-1 = "value-1-test" } client = "client-1" client_version = "client-version-1" From 33f7b99f799e1a644d8aa7f17c92637c8f7b3e1f Mon Sep 17 00:00:00 2001 From: Shuya Ma Date: Tue, 7 Mar 2023 16:04:51 -0800 Subject: [PATCH 3/3] clean up --- .../terraform/tests/resource_cloud_run_v2_job_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go b/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go index a637afbb549a..d6f4714ae29b 100644 --- a/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go +++ b/mmv1/third_party/terraform/tests/resource_cloud_run_v2_job_test.go @@ -47,7 +47,7 @@ func testAccCloudRunV2Job_cloudrunv2JobFull(context map[string]interface{}) stri location = "us-central1" launch_stage = "BETA" labels = { - label-1 = "value-1-test" + label-1 = "value-1" } client = "client-1" client_version = "client-version-1"