diff --git a/cmd/dagger/cmd/root.go b/cmd/dagger/cmd/root.go index 901ae0df..1a01a811 100644 --- a/cmd/dagger/cmd/root.go +++ b/cmd/dagger/cmd/root.go @@ -24,7 +24,7 @@ var rootCmd = &cobra.Command{ } func init() { - rootCmd.PersistentFlags().String("log-format", "", "Log format (json, pretty). Defaults to json if the terminal is not a tty") + rootCmd.PersistentFlags().String("log-format", "auto", "Log format (auto, plain, tty, json)") rootCmd.PersistentFlags().StringP("log-level", "l", "info", "Log level") rootCmd.PersistentFlags().Bool("no-cache", false, "Disable caching") diff --git a/cmd/dagger/cmd/up.go b/cmd/dagger/cmd/up.go index bd59c9ae..8dcbcefb 100644 --- a/cmd/dagger/cmd/up.go +++ b/cmd/dagger/cmd/up.go @@ -31,7 +31,23 @@ var upCmd = &cobra.Command{ } }, Run: func(cmd *cobra.Command, args []string) { - lg := logger.New() + var ( + lg = logger.New() + tty *logger.TTYOutput + err error + ) + + if f := viper.GetString("log-format"); f == "tty" || f == "auto" && term.IsTerminal(int(os.Stdout.Fd())) { + tty, err = logger.NewTTYOutput(os.Stderr) + if err != nil { + lg.Fatal().Err(err).Msg("failed to initialize TTY logger") + } + tty.Start() + defer tty.Stop() + + lg = lg.Output(tty) + } + ctx := lg.WithContext(cmd.Context()) project := common.CurrentProject(ctx) @@ -45,7 +61,7 @@ var upCmd = &cobra.Command{ cl := common.NewClient(ctx) - err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error { + err = cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error { // check that all inputs are set if err := checkInputs(ctx, env); err != nil { return err @@ -60,6 +76,11 @@ var upCmd = &cobra.Command{ return err } + // FIXME: `ListOutput` is printing to Stdout directly which messes + // up the TTY logger. + if tty != nil { + tty.Stop() + } return output.ListOutputs(ctx, env, term.IsTerminal(int(os.Stdout.Fd()))) }) diff --git a/cmd/dagger/logger/logger.go b/cmd/dagger/logger/logger.go index 56da3d6a..795a8938 100644 --- a/cmd/dagger/logger/logger.go +++ b/cmd/dagger/logger/logger.go @@ -21,8 +21,8 @@ func New() zerolog.Logger { Timestamp(). Logger() - if prettyLogs() { - logger = logger.Output(&Console{Out: os.Stderr}) + if !jsonLogs() { + logger = logger.Output(&PlainOutput{Out: os.Stderr}) } else { logger = logger.With().Timestamp().Caller().Logger() } @@ -35,14 +35,16 @@ func New() zerolog.Logger { return logger.Level(lvl) } -func prettyLogs() bool { +func jsonLogs() bool { switch f := viper.GetString("log-format"); f { case "json": - return false - case "pretty": return true - case "": - return term.IsTerminal(int(os.Stdout.Fd())) + case "plain": + return false + case "tty": + return false + case "auto": + return !term.IsTerminal(int(os.Stdout.Fd())) default: fmt.Fprintf(os.Stderr, "invalid --log-format %q\n", f) os.Exit(1) diff --git a/cmd/dagger/logger/console.go b/cmd/dagger/logger/plain.go similarity index 78% rename from cmd/dagger/logger/console.go rename to cmd/dagger/logger/plain.go index 7e1aaccd..e454147e 100644 --- a/cmd/dagger/logger/console.go +++ b/cmd/dagger/logger/plain.go @@ -6,8 +6,8 @@ import ( "fmt" "hash/adler32" "io" + "sort" "strings" - "sync" "time" "github.com/mitchellh/colorstring" @@ -19,38 +19,29 @@ var colorize = colorstring.Colorize{ Reset: true, } -type Console struct { - Out io.Writer - maxLength int - l sync.Mutex +type PlainOutput struct { + Out io.Writer } -func (c *Console) Write(p []byte) (n int, err error) { +func (c *PlainOutput) Write(p []byte) (int, error) { event := map[string]interface{}{} d := json.NewDecoder(bytes.NewReader(p)) if err := d.Decode(&event); err != nil { - return n, fmt.Errorf("cannot decode event: %s", err) + return 0, fmt.Errorf("cannot decode event: %s", err) } - source := c.parseSource(event) + source := parseSource(event) - c.l.Lock() - if len(source) > c.maxLength { - c.maxLength = len(source) - } - c.l.Unlock() - - return fmt.Fprintln(c.Out, - colorize.Color(fmt.Sprintf("%s %s %s%s%s", - c.formatTimestamp(event), - c.formatLevel(event), - c.formatSource(source), - c.formatMessage(event), - c.formatFields(event), - ))) + return fmt.Fprintln(c.Out, colorize.Color(fmt.Sprintf("%s %s %s%s%s", + formatTimestamp(event), + formatLevel(event), + formatSource(source), + formatMessage(event), + formatFields(event), + ))) } -func (c *Console) formatLevel(event map[string]interface{}) string { +func formatLevel(event map[string]interface{}) string { level := zerolog.DebugLevel if l, ok := event[zerolog.LevelFieldName].(string); ok { level, _ = zerolog.ParseLevel(l) @@ -76,7 +67,7 @@ func (c *Console) formatLevel(event map[string]interface{}) string { } } -func (c *Console) formatTimestamp(event map[string]interface{}) string { +func formatTimestamp(event map[string]interface{}) string { ts, ok := event[zerolog.TimestampFieldName].(string) if !ok { return "???" @@ -89,7 +80,7 @@ func (c *Console) formatTimestamp(event map[string]interface{}) string { return fmt.Sprintf("[dark_gray]%s[reset]", t.Format(time.Kitchen)) } -func (c *Console) formatMessage(event map[string]interface{}) string { +func formatMessage(event map[string]interface{}) string { message, ok := event[zerolog.MessageFieldName].(string) if !ok { return "" @@ -125,7 +116,7 @@ func (c *Console) formatMessage(event map[string]interface{}) string { } } -func (c *Console) parseSource(event map[string]interface{}) string { +func parseSource(event map[string]interface{}) string { source := "system" if task, ok := event["component"].(string); ok && task != "" { source = task @@ -133,14 +124,14 @@ func (c *Console) parseSource(event map[string]interface{}) string { return source } -func (c *Console) formatSource(source string) string { +func formatSource(source string) string { return fmt.Sprintf("[%s]%s | [reset]", hashColor(source), source, ) } -func (c *Console) formatFields(entry map[string]interface{}) string { +func formatFields(entry map[string]interface{}) string { // these are the fields we don't want to expose, either because they're // already part of the Log structure or because they're internal fieldSkipList := map[string]struct{}{ @@ -149,7 +140,9 @@ func (c *Console) formatFields(entry map[string]interface{}) string { zerolog.TimestampFieldName: {}, zerolog.ErrorFieldName: {}, zerolog.CallerFieldName: {}, + "environment": {}, "component": {}, + "state": {}, } fields := []string{} @@ -180,7 +173,10 @@ func (c *Console) formatFields(entry map[string]interface{}) string { if len(fields) == 0 { return "" } - return fmt.Sprintf(" [dim]%s[reset]", strings.Join(fields, " ")) + sort.SliceStable(fields, func(i, j int) bool { + return fields[i] < fields[j] + }) + return fmt.Sprintf(" [bold]%s[reset]", strings.Join(fields, " ")) } // hashColor returns a consistent color for a given string @@ -195,8 +191,6 @@ func hashColor(text string) string { "light_yellow", "cyan", "light_cyan", - "red", - "light_red", } h := adler32.Checksum([]byte(text)) return colors[int(h)%len(colors)] diff --git a/cmd/dagger/logger/tty.go b/cmd/dagger/logger/tty.go new file mode 100644 index 00000000..861c07ae --- /dev/null +++ b/cmd/dagger/logger/tty.go @@ -0,0 +1,356 @@ +package logger + +import ( + "bytes" + "encoding/json" + "fmt" + "os" + "strings" + "sync" + "time" + "unicode/utf8" + + "github.com/containerd/console" + "github.com/morikuni/aec" + "go.dagger.io/dagger/environment" +) + +type Event map[string]interface{} + +type Group struct { + Name string + State environment.State + Events []Event + Started *time.Time + Completed *time.Time +} + +type Message struct { + Event Event + Group *Group +} + +type Logs struct { + Messages []Message + + groups map[string]*Group + l sync.Mutex +} + +func (l *Logs) Add(event Event) error { + l.l.Lock() + defer l.l.Unlock() + + component, ok := event["component"].(string) + if !ok { + l.Messages = append(l.Messages, Message{ + Event: event, + }) + + return nil + } + + groupKey := strings.Split(component, ".#up")[0] + group := l.groups[groupKey] + + // If the group doesn't exist, create it + if group == nil { + now := time.Now() + group = &Group{ + Name: groupKey, + Started: &now, + } + l.groups[groupKey] = group + l.Messages = append(l.Messages, Message{ + Group: group, + }) + } + + // Handle state events + // For state events, we just want to update the group status -- no need to + // dispanything + if st, ok := event["state"].(string); ok { + // Ignore state updates for "sub" components + if component != groupKey { + return nil + } + + group.State = environment.State(st) + if group.State != environment.StateComputing { + now := time.Now() + group.Completed = &now + } + + return nil + } + + group.Events = append(group.Events, event) + + return nil +} + +type TTYOutput struct { + cons console.Console + logs *Logs + lineCount int + l sync.RWMutex + + stopCh chan struct{} + doneCh chan struct{} + printCh chan struct{} +} + +func NewTTYOutput(w *os.File) (*TTYOutput, error) { + cons, err := console.ConsoleFromFile(w) + if err != nil { + return nil, err + } + + c := &TTYOutput{ + logs: &Logs{ + groups: make(map[string]*Group), + }, + cons: cons, + stopCh: make(chan struct{}), + doneCh: make(chan struct{}), + printCh: make(chan struct{}, 128), + } + + return c, nil +} + +func (c *TTYOutput) Start() { + defer close(c.doneCh) + go func() { + for { + select { + case <-c.stopCh: + return + case <-c.printCh: + c.print() + case <-time.After(100 * time.Millisecond): + c.print() + } + } + }() +} + +func (c *TTYOutput) Stop() { + c.l.Lock() + defer c.l.Unlock() + + if c.doneCh == nil { + return + } + close(c.stopCh) + <-c.doneCh + c.doneCh = nil +} + +func (c *TTYOutput) Write(p []byte) (n int, err error) { + event := Event{} + d := json.NewDecoder(bytes.NewReader(p)) + if err := d.Decode(&event); err != nil { + return n, fmt.Errorf("cannot decode event: %s", err) + } + + if err := c.logs.Add(event); err != nil { + return 0, err + } + + c.print() + + return len(p), nil +} + +func (c *TTYOutput) print() { + c.l.Lock() + defer c.l.Unlock() + + // make sure the printer is not stopped + select { + case <-c.stopCh: + return + default: + } + + width, height := c.getSize() + + // hide during re-rendering to avoid flickering + fmt.Fprint(c.cons, aec.Hide) + defer fmt.Fprint(c.cons, aec.Show) + + // rewind to the top + b := aec.EmptyBuilder + for i := 0; i < c.lineCount; i++ { + b = b.Up(1) + } + fmt.Fprint(c.cons, b.ANSI) + + runningGroups := 0 + for _, message := range c.logs.Messages { + group := message.Group + if group == nil || group.State != environment.StateComputing { + continue + } + runningGroups++ + } + + linesPerGroup := 5 + if freeLines := (height - len(c.logs.Messages)); freeLines > 0 && runningGroups > 0 { + linesPerGroup = (freeLines - 2) / runningGroups + } + + lineCount := 0 + for _, message := range c.logs.Messages { + if group := message.Group; group != nil { + lineCount += c.printGroup(group, width, linesPerGroup) + } else { + lineCount += c.printLine(message.Event, width) + } + } + + if diff := c.lineCount - lineCount; diff > 0 { + for i := 0; i < diff; i++ { + fmt.Fprintln(c.cons, strings.Repeat(" ", width)) + } + fmt.Fprint(c.cons, aec.EmptyBuilder.Up(uint(diff)).Column(0).ANSI) + } + + c.lineCount = lineCount +} + +func (c *TTYOutput) printLine(event Event, width int) int { + message := colorize.Color(fmt.Sprintf("%s %s %s%s", + formatTimestamp(event), + formatLevel(event), + formatMessage(event), + formatFields(event), + )) + + // trim + for utf8.RuneCountInString(message) > width { + message = message[0:len(message)-4] + "…" + } + + // pad + if delta := width - utf8.RuneCountInString(message); delta > 0 { + message += strings.Repeat(" ", delta) + } + message += "\n" + + // print + fmt.Fprint(c.cons, message) + + return 1 +} + +func (c *TTYOutput) printGroup(group *Group, width, maxLines int) int { + lineCount := 0 + + prefix := "" + switch group.State { + case environment.StateComputing: + prefix = "[+]" + case environment.StateCanceled: + prefix = "[✗]" + case environment.StateFailed: + prefix = "[✗]" + case environment.StateCompleted: + prefix = "[✔]" + } + + out := prefix + " " + group.Name + + endTime := time.Now() + if group.Completed != nil { + endTime = *group.Completed + } + + dt := endTime.Sub(*group.Started).Seconds() + if dt < 0.05 { + dt = 0 + } + timer := fmt.Sprintf("%3.1fs", dt) + + // align + out += strings.Repeat(" ", width-utf8.RuneCountInString(out)-len(timer)) + out += timer + out += "\n" + + // color + switch group.State { + case environment.StateComputing: + out = aec.Apply(out, aec.LightBlueF) + case environment.StateCanceled: + out = aec.Apply(out, aec.LightYellowF) + case environment.StateFailed: + out = aec.Apply(out, aec.LightRedF) + case environment.StateCompleted: + out = aec.Apply(out, aec.LightGreenF) + } + + // Print + fmt.Fprint(c.cons, out) + lineCount++ + + if group.State == environment.StateCompleted { + // for completed tasks, don't show any logs + return lineCount + } + + events := group.Events + + if group.State == environment.StateComputing { + // for computing tasks, show only last N + if len(events) > maxLines { + events = events[len(events)-maxLines:] + } + } + + // for everything else (error, canceled), show all logs + + for _, event := range events { + lineCount += c.printGroupLine(event, width) + } + + return lineCount +} + +func (c *TTYOutput) printGroupLine(event Event, width int) int { + message := colorize.Color(fmt.Sprintf("%s%s", + formatMessage(event), + formatFields(event), + )) + + // trim + for utf8.RuneCountInString(message) > width { + message = message[0:len(message)-4] + "…" + } + + // pad + if delta := width - utf8.RuneCountInString(message); delta > 0 { + message += strings.Repeat(" ", delta) + } + message += "\n" + + // color + message = aec.Apply(message, aec.Faint) + + // Print + fmt.Fprint(c.cons, message) + + return 1 +} + +func (c *TTYOutput) getSize() (int, int) { + width := 80 + height := 10 + size, err := c.cons.Size() + if err == nil && size.Width > 0 && size.Height > 0 { + width = int(size.Width) + height = int(size.Height) + } + + return width, height +} diff --git a/docs/learn/tests/helpers.bash b/docs/learn/tests/helpers.bash index ae6a6d98..85334291 100644 --- a/docs/learn/tests/helpers.bash +++ b/docs/learn/tests/helpers.bash @@ -15,8 +15,8 @@ common_setup() { DAGGER_PROJECT="$UNIVERSE" export DAGGER_PROJECT - # Force pretty printing for error reporting - DAGGER_LOG_FORMAT="pretty" + # Force plain printing for error reporting + DAGGER_LOG_FORMAT="plain" export DAGGER_LOG_FORMAT # Sandbox project. diff --git a/environment/environment.go b/environment/environment.go index 0e434286..77200d4b 100644 --- a/environment/environment.go +++ b/environment/environment.go @@ -3,8 +3,6 @@ package environment import ( "context" "fmt" - "strings" - "time" "cuelang.org/go/cue" cueflow "cuelang.org/go/tools/flow" @@ -184,10 +182,6 @@ func newPipelineRunner(computed *compiler.Value, s solver.Solver) cueflow.Runner ctx, span := tr.Start(ctx, fmt.Sprintf("compute: %s", t.Path().String())) defer span.End() - start := time.Now() - lg. - Info(). - Msg("computing") for _, dep := range t.Dependencies() { lg. Debug(). @@ -203,19 +197,6 @@ func newPipelineRunner(computed *compiler.Value, s solver.Solver) cueflow.Runner attribute.String("error", err.Error()), )) - // FIXME: this should use errdefs.IsCanceled(err) - if strings.Contains(err.Error(), "context canceled") { - lg. - Error(). - Dur("duration", time.Since(start)). - Msg("canceled") - return err - } - lg. - Error(). - Dur("duration", time.Since(start)). - Err(err). - Msg("failed") return err } @@ -241,10 +222,6 @@ func newPipelineRunner(computed *compiler.Value, s solver.Solver) cueflow.Runner return err } - lg. - Info(). - Dur("duration", time.Since(start)). - Msg("completed") return nil }) } diff --git a/environment/pipeline.go b/environment/pipeline.go index f4eb11b4..f3ab066a 100644 --- a/environment/pipeline.go +++ b/environment/pipeline.go @@ -9,6 +9,7 @@ import ( "net" "net/url" "strings" + "time" "cuelang.org/go/cue" "github.com/docker/distribution/reference" @@ -27,6 +28,15 @@ import ( "go.dagger.io/dagger/solver" ) +type State string + +const ( + StateComputing = State("computing") + StateCanceled = State("canceled") + StateFailed = State("failed") + StateCompleted = State("completed") +) + // An execution pipeline type Pipeline struct { code *compiler.Value @@ -146,6 +156,49 @@ func analyzeOp(fn func(*compiler.Value) error, op *compiler.Value) error { } func (p *Pipeline) Run(ctx context.Context) error { + lg := log. + Ctx(ctx). + With(). + Str("component", p.name). + Logger() + + start := time.Now() + + lg. + Info(). + Str("state", string(StateComputing)). + Msg(string(StateComputing)) + + err := p.run(ctx) + + if err != nil { + // FIXME: this should use errdefs.IsCanceled(err) + if strings.Contains(err.Error(), "context canceled") { + lg. + Error(). + Dur("duration", time.Since(start)). + Str("state", string(StateCanceled)). + Msg(string(StateCanceled)) + } else { + lg. + Error(). + Dur("duration", time.Since(start)). + Err(err). + Str("state", string(StateFailed)). + Msg(string(StateFailed)) + } + return err + } + + lg. + Info(). + Dur("duration", time.Since(start)). + Str("state", string(StateCompleted)). + Msg(string(StateCompleted)) + return nil +} + +func (p *Pipeline) run(ctx context.Context) error { ops, err := ops(p.code) if err != nil { return err diff --git a/go.mod b/go.mod index 51e1fff0..e7ea64c5 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,6 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/uuid v1.3.0 github.com/hashicorp/go-version v1.3.0 - github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea github.com/mattn/go-colorable v0.1.8 // indirect github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db github.com/mitchellh/go-homedir v1.1.0 @@ -27,6 +26,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tonistiigi/fsutil v0.0.0-20210609172227-d72af97c0eaf github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea + github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f go.mozilla.org/sops/v3 v3.7.1 go.opentelemetry.io/otel v1.0.1 go.opentelemetry.io/otel/exporters/jaeger v1.0.1 @@ -45,7 +45,6 @@ require ( replace ( github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe - github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 // genproto: corresponds to containerd google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63 ) diff --git a/go.sum b/go.sum index 4ebe3692..2a5ea62d 100644 --- a/go.sum +++ b/go.sum @@ -848,6 +848,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= +github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea/go.mod h1:QMdK4dGB3YhEW2BmA1wgGpPYI3HZy/5gD705PXKUVSg= github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= @@ -1296,8 +1297,7 @@ github.com/tonistiigi/go-actions-cache v0.0.0-20211002214948-4d48f2ff622a/go.mod github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe/go.mod h1:/+MCh11CJf2oz0BXmlmqyopK/ad1rKkcOXPoYuPCJYU= github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0= github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk= -github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305 h1:y/1cL5AL2oRcfzz8CAHHhR6kDDfIOT0WEyH5k40sccM= -github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305/go.mod h1:gXOLibKqQTRAVuVZ9gX7G9Ykky8ll8yb4slxsEMoY0c= +github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f h1:DLpt6B5oaaS8jyXHa9VA4rrZloBVPVXeCtrOsrFauxc= github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= diff --git a/stdlib/helpers.bash b/stdlib/helpers.bash index fc081be5..72461590 100644 --- a/stdlib/helpers.bash +++ b/stdlib/helpers.bash @@ -12,8 +12,8 @@ common_setup() { DAGGER_PROJECT="$UNIVERSE" export DAGGER_PROJECT - # Force pretty printing for error reporting - DAGGER_LOG_FORMAT="pretty" + # Force plain printing for error reporting + DAGGER_LOG_FORMAT="plain" export DAGGER_LOG_FORMAT # Sandbox project. @@ -97,11 +97,11 @@ setup_localstack() { if [ "$(curl -s http://localhost:4566)" = '{"status": "running"}' ] && \ [ "$GITHUB_ACTIONS" != "true" ]; then echo "Cleanup local LOCALSTACK" - + # S3 buckets cleanup aws --endpoint-url=http://localhost:4566 s3 rm s3://dagger-ci || true aws --endpoint-url=http://localhost:4566 s3 mb s3://dagger-ci || true - + # ECR repositories cleanup aws --endpoint-url=http://localhost:4566 ecr delete-repository --repository-name dagger-ci || true aws --endpoint-url=http://localhost:4566 ecr create-repository --repository-name dagger-ci || true diff --git a/tests/helpers.bash b/tests/helpers.bash index 8e3eb2c9..5daf576f 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash @@ -7,7 +7,7 @@ common_setup() { DAGGER="${DAGGER_BINARY:-$TESTDIR/../cmd/dagger/dagger}" export DAGGER - DAGGER_LOG_FORMAT="pretty" + DAGGER_LOG_FORMAT="plain" export DAGGER_LOG_FORMAT DAGGER_PROJECT="$(mktemp -d -t dagger-project-XXXXXX)" @@ -28,7 +28,7 @@ dagger_new_with_plan() { dagger_new_with_env() { local sourcePlan="$1" - + "$DAGGER" init --project "$DAGGER_PROJECT" rsync -av "$sourcePlan"/ "$DAGGER_PROJECT" } diff --git a/util/progressui/display.go b/util/progressui/display.go index 55f269aa..e68f1be9 100644 --- a/util/progressui/display.go +++ b/util/progressui/display.go @@ -12,11 +12,11 @@ import ( "time" "github.com/containerd/console" - "github.com/jaguilar/vt100" "github.com/moby/buildkit/client" "github.com/morikuni/aec" digest "github.com/opencontainers/go-digest" "github.com/tonistiigi/units" + "github.com/tonistiigi/vt100" "golang.org/x/time/rate" )