Fixed schema template

Author: michalbil

pkg/commands/codegen/codegen.go

@@ -3,10 +3,11 @@ package codegen
 import (
 	"context"
 	"fmt"
+	"log"
+
 	"github.com/paloaltonetworks/pan-os-codegen/pkg/generate"
 	"github.com/paloaltonetworks/pan-os-codegen/pkg/load"
 	"github.com/paloaltonetworks/pan-os-codegen/pkg/properties"
-	"log"
 )
 
 type CommandType string
@@ -97,7 +98,7 @@ func (c *Command) Execute() error {
 			terraformGenerator := generate.NewCreator(config.Output.TerraformProvider, c.templatePath, spec)
 			err = terraformGenerator.RenderTerraformProviderFile(newProviderObject, spec)
 			if err != nil {
-				return fmt.Errorf("error generating Terraform provider - %s", err)
+				return fmt.Errorf("error rendering Terraform provider file for %s - %s", specPath, err)
 			}
 
 			resourceList = append(resourceList, newProviderObject.Resources...)

pkg/generate/generator.go

@@ -3,7 +3,6 @@ package generate
 import (
 	"bytes"
 	"fmt"
-	"github.com/paloaltonetworks/pan-os-codegen/pkg/translate/terraform_provider"
 	"go/format"
 	"io"
 	"log"
@@ -15,6 +14,7 @@ import (
 	"github.com/paloaltonetworks/pan-os-codegen/pkg/naming"
 	"github.com/paloaltonetworks/pan-os-codegen/pkg/properties"
 	"github.com/paloaltonetworks/pan-os-codegen/pkg/translate"
+	"github.com/paloaltonetworks/pan-os-codegen/pkg/translate/terraform_provider"
 )
 
 type Creator struct {
@@ -118,7 +118,8 @@ func (c *Creator) processTemplate(templateName, filePath string) error {
 func (c *Creator) writeFormattedContentToFile(filePath, content string) error {
 	formattedCode, err := format.Source([]byte(content))
 	if err != nil {
-		return fmt.Errorf("error formatting code %w", err)
+		log.Printf("provided content: %s", content)
+		return fmt.Errorf("error formatting code: %w", err)
 	}
 	formattedBuf := bytes.NewBuffer(formattedCode)
 

pkg/translate/terraform_provider/template.go

@@ -192,10 +192,10 @@ func (r *{{ structName }}) Schema(ctx context.Context, req resource.SchemaReques
 		Description: "The location of this object.",
 		Required:    true,
 		Attributes: map[string]rsschema.Attribute{	
-	{{- range $pName, $pParam := $.Locations -}}
-		{{ ResourceParamToSchema $pName $pParam }}
-	{{- end }}
-	}
+			{{- range $pName, $pParam := $.Locations -}}
+				{{ ResourceParamToSchema $pName $pParam }}
+			{{- end }}
+	},
 },
 	{{- range $pName, $pParam := $.Spec.Params -}}
 		{{ ResourceParamToSchema $pName $pParam }}