Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix yaml config bug #2140

Merged
merged 2 commits into from
Feb 25, 2021
Merged

Fix yaml config bug #2140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4140608
fix bug with finding config file
cx-joao-reigota Feb 25, 2021
4529179
fixed bug with arrays in yaml config file
cx-joao-reigota Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions internal/console/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,15 @@ var scanCmd = &cobra.Command{

func initializeConfig(cmd *cobra.Command) error {
if cfgFile == "" {
_, err := os.Stat(filepath.ToSlash(filepath.Join(filepath.Dir(path), "kics.config")))
configpath := path
info, err := os.Stat(path)
if err != nil {
return nil
}
if !info.IsDir() {
configpath = filepath.Dir(path)
}
_, err = os.Stat(filepath.ToSlash(filepath.Join(configpath, "kics.config")))
if err != nil {
if os.IsNotExist(err) {
return nil
Expand All @@ -78,7 +86,7 @@ func initializeConfig(cmd *cobra.Command) error {
if err := v.ReadInConfig(); err != nil {
return err
}
v.SetEnvPrefix("VIPER_")
v.SetEnvPrefix("KICS_")
v.AutomaticEnv()
bindFlags(cmd, v)
return nil
Expand All @@ -88,14 +96,26 @@ func bindFlags(cmd *cobra.Command, v *viper.Viper) {
cmd.Flags().VisitAll(func(f *pflag.Flag) {
if strings.Contains(f.Name, "-") {
envVarSuffix := strings.ToUpper(strings.ReplaceAll(f.Name, "-", "_"))
if err := v.BindEnv(f.Name, fmt.Sprintf("%s_%s", "VIPER_", envVarSuffix)); err != nil {
if err := v.BindEnv(f.Name, fmt.Sprintf("%s_%s", "KICS", envVarSuffix)); err != nil {
log.Err(err).Msg("Failed to bind Viper flags")
}
}
if !f.Changed && v.IsSet(f.Name) {
val := v.Get(f.Name)
if err := cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val)); err != nil {
log.Err(err).Msg("Failed to get Viper flags")
switch t := val.(type) {
case []interface{}:
var paramSlice []string
for _, param := range t {
paramSlice = append(paramSlice, param.(string))
}
valStr := strings.Join(paramSlice, ",")
if err := cmd.Flags().Set(f.Name, fmt.Sprintf("%v", valStr)); err != nil {
log.Err(err).Msg("Failed to get Viper flags")
}
default:
if err := cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val)); err != nil {
log.Err(err).Msg("Failed to get Viper flags")
}
}
}
})
Expand Down