tgc-revival: use testresource data for cai2hcl

docs/content/convert/add-new-resource-tgc.md

@@ -304,6 +304,10 @@ To resolve integration test failures, you need to apply the correct override con
 
 		If the default Terraform encoding applied during conversion is causing issues, disable it by adding `tgc_ignore_terraform_encoder: true` to the Resource.yaml file.
 
+	* Ignore Default Terraform Decoder
+
+		If the default Terraform decoding applied during conversion is causing issues, disable it by adding `tgc_ignore_terraform_decoder: true` to the Resource.yaml file.
+
 	* Custom Decoder (CAI → GET API object Mismatch)
 
 		This is used when the value of a field in a CAI asset is different from the value required in the final API object during cai2hcl.

mmv1/api/resource.go

@@ -386,6 +386,9 @@ type TGCResource struct {
 	// If true, the Terraform custom encoder is not applied during tfplan2cai
 	TGCIgnoreTerraformEncoder bool `yaml:"tgc_ignore_terraform_encoder,omitempty"`
 
+	// If true, the Terraform custom decoder is not applied during cai2hcl
+	TGCIgnoreTerraformDecoder bool `yaml:"tgc_ignore_terraform_decoder,omitempty"`
+
 	// [Optional] The parameter that uniquely identifies the resource.
 	// Generally, it shouldn't be set when the identity can be decided.
 	// Otherswise, it should be set.

mmv1/products/dataproc/Batch.yaml

@@ -45,6 +45,7 @@ async:
     resource_inside_response: false
 collection_url_key: 'batches'
 include_in_tgc_next_DO_NOT_USE: true
+tgc_ignore_terraform_decoder: true
 custom_code:
   constants: 'templates/terraform/constants/cloud_dataproc_batch.go.tmpl'
   decoder: 'templates/terraform/decoders/cloud_dataproc_batch.go.tmpl'
@@ -289,6 +290,8 @@ properties:
         type: KeyValuePairs
         description: |
           A mapping of property names to values, which are used to configure workload execution.
+        custom_tgc_expand: 'templates/tgc_next/custom_expand/dataproc_batch.go.tmpl'
+        custom_tgc_flatten: 'templates/tgc_next/custom_flatten/dataproc_batch.go.tmpl'
       - name: 'effective_properties'
         type: KeyValuePairs
         description: |

mmv1/products/pubsub/Topic.yaml

@@ -291,7 +291,7 @@
               - 'avro_format'
               - 'pubsub_avro_format'
             properties:
  # Meant to be an empty object with no properties.
               []
           - name: 'pubsubAvroFormat'
             type: NestedObject
@@ -307,7 +307,7 @@
               - 'avro_format'
               - 'pubsub_avro_format'
             properties:
  # Meant to be an empty object with no properties.
               []
           - name: 'minimumObjectCreateTime'
             type: String
@@ -469,6 +469,7 @@
           description: |
             Javascript User Defined Function. If multiple Javascript UDFs are specified on a resource,
             each one must have a unique `function_name`.
+          is_missing_in_cai: true
           properties:
             - name: functionName
               type: String

mmv1/templates/tgc_next/cai2hcl/resource_converter.go.tmpl

@@ -79,7 +79,13 @@ func (c *{{ $.ResourceName -}}Cai2hclConverter) convertResourceData(asset caiass
 	var err error
 	res := asset.Resource.Data
 	config := transport.NewConfig()
-	d := &schema.ResourceData{}
+
+	// This is a fake resource used to get fake d
+	// d.Get will return empty map, instead of nil
+	fakeResource := &schema.Resource{
+		Schema: c.schema,
+	}
+	d := fakeResource.TestResourceData()
 
 {{	if $.TgcHclBlockName -}}
 	hclBlockName := res["{{ $.TgcHclBlockName -}}"].(string)
@@ -98,7 +104,7 @@ func (c *{{ $.ResourceName -}}Cai2hclConverter) convertResourceData(asset caiass
 	}
 {{ end}}
 
-{{ if $.CustomCode.Decoder -}}
+{{ if and $.CustomCode.Decoder (not $.TGCIgnoreTerraformDecoder) -}}
 	res, err = resource{{ $.ResourceName -}}Decoder(d, config, res)
 	if err != nil {
 		return nil, err
@@ -145,7 +151,7 @@ func resource{{ $.ResourceName -}}TgcDecoder(d *schema.ResourceData, meta interf
 }
 {{- end }}
 
-{{- if $.CustomCode.Decoder }}
+{{- if and $.CustomCode.Decoder (not $.TGCIgnoreTerraformDecoder) }}
 func resource{{ $.ResourceName -}}Decoder(d *schema.ResourceData, meta interface{}, res map[string]interface{}) (map[string]interface{}, error) {
 	{{ $.CustomTemplate $.CustomCode.Decoder false -}}
 }

mmv1/templates/tgc_next/custom_expand/dataproc_batch.go.tmpl

@@ -0,0 +1,12 @@
+func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	if v == nil {
+		return map[string]string{}, nil
+	}
+	m := make(map[string]string)
+	for k, val := range v.(map[string]interface{}) {
+		// In CAI asset, the properties have prefix "spark:" (e.g. spark:spark.dynamicAllocation.enabled)
+        modifiedK := fmt.Sprintf("spark:%s", k)
+		m[modifiedK] = val.(string)
+	}
+	return m, nil
+}

mmv1/templates/tgc_next/custom_flatten/dataproc_batch.go.tmpl

@@ -0,0 +1,14 @@
+func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+    if properties, ok :=  v.(map[string]interface{}); ok {
+        propertiesCopy := make(map[string]interface{})
+        for k, v := range properties {
+            // Remove the prefix "spark:" from the properties. Otherwise, terraform apply will fail with the error from API. 
+            modifiedK := strings.TrimPrefix(k, "spark:")
+            propertiesCopy[modifiedK] = v
+        }
+        return propertiesCopy
+    }
+
+
+	return v
+}