From 6b45b1d61c6a50ef7808088a0f00438e71ef2428 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Fri, 22 Oct 2021 17:55:38 +0200 Subject: [PATCH] ux: rework displaying of success messages --- pkg/compiler/backend/simpledocker.go | 10 +++++----- pkg/compiler/compiler.go | 8 ++++---- pkg/installer/repository_docker.go | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkg/compiler/backend/simpledocker.go b/pkg/compiler/backend/simpledocker.go index a49cf37e..fa8d8f02 100644 --- a/pkg/compiler/backend/simpledocker.go +++ b/pkg/compiler/backend/simpledocker.go @@ -56,7 +56,7 @@ func (s *SimpleDocker) BuildImage(opts Options) error { return err } - s.ctx.Info(":whale: Building image " + name + " done") + s.ctx.Success(":whale: Building image " + name + " done") bus.Manager.Publish(bus.EventImagePostBuild, opts) @@ -70,7 +70,7 @@ func (s *SimpleDocker) CopyImage(src, dst string) error { if err != nil { return errors.Wrap(err, "Failed tagging image: "+string(out)) } - s.ctx.Info(":whale: Tagged image:", src, "->", dst) + s.ctx.Success(":whale: Tagged image:", src, "->", dst) return nil } @@ -90,7 +90,7 @@ func (s *SimpleDocker) DownloadImage(opts Options) error { return errors.Wrap(err, "Failed pulling image: "+string(out)) } - s.ctx.Info(":whale: Downloaded image:", name) + s.ctx.Success(":whale: Downloaded image:", name) bus.Manager.Publish(bus.EventImagePostPull, opts) return nil @@ -120,7 +120,7 @@ func (s *SimpleDocker) RemoveImage(opts Options) error { if err != nil { return errors.Wrap(err, "Failed removing image: "+string(out)) } - s.ctx.Info(":whale: Removed image:", name) + s.ctx.Success(":whale: Removed image:", name) //Info(string(out)) return nil } @@ -137,7 +137,7 @@ func (s *SimpleDocker) Push(opts Options) error { if err != nil { return errors.Wrap(err, "Failed pushing image: "+string(out)) } - s.ctx.Info(":whale: Pushed image:", name) + s.ctx.Success(":whale: Pushed image:", name) bus.Manager.Publish(bus.EventImagePostPush, opts) //Info(string(out)) diff --git a/pkg/compiler/compiler.go b/pkg/compiler/compiler.go index f4df7efe..4e346de0 100644 --- a/pkg/compiler/compiler.go +++ b/pkg/compiler/compiler.go @@ -447,7 +447,7 @@ func (cs *LuetCompiler) genArtifact(p *compilerspec.LuetCompilationSpec, builder if err != nil { return a, errors.Wrap(err, "Failed while writing metadata file") } - cs.Options.Context.Info(pkgTag, " :white_check_mark: done (empty virtual package)") + cs.Options.Context.Success(pkgTag, " :white_check_mark: done (empty virtual package)") return a, nil } @@ -477,7 +477,7 @@ func (cs *LuetCompiler) genArtifact(p *compilerspec.LuetCompilationSpec, builder if err != nil { return a, errors.Wrap(err, "Failed while writing metadata file") } - cs.Options.Context.Info(pkgTag, " :white_check_mark: Done") + cs.Options.Context.Success(pkgTag, " :white_check_mark: Done") return a, nil } @@ -965,7 +965,7 @@ func (cs *LuetCompiler) resolveMultiStageImages(concurrency int, keepPermissions Source: c.Source, Destination: c.Destination, }) - cs.Options.Context.Info(copyTag2, ":white_check_mark: Done") + cs.Options.Context.Success(copyTag2, ":white_check_mark: Done") } else { resolvedCopyFields = append(resolvedCopyFields, c) } @@ -1128,7 +1128,7 @@ func (cs *LuetCompiler) compile(concurrency int, keepPermissions bool, generateF a.PackageCacheImage = assertion.Hash.PackageHash - cs.Options.Context.Info(pkgTag, ":white_check_mark: Done") + cs.Options.Context.Success(pkgTag, ":white_check_mark: Done") bus.Manager.Publish(bus.EventPackagePostBuild, struct { CompileSpec *compilerspec.LuetCompilationSpec diff --git a/pkg/installer/repository_docker.go b/pkg/installer/repository_docker.go index dbd3eb5b..7ea0714c 100644 --- a/pkg/installer/repository_docker.go +++ b/pkg/installer/repository_docker.go @@ -262,7 +262,6 @@ func (d *dockerRepositoryGenerator) Generate(r *LuetSystemRepository, imagePrefi artifacts, snapshotRepoFile, err := r.Snapshot(id, repoTemp) if err != nil { return errors.Wrap(err, "while creating snapshot") - } if err := d.pushRepoMetadata(snapshotRepoFile, filepath.Base(snapshotRepoFile), r); err != nil { return errors.Wrap(err, "while pushing repository snapshot metadata tree")