Sort resources and set in product in go compiler (GoogleCloudPlatform…

…#10135)

mmv1/api/product.go

@@ -39,7 +39,7 @@ type Product struct {
 
 	// Display Name: The full name of the GCP product; eg "Cloud Bigtable"
 
-	Objects []interface{}
+	Objects []*Resource
 
 	// The list of permission scopes available for the service
 	// For example: `https://www.googleapis.com/auth/compute`
@@ -69,6 +69,14 @@ type Product struct {
 	ClientName string `yaml:"client_name"`
 }
 
+func (p *Product) Validate() {
+	// TODO Q1 Rewrite super
+	//     super
+	for _, o := range p.Objects {
+		o.ProductMetadata = p
+	}
+}
+
 // def validate
 //     super
 //     set_variables @objects, :__product

mmv1/api/resource.go

@@ -267,9 +267,28 @@ type Resource struct {
 	// Add a deprecation message for a resource that's been deprecated in the API.
 	DeprecationMessage string `yaml:"deprecation_message"`
 
-	Properties []Type
+	Properties []*Type
 
-	Parameters []Type
+	Parameters []*Type
+
+	ProductMetadata *Product
 }
 
 // TODO: rewrite functions
+func (r *Resource) Validate() {
+	// TODO Q1 Rewrite super
+	// super
+
+	r.setResourceMetada(r.Parameters)
+	r.setResourceMetada(r.Properties)
+}
+
+func (r *Resource) setResourceMetada(properties []*Type) {
+	if properties == nil {
+		return
+	}
+
+	for _, property := range properties {
+		property.ResourceMetadata = r
+	}
+}

mmv1/api/type.go

@@ -231,10 +231,9 @@ type Type struct {
 	// just as they are in the standard flattener template.
 	CustomFlatten string `yaml:"custom_flatten"`
 
-	__resource Resource
+	ResourceMetadata *Resource
 
-	// TODO: set a specific type intead of interface{}
-	__parent interface{} // is nil for top-level properties
+	ParentMetadata *Type // is nil for top-level properties
 }
 
 const MAX_NAME = 20

mmv1/main.go

@@ -80,17 +80,17 @@ func main() {
 			// TODO Q1: remove these lines, which are for debugging
 			// log.Printf("productYamlPath %#v", productYamlPath)
 
-			var resources []api.Resource
+			var resources []*api.Resource = make([]*api.Resource, 0)
 
 			productYaml, err := os.ReadFile(productYamlPath)
 			if err != nil {
 				log.Fatalf("Cannot open the file: %v", productYaml)
 			}
-			productApi := api.Product{}
-			yamlValidator.Parse(productYaml, &productApi)
+			productApi := &api.Product{}
+			yamlValidator.Parse(productYaml, productApi)
 
 			// TODO Q1: remove these lines, which are for debugging
-			// prod, _ := json.Marshal(&productApi)
+			// prod, _ := json.Marshal(productApi)
 			// log.Printf("prod %s", string(prod))
 
 			if !productApi.ExistsAtVersionOrLower(version) {
@@ -118,21 +118,29 @@ func main() {
 				if err != nil {
 					log.Fatalf("Cannot open the file: %v", resourceYamlPath)
 				}
-				resource := api.Resource{}
-				yamlValidator.Parse(resourceYaml, &resource)
+				resource := &api.Resource{}
+				yamlValidator.Parse(resourceYaml, resource)
 
 				// TODO Q1: remove these lines, which are for debugging
-				// res, _ := json.Marshal(&resource)
+				// res, _ := json.Marshal(resource)
 				// log.Printf("resource %s", string(res))
 
 				// TODO Q1: add labels related fields
 
+				resource.Validate()
 				resources = append(resources, resource)
 			}
 
 			// TODO Q2: override resources
+			log.Printf("resources before sorting %#v", resources)
 
-			// TODO Q1: sort resources by name and set in product
+			// Sort resources by name
+			sort.Slice(resources, func(i, j int) bool {
+				return resources[i].Name < resources[j].Name
+			})
+
+			productApi.Objects = resources
+			productApi.Validate()
 
 			// TODO Q2: set other providers via flag
 			providerToGenerate := provider.NewTerraform(productApi)
@@ -142,7 +150,6 @@ func main() {
 				continue
 			}
 
-			// TODO Q1: generate templates
 			log.Printf("%s: Generating files", productName)
 			providerToGenerate.Generate(outputPath, productName, generateCode, generateDocs)
 		}

mmv1/provider/terraform.go

@@ -34,7 +34,7 @@ type Terraform struct {
 	ResourcesForVersion []api.Resource
 }
 
-func NewTerraform(product api.Product) *Terraform {
+func NewTerraform(product *api.Product) *Terraform {
 	t := Terraform{ResourceCount: 0, IAMResourceCount: 0}
 
 	// TODO Q1