Added IPv6 support for Internal Ranges in Terraform. (#13626) (#22401)

[upstream:4002beb93f0622f8e7ee4509ca6fa2e8ec5c508b]

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

Author: modular-magician

.changelog/13626.txt

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

google/services/networkconnectivity/resource_network_connectivity_internal_range.go

@@ -97,10 +97,12 @@ Only IPv4 CIDR ranges are supported.`,
 				},
 			},
 			"ip_cidr_range": {
-				Type:        schema.TypeString,
-				Computed:    true,
-				Optional:    true,
-				Description: `The IP range that this internal range defines.`,
+				Type:     schema.TypeString,
+				Computed: true,
+				Optional: true,
+				Description: `The IP range that this internal range defines.
+NOTE: IPv6 ranges are limited to usage=EXTERNAL_TO_VPC and peering=FOR_SELF
+NOTE: For IPv6 Ranges this field is compulsory, i.e. the address range must be specified explicitly.`,
 			},
 			"labels": {
 				Type:     schema.TypeMap,
@@ -152,7 +154,9 @@ For example /projects/{project}/regions/{region}/subnetworks/{subnet}`,
 				Type:     schema.TypeInt,
 				Optional: true,
 				Description: `An alternate to ipCidrRange. Can be set when trying to create a reservation that automatically finds a free range of the given size.
-If both ipCidrRange and prefixLength are set, there is an error if the range sizes do not match. Can also be used during updates to change the range size.`,
+If both ipCidrRange and prefixLength are set, there is an error if the range sizes do not match. Can also be used during updates to change the range size.
+NOTE: For IPv6 this field only works if ip_cidr_range is set as well, and both fields must match. In other words, with IPv6 this field only works as
+a redundant parameter.`,
 			},
 			"target_cidr_range": {
 				Type:     schema.TypeList,

google/services/networkconnectivity/resource_network_connectivity_internal_range_test.go

@@ -284,3 +284,58 @@ resource "google_compute_network" "default" {
 }
 `, context)
 }
+
+func TestAccNetworkConnectivityInternalRange_networkConnectivityInternalRangesIPv6Example_full(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	resourceName := "google_network_connectivity_internal_range.default"
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckNetworkConnectivityInternalRangeDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNetworkConnectivityInternalRange_networkConnectivityInternalRangesIPv6Example_full(context),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						resourceName, "description", "Test internal range IPv6"),
+					resource.TestCheckResourceAttr(
+						resourceName, "ip_cidr_range", "1234:0:1:1::/64"),
+					resource.TestCheckResourceAttr(
+						resourceName, "usage", "EXTERNAL_TO_VPC"),
+					resource.TestCheckResourceAttr(
+						resourceName, "peering", "FOR_SELF"),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"name", "network", "labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccNetworkConnectivityInternalRange_networkConnectivityInternalRangesIPv6Example_full(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_network_connectivity_internal_range" "default" {
+  name    = "basic%{random_suffix}"
+  description = "Test internal range IPv6"
+  network = google_compute_network.default.name
+  ip_cidr_range = "1234:0:1:1::/64"
+  usage   = "EXTERNAL_TO_VPC"
+  peering = "FOR_SELF"
+}
+
+resource "google_compute_network" "default" {
+  name                    = "tf-test-internal-ranges%{random_suffix}"
+  auto_create_subnetworks = false
+}
+`, context)
+}

website/docs/r/network_connectivity_internal_range.html.markdown

@@ -225,11 +225,15 @@ The following arguments are supported:
 * `ip_cidr_range` -
   (Optional)
   The IP range that this internal range defines.
+  NOTE: IPv6 ranges are limited to usage=EXTERNAL_TO_VPC and peering=FOR_SELF
+  NOTE: For IPv6 Ranges this field is compulsory, i.e. the address range must be specified explicitly.
 
 * `prefix_length` -
   (Optional)
   An alternate to ipCidrRange. Can be set when trying to create a reservation that automatically finds a free range of the given size.
   If both ipCidrRange and prefixLength are set, there is an error if the range sizes do not match. Can also be used during updates to change the range size.
+  NOTE: For IPv6 this field only works if ip_cidr_range is set as well, and both fields must match. In other words, with IPv6 this field only works as
+  a redundant parameter.
 
 * `target_cidr_range` -
   (Optional)