MM-10189 Fixed inconsistency when using environment variables for MessageExportSettings (#8705)

1 files changed, 13 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()
 		}