dataapiv2 - Various Fixes to the terraform side (#3291)

* Populate ApiVersion * fix resourceLabel * Hardcode GenerateModel,GenerateIdValidationFunction,GenerateSchema to true similar to C# generation * Set ModelToModelMappings * Set ModelToModelMappings into the api * Address review
hashicorp · Nov 8, 2023 · f1fb416 · f1fb416
1 parent a267fa1
commit f1fb416
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/tools/data-api/internal/endpoints/v1/terraform.go b/tools/data-api/internal/endpoints/v1/terraform.go
@@ -31,8 +31,8 @@ func (api Api) terraform(w http.ResponseWriter, r *http.Request) {
 func mapTerraformResources(input map[string]repositories.TerraformResourceDetails) map[string]models.TerraformResourceDetails {
 	output := make(map[string]models.TerraformResourceDetails, 0)
 
-	for name, resource := range input {
-		output[name] = models.TerraformResourceDetails{
+	for _, resource := range input {
+		output[resource.Label] = models.TerraformResourceDetails{
 			ApiVersion: resource.ApiVersion,
 			CreateMethod: models.MethodDefinition{
 				Generate:         resource.CreateMethod.Generate,

diff --git a/tools/data-api/internal/repositories/services.go b/tools/data-api/internal/repositories/services.go
@@ -527,6 +527,7 @@ func parseTerraformDefinitionResourceFromFilePath(resourcePath string, file os.D
 	definition.ApiVersion = resourceDefinition.ApiVersion
 	definition.Generate = resourceDefinition.Generate
 	definition.ResourceIdName = resourceDefinition.ResourceIdName
+	definition.Label = resourceDefinition.Label
 
 	definition.CreateMethod = MethodDefinition{
 		Generate:         resourceDefinition.CreateMethod.Generate,
@@ -632,6 +633,7 @@ func parseTerraformDefinitionResourceMappingsFromFilePath(resourcePath string, f
 				SdkModelName:    modelToModelMapping.SdkModelName,
 			})
 		}
+		mappings.ModelToModels = modelToModels
 	}
 
 	return mappings, nil

diff --git a/tools/data-api/internal/repositories/terraform_models.go b/tools/data-api/internal/repositories/terraform_models.go
@@ -29,6 +29,7 @@ type TerraformResourceDetails struct {
 	GenerateModel        bool
 	GenerateIdValidation bool
 	GenerateSchema       bool
+	Label                string
 	Mappings             MappingDefinition
 	ReadMethod           MethodDefinition
 	Resource             string

diff --git a/...s/importer-rest-api-specs/components/dataapigeneratorjson/templater_terraform_mappings.go b/...s/importer-rest-api-specs/components/dataapigeneratorjson/templater_terraform_mappings.go
@@ -88,6 +88,7 @@ func mapTerraformSchemaMappings(input resourcemanager.MappingDefinition) (*dataA
 	if len(*outputFieldMappings) > 0 {
 		output.FieldMappings = outputFieldMappings
 	}
+
 	modelToModelMappings = uniqueAndSortModelToModelMappings(modelToModelMappings)
 	if len(modelToModelMappings) > 0 {
 		output.ModelToModelMappings = &modelToModelMappings

diff --git a/tools/importer-rest-api-specs/components/resources/identification.go b/tools/importer-rest-api-specs/components/resources/identification.go
@@ -133,6 +133,7 @@ func FindCandidates(input services.Resource, resourceDefinitions map[string]defi
 				Generate:             true,
 				GenerateSchema:       true,
 				GenerateIdValidation: true,
+				GenerateModel:        true,
 				ReadMethod:           *getMethod,
 				Resource:             apiResourceName,
 				ResourceIdName:       resourceIdName,

diff --git a/tools/importer-rest-api-specs/pipeline/task_generate_terraform_resources.go b/tools/importer-rest-api-specs/pipeline/task_generate_terraform_resources.go
@@ -44,6 +44,7 @@ func (pipelineTask) generateTerraformDetails(data *models.AzureApiDefinition, lo
 				continue
 			}
 
+			resourceDetails.ApiVersion = data.ApiVersion
 			resourceDetails.SchemaModels = *modelsForResource
 			resourceDetails.Mappings = *mappings
 			resourceDetails.Tests.Generate = true