TrueCloudLab
/
frostfs-s3-gw
16
2
Fork 14
Code Issues 19 Pull Requests 4 Actions Packages Releases 6 Activity

[#266] Fix namespace config initialization
/ DCO (pull_request) Successful in 4m34s Details
/ Builds (1.20) (pull_request) Successful in 4m59s Details
/ Builds (1.21) (pull_request) Successful in 4m49s Details
/ Vulncheck (pull_request) Successful in 5m22s Details
/ Lint (pull_request) Successful in 8m8s Details
/ Tests (1.20) (pull_request) Successful in 4m37s Details
/ Tests (1.21) (pull_request) Successful in 5m28s Details 

Don't use nil Namespaces map in case when file isn't provided or invalid

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
pull/274/head
Denis Kirillov 2023-12-01 15:42:50 +03:00
parent 28c6bb4cb8
commit 5c0a502261
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/s3-gw/app_settings.go
View File

@ -482,7 +482,7 @@ func fetchNamespacesConfig(l *zap.Logger, v *viper.Viper) NamespacesConfig {
nsConfig, err := readNamespacesConfig(v.GetString(cfgNamespacesConfig))
if err != nil {
l.Warn(logs.FailedToParseNamespacesConfig)
l.Warn(logs.FailedToParseNamespacesConfig, zap.Error(err))
}
defaultNamespacesNames := fetchDefaultNamespaces(l, v)
@ -516,18 +516,21 @@ func fetchNamespacesConfig(l *zap.Logger, v *viper.Viper) NamespacesConfig {
}
func readNamespacesConfig(filepath string) (NamespacesConfig, error) {
nsConfig := NamespacesConfig{
Namespaces: make(Namespaces),
}
if filepath == "" {
return NamespacesConfig{}, nil
return nsConfig, nil
}
data, err := os.ReadFile(filepath)
if err != nil {
return NamespacesConfig{}, fmt.Errorf("failed to read namespace config '%s': %w", filepath, err)
return nsConfig, fmt.Errorf("failed to read namespace config '%s': %w", filepath, err)
}
var nsConfig NamespacesConfig
if err = json.Unmarshal(data, &nsConfig); err != nil {
return NamespacesConfig{}, fmt.Errorf("failed to parse namespace config: %w", err)
return nsConfig, fmt.Errorf("failed to parse namespace config: %w", err)
}
return nsConfig, nil