From 339dddf5b5e63b689352dc11ea501f3eae9d2e28 Mon Sep 17 00:00:00 2001 From: Safeer Jiwan Date: Fri, 17 May 2024 15:51:13 -0700 Subject: [PATCH] fix: have GetModuleContext use config and secrets from the context instead of creating a new managers using the envar file --- backend/controller/controller.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/backend/controller/controller.go b/backend/controller/controller.go index 41b42b22e6..c9db0696d3 100644 --- a/backend/controller/controller.go +++ b/backend/controller/controller.go @@ -657,18 +657,13 @@ nextModule: func (s *Service) GetModuleContext(ctx context.Context, req *connect.Request[ftlv1.ModuleContextRequest]) (*connect.Response[ftlv1.ModuleContextResponse], error) { name := req.Msg.Module - cm, err := cf.NewDefaultConfigurationManagerFromConfig(ctx, cf.ConfigFromEnvironment()) - if err != nil { - return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("could not get configs: %w", err)) - } + cm := cf.ConfigFromContext(ctx) + sm := cf.SecretsFromContext(ctx) + configs, err := cm.MapForModule(ctx, name) if err != nil { return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("could not get configs: %w", err)) } - sm, err := cf.NewDefaultSecretsManagerFromConfig(ctx, cf.ConfigFromEnvironment()) - if err != nil { - return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("could not get secrets: %w", err)) - } secrets, err := sm.MapForModule(ctx, name) if err != nil { return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("could not get secrets: %w", err))