Skip to content

Commit 635eb8e

Browse files
committed
Update filter
1 parent 4f0bf0d commit 635eb8e

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

tools/cli/internal/cli/filter/filter.go

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@ func (o *Opts) Run() error {
4141
return err
4242
}
4343

44-
filteredOAS, err := filter.ApplyFilters(specInfo.Spec, filter.NewMetadata(nil, o.env), filter.FiltersWithoutVersioning)
44+
// If a version is provided, versioning filters will also be applied.
45+
filters := filter.FiltersWithoutVersioning
46+
if o.version != "" {
47+
filters = filter.DefaultFilters
48+
}
49+
50+
filteredOAS, err := filter.ApplyFilters(specInfo.Spec, filter.NewMetadata(nil, o.env), filters)
4551
if err != nil {
4652
return err
4753
}
@@ -66,7 +72,7 @@ func Builder() *cobra.Command {
6672

6773
cmd := &cobra.Command{
6874
Use: "filter -s spec ",
69-
Short: "Filter Open API specification given a list of filters.",
75+
Short: "Filter Open API specification removing hidden endpoints and extension metadata. If a version is provided, versioning filters will also be applied.",
7076
Args: cobra.NoArgs,
7177
PreRunE: func(_ *cobra.Command, args []string) error {
7278
return opts.PreRunE(args)
@@ -78,10 +84,13 @@ func Builder() *cobra.Command {
7884

7985
cmd.Flags().StringVarP(&opts.basePath, flag.Spec, flag.SpecShort, "-", usage.Spec)
8086
cmd.Flags().StringVar(&opts.env, flag.Environment, "", usage.Environment)
81-
cmd.Flags().StringVar(&opts.version, flag.Version, "", usage.Version)
8287
cmd.Flags().StringVarP(&opts.outputPath, flag.Output, flag.OutputShort, "", usage.Output)
83-
cmd.Flags().StringVarP(&opts.format, flag.Format, flag.FormatShort, openapi.JSON, usage.Format)
84-
_ = cmd.MarkFlagRequired(flag.Output)
88+
cmd.Flags().StringVar(&opts.version, flag.Version, "", usage.Version)
89+
cmd.Flags().StringVarP(&opts.format, flag.Format, flag.FormatShort, openapi.ALL, usage.Format)
8590

91+
// Required flags
92+
_ = cmd.MarkFlagRequired(flag.Output)
93+
_ = cmd.MarkFlagRequired(flag.Spec)
94+
_ = cmd.MarkFlagRequired(flag.Environment)
8695
return cmd
8796
}

0 commit comments

Comments
 (0)