tgc: check both old and new TGC compilers (#15465)

Author: zli82016

mmv1/api/type.go

@@ -548,7 +548,7 @@ func (t *Type) GetPrefix() string {
 		if t.ParentMetadata == nil {
 			nestedPrefix := ""
 			// TODO: Use the nestedPrefix for tgc provider to be consistent with terraform provider
-			if t.ResourceMetadata.NestedQuery != nil && t.ResourceMetadata.Compiler != "terraformgoogleconversion-codegen" {
+			if t.ResourceMetadata.NestedQuery != nil && !strings.Contains(t.ResourceMetadata.Compiler, "terraformgoogleconversion") {
 				nestedPrefix = "Nested"
 			}
 

mmv1/templates/terraform/constants/agent_pool.go.tmpl

@@ -1,4 +1,4 @@
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 // waitForAgentPoolReady waits for an agent pool to leave the
 // "CREATING" state and become "CREATED", to indicate that it's ready.
 func waitForAgentPoolReady(d *schema.ResourceData, config *transport_tpg.Config, timeout time.Duration) error {

mmv1/templates/terraform/constants/apigee_nat_address.go.tmpl

@@ -1,4 +1,4 @@
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 // waitForNatAddressReady waits for an NatAddress to leave the
 // "CREATING" state and become "RESERVED", to indicate that it's ready.
 func waitForNatAddressReserved(d *schema.ResourceData, config *transport_tpg.Config, timeout time.Duration) error {

mmv1/templates/terraform/constants/bigquery_data_transfer.go.tmpl

@@ -10,7 +10,7 @@ func sensitiveParamCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v
 		}
 	}
 
-	{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+	{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 	for _, sp := range sensitiveWoParams {
 		mapLabel := diff.Get("params." + sp[:len(sp)-3]).(string)
 		authLabel, _ := diff.GetRawConfigAt(cty.GetAttrPath("sensitive_params").IndexInt(0).GetAttr(sp))

mmv1/templates/terraform/constants/clouddomains_registration.go.tmpl

@@ -1,4 +1,4 @@
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 // waitForRegistrationActive waits for a registration to leave the
 // "REGISTRATION_PENDING" state and become "ACTIVE" or any other state.
 func waitForRegistrationActive(d *schema.ResourceData, config *transport_tpg.Config, timeout time.Duration) error {

mmv1/templates/terraform/constants/colab_runtime.go.tmpl

@@ -17,7 +17,7 @@ func ModifyColabRuntimeOperation(config *transport_tpg.Config, d *schema.Resourc
 	return res, nil
 }
 
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 func waitForColabOperation(config *transport_tpg.Config, d *schema.ResourceData, project string, billingProject string, userAgent string, response map[string]interface{}) error {
 	var opRes map[string]interface{}
 	err := ColabOperationWaitTimeWithResponse(

mmv1/templates/terraform/constants/integration_connectors_connection.go.tmpl

@@ -1,4 +1,4 @@
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 // waitforConnectionReady waits for an connecion to leave the
 // "CREATING" state, to indicate that it's ready.
 func waitforConnectionReady(d *schema.ResourceData, config *transport_tpg.Config, timeout time.Duration) error {

mmv1/templates/terraform/constants/interconnect_attachment.go.tmpl

@@ -1,4 +1,4 @@
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 // waitForAttachmentToBeProvisioned waits for an attachment to leave the
 // "UNPROVISIONED" state, to indicate that it's either ready or awaiting partner
 // activity.

mmv1/templates/terraform/constants/notebooks_instance.go.tmpl

@@ -48,7 +48,7 @@ func NotebooksInstanceKmsDiffSuppress(_, old, new string, _ *schema.ResourceData
 	return false
 }
 
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 // waitForNotebooksInstanceActive waits for an Notebook instance to become "ACTIVE"
 func waitForNotebooksInstanceActive(d *schema.ResourceData, config *transport_tpg.Config, timeout time.Duration) error {
 	return retry.Retry(timeout, func() *retry.RetryError {
@@ -88,7 +88,7 @@ func modifyNotebooksInstanceState(config *transport_tpg.Config, d *schema.Resour
 	return res, nil
 }
 
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 func waitForNotebooksOperation(config *transport_tpg.Config, d *schema.ResourceData, project string, billingProject string, userAgent string, response map[string]interface{}) error {
 	var opRes map[string]interface{}
 	err := NotebooksOperationWaitTimeWithResponse(

mmv1/templates/terraform/constants/org_policy_policy.go.tmpl

@@ -4,7 +4,7 @@ func resourceOrgpolicyPolicyRulesConditionExpressionDiffSuppress(_, old, new str
 	return oldReplaced == newReplaced
 }
 
-{{- if ne $.Compiler "terraformgoogleconversion-codegen" }}
+{{- if not (contains $.Compiler "terraformgoogleconversion") }}
 func resourceOrgPolicyPolicySpecRulesDiffSuppress(k, o, n string, d *schema.ResourceData) bool {
 	oldCount, newCount := d.GetChange("spec.0.rules.#")
 	var count int