fix executor update (#1499)

* fix executor update * fix executor update * remove debug
astronomer · Jan 29, 2024 · 3116aba · 3116aba
1 parent 114c036
commit 3116aba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cloud/deployment/deployment.go b/cloud/deployment/deployment.go
@@ -65,9 +65,10 @@ const (
 )
 
 var (
-	sleepTime  = 180
-	tickNum    = 10
-	timeoutNum = 180
+	sleepTime                  = 180
+	tickNum                    = 10
+	timeoutNum                 = 180
+	dedicatedDeploymentRequest = astroplatformcore.UpdateDedicatedDeploymentRequest{}
 )
 
 func newTableOut() *printutil.Table {
@@ -934,7 +935,7 @@ func Update(deploymentID, name, ws, description, deploymentName, dagDeploy, exec
 			case KubeExecutor:
 				requestedExecutor = astroplatformcore.UpdateDedicatedDeploymentRequestExecutorKUBERNETES
 			}
-			dedicatedDeploymentRequest := astroplatformcore.UpdateDedicatedDeploymentRequest{
+			dedicatedDeploymentRequest = astroplatformcore.UpdateDedicatedDeploymentRequest{
 				Description:          &description,
 				Name:                 name,
 				Executor:             requestedExecutor,
@@ -973,6 +974,7 @@ func Update(deploymentID, name, ws, description, deploymentName, dagDeploy, exec
 			case astroplatformcore.UpdateDedicatedDeploymentRequestExecutorKUBERNETES:
 				if *currentDeployment.Executor == astroplatformcore.DeploymentExecutorCELERY {
 					confirmWithUser = true
+					dedicatedDeploymentRequest.WorkerQueues = nil
 				}
 			}
 			err := updateDeploymentRequest.FromUpdateDedicatedDeploymentRequest(dedicatedDeploymentRequest)

diff --git a/cloud/deployment/deployment_test.go b/cloud/deployment/deployment_test.go
@@ -1530,6 +1530,7 @@ func TestUpdate(t *testing.T) { //nolint
 		err = Update("test-id-1", "", ws, "update", "", "", KubeExecutor, "medium", "enable", "disable", "", "", "", "", 0, 0, workerQueueRequest, hybridQueueList, newEnvironmentVariables, false, mockCoreClient, mockPlatformCoreClient)
 
 		assert.NoError(t, err)
+		assert.Equal(t, (*[]astroplatformcore.WorkerQueueRequest)(nil), dedicatedDeploymentRequest.WorkerQueues)
 		mockCoreClient.AssertExpectations(t)
 		mockPlatformCoreClient.AssertExpectations(t)
 	})