Merge branch 'GoogleCloudPlatform:main' into main

Author: anthonyrtong

.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/infra/terraform/main.tf

@@ -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/magician/github/membership_data.go

@@ -75,11 +75,18 @@ var (
 					startDate: newDate(2025, 4, 9),
 					endDate:   newDate(2025, 4, 15),
 				},
+				{
+					startDate: newDate(2025, 9, 26),
+					endDate:   newDate(2025, 10, 4),
+				},
 			},
 		},
 		"hao-nan-li": {
 			vacations: []Vacation{},
 		},
+		"malhotrasagar2212": {
+			vacations: []Vacation{},
+		},
 		"melinath": {
 			vacations: []Vacation{
 				{
@@ -105,10 +112,19 @@ var (
 					startDate: newDate(2025, 8, 1),
 					endDate:   newDate(2025, 8, 11),
 				},
+				{
+					startDate: newDate(2025, 9, 23),
+					endDate:   newDate(2025, 9, 29),
+				},
 			},
 		},
 		"ScottSuarez": {
-			vacations: []Vacation{},
+			vacations: []Vacation{
+				{
+					startDate: newDate(2025, 9, 26),
+					endDate:   newDate(2025, 10, 5),
+				},
+			},
 		},
 		"shuyama1": {
 			vacations: []Vacation{
@@ -158,7 +174,6 @@ var (
 
 	// This is for new team members who are onboarding
 	trustedContributors = map[string]struct{}{
-		"bbasata":           struct{}{},
-		"malhotrasagar2212": struct{}{},
+		"bbasata": struct{}{},
 	}
 )

.ci/magician/go.mod

@@ -1,6 +1,6 @@
 module magician
 
-go 1.23
+go 1.24
 
 replace github.com/GoogleCloudPlatform/magic-modules/tools/issue-labeler => ../../tools/issue-labeler
 

.ci/unit-tests/gcb-membership-checker-test.yml

@@ -1,6 +1,6 @@
 ---
 steps:
-    - name: 'golang:1.23'
+    - name: 'golang:1.24'
       args:
         - '-c'
         - |

.github/workflows/build-downstream.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '^1.23'
+          go-version: '^1.24'
 
       # Cache Go modules
       - name: Cache Go modules

.github/workflows/changelog-checker.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '^1.23.0'
+          go-version: '^1.24.0'
 
       - name: Build
         run: |

.github/workflows/ensure-service-team-labels.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '^1.23.0'
+          go-version: '^1.24.0'
       - name: Build issue-labeler
         run: |
           cd tools/issue-labeler

.github/workflows/gofmt.yml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           cache: false
-          go-version: '^1.23'
+          go-version: '^1.24'
       - name: gofmt
         run: |
           GOFMT_OUTPUT="$(gofmt -l .)"