update make validate-cuclonedx-schema

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
anchore · Apr 19, 2022 · b730abc · b730abc
1 parent b68b6f9
commit b730abc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmd/syft/cli/commands.go b/cmd/syft/cli/commands.go
@@ -29,7 +29,7 @@ func New() *cobra.Command {
 	// e.g. pod.context = APPNAME_POD_CONTEXT
 	v := viper.NewWithOptions(viper.EnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_")))
 
-	// since root is aliased as packages we need to construct this command first
+	// since root is aliased as the packages cmd we need to construct this command first
 	packagesCmd := Packages(v, app, ro, po)
 
 	// rootCmd is currently an alias for the packages command

diff --git a/cmd/syft/cli/options/packages.go b/cmd/syft/cli/options/packages.go
@@ -69,8 +69,6 @@ func (o *PackagesOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error {
 func bindPackageConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error {
 	// Formatting & Input options //////////////////////////////////////////////
 
-	// note: output is not included since this configuration option is shared between multiple subcommands
-
 	if err := v.BindPFlag("package.cataloger.scope", flags.Lookup("scope")); err != nil {
 		return err
 	}
@@ -83,6 +81,10 @@ func bindPackageConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error {
 		return err
 	}
 
+	if err := v.BindPFlag("output", flags.Lookup("output")); err != nil {
+		return err
+	}
+
 	// Upload options //////////////////////////////////////////////////////////
 
 	if err := v.BindPFlag("anchore.host", flags.Lookup("host")); err != nil {

diff --git a/internal/config/application.go b/internal/config/application.go
@@ -199,7 +199,6 @@ func loadConfig(v *viper.Viper, configPath string) error {
 	}
 
 	// start searching for valid configs in order...
-
 	// 1. look for .<appname>.yaml (in the current directory)
 	v.AddConfigPath(".")
 	v.SetConfigName("." + internal.ApplicationName)
@@ -245,6 +244,5 @@ func loadConfig(v *viper.Viper, configPath string) error {
 	} else if !errors.As(err, &viper.ConfigFileNotFoundError{}) {
 		return fmt.Errorf("unable to parse config=%q: %w", v.ConfigFileUsed(), err)
 	}
-
 	return nil
 }