initialize auth url

Signed-off-by: mteodor <mirko.teodorovic@gmail.com>
absmach · Dec 13, 2021 · b13ae3c · b13ae3c
1 parent 8741b32
commit b13ae3c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/cmd/cassandra-reader/main.go b/cmd/cassandra-reader/main.go
@@ -47,8 +47,9 @@ const (
 	defServerCert        = ""
 	defServerKey         = ""
 	defJaegerURL         = ""
-	defThingsAuthURL     = "localhost:8181"
+	defThingsAuthURL     = "localhost:8183"
 	defThingsAuthTimeout = "1s"
+	defUsersAuthURL      = "localhost:8181"
 	defUsersAuthTimeout  = "1s"
 
 	envLogLevel          = "MF_CASSANDRA_READER_LOG_LEVEL"
@@ -65,6 +66,7 @@ const (
 	envJaegerURL         = "MF_JAEGER_URL"
 	envThingsAuthURL     = "MF_THINGS_AUTH_GRPC_URL"
 	envThingsAuthTimeout = "MF_THINGS_AUTH_GRPC_TIMEOUT"
+	envUsersAuthURL      = "MF_AUTH_GRPC_URL"
 	envUsersAuthTimeout  = "MF_AUTH_GRPC_TIMEOUT"
 )
 
@@ -175,6 +177,11 @@ func loadConfig() config {
 		log.Fatalf("Invalid %s value: %s", envThingsAuthTimeout, err.Error())
 	}
 
+	usersAuthTimeout, err := time.ParseDuration(mainflux.Env(envUsersAuthTimeout, defUsersAuthTimeout))
+	if err != nil {
+		log.Fatalf("Invalid %s value: %s", envThingsAuthTimeout, err.Error())
+	}
+
 	return config{
 		logLevel:          mainflux.Env(envLogLevel, defLogLevel),
 		port:              mainflux.Env(envPort, defPort),
@@ -185,6 +192,8 @@ func loadConfig() config {
 		serverKey:         mainflux.Env(envServerKey, defServerKey),
 		jaegerURL:         mainflux.Env(envJaegerURL, defJaegerURL),
 		thingsAuthURL:     mainflux.Env(envThingsAuthURL, defThingsAuthURL),
+		usersAuthURL:      mainflux.Env(envUsersAuthURL, defUsersAuthURL),
+		usersAuthTimeout:  usersAuthTimeout,
 		thingsAuthTimeout: authTimeout,
 	}
 }

diff --git a/cmd/influxdb-reader/main.go b/cmd/influxdb-reader/main.go
@@ -42,8 +42,8 @@ const (
 	defServerKey         = ""
 	defJaegerURL         = ""
 	defThingsAuthURL     = "localhost:8183"
-	defUsersAuthURL      = "localhost:8181"
 	defThingsAuthTimeout = "1s"
+	defUsersAuthURL      = "localhost:8181"
 	defUsersAuthTimeout  = "1s"
 
 	envLogLevel          = "MF_INFLUX_READER_LOG_LEVEL"

diff --git a/cmd/mongodb-reader/main.go b/cmd/mongodb-reader/main.go
@@ -44,9 +44,9 @@ const (
 	defServerCert        = ""
 	defServerKey         = ""
 	defJaegerURL         = ""
-	defThingsAuthURL     = "localhost:8181"
-	defUsersAuthURL      = "localhost:8181"
+	defThingsAuthURL     = "localhost:8183"
 	defThingsAuthTimeout = "1s"
+	defUsersAuthURL      = "localhost:8181"
 	defUsersAuthTimeout  = "1s"
 
 	envLogLevel          = "MF_MONGO_READER_LOG_LEVEL"
@@ -61,6 +61,8 @@ const (
 	envJaegerURL         = "MF_JAEGER_URL"
 	envThingsAuthURL     = "MF_THINGS_AUTH_GRPC_URL"
 	envThingsAuthTimeout = "MF_THINGS_AUTH_GRPC_TIMEOUT"
+	envUsersAuthURL      = "MF_AUTH_GRPC_URL"
+	envUsersAuthTimeout  = "MF_AUTH_GRPC_TIMEOUT"
 )
 
 type config struct {
@@ -157,6 +159,11 @@ func loadConfigs() config {
 		log.Fatalf("Invalid %s value: %s", envThingsAuthTimeout, err.Error())
 	}
 
+	usersAuthTimeout, err := time.ParseDuration(mainflux.Env(envUsersAuthTimeout, defUsersAuthTimeout))
+	if err != nil {
+		log.Fatalf("Invalid %s value: %s", envThingsAuthTimeout, err.Error())
+	}
+
 	return config{
 		logLevel:          mainflux.Env(envLogLevel, defLogLevel),
 		port:              mainflux.Env(envPort, defPort),
@@ -169,7 +176,9 @@ func loadConfigs() config {
 		serverKey:         mainflux.Env(envServerKey, defServerKey),
 		jaegerURL:         mainflux.Env(envJaegerURL, defJaegerURL),
 		thingsAuthURL:     mainflux.Env(envThingsAuthURL, defThingsAuthURL),
+		usersAuthURL:      mainflux.Env(envUsersAuthURL, defUsersAuthURL),
 		thingsAuthTimeout: authTimeout,
+		usersAuthTimeout:  usersAuthTimeout,
 	}
 }
 

diff --git a/cmd/postgres-reader/main.go b/cmd/postgres-reader/main.go
@@ -49,8 +49,9 @@ const (
 	defDBSSLKey          = ""
 	defDBSSLRootCert     = ""
 	defJaegerURL         = ""
-	defThingsAuthURL     = "localhost:8181"
+	defThingsAuthURL     = "localhost:8183"
 	defThingsAuthTimeout = "1s"
+	defUsersAuthURL      = "localhost:8181"
 	defUsersAuthTimeout  = "1s"
 
 	envLogLevel          = "MF_POSTGRES_READER_LOG_LEVEL"
@@ -69,7 +70,7 @@ const (
 	envJaegerURL         = "MF_JAEGER_URL"
 	envThingsAuthURL     = "MF_THINGS_AUTH_GRPC_URL"
 	envThingsAuthTimeout = "MF_THINGS_AUTH_GRPC_TIMEOUT"
-	envAuthURL           = "MF_AUTH_GRPC_URL"
+	envUsersAuthURL      = "MF_AUTH_GRPC_URL"
 	envUsersAuthTimeout  = "MF_AUTH_GRPC_TIMEOUT"
 )
 
@@ -178,6 +179,11 @@ func loadConfig() config {
 		log.Fatalf("Invalid %s value: %s", envThingsAuthTimeout, err.Error())
 	}
 
+	usersAuthTimeout, err := time.ParseDuration(mainflux.Env(envUsersAuthTimeout, defUsersAuthTimeout))
+	if err != nil {
+		log.Fatalf("Invalid %s value: %s", envThingsAuthTimeout, err.Error())
+	}
+
 	return config{
 		logLevel:          mainflux.Env(envLogLevel, defLogLevel),
 		port:              mainflux.Env(envPort, defPort),
@@ -186,7 +192,9 @@ func loadConfig() config {
 		dbConfig:          dbConfig,
 		jaegerURL:         mainflux.Env(envJaegerURL, defJaegerURL),
 		thingsAuthURL:     mainflux.Env(envThingsAuthURL, defThingsAuthURL),
+		usersAuthURL:      mainflux.Env(envUsersAuthURL, defUsersAuthURL),
 		thingsAuthTimeout: authTimeout,
+		usersAuthTimeout:  usersAuthTimeout,
 	}
 }