refactor: centralise config/secrets/dbs/mocks into ModuleContext #1395
Conversation
| @@ -60,6 +55,64 @@ func TestManager(t *testing.T) { | |||
| }) | |||
| } | |||
|
|
|||
| // TestMapPriority checks that module specific configs beat global configs when flattening for a module | |||
| func TestMapPriority(t *testing.T) { | |||
There was a problem hiding this comment.
moved from module_context_test.go
| @@ -1,8 +0,0 @@ | |||
| [global] | |||
There was a problem hiding this comment.
Removed because config/secret behavior is no longer tightly tied to project files
| // This is useful for testing and development, where the environment is used to provide | ||
| // configurations, secrets and DSNs. The context is built from a combination of | ||
| // the ftl-project.toml file and (for now) environment variables. | ||
| func FromEnvironment(ctx context.Context, module string, isTesting bool) (*ModuleContext, error) { |
There was a problem hiding this comment.
moved from module_context.go
matt2e
force-pushed
the
matt2e/go-runtime-no-config
branch
from
247e043 to
1b31a1d
Compare
| // configurations, secrets and DSNs. The context is built from a combination of | ||
| // the ftl-project.toml file and (for now) environment variables. | ||
| func FromEnvironment(ctx context.Context, module string, isTesting bool) (*ModuleContext, error) { | ||
| // TODO: split this func into separate purposes: explicitly reading a particular project file, and reading DSNs from environment |
There was a problem hiding this comment.
Related to this issue: #1391
matt2e
force-pushed
the
matt2e/go-runtime-no-config
branch
from
1b31a1d to
658ea91
Compare
| if mock, ok := m.mockVerbs[ref]; ok { | ||
| return MockBehavior{Mock: mock}, nil | ||
| } | ||
| // TODO: add logic here for when to do direct behavior |
There was a problem hiding this comment.
Will be done in this PR after it rebases on this one: #1373
| ) | ||
|
|
||
| type Ref struct { |
There was a problem hiding this comment.
Can we use a schema.RefKey here? We're proliferating Refs for no real reason I think, so I'm trying to consolidate them. schema.Ref has a method to retrieve a RefKey.
| return moduleCtx | ||
| } | ||
|
|
||
| func FromContext(ctx context.Context) *ModuleContext { |
There was a problem hiding this comment.
Comments.
Please add useful comments to all code going into go-runtime.
| } | ||
|
|
||
| // SetSecret sets a secret value for the module. | ||
| func (m *ModuleContext) SetSecret(name string, value any) error { |
There was a problem hiding this comment.
Do we nede setters? Can we not make the ModuleContext immutable?
If we don't, it will need locks because it could be accessed from multiple threads, but I'd vastly prefer it to be immutable.
There was a problem hiding this comment.
Will make another issue for that
| return resp, fmt.Errorf("%s: %w", callee, err) | ||
| } | ||
| switch behavior := behavior.(type) { | ||
| case modulecontext.MockBehavior: |
There was a problem hiding this comment.
Instead of a switch in the call function with logic in each case, move the logic into the respective VerbBehaviour implementations. A general pattern to watch for is that if significant logic around a "switch" is occurring outside the thing being switched on it might be time to encapsulate that logic into a method.
configurationpackage in go-runtimecall.gonow asks ModuleContext for any custom behaviour as required by the test set up. This includes verb mocks, whether to allow calling the verb directly, or custom errors in testing environments