From 9f260950af1b1db459ab50032c591eb8a8fdef7f Mon Sep 17 00:00:00 2001
From: Akshay Gaikwad <akshay.gaikwad@rafay.co>
Date: Tue, 15 Mar 2022 10:22:09 +0530
Subject: [PATCH] Drop KRATOS_SCHEME env var

---
 env.example |  3 +--
 main.go     | 18 ++++++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/env.example b/env.example
index 05c109e..831810a 100644
--- a/env.example
+++ b/env.example
@@ -32,5 +32,4 @@ CORE_CD_RELAY_CONNECTOR_HOST='*.core-connector.cdrelay.rafay.local:10012'
 SCHEDULER_NAMESPACE='rafay-system'
 
 # Kratos
-KRATOS_SCHEME='http'
-KRATOS_ADDR='localhost:4433'
+KRATOS_ADDR='http://localhost:4433'
diff --git a/main.go b/main.go
index 7189b12..ef485ef 100644
--- a/main.go
+++ b/main.go
@@ -81,8 +81,7 @@ const (
 	schedulerNamespaceEnv       = "SCHEDULER_NAMESPACE"
 
 	// kratos
-	kratosSchemeEnv = "KRATOS_SCHEME"
-	kratosAddrEnv   = "KRATOS_ADDR"
+	kratosAddrEnv = "KRATOS_ADDR"
 )
 
 var (
@@ -122,9 +121,8 @@ var (
 	schedulerNamespace       string
 
 	// kratos
-	kratosScheme string
-	kratosAddr   string
-	kc           *kclient.APIClient
+	kratosAddr string
+	kc         *kclient.APIClient
 
 	// services
 	ps    service.PartnerService
@@ -195,8 +193,7 @@ func setup() {
 	viper.SetDefault(schedulerNamespaceEnv, "rafay-system")
 
 	// kratos
-	viper.SetDefault(kratosSchemeEnv, "http")
-	viper.SetDefault(kratosAddrEnv, "localhost:4433")
+	viper.SetDefault(kratosAddrEnv, "http://localhost:4433")
 
 	viper.BindEnv(rpcPortEnv)
 	viper.BindEnv(apiPortEnv)
@@ -209,7 +206,6 @@ func setup() {
 	viper.BindEnv(dbUserEnv)
 	viper.BindEnv(dbPasswordEnv)
 
-	viper.BindEnv(kratosSchemeEnv)
 	viper.BindEnv(kratosAddrEnv)
 
 	viper.BindEnv(sentryPeeringHostEnv)
@@ -237,7 +233,6 @@ func setup() {
 	dbUser = viper.GetString(dbUserEnv)
 	dbPassword = viper.GetString(dbPasswordEnv)
 
-	kratosScheme = viper.GetString(kratosSchemeEnv)
 	kratosAddr = viper.GetString(kratosAddrEnv)
 
 	bootstrapKEK = viper.GetString(bootstrapKEKEnv)
@@ -258,8 +253,7 @@ func setup() {
 
 	// Kratos client setup
 	kratosConfig := kclient.NewConfiguration()
-	kratosUrl := kratosScheme + "://" + kratosAddr
-	kratosConfig.Servers[0].URL = kratosUrl
+	kratosConfig.Servers[0].URL = kratosAddr
 	kc = kclient.NewAPIClient(kratosConfig)
 
 	// db setup
@@ -313,7 +307,7 @@ func setup() {
 	rs = service.NewRoleService(db, as)
 	rrs = service.NewRolepermissionService(db)
 	is = service.NewIdpService(db, apiAddr)
-	oidcs = service.NewOIDCProviderService(db, kratosUrl)
+	oidcs = service.NewOIDCProviderService(db, kratosAddr)
 
 	//sentry related services
 	bs = service.NewBootstrapService(db)