From f98da9ded9dd92c175c0d5e7c2de89200166f1e1 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Tue, 8 Oct 2024 14:14:25 -0700 Subject: [PATCH 1/5] update dockerfile --- .ci/containers/build-environment/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/containers/build-environment/Dockerfile b/.ci/containers/build-environment/Dockerfile index 7866dc9608cb..0a23367f577b 100644 --- a/.ci/containers/build-environment/Dockerfile +++ b/.ci/containers/build-environment/Dockerfile @@ -39,8 +39,8 @@ RUN git config --global user.email "magic-modules@google.com" RUN go install golang.org/x/tools/cmd/goimports@d088b475e3360caabc032aaee1dc66351d4e729a RUN go install github.com/github/hub@v2.11.2+incompatible -ADD "https://raw.githubusercontent.com/GoogleCloudPlatform/magic-modules/main/mmv1/Gemfile" Gemfile -ADD "https://raw.githubusercontent.com/GoogleCloudPlatform/magic-modules/main/mmv1/Gemfile.lock" Gemfile.lock +ADD "https://raw.githubusercontent.com/GoogleCloudPlatform/magic-modules/refs/heads/legacy-ruby/mmv1/Gemfile" Gemfile +ADD "https://raw.githubusercontent.com/GoogleCloudPlatform/magic-modules/refs/heads/legacy-ruby/mmv1/Gemfile.lock" Gemfile.lock RUN bundle install RUN rm Gemfile Gemfile.lock From a21cec51aa3e3311d556d09304ded3721b8fe93a Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 24 Oct 2024 13:19:20 -0700 Subject: [PATCH 2/5] rebuild test --- .ci/gcb-build-container.yml | 2 +- mmv1/third_party/terraform/services/compute/metadata.go.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/gcb-build-container.yml b/.ci/gcb-build-container.yml index 838f1a1868ef..ab50365a6583 100644 --- a/.ci/gcb-build-container.yml +++ b/.ci/gcb-build-container.yml @@ -1,6 +1,6 @@ --- # substitutions: -# _IMAGE_NAME: 'gcr.io/graphite-docker-images/bash-plus:latest' +# _IMAGE_NAME: 'gcr.io/graphite-docker-images/bash-plus:testing' # _DIRECTORY: '.ci/containers/bash-plus' steps: diff --git a/mmv1/third_party/terraform/services/compute/metadata.go.tmpl b/mmv1/third_party/terraform/services/compute/metadata.go.tmpl index 542bc60f6802..7594a02759d8 100644 --- a/mmv1/third_party/terraform/services/compute/metadata.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/metadata.go.tmpl @@ -31,13 +31,13 @@ func MetadataRetryWrapper(update func() error) error { // Update the metadata (serverMD) according to the provided diff (oldMDMap v // newMDMap). -func MetadataUpdate(oldMDMap map[string]interface{}, newMDMap map[string]interface{}, serverMD *compute.Metadata) { +func MetadataUpdate(oldMDMapA map[string]interface{}, newMDMap map[string]interface{}, serverMD *compute.Metadata) { curMDMap := make(map[string]string) // Load metadata on server into map for _, kv := range serverMD.Items { // If the server state has a key that we had in our old // state, but not in our new state, we should delete it - _, okOld := oldMDMap[kv.Key] + _, okOld := oldMDMapA[kv.Key] _, okNew := newMDMap[kv.Key] if okOld && !okNew { continue From aa9f92ef7993771f55fa2da85da2e9d0d035ce6d Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 24 Oct 2024 13:42:33 -0700 Subject: [PATCH 3/5] wrong image --- .ci/gcb-build-container.yml | 2 +- .ci/gcb-generate-diffs-new.yml | 20 +++++++++---------- .ci/gcb-pr-downstream-generation-and-test.yml | 20 +++++++++---------- .ci/gcb-push-downstream.yml | 10 +++++----- scripts/make-in-container.sh | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.ci/gcb-build-container.yml b/.ci/gcb-build-container.yml index ab50365a6583..838f1a1868ef 100644 --- a/.ci/gcb-build-container.yml +++ b/.ci/gcb-build-container.yml @@ -1,6 +1,6 @@ --- # substitutions: -# _IMAGE_NAME: 'gcr.io/graphite-docker-images/bash-plus:testing' +# _IMAGE_NAME: 'gcr.io/graphite-docker-images/bash-plus:latest' # _DIRECTORY: '.ci/containers/bash-plus' steps: diff --git a/.ci/gcb-generate-diffs-new.yml b/.ci/gcb-generate-diffs-new.yml index feaff16211ae..bfaaf00c7157 100644 --- a/.ci/gcb-generate-diffs-new.yml +++ b/.ci/gcb-generate-diffs-new.yml @@ -64,12 +64,12 @@ steps: - --no-ff - head/$_HEAD_BRANCH - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: build-magician-binary waitFor: ["merged"] - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: remove-label secretEnv: ["GITHUB_TOKEN_MAGIC_MODULES"] @@ -81,7 +81,7 @@ steps: - $_PR_NUMBER - 'awaiting-approval' - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -95,7 +95,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -109,7 +109,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] id: tpgb-head @@ -123,7 +123,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpgb-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -137,7 +137,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -151,7 +151,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -165,7 +165,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -179,7 +179,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] diff --git a/.ci/gcb-pr-downstream-generation-and-test.yml b/.ci/gcb-pr-downstream-generation-and-test.yml index 9e753b8d5174..dfb4f5928aa7 100644 --- a/.ci/gcb-pr-downstream-generation-and-test.yml +++ b/.ci/gcb-pr-downstream-generation-and-test.yml @@ -48,12 +48,12 @@ steps: - --no-ff - head/$_HEAD_BRANCH - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: build-magician-binary waitFor: ["merged"] - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: remove-label secretEnv: ["GITHUB_TOKEN_MAGIC_MODULES"] @@ -65,7 +65,7 @@ steps: - $_PR_NUMBER - 'awaiting-approval' - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -79,7 +79,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -93,7 +93,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] id: tpgb-head @@ -107,7 +107,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpgb-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -121,7 +121,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -135,7 +135,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -149,7 +149,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -163,7 +163,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] diff --git a/.ci/gcb-push-downstream.yml b/.ci/gcb-push-downstream.yml index 37a765e4ab67..439cd7edf538 100644 --- a/.ci/gcb-push-downstream.yml +++ b/.ci/gcb-push-downstream.yml @@ -24,7 +24,7 @@ steps: - checkout - $COMMIT_SHA - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: build-magician-binary waitFor: ["checkout"] @@ -74,7 +74,7 @@ steps: - $COMMIT_SHA # TPG - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tpg-push @@ -99,7 +99,7 @@ steps: - $COMMIT_SHA # TPGB - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tpgb-push @@ -124,7 +124,7 @@ steps: - $COMMIT_SHA # TGC - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tgc-push @@ -149,7 +149,7 @@ steps: - $COMMIT_SHA # TF-OICS - - name: 'gcr.io/graphite-docker-images/build-environment' + - name: 'gcr.io/graphite-docker-images/build-environment:testing' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tf-oics-push diff --git a/scripts/make-in-container.sh b/scripts/make-in-container.sh index 3727deca1c18..33a785c70d9a 100755 --- a/scripts/make-in-container.sh +++ b/scripts/make-in-container.sh @@ -5,7 +5,7 @@ # will be pulled or built during the exectuion of the script. set -e -BUILDER_IMAGE="gcr.io/graphite-docker-images/build-environment:latest" +BUILDER_IMAGE="gcr.io/graphite-docker-images/build-environment:testing" if [ -t 1 ]; then red=$'\e[1;31m' From 40c945c590b85e34bc1279cf4f7a2a3e9733bc71 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 24 Oct 2024 14:36:05 -0700 Subject: [PATCH 4/5] undoing testing changes --- .ci/gcb-generate-diffs-new.yml | 20 +++++++++---------- .ci/gcb-pr-downstream-generation-and-test.yml | 20 +++++++++---------- .ci/gcb-push-downstream.yml | 10 +++++----- .../services/compute/metadata.go.tmpl | 2 +- scripts/make-in-container.sh | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.ci/gcb-generate-diffs-new.yml b/.ci/gcb-generate-diffs-new.yml index bfaaf00c7157..feaff16211ae 100644 --- a/.ci/gcb-generate-diffs-new.yml +++ b/.ci/gcb-generate-diffs-new.yml @@ -64,12 +64,12 @@ steps: - --no-ff - head/$_HEAD_BRANCH - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: build-magician-binary waitFor: ["merged"] - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: remove-label secretEnv: ["GITHUB_TOKEN_MAGIC_MODULES"] @@ -81,7 +81,7 @@ steps: - $_PR_NUMBER - 'awaiting-approval' - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -95,7 +95,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -109,7 +109,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] id: tpgb-head @@ -123,7 +123,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpgb-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -137,7 +137,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -151,7 +151,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -165,7 +165,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -179,7 +179,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] diff --git a/.ci/gcb-pr-downstream-generation-and-test.yml b/.ci/gcb-pr-downstream-generation-and-test.yml index dfb4f5928aa7..9e753b8d5174 100644 --- a/.ci/gcb-pr-downstream-generation-and-test.yml +++ b/.ci/gcb-pr-downstream-generation-and-test.yml @@ -48,12 +48,12 @@ steps: - --no-ff - head/$_HEAD_BRANCH - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: build-magician-binary waitFor: ["merged"] - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: remove-label secretEnv: ["GITHUB_TOKEN_MAGIC_MODULES"] @@ -65,7 +65,7 @@ steps: - $_PR_NUMBER - 'awaiting-approval' - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -79,7 +79,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpg-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -93,7 +93,7 @@ steps: - 'ga' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] id: tpgb-head @@ -107,7 +107,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tpgb-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -121,7 +121,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -135,7 +135,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tgc-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -149,7 +149,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-head secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] @@ -163,7 +163,7 @@ steps: - 'beta' - $_PR_NUMBER - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: tf-oics-base secretEnv: ["GITHUB_TOKEN_DOWNSTREAMS"] diff --git a/.ci/gcb-push-downstream.yml b/.ci/gcb-push-downstream.yml index 439cd7edf538..37a765e4ab67 100644 --- a/.ci/gcb-push-downstream.yml +++ b/.ci/gcb-push-downstream.yml @@ -24,7 +24,7 @@ steps: - checkout - $COMMIT_SHA - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' id: build-magician-binary waitFor: ["checkout"] @@ -74,7 +74,7 @@ steps: - $COMMIT_SHA # TPG - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tpg-push @@ -99,7 +99,7 @@ steps: - $COMMIT_SHA # TPGB - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tpgb-push @@ -124,7 +124,7 @@ steps: - $COMMIT_SHA # TGC - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tgc-push @@ -149,7 +149,7 @@ steps: - $COMMIT_SHA # TF-OICS - - name: 'gcr.io/graphite-docker-images/build-environment:testing' + - name: 'gcr.io/graphite-docker-images/build-environment' entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh' secretEnv: ["GITHUB_TOKEN_CLASSIC"] id: tf-oics-push diff --git a/mmv1/third_party/terraform/services/compute/metadata.go.tmpl b/mmv1/third_party/terraform/services/compute/metadata.go.tmpl index 7594a02759d8..adeed8b0c671 100644 --- a/mmv1/third_party/terraform/services/compute/metadata.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/metadata.go.tmpl @@ -37,7 +37,7 @@ func MetadataUpdate(oldMDMapA map[string]interface{}, newMDMap map[string]interf for _, kv := range serverMD.Items { // If the server state has a key that we had in our old // state, but not in our new state, we should delete it - _, okOld := oldMDMapA[kv.Key] + _, okOld := oldMDMap[kv.Key] _, okNew := newMDMap[kv.Key] if okOld && !okNew { continue diff --git a/scripts/make-in-container.sh b/scripts/make-in-container.sh index 33a785c70d9a..3727deca1c18 100755 --- a/scripts/make-in-container.sh +++ b/scripts/make-in-container.sh @@ -5,7 +5,7 @@ # will be pulled or built during the exectuion of the script. set -e -BUILDER_IMAGE="gcr.io/graphite-docker-images/build-environment:testing" +BUILDER_IMAGE="gcr.io/graphite-docker-images/build-environment:latest" if [ -t 1 ]; then red=$'\e[1;31m' From b5922998e6f37bb867d665478e594bd5518dcc40 Mon Sep 17 00:00:00 2001 From: Nick Elliot Date: Thu, 24 Oct 2024 14:36:49 -0700 Subject: [PATCH 5/5] undoing testing changes2 --- mmv1/third_party/terraform/services/compute/metadata.go.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/services/compute/metadata.go.tmpl b/mmv1/third_party/terraform/services/compute/metadata.go.tmpl index adeed8b0c671..542bc60f6802 100644 --- a/mmv1/third_party/terraform/services/compute/metadata.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/metadata.go.tmpl @@ -31,7 +31,7 @@ func MetadataRetryWrapper(update func() error) error { // Update the metadata (serverMD) according to the provided diff (oldMDMap v // newMDMap). -func MetadataUpdate(oldMDMapA map[string]interface{}, newMDMap map[string]interface{}, serverMD *compute.Metadata) { +func MetadataUpdate(oldMDMap map[string]interface{}, newMDMap map[string]interface{}, serverMD *compute.Metadata) { curMDMap := make(map[string]string) // Load metadata on server into map for _, kv := range serverMD.Items {