Wiring-up generation of expand and flatten for provider and resources (…

…#31)
hashicorp · Aug 10, 2023 · 780b5d4 · 780b5d4
1 parent 6aa6290
commit 780b5d4
Show file tree

Hide file tree

Showing 8 changed files with 3,669 additions and 9 deletions.
diff --git a/internal/cmd/generate_provider.go b/internal/cmd/generate_provider.go
@@ -152,6 +152,12 @@ func generateProviderCode(spec spec.Specification, outputPath, packageName, gene
 		log.Fatal(err)
 	}
 
+	// generate "expand" and "flatten" code
+	modelsToFromBytes, err := g.ModelsToFromBytes()
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	// format schema code
 	formattedProvidersSchema, err := format.Format(schemaBytes)
 	if err != nil {
@@ -170,8 +176,14 @@ func generateProviderCode(spec spec.Specification, outputPath, packageName, gene
 		log.Fatal(err)
 	}
 
+	// format "expand" and "flatten" code
+	formattedProviderToFrom, err := format.Format(modelsToFromBytes)
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	// write code
-	err = output.WriteProviders(formattedProvidersSchema, formattedProvidersModels, formattedProvidersModelObjectHelpers, outputPath)
+	err = output.WriteProviders(formattedProvidersSchema, formattedProvidersModels, formattedProvidersModelObjectHelpers, formattedProviderToFrom, outputPath)
 	if err != nil {
 		return fmt.Errorf("error writing Go code to output: %w", err)
 	}

diff --git a/internal/cmd/generate_resources.go b/internal/cmd/generate_resources.go
@@ -152,6 +152,12 @@ func generateResourceCode(spec spec.Specification, outputPath, packageName, gene
 		log.Fatal(err)
 	}
 
+	// generate "expand" and "flatten" code
+	modelsToFromBytes, err := g.ModelsToFromBytes()
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	// format schema code
 	formattedResourcesSchema, err := format.Format(schemaBytes)
 	if err != nil {
@@ -170,8 +176,14 @@ func generateResourceCode(spec spec.Specification, outputPath, packageName, gene
 		log.Fatal(err)
 	}
 
+	// format "expand" and "flatten" code
+	formattedResourcesToFrom, err := format.Format(modelsToFromBytes)
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	// write code
-	err = output.WriteResources(formattedResourcesSchema, formattedResourcesModels, formattedResourcesModelObjectHelpers, outputPath)
+	err = output.WriteResources(formattedResourcesSchema, formattedResourcesModels, formattedResourcesModelObjectHelpers, formattedResourcesToFrom, outputPath)
 	if err != nil {
 		return fmt.Errorf("error writing Go code to output: %w", err)
 	}