feat: merge develop

cmd/init.go

@@ -76,13 +76,19 @@ func initDatabase() {
 		panic("database bk-iam should be configured")
 	}
 
+	if globalConfig.EnableBkAuth {
+		database.InitDBClients(&defaultDBConfig, nil)
+		log.Info("init Database success")
+		return
+	}
+
 	// TODO: 不应该成为强依赖
 	bkPaaSDBConfig, ok := globalConfig.DatabaseMap["open_paas"]
 	if !ok {
-		panic("database open_paas should be configured")
+		panic("bkauth is not enabled, so database open_paas should be configured")
 	}
-
 	database.InitDBClients(&defaultDBConfig, &bkPaaSDBConfig)
+
 	log.Info("init Database success")
 }
 
@@ -142,7 +148,21 @@ func initSupportShieldFeatures() {
 }
 
 func initComponents() {
-	component.InitComponentClients()
+	component.InitBkRemoteResourceClient()
+
+	if globalConfig.EnableBkAuth {
+		bkAuthHost, ok := globalConfig.HostMap["bkauth"]
+		if !ok {
+			panic("bkauth is enabled, so host bkauth should be configured")
+		}
+
+		if globalConfig.BkAppCode == "" || globalConfig.BkAppSecret == "" {
+			panic("bkauth is enabled, but iam's bkAppCode and bkAppSecret is not configured")
+		}
+
+		component.InitBkAuthClient(bkAuthHost.Addr, globalConfig.BkAppCode, globalConfig.BkAppSecret)
+		log.Infof("init bkauth client success, host = %s", bkAuthHost.Addr)
+	}
 }
 
 func initQuota() {