Fix issues from bug bash

cloud/deploy/deploy.go

@@ -70,9 +70,10 @@ var (
 )
 
 var (
-	errDagsParseFailed       = errors.New("your local DAGs did not parse. Fix the listed errors or use `astro deploy [deployment-id] -f` to force deploy") //nolint:revive
-	envFileMissing           = errors.New("Env file path is incorrect: ")                                                                                  //nolint:revive
-	errCiCdEnforcementUpdate = errors.New("cannot update dag deploy since ci/cd enforcement is enabled for this deployment. Please use API Tokens or API Keys instead")
+	errDagsParseFailed        = errors.New("your local DAGs did not parse. Fix the listed errors or use `astro deploy [deployment-id] -f` to force deploy") //nolint:revive
+	envFileMissing            = errors.New("Env file path is incorrect: ")                                                                                  //nolint:revive
+	errCiCdEnforcementUpdate  = errors.New("cannot update dag deploy since ci/cd enforcement is enabled for this deployment. Please use API Tokens or API Keys instead")
+	errImageDeployNoPriorDags = errors.New("cannot do image deploy with no prior DAGs deployed. Please deploy DAGs to your Deployment first")
 )
 
 var (
@@ -83,16 +84,17 @@ var (
 )
 
 type deploymentInfo struct {
-	deploymentID     string
-	namespace        string
-	deployImage      string
-	currentVersion   string
-	organizationID   string
-	workspaceID      string
-	webserverURL     string
-	dagDeployEnabled bool
-	deploymentType   string
-	cicdEnforcement  bool
+	deploymentID             string
+	namespace                string
+	deployImage              string
+	currentVersion           string
+	organizationID           string
+	workspaceID              string
+	webserverURL             string
+	deploymentType           string
+	desiredDagTarballVersion string
+	dagDeployEnabled         bool
+	cicdEnforcement          bool
 }
 
 type InputDeploy struct {
@@ -232,6 +234,15 @@ func Deploy(deployInput InputDeploy, client astro.Client, coreClient astrocore.C
 		return nil
 	}
 
+	if deployInput.Image {
+		if !deployInfo.dagDeployEnabled {
+			return fmt.Errorf(enableDagDeployMsg, deployInfo.deploymentID) //nolint
+		}
+		if deployInfo.desiredDagTarballVersion == "" {
+			return errImageDeployNoPriorDags
+		}
+	}
+
 	deploymentURL, err := deployment.GetDeploymentURL(deployInfo.deploymentID, deployInfo.workspaceID)
 	if err != nil {
 		return err
@@ -372,23 +383,12 @@ func Deploy(deployInput InputDeploy, client astro.Client, coreClient astrocore.C
 					return err
 				}
 			} else {
-				if !deployInfo.dagDeployEnabled {
-					return fmt.Errorf(enableDagDeployMsg, deployInfo.deploymentID) //nolint
-				}
 				fmt.Println("Image Deploy only. Skipping deploying DAG...")
 			}
 		}
 		// finish deploy
 		if deployInput.Image {
-			coreDeployment, err := deployment.CoreGetDeployment(deployInfo.workspaceID, deployInfo.organizationID, deployInfo.deploymentID, coreClient)
-			if err != nil {
-				return err
-			}
-			if coreDeployment.CurrentDagTarballVersion != nil {
-				dagTarballVersion = *coreDeployment.CurrentDagTarballVersion
-			} else {
-				dagTarballVersion = ""
-			}
+			dagTarballVersion = deployInfo.desiredDagTarballVersion
 		}
 		err = updateDeploy(deployID, deployInfo.deploymentID, deployInfo.organizationID, dagTarballVersion, deployInfo.dagDeployEnabled, coreClient)
 		if err != nil {
@@ -430,6 +430,17 @@ func getDeploymentInfo(deploymentID, wsID, deploymentName string, prompt bool, c
 		if err != nil {
 			return deploymentInfo{}, err
 		}
+		coreDeployment, err := deployment.CoreGetDeployment(currentDeployment.Workspace.ID, currentDeployment.Workspace.OrganizationID, currentDeployment.ID, coreClient)
+		if err != nil {
+			return deploymentInfo{}, err
+		}
+		var desiredDagTarballVersion string
+		if coreDeployment.DesiredDagTarballVersion != nil {
+			desiredDagTarballVersion = *coreDeployment.DesiredDagTarballVersion
+		} else {
+			desiredDagTarballVersion = ""
+		}
+
 		return deploymentInfo{
 			currentDeployment.ID,
 			currentDeployment.ReleaseName,
@@ -438,8 +449,9 @@ func getDeploymentInfo(deploymentID, wsID, deploymentName string, prompt bool, c
 			currentDeployment.Workspace.OrganizationID,
 			currentDeployment.Workspace.ID,
 			currentDeployment.DeploymentSpec.Webserver.URL,
-			currentDeployment.DagDeployEnabled,
 			currentDeployment.Type,
+			desiredDagTarballVersion,
+			currentDeployment.DagDeployEnabled,
 			currentDeployment.APIKeyOnlyDeployments,
 		}, nil
 	}

cloud/deployment/deployment.go

@@ -696,6 +696,10 @@ func Update(deploymentID, label, ws, description, deploymentName, dagDeploy, exe
 		}
 	}
 
+	// determine dagDeploy enabled/disabled
+	if dagDeploy == "" {
+		deploymentUpdate.DagDeployEnabled = currentDeployment.DagDeployEnabled
+	}
 	if dagDeploy == "enable" {
 		if currentDeployment.DagDeployEnabled {
 			fmt.Println("\nDAG deploys are already enabled for this Deployment. Your DAGs will continue to run as scheduled.")