diff --git a/cmd/setup/setup.go b/cmd/setup/setup.go index 5e30e66..61eabb1 100644 --- a/cmd/setup/setup.go +++ b/cmd/setup/setup.go @@ -70,13 +70,13 @@ func NewRemoveCommand() *cobra.Command { return err } - config := alias.DefaultConfig() - rcFileManager, err := alias.NewDefaultRcFileManager(config.RcFileName) + cfg := alias.DefaultConfig() + rcFileManager, err := alias.NewDefaultRcFileManager(cfg.RcFileName) if err != nil { return err } - aliasManager := alias.New(config, rcFileManager) + aliasManager := alias.New(cfg, rcFileManager) return aliasManager.Remove() }, } diff --git a/config/config.go b/config/config.go index d05e13b..6e5f31c 100644 --- a/config/config.go +++ b/config/config.go @@ -31,7 +31,7 @@ type Config struct { // InsecureInstallation allows bypassing install blocking on malicious packages InsecureInstallation bool `mapstructure:"insecure_installation"` - // TrustedPackages allows for trusting an suspicious package and ignoring the suspicious behaviour for the package in future installations + // TrustedPackages allows for trusting a suspicious package and ignoring the suspicious behaviour for the package in future installations TrustedPackages TrustedPackage `mapstructure:"trusted_packages"` } diff --git a/config/config_test.go b/config/config_test.go index e034c96..4b79bee 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -69,7 +69,7 @@ transitive_depth: 7 include_dev_dependencies: true dry_run: true paranoid: true -trusted_packages: ["a","b"] +trusted_packages: {'purls': ["a", "b"]} `), 0o644)) fs := pflag.NewFlagSet("test", pflag.ContinueOnError) @@ -87,5 +87,5 @@ trusted_packages: ["a","b"] assert.True(t, cfg.IncludeDevDependencies, "include_dev_dependencies should be overridden by file to true") assert.True(t, cfg.DryRun, "dry_run should be overridden by file to true") assert.True(t, cfg.Paranoid, "paranoid should be overridden by file to true") - assert.ElementsMatch(t, []string{"a", "b"}, cfg.TrustedPackages, "trusted_packages should match file values") + assert.ElementsMatch(t, []string{"a", "b"}, cfg.TrustedPackages.Purl, "trusted_packages should match file values") } diff --git a/main.go b/main.go index 253a114..28ce213 100644 --- a/main.go +++ b/main.go @@ -63,7 +63,6 @@ func main() { } globalConfig = cfg - fmt.Printf("Config: %+v", globalConfig) log.InitZapLogger("pmg", "cli") cmd.SetContext(globalConfig.Inject(cmd.Context())) },