3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-21 10:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

databroker: fix fast forward (#4194)

Browse source 
databroker: fix fast forward (#4192)

* databroker: sort configs

* databroker: fix fast-forward

* newest not oldest

Co-authored-by: Caleb Doxsey <cdoxsey@pomerium.com>
This commit is contained in:
backport-actions-token[bot] 2023-05-23 15:47:07 -06:00 • committed by GitHub
parent ca59798540
commit 4aa6960e06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 113 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/databroker/config_source.go
View file

@ -81,7 +81,7 @@ func (src *ConfigSource) rebuild(ctx context.Context, firstTime firstTime) {
// start the updater
src.runUpdater(cfg)
seen := map[uint64]struct{}{}
seen := map[uint64]string{}
for _, policy := range cfg.Options.GetAllPolicies() {
id, err := policy.RouteID()
if err != nil {
@ -90,7 +90,7 @@ func (src *ConfigSource) rebuild(ctx context.Context, firstTime firstTime) {
Msg("databroker: invalid policy config, ignoring")
return
}
seen[id] = struct{}{}
seen[id] = ""
}
var additionalPolicies []config.Policy
@ -145,11 +145,12 @@ func (src *ConfigSource) rebuild(ctx context.Context, firstTime firstTime) {
errCount++
log.Warn(ctx).Err(err).
Str("db_config_id", id).
Str("seen-in", seen[routeID]).
Str("policy", policy.String()).
Msg("databroker: duplicate policy detected, ignoring")
continue
}
seen[routeID] = struct{}{}
seen[routeID] = id
additionalPolicies = append(additionalPolicies, *policy)
}