Skip to content

refactor(cmd): Use os.Exit(1) only from main() #1398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamietanna merged 1 commit into from
Jan 23, 2024
Merged

refactor(cmd): Use os.Exit(1) only from main() #1398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cmd/oapi-codegen/oapi-codegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,13 @@ func main() {
errExit("error parsing'%s' as YAML: %v\n", flagConfigFile, err)
}
}
opts = newConfigFromOldConfig(oldConfig)
var err error
opts, err = newConfigFromOldConfig(oldConfig)
if err != nil {
flag.PrintDefaults()
errExit("error creating new config from old config: %v\n", err)
}

}

// Ensure default values are set if user hasn't specified some needed
Expand Down Expand Up @@ -488,7 +494,7 @@ func generationTargets(cfg *codegen.Configuration, targets []string) error {
return nil
}

func newConfigFromOldConfig(c oldConfiguration) configuration {
func newConfigFromOldConfig(c oldConfiguration) (configuration, error) {
// Take flags into account.
cfg := updateOldConfigFromFlags(c)

Expand All @@ -500,9 +506,7 @@ func newConfigFromOldConfig(c oldConfiguration) configuration {
opts.OutputOptions.ResponseTypeSuffix = flagResponseTypeSuffix

if err := generationTargets(&opts, cfg.GenerateTargets); err != nil {
fmt.Println(err)
flag.PrintDefaults()
os.Exit(1)
return configuration{}, fmt.Errorf("generation targets: %w", err)
}

opts.OutputOptions.IncludeTags = cfg.IncludeTags
Expand All @@ -511,7 +515,7 @@ func newConfigFromOldConfig(c oldConfiguration) configuration {

templates, err := loadTemplateOverrides(cfg.TemplatesDir)
if err != nil {
errExit("error loading template overrides: %s\n", err)
return configuration{}, fmt.Errorf("loading template overrides: %w", err)
}
opts.OutputOptions.UserTemplates = templates

Expand All @@ -522,5 +526,5 @@ func newConfigFromOldConfig(c oldConfiguration) configuration {
return configuration{
Configuration: opts,
OutputFile: cfg.OutputFile,
}
}, nil
}