Merge branch 'main' into dc-terraform

GoogleCloudPlatform · Dec 13, 2024 · a08aaa0 · a08aaa0
2 parents 24c628c + d7d5bdf
commit a08aaa0
Show file tree

Hide file tree

Showing 845 changed files with 14,092 additions and 7,422 deletions.
diff --git a/.ci/containers/build-environment/Dockerfile b/.ci/containers/build-environment/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"
 WORKDIR $GOPATH
 
 # terraform binary used by tfv/tgc
-COPY --from=hashicorp/terraform:1.8.3 /bin/terraform /bin/terraform
+COPY --from=hashicorp/terraform:1.10.0 /bin/terraform /bin/terraform
 
 SHELL ["/bin/bash", "-c"]
 

diff --git a/.ci/containers/go-plus/Dockerfile b/.ci/containers/go-plus/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN wget https://releases.hashicorp.com/terraform/1.8.3/terraform_1.8.3_linux_amd64.zip \
-    && unzip terraform_1.8.3_linux_amd64.zip \
-    && rm terraform_1.8.3_linux_amd64.zip \
+RUN wget https://releases.hashicorp.com/terraform/1.10.0/terraform_1.10.0_linux_amd64.zip \
+    && unzip terraform_1.10.0_linux_amd64.zip \
+    && rm terraform_1.10.0_linux_amd64.zip \
     && mv ./terraform /bin/terraform
diff --git a/.ci/gcb-generate-diffs-new.yml b/.ci/gcb-generate-diffs-new.yml
diff --git a/.ci/gcb-pr-downstream-generation-and-test.yml b/.ci/gcb-pr-downstream-generation-and-test.yml
@@ -277,7 +277,7 @@ steps:
         - COMMIT_SHA=$COMMIT_SHA
 
 # Long timeout to enable waiting on VCR test
-timeout: 20000s
+timeout: 64800s
 options:
     machineType: 'N1_HIGHCPU_32'
 

diff --git a/.ci/magician/cmd/generate_downstream.go b/.ci/magician/cmd/generate_downstream.go
@@ -335,12 +335,15 @@ func createCommit(scratchRepo *source.Repo, commitMessage string, rnr ExecRunner
 	commitSha = strings.TrimSpace(commitSha)
 	fmt.Printf("Commit sha on the branch is: `%s`\n", commitSha)
 
-	variablePath := fmt.Sprintf("/workspace/commitSHA_modular-magician_%s.txt", scratchRepo.Name)
-	fmt.Println("variablePath: ", variablePath)
-
-	err = rnr.WriteFile(variablePath, commitSha)
-	if err != nil {
-		fmt.Println("Error:", err)
+	// auto-pr's use commitSHA_modular-magician_<repo>_.txt file to communicate commmit hash
+	// across cloudbuild steps. Used in test-tpg to execute unit tests for the HEAD commit
+	if strings.HasPrefix(scratchRepo.Branch, "auto-pr-") && !strings.HasSuffix(scratchRepo.Branch, "-old") {
+		variablePath := fmt.Sprintf("/workspace/commitSHA_modular-magician_%s.txt", scratchRepo.Name)
+		fmt.Println("variablePath: ", variablePath)
+		err = rnr.WriteFile(variablePath, commitSha)
+		if err != nil {
+			fmt.Println("Error:", err)
+		}
 	}
 
 	return commitSha, err

diff --git a/.ci/magician/cmd/interfaces.go b/.ci/magician/cmd/interfaces.go
@@ -48,6 +48,7 @@ type ExecRunner interface {
 	RemoveAll(path string) error
 	PushDir(path string) error
 	PopDir() error
+	ReadFile(name string) (string, error)
 	WriteFile(name, data string) error
 	AppendFile(name, data string) error // Not used (yet).
 	Run(name string, args []string, env map[string]string) (string, error)