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

envoy: remove deprecated access_log_path (#2523)

Browse source
This commit is contained in:
Caleb Doxsey 2021-08-25 09:19:35 -06:00 • committed by GitHub
parent 2389f8f5e5
commit db43014d78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
config/envoyconfig/bootstrap.go
View file

@ -2,12 +2,15 @@ package envoyconfig
import ( import (
"fmt" "fmt"
"os"
envoy_config_accesslog_v3 "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3"
envoy_config_bootstrap_v3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3" envoy_config_bootstrap_v3 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
envoy_config_metrics_v3 "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3" envoy_config_metrics_v3 "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3"
envoy_extensions_access_loggers_file_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3"
"google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
@ -16,16 +19,27 @@ import (
) )
// BuildBootstrapAdmin builds the admin config for the envoy bootstrap. // BuildBootstrapAdmin builds the admin config for the envoy bootstrap.
func (b *Builder) BuildBootstrapAdmin(cfg *config.Config) (*envoy_config_bootstrap_v3.Admin, error) { func (b *Builder) BuildBootstrapAdmin(cfg *config.Config) (admin *envoy_config_bootstrap_v3.Admin, err error) {
adminAddr, err := parseAddress(cfg.Options.EnvoyAdminAddress) admin = &envoy_config_bootstrap_v3.Admin{
ProfilePath: cfg.Options.EnvoyAdminProfilePath,
}
admin.Address, err = parseAddress(cfg.Options.EnvoyAdminAddress)
if err != nil { if err != nil {
return nil, fmt.Errorf("envoyconfig: invalid envoy admin address: %w", err) return nil, fmt.Errorf("envoyconfig: invalid envoy admin address: %w", err)
} }
return &envoy_config_bootstrap_v3.Admin{
AccessLogPath: cfg.Options.EnvoyAdminAccessLogPath, if cfg.Options.EnvoyAdminAccessLogPath != os.DevNull && cfg.Options.EnvoyAdminAccessLogPath != "" {
ProfilePath: cfg.Options.EnvoyAdminProfilePath, tc := marshalAny(&envoy_extensions_access_loggers_file_v3.FileAccessLog{
Address: adminAddr, Path: cfg.Options.EnvoyAdminAccessLogPath,
}, nil })
admin.AccessLog = append(admin.AccessLog, &envoy_config_accesslog_v3.AccessLog{
Name: "envoy.access_loggers.file",
ConfigType: &envoy_config_accesslog_v3.AccessLog_TypedConfig{TypedConfig: tc},
})
}
return admin, nil
} }
// BuildBootstrapLayeredRuntime builds the layered runtime for the envoy bootstrap. // BuildBootstrapLayeredRuntime builds the layered runtime for the envoy bootstrap.