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

remove deprecated cache_service_url config option (#1614)

Browse source 
* remove deprecated cache_service_url config option

* remove broken test

* update integration test config

* update nginx example

Co-authored-by: Travis Groth <travisgroth@users.noreply.github.com>
This commit is contained in:
Caleb Doxsey 2020-11-23 14:57:29 -07:00 • committed by GitHub
parent ee03d0e9f8
commit 2d5690dde6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 133 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

19
config/options.go
View file

@ -238,14 +238,6 @@ type Options struct {
ForwardAuthURLString string `mapstructure:"forward_auth_url" yaml:"forward_auth_url,omitempty"`
ForwardAuthURL *url.URL `yaml:",omitempty"`
// CacheURL is the routable destination of the cache service's
// gRPC endpoint. NOTE: As many load balancers do not support
// externally routed gRPC so this may be an internal location.
//
// TODO(BDD): Deprecate and remove in 0.11.0
CacheURLString string `mapstructure:"cache_service_url" yaml:"cache_service_url,omitempty"`
CacheURL *url.URL `yaml:",omitempty"`
// DataBrokerURL is the routable destination of the databroker service's gRPC endpiont.
DataBrokerURLString string `mapstructure:"databroker_service_url" yaml:"databroker_service_url,omitempty"`
DataBrokerURL *url.URL `yaml:",omitempty"`
@ -504,15 +496,11 @@ func (o *Options) Validate() error {
if o.AuthorizeURLString == "" {
o.AuthorizeURLString = "http://127.0.0.1" + DefaultAlternativeAddr
}
if o.CacheURLString == "" {
o.CacheURLString = "http://127.0.0.1" + DefaultAlternativeAddr
if o.DataBrokerURLString == "" {
o.DataBrokerURLString = "http://127.0.0.1" + DefaultAlternativeAddr
}
}
if o.DataBrokerURLString == "" {
log.Warn().Msg("config: cache url will be deprecated in v0.11.0")
o.DataBrokerURLString = o.CacheURLString
}
switch o.DataBrokerStorageType {
case StorageInMemoryName:
case StorageRedisName:
@ -929,9 +917,6 @@ func (o *Options) ApplySettings(settings *config.Settings) {
if settings.ForwardAuthUrl != nil {
o.ForwardAuthURLString = settings.GetForwardAuthUrl()
}
if settings.CacheServiceUrl != nil {
o.CacheURLString = settings.GetCacheServiceUrl()
}
if settings.DatabrokerServiceUrl != nil {
o.DataBrokerURLString = settings.GetDatabrokerServiceUrl()
}