Merge pull request #47 from openinfradev/release

241015 main from release ( v3.2.1 )
openinfradev · Oct 15, 2024 · 80b085f · 80b085f
2 parents c49f5d2 + 0584c49
commit 80b085f
Show file tree

Hide file tree

Showing 21 changed files with 936 additions and 603 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,6 +12,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1

diff --git a/.github/workflows/golangcic-lint.yml b/.github/workflows/golangcic-lint.yml
@@ -1,35 +1,35 @@
 name: Lint
 on:
   push:
+    tags:
+      - v*
+    branches:
+      - main
+      - develop
+      - release
   pull_request:
-
+    branches:
+      - main
+      - develop
+      - release
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: latest
-          args: --timeout=5m
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
-          # Optional: if set to true then the action will use pre-installed Go.
-          # skip-go-installation: true
-
-          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
-          # skip-pkg-cache: true
-
-          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true
+          go-version: "1.21"
+          cache: false
+      - name: Install golangci-lint
+        # Install golangci-lint from source instead of using
+        # golangci-lint-action to ensure the golangci-lint binary is built with
+        # the same Go version we're targeting.
+        # Avoids incompatibility issues such as:
+        # - https://github.com/golangci/golangci-lint/issues/2922
+        # - https://github.com/golangci/golangci-lint/issues/2673
+        # - https://github.com/golangci/golangci-lint-action/issues/442
+        run: go install github.com/golangci/golangci-lint/cmd/[email protected]
+      - name: Run golangci-lint
+        run: golangci-lint run --verbose --out-format=github-actions
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -9,11 +9,13 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Test
         run: go test -v -cover ./...
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,6 @@
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+
+cmd/server/server
+cmd/server/start_dev.sh
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 docker.io/library/golang:1.18-buster AS builder
+FROM --platform=linux/amd64 docker.io/library/golang:1.21 AS builder
 
 RUN mkdir -p /app
 WORKDIR /app

diff --git a/cmd/server/appgroup_status.go b/cmd/server/appgroup_status.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/openinfradev/tks-api/pkg/domain"
@@ -17,7 +18,7 @@ func processAppGroupStatus() error {
 	if len(appGroups) == 0 {
 		return nil
 	}
-	log.Info("appGroups : ", appGroups)
+	log.Info(context.TODO(), "[processAppGroupStatus] appGroups : ", appGroups)
 
 	for i := range appGroups {
 		appGroup := appGroups[i]
@@ -32,13 +33,13 @@ func processAppGroupStatus() error {
 		var newMessage string
 
 		if workflowId != "" {
-			workflow, err := argowfClient.GetWorkflow("argo", workflowId)
+			workflow, err := argowfClient.GetWorkflow(context.TODO(), "argo", workflowId)
 			if err != nil {
-				log.Error("failed to get argo workflow. err : ", err)
+				log.Error(context.TODO(), "failed to get argo workflow. err : ", err)
 				continue
 			}
 			newMessage = fmt.Sprintf("(%s) %s", workflow.Status.Progress, workflow.Status.Message)
-			log.Debug(fmt.Sprintf("status [%s], newMessage [%s], phase [%s]", status, newMessage, workflow.Status.Phase))
+			log.Debug(context.TODO(), fmt.Sprintf("status [%s], newMessage [%s], phase [%s]", status, newMessage, workflow.Status.Phase))
 			if status == domain.AppGroupStatus_INSTALLING {
 				switch workflow.Status.Phase {
 				case "Running":
@@ -70,10 +71,10 @@ func processAppGroupStatus() error {
 		}
 
 		if status != newStatus || statusDesc != newMessage {
-			log.Debug(fmt.Sprintf("update status!! appGroupId [%s], newStatus [%s], newMessage [%s]", appGroupId, newStatus, newMessage))
+			log.Debug(context.TODO(), fmt.Sprintf("update status!! appGroupId [%s], newStatus [%s], newMessage [%s]", appGroupId, newStatus, newMessage))
 			err := applicationAccessor.UpdateAppGroupStatus(appGroupId, newStatus, newMessage, workflowId)
 			if err != nil {
-				log.Error("Failed to update appgroup status err : ", err)
+				log.Error(context.TODO(), "Failed to update appgroup status err : ", err)
 				continue
 			}
 		}

diff --git a/cmd/server/cloud_account_status.go b/cmd/server/cloud_account_status.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/openinfradev/tks-api/pkg/domain"
@@ -16,7 +17,7 @@ func processCloudAccountStatus() error {
 	if len(cloudAccounts) == 0 {
 		return nil
 	}
-	log.Info("cloudAccounts : ", cloudAccounts)
+	log.Info(context.TODO(), "[processCloudAccountStatus] cloudAccounts : ", cloudAccounts)
 
 	for i := range cloudAccounts {
 		cloudaccount := cloudAccounts[i]
@@ -31,14 +32,14 @@ func processCloudAccountStatus() error {
 		var newMessage string
 
 		if workflowId != "" {
-			workflow, err := argowfClient.GetWorkflow("argo", workflowId)
+			workflow, err := argowfClient.GetWorkflow(context.TODO(), "argo", workflowId)
 			if err != nil {
-				log.Error("failed to get argo workflow. err : ", err)
+				log.Error(context.TODO(), "failed to get argo workflow. err : ", err)
 				continue
 			}
 
 			newMessage = fmt.Sprintf("(%s) %s", workflow.Status.Progress, workflow.Status.Message)
-			log.Debug(fmt.Sprintf("status [%s], newMessage [%s], phase [%s]", status, newMessage, workflow.Status.Phase))
+			log.Debug(context.TODO(), fmt.Sprintf("status [%s], newMessage [%s], phase [%s]", status, newMessage, workflow.Status.Phase))
 
 			if status == domain.CloudAccountStatus_CREATING {
 				switch workflow.Status.Phase {
@@ -71,17 +72,17 @@ func processCloudAccountStatus() error {
 		}
 
 		if status != newStatus || statusDesc != newMessage {
-			log.Debug(fmt.Sprintf("update status!! cloudAccountId [%s], newStatus [%s], newMessage [%s]", cloudAccountId, newStatus, newMessage))
+			log.Debug(context.TODO(), fmt.Sprintf("update status!! cloudAccountId [%s], newStatus [%s], newMessage [%s]", cloudAccountId, newStatus, newMessage))
 			err := cloudAccountAccessor.UpdateCloudAccountStatus(cloudAccountId, newStatus, newMessage, workflowId)
 			if err != nil {
-				log.Error("Failed to update cloudaccount status err : ", err)
+				log.Error(context.TODO(), "Failed to update cloudaccount status err : ", err)
 				continue
 			}
 
 			if newStatus == domain.CloudAccountStatus_CREATED {
 				err = cloudAccountAccessor.UpdateCreatedIAM(cloudAccountId, true)
 				if err != nil {
-					log.Error("Failed to update cloudaccount createdIAM err : ", err)
+					log.Error(context.TODO(), "Failed to update cloudaccount createdIAM err : ", err)
 					continue
 				}
 

diff --git a/cmd/server/cluster_byoh.go b/cmd/server/cluster_byoh.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 
@@ -21,7 +22,7 @@ func processClusterByoh() error {
 	if len(clusters) == 0 {
 		return nil
 	}
-	log.Info("byoh clusters : ", clusters)
+	log.Info(context.TODO(), "[processClusterByoh] byoh clusters : ", clusters)
 
 	token = getTksApiToken()
 	if token != "" {
@@ -34,7 +35,7 @@ func processClusterByoh() error {
 		url := fmt.Sprintf("clusters/%s/nodes", clusterId)
 		body, err := apiClient.Get(url)
 		if err != nil {
-			log.Error(err)
+			log.Error(context.TODO(), err)
 			continue
 		}
 
@@ -47,25 +48,25 @@ func processClusterByoh() error {
 				completed = false
 			}
 		}
-		log.Info(out.Nodes)
+		log.Info(context.TODO(), out.Nodes)
 
 		//completed = true // FOR TEST
 		if completed {
-			log.Info(fmt.Sprintf("all agents registered! starting stack creation. clusterId %s", clusterId))
+			log.Info(context.TODO(), fmt.Sprintf("all agents registered! starting stack creation. clusterId %s", clusterId))
 			// clusterId, newStatus, newMessage, workflowId
 			if err = clusterAccessor.UpdateClusterStatus(clusterId, domain.ClusterStatus_INSTALLING, "", ""); err != nil {
-				log.Error("Failed to update cluster status err : ", err)
+				log.Error(context.TODO(), "Failed to update cluster status err : ", 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)
+					log.Error(context.TODO(), err)
 					continue
 				}
 			} else {
 				if _, err = apiClient.Post("clusters/"+clusterId+"/install", nil); err != nil {
-					log.Error(err)
+					log.Error(context.TODO(), err)
 					continue
 				}
 			}
@@ -88,10 +89,7 @@ func transcode(in, out interface{}) {
 }
 
 func getTksApiToken() string {
-	_, err := apiClient.Post("auth/ping", domain.PingTokenRequest{
-		Token:          token,
-		OrganizationId: "master",
-	})
+	_, err := apiClient.Get("auth/verify-token")
 	if err != nil {
 		body, err := apiClient.Post("auth/login", domain.LoginRequest{
 			AccountId:      viper.GetString("tks-api-account"),
@@ -105,7 +103,7 @@ func getTksApiToken() string {
 		var out domain.LoginResponse
 		transcode(body, &out)
 
-		log.Info(out.User.Token)
+		log.Info(context.TODO(), out.User.Token)
 		token = out.User.Token
 	}
 

diff --git a/cmd/server/cluster_status.go b/cmd/server/cluster_status.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/openinfradev/tks-api/pkg/domain"
@@ -16,7 +17,7 @@ func processClusterStatus() error {
 	if len(clusters) == 0 {
 		return nil
 	}
-	log.Info("clusters : ", clusters)
+	log.Info(context.TODO(), "[processClusterStatus] clusters : ", clusters)
 
 	for i := range clusters {
 		cluster := clusters[i]
@@ -31,19 +32,26 @@ func processClusterStatus() error {
 		var newMessage string
 
 		if workflowId != "" {
-			workflow, err := argowfClient.GetWorkflow("argo", workflowId)
+			workflow, err := argowfClient.GetWorkflow(context.TODO(), "argo", workflowId)
 			if err != nil {
-				log.Error("failed to get argo workflow. err : ", err)
+				log.Error(context.TODO(), "failed to get argo workflow. err : ", err)
 				continue
 			}
 
 			newMessage = fmt.Sprintf("(%s) %s", workflow.Status.Progress, workflow.Status.Message)
-			log.Debug(fmt.Sprintf("status [%s], newMessage [%s], phase [%s]", status, newMessage, workflow.Status.Phase))
+			log.Debug(context.TODO(), fmt.Sprintf("status [%s], newMessage [%s], phase [%s]", status, newMessage, workflow.Status.Phase))
 
 			if status == domain.ClusterStatus_INSTALLING {
 				switch workflow.Status.Phase {
 				case "Running":
 					newStatus = domain.ClusterStatus_INSTALLING
+
+					paused, err := argowfClient.IsPausedWorkflow(context.TODO(), "argo", workflowId)
+					if err == nil && paused {
+						newStatus = domain.ClusterStatus_STOPPED
+					}
+				case "Stopped":
+					newStatus = domain.ClusterStatus_STOPPED
 				case "Succeeded":
 					newStatus = domain.ClusterStatus_RUNNING
 				case "Failed":
@@ -82,10 +90,10 @@ func processClusterStatus() error {
 		}
 
 		if status != newStatus || statusDesc != newMessage {
-			log.Debug(fmt.Sprintf("update status!! clusterId [%s], newStatus [%s], newMessage [%s]", clusterId, newStatus, newMessage))
+			log.Debug(context.TODO(), fmt.Sprintf("update status!! clusterId [%s], newStatus [%s], newMessage [%s]", clusterId, newStatus, newMessage))
 			err := clusterAccessor.UpdateClusterStatus(clusterId, newStatus, newMessage, workflowId)
 			if err != nil {
-				log.Error("Failed to update cluster status err : ", err)
+				log.Error(context.TODO(), "Failed to update cluster status err : ", err)
 				continue
 			}
 		}