Commit b2c5357 1 parent 661880f commit b2c5357 Copy full SHA for b2c5357
File tree 2 files changed +13
-0
lines changed
2 files changed +13
-0
lines changed Original file line number Diff line number Diff line change @@ -425,6 +425,17 @@ func (h *OperatorHandlerImpl) RemoveRemoteCluster(
425
425
scope , startTime := h .startRequestProfile (metrics .OperatorRemoveRemoteClusterScope )
426
426
defer func () { scope .Timer (metrics .ServiceLatency .GetMetricName ()).Record (time .Since (startTime )) }()
427
427
428
+ var isClusterNameExist bool
429
+ for clusterName := range h .clusterMetadata .GetAllClusterInfo () {
430
+ if clusterName == request .GetClusterName () {
431
+ isClusterNameExist = true
432
+ break
433
+ }
434
+ }
435
+ if ! isClusterNameExist {
436
+ return nil , serviceerror .NewNotFound ("The cluster to be deleted cannot be found in clusters cache." )
437
+ }
438
+
428
439
if err := h .clusterMetadataManager .DeleteClusterMetadata (
429
440
ctx ,
430
441
& persistence.DeleteClusterMetadataRequest {ClusterName : request .GetClusterName ()},
Original file line number Diff line number Diff line change @@ -469,6 +469,7 @@ func (s *operatorHandlerSuite) Test_DeleteNamespace() {
469
469
470
470
func (s * operatorHandlerSuite ) Test_RemoveRemoteCluster_Success () {
471
471
var clusterName = "cluster"
472
+ s .mockResource .ClusterMetadata .EXPECT ().GetAllClusterInfo ().Return (map [string ]cluster.ClusterInformation {clusterName : {}})
472
473
s .mockResource .ClusterMetadataMgr .EXPECT ().DeleteClusterMetadata (
473
474
gomock .Any (),
474
475
& persistence.DeleteClusterMetadataRequest {ClusterName : clusterName },
@@ -480,6 +481,7 @@ func (s *operatorHandlerSuite) Test_RemoveRemoteCluster_Success() {
480
481
481
482
func (s * operatorHandlerSuite ) Test_RemoveRemoteCluster_Error () {
482
483
var clusterName = "cluster"
484
+ s .mockResource .ClusterMetadata .EXPECT ().GetAllClusterInfo ().Return (map [string ]cluster.ClusterInformation {clusterName : {}})
483
485
s .mockResource .ClusterMetadataMgr .EXPECT ().DeleteClusterMetadata (
484
486
gomock .Any (),
485
487
& persistence.DeleteClusterMetadataRequest {ClusterName : clusterName },
You can’t perform that action at this time.
0 commit comments