Commit 4f79a84e authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

set default value for Auth.JwksUrl to activate env variable

parent ad548b59

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 
variables:

  GIT_STRATEGY: clone

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-broker"

  TAG: 0.1.0

  TAG: 0.1.1



# This import is for the func_rse_docker_* functions

before_script:

src/common/settings.go

+3 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ type serverSettings struct { 
var Settings serverSettings



func ReadConfig(fname string) (log.Level, error) {



	// need to set defaults for all nested values, othervise Viper does not read them from environment!

	viper.SetDefault("CatCommand", "cat $filename")

	viper.SetDefault("TestCommand", "test -r $filename")

	viper.SetDefault("Http.Enabled", true)

	viper.SetDefault("Http.Host", "http://localhost")

	viper.SetDefault("Http.Port", 7000)

	viper.SetDefault("Http.Port", 9000)

	viper.SetDefault("Http.ChunkSize", 100000)

	viper.SetDefault("Http.Timeout", 3)

	viper.SetDefault("Rmq.Url", "amqp://guest:guest@127.0.0.1:5672")
@@ -48,6 +48,7 @@ func ReadConfig(fname string) (log.Level, error) { 
	viper.SetDefault("LogLevel", "debug")

	viper.SetDefault("Auth.Enabled", false)

	viper.SetDefault("Auth.UserList", []string{})

	viper.SetDefault("Auth.JwksUrl", "")



	if fname != "" {

		viper.SetConfigFile(fname)

src/common/version.go

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ var version string 
// Default build-time variable for library-import.

// This file is overridden on build with build-time informations.

func init() {

	version = "0.1.0"

	version = "0.1.1"

	rdbApiVersion = "v0.1"

}