Only set Compiler on product

Author: zli82016

mmv1/api/product.go

@@ -78,8 +78,6 @@ type Product struct {
 	// The compiler to generate the downstream files, for example "terraformgoogleconversion-codegen".
 	Compiler string `yaml:"-"`
 
-	ProviderName string `yaml:"-"`
-
 	// ImportPath contains the prefix used for importing packages in generated files.
 	ImportPath string `yaml:"-"`
 }
@@ -147,6 +145,10 @@ func (p *Product) SetCompiler(t string) {
 	p.Compiler = fmt.Sprintf("%s-codegen", strings.ToLower(t))
 }
 
+func (p Product) IsTgcCompiler() bool {
+	return p.Compiler == "terraformgoogleconversionnext-codegen"
+}
+
 // ====================
 // Version-related methods
 // ====================

mmv1/api/resource.go

@@ -340,8 +340,6 @@ type Resource struct {
 	// The version name provided by the user through CI
 	TargetVersionName string `yaml:"-"`
 
-	// The compiler to generate the downstream files, for example "terraformgoogleconversion-codegen".
-	Compiler string `yaml:"-"`
 
 	// The API "resource type kind" used for this resource e.g., "Function".
 	// If this is not set, then :name is used instead, which is strongly
@@ -898,7 +896,7 @@ func (r *Resource) addWriteOnlyFields(props []*Type, propWithWoConfigured *Type)
 	}
 	// Don't add write only fields to tgc, as write only fields don't exist in tfplan json,
 	// the input of tfplan2cai.
-	if !strings.HasPrefix(r.ProductMetadata.ProviderName, "tgc") {
+	if !r.ProductMetadata.IsTgcCompiler() {
 		woFieldName := fmt.Sprintf("%sWo", propWithWoConfigured.Name)
 		woVersionFieldName := fmt.Sprintf("%sVersion", woFieldName)
 		writeOnlyField := buildWriteOnlyField(woFieldName, woVersionFieldName, propWithWoConfigured)
@@ -1448,9 +1446,7 @@ func ignoreReadFields(props []*Type) []string {
 	return fields
 }
 
-func (r *Resource) SetCompiler(t string) {
-	r.Compiler = fmt.Sprintf("%s-codegen", strings.ToLower(t))
-}
+
 
 // Returns the id format of an object, or self_link_uri if none is explicitly defined
 // We prefer the long name of a resource as the id so that users can reference
@@ -2596,5 +2592,5 @@ func (r Resource) CaiResourceName() string {
 }
 
 func (r Resource) IsTgcCompiler() bool {
-	return r.Compiler == "terraformgoogleconversionnext-codegen"
+	return r.ProductMetadata.Compiler == "terraformgoogleconversionnext-codegen"
 }

mmv1/api/resource_test.go

@@ -399,13 +399,14 @@ func TestResourceAddExtraFields(t *testing.T) {
 	t.Parallel()
 
 	createTestResource := func(name, pn string) *Resource {
-		return &Resource{
+		r := &Resource{
 			Name: name,
 			ProductMetadata: &Product{
-				Name:         "testproduct",
-				ProviderName: pn,
+				Name: "testproduct",
 			},
 		}
+		r.ProductMetadata.SetCompiler(pn)
+		return r
 	}
 
 	createTestType := func(name, typeStr string, options ...func(*Type)) *Type {
@@ -488,7 +489,7 @@ func TestResourceAddExtraFields(t *testing.T) {
 	t.Run("WriteOnly property doesn't add companion fields for tgc", func(t *testing.T) {
 		t.Parallel()
 
-		resource := createTestResource("testresource", "tgc")
+		resource := createTestResource("testresource", "terraformgoogleconversionnext")
 		writeOnlyProp := createTestType("password", "String",
 			withWriteOnly(true),
 			withRequired(true),

mmv1/api/type.go

@@ -607,7 +607,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 && !strings.Contains(t.ResourceMetadata.Compiler, "terraformgoogleconversion") {
+			if t.ResourceMetadata.NestedQuery != nil && !strings.Contains(t.ResourceMetadata.ProductMetadata.Compiler, "terraformgoogleconversion") {
 				nestedPrefix = "Nested"
 			}
 

mmv1/loader/loader.go

@@ -154,9 +154,7 @@ func (l *Loader) batchLoadProducts(productNames []string, providerName string) m
 // Load compiles a product with all its resources from the given path and optional overrides
 // This loads the product configuration and all its resources into memory without generating any files
 func (l *Loader) LoadProduct(productName, providerName string) (*api.Product, error) {
-	p := &api.Product{
-		ProviderName: providerName,
-	}
+	p := &api.Product{}
 	productYamlPath := filepath.Join(productName, "product.yaml")
 
 	var productOverridePath string
@@ -202,6 +200,7 @@ func (l *Loader) LoadProduct(productName, providerName string) (*api.Product, er
 	p.Version = p.VersionObjOrClosest(l.version)
 
 	p.Objects = resources
+	p.SetCompiler(providerName)
 	p.Validate()
 
 	return p, nil

mmv1/provider/terraform.go

@@ -64,10 +64,8 @@ func NewTerraform(product *api.Product, versionName string, startTime time.Time,
 		templateFS:        templateFS,
 	}
 
-	t.Product.SetCompiler(ProviderName(t))
 	t.Product.ImportPath = ImportPathFromVersion(versionName)
 	for _, r := range t.Product.Objects {
-		r.SetCompiler(ProviderName(t))
 		r.ImportPath = t.Product.ImportPath
 	}
 

mmv1/provider/terraform_tgc.go

@@ -58,9 +58,7 @@ func NewTerraformGoogleConversion(product *api.Product, versionName string, star
 		templateFS:        templateFS,
 	}
 
-	t.Product.SetCompiler(ProviderName(t))
 	for _, r := range t.Product.Objects {
-		r.SetCompiler(ProviderName(t))
 		r.ImportPath = ImportPathFromVersion(versionName)
 	}
 

mmv1/provider/terraform_tgc_cai2hcl.go

@@ -43,9 +43,7 @@ func NewCaiToTerraformConversion(product *api.Product, versionName string, start
 		templateFS:        templateFS,
 	}
 
-	t.Product.SetCompiler(ProviderName(t))
 	for _, r := range t.Product.Objects {
-		r.SetCompiler(ProviderName(t))
 		r.ImportPath = ImportPathFromVersion(versionName)
 	}
 

mmv1/provider/terraform_tgc_next.go

@@ -75,9 +75,7 @@ func NewTerraformGoogleConversionNext(product *api.Product, versionName string,
 		templateFS:                 templateFS,
 	}
 
-	t.Product.SetCompiler(ProviderName(t))
 	for _, r := range t.Product.Objects {
-		r.SetCompiler(ProviderName(t))
 		r.ImportPath = ImportPathFromVersion(versionName)
 	}
 

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

@@ -1,4 +1,4 @@
-{{- if not (contains $.Compiler "terraformgoogleconversion") }}
+{{- if not (contains $.ProductMetadata.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 {