chore: moved WatchAndValidateViper to viperx

cmd/root.go

@@ -24,15 +24,13 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/fsnotify/fsnotify"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	_ "github.com/ory/jsonschema/v3/fileloader"
 	_ "github.com/ory/jsonschema/v3/httploader"
 
-	"github.com/ory/viper"
 	"github.com/ory/x/viperx"
 )
 
@@ -58,36 +56,3 @@ func Execute() {
 func init() {
 	viperx.RegisterConfigFlag(RootCmd, "oathkeeper")
 }
-
-func watchAndValidateViper() {
-	logger = viperx.InitializeConfig("oathkeeper", "", logger)
-
-	schema, err := schemas.Find("config.schema.json")
-	if err != nil {
-		logger.WithError(err).Fatal("Unable to open configuration JSON Schema.")
-	}
-
-	if err := viperx.Validate("config.schema.json", schema); err != nil {
-		viperx.LoggerWithValidationErrorFields(logger, err).
-			Fatal("The configuration is invalid and could not be loaded.")
-	}
-
-	viperx.AddWatcher(func(event fsnotify.Event) error {
-		if err := viperx.Validate("config.schema.json", schema); err != nil {
-			viperx.LoggerWithValidationErrorFields(logger, err).
-				Error("The changed configuration is invalid and could not be loaded. Rolling back to the last working configuration revision. Please address the validation errors before restarting ORY Oathkeeper.")
-			return viperx.ErrRollbackConfigurationChanges
-		}
-		return nil
-	})
-
-	viperx.WatchConfig(logger, &viperx.WatchOptions{
-		Immutables: []string{"serve", "profiling", "log"},
-		OnImmutableChange: func(key string) {
-			logger.
-				WithField("key", key).
-				WithField("reset_to", fmt.Sprintf("%v", viper.Get(key))).
-				Error("A configuration value marked as immutable has changed. Rolling back to the last working configuration revision. To reload the values please restart ORY Oathkeeper.")
-		},
-	})
-}

cmd/serve.go

@@ -43,7 +43,12 @@ on configuration options, open the configuration documentation:
 >> https://www.ory.sh/docs/oathkeeper/configuration <<
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		watchAndValidateViper()
+		logger = viperx.InitializeConfig("oathkeeper", "", logger)
+		schema, err := schemas.Find("config.schema.json")
+		if err != nil {
+			logger.WithError(err).Fatal("Unable to open configuration JSON Schema.")
+		}
+		viperx.WatchAndValidateViper(logger, schema, "ORY Oathkeeper", []string{"serve", "profiling", "log"})
 		server.RunServe(x.Version, x.Commit, x.Date)(cmd, args)
 	},
 }

go.mod

@@ -7,11 +7,12 @@ require (
 	github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/bxcodec/faker v2.0.1+incompatible
-	github.com/dgraph-io/ristretto v0.0.1
+	github.com/dgraph-io/ristretto v0.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/dlclark/regexp2 v1.2.0
-	github.com/fsnotify/fsnotify v1.4.7
+	github.com/fsnotify/fsnotify v1.4.9
 	github.com/ghodss/yaml v1.0.0
+	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
 	github.com/go-openapi/errors v0.19.2
 	github.com/go-openapi/runtime v0.19.5
 	github.com/go-openapi/strfmt v0.19.3
@@ -29,27 +30,27 @@ require (
 	github.com/huandu/xstrings v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.7
 	github.com/julienschmidt/httprouter v1.2.0
-	github.com/lib/pq v1.0.0
-	github.com/mattn/goveralls v0.0.3
+	github.com/lib/pq v1.2.0
+	github.com/mattn/goveralls v0.0.5
+	github.com/mitchellh/mapstructure v1.2.2 // indirect
 	github.com/ory/fosite v0.29.2
-	github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90
+	github.com/ory/go-acc v0.2.1
 	github.com/ory/go-convenience v0.1.0
 	github.com/ory/gojsonschema v1.2.0
 	github.com/ory/graceful v0.1.1
-	github.com/ory/herodot v0.6.2
+	github.com/ory/herodot v0.7.0
 	github.com/ory/jsonschema/v3 v3.0.1
 	github.com/ory/ladon v1.1.0
 	github.com/ory/sdk/swagutil v0.0.0-20200202121523-307941feee4b
-	github.com/ory/viper v1.5.7
-	github.com/ory/x v0.0.95
+	github.com/ory/viper v1.7.3
+	github.com/ory/x v0.0.106
 	github.com/pborman/uuid v1.2.0
-	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/pkg/errors v0.9.1
 	github.com/rs/cors v1.6.0
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.5
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/sirupsen/logrus v1.5.0
+	github.com/spf13/cobra v0.0.6
+	github.com/spf13/viper v1.6.2 // indirect
 	github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518
 	github.com/square/go-jose v2.3.1+incompatible
 	github.com/stretchr/testify v1.4.0
@@ -58,9 +59,10 @@ require (
 	github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce
 	github.com/urfave/negroni v1.0.0
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	golang.org/x/crypto v0.0.0-20200117160349-530e935923ad
+	golang.org/x/crypto v0.0.0-20200320181102-891825fb96df
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	golang.org/x/tools v0.0.0-20200203215610-ab391d50b528
+	golang.org/x/sys v0.0.0-20200321134203-328b4cd54aae // indirect
+	golang.org/x/tools v0.0.0-20200323171731-e609210bcd3f
 	gopkg.in/square/go-jose.v2 v2.3.1
 )