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

config: add enable_google_cloud_serverless_authentication to config protobuf (#2306)

Browse source 
* config: add enable_google_cloud_serverless_authentication to config protobuf

* use dependency injection for embedded envoy provider

* Revert "use dependency injection for embedded envoy provider"

This reverts commit 5c08990501.

* config: attach envoy version to Config to avoid metrics depending on envoy/files
This commit is contained in:
Caleb Doxsey 2021-06-21 18:00:29 -06:00 • committed by GitHub
parent 8cd1f42281
commit fcb33966e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 477 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/config_source.go
View file

@ -97,7 +97,7 @@ type FileOrEnvironmentSource struct {
}
// NewFileOrEnvironmentSource creates a new FileOrEnvironmentSource.
func NewFileOrEnvironmentSource(configFile string) (*FileOrEnvironmentSource, error) {
func NewFileOrEnvironmentSource(configFile, envoyVersion string) (*FileOrEnvironmentSource, error) {
ctx := log.WithContext(context.TODO(), func(c zerolog.Context) zerolog.Context {
return c.Str("config_file_source", configFile)
})
@ -107,7 +107,10 @@ func NewFileOrEnvironmentSource(configFile string) (*FileOrEnvironmentSource, er
return nil, err
}
cfg := &Config{Options: options}
cfg := &Config{
Options: options,
EnvoyVersion: envoyVersion,
}
metrics.SetConfigInfo(ctx, cfg.Options.Services, "local", cfg.Checksum(), true)
src := &FileOrEnvironmentSource{
@ -130,7 +133,8 @@ func (src *FileOrEnvironmentSource) onConfigChange(ctx context.Context) func(fsn
cfg := src.config
options, err := newOptionsFromConfig(src.configFile)
if err == nil {
cfg = &Config{Options: options}
cfg = cfg.Clone()
cfg.Options = options
metrics.SetConfigInfo(ctx, cfg.Options.Services, "local", cfg.Checksum(), true)
} else {
log.Error(ctx).Err(err).Msg("config: error updating config")