Remove uneeded entries and Update vacate Tests

elastic · Oct 14, 2024 · 799ce06 · 799ce06
1 parent 5ea6794
commit 799ce06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/api/platformapi/allocatorapi/vacate.go b/pkg/api/platformapi/allocatorapi/vacate.go
@@ -126,7 +126,6 @@ func moveNodes(id string, params *VacateParams, p *pool.Pool) ([]pool.Validator,
 		platform_infrastructure.NewMoveClustersParams().
 			WithAllocatorID(id).
 			WithMoveOnly(params.MoveOnly).
-			WithForceMove(params.ForceMove).
 			WithContext(api.WithRegion(context.Background(), params.Region)).
 			WithValidateOnly(ec.Bool(true)),
 		params.AuthWriter,
@@ -283,7 +282,6 @@ func newVacateClusterParams(params addAllocatorMovesToPoolParams, id, kind strin
 		Output:              params.VacateParams.Output,
 		OutputFormat:        params.VacateParams.OutputFormat,
 		MoveOnly:            params.VacateParams.MoveOnly,
-		ForceMove:           params.VacateParams.ForceMove,
 		PlanOverrides:       params.VacateParams.PlanOverrides,
 	}
 
@@ -393,7 +391,6 @@ func newMoveClusterParams(params *VacateClusterParams) (*platform_infrastructure
 		platform_infrastructure.NewMoveClustersParams().
 			WithAllocatorDown(params.AllocatorDown).
 			WithMoveOnly(params.MoveOnly).
-			WithForceMove(params.ForceMove).
 			WithAllocatorID(params.ID).
 			WithContext(api.WithRegion(context.Background(), params.Region)).
 			WithValidateOnly(ec.Bool(true)).

diff --git a/pkg/api/platformapi/allocatorapi/vacate_test.go b/pkg/api/platformapi/allocatorapi/vacate_test.go
@@ -1295,11 +1295,13 @@ func Test_newMoveClusterParams(t *testing.T) {
 				Kind:          "elasticsearch",
 				Output:        output.NewDevice(new(bytes.Buffer)),
 				AllocatorDown: ec.Bool(false),
+				ForceMove:     ec.Bool(true),
 			}},
 			want: platform_infrastructure.NewMoveClustersByTypeParams().
 				WithAllocatorID("allocator-1").
 				WithClusterType(util.Elasticsearch).
 				WithAllocatorDown(ec.Bool(false)).
+				WithForceMove(ec.Bool(true)).
 				WithContext(api.WithRegion(context.Background(), "us-east-1")).
 				WithBody(&models.MoveClustersRequest{
 					ElasticsearchClusters: []*models.MoveElasticsearchClusterConfiguration{