Fix configuration with env vars

ory · Oct 24, 2019 · 03d7af1 · 03d7af1
1 parent 40e3b89
commit 03d7af1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -30,11 +30,10 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/ory/gojsonschema"
-
+	"github.com/ory/oathkeeper/driver/configuration"
 	"github.com/ory/viper"
-	"github.com/ory/x/viperx"
-
 	"github.com/ory/x/logrusx"
+	"github.com/ory/x/viperx"
 )
 
 var schemas = packr.New("schemas", "../.schemas")
@@ -63,6 +62,7 @@ func init() {
 	}
 
 	cobra.OnInitialize(func() {
+		configuration.BindEnvs()
 		viperx.InitializeConfig("oathkeeper", "", nil)
 
 		logger = logrusx.New()

diff --git a/driver/configuration/provider_viper.go b/driver/configuration/provider_viper.go
@@ -87,7 +87,7 @@ const (
 )
 
 func BindEnvs() {
-	if err := viper.BindEnv(
+	keys := []string{
 		ViperKeyProxyReadTimeout,
 		ViperKeyProxyWriteTimeout,
 		ViperKeyProxyIdleTimeout,
@@ -112,8 +112,13 @@ func BindEnvs() {
 		ViperKeyAuthenticatorOAuth2ClientCredentialsIsEnabled,
 		ViperKeyAuthenticatorOAuth2TokenIntrospectionIsEnabled,
 		ViperKeyAuthenticatorUnauthorizedIsEnabled,
-	); err != nil {
-		panic(err.Error())
+	}
+
+	for _, key := range keys {
+		env := strings.ToUpper(strings.ReplaceAll(key, ".", "_"))
+		if err := viper.BindEnv(key, env); err != nil {
+			panic(err.Error())
+		}
 	}
 }
 

diff --git a/driver/configuration/provider_viper_public_test.go b/driver/configuration/provider_viper_public_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"os"
 	"testing"
 
 	"github.com/rs/cors"
@@ -342,3 +343,21 @@ func TestAuthenticatorOAuth2TokenIntrospectionPreAuthorization(t *testing.T) {
 		})
 	}
 }
+
+func TestViperProvider_envs(t *testing.T) {
+	p := NewViperProvider(logrus.New())
+	BindEnvs()
+
+	assert.Equal(t, ":4455", p.ProxyServeAddress())
+	assert.Equal(t, false, p.AuthenticatorIsEnabled("oauth2_introspection"))
+
+	err := os.Setenv("SERVE_PROXY_HOST", "foo")
+	require.NoError(t, err)
+	err = os.Setenv("SERVE_PROXY_PORT", "8080")
+	require.NoError(t, err)
+	err = os.Setenv("AUTHENTICATORS_OAUTH2_INTROSPECTION_ENABLED", "true")
+	require.NoError(t, err)
+
+	assert.Equal(t, "foo:8080", p.ProxyServeAddress())
+	assert.Equal(t, true, p.AuthenticatorIsEnabled("oauth2_introspection"))
+}