3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-17 19:17:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

databroker: sort configs (#4190)

Browse source
This commit is contained in:
Caleb Doxsey 2023-05-23 10:08:29 -06:00 • committed by GitHub
parent 7899e40973
commit fe8e788076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/databroker/config_source.go
View file

@ -2,9 +2,12 @@ package databroker
import (
"context"
"sort"
"sync"
"time"
"golang.org/x/exp/maps"
"github.com/pomerium/pomerium/config"
"github.com/pomerium/pomerium/internal/hashutil"
"github.com/pomerium/pomerium/internal/log"
@ -92,8 +95,13 @@ func (src *ConfigSource) rebuild(ctx context.Context, firstTime firstTime) {
var additionalPolicies []config.Policy
ids := maps.Keys(src.dbConfigs)
sort.Strings(ids)
// add all the config policies to the list
for id, cfgpb := range src.dbConfigs {
for _, id := range ids {
cfgpb := src.dbConfigs[id]
cfg.Options.ApplySettings(ctx, cfgpb.Settings)
var errCount uint64