Add template overrides from files in new config

jacklee1792 · jacklee1792 · commit d70b518f3f3a · 2022-07-01T18:48:44.000-04:00
diff --git a/cmd/oapi-codegen/oapi-codegen.go b/cmd/oapi-codegen/oapi-codegen.go
@@ -131,6 +131,9 @@ func main() {
 		if err != nil {
 			errExit("error processing flags: %v", err)
 		}
+		if opts, err = updateTemplatesFromFiles(opts); err != nil {
+			errExit("error loading template files: %v", err)
+		}
 	} else {
 		var oldConfig oldConfiguration
 		if flagConfigFile != "" {
@@ -265,6 +268,27 @@ func updateConfigFromFlags(cfg configuration) (configuration, error) {
 	return cfg, nil
 }
 
+// updateTemplatesFromFiles populates the UserTemplates field in OutputOptions using the
+// UserTemplateFiles field. If there is a shared key between UserTemplates and UserTemplateFiles,
+// the contents of the file take precedence.
+func updateTemplatesFromFiles(cfg configuration) (configuration, error) {
+	oo := &cfg.OutputOptions
+	if oo.UserTemplateFiles == nil {
+		return cfg, nil
+	}
+	if oo.UserTemplates == nil {
+		oo.UserTemplates = make(map[string]string)
+	}
+	for key, filename := range oo.UserTemplateFiles {
+		data, err := ioutil.ReadFile(filename)
+		if err != nil {
+			return configuration{}, err
+		}
+		oo.UserTemplates[key] = string(data)
+	}
+	return cfg, nil
+}
+
 // updateOldConfigFromFlags parses the flags and the config file. Anything which is
 // a zerovalue in the configuration file will be replaced with the flag
 // value, this means that the config file overrides flag values.
diff --git a/pkg/codegen/configuration.go b/pkg/codegen/configuration.go
@@ -26,7 +26,7 @@ type GenerateOptions struct {
 	EchoServer    bool `yaml:"echo-server,omitempty"`    // EchoServer specifies whether to generate echo server boilerplate
 	GinServer     bool `yaml:"gin-server,omitempty"`     // GinServer specifies whether to generate gin server boilerplate
 	GorillaServer bool `yaml:"gorilla-server,omitempty"` // GorillaServer specifies whether to generate Gorilla server boilerplate
-	Strict        bool `yaml:"strict-server,omitempty"` // Strict specifies whether to generate strict server wrapper
+	Strict        bool `yaml:"strict-server,omitempty"`  // Strict specifies whether to generate strict server wrapper
 	Client        bool `yaml:"client,omitempty"`         // Client specifies whether to generate client boilerplate
 	Models        bool `yaml:"models,omitempty"`         // Models specifies whether to generate type definitions
 	EmbeddedSpec  bool `yaml:"embedded-spec,omitempty"`  // Whether to embed the swagger spec in the generated code
@@ -61,11 +61,12 @@ type CompatibilityOptions struct {
 
 // OutputOptions are used to modify the output code in some way.
 type OutputOptions struct {
-	SkipFmt       bool              `yaml:"skip-fmt,omitempty"`       // Whether to skip go imports on the generated code
-	SkipPrune     bool              `yaml:"skip-prune,omitempty"`     // Whether to skip pruning unused components on the generated code
-	IncludeTags   []string          `yaml:"include-tags,omitempty"`   // Only include operations that have one of these tags. Ignored when empty.
-	ExcludeTags   []string          `yaml:"exclude-tags,omitempty"`   // Exclude operations that have one of these tags. Ignored when empty.
-	UserTemplates map[string]string `yaml:"user-templates,omitempty"` // Override built-in templates from user-provided files
+	SkipFmt           bool              `yaml:"skip-fmt,omitempty"`            // Whether to skip go imports on the generated code
+	SkipPrune         bool              `yaml:"skip-prune,omitempty"`          // Whether to skip pruning unused components on the generated code
+	IncludeTags       []string          `yaml:"include-tags,omitempty"`        // Only include operations that have one of these tags. Ignored when empty.
+	ExcludeTags       []string          `yaml:"exclude-tags,omitempty"`        // Exclude operations that have one of these tags. Ignored when empty.
+	UserTemplates     map[string]string `yaml:"user-templates,omitempty"`      // Override built-in templates from user-provided files
+	UserTemplateFiles map[string]string `yaml:"user-template-files,omitempty"` // Same as UserTemplates, with filenames as values instead
 
 	ExcludeSchemas     []string `yaml:"exclude-schemas,omitempty"`      // Exclude from generation schemas with given names. Ignored when empty.
 	ResponseTypeSuffix string   `yaml:"response-type-suffix,omitempty"` // The suffix used for responses types
