Skip to content

Cleanup old code and empty password for redis by default #248

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

Merged
merged 1 commit into from
Apr 1, 2022
Merged

Cleanup old code and empty password for redis by default #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions admin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,6 @@ var validAuth = map[string]bool{
settings.AuthJSON: true,
}

// Valid values for logging in configuration
var validLogging = map[string]bool{
settings.LoggingDB: true,
settings.LoggingSplunk: true,
}

// Function to load the configuration file
func loadConfiguration(file, service string) (types.JSONConfigurationService, error) {
var cfg types.JSONConfigurationService
Expand All @@ -194,9 +188,6 @@ func loadConfiguration(file, service string) (types.JSONConfigurationService, er
if !validAuth[cfg.Auth] {
return cfg, fmt.Errorf("Invalid auth method")
}
if !validLogging[cfg.Logger] {
return cfg, fmt.Errorf("Invalid logging method")
}
// No errors!
return cfg, nil
}
Expand Down Expand Up @@ -300,7 +291,7 @@ func init() {
},
&cli.StringFlag{
Name: "redis-pass",
Value: "redis",
Value: "",
Usage: "Password to be used for redis",
EnvVars: []string{"REDIS_PASS"},
Destination: &redisConfig.Password,
Expand Down
8 changes: 1 addition & 7 deletions api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@ var validAuth = map[string]bool{
settings.AuthNone: true,
settings.AuthJWT: true,
}
var validLogging = map[string]bool{
settings.LoggingNone: true,
}

// Function to load the configuration file and assign to variables
func loadConfiguration(file string) (types.JSONConfigurationService, error) {
Expand All @@ -151,9 +148,6 @@ func loadConfiguration(file string) (types.JSONConfigurationService, error) {
if !validAuth[cfg.Auth] {
return cfg, fmt.Errorf("Invalid auth method: '%s'", cfg.Auth)
}
if !validLogging[cfg.Logger] {
return cfg, fmt.Errorf("Invalid logging method")
}
// No errors!
return cfg, nil
}
Expand Down Expand Up @@ -250,7 +244,7 @@ func init() {
},
&cli.StringFlag{
Name: "redis-pass",
Value: "redis",
Value: "",
Usage: "Password to be used for redis",
EnvVars: []string{"REDIS_PASS"},
Destination: &redisConfig.Password,
Expand Down