Add terraform support for InterconnectGroup and InterconnectAttachmentGroup resources (#13870) (#10136)

[upstream:5c634d78d4a11421e7065d9d28ad8b3a7d837bc7]

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

Author: modular-magician

.changelog/13870.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+`google_compute_interconnect_group`
+```
+
+```release-note:new-resource
+`google_compute_interconnect_attachment_group`
+```

google-beta/provider/provider_mmv1_resources.go

@@ -587,9 +587,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 669
+// Generated resources: 671
 // Generated IAM resources: 339
-// Total generated resources: 1008
+// Total generated resources: 1010
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                                     accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                               accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -870,6 +870,8 @@ var generatedResources = map[string]*schema.Resource{
 	"google_compute_instant_snapshot_iam_policy":                                 tpgiamresource.ResourceIamPolicy(compute.ComputeInstantSnapshotIamSchema, compute.ComputeInstantSnapshotIamUpdaterProducer, compute.ComputeInstantSnapshotIdParseFunc),
 	"google_compute_interconnect":                                                compute.ResourceComputeInterconnect(),
 	"google_compute_interconnect_attachment":                                     compute.ResourceComputeInterconnectAttachment(),
+	"google_compute_interconnect_attachment_group":                               compute.ResourceComputeInterconnectAttachmentGroup(),
+	"google_compute_interconnect_group":                                          compute.ResourceComputeInterconnectGroup(),
 	"google_compute_machine_image":                                               compute.ResourceComputeMachineImage(),
 	"google_compute_machine_image_iam_binding":                                   tpgiamresource.ResourceIamBinding(compute.ComputeMachineImageIamSchema, compute.ComputeMachineImageIamUpdaterProducer, compute.ComputeMachineImageIdParseFunc),
 	"google_compute_machine_image_iam_member":                                    tpgiamresource.ResourceIamMember(compute.ComputeMachineImageIamSchema, compute.ComputeMachineImageIamUpdaterProducer, compute.ComputeMachineImageIdParseFunc),

google-beta/services/compute/resource_compute_interconnect.go

@@ -371,6 +371,16 @@ backend connectivity issues.`,
 					Type: schema.TypeString,
 				},
 			},
+			"interconnect_groups": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Description: `URLs of InterconnectGroups that include this Interconnect.
+Order is arbitrary and items are unique.`,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Set: schema.HashString,
+			},
 			"label_fingerprint": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -775,6 +785,9 @@ func resourceComputeInterconnectRead(d *schema.ResourceData, meta interface{}) e
 	if err := d.Set("available_features", flattenComputeInterconnectAvailableFeatures(res["availableFeatures"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Interconnect: %s", err)
 	}
+	if err := d.Set("interconnect_groups", flattenComputeInterconnectInterconnectGroups(res["interconnectGroups"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Interconnect: %s", err)
+	}
 	if err := d.Set("terraform_labels", flattenComputeInterconnectTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Interconnect: %s", err)
 	}
@@ -1280,6 +1293,13 @@ func flattenComputeInterconnectAvailableFeatures(v interface{}, d *schema.Resour
 	return v
 }
 
+func flattenComputeInterconnectInterconnectGroups(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return v
+	}
+	return schema.NewSet(schema.HashString, v.([]interface{}))
+}
+
 func flattenComputeInterconnectTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v

google-beta/services/compute/resource_compute_interconnect_attachment.go

@@ -291,6 +291,11 @@ DEDICATED. Possible values: ["DEDICATED", "PARTNER", "PARTNER_PROVIDER"]`,
 				Description: `The IEEE 802.1Q VLAN tag for this attachment, in the range 2-4094. When
 using PARTNER type this will be managed upstream.`,
 			},
+			"attachment_group": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `URL of the AttachmentGroup that includes this Attachment.`,
+			},
 			"cloud_router_ip_address": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -788,6 +793,9 @@ func resourceComputeInterconnectAttachmentRead(d *schema.ResourceData, meta inte
 	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("attachment_group", flattenComputeInterconnectAttachmentAttachmentGroup(res["attachmentGroup"], 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)
 	}
@@ -1213,6 +1221,10 @@ func flattenComputeInterconnectAttachmentCandidateCustomerRouterIpv6Address(v in
 	return v
 }
 
+func flattenComputeInterconnectAttachmentAttachmentGroup(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

google-beta/services/compute/resource_compute_interconnect_attachment_generated_meta.yaml

@@ -6,6 +6,7 @@ api_version: 'beta'
 api_resource_type_kind: 'InterconnectAttachment'
 fields:
   - field: 'admin_enabled'
+  - field: 'attachment_group'
   - field: 'bandwidth'
   - field: 'candidate_cloud_router_ip_address'
   - field: 'candidate_cloud_router_ipv6_address'