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: config/secret override was writing merged configs #1053

Merged
merged 1 commit into from
Mar 8, 2024
Merged

fix: config/secret override was writing merged configs #1053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 31 additions & 19 deletions common/configuration/projectconfig_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ var _ Resolver[Secrets] = ProjectConfigResolver[Secrets]{}
func (p ProjectConfigResolver[R]) Role() R { var r R; return r }

func (p ProjectConfigResolver[R]) Get(ctx context.Context, ref Ref) (*url.URL, error) {
mapping, err := p.getMapping(ctx, ref.Module)
config, err := p.loadConfig(ctx)
if err != nil {
return nil, err
}
mapping, err := p.getMapping(config, ref.Module)
if err != nil {
return nil, err
}
Expand All @@ -52,7 +56,7 @@ func (p ProjectConfigResolver[R]) List(ctx context.Context) ([]Entry, error) {
moduleNames = append(moduleNames, "")
for _, moduleName := range moduleNames {
module := optional.Zero(moduleName)
mapping, err := p.getMapping(ctx, module)
mapping, err := p.getMapping(config, module)
if err != nil {
return nil, err
}
Expand All @@ -72,21 +76,29 @@ func (p ProjectConfigResolver[R]) List(ctx context.Context) ([]Entry, error) {
}

func (p ProjectConfigResolver[R]) Set(ctx context.Context, ref Ref, key *url.URL) error {
mapping, err := p.getMapping(ctx, ref.Module)
config, err := p.loadWritableConfig(ctx)
if err != nil {
return err
}
mapping, err := p.getMapping(config, ref.Module)
if err != nil {
return err
}
mapping[ref.Name] = (*pc.URL)(key)
return p.setMapping(ctx, ref.Module, mapping)
return p.setMapping(config, ref.Module, mapping)
}

func (p ProjectConfigResolver[From]) Unset(ctx context.Context, ref Ref) error {
mapping, err := p.getMapping(ctx, ref.Module)
config, err := p.loadWritableConfig(ctx)
if err != nil {
return err
}
mapping, err := p.getMapping(config, ref.Module)
if err != nil {
return err
}
delete(mapping, ref.Name)
return p.setMapping(ctx, ref.Module, mapping)
return p.setMapping(config, ref.Module, mapping)
}

func (p ProjectConfigResolver[R]) configPaths() []string {
Expand All @@ -101,23 +113,28 @@ func (p ProjectConfigResolver[R]) configPaths() []string {
return []string{}
}

func (p ProjectConfigResolver[R]) loadWritableConfig(ctx context.Context) (pc.Config, error) {
configPaths := p.configPaths()
if len(configPaths) == 0 {
return pc.Config{}, nil
}
target := configPaths[len(configPaths)-1]
log.FromContext(ctx).Tracef("Loading config from %s", target)
return pc.Load(target)
}

func (p ProjectConfigResolver[R]) loadConfig(ctx context.Context) (pc.Config, error) {
logger := log.FromContext(ctx)
configPaths := p.configPaths()
logger.Debugf("Loading config from %s", strings.Join(configPaths, " "))
logger.Tracef("Loading config from %s", strings.Join(configPaths, " "))
config, err := pc.Merge(configPaths...)
if err != nil {
return pc.Config{}, err
}
return config, nil
}

func (p ProjectConfigResolver[R]) getMapping(ctx context.Context, module optional.Option[string]) (map[string]*pc.URL, error) {
config, err := p.loadConfig(ctx)
if err != nil {
return nil, err
}

func (p ProjectConfigResolver[R]) getMapping(config pc.Config, module optional.Option[string]) (map[string]*pc.URL, error) {
var k R
get := func(dest pc.ConfigAndSecrets) map[string]*pc.URL {
switch any(k).(type) {
Expand Down Expand Up @@ -145,12 +162,7 @@ func (p ProjectConfigResolver[R]) getMapping(ctx context.Context, module optiona
return mapping, nil
}

func (p ProjectConfigResolver[R]) setMapping(ctx context.Context, module optional.Option[string], mapping map[string]*pc.URL) error {
config, err := p.loadConfig(ctx)
if err != nil {
return err
}

func (p ProjectConfigResolver[R]) setMapping(config pc.Config, module optional.Option[string], mapping map[string]*pc.URL) error {
var k R
set := func(dest *pc.ConfigAndSecrets, mapping map[string]*pc.URL) {
switch any(k).(type) {
Expand Down