Fix template generation for cloudstack

terraform/cloudstack/template_generator.go

@@ -2,11 +2,20 @@ package cloudstack
 
 import (
 	"embed"
+	"fmt"
 	"strings"
 
 	"github.com/cloudfoundry/bosh-bootloader/storage"
 )
 
+type templates struct {
+	providerVars     string
+	provider         string
+	resourcesOutputs string
+	resourcesVars    string
+	resources        string
+}
+
 type TemplateGenerator struct {
 	EmbedData embed.FS
 	Path      string
@@ -23,16 +32,49 @@ func NewTemplateGenerator() TemplateGenerator {
 }
 
 func (t TemplateGenerator) Generate(state storage.State) string {
-	var vals []string
+	tmpls := t.readTemplates()
+	template := strings.Join([]string{tmpls.providerVars, tmpls.provider, tmpls.resourcesOutputs, tmpls.resourcesVars, tmpls.resources}, "\n")
+	return template
+}
 
-	content, err := t.EmbedData.ReadDir(t.Path)
-	if err != nil {
-		panic(err)
+func (t TemplateGenerator) readTemplates() templates {
+	listings := map[string]string{
+		"provider-vars.tf":     "",
+		"provider.tf":          "",
+		"resources-outputs.tf": "",
+		"resources-vars.tf":    "",
+		"resources.tf":         "",
 	}
 
-	for _, embedDataEntry := range content {
-		vals = append(vals, embedDataEntry.Name())
+	var errors []error
+	for item := range listings {
+		content, err := t.EmbedData.ReadDir(t.Path)
+		for _, embedDataEntry := range content {
+			if strings.Contains(embedDataEntry.Name(), item) {
+				out, err := t.EmbedData.ReadFile(fmt.Sprintf("%s/%s", t.Path, embedDataEntry.Name()))
+				if err != nil {
+					errors = append(errors, err)
+					break
+				}
+				listings[item] = string(out)
+				break
+			}
+		}
+		if err != nil {
+			errors = append(errors, err)
+			continue
+		}
 	}
 
-	return strings.Join(vals, "\n")
+	if errors != nil {
+		panic(errors)
+	}
+
+	return templates{
+		providerVars:     listings["provider-vars.tf"],
+		provider:         listings["provider.tf"],
+		resourcesOutputs: listings["resources-outputs.tf"],
+		resourcesVars:    listings["resources-vars.tf"],
+		resources:        listings["resources.tf"],
+	}
 }

terraform/executor.go

@@ -104,7 +104,7 @@ func formatVars(inputs map[string]interface{}) string {
 		} else if valList, ok := value.([]string); ok {
 			value = fmt.Sprintf(`["%s"]`, strings.Join(valList, `","`))
 		}
-		formattedVars = fmt.Sprintf("%s\n%s=%s", formattedVars, name, value)
+		formattedVars = fmt.Sprintf("%s\n%s=%v", formattedVars, name, value)
 	}
 	return formattedVars
 }