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

Merge branch 'main' into wasaga/pomerium-disable-validation

Browse source
This commit is contained in:
Denis Mishin 2023-11-01 18:38:57 -04:00 • committed by GitHub
commit e85611b7d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 1070 additions and 838 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/databroker/config_source.go
View file

@ -112,9 +112,6 @@ func (src *ConfigSource) rebuild(ctx context.Context, firstTime firstTime) {
// add all the config policies to the list
for _, id := range ids {
cfgpb := src.dbConfigs[id]
if cfgpb.GetVersion() > 0 {
cfg.Version = cfgpb.GetVersion()
}
cfg.Options.ApplySettings(ctx, certsIndex, cfgpb.Settings)
var errCount uint64
@ -174,7 +171,7 @@ func (src *ConfigSource) rebuild(ctx context.Context, firstTime firstTime) {
// add the additional policies here since calling `Validate` will reset them.
cfg.Options.AdditionalPolicies = append(cfg.Options.AdditionalPolicies, additionalPolicies...)
log.Info(ctx).Int64("config-version", cfg.Version).Msg("databroker: built new config")
log.Info(ctx).Msg("databroker: built new config")
src.computedConfig = cfg
if !firstTime {