Merge branch version/0-47-0-RC1 to adopt changes from PR #3512

ActiveState · Sep 25, 2024 · a384772 · a384772
2 parents 7bd12e5 + 0eb7c24
commit a384772
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/internal/config/instance.go b/internal/config/instance.go
@@ -185,7 +185,7 @@ func (i *Instance) Get(key string) interface{} {
 		return result
 	}
 	if opt := mediator.GetOption(key); mediator.KnownOption(opt) {
-		return opt.Default
+		return mediator.GetDefault(opt)
 	}
 	return nil
 }

diff --git a/internal/mediators/config/registry.go b/internal/mediators/config/registry.go
@@ -67,3 +67,10 @@ func RegisterOptionWithEvents(key string, t Type, defaultValue interface{}, get,
 func KnownOption(rule Option) bool {
 	return rule.isRegistered
 }
+
+func GetDefault(opt Option) interface{} {
+	if enum, ok := opt.Default.(*Enums); ok {
+		return enum.Default
+	}
+	return opt.Default
+}