Support FOR_MIGRATION InternalRange objects (#11856)

[upstream:b6675939e5afa0113e79ec31076c93d7021adc46]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/11856.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+networkconnectivity: added field `migration` to resource `google_network_connectivity_internal_range`
+```

google-beta/services/networkconnectivity/resource_network_connectivity_internal_range.go

@@ -77,8 +77,8 @@ func ResourceNetworkConnectivityInternalRange() *schema.Resource {
 			"usage": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: verify.ValidateEnum([]string{"FOR_VPC", "EXTERNAL_TO_VPC"}),
-				Description:  `The type of usage set for this InternalRange. Possible values: ["FOR_VPC", "EXTERNAL_TO_VPC"]`,
+				ValidateFunc: verify.ValidateEnum([]string{"FOR_VPC", "EXTERNAL_TO_VPC", "FOR_MIGRATION"}),
+				Description:  `The type of usage set for this InternalRange. Possible values: ["FOR_VPC", "EXTERNAL_TO_VPC", "FOR_MIGRATION"]`,
 			},
 			"description": {
 				Type:        schema.TypeString,
@@ -101,6 +101,33 @@ func ResourceNetworkConnectivityInternalRange() *schema.Resource {
 Please refer to the field 'effective_labels' for all of the labels present on the resource.`,
 				Elem: &schema.Schema{Type: schema.TypeString},
 			},
+			"migration": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				ForceNew:    true,
+				Description: `Specification for migration with source and target resource names.`,
+				MaxItems:    1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"source": {
+							Type:     schema.TypeString,
+							Required: true,
+							Description: `Resource path as an URI of the source resource, for example a subnet.
+The project for the source resource should match the project for the
+InternalRange.
+An example /projects/{project}/regions/{region}/subnetworks/{subnet}`,
+						},
+						"target": {
+							Type:     schema.TypeString,
+							Required: true,
+							Description: `Resource path of the target resource. The target project can be
+different, as in the cases when migrating to peer networks. The resource
+may not exist yet.
+For example /projects/{project}/regions/{region}/subnetworks/{subnet}`,
+						},
+					},
+				},
+			},
 			"overlaps": {
 				Type:        schema.TypeList,
 				Optional:    true,
@@ -215,6 +242,12 @@ func resourceNetworkConnectivityInternalRangeCreate(d *schema.ResourceData, meta
 	} else if v, ok := d.GetOkExists("overlaps"); !tpgresource.IsEmptyValue(reflect.ValueOf(overlapsProp)) && (ok || !reflect.DeepEqual(v, overlapsProp)) {
 		obj["overlaps"] = overlapsProp
 	}
+	migrationProp, err := expandNetworkConnectivityInternalRangeMigration(d.Get("migration"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("migration"); !tpgresource.IsEmptyValue(reflect.ValueOf(migrationProp)) && (ok || !reflect.DeepEqual(v, migrationProp)) {
+		obj["migration"] = migrationProp
+	}
 	labelsProp, err := expandNetworkConnectivityInternalRangeEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -350,6 +383,9 @@ func resourceNetworkConnectivityInternalRangeRead(d *schema.ResourceData, meta i
 	if err := d.Set("overlaps", flattenNetworkConnectivityInternalRangeOverlaps(res["overlaps"], d, config)); err != nil {
 		return fmt.Errorf("Error reading InternalRange: %s", err)
 	}
+	if err := d.Set("migration", flattenNetworkConnectivityInternalRangeMigration(res["migration"], d, config)); err != nil {
+		return fmt.Errorf("Error reading InternalRange: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenNetworkConnectivityInternalRangeTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading InternalRange: %s", err)
 	}
@@ -661,6 +697,29 @@ func flattenNetworkConnectivityInternalRangeOverlaps(v interface{}, d *schema.Re
 	return v
 }
 
+func flattenNetworkConnectivityInternalRangeMigration(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+	transformed := make(map[string]interface{})
+	transformed["source"] =
+		flattenNetworkConnectivityInternalRangeMigrationSource(original["source"], d, config)
+	transformed["target"] =
+		flattenNetworkConnectivityInternalRangeMigrationTarget(original["target"], d, config)
+	return []interface{}{transformed}
+}
+func flattenNetworkConnectivityInternalRangeMigrationSource(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenNetworkConnectivityInternalRangeMigrationTarget(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenNetworkConnectivityInternalRangeTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -712,6 +771,40 @@ func expandNetworkConnectivityInternalRangeOverlaps(v interface{}, d tpgresource
 	return v, nil
 }
 
+func expandNetworkConnectivityInternalRangeMigration(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedSource, err := expandNetworkConnectivityInternalRangeMigrationSource(original["source"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedSource); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["source"] = transformedSource
+	}
+
+	transformedTarget, err := expandNetworkConnectivityInternalRangeMigrationTarget(original["target"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedTarget); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["target"] = transformedTarget
+	}
+
+	return transformed, nil
+}
+
+func expandNetworkConnectivityInternalRangeMigrationSource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandNetworkConnectivityInternalRangeMigrationTarget(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandNetworkConnectivityInternalRangeEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google-beta/services/networkconnectivity/resource_network_connectivity_internal_range_generated_test.go

@@ -226,6 +226,63 @@ resource "google_compute_subnetwork" "default" {
 `, context)
 }
 
+func TestAccNetworkConnectivityInternalRange_networkConnectivityInternalRangesMigrationExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckNetworkConnectivityInternalRangeDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNetworkConnectivityInternalRange_networkConnectivityInternalRangesMigrationExample(context),
+			},
+			{
+				ResourceName:            "google_network_connectivity_internal_range.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"labels", "name", "network", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccNetworkConnectivityInternalRange_networkConnectivityInternalRangesMigrationExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_network_connectivity_internal_range" "default" {
+  name          = "migration%{random_suffix}"
+  description   = "Test internal range"
+  network       = google_compute_network.default.self_link
+  usage         = "FOR_MIGRATION"
+  peering       = "FOR_SELF"
+  ip_cidr_range = "10.1.0.0/16"
+  migration {
+    source = google_compute_subnetwork.source.self_link
+    target = "projects/${data.google_project.target_project.project_id}/regions/us-central1/subnetworks/target-subnet"
+  }
+}
+
+resource "google_compute_network" "default" {
+  name                    = "tf-test-internal-ranges%{random_suffix}"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_subnetwork" "source" {
+  name          = "tf-test-source-subnet%{random_suffix}"
+  ip_cidr_range = "10.1.0.0/16"
+  region        = "us-central1"
+  network       = google_compute_network.default.name
+}
+
+data "google_project" "target_project" {
+}
+`, context)
+}
+
 func testAccCheckNetworkConnectivityInternalRangeDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

website/docs/r/network_connectivity_internal_range.html.markdown

@@ -144,6 +144,43 @@ resource "google_compute_subnetwork" "default" {
   network       = google_compute_network.default.id
 }
 ```
+<div class = "oics-button" style="float: right; margin: 0 0 -15px">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=network_connectivity_internal_ranges_migration&open_in_editor=main.tf" target="_blank">
+    <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
+  </a>
+</div>
+## Example Usage - Network Connectivity Internal Ranges Migration
+
+
+```hcl
+resource "google_network_connectivity_internal_range" "default" {
+  name          = "migration"
+  description   = "Test internal range"
+  network       = google_compute_network.default.self_link
+  usage         = "FOR_MIGRATION"
+  peering       = "FOR_SELF"
+  ip_cidr_range = "10.1.0.0/16"
+  migration {
+    source = google_compute_subnetwork.source.self_link
+    target = "projects/${data.google_project.target_project.project_id}/regions/us-central1/subnetworks/target-subnet"
+  }
+}
+
+resource "google_compute_network" "default" {
+  name                    = "internal-ranges"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_subnetwork" "source" {
+  name          = "source-subnet"
+  ip_cidr_range = "10.1.0.0/16"
+  region        = "us-central1"
+  network       = google_compute_network.default.name
+}
+
+data "google_project" "target_project" {
+}
+```
 
 ## Argument Reference
 
@@ -161,7 +198,7 @@ The following arguments are supported:
 * `usage` -
   (Required)
   The type of usage set for this InternalRange.
-  Possible values are: `FOR_VPC`, `EXTERNAL_TO_VPC`.
+  Possible values are: `FOR_VPC`, `EXTERNAL_TO_VPC`, `FOR_MIGRATION`.
 
 * `peering` -
   (Required)
@@ -202,10 +239,31 @@ The following arguments are supported:
   Optional. Types of resources that are allowed to overlap with the current internal range.
   Each value may be one of: `OVERLAP_ROUTE_RANGE`, `OVERLAP_EXISTING_SUBNET_RANGE`.
 
+* `migration` -
+  (Optional)
+  Specification for migration with source and target resource names.
+  Structure is [documented below](#nested_migration).
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.
 
 
+<a name="nested_migration"></a>The `migration` block supports:
+
+* `source` -
+  (Required)
+  Resource path as an URI of the source resource, for example a subnet.
+  The project for the source resource should match the project for the
+  InternalRange.
+  An example /projects/{project}/regions/{region}/subnetworks/{subnet}
+
+* `target` -
+  (Required)
+  Resource path of the target resource. The target project can be
+  different, as in the cases when migrating to peer networks. The resource
+  may not exist yet.
+  For example /projects/{project}/regions/{region}/subnetworks/{subnet}
+
 ## Attributes Reference
 
 In addition to the arguments listed above, the following computed attributes are exported: