Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): Handle multiple modes including entityresolution mode #1816

Merged
merged 13 commits into from
Dec 6, 2024
Merged

fix(core): Handle multiple modes including entityresolution mode #1816

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
31422cd
fix multiple modes handling
elizabethhealy Dec 5, 2024
c974e86
add tests
elizabethhealy Dec 5, 2024
0d05459
mock server
elizabethhealy Dec 5, 2024
a2bcfb8
dynamic yaml files, use keycloak mock server
elizabethhealy Dec 6, 2024
58e2433
linting
elizabethhealy Dec 6, 2024
3a64b48
add postgres mocking
elizabethhealy Dec 6, 2024
f5cecb3
linting
elizabethhealy Dec 6, 2024
45c56a5
linting
elizabethhealy Dec 6, 2024
0cc2704
add container cleanup
elizabethhealy Dec 6, 2024
b1266e0
linting
elizabethhealy Dec 6, 2024
5c9e64c
cleanup existing contaieners, use unique naming, same func
elizabethhealy Dec 6, 2024
77b28cf
just error tests
elizabethhealy Dec 6, 2024
1bbc7d3
success, assertion failure on db
elizabethhealy Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions service/pkg/server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,15 @@ func Start(f ...StartOptions) error {
oidcconfig *auth.OIDCConfiguration
)

// If the mode is not all or entityresolution, we need to have a valid SDK config
// If the mode is not all, does not include both core and entityresolution, or is not entityresolution on its own, we need to have a valid SDK config
// entityresolution does not connect to other services and can run on its own
if !slices.Contains(cfg.Mode, "all") && !slices.Contains(cfg.Mode, "entityresolution") && cfg.SDKConfig == (config.SDKConfig{}) {
logger.Error("mode is not all or entityresolution, but no sdk config provided")
return errors.New("mode is not all or entityresolution, but no sdk config provided")
// core only connects to entityresolution
if !(slices.Contains(cfg.Mode, "all") || // no config required for all mode
(slices.Contains(cfg.Mode, "core") && slices.Contains(cfg.Mode, "entityresolution")) || // or core and entityresolution modes togethor
(slices.Contains(cfg.Mode, "entityresolution") && len(cfg.Mode) == 1)) && // or entityresolution on its own
elizabethhealy marked this conversation as resolved.
Show resolved Hide resolved
cfg.SDKConfig == (config.SDKConfig{}) {
logger.Error("mode is not all, entityresolution, or a combination of core and entityresolution, but no sdk config provided")
return errors.New("mode is not all, entityresolution, or a combination of core and entityresolution, but no sdk config provided")
}

// If client credentials are provided, use them
Expand All @@ -186,7 +190,7 @@ func Start(f ...StartOptions) error {
sdkOptions = append(sdkOptions, sdk.WithCustomCoreConnection(otdf.ConnectRPCInProcess.Conn()))

// handle ERS connection for core mode
if slices.Contains(cfg.Mode, "core") {
if slices.Contains(cfg.Mode, "core") && !slices.Contains(cfg.Mode, "entityresolution") {
logger.Info("core mode")

if cfg.SDKConfig.EntityResolutionConnection.Endpoint == "" {
Expand Down
Loading