Compute serviceattachment dcl

mmv1/products/compute/terraform.yaml

@@ -2505,6 +2505,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
   SecurityPolicy: !ruby/object:Overrides::Terraform::ResourceOverride
     exclude: true
   ServiceAttachment: !ruby/object:Overrides::Terraform::ResourceOverride
+    exclude: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "service_attachment_basic"

mmv1/third_party/terraform/utils/provider.go.erb

@@ -466,6 +466,7 @@ end     # products.each do
 				"google_compute_firewall_policy_association":   resourceComputeFirewallPolicyAssociation(),
 				"google_compute_firewall_policy":               resourceComputeFirewallPolicy(),
 				"google_compute_firewall_policy_rule":          resourceComputeFirewallPolicyRule(),
+				"google_compute_service_attachment":            resourceComputeServiceAttachment(),
 				"google_dataproc_workflow_template":            resourceDataprocWorkflowTemplate(),
 				"google_eventarc_trigger":                      resourceEventarcTrigger(),
 				<% unless version == 'ga' -%>

mmv1/third_party/terraform/utils/provider_test.go.erb

@@ -1064,7 +1064,7 @@ func initializeReleaseDiffTest(c resource.TestCase) resource.TestCase {
 				replacementSteps = append(replacementSteps, newStep)
 			}
 			replacementSteps = append(replacementSteps, testStep)
-		} else {
+		} else if !testStep.ImportStateVerify {
 			replacementSteps = append(replacementSteps, testStep)
 		}
 	}

tpgtools/overrides/compute/beta/firewall_policy_rule.yaml

@@ -1,4 +0,0 @@
-- type: DIFF_SUPPRESS_FUNC
-  field: target_resources
-  details:
-    diffsuppressfunc: compareSelfLinkOrResourceName

tpgtools/overrides/compute/beta/service_attachment.yaml

@@ -0,0 +1,12 @@
+- type: EXCLUDE
+  field: region
+- type: EXCLUDE
+  field: service_attachment_id
+- type: CUSTOM_NAME
+  details:
+    name: region
+  field: location
+- type: DIFF_SUPPRESS_FUNC
+  field: location
+  details:
+    diffsuppressfunc: compareSelfLinkOrResourceName

tpgtools/overrides/compute/firewall_policy_rule.yaml

@@ -1,4 +0,0 @@
-- type: DIFF_SUPPRESS_FUNC
-  field: target_resources
-  details:
-    diffsuppressfunc: compareSelfLinkOrResourceName

tpgtools/overrides/compute/samples/serviceattachment/basic.tf.tmpl

@@ -0,0 +1,78 @@
+resource "google_compute_service_attachment" "primary" {
+  name        = "{{my-psc-ilb}}"
+  region      = "{{region}}"
+  description = "A service attachment configured with Terraform"
+
+  enable_proxy_protocol    = true
+  connection_preference    = "ACCEPT_AUTOMATIC"
+  nat_subnets              = [google_compute_subnetwork.psc_ilb_nat.id]
+  target_service           = google_compute_forwarding_rule.psc_ilb_target_service.id
+}
+
+resource "google_compute_address" "psc_ilb_consumer_address" {
+  name   = "{{psc-ilb-consumer-address}}"
+  region = "{{region}}"
+
+  subnetwork   = "default"
+  address_type = "INTERNAL"
+}
+
+resource "google_compute_forwarding_rule" "psc_ilb_consumer" {
+  name   = "{{psc-ilb-consumer-forwarding-rule}}"
+  region = "{{region}}"
+
+  target                = google_compute_service_attachment.primary.id
+  load_balancing_scheme = "" # need to override EXTERNAL default when target is a service attachment
+  network               = "default"
+  ip_address            = google_compute_address.psc_ilb_consumer_address.id
+}
+
+resource "google_compute_forwarding_rule" "psc_ilb_target_service" {
+  name   = "{{producer-forwarding-rule}}"
+  region = "{{region}}"
+
+  load_balancing_scheme = "INTERNAL"
+  backend_service       = google_compute_region_backend_service.producer_service_backend.id
+  all_ports             = true
+  network               = google_compute_network.psc_ilb_network.name
+  subnetwork            = google_compute_subnetwork.psc_ilb_producer_subnetwork.name
+}
+
+resource "google_compute_region_backend_service" "producer_service_backend" {
+  name   = "{{producer-service}}"
+  region = "{{region}}"
+
+  health_checks = [google_compute_health_check.producer_service_health_check.id]
+}
+
+resource "google_compute_health_check" "producer_service_health_check" {
+  name = "{{producer-service-health-check}}"
+
+  check_interval_sec = 1
+  timeout_sec        = 1
+  tcp_health_check {
+    port = "80"
+  }
+}
+
+resource "google_compute_network" "psc_ilb_network" {
+  name = "{{psc-ilb-network}}"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_subnetwork" "psc_ilb_producer_subnetwork" {
+  name   = "{{psc-ilb-producer-subnetwork}}"
+  region = "{{region}}"
+
+  network       = google_compute_network.psc_ilb_network.id
+  ip_cidr_range = "10.0.0.0/16"
+}
+
+resource "google_compute_subnetwork" "psc_ilb_nat" {
+  name   = "{{psc-ilb-nat}}"
+  region = "{{region}}"
+
+  network       = google_compute_network.psc_ilb_network.id
+  purpose       =  "PRIVATE_SERVICE_CONNECT"
+  ip_cidr_range = "10.1.0.0/16"
+}

tpgtools/overrides/compute/samples/serviceattachment/basic.yaml

@@ -0,0 +1,24 @@
+# optional test level config -- needed for updates consumer_lists.tf.tmpl def
+updates:
+- resource: ./basic_update.tf.tmpl
+variables:
+  - name: "region"
+    type: "region"
+  - name: "my-psc-ilb"
+    type: "resource_name"
+  - name: "psc-ilb-consumer-address"
+    type: "resource_name"
+  - name: "psc-ilb-consumer-forwarding-rule"
+    type: "resource_name"
+  - name: "producer-forwarding-rule"
+    type: "resource_name"
+  - name: "producer-service"
+    type: "resource_name"
+  - name: "producer-service-health-check"
+    type: "resource_name"
+  - name: "psc-ilb-network"
+    type: "resource_name"
+  - name: "psc-ilb-producer-subnetwork"
+    type: "resource_name"
+  - name: "psc-ilb-nat"
+    type: "resource_name"