Sync main oct 27 feature branch resource identity (#15430)

Author: BBBmau

.ci/containers/build-environment/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23-bullseye AS builder
+FROM golang:1.24-bullseye AS builder
 
 # Set working directory
 WORKDIR /app

.ci/containers/go-plus/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
 

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

@@ -171,6 +171,18 @@ resource "google_organization_iam_member" "sa_principal_access_boundary_admin" {
   member = google_service_account.sa.member
 }
 
+resource "google_organization_iam_member" "dlp_admin" {
+  org_id = data.google_organization.org.org_id
+  role   = "roles/dlp.admin"
+  member = google_project_service_identity.dlp_sa.member
+}
+
+resource "google_organization_iam_member" "dlp_org_driver" {
+  org_id = data.google_organization.org.org_id
+  role   = "roles/dlp.orgdriver"
+  member = google_project_service_identity.dlp_sa.member
+}
+
 resource "google_billing_account_iam_member" "sa_master_billing_admin" {
   billing_account_id = data.google_billing_account.master_acct.id
   role               = "roles/billing.admin"
@@ -315,6 +327,7 @@ module "project-services" {
     "networksecurity.googleapis.com",
     "networkservices.googleapis.com",
     "notebooks.googleapis.com",
+    "observability.googleapis.com",
     "orgpolicy.googleapis.com",
     "osconfig.googleapis.com",
     "oslogin.googleapis.com",
@@ -420,6 +433,14 @@ resource "google_project_service_identity" "parametermanager_sa" {
   service = "parametermanager.googleapis.com"
 }
 
+resource "google_project_service_identity" "dlp_sa" {
+  provider = google-beta
+  depends_on = [module.project-services]
+
+  project = google_project.proj.project_id
+  service = "dlp.googleapis.com"
+}
+
 # TestAccComposerEnvironment_fixPyPiPackages
 # TestAccComposerEnvironmentComposer2_private
 # TestAccComposerEnvironment_withEncryptionConfigComposer1

.ci/infra/terraform/main.tf

@@ -111,6 +111,8 @@ func execReassignReviewer(prNumber, newPrimaryReviewer string, gh GithubClient)
 		return err
 	}
 
+	gh.RemoveLabel(prNumber, "assign-reviewer")
+
 	return nil
 }
 

.ci/magician/cmd/membership_checker.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -470,9 +471,7 @@ func runReplaying(runFullVCR bool, version provider.Version, services map[string
 				Version:  version,
 				TestDirs: []string{servicePath},
 			})
-			if serviceReplayingErr != nil {
-				replayingErr = serviceReplayingErr
-			}
+			replayingErr = errors.Join(replayingErr, serviceReplayingErr)
 			result.PassedTests = append(result.PassedTests, serviceResult.PassedTests...)
 			result.SkippedTests = append(result.SkippedTests, serviceResult.SkippedTests...)
 			result.FailedTests = append(result.FailedTests, serviceResult.FailedTests...)