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

Author: actions-user

mmv1/products/compute/Instance.yaml

@@ -720,3 +720,10 @@ properties:
           comply with RFC1035.
         item_type:
           type: String
+  - name: 'eraseWindowsVssSignature'
+    type: Boolean
+    description: |
+      Specifies whether the disks restored from source snapshots or source machine image should erase Windows specific VSS signature.
+    min_version: 'beta'
+    ignore_read: true
+    default_value: false

mmv1/products/datastream/PrivateConnection.yaml

@@ -52,6 +52,15 @@ examples:
     vars:
       private_connection_id: 'my-connection'
       network_name: 'my-network'
+    ignore_read_extra:
+      - 'deletion_policy'
+  - name: 'datastream_private_connection_force_delete'
+    primary_resource_id: 'default'
+    vars:
+      private_connection_id: 'my-connection'
+      network_name: 'my-network'
+    ignore_read_extra:
+      - 'deletion_policy'
   - name: 'datastream_private_connection_psc_interface'
     primary_resource_id: 'default'
     test_env_vars:
@@ -64,6 +73,17 @@ examples:
       network_attachment_name: 'my-network-attachment'
       network_name: 'my-network'
       subnetwork_name: 'my-subnetwork'
+    ignore_read_extra:
+      - 'deletion_policy'
+virtual_fields:
+  - name: 'deletion_policy'
+    description: |
+      The deletion policy for the private connection. Setting `FORCE` will also delete any child
+      routes that belong to this private connection. Setting `DEFAULT` will fail the delete if
+      child routes exist. Defaults to `FORCE` for backwards compatibility.
+      Possible values: `DEFAULT`, `FORCE`.
+    type: String
+    default_value: "FORCE"
 parameters:
   - name: 'privateConnectionId'
     type: String

mmv1/products/tags/TagKey.yaml

@@ -125,7 +125,6 @@ properties:
 
       Purpose data corresponds to the policy system that the tag is intended for. For example, the GCE_FIREWALL purpose expects data in the following format: `network = "<project-name>/<vpc-name>"`.
     immutable: true
-    ignore_read: true
   - name: 'allowedValuesRegex'
     type: String
     description: |

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

@@ -0,0 +1,19 @@
+resource "google_datastream_private_connection" "{{$.PrimaryResourceId}}" {
+	display_name          = "Connection profile"
+	location              = "us-central1"
+	private_connection_id = "{{index $.Vars "private_connection_id"}}"
+	deletion_policy       = "FORCE"
+
+	labels = {
+		key = "value"
+	}
+
+	vpc_peering_config {
+		vpc = google_compute_network.default.id
+		subnet = "10.0.0.0/29"
+	}
+}
+
+resource "google_compute_network" "default" {
+  name = "{{index $.Vars "network_name"}}"
+}

mmv1/templates/terraform/pre_delete/private_connection.go.tmpl

@@ -1,5 +1,7 @@
-// Add force=true query param to force deletion of private connection sub resources like Routes
-url, err = transport_tpg.AddQueryParams(url, map[string]string{"force": strconv.FormatBool(true)})
-if err != nil {
-return err
-}
+// Add force=true query param if deletion_policy is FORCE to delete child routes
+if deletionPolicy := d.Get("deletion_policy"); deletionPolicy == "FORCE" {
+	url, err = transport_tpg.AddQueryParams(url, map[string]string{"force": strconv.FormatBool(true)})
+	if err != nil {
+		return err
+	}
+}

mmv1/third_party/terraform/services/compute/resource_compute_instance.go.tmpl

@@ -1671,6 +1671,15 @@ be from 0 to 999,999,999 inclusive.`,
 					},
 				},
 			},
+			{{- if ne $.TargetVersionName `ga` }}
+			"erase_windows_vss_signature": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				ForceNew:	 true,
+				Default:     false,
+				Description: `Specifies whether the disks restored from source snapshots or source machine image should erase Windows specific VSS signature.`,
+			},
+			{{- end }}
 		},
 		CustomizeDiff: customdiff.All(
 			tpgresource.DefaultProviderProject,
@@ -1850,6 +1859,9 @@ func expandComputeInstance(project string, d *schema.ResourceData, config *trans
 		ReservationAffinity:        reservationAffinity,
 		KeyRevocationActionType:    d.Get("key_revocation_action_type").(string),
 		InstanceEncryptionKey:      expandComputeInstanceEncryptionKey(d),
+		{{- if ne $.TargetVersionName `ga` }}
+		EraseWindowsVssSignature:   d.Get("erase_windows_vss_signature").(bool),
+		{{- end }}
 	}, nil
 }
 
@@ -2321,6 +2333,16 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
 		return fmt.Errorf("Error setting instance_encryption_key: %s", err)
 	}
 
+    {{- if ne $.TargetVersionName `ga` }}
+	// If not forced to false, upgrading to a new provider version and subsequently changing a vm property
+    // will trigger replacement when erase_windows_vss_signature = null in state is changed to false as part of a refresh
+    if _, ok := d.GetOkExists("erase_windows_vss_signature"); !ok {
+        if err := d.Set("erase_windows_vss_signature", false); err != nil {
+            return fmt.Errorf("Error setting erase_windows_vss_signature: %s", err)
+        }
+    }
+    {{- end }}
+
 	d.SetId(fmt.Sprintf("projects/%s/zones/%s/instances/%s", project, zone, instance.Name))
 
 	return nil
@@ -3573,6 +3595,15 @@ func resourceComputeInstanceImportState(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return nil, fmt.Errorf("Error constructing id: %s", err)
 	}
+
+    {{- if ne $.TargetVersionName `ga` }}
+	// erase_windows_vss_signature is not a property of a vm so force to false on import.
+    // If not set, value is null in state and will cause replacement if a vm property is subsequently updated (eg. machine_type).
+    if err := d.Set("erase_windows_vss_signature", false); err != nil {
+        return nil, fmt.Errorf("Error setting erase_windows_vss_signature: %s", err)
+    }
+    {{- end }}
+	
 	d.SetId(id)
 
 	return []*schema.ResourceData{d}, nil

mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_meta.yaml.tmpl

@@ -259,4 +259,7 @@ fields:
   - field: 'terraform_labels'
     provider_only: true
   - api_field: 'zone'
+{{- if ne $.TargetVersionName "ga" }}
+  - api_field: 'eraseWindowsVssSignature'
+{{- end }}
 {{ end }}

mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_test.go.tmpl

@@ -374,6 +374,54 @@ func TestAccComputeInstanceFromMachineImage_withSourceMachineImageEncryptionKey(
 	})
 }
 
+{{ if ne $.TargetVersionName `ga` -}}
+func TestAccComputeInstanceFromMachineImage_VSSWindows(t *testing.T) {
+  t.Parallel()
+
+  var instance compute.Instance
+
+  context_1 := map[string]interface{}{
+    "instance1_name":       fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "image_name":           fmt.Sprintf("tf-test-image-%s", acctest.RandString(t, 10)),
+    "instance2_name":       fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "vss_flag":             true,
+    "guest_flush":          true,
+  }
+  context_2 := map[string]interface{}{
+    "instance1_name":       fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "image_name":           fmt.Sprintf("tf-test-image-%s", acctest.RandString(t, 10)),
+    "instance2_name":       fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "vss_flag":             false,
+    "guest_flush":          false,
+  }
+  
+  acctest.VcrTest(t, resource.TestCase{
+    PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+    ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+    ExternalProviders: map[string]resource.ExternalProvider{
+      "time": {},
+    },
+    CheckDestroy:             testAccCheckComputeInstanceFromMachineImageDestroyProducer(t),
+    Steps: []resource.TestStep{
+      {
+        Config: testAccComputeInstanceFromMachineImage_VSSWindows(context_1),
+        Check: resource.ComposeTestCheckFunc(
+          testAccCheckComputeInstanceExists(
+            t, "google_compute_instance_from_machine_image.foobar", &instance),
+        ),
+      },
+      {
+        Config: testAccComputeInstanceFromMachineImage_VSSWindows(context_2),
+        Check: resource.ComposeTestCheckFunc(
+          testAccCheckComputeInstanceExists(
+            t, "google_compute_instance_from_machine_image.foobar", &instance),
+        ),
+      },
+    },
+  })
+}
+{{- end }}
+
 func testAccCheckComputeInstanceFromMachineImageDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		config := acctest.GoogleProviderConfig(t)
@@ -1440,6 +1488,74 @@ resource "google_compute_instance_from_machine_image" "foobar" {
 `, context)
 }
 
+{{ if ne $.TargetVersionName `ga` -}}
+func testAccComputeInstanceFromMachineImage_VSSWindows(context map[string]interface{}) string {
+  return acctest.Nprintf(`
+data "google_compute_image" "my_image" {
+  provider = google-beta
+
+  family  = "windows-2025"
+  project = "windows-cloud"
+}
+
+// Takes about 3 minutes for vm to be fully ready
+resource "google_compute_instance" "initialvm" {
+  provider     = google-beta
+
+  name         = "%{instance1_name}"
+  machine_type = "e2-standard-2"
+  zone         = "us-central1-a"
+
+  boot_disk {
+    initialize_params {
+      image = data.google_compute_image.my_image.self_link
+       type = "pd-ssd"
+    }
+  }
+
+  network_interface {
+    network = "default"
+  }
+
+}
+
+// Need to wait for initialvm to be fully ready otherwise snapshot with guest_flush = true will fail.
+resource "time_sleep" "wait_240_seconds" {
+  create_duration = "240s"
+  depends_on = [google_compute_instance.initialvm]
+}
+
+resource "google_compute_machine_image" "foobar" {
+  provider = google-beta
+
+  name            = "%{image_name}"
+  source_instance = google_compute_instance.initialvm.self_link
+  guest_flush     = "%{guest_flush}"
+  depends_on = [ time_sleep.wait_240_seconds ]
+
+  // guest_flush is not a property of machine_image and therefore always ends up as false in the state.
+  // To properly test erase_windows_vss_signature = true, guest_flush would need to be true.
+  // However, after apply, a plan will always show a diff because guest_flush is false in state.
+  // We therefore need to ignore this field; otherwise, the test fails
+  lifecycle {
+    ignore_changes = [guest_flush]
+  }
+}
+
+resource "google_compute_instance_from_machine_image" "foobar" {
+  provider = google-beta
+
+  name         = "%{instance2_name}"
+  zone         = "us-central1-a"
+
+  source_machine_image = google_compute_machine_image.foobar.self_link
+
+  erase_windows_vss_signature = %{vss_flag}
+
+}
+`, context)
+}
+{{- end }}
 {{- else }}
 // Magic Modules doesn't let us remove files - blank out beta-only common-compile files for now.
 {{- end }}

mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template_meta.yaml.tmpl

@@ -272,3 +272,6 @@ fields:
   - field: 'terraform_labels'
     provider_only: true
   - api_field: 'zone'
+{{- if ne $.TargetVersionName "ga" }}
+  - api_field: 'eraseWindowsVssSignature'
+{{- end }}

mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template_test.go.tmpl

@@ -626,6 +626,49 @@ func TestAccComputeInstanceFromTemplate_DiskForceAttach(t *testing.T) {
 	})
 }
 
+{{ if ne $.TargetVersionName `ga` -}}
+func TestAccComputeInstanceFromTemplate_VSSWindows(t *testing.T) {
+  t.Parallel()
+
+  var instance compute.Instance
+
+  context_1 := map[string]interface{}{
+    "bootdisk_name":  fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "template_name":  fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "instance_name":  fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "vss_flag":       true,
+  }
+  context_2 := map[string]interface{}{
+    "bootdisk_name":  fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "template_name":  fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "instance_name":  fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10)),
+    "vss_flag":       false,
+  }
+
+  acctest.VcrTest(t, resource.TestCase{
+    PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+    ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+    CheckDestroy:             testAccCheckComputeInstanceFromTemplateDestroyProducer(t),
+    Steps: []resource.TestStep{
+      {
+        Config: testAccComputeInstanceFromTemplate_VSSWindows(context_1),
+        Check: resource.ComposeTestCheckFunc(
+          testAccCheckComputeInstanceExists(
+            t, "google_compute_instance_from_template.foobar", &instance),
+        ),
+      },
+      {
+        Config: testAccComputeInstanceFromTemplate_VSSWindows(context_2),
+        Check: resource.ComposeTestCheckFunc(
+          testAccCheckComputeInstanceExists(
+            t, "google_compute_instance_from_template.foobar", &instance),
+          ),
+      },
+    },
+  })
+}
+{{- end }}
+
 func testAccComputeInstanceFromTemplate_basic(instance, template string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
@@ -2628,3 +2671,54 @@ resource "google_compute_instance_from_template" "foobar" {
 }
 `, context)
 }
+
+{{ if ne $.TargetVersionName `ga` -}}
+func testAccComputeInstanceFromTemplate_VSSWindows(context map[string]interface{}) string {
+  return acctest.Nprintf(`
+data "google_compute_image" "my_image" {
+  provider = google-beta
+
+  family  = "windows-2025"
+  project = "windows-cloud"
+}
+
+resource "google_compute_disk" "foobarboot" {
+  provider = google-beta
+
+  name  = "%{bootdisk_name}"
+  image = data.google_compute_image.my_image.self_link
+  size  = 50
+  type  = "pd-ssd"
+  zone  = "us-central1-a"
+}
+
+resource "google_compute_instance_template" "foobar" {
+  provider = google-beta
+
+  name          = "%{template_name}"
+  machine_type  = "e2-standard-2"
+
+  disk {
+    source      = google_compute_disk.foobarboot.name
+    boot        = true
+  }
+
+  network_interface {
+    network = "default"
+  }
+
+}
+
+resource "google_compute_instance_from_template" "foobar" {
+  provider = google-beta
+
+  name         = "%{instance_name}"
+  zone         = "us-central1-a"
+
+  source_instance_template = google_compute_instance_template.foobar.self_link
+
+  erase_windows_vss_signature = %{vss_flag}
+}
+`, context)
+}
+{{- end }}