Merge pull request #73 from asalkeld/deploy-progress

feat(deploy): add progress updates

pkg/cmd/deployment/root.go

@@ -66,33 +66,44 @@ nitric deployment apply -n prod-aws -s ../project/ -t prod "functions/*.ts"
 
 		s, err := stack.FromOptions()
 		if err != nil && len(args) > 0 {
-			s, err = stack.FromGlobArgs(args)
-			cobra.CheckErr(err)
-
-			s, err = codeconfig.Populate(s)
+			codeAsConfig := tasklet.Runner{
+				StartMsg: "Gathering configuration from code..",
+				Runner: func(_ output.Progress) error {
+					s, err = stack.FromGlobArgs(args)
+					if err != nil {
+						return err
+					}
+
+					s, err = codeconfig.Populate(s)
+					return err
+				},
+				StopMsg: "Configuration gathered",
+			}
+			tasklet.MustRun(codeAsConfig, tasklet.Opts{LogToPterm: true})
 		}
-		cobra.CheckErr(err)
 
 		p, err := provider.NewProvider(s, t)
 		cobra.CheckErr(err)
 
 		buildImages := tasklet.Runner{
 			StartMsg: "Building Images",
-			Runner: func(tCtx tasklet.TaskletContext) error {
+			Runner: func(_ output.Progress) error {
 				return build.Create(s, t)
 			},
-			StopMsg: "Images built!",
+			StopMsg: "Images built",
 		}
-		tasklet.MustRun(buildImages, tasklet.Opts{})
+		tasklet.MustRun(buildImages, tasklet.Opts{
+			LogToPterm: true,
+		})
 
 		deploy := tasklet.Runner{
 			StartMsg: "Deploying..",
-			Runner: func(tCtx tasklet.TaskletContext) error {
-				return p.Apply(deploymentName)
+			Runner: func(progress output.Progress) error {
+				return p.Apply(progress, deploymentName)
 			},
-			StopMsg: "Deployment complete!",
+			StopMsg: "Stack",
 		}
-		tasklet.MustRun(deploy, tasklet.Opts{})
+		tasklet.MustRun(deploy, tasklet.Opts{SuccessPrefix: "Deployed"})
 	},
 	Args: cobra.MinimumNArgs(0),
 }
@@ -117,13 +128,15 @@ nitric deployment delete -n prod-aws -s ../project/ -t prod
 
 		deploy := tasklet.Runner{
 			StartMsg: "Deleting..",
-			Runner: func(tCtx tasklet.TaskletContext) error {
-				return p.Delete(deploymentName)
+			Runner: func(progress output.Progress) error {
+				return p.Delete(progress, deploymentName)
 			},
-			StopMsg: "Deployment deleted!",
+			StopMsg: "Deployment",
 		}
-		tasklet.MustRun(deploy, tasklet.Opts{})
-
+		tasklet.MustRun(deploy, tasklet.Opts{
+			LogToPterm:    true,
+			SuccessPrefix: "Deleted",
+		})
 	},
 	Args: cobra.ExactArgs(0),
 }

pkg/cmd/root.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/mitchellh/mapstructure"
+	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
@@ -53,6 +54,10 @@ var rootCmd = &cobra.Command{
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
+	if output.VerboseLevel > 1 {
+		pterm.EnableDebugMessages()
+	}
+
 	cobra.CheckErr(rootCmd.Execute())
 }
 
@@ -136,7 +141,7 @@ func ensureConfigDefaults() {
 	if needsWrite {
 		tasklet.MustRun(tasklet.Runner{
 			StartMsg: "Updating configfile to include defaults",
-			Runner: func(_ tasklet.TaskletContext) error {
+			Runner: func(_ output.Progress) error {
 				// ensure .config/nitric exists
 				err := os.MkdirAll(utils.NitricConfigDir(), os.ModePerm)
 				if err != nil {

pkg/cmd/run/root.go

@@ -59,7 +59,7 @@ var runCmd = &cobra.Command{
 
 		createBaseImage := tasklet.Runner{
 			StartMsg: "Creating Dev Image",
-			Runner: func(tCtx tasklet.TaskletContext) error {
+			Runner: func(_ output.Progress) error {
 				return build.CreateBaseDev(s)
 			},
 			StopMsg: "Created Dev Image!",
@@ -71,7 +71,7 @@ var runCmd = &cobra.Command{
 
 		startLocalServices := tasklet.Runner{
 			StartMsg: "Starting Local Services",
-			Runner: func(tCtx tasklet.TaskletContext) error {
+			Runner: func(progress output.Progress) error {
 				go func(errch chan error) {
 					errch <- ls.Start()
 				}(memerr)
@@ -88,7 +88,7 @@ var runCmd = &cobra.Command{
 					if ls.Running() {
 						break
 					}
-					tCtx.Spinner().UpdateText("Waiting for Local Services to be ready")
+					progress.Busyf("Waiting for Local Services to be ready")
 					time.Sleep(time.Second)
 				}
 				return nil
@@ -103,7 +103,7 @@ var runCmd = &cobra.Command{
 
 		startFunctions := tasklet.Runner{
 			StartMsg: "Starting Functions",
-			Runner: func(tCtx tasklet.TaskletContext) error {
+			Runner: func(_ output.Progress) error {
 				functions, err = run.FunctionsFromHandlers(s)
 				if err != nil {
 					return err

pkg/codeconfig/codeconfig.go

@@ -18,8 +18,8 @@ package codeconfig
 
 import (
 	"fmt"
+	"log"
 	"net"
-	"os"
 	"regexp"
 	osruntime "runtime"
 	"strings"
@@ -31,6 +31,7 @@ import (
 	"github.com/imdario/mergo"
 	"github.com/moby/moby/pkg/stdcopy"
 	"github.com/pkg/errors"
+	"github.com/pterm/pterm"
 	"google.golang.org/grpc"
 
 	"github.com/nitrictech/cli/pkg/build"
@@ -296,9 +297,8 @@ func (c *codeConfig) collectOne(handler string) error {
 		return err
 	}
 
+	pterm.Debug.Println(containerengine.Cli(cc, hostConfig))
 	if output.VerboseLevel > 1 {
-		fmt.Println(containerengine.Cli(cc, hostConfig))
-
 		logreader, err := ce.ContainerLogs(cID, types.ContainerLogsOptions{
 			ShowStdout: true,
 			ShowStderr: true,
@@ -308,7 +308,7 @@ func (c *codeConfig) collectOne(handler string) error {
 			return err
 		}
 		go func() {
-			_, _ = stdcopy.StdCopy(os.Stdout, os.Stderr, logreader)
+			_, _ = stdcopy.StdCopy(log.Writer(), log.Writer(), logreader)
 		}()
 	}
 

pkg/containerengine/docker.go

@@ -24,7 +24,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"os/exec"
 	"strings"
 	"time"
@@ -38,6 +37,7 @@ import (
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/pkg/errors"
+	"github.com/pterm/pterm"
 
 	"github.com/nitrictech/cli/pkg/utils"
 )
@@ -187,7 +187,7 @@ func print(rd io.Reader) error {
 			return err
 		}
 		if len(line.Stream) > 0 {
-			log.Default().Print(line.Stream)
+			pterm.Debug.Print(line.Stream)
 		}
 	}
 

pkg/output/verbose.go

@@ -16,4 +16,29 @@
 
 package output
 
-var VerboseLevel int
+import (
+	"io"
+)
+
+var (
+	VerboseLevel int
+)
+
+type Progress interface {
+	Debugf(format string, a ...interface{})
+	Busyf(format string, a ...interface{})
+	Successf(format string, a ...interface{})
+	Failf(format string, a ...interface{})
+}
+
+func StdoutToPtermDebug(b io.ReadCloser, p Progress, prefix string) {
+	defer b.Close()
+	buf := make([]byte, 1024)
+	for {
+		n, err := b.Read(buf)
+		if err != nil {
+			break
+		}
+		p.Debugf("%s %v", prefix, string(buf[:n]))
+	}
+}

pkg/provider/pulumi/azure/azure.go

@@ -74,19 +74,23 @@ func (a *azureProvider) SupportedRegions() []string {
 func (a *azureProvider) Validate() error {
 	errList := utils.NewErrorList()
 
-	if !sliceutil.Contains(a.SupportedRegions(), a.t.Region) {
+	if a.t.Region == "" {
+		errList.Add(fmt.Errorf("target %s requires \"region\"", a.t.Provider))
+	} else if !sliceutil.Contains(a.SupportedRegions(), a.t.Region) {
 		errList.Add(utils.NewNotSupportedErr(fmt.Sprintf("region %s not supported on provider %s", a.t.Region, a.t.Provider)))
 	}
 
 	if _, ok := a.t.Extra["org"]; !ok {
 		errList.Add(fmt.Errorf("target %s requires \"org\"", a.t.Provider))
+	} else {
+		a.org = a.t.Extra["org"].(string)
 	}
-	a.org = a.t.Extra["org"].(string)
 
 	if _, ok := a.t.Extra["adminemail"]; !ok {
 		errList.Add(fmt.Errorf("target %s requires \"adminemail\"", a.t.Provider))
+	} else {
+		a.adminEmail = a.t.Extra["adminemail"].(string)
 	}
-	a.adminEmail = a.t.Extra["adminemail"].(string)
 
 	return errList.Aggregate()
 }

pkg/provider/pulumi/generator.go

@@ -21,8 +21,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/pulumi/pulumi/sdk/v3/go/auto"
-	"github.com/pulumi/pulumi/sdk/v3/go/auto/debug"
-	"github.com/pulumi/pulumi/sdk/v3/go/auto/optup"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/workspace"
 
@@ -100,18 +98,13 @@ func (p *pulumiDeployment) load(name string) (*auto.Stack, error) {
 	return &s, errors.WithMessage(err, "Refresh")
 }
 
-func (p *pulumiDeployment) Apply(name string) error {
+func (p *pulumiDeployment) Apply(log output.Progress, name string) error {
 	s, err := p.load(name)
 	if err != nil {
 		return errors.WithMessage(err, "loading pulumi stack")
 	}
 
-	var loglevel uint = uint(output.VerboseLevel)
-	dbg := optup.DebugLogging(debug.LoggingOptions{
-		LogLevel:    &loglevel,
-		LogToStdErr: true})
-
-	res, err := s.Up(context.Background(), dbg)
+	res, err := s.Up(context.Background(), updateLoggingOpts(log)...)
 	defer p.p.CleanUp()
 	if err != nil {
 		return errors.WithMessage(err, "Updating pulumi stack "+res.Summary.Message)
@@ -136,12 +129,13 @@ func (p *pulumiDeployment) List() (interface{}, error) {
 	return ws.ListStacks(context.Background())
 }
 
-func (a *pulumiDeployment) Delete(name string) error {
+func (a *pulumiDeployment) Delete(log output.Progress, name string) error {
 	s, err := a.load(name)
 	if err != nil {
 		return err
 	}
-	res, err := s.Destroy(context.Background())
+
+	res, err := s.Destroy(context.Background(), destroyLoggingOpts(log)...)
 	if err != nil {
 		return errors.WithMessage(err, res.Summary.Message)
 	}