Revert "Reimplemented compute service attachment using the DCL (Googl…

…eCloudPlatform#5342)" (GoogleCloudPlatform#5442)

mmv1/products/compute/terraform.yaml

@@ -2431,7 +2431,6 @@ 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/tests/resource_compute_service_attachment_test.go

@@ -25,7 +25,7 @@ func TestAccComputeServiceAttachment_serviceAttachmentBasicExampleUpdate(t *test
 				ResourceName:            "google_compute_service_attachment.psc_ilb_service_attachment",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"target_service", "region", "nat_subnets.0"},
+				ImportStateVerifyIgnore: []string{"target_service", "region"},
 			},
 			{
 				Config: testAccComputeServiceAttachment_serviceAttachmentBasicExampleUpdate(context),
@@ -34,7 +34,7 @@ func TestAccComputeServiceAttachment_serviceAttachmentBasicExampleUpdate(t *test
 				ResourceName:            "google_compute_service_attachment.psc_ilb_service_attachment",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"target_service", "region", "nat_subnets.0"},
+				ImportStateVerifyIgnore: []string{"target_service", "region"},
 			},
 		},
 	})

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

@@ -462,7 +462,6 @@ 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

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

mmv1/third_party/terraform/utils/self_link_helpers.go

@@ -53,17 +53,6 @@ func compareSelfLinkOrResourceName(_, old, new string, _ *schema.ResourceData) b
 	return compareSelfLinkRelativePaths("", old, new, nil)
 }
 
-// compareSelfLinkOrResourceNameList checks if two elements of lists of resources are the same resource
-//
-// Use this method when the field accepts either a name or a self_link referencing a resource.
-// The value we store (i.e. `old` in this method), must be a self_link.
-func compareSelfLinkOrResourceNameList(k, old, new string, _ *schema.ResourceData) bool {
-	if strings.HasSuffix(k, ".#") {
-		return new == old
-	}
-	return compareSelfLinkOrResourceName("", old, new, nil)
-}
-
 // Hash the relative path of a self link.
 func selfLinkRelativePathHash(selfLink interface{}) int {
 	path, _ := getRelativePath(selfLink.(string))

tpgtools/property.go

@@ -392,25 +392,13 @@ func getSchemaExtensionMap(v interface{}) map[interface{}]interface{} {
 }
 
 func (p Property) DefaultDiffSuppress() *string {
-	if p.Computed {
-		return nil
-	}
 	switch p.Type.String() {
 	case SchemaTypeString:
+		// Field is reference to another resource
 		if _, ok := p.typ.Extension["x-dcl-references"]; ok {
-			// Field is reference to another resource.
 			dsf := "compareSelfLinkOrResourceName"
 			return &dsf
 		}
-	case SchemaTypeList:
-		if p.typ.Items == nil || len(p.typ.Items.Extension) == 0 {
-			return nil
-		}
-		if _, ok := p.typ.Items.Extension["x-dcl-references"]; ok {
-			// Field is reference to another resource.
-			dsf := "compareSelfLinkOrResourceNameList"
-			return &dsf
-		}
 	}
 	return nil
 }

tpgtools/sample.go

@@ -213,7 +213,7 @@ func (s Sample) ReplaceReferences(d *Dependency) error {
 		var tfReference string
 		for _, dep := range s.DependencyList {
 			if dep.FileName == referenceFileName {
-				tfReference = dep.TerraformResourceType + "." + dep.HCLLocalName + "." + jsonToSnakeCase(idField)
+				tfReference = dep.TerraformResourceType + "." + dep.HCLLocalName + "." + idField
 				break
 			}
 		}