Do not throw the error for astro deploy if dag-deploy itself is disab…

…led (#1538)

* Do not throw the error for astro deploy if dag-deploy itself is disabled

* Do not throw the error for astro deploy if dag-deploy itself is disabled

* Do not throw the error for astro deploy if dag-deploy itself is disabled

cmd/software/deploy.go

@@ -1,6 +1,7 @@
 package software
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/astronomer/astro-cli/cmd/utils"
@@ -104,5 +105,11 @@ func deployAirflow(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	return DagsOnlyDeploy(houstonClient, appConfig, ws, deploymentID, config.WorkingPath, nil, true)
+
+	err = DagsOnlyDeploy(houstonClient, appConfig, ws, deploymentID, config.WorkingPath, nil, true)
+	// Don't throw the error if dag-deploy itself is disabled
+	if errors.Is(err, deploy.ErrDagOnlyDeployDisabledInConfig) || errors.Is(err, deploy.ErrDagOnlyDeployNotEnabledForDeployment) {
+		return nil
+	}
+	return err
 }

cmd/software/deploy_test.go

@@ -61,9 +61,18 @@ func TestDeploy(t *testing.T) {
 		}
 	})
 
-	t.Run("error should be returned for astro deploy, if dags deploy throws error", func(t *testing.T) {
+	t.Run("error should be returned for astro deploy, if dags deploy throws error and the feature is enabled", func(t *testing.T) {
+		DagsOnlyDeploy = func(houstonClient houston.ClientInterface, appConfig *houston.AppConfig, wsID, deploymentID, dagsParentPath string, dagDeployURL *string, cleanUpFiles bool) error {
+			return deploy.ErrNoWorkspaceID
+		}
 		err := execDeployCmd([]string{"-f"}...)
-		assert.ErrorIs(t, err, deploy.ErrDagOnlyDeployDisabledInConfig)
+		assert.ErrorIs(t, err, deploy.ErrNoWorkspaceID)
+		DagsOnlyDeploy = deploy.DagsOnlyDeploy
+	})
+
+	t.Run("No error should be returned for astro deploy, if dags deploy throws error but the feature itself is disabled", func(t *testing.T) {
+		err := execDeployCmd([]string{"-f"}...)
+		assert.ErrorIs(t, err, nil)
 	})
 
 	t.Run("Test for the flag --dags", func(t *testing.T) {

software/deploy/deploy.go

@@ -39,7 +39,7 @@ var (
 	errDeploymentNotFound                   = errors.New("no airflow deployments found")
 	errInvalidDeploymentSelected            = errors.New("invalid deployment selection\n") //nolint
 	ErrDagOnlyDeployDisabledInConfig        = errors.New("to perform this operation, set both deployments.dagOnlyDeployment and deployments.configureDagDeployment to true in your Astronomer cluster")
-	errDagOnlyDeployNotEnabledForDeployment = errors.New("to perform this operation, first set the Deployment type to 'dag_deploy' via the UI or the API")
+	ErrDagOnlyDeployNotEnabledForDeployment = errors.New("to perform this operation, first set the Deployment type to 'dag_deploy' via the UI or the API or the CLI")
 	ErrEmptyDagFolderUserCancelledOperation = errors.New("no DAGs found in the dags folder. User canceled the operation")
 )
 
@@ -354,7 +354,7 @@ func DagsOnlyDeploy(houstonClient houston.ClientInterface, appConfig *houston.Ap
 		return fmt.Errorf("failed to get deployment info: %w", err)
 	}
 	if !isDagOnlyDeploymentEnabledForDeployment(deploymentInfo) {
-		return errDagOnlyDeployNotEnabledForDeployment
+		return ErrDagOnlyDeployNotEnabledForDeployment
 	}
 
 	uploadURL := ""

software/deploy/deploy_test.go

@@ -435,7 +435,7 @@ func TestDeployDagsOnlyFailure(t *testing.T) {
 		}
 		houstonMock.On("GetDeployment", mock.Anything).Return(deployment, nil).Once()
 		err := DagsOnlyDeploy(houstonMock, appConfig, wsID, deploymentID, config.WorkingPath, nil, false)
-		assert.ErrorIs(t, err, errDagOnlyDeployNotEnabledForDeployment)
+		assert.ErrorIs(t, err, ErrDagOnlyDeployNotEnabledForDeployment)
 		houstonMock.AssertExpectations(t)
 	})