tgc-revival: use the cai asset types in ConverterMap (#15246)

Author: zli82016

mmv1/provider/terraform_tgc_next.go

@@ -344,7 +344,7 @@ func (tgc *TerraformGoogleConversionNext) generateResourcesForVersion(products [
 			}
 			tgc.ResourcesForVersion = append(tgc.ResourcesForVersion, resourceIdentifier)
 
-			caiResourceType := fmt.Sprintf("%s.%s", service, object.CaiResourceType())
+			caiResourceType := object.CaiAssetType()
 			if _, ok := resourcesByCaiResourceType[caiResourceType]; !ok {
 				resourcesByCaiResourceType[caiResourceType] = make([]ResourceIdentifier, 0)
 			}

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

@@ -43,16 +43,16 @@ var provider *schema.Provider = tpg_provider.Provider()
 // ConverterMap is a collection of converters instances, indexed by cai asset type.
 var ConverterMap = map[string]map[string]models.Cai2hclConverter{
 	// ####### START handwritten resources ###########
-	resourcemanager.ProjectAssetType: {
+	"cloudresourcemanager.googleapis.com/Project": {
 		"Default": resourcemanager.NewProjectCai2hclConverter(provider),
 	},
-	compute.ComputeInstanceAssetType: {
+	"compute.googleapis.com/Instance": {
 		"Default": compute.NewComputeInstanceCai2hclConverter(provider),
 	},
 	// ####### END handwritten resources ###########
 
-	{{- range $resourceType, $resources := $.ResourcesByCaiResourceType}}
-	{{ $resourceType }}AssetType: {
+	{{- range $caiResourceType, $resources := $.ResourcesByCaiResourceType}}
+	"{{ $caiResourceType }}": {
 	{{- range $object := $resources }}
 		"{{ $object.AliasName }}": {{ $object.ServiceName }}.New{{ $object.ResourceName -}}Cai2hclConverter(provider),
 	{{- end }}