Typed provider configuration

provider-ci/go.mod

@@ -4,7 +4,6 @@ go 1.21
 
 require (
 	github.com/Masterminds/sprig v2.22.0+incompatible
-	github.com/imdario/mergo v0.3.16
 	github.com/spf13/cobra v1.7.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -15,6 +14,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect

provider-ci/internal/cmd/generate.go

@@ -21,33 +21,26 @@ var generateCmd = &cobra.Command{
 	Use:   "generate",
 	Short: "Generate repository files.",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		localConfig, err := pkg.LoadLocalConfig(generateArgs.ConfigPath)
-		if err != nil {
-			return err
-		}
-		// Merge local config with template defaults
-		mergedConfig, err := localConfig.WithTemplateDefaults()
+		config, err := pkg.LoadLocalConfig(generateArgs.ConfigPath)
 		if err != nil {
 			return err
 		}
 
 		// Template name priority: CLI flag > config file
 		if generateArgs.TemplateName == "" {
-			if templateName, ok := mergedConfig["template"].(string); ok {
-				generateArgs.TemplateName = templateName
+			if config.Template != "" {
+				generateArgs.TemplateName = config.Template
 			}
 		}
 
 		// Name priority: CLI flag > config file ("repository", then "name" field)
 		if generateArgs.RepositoryName == "" {
-			if repositoryName, ok := mergedConfig["repository"].(string); ok {
-				generateArgs.RepositoryName = repositoryName
-			} else if name, ok := mergedConfig["name"].(string); ok {
-				generateArgs.RepositoryName = name
+			if config.Repository != "" {
+				generateArgs.RepositoryName = config.Repository
 			} else {
-				providerName, providerOk := mergedConfig["provider"].(string)
-				organizationName, organizationOk := mergedConfig["organization"].(string)
-				if providerOk && organizationOk {
+				providerName := config.Provider
+				organizationName := config.Organization
+				if providerName != "" && organizationName != "" {
 					generateArgs.RepositoryName = fmt.Sprintf("%s/pulumi-%s", organizationName, providerName)
 				}
 			}
@@ -61,7 +54,7 @@ var generateCmd = &cobra.Command{
 			RepositoryName: generateArgs.RepositoryName,
 			OutDir:         generateArgs.OutDir,
 			TemplateName:   generateArgs.TemplateName,
-			Config:         mergedConfig,
+			Config:         config,
 		})
 		return err
 	},