diff --git a/cmd/proxy/actions/app.go b/cmd/proxy/actions/app.go index 32e28d2b..7a1404ad 100644 --- a/cmd/proxy/actions/app.go +++ b/cmd/proxy/actions/app.go @@ -119,7 +119,7 @@ func App(conf *config.Config) (*buffalo.App, error) { initializeAuth(app) - if !conf.Proxy.FilterOff { + if !conf.FilterOff() { mf, err := module.NewFilter(conf.FilterFile) if err != nil { lggr.Fatal(err) diff --git a/config.dev.toml b/config.dev.toml index 1654d78d..9ded2d7a 100644 --- a/config.dev.toml +++ b/config.dev.toml @@ -46,7 +46,7 @@ CloudRuntime = "none" # The filename for the include exclude filter. Defaults to 'filter.conf' # Env override: ATHENS_FILTER_FILE -FilterFile = "filter.conf" +FilterFile = "" # Timeout is the timeout for external network calls in seconds # This value is used as the default for storage backends if they don't specify timeouts @@ -75,11 +75,6 @@ Timeout = 300 # Env override: ATHENS_REDIS_QUEUE_ADDRESS RedisQueueAddress = ":6379" - # Flag to turn off Proxy Filter middleware - # Defaults to true - # Env override: PROXY_FILTER_OFF - FilterOff = true - # Username for basic auth # Env override: BASIC_AUTH_USER BasicAuthUser = "" diff --git a/pkg/config/config.go b/pkg/config/config.go index 2ae51ee2..80f68d9f 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -28,6 +28,11 @@ type Config struct { Storage *StorageConfig } +// FilterOff returns true if the FilterFile is empty +func (c *Config) FilterOff() bool { + return c.FilterFile == "" +} + // ParseConfigFile parses the given file into an athens config struct func ParseConfigFile(configFile string) (*Config, error) { diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 3af8cdcd..b03e832d 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -59,7 +59,6 @@ func TestEnvOverrides(t *testing.T) { StorageType: "minio", GlobalEndpoint: "mytikas.gomods.io", Port: ":7000", - FilterOff: false, BasicAuthUser: "testuser", BasicAuthPass: "testpass", ForceSSL: true, @@ -77,7 +76,6 @@ func TestEnvOverrides(t *testing.T) { BuffaloLogLevel: "info", GoBinary: "go11", CloudRuntime: "gcp", - FilterFile: "filter2.conf", TimeoutConf: TimeoutConf{ Timeout: 30, }, @@ -203,7 +201,6 @@ func TestParseExampleConfig(t *testing.T) { StorageType: "memory", GlobalEndpoint: "http://localhost:3001", Port: ":3000", - FilterOff: true, BasicAuthUser: "", BasicAuthPass: "", } @@ -263,7 +260,6 @@ func TestParseExampleConfig(t *testing.T) { GoGetWorkers: 30, ProtocolWorkers: 30, CloudRuntime: "none", - FilterFile: "filter.conf", TimeoutConf: TimeoutConf{ Timeout: 300, }, @@ -294,7 +290,6 @@ func getEnvMap(config *Config) map[string]string { "ATHENS_LOG_LEVEL": config.LogLevel, "BUFFALO_LOG_LEVEL": config.BuffaloLogLevel, "ATHENS_CLOUD_RUNTIME": config.CloudRuntime, - "ATHENS_FILTER_FILE": config.FilterFile, "ATHENS_TIMEOUT": strconv.Itoa(config.Timeout), "ATHENS_TRACE_EXPORTER": config.TraceExporterURL, } @@ -304,7 +299,6 @@ func getEnvMap(config *Config) map[string]string { envVars["ATHENS_STORAGE_TYPE"] = proxy.StorageType envVars["ATHENS_GLOBAL_ENDPOINT"] = proxy.GlobalEndpoint envVars["PORT"] = proxy.Port - envVars["PROXY_FILTER_OFF"] = strconv.FormatBool(proxy.FilterOff) envVars["BASIC_AUTH_USER"] = proxy.BasicAuthUser envVars["BASIC_AUTH_PASS"] = proxy.BasicAuthPass envVars["PROXY_FORCE_SSL"] = strconv.FormatBool(proxy.ForceSSL) diff --git a/pkg/config/proxy.go b/pkg/config/proxy.go index 95872dfe..a1adffc9 100644 --- a/pkg/config/proxy.go +++ b/pkg/config/proxy.go @@ -5,7 +5,6 @@ type ProxyConfig struct { StorageType string `validate:"required" envconfig:"ATHENS_STORAGE_TYPE"` GlobalEndpoint string `envconfig:"ATHENS_GLOBAL_ENDPOINT"` // This feature is not yet implemented Port string `validate:"required" envconfig:"PORT"` - FilterOff bool `envconfig:"PROXY_FILTER_OFF"` BasicAuthUser string `envconfig:"BASIC_AUTH_USER"` BasicAuthPass string `envconfig:"BASIC_AUTH_PASS"` ForceSSL bool `envconfig:"PROXY_FORCE_SSL"`