fix: fall back to global secrets was not working (#1340)

fixes #1339
block · Apr 26, 2024 · 513f4e8 · 513f4e8
1 parent 7d39eb7
commit 513f4e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/common/configuration/in_memory_provider.go b/common/configuration/in_memory_provider.go
@@ -2,7 +2,6 @@ package configuration
 
 import (
 	"context"
-	"fmt"
 	"net/url"
 )
 
@@ -18,13 +17,13 @@ func NewInMemoryProvider[R Role]() *InMemoryProvider[R] {
 }
 
 func (p *InMemoryProvider[R]) Role() R     { var r R; return r }
-func (p *InMemoryProvider[R]) Key() string { return "grpc" }
+func (p *InMemoryProvider[R]) Key() string { return "inmemory" }
 
 func (p *InMemoryProvider[R]) Load(ctx context.Context, ref Ref, key *url.URL) ([]byte, error) {
 	if bytes, found := p.values[ref]; found {
 		return bytes, nil
 	}
-	return nil, fmt.Errorf("key %q not found", ref.Name)
+	return nil, ErrNotFound
 }
 
 func (p *InMemoryProvider[R]) Writer() bool {

diff --git a/common/configuration/in_memory_resolver.go b/common/configuration/in_memory_resolver.go
@@ -2,7 +2,6 @@ package configuration
 
 import (
 	"context"
-	"fmt"
 	"net/url"
 )
 
@@ -23,7 +22,7 @@ func (k InMemoryResolver[R]) Get(ctx context.Context, ref Ref) (*url.URL, error)
 	if key, found := k.keyMap[ref]; found {
 		return key, nil
 	}
-	return nil, fmt.Errorf("key %q not found", ref.Name)
+	return nil, ErrNotFound
 }
 
 func (k InMemoryResolver[R]) List(ctx context.Context) ([]Entry, error) {

diff --git a/common/configuration/manager.go b/common/configuration/manager.go
@@ -84,9 +84,8 @@ func (m *Manager[R]) getData(ctx context.Context, ref Ref) ([]byte, error) {
 	key, err := m.resolver.Get(ctx, ref)
 	// Try again at the global scope if the value is not found in module scope.
 	if ref.Module.Ok() && errors.Is(err, ErrNotFound) {
-		gref := ref
-		gref.Module = optional.None[string]()
-		key, err = m.resolver.Get(ctx, gref)
+		ref.Module = optional.None[string]()
+		key, err = m.resolver.Get(ctx, ref)
 		if err != nil {
 			return nil, err
 		}