fix: not supported to restart freed cluster

Signed-off-by: xu.zhu <[email protected]>
horizoncd · Dec 11, 2023 · f831bdb · f831bdb
1 parent 9356c81
commit f831bdb
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/core/controller/cluster/controller_basic_v2.go b/core/controller/cluster/controller_basic_v2.go
@@ -688,9 +688,6 @@ func (c *controller) createPipelineRun(ctx context.Context, clusterID uint,
 	if err != nil {
 		return nil, err
 	}
-	if r.Action == prmodels.ActionBuildDeploy && cluster.GitURL == "" {
-		return nil, herrors.ErrBuildDeployNotSupported
-	}
 
 	var (
 		title        = r.Title
@@ -723,6 +720,9 @@ func (c *controller) createPipelineRun(ctx context.Context, clusterID uint,
 	switch r.Action {
 	case prmodels.ActionBuildDeploy:
 		action = prmodels.ActionBuildDeploy
+		if cluster.GitURL == "" {
+			return nil, herrors.ErrBuildDeployNotSupported
+		}
 
 		if r.Git != nil {
 			if r.Git.Commit != "" {
@@ -805,6 +805,9 @@ func (c *controller) createPipelineRun(ctx context.Context, clusterID uint,
 	case prmodels.ActionRestart:
 		title = prmodels.ActionRestart
 		action = prmodels.ActionRestart
+		if cluster.Status == common.ClusterStatusFreed {
+			return nil, herrors.ErrFreedClusterNotSupportedRestart
+		}
 		configCommitSHA = configCommit.Master
 
 	default:

diff --git a/core/controller/cluster/controller_operation.go b/core/controller/cluster/controller_operation.go
@@ -56,6 +56,11 @@ func (c *controller) Restart(ctx context.Context, clusterID uint) (_ *Pipelineru
 		return nil, err
 	}
 
+	// freed cluster can not be restarted
+	if cluster.Status == common.ClusterStatusFreed {
+		return nil, herrors.ErrFreedClusterNotSupportedRestart
+	}
+
 	// 1. get config commit now
 	lastConfigCommit, err := c.clusterGitRepo.GetConfigCommit(ctx, application.Name, cluster.Name)
 	if err != nil {

diff --git a/core/errors/horizonerrors.go b/core/errors/horizonerrors.go
@@ -219,9 +219,10 @@ var (
 	ErrHTTPRequestFailed     = errors.New("http request failed")
 
 	// cluster
-	ErrClusterNoChange         = errors.New("no change to cluster")
-	ErrShouldBuildDeployFirst  = errors.New("clusters with build config should build and deploy first")
-	ErrBuildDeployNotSupported = errors.New("builddeploy is not supported for this cluster")
+	ErrClusterNoChange                 = errors.New("no change to cluster")
+	ErrShouldBuildDeployFirst          = errors.New("clusters with build config should build and deploy first")
+	ErrBuildDeployNotSupported         = errors.New("builddeploy is not supported for this cluster")
+	ErrFreedClusterNotSupportedRestart = errors.New("freed cluster is not supported to restart")
 
 	// pipelinerun
 

diff --git a/core/http/api/v1/cluster/apis_operation.go b/core/http/api/v1/cluster/apis_operation.go
@@ -217,6 +217,10 @@ func (a *API) Restart(c *gin.Context) {
 
 	resp, err := a.clusterCtl.Restart(c, uint(clusterID))
 	if err != nil {
+		if perror.Cause(err) == herrors.ErrFreedClusterNotSupportedRestart {
+			response.AbortWithRPCError(c, rpcerror.BadRequestError.WithErrMsg(err.Error()))
+			return
+		}
 		if e, ok := perror.Cause(err).(*herrors.HorizonErrNotFound); ok && e.Source == herrors.ClusterInDB {
 			response.AbortWithRPCError(c, rpcerror.NotFoundError.WithErrMsg(err.Error()))
 			return

diff --git a/core/http/api/v2/application/routers.go b/core/http/api/v2/application/routers.go
@@ -24,7 +24,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-// RegisterRoutes register routes
+// RegisterRoute registers routes
 func (api *API) RegisterRoute(engine *gin.Engine) {
 	apiV2Group := engine.Group("/apis/core/v2")
 	apiV2Routes := route.Routes{

diff --git a/core/http/api/v2/cluster/apis_operation.go b/core/http/api/v2/cluster/apis_operation.go
@@ -335,6 +335,10 @@ func (a *API) Restart(c *gin.Context) {
 
 	resp, err := a.clusterCtl.Restart(c, uint(clusterID))
 	if err != nil {
+		if perror.Cause(err) == herrors.ErrFreedClusterNotSupportedRestart {
+			response.AbortWithRPCError(c, rpcerror.BadRequestError.WithErrMsg(err.Error()))
+			return
+		}
 		if e, ok := perror.Cause(err).(*herrors.HorizonErrNotFound); ok && e.Source == herrors.ClusterInDB {
 			response.AbortWithRPCError(c, rpcerror.NotFoundError.WithErrMsg(err.Error()))
 			return