update

Author: blva

tools/cli/internal/cli/merge/merge.go

@@ -75,8 +75,8 @@ func (o *Opts) PreRunE(_ []string) error {
 		return fmt.Errorf("output file must be either a JSON or YAML file, got %s", o.outputPath)
 	}
 
-	if o.format != "json" && o.format != "yaml" {
-		return fmt.Errorf("output format must be either 'json' or 'yaml', got %s", o.format)
+	if err := openapi.ValidateFormat(o.format); err != nil {
+		return err
 	}
 
 	m, err := openapi.NewOasDiff(o.basePath, o.excludePrivatePaths)

tools/cli/internal/cli/split/split.go

@@ -103,12 +103,8 @@ func (o *Opts) PreRunE(_ []string) error {
 		return fmt.Errorf("output file must be either a JSON or YAML file, got %s", o.outputPath)
 	}
 
-	if o.format != openapi.JSON && o.format != openapi.YAML {
-		return fmt.Errorf("output format must be either 'json' or 'yaml', got %s", o.format)
-	}
-
-	if strings.Contains(o.basePath, openapi.DotYAML) {
-		o.format = openapi.YAML
+	if err := openapi.ValidateFormat(o.format); err != nil {
+		return err
 	}
 
 	return nil
@@ -136,7 +132,7 @@ func Builder() *cobra.Command {
 	cmd.Flags().StringVarP(&opts.basePath, flag.Spec, flag.SpecShort, "-", usage.Spec)
 	cmd.Flags().StringVar(&opts.env, flag.Environment, "", usage.Environment)
 	cmd.Flags().StringVarP(&opts.outputPath, flag.Output, flag.OutputShort, "", usage.Output)
-	cmd.Flags().StringVarP(&opts.format, flag.Format, flag.FormatShort, openapi.JSON, usage.Format)
+	cmd.Flags().StringVarP(&opts.format, flag.Format, flag.FormatShort, openapi.ALL, usage.Format)
 	cmd.Flags().StringVar(&opts.gitSha, flag.GitSha, "", usage.GitSha)
 
 	_ = cmd.MarkFlagRequired(flag.Output)

tools/cli/internal/openapi/file.go

@@ -29,6 +29,7 @@ import (
 const (
 	JSON    = "json"
 	YAML    = "yaml"
+	ALL     = "all"
 	DotYAML = ".yaml"
 	DotJSON = ".json"
 )
@@ -41,15 +42,15 @@ func SaveToFile[T any](path, format string, content T, fs afero.Fs) error {
 		return err
 	}
 
-	if format == JSON || format == "" || format == "all" {
+	if format == JSON || format == "" || format == ALL {
 		jsonPath := newPathWithExtension(path, JSON)
 		if errJSON := afero.WriteFile(fs, jsonPath, data, 0o600); errJSON != nil {
 			return errJSON
 		}
 		log.Printf("\nFile was saved in '%s'.\n\n", jsonPath)
 	}
 
-	if format == YAML || format == "" || format == "all" {
+	if format == YAML || format == "" || format == ALL {
 		dataYAML, err := SerializeToYAML(data)
 		if err != nil {
 			return err
@@ -123,3 +124,12 @@ func SerializeToYAML(data []byte) ([]byte, error) {
 func Save(path string, oas *openapi3.T, format string, fs afero.Fs) error {
 	return SaveToFile(path, format, newSpec(oas), fs)
 }
+
+// ValidateFormat validates the format of files supported.
+func ValidateFormat(format string) error {
+	if format != JSON && format != YAML && format != ALL {
+		return fmt.Errorf("format must be either 'json', 'yaml' or 'all', got %s", format)
+	}
+
+	return nil
+}