Bug. add validation for delete cluster

Author: ktkfree

cmd/server/handlers.go

@@ -253,16 +253,27 @@ func (s *server) DeleteCluster(ctx context.Context, in *pb.IDRequest) (*pb.Simpl
 	}
 	clusterId := in.GetId()
 
-	if _, err := clusterInfoClient.GetCluster(ctx, &pb.GetClusterRequest{ClusterId: clusterId}); err != nil {
+	res, err := clusterInfoClient.GetCluster(ctx, &pb.GetClusterRequest{ClusterId: clusterId})
+	if err != nil {
 		log.Error("Failed to get cluster info err : ", err)
 		return &pb.SimpleResponse{
 			Code: pb.Code_NOT_FOUND,
 			Error: &pb.Error{
-				Msg: fmt.Sprintf("Invalid cluster Id %s", clusterId),
+				Msg: fmt.Sprintf("Could not find Cluster with ID %s", clusterId),
 			},
 		}, err
 	}
 
+	if res.GetCluster().GetStatus() == pb.ClusterStatus_DELETING || res.GetCluster().GetStatus() == pb.ClusterStatus_DELETED {
+		log.Error("The cluster has been already deleted. status : ", res.GetCluster().GetStatus())
+		return &pb.SimpleResponse{
+			Code: pb.Code_NOT_FOUND,
+			Error: &pb.Error{
+				Msg: fmt.Sprintf("Could not find cluster with ID. %s", clusterId),
+			},
+		}, errors.New(fmt.Sprintf("Could not find cluster with ID. %s", clusterId))
+	}
+
 	nameSpace := "argo"
 	workflow := "tks-remove-usercluster"
 	appGroup := "tks-cluster-aws"

cmd/server/handlers_test.go

@@ -360,6 +360,27 @@ func TestDeleteCluster(t *testing.T) {
 				require.Equal(t, res.Code, pb.Code_NOT_FOUND)
 			},
 		},
+		{
+			name: "THE_CLUSTER_ALREADY_DELETED",
+			in: &pb.IDRequest{
+				Id: uuid.New().String(),
+			},
+			buildStubs: func(mockArgoClient *mockargo.MockClient, mockClusterInfoClient *mocktks.MockClusterInfoServiceClient) {
+				mockClusterInfoClient.EXPECT().GetCluster(gomock.Any(), gomock.Any()).Times(1).
+					Return(
+						&pb.GetClusterResponse{
+							Code:  pb.Code_OK_UNSPECIFIED,
+							Error: nil,
+							Cluster: &pb.Cluster{
+								Status: pb.ClusterStatus_DELETED,
+							},
+						}, nil)
+			},
+			checkResponse: func(req *pb.IDRequest, res *pb.SimpleResponse, err error) {
+				require.Error(t, err)
+				require.Equal(t, res.Code, pb.Code_NOT_FOUND)
+			},
+		},
 		{
 			name: "FAILED_TO_CALL_WORKFLOW",
 			in: &pb.IDRequest{