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

Author: actions-user

mmv1/products/compute/MachineImage.yaml

@@ -58,6 +58,16 @@ examples:
       key_name: '"key" + randomSuffix'
       # for backward compatible
       keyring_name: '"keyring" + randomSuffix'
+  - name: machine_image_resource_manager_tags
+    primary_resource_id: image
+    vars:
+      image_name: my-image
+      vm_name: my-vm
+      tag_key: tagkey
+      tag_value: tagvalue
+    test_vars_overrides:
+      'tag_key': '"tf-test-key-" + acctest.RandString(t, 10)'
+      'tag_value': '"tf-test-value-" + acctest.RandString(t, 10)'
 properties:
   - name: name
     type: String
@@ -125,3 +135,20 @@ properties:
           The service account used for the encryption request for the given KMS key.
           If absent, the Compute Engine Service Agent service account is used.
         min_version: beta
+  - name: 'params'
+    type: NestedObject
+    ignore_read: true
+    immutable: true
+    min_version: beta
+    description: |
+      Additional params passed with the request, but not persisted as part of resource payload.
+    properties:
+      - name: 'resourceManagerTags'
+        type: KeyValuePairs
+        description: |
+          Resource manager tags to be bound to the machine image. Tag keys and values have the
+          same definition as resource manager tags. Keys must be in the format tagKeys/{tag_key_id},
+          and values are in the format tagValues/456.
+        api_name: resourceManagerTags
+        min_version: beta
+        ignore_read: true

mmv1/products/hypercomputecluster/Cluster.yaml

@@ -306,6 +306,7 @@ properties:
               - name: count
                 type: String
                 required: true
+                diff_suppress_func: 'tpgresource.EmptyOrDefaultStringSuppress("0")'
                 description: Number of login node instances to create.
               - name: enableOsLogin
                 type: Boolean
@@ -441,6 +442,7 @@ properties:
                     alphanumeric, and at most 63 characters).
                 - name: maxDynamicNodeCount
                   type: String
+                  diff_suppress_func: 'tpgresource.EmptyOrDefaultStringSuppress("0")'
                   description: |-
                     Controls how many additional nodes a cluster can bring online to handle
                     workloads. Set this value to enable dynamic node creation and limit the
@@ -449,6 +451,7 @@ properties:
                     on static nodes.
                 - name: staticNodeCount
                   type: String
+                  diff_suppress_func: 'tpgresource.EmptyOrDefaultStringSuppress("0")'
                   description: |-
                     Number of nodes to be statically created for this nodeset. The cluster will
                     attempt to ensure that at least this many nodes exist at all times.

mmv1/templates/terraform/constants/disk.tmpl

@@ -317,10 +317,6 @@ func ExpandStoragePoolUrl(v interface{}, d tpgresource.TerraformResourceData, co
 	if err != nil {
 		return "", err
 	}
-	zone, err := tpgresource.GetZone(d, config)
-	if err != nil {
-		return "", err
-	}
 	
 	formattedStr := v.(string)
 	if strings.HasPrefix(v.(string), "/") {
@@ -338,8 +334,14 @@ func ExpandStoragePoolUrl(v interface{}, d tpgresource.TerraformResourceData, co
 		// For regional or zonal resources which include their region or zone, just put the project in front.
 		replacedStr = config.ComputeBasePath + "projects/" + project + "/" + formattedStr
 	} else {
+		// Resources like instance template do not have a zone argument.
+		// In this case, run GetZone when it is strictly necessary.
+		zone, err := tpgresource.GetZone(d, config)
+		if err != nil {
+			return "", err
+		}
 		// Anything else is assumed to be a zonal resource, with a partial link that begins with the resource name.
 		replacedStr = config.ComputeBasePath + "projects/" + project + "/zones/" + zone + "/storagePools/" + formattedStr
 	}
 	return replacedStr, nil
-}
+}

mmv1/templates/terraform/examples/apigee_organization_cloud_basic_data_residency_test.tf.tmpl

@@ -1,3 +1,5 @@
+// For advanced data residency customers: To ensure advanced data residency compliance for data
+// in transit, you must use the appropriate regional endpoint for the 'apigee_custom_endpoint'.
 provider "google" {
   apigee_custom_endpoint = "https://eu-apigee.googleapis.com/v1/"
 }

mmv1/templates/terraform/examples/machine_image_resource_manager_tags.tf.tmpl

@@ -0,0 +1,42 @@
+data "google_project" "project" {
+  provider = google-beta
+}
+
+resource "google_tags_tag_key" "tag_key1" {
+  provider   = google-beta
+  parent     = "projects/${data.google_project.project.number}"
+  short_name = "{{index $.Vars "tag_key"}}"
+}
+
+resource "google_tags_tag_value" "tag_value1" {
+  provider   = google-beta
+  parent     = google_tags_tag_key.tag_key1.id
+  short_name = "{{index $.Vars "tag_value"}}"
+}
+
+resource "google_compute_instance" "vm" {
+  provider     = google-beta
+  name         = "{{index $.Vars "vm_name"}}"
+  machine_type = "e2-medium"
+
+  boot_disk {
+    initialize_params {
+      image = "debian-cloud/debian-11"
+    }
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+
+resource "google_compute_machine_image" "{{$.PrimaryResourceId}}" {
+  provider        = google-beta
+  name            = "{{index $.Vars "image_name"}}"
+  source_instance = google_compute_instance.vm.self_link
+  params {
+    resource_manager_tags = {
+      (google_tags_tag_key.tag_key1.id) = (google_tags_tag_value.tag_value1.id)
+    }
+  }
+}

…urce_google_billing_project_info_test.go …urce_google_billing_project_info_test.gommv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go renamed to mmv1/third_party/terraform/services/cloudbilling/resource_google_billing_project_info_test.go mmv1/third_party/terraform/services/corebilling/resource_google_billing_project_info_test.go renamed to mmv1/third_party/terraform/services/cloudbilling/resource_google_billing_project_info_test.go

@@ -1,4 +1,4 @@
-package corebilling_test
+package cloudbilling_test
 
 import (
 	"fmt"
@@ -20,7 +20,7 @@ func TestAccBillingProjectInfo_update(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckCoreBillingProjectInfoDestroyProducer(t),
+		CheckDestroy:             testAccCheckCloudBillingProjectInfoDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccBillingProjectInfo_basic(projectId, orgId, billingAccount),

mmv1/third_party/terraform/website/docs/guides/provider_reference.html.markdown

@@ -378,6 +378,24 @@ Support for custom endpoints is on a best-effort basis. The underlying
 endpoint and default values for a resource can be changed at any time without
 being considered a breaking change.
 
+**Data residency at rest and advanced data residency**
+
+For services that support data residency at rest, you can specify a regional endpoint 
+to ensure your data is processed and stored in a specific geographic location.
+
+For services offering advanced data residency, it is critical to use the correct regional 
+endpoint to ensure data remains within the chosen region when at use, in use, and in transit.
+
+Example of Apigee regional endpoint for the European Union:
+
+```
+provider "google" {
+  apigee_custom_endpoint = "https://apigee.eu.rep.googleapis.com/v1/"
+}
+```
+
+Always consult the specific service documentation for the correct regional or multi-regional endpoint to use.
+
 ---
 
 * `universe_domain` - (Optional) Specify the GCP universe to deploy in.