cfg: added check for key prefixes;

pkg/cfg/config.go

@@ -39,6 +39,7 @@ type Config interface {
 	GetStringSlice(key string, optionalDefault ...[]string) []string
 	GetTime(key string, optionalDefault ...time.Time) time.Time
 	IsSet(string) bool
+	HasPrefix(prefix string) bool
 	UnmarshalDefaults(val interface{}, additionalDefaults ...UnmarshalDefaults)
 	UnmarshalKey(key string, val interface{}, additionalDefaults ...UnmarshalDefaults)
 }
@@ -297,6 +298,16 @@ func (c *config) IsSet(key string) bool {
 	return c.isSet(key)
 }
 
+func (c *config) HasPrefix(prefix string) bool {
+	envPrefix := c.resolveEnvKey(c.envKeyPrefix, prefix)
+
+	if c.envProvider.PrefixExists(envPrefix) {
+		return true
+	}
+
+	return c.IsSet(prefix)
+}
+
 func (c *config) Option(options ...Option) error {
 	for _, opt := range options {
 		if err := opt(c); err != nil {

pkg/cfg/config_test.go

@@ -76,6 +76,31 @@ func (s *ConfigTestSuite) TestConfig_IsSet() {
 	s.False(s.config.IsSet("missing"))
 }
 
+func (s *ConfigTestSuite) TestConfig_HasPrefix() {
+	s.setupConfigValues(map[string]interface{}{
+		"i": 1,
+		"ms": map[string]interface{}{
+			"b": true,
+		},
+	})
+
+	s.True(s.config.HasPrefix("i"))
+	s.False(s.config.HasPrefix("k"))
+	s.True(s.config.HasPrefix("ms"))
+	s.True(s.config.HasPrefix("ms.b"))
+	s.False(s.config.HasPrefix("ms.b.c"))
+
+	s.setupEnvironment(map[string]string{
+		"FOO":          "bar",
+		"NESTED_KEY_A": "1",
+	})
+
+	s.True(s.config.HasPrefix("foo"))
+	s.False(s.config.HasPrefix("baz"))
+	s.True(s.config.HasPrefix("nested.key"))
+	s.False(s.config.HasPrefix("nested.keys"))
+}
+
 func (s *ConfigTestSuite) TestConfig_Get() {
 	s.setupConfigValues(map[string]interface{}{
 		"i": 1,

pkg/cfg/environment.go

@@ -2,10 +2,14 @@ package cfg
 
 import (
 	"os"
+	"strings"
+
+	"github.com/justtrackio/gosoline/pkg/funk"
 )
 
 type EnvProvider interface {
 	LookupEnv(key string) (string, bool)
+	PrefixExists(prefix string) bool
 	SetEnv(key string, value string) error
 }
 
@@ -20,6 +24,20 @@ func (o *osEnvProvider) LookupEnv(key string) (string, bool) {
 	return os.LookupEnv(key)
 }
 
+func (o *osEnvProvider) PrefixExists(prefix string) bool {
+	envs := os.Environ()
+
+	for _, env := range envs {
+		key, _, _ := strings.Cut(env, "=")
+
+		if strings.HasPrefix(key, prefix) {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (o *osEnvProvider) SetEnv(key string, value string) error {
 	return os.Setenv(key, value)
 }
@@ -28,9 +46,9 @@ type memoryEnvProvider struct {
 	values map[string]string
 }
 
-func NewMemoryEnvProvider() *memoryEnvProvider {
+func NewMemoryEnvProvider(initialValues ...map[string]string) *memoryEnvProvider {
 	return &memoryEnvProvider{
-		values: make(map[string]string),
+		values: funk.MergeMaps(initialValues...),
 	}
 }
 
@@ -40,6 +58,16 @@ func (m *memoryEnvProvider) LookupEnv(key string) (string, bool) {
 	return val, ok
 }
 
+func (o *memoryEnvProvider) PrefixExists(prefix string) bool {
+	for key := range o.values {
+		if strings.HasPrefix(key, prefix) {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (m *memoryEnvProvider) SetEnv(key string, value string) error {
 	m.values[key] = value
 	return nil

pkg/cfg/environment_test.go

@@ -0,0 +1,23 @@
+package cfg_test
+
+import (
+	"os"
+	"testing"
+
+	"github.com/justtrackio/gosoline/pkg/cfg"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOsPrefixExists(t *testing.T) {
+	os.Setenv("GOSOLINE_TEST", "foobar")
+
+	provider := cfg.NewOsEnvProvider()
+	assert.True(t, provider.PrefixExists("GOSOLINE"))
+}
+
+func TestMemoryPrefixExists(t *testing.T) {
+	provider := cfg.NewMemoryEnvProvider(map[string]string{
+		"GOSOLINE_TEST": "foobar",
+	})
+	assert.True(t, provider.PrefixExists("GOSOLINE"))
+}

pkg/cloud/aws/credentials.go

@@ -38,7 +38,7 @@ func GetAssumeRoleCredentialsProvider(ctx context.Context, roleArn string) (aws.
 }
 
 func UnmarshalCredentials(config cfg.Config) *Credentials {
-	if !config.IsSet("cloud.aws.credentials") {
+	if !config.HasPrefix("cloud.aws.credentials") {
 		return nil
 	}
 

pkg/cloud/aws/credentials_test.go

@@ -30,7 +30,7 @@ func (s *CredentialsTestSuite) SetupTest() {
 }
 
 func (s *CredentialsTestSuite) TestNoConfiguredProvider() {
-	s.config.On("IsSet", "cloud.aws.credentials").Return(false)
+	s.config.On("HasPrefix", "cloud.aws.credentials").Return(false)
 
 	provider, err := gosoAws.GetCredentialsProvider(s.ctx, s.config, gosoAws.ClientSettings{})
 
@@ -39,7 +39,7 @@ func (s *CredentialsTestSuite) TestNoConfiguredProvider() {
 }
 
 func (s *CredentialsTestSuite) TestStaticCredentialsProvider() {
-	s.config.On("IsSet", "cloud.aws.credentials").Return(true)
+	s.config.On("HasPrefix", "cloud.aws.credentials").Return(true)
 	s.config.On("UnmarshalKey", "cloud.aws.credentials", mock.AnythingOfType("*aws.Credentials")).Run(func(args mock.Arguments) {
 		credentials := args.Get(1).(*gosoAws.Credentials)