Hides most build and start output behind verbosity level

airflow/container.go

@@ -124,10 +124,8 @@ func generateConfig(projectName, airflowHome, envFile, buildImage, settingsFile
 
 	if envFile != "" {
 		if !envExists {
-			fmt.Printf(envNotFoundMsg, envFile)
 			envFile = ""
 		} else {
-			fmt.Printf(envFoundMsg, envFile)
 			envFile = fmt.Sprintf("env_file: %s", envFile)
 		}
 	}

airflow/docker.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"context"
 	"fmt"
+	"io"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -23,6 +24,7 @@ import (
 	"github.com/astronomer/astro-cli/pkg/ansi"
 	"github.com/astronomer/astro-cli/pkg/fileutil"
 	"github.com/astronomer/astro-cli/pkg/logger"
+	"github.com/astronomer/astro-cli/pkg/spinner"
 	"github.com/astronomer/astro-cli/pkg/util"
 	"github.com/astronomer/astro-cli/settings"
 	"github.com/compose-spec/compose-go/v2/interpolation"
@@ -68,9 +70,7 @@ const (
 	composeUserPasswordMsg  = "The default Airflow UI credentials are: %s"
 	postgresUserPasswordMsg = "The default Postgres DB credentials are: %s"
 
-	envPathMsg     = "Error looking for \"%s\""
-	envFoundMsg    = "Env file \"%s\" found. Loading...\n"
-	envNotFoundMsg = "Env file \"%s\" not found. Skipping...\n"
+	envPathMsg = "Error looking for \"%s\""
 )
 
 var (
@@ -166,7 +166,20 @@ func DockerComposeInit(airflowHome, envFile, dockerfile, imageName string) (*Doc
 	imageHandler := DockerImageInit(ImageName(imageName, "latest"))
 	composeFile := Composeyml
 
-	dockerCli, err := command.NewDockerCli()
+	// Determine if we should output to terminal or buffer.
+	output := logger.GetLevel() >= logrus.DebugLevel
+
+	// Route output streams according to verbosity.
+	var stdout, stderr io.Writer
+	if output {
+		stdout = os.Stdout
+		stderr = os.Stderr
+	} else {
+		stdout = io.Discard
+		stderr = io.Discard
+	}
+
+	dockerCli, err := command.NewDockerCli(command.WithOutputStream(stdout), command.WithErrorStream(stderr))
 	if err != nil {
 		logger.Fatalf("error creating compose client %s", err)
 	}
@@ -219,7 +232,7 @@ func (d *DockerCompose) Start(imageName, settingsFile, composeFile, buildSecretS
 				fmt.Printf("Adding 'astro-run-dag' package to requirements.txt unsuccessful: %s\nManually add package to requirements.txt", err.Error())
 			}
 		}
-		imageBuildErr := d.imageHandler.Build(d.dockerfile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true, NoCache: noCache})
+		imageBuildErr := d.imageHandler.Build(d.dockerfile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome, NoCache: noCache})
 		if !config.CFG.DisableAstroRun.GetBool() {
 			// remove astro-run-dag from requirments.txt
 			err = fileutil.RemoveLineFromFile("./requirements.txt", "astro-run-dag", " # This package is needed for the astro run command. It will be removed before a deploy")
@@ -243,6 +256,15 @@ func (d *DockerCompose) Start(imageName, settingsFile, composeFile, buildSecretS
 		return err
 	}
 
+	// Determine if we should output to terminal or buffer.
+	output := logger.GetLevel() >= logrus.DebugLevel
+
+	s := spinner.NewSpinner("Project is starting up…")
+	if !output {
+		s.Start()
+		defer s.Stop()
+	}
+
 	// Create a compose project
 	project, err := createDockerProject(d.projectName, d.airflowHome, d.envFile, "", settingsFile, composeFile, imageLabels)
 	if err != nil {
@@ -251,7 +273,9 @@ func (d *DockerCompose) Start(imageName, settingsFile, composeFile, buildSecretS
 
 	// Start up our project
 	err = d.composeService.Up(context.Background(), project, api.UpOptions{
-		Create: api.CreateOptions{},
+		Create: api.CreateOptions{
+			QuietPull: output,
+		},
 		Start: api.StartOptions{
 			Project: project,
 		},
@@ -260,13 +284,15 @@ func (d *DockerCompose) Start(imageName, settingsFile, composeFile, buildSecretS
 		return errors.Wrap(err, composeRecreateErrMsg)
 	}
 
-	fmt.Println("\n\nAirflow is starting up!")
-
 	airflowDockerVersion, err := d.checkAiflowVersion()
 	if err != nil {
 		return err
 	}
 
+	// If we're logging the output, only start the spinner for waiting on the webserver healthcheck.
+	s.Start()
+	defer s.Stop()
+
 	// Airflow webserver should be hosted at localhost
 	// from the perspective of the CLI running on the host machine.
 	webserverPort := config.CFG.WebserverPort.GetString()
@@ -279,6 +305,8 @@ func (d *DockerCompose) Start(imageName, settingsFile, composeFile, buildSecretS
 		return err
 	}
 
+	spinner.StopWithCheckmark(s, "Project has been started")
+
 	// If we've successfully gotten a healthcheck response, print the status.
 	err = printStatus(settingsFile, envConns, project, d.composeService, airflowDockerVersion, noBrowser)
 	if err != nil {
@@ -321,6 +349,10 @@ func (d *DockerCompose) ComposeExport(settingsFile, composeFile string) error {
 
 // Stop a running docker project
 func (d *DockerCompose) Stop(waitForExit bool) error {
+	s := spinner.NewSpinner("Stopping project…")
+	s.Start()
+	defer s.Stop()
+
 	imageLabels, err := d.imageHandler.ListLabels()
 	if err != nil {
 		return err
@@ -339,6 +371,7 @@ func (d *DockerCompose) Stop(waitForExit bool) error {
 	}
 
 	if !waitForExit {
+		spinner.StopWithCheckmark(s, "Project has been stopped")
 		return nil
 	}
 
@@ -403,6 +436,10 @@ func (d *DockerCompose) PS() error {
 
 // Kill stops a local airflow development cluster
 func (d *DockerCompose) Kill() error {
+	s := spinner.NewSpinner("Killing project…")
+	s.Start()
+	defer s.Stop()
+
 	// Killing an already killed project produces an unsightly warning,
 	// so we briefly switch to a higher level before running the kill command.
 	// We then swap back to the original level.
@@ -416,6 +453,8 @@ func (d *DockerCompose) Kill() error {
 		return errors.Wrap(err, composeStopErrMsg)
 	}
 
+	spinner.StopWithCheckmark(s, "Project has been killed")
+
 	return nil
 }
 
@@ -488,7 +527,7 @@ func (d *DockerCompose) Pytest(pytestFile, customImageName, deployImageName, pyt
 	if deployImageName == "" {
 		// build image
 		if customImageName == "" {
-			err := d.imageHandler.Build(d.dockerfile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true})
+			err := d.imageHandler.Build(d.dockerfile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome})
 			if err != nil {
 				return "", err
 			}
@@ -514,7 +553,7 @@ func (d *DockerCompose) Pytest(pytestFile, customImageName, deployImageName, pyt
 	}
 
 	// run pytests
-	exitCode, err := d.imageHandler.Pytest(pytestFile, d.airflowHome, d.envFile, "", pytestArgs, false, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true})
+	exitCode, err := d.imageHandler.Pytest(pytestFile, d.airflowHome, d.envFile, "", pytestArgs, false, airflowTypes.ImageBuildConfig{Path: d.airflowHome})
 	if err != nil {
 		return exitCode, err
 	}
@@ -548,7 +587,7 @@ func (d *DockerCompose) UpgradeTest(newAirflowVersion, deploymentID, newImageNam
 	} else {
 		// build image for current Airflow version to get current Airflow version
 		fmt.Println("\nBuilding image for current Airflow version")
-		imageBuildErr := d.imageHandler.Build(d.dockerfile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true})
+		imageBuildErr := d.imageHandler.Build(d.dockerfile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome})
 		if imageBuildErr != nil {
 			return imageBuildErr
 		}
@@ -643,7 +682,7 @@ func (d *DockerCompose) conflictTest(testHomeDirectory, newImageName, newAirflow
 		return err
 	}
 
-	exitCode, conflictErr := d.imageHandler.ConflictTest(d.airflowHome, testHomeDirectory, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true})
+	exitCode, conflictErr := d.imageHandler.ConflictTest(d.airflowHome, testHomeDirectory, airflowTypes.ImageBuildConfig{Path: d.airflowHome})
 	if conflictErr != nil {
 		return conflictErr
 	}
@@ -673,7 +712,7 @@ func (d *DockerCompose) versionTest(testHomeDirectory, currentAirflowVersion, de
 		return err
 	}
 	fmt.Println("\nBuilding image for new Airflow version")
-	imageBuildErr := d.imageHandler.Build(newDockerFile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true})
+	imageBuildErr := d.imageHandler.Build(newDockerFile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome})
 	if imageBuildErr != nil {
 		return imageBuildErr
 	}
@@ -711,7 +750,7 @@ func (d *DockerCompose) dagTest(testHomeDirectory, newAirflowVersion, newDockerF
 		fmt.Printf("Adding 'pytest-html' package to requirements.txt unsuccessful: %s\nManually add package to requirements.txt", err.Error())
 	}
 	fmt.Println("\nBuilding image for new Airflow version")
-	imageBuildErr := d.imageHandler.Build(newDockerFile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true})
+	imageBuildErr := d.imageHandler.Build(newDockerFile, buildSecretString, airflowTypes.ImageBuildConfig{Path: d.airflowHome})
 
 	// remove pytest-html to the requirements
 	err = fileutil.RemoveLineFromFile(reqFile, "pytest-html", " # This package is needed for the upgrade dag test. It will be removed once the test is over")
@@ -738,7 +777,7 @@ func (d *DockerCompose) dagTest(testHomeDirectory, newAirflowVersion, newDockerF
 	htmlReportArgs := "--html=dag-test-report.html --self-contained-html"
 	// compare pip freeze files
 	fmt.Println("\nRunning DAG parse test with the new Airflow version")
-	exitCode, err := d.imageHandler.Pytest(pytestFile, d.airflowHome, d.envFile, testHomeDirectory, strings.Fields(htmlReportArgs), true, airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true})
+	exitCode, err := d.imageHandler.Pytest(pytestFile, d.airflowHome, d.envFile, testHomeDirectory, strings.Fields(htmlReportArgs), true, airflowTypes.ImageBuildConfig{Path: d.airflowHome})
 	if err != nil {
 		if strings.Contains(exitCode, "1") { // exit code is 1 meaning tests failed
 			fmt.Println("See above for errors detected in your DAGs")
@@ -1256,7 +1295,7 @@ func (d *DockerCompose) RunDAG(dagID, settingsFile, dagFile, executionDate strin
 			fmt.Printf("Removing line 'astro-run-dag' package from requirements.txt unsuccessful: %s\n", err.Error())
 		}
 	}()
-	err = d.imageHandler.Build(d.dockerfile, "", airflowTypes.ImageBuildConfig{Path: d.airflowHome, Output: true, NoCache: noCache})
+	err = d.imageHandler.Build(d.dockerfile, "", airflowTypes.ImageBuildConfig{Path: d.airflowHome, NoCache: noCache})
 	if err != nil {
 		return err
 	}
@@ -1378,13 +1417,13 @@ func printStatus(settingsFile string, envConns map[string]astrocore.EnvironmentO
 			}
 		}
 	}
-	fmt.Println("\nProject is running! All components are now available.")
 	parts := strings.Split(config.CFG.WebserverPort.GetString(), ":")
 	webserverURL := "http://localhost:" + parts[len(parts)-1]
-	fmt.Printf("\n"+composeLinkWebserverMsg+"\n", ansi.Bold(webserverURL))
-	fmt.Printf(composeLinkPostgresMsg+"\n", ansi.Bold("localhost:"+config.CFG.PostgresPort.GetString()+"/postgres"))
-	fmt.Printf(composeUserPasswordMsg+"\n", ansi.Bold("admin:admin"))
-	fmt.Printf(postgresUserPasswordMsg+"\n", ansi.Bold("postgres:postgres"))
+	bullet := ansi.Blue("+ ")
+	fmt.Printf(bullet+composeLinkWebserverMsg+"\n", ansi.Bold(webserverURL))
+	fmt.Printf(bullet+composeLinkPostgresMsg+"\n", ansi.Bold("postgresql://localhost:"+config.CFG.PostgresPort.GetString()+"/postgres"))
+	fmt.Printf(bullet+composeUserPasswordMsg+"\n", ansi.Bold("admin:admin"))
+	fmt.Printf(bullet+postgresUserPasswordMsg+"\n", ansi.Bold("postgres:postgres"))
 	if !(noBrowser || util.CheckEnvBool(os.Getenv("ASTRONOMER_NO_BROWSER"))) {
 		err = openURL(webserverURL)
 		if err != nil {

airflow/docker_image.go

@@ -8,23 +8,26 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"regexp"
-	"strings"
 
 	"github.com/astronomer/astro-cli/airflow/runtimes"
 	airflowTypes "github.com/astronomer/astro-cli/airflow/types"
 	"github.com/astronomer/astro-cli/config"
+	"github.com/astronomer/astro-cli/pkg/ansi"
 	"github.com/astronomer/astro-cli/pkg/logger"
+	"github.com/astronomer/astro-cli/pkg/spinner"
 	"github.com/astronomer/astro-cli/pkg/util"
 	cliConfig "github.com/docker/cli/cli/config"
 	cliTypes "github.com/docker/cli/cli/config/types"
 	"github.com/docker/cli/cli/streams"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
+	"github.com/sirupsen/logrus"
+	"io"
+	"os"
+	"os/exec"
+	"regexp"
+	"strings"
 )
 
 const (
@@ -71,6 +74,17 @@ func shouldAddPullFlag(dockerfilePath string) (bool, error) {
 }
 
 func (d *DockerImage) Build(dockerfilePath, buildSecretString string, buildConfig airflowTypes.ImageBuildConfig) error {
+	// Determine if we should output to terminal or buffer.
+	output := logger.GetLevel() >= logrus.DebugLevel
+
+	// Start the spinner.
+	s := spinner.NewSpinner("Building project image…")
+	s.FinalMSG = ansi.Green("\u2714") + " Project image has been updated\n"
+	if !output {
+		s.Start()
+		defer s.Stop()
+	}
+
 	containerRuntime, err := runtimes.GetContainerRuntimeBinary()
 	if err != nil {
 		return err
@@ -118,24 +132,34 @@ func (d *DockerImage) Build(dockerfilePath, buildSecretString string, buildConfi
 		}
 		args = append(args, buildSecretArgs...)
 	}
-	// Build image
+
+	// Route output streams according to verbosity.
 	var stdout, stderr io.Writer
-	if buildConfig.Output {
+	var outBuff bytes.Buffer
+	if output {
 		stdout = os.Stdout
 		stderr = os.Stderr
 	} else {
-		stdout = nil
-		stderr = nil
+		stdout = &outBuff
+		stderr = &outBuff
 	}
-	fmt.Println(args)
+
+	// Build the image
 	err = cmdExec(containerRuntime, stdout, stderr, args...)
 	if err != nil {
-		return fmt.Errorf("command '%s build -t %s failed: %w", containerRuntime, d.imageName, err)
+		s.FinalMSG = ""
+		s.Stop()
+		fmt.Println(strings.TrimSpace(outBuff.String()) + "\n")
+		return errors.New("an error was encountered while building the image, see the build logs for details")
 	}
-	return err
+
+	return nil
 }
 
 func (d *DockerImage) Pytest(pytestFile, airflowHome, envFile, testHomeDirectory string, pytestArgs []string, htmlReport bool, buildConfig airflowTypes.ImageBuildConfig) (string, error) {
+	// Determine if we should output to terminal or buffer.
+	output := logger.GetLevel() >= logrus.DebugLevel
+
 	// delete container
 	containerRuntime, err := runtimes.GetContainerRuntimeBinary()
 	if err != nil {
@@ -167,7 +191,7 @@ func (d *DockerImage) Pytest(pytestFile, airflowHome, envFile, testHomeDirectory
 	args = append(args, pytestArgs...)
 	// run pytest image
 	var stdout, stderr io.Writer
-	if buildConfig.Output {
+	if output {
 		stdout = os.Stdout
 		stderr = os.Stderr
 	} else {