Add the subnetLength field to the InterconnectAttachment resource (#10722) (#18187)

[upstream:c4ee9b0b5179102785d20a53daa89bc75c8990c5]

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

Author: modular-magician

google/services/compute/resource_compute_interconnect_attachment.go

@@ -154,11 +154,9 @@ domain. If not specified, the value will default to AVAILABILITY_DOMAIN_ANY.`,
 				Description: `Indicates the user-supplied encryption option of this interconnect
 attachment. Can only be specified at attachment creation for PARTNER or
 DEDICATED attachments.
-
 * NONE - This is the default value, which means that the VLAN attachment
 carries unencrypted traffic. VMs are able to send traffic to, or receive
 traffic from, such a VLAN attachment.
-
 * IPSEC - The VLAN attachment carries only encrypted traffic that is
 encrypted by an IPsec device, such as an HA VPN gateway or third-party
 IPsec VPN. VMs cannot directly send traffic to, or receive traffic from,
@@ -182,17 +180,14 @@ be set if type is PARTNER.`,
 				Description: `URL of addresses that have been reserved for the interconnect attachment,
 Used only for interconnect attachment that has the encryption option as
 IPSEC.
-
 The addresses must be RFC 1918 IP address ranges. When creating HA VPN
 gateway over the interconnect attachment, if the attachment is configured
 to use an RFC 1918 IP address, then the VPN gateway's IP address will be
 allocated from the IP address range specified here.
-
 For example, if the HA VPN gateway's interface 0 is paired to this
 interconnect attachment, then an RFC 1918 IP address for the VPN gateway
 interface 0 will be allocated from the IP address specified for this
 interconnect attachment.
-
 If this field is not specified for interconnect attachment that has
 encryption option as IPSEC, later on when creating HA VPN gateway on this
 interconnect attachment, the HA VPN gateway's IP address will be
@@ -223,9 +218,19 @@ this interconnect attachment. Currently, only 1440 and 1500 are allowed. If not
 				ValidateFunc: verify.ValidateEnum([]string{"IPV4_IPV6", "IPV4_ONLY", ""}),
 				Description: `The stack type for this interconnect attachment to identify whether the IPv6
 feature is enabled or not. If not specified, IPV4_ONLY will be used.
-
 This field can be both set at interconnect attachments creation and update
 interconnect attachment operations. Possible values: ["IPV4_IPV6", "IPV4_ONLY"]`,
+			},
+			"subnet_length": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				ForceNew: true,
+				Description: `Length of the IPv4 subnet mask. Allowed values: 29 (default), 30. The default value is 29,
+except for Cross-Cloud Interconnect connections that use an InterconnectRemoteLocation with a
+constraints.subnetLengthRange.min equal to 30. For example, connections that use an Azure
+remote location fall into this category. In these cases, the default value is 30, and
+requesting 29 returns an error. Where both 29 and 30 are allowed, 29 is preferred, because it
+gives Google Cloud Support more debugging visibility.`,
 			},
 			"type": {
 				Type:         schema.TypeString,
@@ -421,6 +426,12 @@ func resourceComputeInterconnectAttachmentCreate(d *schema.ResourceData, meta in
 	} else if v, ok := d.GetOkExists("stack_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(stackTypeProp)) && (ok || !reflect.DeepEqual(v, stackTypeProp)) {
 		obj["stackType"] = stackTypeProp
 	}
+	subnetLengthProp, err := expandComputeInterconnectAttachmentSubnetLength(d.Get("subnet_length"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("subnet_length"); !tpgresource.IsEmptyValue(reflect.ValueOf(subnetLengthProp)) && (ok || !reflect.DeepEqual(v, subnetLengthProp)) {
+		obj["subnetLength"] = subnetLengthProp
+	}
 	regionProp, err := expandComputeInterconnectAttachmentRegion(d.Get("region"), d, config)
 	if err != nil {
 		return err
@@ -1007,6 +1018,10 @@ func expandComputeInterconnectAttachmentStackType(v interface{}, d tpgresource.T
 	return v, nil
 }
 
+func expandComputeInterconnectAttachmentSubnetLength(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandComputeInterconnectAttachmentRegion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	f, err := tpgresource.ParseGlobalFieldValue("regions", v.(string), "project", d, config, true)
 	if err != nil {

google/services/compute/resource_compute_interconnect_attachment_generated_test.go

@@ -49,7 +49,7 @@ func TestAccComputeInterconnectAttachment_interconnectAttachmentBasicExample(t *
 				ResourceName:            "google_compute_interconnect_attachment.on_prem",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"candidate_subnets", "region", "router"},
+				ImportStateVerifyIgnore: []string{"candidate_subnets", "region", "router", "subnet_length"},
 			},
 		},
 	})
@@ -80,6 +80,72 @@ resource "google_compute_network" "foobar" {
 `, context)
 }
 
+func TestAccComputeInterconnectAttachment_interconnectAttachmentDedicatedExample(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:             testAccCheckComputeInterconnectAttachmentDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeInterconnectAttachment_interconnectAttachmentDedicatedExample(context),
+			},
+			{
+				ResourceName:            "google_compute_interconnect_attachment.on_prem",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"candidate_subnets", "region", "router", "subnet_length"},
+			},
+		},
+	})
+}
+
+func testAccComputeInterconnectAttachment_interconnectAttachmentDedicatedExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+data "google_project" "project" {}
+
+resource "google_compute_interconnect" "foobar" {
+  name                 = "tf-test-interconenct-1%{random_suffix}"
+  customer_name        = "internal_customer" # Special customer only available for Google testing.
+  interconnect_type    = "IT_PRIVATE"        # Special type only available for Google testing.
+  link_type            = "LINK_TYPE_ETHERNET_10G_LR"
+  requested_link_count = 1
+  location             = "https://www.googleapis.com/compute/v1/projects/${data.google_project.project.name}/global/interconnectLocations/z2z-us-east4-zone1-lciadl-a" # Special location only available for Google testing.
+}
+
+resource "google_compute_interconnect_attachment" "on_prem" {
+  name                     = "tf-test-on-prem-attachment%{random_suffix}"
+  type                     = "DEDICATED"
+  interconnect             = google_compute_interconnect.foobar.id
+  router                   = google_compute_router.foobar.id
+  mtu                      = 1500
+  subnet_length            = 29
+  vlan_tag8021q            = 1000
+  region                   = "https://www.googleapis.com/compute/v1/projects/${data.google_project.project.name}/regions/us-east4"
+  stack_type               = "IPV4_ONLY"
+}
+
+resource "google_compute_router" "foobar" {
+  name    = "tf-test-router-1%{random_suffix}"
+  network = google_compute_network.foobar.name
+  region  = "us-east4"
+  bgp {
+    asn = 16550
+  }
+}
+
+resource "google_compute_network" "foobar" {
+  name                    = "tf-test-network-1%{random_suffix}"
+  auto_create_subnetworks = false
+}
+`, context)
+}
+
 func TestAccComputeInterconnectAttachment_computeInterconnectAttachmentIpsecEncryptionExample(t *testing.T) {
 	t.Parallel()
 
@@ -99,7 +165,7 @@ func TestAccComputeInterconnectAttachment_computeInterconnectAttachmentIpsecEncr
 				ResourceName:            "google_compute_interconnect_attachment.ipsec-encrypted-interconnect-attachment",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"candidate_subnets", "region", "router"},
+				ImportStateVerifyIgnore: []string{"candidate_subnets", "region", "router", "subnet_length"},
 			},
 		},
 	})

website/docs/r/compute_interconnect_attachment.html.markdown

@@ -224,6 +224,15 @@ The following arguments are supported:
   interconnect attachment operations.
   Possible values are: `IPV4_IPV6`, `IPV4_ONLY`.
 
+* `subnet_length` -
+  (Optional)
+  Length of the IPv4 subnet mask. Allowed values: 29 (default), 30. The default value is 29,
+  except for Cross-Cloud Interconnect connections that use an InterconnectRemoteLocation with a
+  constraints.subnetLengthRange.min equal to 30. For example, connections that use an Azure
+  remote location fall into this category. In these cases, the default value is 30, and
+  requesting 29 returns an error. Where both 29 and 30 are allowed, 29 is preferred, because it
+  gives Google Cloud Support more debugging visibility.
+
 * `region` -
   (Optional)
   Region where the regional interconnect attachment resides.