Add support for domainNames to Service Attachment (#6003) (#11702)

Co-authored-by: Shuya Ma <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Shuya Ma <[email protected]>

Author: modular-magician

.changelog/6003.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added support for `domain_names` attribute in `google_compute_service_attachment`
+```

google/resource_clouddeploy_delivery_pipeline_generated_test.go

@@ -114,9 +114,9 @@ resource "google_clouddeploy_delivery_pipeline" "primary" {
   description = "updated description"
 
   labels = {
-    my_third_label = "example-label-3"
-
     my_second_label = "updated-example-label-2"
+
+    my_third_label = "example-label-3"
   }
 
   project = "%{project_name}"

google/resource_clouddeploy_target_generated_test.go

@@ -91,9 +91,9 @@ resource "google_clouddeploy_target" "primary" {
   name     = "tf-test-target%{random_suffix}"
 
   annotations = {
-    my_second_annotation = "example-annotation-2"
-
     my_first_annotation = "example-annotation-1"
+
+    my_second_annotation = "example-annotation-2"
   }
 
   description = "basic description"
@@ -175,9 +175,9 @@ resource "google_clouddeploy_target" "primary" {
   }
 
   labels = {
-    my_third_label = "example-label-3"
-
     my_second_label = "updated-example-label-2"
+
+    my_third_label = "example-label-3"
   }
 
   project          = "%{project_name}"

google/resource_compute_service_attachment.go

@@ -118,6 +118,18 @@ attachment.`,
 				Optional:    true,
 				Description: `An optional description of this resource.`,
 			},
+			"domain_names": {
+				Type:     schema.TypeList,
+				Optional: true,
+				ForceNew: true,
+				Description: `If specified, the domain name will be used during the integration between
+the PSC connected endpoints and the Cloud DNS. For example, this is a
+valid domain name: "p.mycompany.com.". Current max number of domain names
+supported is 1.`,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"region": {
 				Type:             schema.TypeString,
 				Computed:         true,
@@ -218,6 +230,12 @@ func resourceComputeServiceAttachmentCreate(d *schema.ResourceData, meta interfa
 	} else if v, ok := d.GetOkExists("enable_proxy_protocol"); !isEmptyValue(reflect.ValueOf(enableProxyProtocolProp)) && (ok || !reflect.DeepEqual(v, enableProxyProtocolProp)) {
 		obj["enableProxyProtocol"] = enableProxyProtocolProp
 	}
+	domainNamesProp, err := expandComputeServiceAttachmentDomainNames(d.Get("domain_names"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("domain_names"); !isEmptyValue(reflect.ValueOf(domainNamesProp)) && (ok || !reflect.DeepEqual(v, domainNamesProp)) {
+		obj["domainNames"] = domainNamesProp
+	}
 	consumerRejectListsProp, err := expandComputeServiceAttachmentConsumerRejectLists(d.Get("consumer_reject_lists"), d, config)
 	if err != nil {
 		return err
@@ -341,6 +359,9 @@ func resourceComputeServiceAttachmentRead(d *schema.ResourceData, meta interface
 	if err := d.Set("enable_proxy_protocol", flattenComputeServiceAttachmentEnableProxyProtocol(res["enableProxyProtocol"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ServiceAttachment: %s", err)
 	}
+	if err := d.Set("domain_names", flattenComputeServiceAttachmentDomainNames(res["domainNames"], d, config)); err != nil {
+		return fmt.Errorf("Error reading ServiceAttachment: %s", err)
+	}
 	if err := d.Set("consumer_reject_lists", flattenComputeServiceAttachmentConsumerRejectLists(res["consumerRejectLists"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ServiceAttachment: %s", err)
 	}
@@ -573,6 +594,10 @@ func flattenComputeServiceAttachmentEnableProxyProtocol(v interface{}, d *schema
 	return v
 }
 
+func flattenComputeServiceAttachmentDomainNames(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenComputeServiceAttachmentConsumerRejectLists(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -668,6 +693,10 @@ func expandComputeServiceAttachmentEnableProxyProtocol(v interface{}, d Terrafor
 	return v, nil
 }
 
+func expandComputeServiceAttachmentDomainNames(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandComputeServiceAttachmentConsumerRejectLists(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

google/resource_compute_service_attachment_generated_test.go

@@ -55,6 +55,7 @@ resource "google_compute_service_attachment" "psc_ilb_service_attachment" {
   region      = "us-west2"
   description = "A service attachment configured with Terraform"
 
+  domain_names             = ["gcp.tfacc.hashicorptest.com."]
   enable_proxy_protocol    = true
   connection_preference    = "ACCEPT_AUTOMATIC"
   nat_subnets              = [google_compute_subnetwork.psc_ilb_nat.id]
@@ -163,6 +164,7 @@ resource "google_compute_service_attachment" "psc_ilb_service_attachment" {
   region      = "us-west2"
   description = "A service attachment configured with Terraform"
 
+  domain_names             = ["gcp.tfacc.hashicorptest.com."]
   enable_proxy_protocol    = true
   connection_preference    = "ACCEPT_MANUAL"
   nat_subnets              = [google_compute_subnetwork.psc_ilb_nat.id]

website/docs/r/compute_service_attachment.html.markdown

@@ -45,6 +45,7 @@ resource "google_compute_service_attachment" "psc_ilb_service_attachment" {
   region      = "us-west2"
   description = "A service attachment configured with Terraform"
 
+  domain_names             = ["gcp.tfacc.hashicorptest.com."]
   enable_proxy_protocol    = true
   connection_preference    = "ACCEPT_AUTOMATIC"
   nat_subnets              = [google_compute_subnetwork.psc_ilb_nat.id]
@@ -133,6 +134,7 @@ resource "google_compute_service_attachment" "psc_ilb_service_attachment" {
   region      = "us-west2"
   description = "A service attachment configured with Terraform"
 
+  domain_names             = ["gcp.tfacc.hashicorptest.com."]
   enable_proxy_protocol    = true
   connection_preference    = "ACCEPT_MANUAL"
   nat_subnets              = [google_compute_subnetwork.psc_ilb_nat.id]
@@ -258,6 +260,13 @@ The following arguments are supported:
   (Optional)
   An optional description of this resource.
 
+* `domain_names` -
+  (Optional)
+  If specified, the domain name will be used during the integration between
+  the PSC connected endpoints and the Cloud DNS. For example, this is a
+  valid domain name: "p.mycompany.com.". Current max number of domain names
+  supported is 1.
+
 * `consumer_reject_lists` -
   (Optional)
   An array of projects that are not allowed to connect to this service