Add fields for custom ranges for interconnect attachment (#14106) (#10092)

modular-magician · web-flow · commit cf185d9a1150 · 2025-05-27T11:06:49.000-07:00
[upstream:844aac8472ba65afa501f62815a12e52882f9ef5]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/14106.txt b/.changelog/14106.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added `candidate_cloud_router_ip_address`, `candidate_customer_router_ip_address`, `candidate_cloud_router_ipv6_address`, and `candidate_customer_router_ipv6_address` fields to `google_compute_interconnect_attachment` resource (beta)
+```
diff --git a/google-beta/services/compute/resource_compute_interconnect_attachment.go b/google-beta/services/compute/resource_compute_interconnect_attachment.go
@@ -116,6 +116,34 @@ For attachments of type DEDICATED, the user can set the bandwidth.
 For attachments of type PARTNER, the Google Partner that is operating the interconnect must set the bandwidth.
 Output only for PARTNER type, mutable for PARTNER_PROVIDER and DEDICATED,
 Defaults to BPS_10G Possible values: ["BPS_50M", "BPS_100M", "BPS_200M", "BPS_300M", "BPS_400M", "BPS_500M", "BPS_1G", "BPS_2G", "BPS_5G", "BPS_10G", "BPS_20G", "BPS_50G", "BPS_100G"]`,
+			},
+			"candidate_cloud_router_ip_address": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Description: `Single IPv4 address + prefix length to be configured on the cloud router interface for this
+interconnect attachment. Example: 203.0.113.1/29`,
+			},
+			"candidate_cloud_router_ipv6_address": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Description: `Single IPv6 address + prefix length to be configured on the cloud router interface for this
+interconnect attachment. Example: 2001:db8::1/125`,
+			},
+			"candidate_customer_router_ip_address": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Description: `Single IPv4 address + prefix length to be configured on the customer router interface for this
+interconnect attachment. Example: 203.0.113.2/29`,
+			},
+			"candidate_customer_router_ipv6_address": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Description: `Single IPv6 address + prefix length to be configured on the customer router interface for this
+interconnect attachment. Example: 2001:db8::2/125`,
 			},
 			"candidate_subnets": {
 				Type:     schema.TypeList,
@@ -474,6 +502,30 @@ func resourceComputeInterconnectAttachmentCreate(d *schema.ResourceData, meta in
 	} else if v, ok := d.GetOkExists("label_fingerprint"); !tpgresource.IsEmptyValue(reflect.ValueOf(labelFingerprintProp)) && (ok || !reflect.DeepEqual(v, labelFingerprintProp)) {
 		obj["labelFingerprint"] = labelFingerprintProp
 	}
+	candidateCloudRouterIpAddressProp, err := expandComputeInterconnectAttachmentCandidateCloudRouterIpAddress(d.Get("candidate_cloud_router_ip_address"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("candidate_cloud_router_ip_address"); !tpgresource.IsEmptyValue(reflect.ValueOf(candidateCloudRouterIpAddressProp)) && (ok || !reflect.DeepEqual(v, candidateCloudRouterIpAddressProp)) {
+		obj["candidateCloudRouterIpAddress"] = candidateCloudRouterIpAddressProp
+	}
+	candidateCustomerRouterIpAddressProp, err := expandComputeInterconnectAttachmentCandidateCustomerRouterIpAddress(d.Get("candidate_customer_router_ip_address"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("candidate_customer_router_ip_address"); !tpgresource.IsEmptyValue(reflect.ValueOf(candidateCustomerRouterIpAddressProp)) && (ok || !reflect.DeepEqual(v, candidateCustomerRouterIpAddressProp)) {
+		obj["candidateCustomerRouterIpAddress"] = candidateCustomerRouterIpAddressProp
+	}
+	candidateCloudRouterIpv6AddressProp, err := expandComputeInterconnectAttachmentCandidateCloudRouterIpv6Address(d.Get("candidate_cloud_router_ipv6_address"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("candidate_cloud_router_ipv6_address"); !tpgresource.IsEmptyValue(reflect.ValueOf(candidateCloudRouterIpv6AddressProp)) && (ok || !reflect.DeepEqual(v, candidateCloudRouterIpv6AddressProp)) {
+		obj["candidateCloudRouterIpv6Address"] = candidateCloudRouterIpv6AddressProp
+	}
+	candidateCustomerRouterIpv6AddressProp, err := expandComputeInterconnectAttachmentCandidateCustomerRouterIpv6Address(d.Get("candidate_customer_router_ipv6_address"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("candidate_customer_router_ipv6_address"); !tpgresource.IsEmptyValue(reflect.ValueOf(candidateCustomerRouterIpv6AddressProp)) && (ok || !reflect.DeepEqual(v, candidateCustomerRouterIpv6AddressProp)) {
+		obj["candidateCustomerRouterIpv6Address"] = candidateCustomerRouterIpv6AddressProp
+	}
 	labelsProp, err := expandComputeInterconnectAttachmentEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -724,6 +776,18 @@ func resourceComputeInterconnectAttachmentRead(d *schema.ResourceData, meta inte
 	if err := d.Set("label_fingerprint", flattenComputeInterconnectAttachmentLabelFingerprint(res["labelFingerprint"], d, config)); err != nil {
 		return fmt.Errorf("Error reading InterconnectAttachment: %s", err)
 	}
+	if err := d.Set("candidate_cloud_router_ip_address", flattenComputeInterconnectAttachmentCandidateCloudRouterIpAddress(res["candidateCloudRouterIpAddress"], d, config)); err != nil {
+		return fmt.Errorf("Error reading InterconnectAttachment: %s", err)
+	}
+	if err := d.Set("candidate_customer_router_ip_address", flattenComputeInterconnectAttachmentCandidateCustomerRouterIpAddress(res["candidateCustomerRouterIpAddress"], d, config)); err != nil {
+		return fmt.Errorf("Error reading InterconnectAttachment: %s", err)
+	}
+	if err := d.Set("candidate_cloud_router_ipv6_address", flattenComputeInterconnectAttachmentCandidateCloudRouterIpv6Address(res["candidateCloudRouterIpv6Address"], d, config)); err != nil {
+		return fmt.Errorf("Error reading InterconnectAttachment: %s", err)
+	}
+	if err := d.Set("candidate_customer_router_ipv6_address", flattenComputeInterconnectAttachmentCandidateCustomerRouterIpv6Address(res["candidateCustomerRouterIpv6Address"], d, config)); err != nil {
+		return fmt.Errorf("Error reading InterconnectAttachment: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenComputeInterconnectAttachmentTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading InterconnectAttachment: %s", err)
 	}
@@ -1133,6 +1197,22 @@ func flattenComputeInterconnectAttachmentLabelFingerprint(v interface{}, d *sche
 	return v
 }
 
+func flattenComputeInterconnectAttachmentCandidateCloudRouterIpAddress(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenComputeInterconnectAttachmentCandidateCustomerRouterIpAddress(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenComputeInterconnectAttachmentCandidateCloudRouterIpv6Address(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenComputeInterconnectAttachmentCandidateCustomerRouterIpv6Address(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenComputeInterconnectAttachmentTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -1239,6 +1319,22 @@ func expandComputeInterconnectAttachmentLabelFingerprint(v interface{}, d tpgres
 	return v, nil
 }
 
+func expandComputeInterconnectAttachmentCandidateCloudRouterIpAddress(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandComputeInterconnectAttachmentCandidateCustomerRouterIpAddress(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandComputeInterconnectAttachmentCandidateCloudRouterIpv6Address(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandComputeInterconnectAttachmentCandidateCustomerRouterIpv6Address(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandComputeInterconnectAttachmentEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil
diff --git a/google-beta/services/compute/resource_compute_interconnect_attachment_generated_meta.yaml b/google-beta/services/compute/resource_compute_interconnect_attachment_generated_meta.yaml
@@ -7,6 +7,10 @@ api_resource_type_kind: 'InterconnectAttachment'
 fields:
   - field: 'admin_enabled'
   - field: 'bandwidth'
+  - field: 'candidate_cloud_router_ip_address'
+  - field: 'candidate_cloud_router_ipv6_address'
+  - field: 'candidate_customer_router_ip_address'
+  - field: 'candidate_customer_router_ipv6_address'
   - field: 'candidate_subnets'
   - field: 'cloud_router_ip_address'
   - field: 'cloud_router_ipv6_address'
diff --git a/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go b/google-beta/services/compute/resource_compute_interconnect_attachment_generated_test.go
@@ -211,6 +211,65 @@ resource "google_compute_network" "network" {
 `, context)
 }
 
+func TestAccComputeInterconnectAttachment_computeInterconnectAttachmentCustomRangesExample(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.ProtoV5ProviderBetaFactories(t),
+		CheckDestroy:             testAccCheckComputeInterconnectAttachmentDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeInterconnectAttachment_computeInterconnectAttachmentCustomRangesExample(context),
+			},
+			{
+				ResourceName:            "google_compute_interconnect_attachment.custom-ranges-interconnect-attachment",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"candidate_subnets", "labels", "region", "router", "subnet_length", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccComputeInterconnectAttachment_computeInterconnectAttachmentCustomRangesExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_interconnect_attachment" "custom-ranges-interconnect-attachment" {
+  name                                   = "tf-test-test-custom-ranges-interconnect-attachment%{random_suffix}"
+  edge_availability_domain               = "AVAILABILITY_DOMAIN_1"
+  type                                   = "PARTNER"
+  router                                 = google_compute_router.foobar.id
+  mtu                                    = 1500
+  stack_type                             = "IPV4_IPV6"
+  labels                                 = { mykey = "myvalue" }
+  candidate_cloud_router_ip_address      = "192.169.0.1/29"
+  candidate_customer_router_ip_address   = "192.169.0.2/29"
+  candidate_cloud_router_ipv6_address    = "748d:2f23:6651:9455:828b:ca81:6fe0:fed1/125"
+  candidate_customer_router_ipv6_address = "748d:2f23:6651:9455:828b:ca81:6fe0:fed2/125"
+  provider                               = google-beta
+}
+
+resource "google_compute_router" "foobar" {
+  name     = "tf-test-test-router%{random_suffix}"
+  network  = google_compute_network.foobar.name
+  bgp {
+    asn = 16550
+  }
+  provider = google-beta
+}
+
+resource "google_compute_network" "foobar" {
+  name                    = "tf-test-test-network%{random_suffix}"
+  auto_create_subnetworks = false
+  provider                = google-beta
+}
+`, context)
+}
+
 func testAccCheckComputeInterconnectAttachmentDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {
diff --git a/website/docs/r/compute_interconnect_attachment.html.markdown b/website/docs/r/compute_interconnect_attachment.html.markdown
@@ -105,6 +105,45 @@ resource "google_compute_network" "network" {
   auto_create_subnetworks = false
 }
 ```
+<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.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=compute_interconnect_attachment_custom_ranges&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 - Compute Interconnect Attachment Custom Ranges
+
+
+```hcl
+resource "google_compute_interconnect_attachment" "custom-ranges-interconnect-attachment" {
+  name                                   = "test-custom-ranges-interconnect-attachment"
+  edge_availability_domain               = "AVAILABILITY_DOMAIN_1"
+  type                                   = "PARTNER"
+  router                                 = google_compute_router.foobar.id
+  mtu                                    = 1500
+  stack_type                             = "IPV4_IPV6"
+  labels                                 = { mykey = "myvalue" }
+  candidate_cloud_router_ip_address      = "192.169.0.1/29"
+  candidate_customer_router_ip_address   = "192.169.0.2/29"
+  candidate_cloud_router_ipv6_address    = "748d:2f23:6651:9455:828b:ca81:6fe0:fed1/125"
+  candidate_customer_router_ipv6_address = "748d:2f23:6651:9455:828b:ca81:6fe0:fed2/125"
+  provider                               = google-beta
+}
+
+resource "google_compute_router" "foobar" {
+  name     = "test-router"
+  network  = google_compute_network.foobar.name
+  bgp {
+    asn = 16550
+  }
+  provider = google-beta
+}
+
+resource "google_compute_network" "foobar" {
+  name                    = "test-network"
+  auto_create_subnetworks = false
+  provider                = google-beta
+}
+```
 
 ## Argument Reference
 
@@ -249,6 +288,26 @@ The following arguments are supported:
   **Note**: This field is non-authoritative, and will only manage the labels present in your configuration.
   Please refer to the field `effective_labels` for all of the labels present on the resource.
 
+* `candidate_cloud_router_ip_address` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  Single IPv4 address + prefix length to be configured on the cloud router interface for this
+  interconnect attachment. Example: 203.0.113.1/29
+
+* `candidate_customer_router_ip_address` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  Single IPv4 address + prefix length to be configured on the customer router interface for this
+  interconnect attachment. Example: 203.0.113.2/29
+
+* `candidate_cloud_router_ipv6_address` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  Single IPv6 address + prefix length to be configured on the cloud router interface for this
+  interconnect attachment. Example: 2001:db8::1/125
+
+* `candidate_customer_router_ipv6_address` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  Single IPv6 address + prefix length to be configured on the customer router interface for this
+  interconnect attachment. Example: 2001:db8::2/125
+
 * `region` -
   (Optional)
   Region where the regional interconnect attachment resides.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	+compute: added `candidate_cloud_router_ip_address`, `candidate_customer_router_ip_address`, `candidate_cloud_router_ipv6_address`, and `candidate_customer_router_ipv6_address` fields to `google_compute_interconnect_attachment` resource (beta)
	`3`	+```