Merge remote-tracking branch 'upstream/main'

Author: pete-layerhealth

.ci/README.md

@@ -0,0 +1,50 @@
+{{- if .NotesByType.unknown -}}
+UNKNOWN CHANGELOG TYPE:
+{{range .NotesByType.unknown -}}
+* {{ template "note" .}}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.note -}}
+NOTES:
+{{range .NotesByType.note -}}
+* {{ template "note" .}}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.deprecation -}}
+DEPRECATIONS:
+{{range .NotesByType.deprecation -}}
+* {{ template "note" .}}
+{{ end -}}
+{{- end -}}
+
+{{- if index .NotesByType "breaking-change" -}}
+BREAKING CHANGES:
+{{range index .NotesByType "breaking-change" -}}
+* {{ template "note" .}}
+{{ end -}}
+{{- end -}}
+
+{{- $features := combineTypes .NotesByType.feature (index .NotesByType "new-resource" ) (index .NotesByType "new-datasource") (index .NotesByType "new-data-source") (index .NotesByType "new-function" ) (index .NotesByType "new-ephemeral" ) -}}
+{{- if $features }}
+FEATURES:
+{{range $features | sort -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- $improvements := combineTypes .NotesByType.improvement .NotesByType.enhancement -}}
+{{- if $improvements }}
+IMPROVEMENTS:
+{{range $improvements | sort -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.bug }}
+BUG FIXES:
+{{range .NotesByType.bug -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}

.ci/changelog2.tmpl

@@ -1,5 +1,4 @@
-# Stage 1: Building Go dependencies
-FROM golang:1.23-bullseye AS builder
+FROM golang:1.24-bullseye AS builder
 
 # Set working directory
 WORKDIR /app
@@ -11,39 +10,25 @@ ADD "https://raw.githubusercontent.com/GoogleCloudPlatform/magic-modules/main/tp
 # Install the go dependencies
 RUN go mod download
 
-# Stage 2: Creating the final imag
-FROM ruby:3.1-bullseye
-
-# golang
-COPY --from=golang:1.23-bullseye /usr/local/go /usr/local/go
 ENV GOPATH /go
 ENV PATH /usr/local/go/bin:$PATH
 ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"
 WORKDIR $GOPATH
 
 # terraform binary used by tfv/tgc
-COPY --from=hashicorp/terraform:1.10.0 /bin/terraform /bin/terraform
+COPY --from=hashicorp/terraform:1.11.0 /bin/terraform /bin/terraform
 
 SHELL ["/bin/bash", "-c"]
 
 ENV GO111MODULE "on"
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
-RUN apt-get update && apt-get install -y --no-install-recommends git openssh-client apt-transport-https ca-certificates curl netbase wget gcc make jq libjq1
+RUN apt-get update && apt-get install -y --no-install-recommends git openssh-client apt-transport-https ca-certificates curl netbase wget gcc make jq libjq1 unzip zip
 
 RUN git config --global user.name "Modular Magician"
 RUN git config --global user.email "[email protected]"
 
 RUN go install golang.org/x/tools/cmd/goimports@d088b475e3360caabc032aaee1dc66351d4e729a
 RUN go install github.com/github/[email protected]+incompatible
-
-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
-
-# Copy Go dependencies from builder stage
-COPY --from=builder /go/pkg /go/pkg
-

.ci/containers/build-environment/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Download go module cache for builds
-FROM golang:1.23-bullseye AS builder
+FROM golang:1.24-bullseye AS builder
 ENV GOCACHE=/go/cache
 
 RUN apt-get update && apt-get install -y unzip
@@ -12,7 +12,7 @@ WORKDIR /app1/magic-modules-main/.ci/magician
 RUN go build -o /dev/null .
 
 # Stage 2: Creating the final image
-FROM golang:1.23-bullseye
+FROM golang:1.24-bullseye
 SHELL ["/bin/bash", "-c"]
 ENV GOCACHE=/go/cache
 
@@ -21,15 +21,15 @@ COPY --from=builder /go/pkg/mod /go/pkg/mod
 COPY --from=builder /go/cache /go/cache
 
 RUN apt-get update && \
-    apt-get install -y git jq unzip parallel curl && \
+    apt-get install -y git jq unzip zip parallel curl && \
     echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg  add - && \
     apt-get update -y && \
     apt-get install google-cloud-sdk -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-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
+RUN wget https://releases.hashicorp.com/terraform/1.11.0/terraform_1.11.0_linux_amd64.zip \
+    && unzip terraform_1.11.0_linux_amd64.zip \
+    && rm terraform_1.11.0_linux_amd64.zip \
+    && mv ./terraform /bin/terraform

.ci/containers/go-plus/Dockerfile

@@ -211,6 +211,18 @@ steps:
       args:
         - "check-cassettes"
 
+    - name: 'gcr.io/graphite-docker-images/go-plus'
+      id: magician-delete-branches
+      waitFor: ["vcr-merge"]
+      entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
+      secretEnv:
+        - "GITHUB_TOKEN_CLASSIC"
+      args:
+        - "delete-branches"
+        - $COMMIT_SHA
+        - $BRANCH_NAME
+
+
 # set extremely long 1 day timeout, in order to ensure that any jams / backlogs can be cleared.
 timeout: 86400s
 options:

.ci/gcb-contributor-membership-checker.yml

@@ -0,0 +1,37 @@
+---
+steps:
+    - name: 'gcr.io/graphite-docker-images/go-plus'
+      id: collect-nightly-test-status
+      entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
+      secretEnv: ["TEAMCITY_TOKEN"]
+      args:
+        - 'collect-nightly-test-status'
+        - $_CUSTOM_DATE
+    - name: 'gcr.io/graphite-docker-images/go-plus'
+      id: create-test-failure-ticket
+      entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
+      secretEnv: ["GITHUB_TOKEN"]
+      waitFor: ["collect-nightly-test-status"]
+      args:
+        - 'create-test-failure-ticket'
+    - name: 'ubuntu'
+      args: ['sleep', '120']
+    - name: 'gcr.io/graphite-docker-images/go-plus'
+      id: manage-test-failure-ticket
+      entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
+      secretEnv: ["GITHUB_TOKEN"]
+      waitFor: ["create-test-failure-ticket"]
+      args:
+        - 'manage-test-failure-ticket'
+
+timeout: 3600s
+options:
+    machineType: 'N1_HIGHCPU_32'
+
+logsBucket: 'gs://cloudbuild-test-failure-ticket-logs'
+availableSecrets:
+  secretManager:
+    - versionName: projects/673497134629/secrets/teamcity-token/versions/latest
+      env: TEAMCITY_TOKEN
+    - versionName: projects/673497134629/secrets/github-classic--repo-workflow/versions/latest
+      env: GITHUB_TOKEN

.ci/gcb-push-downstream.yml

@@ -13,7 +13,7 @@ steps:
         - $BUILD_ID
 
 # Long timeout to enable waiting on VCR test
-timeout: 20000s
+timeout: 40000s
 options:
     machineType: 'N1_HIGHCPU_32'
 

.ci/gcb-test-failure-ticket.yaml

@@ -12,8 +12,8 @@ Prerequisites:
 - A BeyondCorp subscription on the organization
 
 After applying this configuration:
-- (Internal only) Enable stubbed calls for GKE MultiCloud resources
-- (Internal only) Verify ownership of `hashicorptest.com` for new service account
+- (Internal setup) Enable stubbed calls for GKE MultiCloud resources
+- (Internal setup) Verify ownership of `hashicorptest.com` for new service account
 - Enable Media CDN
 - Enable Access Boundary permissions
 - Enable BigQuery Table IAM conditions
@@ -73,3 +73,6 @@ Quotas that will need to be adjusted to support all tests:
 - compute.googleapis.com/c2_cpus (us-central1)
 - compute.googleapis.com/n2_cpus (us-central1) to 36+
 - VMware Engine standard 72 vCPUs nodes per region - southamerica-east1 to 21
+- logging.googleapis.com/log_buckets_count to 200
+- "Reasoning engine write requests per minute" for us-central1 to 20+
+- aiplatform.googleapis.com/in_use_customer_managed_encryption_keys to 5+