fix: support globally scoped (not module-scoped) secrets/config (#1000)

block · Feb 28, 2024 · c03702d · c03702d
1 parent 9914282
commit c03702d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/go-runtime/ftl/config.go b/go-runtime/ftl/config.go
@@ -31,7 +31,10 @@ func (c *ConfigValue[T]) String() string {
 func (c *ConfigValue[T]) Get() (out T) {
 	value, ok := os.LookupEnv(fmt.Sprintf("FTL_CONFIG_%s_%s", strings.ToUpper(c.module), strings.ToUpper(c.name)))
 	if !ok {
-		return out
+		value, ok = os.LookupEnv(fmt.Sprintf("FTL_CONFIG_%s", strings.ToUpper(c.name)))
+		if !ok {
+			return out
+		}
 	}
 	if err := json.Unmarshal([]byte(value), &out); err != nil {
 		panic(fmt.Errorf("failed to parse %s value %q: %w", c, value, err))

diff --git a/go-runtime/ftl/secrets.go b/go-runtime/ftl/secrets.go
@@ -30,7 +30,10 @@ func (s *SecretValue[Type]) String() string {
 func (s *SecretValue[Type]) Get() (out Type) {
 	value, ok := os.LookupEnv(fmt.Sprintf("FTL_SECRET_%s_%s", strings.ToUpper(s.module), strings.ToUpper(s.name)))
 	if !ok {
-		return out
+		value, ok = os.LookupEnv(fmt.Sprintf("FTL_SECRET_%s", strings.ToUpper(s.name)))
+		if !ok {
+			return out
+		}
 	}
 	if err := json.Unmarshal([]byte(value), &out); err != nil {
 		panic(fmt.Errorf("failed to parse %s: %w", s, err))