primal/athens
1
0
Fork 0
mirror of https://github.com/gomods/athens synced 2026-02-03 11:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

change env var for port to ATHENS_PORT (#839)

Browse Source 
* use sys env ATHENS_PORT instead of PORT

* add default port

* validate is not needed since we default a port now. add test for default port
This commit is contained in:
Nathaniel Ward
2018-10-31 22:24:54 -04:00
committed by Manu Gupta
parent 8f4e3dc3c0
commit ed05805db6
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/config/config_test.go
+13 -1
View File
@@ -53,6 +53,18 @@ func compareStorageConfigs(parsedStorage *StorageConfig, expStorage *StorageConf
}
}
func TestPortDefaultsCorrectly(t *testing.T) {
conf := &Config{}
err := envOverride(conf)
if err != nil {
t.Fatalf("Env override failed: %v", err)
}
expPort := ":3000"
if conf.Proxy.Port != expPort {
t.Errorf("Port was incorrect. Got: %s, want: %s", conf.Proxy.Port, expPort)
}
}
func TestEnvOverrides(t *testing.T) {
expProxy := ProxyConfig{
@@ -298,7 +310,7 @@ func getEnvMap(config *Config) map[string]string {
if proxy != nil {
envVars["ATHENS_STORAGE_TYPE"] = proxy.StorageType
envVars["ATHENS_GLOBAL_ENDPOINT"] = proxy.GlobalEndpoint
envVars["PORT"] = proxy.Port
envVars["ATHENS_PORT"] = proxy.Port
envVars["BASIC_AUTH_USER"] = proxy.BasicAuthUser
envVars["BASIC_AUTH_PASS"] = proxy.BasicAuthPass
envVars["PROXY_FORCE_SSL"] = strconv.FormatBool(proxy.ForceSSL)
pkg/config/proxy.go
+1 -1
View File
@@ -4,7 +4,7 @@ package config
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"`
Port string `envconfig:"ATHENS_PORT" default:":3000"`
BasicAuthUser string `envconfig:"BASIC_AUTH_USER"`
BasicAuthPass string `envconfig:"BASIC_AUTH_PASS"`
ForceSSL bool `envconfig:"PROXY_FORCE_SSL"`