diff --git a/cmd/deps.go b/cmd/deps.go index 5a1447fc61..89759a6e03 100644 --- a/cmd/deps.go +++ b/cmd/deps.go @@ -20,10 +20,10 @@ import ( ) type depsCommandParams struct { - dataPaths repeatedStringFlag - format *util.EnumFlag - ignore []string - bundlePaths repeatedStringFlag + dataPaths repeatedStringFlag + outputFormat *util.EnumFlag + ignore []string + bundlePaths repeatedStringFlag } const ( @@ -35,7 +35,7 @@ func init() { var params depsCommandParams - params.format = util.NewEnumFlag(depsFormatPretty, []string{ + params.outputFormat = util.NewEnumFlag(depsFormatPretty, []string{ depsFormatPretty, depsFormatJSON, }) @@ -56,10 +56,10 @@ func init() { }, } - depsCommand.Flags().VarP(params.format, "format", "f", "set output format") - depsCommand.Flags().VarP(¶ms.dataPaths, "data", "d", "set data file(s) or directory path(s)") - depsCommand.Flags().VarP(¶ms.bundlePaths, "bundle", "b", "set bundle file(s) or directory path(s)") addIgnoreFlag(depsCommand.Flags(), ¶ms.ignore) + addDataFlag(depsCommand.Flags(), ¶ms.dataPaths) + addBundleFlag(depsCommand.Flags(), ¶ms.bundlePaths) + addOutputFormat(depsCommand.Flags(), params.outputFormat) RootCommand.AddCommand(depsCommand) } @@ -123,7 +123,7 @@ func deps(args []string, params depsCommandParams) error { Virtual: vrs, } - switch params.format.String() { + switch params.outputFormat.String() { case depsFormatJSON: return presentation.JSON(os.Stdout, output) default: diff --git a/cmd/flags.go b/cmd/flags.go index 390b5a2e84..bde4fe4846 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -31,11 +31,11 @@ func addFailFlag(fs *pflag.FlagSet, fail *bool, value bool) { } func addDataFlag(fs *pflag.FlagSet, paths *repeatedStringFlag) { - fs.VarP(paths, "data", "d", "set data file(s) or directory path(s)") + fs.VarP(paths, "data", "d", "set policy or data file(s). This flag can be repeated.") } func addBundleFlag(fs *pflag.FlagSet, paths *repeatedStringFlag) { - fs.VarP(paths, "bundle", "b", "set bundle file(s) or directory path(s)") + fs.VarP(paths, "bundle", "b", "set bundle file(s) or directory path(s). This flag can be repeated.") } func addBundleModeFlag(fs *pflag.FlagSet, bundle *bool, value bool) { @@ -47,7 +47,7 @@ func addInputFlag(fs *pflag.FlagSet, inputPath *string) { } func addImportFlag(fs *pflag.FlagSet, imports *repeatedStringFlag) { - fs.VarP(imports, "import", "", "set query import(s)") + fs.VarP(imports, "import", "", "set query import(s). This flag can be repeated.") } func addPackageFlag(fs *pflag.FlagSet, pkg *string) {