Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

actions-user · actions-user · commit 8cd36ec7c30c · 2026-05-12T02:26:09.000Z
diff --git a/mmv1/products/compute/OrganizationSecurityPolicyAssociation.yaml b/mmv1/products/compute/OrganizationSecurityPolicyAssociation.yaml
@@ -48,6 +48,12 @@ examples:
       short_name: "my-short-name"
     test_env_vars:
       org_id: 'ORG_TARGET'
+  - name: 'organization_security_policy_association_excluded'
+    primary_resource_id: 'policy'
+    vars:
+      short_name: "my-short-name-excluded"
+    test_env_vars:
+      org_id: 'ORG_TARGET'
 parameters:
   - name: 'policyId'
     type: String
diff --git a/mmv1/products/container/Cluster.yaml b/mmv1/products/container/Cluster.yaml
@@ -94,6 +94,12 @@ properties:
           type: 'String'
           description: 'The selected network policy provider.'
           is_missing_in_cai: true
+  - name: minMasterVersion
+    type: String
+    ignore_read: true
+  - name: nodeVersion
+    type: String
+    ignore_read: true
 tgc_tests:
   - name: TestAccContainerCluster_withDatabaseEncryption
     skip: Bug in the API, https://github.com/hashicorp/terraform-provider-google/issues/26882
diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_data_residency_test.tf.tmpl b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_data_residency_test.tf.tmpl
@@ -22,6 +22,10 @@ resource "time_sleep" "wait_300_seconds" {
   depends_on = [google_project_service.apigee]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   description                = "Terraform-provisioned basic Apigee Org under European Union hosting jurisdiction."
   project_id                 = google_project.project.project_id
@@ -30,10 +34,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   disable_vpc_peering        = true
   depends_on                 = [
     time_sleep.wait_300_seconds,
+    time_sleep.wait_after_destroy,
   ]
 }
-
-resource "time_sleep" "wait_after_destroy" {
-  destroy_duration = "150s"
-  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
-}
diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.tmpl b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_disable_vpc_peering_test.tf.tmpl
@@ -16,6 +16,9 @@ resource "time_sleep" "wait_300_seconds" {
   depends_on = [google_project_service.apigee]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+}
 
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   description         = "Terraform-provisioned basic Apigee Org without VPC Peering."
@@ -24,10 +27,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   disable_vpc_peering = true
   depends_on          = [
     time_sleep.wait_300_seconds,
+    time_sleep.wait_after_destroy,
   ]
 }
-
-resource "time_sleep" "wait_after_destroy" {
-  destroy_duration = "150s"
-  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
-}
diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.tmpl b/mmv1/templates/terraform/examples/apigee_organization_cloud_basic_test.tf.tmpl
@@ -56,17 +56,17 @@ resource "google_service_networking_connection" "apigee_vpc_connection" {
   depends_on              = [google_project_service.servicenetworking]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   analytics_region   = "us-central1"
   project_id         = google_project.project.project_id
   authorized_network = google_compute_network.apigee_network.id
   depends_on         = [
     google_service_networking_connection.apigee_vpc_connection,
     google_project_service.apigee,
+    time_sleep.wait_after_destroy,
   ]
 }
-
-resource "time_sleep" "wait_after_destroy" {
-  destroy_duration = "150s"
-  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
-}
diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl b/mmv1/templates/terraform/examples/apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl
@@ -79,6 +79,10 @@ resource "time_sleep" "wait_for_iam" {
   depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -102,10 +106,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
 
   depends_on = [
     time_sleep.wait_for_iam,
+    time_sleep.wait_after_destroy,
   ]
 }
-
-resource "time_sleep" "wait_after_destroy" {
-  destroy_duration = "150s"
-  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
-}
diff --git a/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.tmpl b/mmv1/templates/terraform/examples/apigee_organization_cloud_full_test.tf.tmpl
@@ -115,6 +115,10 @@ resource "time_sleep" "wait_for_iam" {
   depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -139,10 +143,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   depends_on = [
     google_service_networking_connection.apigee_vpc_connection,
     time_sleep.wait_for_iam,
+    time_sleep.wait_after_destroy,
   ]
 }
-
-resource "time_sleep" "wait_after_destroy" {
-  destroy_duration = "150s"
-  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
-}
diff --git a/mmv1/templates/terraform/examples/apigee_organization_drz_test.tf.tmpl b/mmv1/templates/terraform/examples/apigee_organization_drz_test.tf.tmpl
@@ -119,6 +119,10 @@ resource "time_sleep" "wait_for_iam" {
   depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -134,10 +138,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
     google_service_networking_connection.apigee_vpc_connection,
     google_project_service.apigee,
     time_sleep.wait_for_iam,
+    time_sleep.wait_after_destroy,
   ]
 }
-
-resource "time_sleep" "wait_after_destroy" {
-  destroy_duration = "150s"
-  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
-}
diff --git a/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.tmpl b/mmv1/templates/terraform/examples/apigee_organization_retention_test.tf.tmpl
@@ -115,6 +115,10 @@ resource "time_sleep" "wait_for_iam" {
   depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]
 }
 
+resource "time_sleep" "wait_after_destroy" {
+  destroy_duration = "150s"
+}
+
 resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
   provider = google-beta
 
@@ -129,10 +133,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {
     google_service_networking_connection.apigee_vpc_connection,
     google_project_service.apigee,
     time_sleep.wait_for_iam,
+    time_sleep.wait_after_destroy,
   ]
 }
-
-resource "time_sleep" "wait_after_destroy" {
-  destroy_duration = "150s"
-  depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]
-}
diff --git a/mmv1/templates/terraform/examples/organization_security_policy_association_excluded.tf.tmpl b/mmv1/templates/terraform/examples/organization_security_policy_association_excluded.tf.tmpl
@@ -0,0 +1,26 @@
+resource "google_folder" "security_policy_target" {
+  display_name        = "tf-test-secpol-%{random_suffix}"
+  parent              = "organizations/{{index $.TestEnvVars "org_id"}}"
+  deletion_protection = false
+}
+
+resource "google_compute_organization_security_policy" "policy" {
+  short_name = "tf-test%{random_suffix}"
+  parent     = google_folder.security_policy_target.name
+  type       = "CLOUD_ARMOR"
+}
+
+resource "google_compute_organization_security_policy_association" "{{$.PrimaryResourceId}}" {
+  name          = "tf-test%{random_suffix}"
+  attachment_id = "organizations/{{index $.TestEnvVars "org_id"}}"
+  policy_id     = google_compute_organization_security_policy.policy.id
+
+  excluded_projects = [
+    "projects/2000000002",
+    "projects/3000000003"
+  ]
+  excluded_folders = [
+    "folders/4000000004",
+    "folders/5000000005"
+  ]
+}
diff --git a/mmv1/third_party/terraform/go.mod b/mmv1/third_party/terraform/go.mod
@@ -3,7 +3,6 @@ module github.com/hashicorp/terraform-provider-google
 go 1.26.0
 
 require (
-	bitbucket.org/creachadair/stringset v0.0.11
 	cloud.google.com/go/auth v0.20.0
 	cloud.google.com/go/auth/oauth2adapt v0.2.8
 	cloud.google.com/go/bigquery v1.74.0
diff --git a/mmv1/third_party/terraform/go.sum b/mmv1/third_party/terraform/go.sum
@@ -1,5 +1,3 @@
-bitbucket.org/creachadair/stringset v0.0.11 h1:6Sv4CCv14Wm+OipW4f3tWOb0SQVpBDLW0knnJqUnmZ8=
-bitbucket.org/creachadair/stringset v0.0.11/go.mod h1:wh0BHewFe+j0HrzWz7KcGbSNpFzWwnpmgPRlB57U5jU=
 cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
 cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
diff --git a/mmv1/third_party/terraform/tpgdclresource/canonicalize.go b/mmv1/third_party/terraform/tpgdclresource/canonicalize.go
@@ -9,11 +9,25 @@ import (
 	"strings"
 	"time"
 
-	"bitbucket.org/creachadair/stringset"
 	glog "github.com/golang/glog"
 )
 
-var selfLinkIgnorableComponents = stringset.New("projects", "regions", "locations", "zones", "organizations", "compute", "v1", "v1beta1", "beta")
+var selfLinkIgnorableComponents = map[string]struct{}{
+	"projects":      {},
+	"regions":       {},
+	"locations":     {},
+	"zones":         {},
+	"organizations": {},
+	"compute":       {},
+	"v1":            {},
+	"v1beta1":       {},
+	"beta":          {},
+}
+
+func hasKey(m map[string]struct{}, k string) bool {
+	_, ok := m[k]
+	return ok
+}
 
 // SelfLinkToSelfLink returns true if left and right are equivalent for selflinks.
 // That means that they are piecewise equal, comparing components, allowing for
@@ -54,9 +68,9 @@ func SelfLinkToSelfLink(l, r *string) bool {
 		case lcomp[li] == rcomp[ri]:
 			li++
 			ri++
-		case selfLinkIgnorableComponents.Contains(lcomp[li]):
+		case hasKey(selfLinkIgnorableComponents, lcomp[li]):
 			li++
-		case selfLinkIgnorableComponents.Contains(rcomp[ri]):
+		case hasKey(selfLinkIgnorableComponents, rcomp[ri]):
 			ri++
 		// The second-to-last element in a long-form self-link contains the
 		// name of the resource.  The name of the resource might be anything,
@@ -192,9 +206,9 @@ func PartialSelfLinkToSelfLink(l, r *string) bool {
 		case lcomp[li] == rcomp[ri]:
 			li--
 			ri--
-		case selfLinkIgnorableComponents.Contains(lcomp[li]):
+		case hasKey(selfLinkIgnorableComponents, lcomp[li]):
 			li--
-		case selfLinkIgnorableComponents.Contains(rcomp[ri]):
+		case hasKey(selfLinkIgnorableComponents, rcomp[ri]):
 			ri--
 		// As in SelfLinkToSelfLink, we permit any value in the second-to-last field
 		// for the value which is longer.
diff --git a/mmv1/third_party/terraform/tpgdclresource/update.go b/mmv1/third_party/terraform/tpgdclresource/update.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"unicode"
 	"unicode/utf8"
-
-	"bitbucket.org/creachadair/stringset"
 )
 
 // UpdateMask creates a Update Mask string according to https://google.aip.dev/161
@@ -18,13 +16,25 @@ func UpdateMask(ds []*FieldDiff) string {
 		ss = append(ss, convertUpdateMaskVal(v.FieldName))
 	}
 
-	dupesRemoved := stringset.New(ss...).Elements()
+	dupesRemoved := removeDuplicates(ss)
 
 	// Sorting the entries is optional, but makes it easier to read + test.
 	sort.Strings(dupesRemoved)
 	return strings.Join(dupesRemoved, ",")
 }
 
+func removeDuplicates(ss []string) []string {
+	m := make(map[string]struct{})
+	var out []string
+	for _, s := range ss {
+		if _, ok := m[s]; !ok {
+			m[s] = struct{}{}
+			out = append(out, s)
+		}
+	}
+	return out
+}
+
 func titleCaseToCamelCase(s string) string {
 	r, n := utf8.DecodeRuneInString(s)
 	p := string(unicode.ToLower(r))
@@ -71,7 +81,7 @@ func TopLevelUpdateMask(ds []*FieldDiff) string {
 		ss = append(ss, convertUpdateMaskVal(part))
 	}
 
-	dupesRemoved := stringset.New(ss...).Elements()
+	dupesRemoved := removeDuplicates(ss)
 
 	// Sorting the entries is optional, but makes it easier to read + test.
 	sort.Strings(dupesRemoved)
@@ -84,7 +94,7 @@ func SnakeCaseUpdateMask(ds []*FieldDiff) string {
 	for _, v := range ds {
 		ss = append(ss, TitleToSnakeCase(convertUpdateMaskVal(v.FieldName)))
 	}
-	dupesRemoved := stringset.New(ss...).Elements()
+	dupesRemoved := removeDuplicates(ss)
 
 	// Sorting the entries is optional, but makes it easier to read + test.
 	sort.Strings(dupesRemoved)
diff --git a/mmv1/third_party/tgc_next/go.mod b/mmv1/third_party/tgc_next/go.mod
@@ -40,7 +40,6 @@ require (
 )
 
 require (
-	bitbucket.org/creachadair/stringset v0.0.11 // indirect
 	cel.dev/expr v0.25.1 // indirect
 	cloud.google.com/go v0.123.0 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
diff --git a/mmv1/third_party/tgc_next/pkg/services/container/resource_container_cluster_cai2hcl.go b/mmv1/third_party/tgc_next/pkg/services/container/resource_container_cluster_cai2hcl.go
@@ -122,8 +122,6 @@ func (c *ContainerClusterCai2hclConverter) convertResourceData(asset caiasset.As
 			hclData["node_locations"] = locations
 		}
 	}
-	hclData["min_master_version"] = asset.Resource.Data["currentNodeVersion"]
-	hclData["node_version"] = asset.Resource.Data["currentNodeVersion"]
 	hclData["logging_service"] = asset.Resource.Data["loggingService"]
 	hclData["monitoring_service"] = asset.Resource.Data["monitoringService"]
 	hclData["node_config"] = flattenNodeConfig(asset.Resource.Data["nodeConfig"], nil)
@@ -1177,18 +1175,21 @@ func flattenClusterAutoscaling(v interface{}, enableAutopilot bool) []map[string
 		if !enableAutopilot {
 			transformed["enabled"] = true
 		}
-	} else if !enableAutopilot {
-		transformed["enabled"] = false
+		transformed["auto_provisioning_defaults"] = flattenAutoProvisioningDefaults(a["autoprovisioningNodePoolDefaults"])
+	}
+	if v := a["autoprovisioningLocations"]; v != nil {
+		transformed["auto_provisioning_locations"] = v
 	}
-	transformed["auto_provisioning_defaults"] = flattenAutoProvisioningDefaults(a["autoprovisioningNodePoolDefaults"])
-	transformed["auto_provisioning_locations"] = a["autoprovisioningLocations"]
 	if v := a["autoscalingProfile"]; v != nil && v != "BALANCED" {
 		transformed["autoscaling_profile"] = v
 	}
 	if dccc, ok := a["defaultComputeClassConfig"].(map[string]interface{}); ok {
 		transformed["default_compute_class_enabled"] = dccc["enabled"]
 	}
 
+	if len(transformed) == 0 {
+		return nil
+	}
 	return []map[string]interface{}{transformed}
 }
 
diff --git a/tools/diff-processor/go.mod b/tools/diff-processor/go.mod
@@ -29,7 +29,6 @@ require (
 )
 
 require (
-	bitbucket.org/creachadair/stringset v0.0.8 // indirect
 	cel.dev/expr v0.15.0 // indirect
 	cloud.google.com/go v0.115.1 // indirect
 	cloud.google.com/go/auth v0.9.0 // indirect
diff --git a/tpgtools/BUILD.bazel b/tpgtools/BUILD.bazel
diff --git a/tpgtools/go.mod b/tpgtools/go.mod
diff --git a/tpgtools/go.sum b/tpgtools/go.sum
diff --git a/tpgtools/id.go b/tpgtools/id.go
diff --git a/tpgtools/property.go b/tpgtools/property.go
diff --git a/tpgtools/resource.go b/tpgtools/resource.go
diff --git a/tpgtools/type.go b/tpgtools/type.go

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ resource "time_sleep" "wait_300_seconds" {`
`16`	`16`	`depends_on = [google_project_service.apigee]`
`17`	`17`	`}`
`18`	`18`
	`19`	`+resource "time_sleep" "wait_after_destroy" {`
	`20`	`+ destroy_duration = "150s"`
	`21`	`+}`
`19`	`22`
`20`	`23`	`resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {`
`21`	`24`	`description = "Terraform-provisioned basic Apigee Org without VPC Peering."`
`@@ -24,10 +27,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {`
`24`	`27`	`disable_vpc_peering = true`
`25`	`28`	`depends_on = [`
`26`	`29`	`time_sleep.wait_300_seconds,`
	`30`	`+ time_sleep.wait_after_destroy,`
`27`	`31`	`]`
`28`	`32`	`}`
`29`		`-`
`30`		`-resource "time_sleep" "wait_after_destroy" {`
`31`		`- destroy_duration = "150s"`
`32`		`- depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]`
`33`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,10 @@ resource "time_sleep" "wait_for_iam" {`
`79`	`79`	`depends_on = [google_kms_crypto_key_iam_member.apigee_sa_keyuser]`
`80`	`80`	`}`
`81`	`81`
	`82`	`+resource "time_sleep" "wait_after_destroy" {`
	`83`	`+ destroy_duration = "150s"`
	`84`	`+}`
	`85`	`+`
`82`	`86`	`resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {`
`83`	`87`	`provider = google-beta`
`84`	`88`
`@@ -102,10 +106,6 @@ resource "google_apigee_organization" "{{$.PrimaryResourceId}}" {`
`102`	`106`
`103`	`107`	`depends_on = [`
`104`	`108`	`time_sleep.wait_for_iam,`
	`109`	`+ time_sleep.wait_after_destroy,`
`105`	`110`	`]`
`106`	`111`	`}`
`107`		`-`
`108`		`-resource "time_sleep" "wait_after_destroy" {`
`109`		`- destroy_duration = "150s"`
`110`		`- depends_on = [google_apigee_organization.{{$.PrimaryResourceId}}]`
`111`		`-}`