diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/config.go | 15 | ||||
-rw-r--r-- | utils/config_test.go | 22 | ||||
-rw-r--r-- | utils/utils.go | 9 |
3 files changed, 44 insertions, 2 deletions
diff --git a/utils/config.go b/utils/config.go index 34cd0ed9f..3827cf4ee 100644 --- a/utils/config.go +++ b/utils/config.go @@ -217,7 +217,7 @@ func newViper(allowEnvironmentOverrides bool) *viper.Viper { // Set zeroed defaults for all the config settings so that Viper knows what environment variables // it needs to be looking for. The correct defaults will later be applied using Config.SetDefaults. - defaults := flattenStructToMap(structToMap(reflect.TypeOf(model.Config{}))) + defaults := getDefaultsFromStruct(model.Config{}) for key, value := range defaults { v.SetDefault(key, value) @@ -226,6 +226,10 @@ func newViper(allowEnvironmentOverrides bool) *viper.Viper { return v } +func getDefaultsFromStruct(s interface{}) map[string]interface{} { + return flattenStructToMap(structToMap(reflect.TypeOf(s))) +} + // Converts a struct type into a nested map with keys matching the struct's fields and values // matching the zeroed value of the corresponding field. func structToMap(t reflect.Type) (out map[string]interface{}) { @@ -251,7 +255,14 @@ func structToMap(t reflect.Type) (out map[string]interface{}) { case reflect.Struct: value = structToMap(field.Type) case reflect.Ptr: - value = nil + indirectType := field.Type.Elem() + + if indirectType.Kind() == reflect.Struct { + // Follow pointers to structs since we need to define defaults for their fields + value = structToMap(indirectType) + } else { + value = nil + } default: value = reflect.Zero(field.Type).Interface() } diff --git a/utils/config_test.go b/utils/config_test.go index ec66a30f0..75bbc420f 100644 --- a/utils/config_test.go +++ b/utils/config_test.go @@ -396,3 +396,25 @@ func sToP(s string) *string { func bToP(b bool) *bool { return &b } + +func TestGetDefaultsFromStruct(t *testing.T) { + s := struct { + TestSettings struct { + IntValue int + BoolValue bool + StringValue string + } + PointerToTestSettings *struct { + Value int + } + }{} + + defaults := getDefaultsFromStruct(s) + + assert.Equal(t, defaults["TestSettings.IntValue"], 0) + assert.Equal(t, defaults["TestSettings.BoolValue"], false) + assert.Equal(t, defaults["TestSettings.StringValue"], "") + assert.Equal(t, defaults["PointerToTestSettings.Value"], 0) + assert.NotContains(t, defaults, "PointerToTestSettings") + assert.Len(t, defaults, 4) +} diff --git a/utils/utils.go b/utils/utils.go index 595a9d2ba..b156f9934 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -13,6 +13,15 @@ import ( "github.com/mattermost/mattermost-server/model" ) +func StringInSlice(a string, slice []string) bool { + for _, b := range slice { + if b == a { + return true + } + } + return false +} + func StringArrayIntersection(arr1, arr2 []string) []string { arrMap := map[string]bool{} result := []string{} |