Merge pull request #194 from openinfradev/fix_import_id

feature. rollback to tks-admin
openinfradev · Nov 3, 2023 · 78f1af0 · 78f1af0
2 parents 1e5d1db + 20763aa
commit 78f1af0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/internal/helper/id.go b/internal/helper/id.go
@@ -7,6 +7,7 @@ import (
 )
 
 var (
+	TKS_ADMIN                   = "tks-admin"
 	PREFIX_USER_ID              = "u"
 	PREFIX_CLUSTER_ID           = "c"
 	PREFIX_ORGANIZATION_ID      = "o"
@@ -29,6 +30,9 @@ func GenerateApplicaionGroupId() string {
 }
 
 func ValidateClusterId(id string) bool {
+	if id == TKS_ADMIN {
+		return true
+	}
 	if !strings.HasPrefix(id, PREFIX_CLUSTER_ID) {
 		return false
 	}

diff --git a/internal/usecase/cluster.go b/internal/usecase/cluster.go
@@ -238,8 +238,8 @@ func (u *ClusterUsecase) Import(ctx context.Context, dto domain.Cluster) (cluste
 	userId := user.GetUserId()
 	dto.CreatorId = &userId
 	if dto.ClusterType == domain.ClusterType_ADMIN {
-		dto.ID = "ctksadmin"
-		dto.Name = "ctksadmin"
+		dto.ID = "tks-admin"
+		dto.Name = "tks-admin"
 	}
 	clusterId, err = u.repo.Create(dto)
 	if err != nil {