From 9d15c3aa1554da65540665e516599ce410542078 Mon Sep 17 00:00:00 2001 From: Akshay Gaikwad Date: Tue, 19 Apr 2022 15:20:35 +0530 Subject: [PATCH] Remove Kratos scheme variable from auth kratos Address var includes scheme, so no need to of separate variable for a scheme. --- pkg/auth/v3/auth.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkg/auth/v3/auth.go b/pkg/auth/v3/auth.go index 30cce52..ea78c43 100644 --- a/pkg/auth/v3/auth.go +++ b/pkg/auth/v3/auth.go @@ -47,10 +47,9 @@ type authContext struct { // fields created then use NewAuthContext instead. func SetupAuthContext(auditLogger *zap.Logger) authContext { var ( - kc *kclient.APIClient - kratosScheme string - kratosAddr string - db *bun.DB + kc *kclient.APIClient + kratosAddr string + db *bun.DB ) // Initialize database @@ -62,19 +61,13 @@ func SetupAuthContext(auditLogger *zap.Logger) authContext { sqldb := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn))) db = bun.NewDB(sqldb, pgdialect.New()) - if v, ok := os.LookupEnv("KRATOS_SCHEME"); ok { - kratosScheme = v - } else { - kratosScheme = "http" - } - if v, ok := os.LookupEnv("KRATOS_ADDR"); ok { kratosAddr = v } else { - kratosAddr = "localhost:4433" + kratosAddr = "http://localhost:4433" } kratosConfig := kclient.NewConfiguration() - kratosConfig.Servers[0].URL = kratosScheme + "://" + kratosAddr + kratosConfig.Servers[0].URL = kratosAddr kc = kclient.NewAPIClient(kratosConfig) gormDb, err := gorm.Open(