feature. reuse tks-api client

openinfradev · Oct 23, 2023 · 2fb7b1f · 2fb7b1f
1 parent 7ebef02
commit 2fb7b1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/cmd/server/cluster_byoh.go b/cmd/server/cluster_byoh.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	_apiClient "github.com/openinfradev/tks-api/pkg/api-client"
 	"github.com/openinfradev/tks-api/pkg/domain"
 	"github.com/openinfradev/tks-api/pkg/log"
 	"github.com/spf13/viper"
@@ -25,16 +24,13 @@ func processClusterByoh() error {
 	log.Info("byoh clusters : ", clusters)
 
 	token = getTksApiToken()
+	if token != "" {
+		apiClient.SetToken(token)
+	}
 	for _, cluster := range clusters {
 		clusterId := cluster.ID
 
 		// check agent node
-		apiClient, err := _apiClient.New(fmt.Sprintf("%s:%d", viper.GetString("tks-api-address"), viper.GetInt("tks-api-port")), token)
-		if err != nil {
-			log.Error(err)
-			continue
-		}
-
 		url := fmt.Sprintf("clusters/%s/nodes", clusterId)
 		body, err := apiClient.Get(url)
 		if err != nil {
@@ -62,12 +58,6 @@ func processClusterByoh() error {
 				continue
 			}
 
-			apiClient, err := _apiClient.New(fmt.Sprintf("%s:%d", viper.GetString("tks-api-address"), viper.GetInt("tks-api-port")), token)
-			if err != nil {
-				log.Error(err)
-				continue
-			}
-
 			if cluster.IsStack {
 				if _, err = apiClient.Post(fmt.Sprintf("organizations/%s/stacks/%s/install", cluster.OrganizationId, clusterId), nil); err != nil {
 					log.Error(err)
@@ -98,13 +88,7 @@ func transcode(in, out interface{}) {
 }
 
 func getTksApiToken() string {
-	apiClient, err := _apiClient.New(fmt.Sprintf("%s:%d", viper.GetString("tks-api-address"), viper.GetInt("tks-api-port")), "")
-	if err != nil {
-		log.Error(err)
-		return ""
-	}
-
-	_, err = apiClient.Post("auth/ping", domain.PingTokenRequest{
+	_, err := apiClient.Post("auth/ping", domain.PingTokenRequest{
 		Token:          token,
 		OrganizationId: "master",
 	})

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	_apiClient "github.com/openinfradev/tks-api/pkg/api-client"
 	argo "github.com/openinfradev/tks-api/pkg/argo-client"
 	"github.com/openinfradev/tks-api/pkg/log"
 	"github.com/spf13/pflag"
@@ -25,6 +26,7 @@ var (
 	applicationAccessor  *application.ApplicationAccessor
 	cloudAccountAccessor *cloudAccount.CloudAccountAccessor
 	organizationAccessor *organization.OrganizationAccessor
+	apiClient            _apiClient.ApiClient
 )
 
 func init() {
@@ -72,6 +74,10 @@ func main() {
 	if err != nil {
 		log.Fatal("failed to create argowf client : ", err)
 	}
+	apiClient, err = _apiClient.New(fmt.Sprintf("%s:%d", viper.GetString("tks-api-address"), viper.GetInt("tks-api-port")))
+	if err != nil {
+		log.Fatal("failed to create tks-api client : ", err)
+	}
 
 	for {
 		err = processClusterStatus()