Skip to content

fix: load extraprops for a service config with remainder values #524

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

Merged
strantalis merged 3 commits into from
Apr 4, 2024
Merged

fix: load extraprops for a service config with remainder values #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf991f1
fix: load extraprops for service config with remainder values
strantalis Apr 4, 2024
be9fff6
remove commented out code
strantalis Apr 4, 2024
4d49266
Merge branch 'main' into fix-extra-props
strantalis Apr 4, 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: 0 additions & 14 deletions service/internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,5 @@ func LoadConfig(key string) (*Config, error) {
return nil, errors.Join(err, ErrLoadingConfig)
}

// Manually handle unmarshaling of ExtraProps for each service
for serviceKey, service := range config.Services {
var extraProps map[string]interface{}
if err := viper.UnmarshalKey("service."+serviceKey, &extraProps); err != nil {
return nil, errors.Join(err, ErrLoadingConfig)
}
service.ExtraProps = extraProps

// Remove "enabled" from ExtraProps
delete(extraProps, "enabled")

config.Services[serviceKey] = service // Update the service in the map
}

return config, nil
}
2 changes: 2 additions & 0 deletions service/pkg/server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ func Start(f ...StartOptions) error {
}
slog.SetDefault(logger.Logger)

slog.Debug("config loaded", slog.Any("config", conf))

slog.Info("starting opa engine")
eng, err := opa.NewEngine(conf.OPA)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion service/pkg/serviceregistry/serviceregistry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
type ServiceConfig struct {
Enabled bool `yaml:"enabled"`
Remote RemoteServiceConfig `yaml:"remote"`
ExtraProps map[string]interface{} `json:"-"`
ExtraProps map[string]interface{} `json:"-" mapstructure:",remain"`
}

type RemoteServiceConfig struct {
Expand Down