Merge pull request #678 from lluiscampos/MEN-8127-add-module-image-progressbar

MEN-8127: Fix output for `write module-image`

Author: lluiscampos

Diff for: LIC_FILES_CHKSUM.sha256

@@ -1,7 +1,7 @@
 # Apache 2.0 licenses.
 38791d93beae962b266e11ac888ea2af4f07578b272c2f9dcb05f54f32960a76  LICENSE
 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/github.com/minio/sha256-simd/LICENSE
-8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor/github.com/mendersoftware/progressbar/LICENSE
+132fb47b89947cd5f98e380186bc412af5561c70669d37d3a83b36f03a0ddae5  vendor/github.com/mendersoftware/progressbar/LICENSE
 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/google.golang.org/genproto/LICENSE
 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/google.golang.org/genproto/googleapis/api/LICENSE
 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/google.golang.org/genproto/googleapis/rpc/LICENSE

Diff for: cli/cli.go

@@ -423,6 +423,10 @@ func getCliContext() *cli.App {
 		},
 		softwareVersionValue,
 		softwareFilesystem,
+		cli.BoolFlag{
+			Name:  "no-progress",
+			Usage: "Suppress the progressbar output",
+		},
 	}
 	writeModuleCommand.Before = applyCompressionInCommand
 

Diff for: cli/write.go

@@ -813,6 +813,13 @@ func writeModuleImage(ctx *cli.Context) error {
 		return err
 	}
 
+	if !ctx.Bool("no-progress") {
+		ctx, cancel := context.WithCancel(context.Background())
+		go reportProgress(ctx, aw.State)
+		defer cancel()
+		aw.ProgressWriter = utils.NewProgressWriter()
+	}
+
 	err = aw.WriteArtifact(
 		&awriter.WriteArtifactArgs{
 			Format:            "mender",

Diff for: go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/klauspost/pgzip v1.2.6
 	github.com/lestrrat-go/jwx v1.2.30
 	github.com/mendersoftware/openssl v1.1.1-0.20221101135106-cb94d0a179f8
-	github.com/mendersoftware/progressbar v0.0.3
+	github.com/mendersoftware/progressbar v0.0.4
 	github.com/minio/sha256-simd v1.0.1
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3

Diff for: go.sum

@@ -176,6 +176,8 @@ github.com/mendersoftware/openssl v1.1.1-0.20221101135106-cb94d0a179f8 h1:LO1M21
 github.com/mendersoftware/openssl v1.1.1-0.20221101135106-cb94d0a179f8/go.mod h1:tikEC94q+Y0TU6r19L6mHzwruoTNYPEkrQPvsHEcQyU=
 github.com/mendersoftware/progressbar v0.0.3 h1:AUdBGPvXO0l9i39rmXKZbEAPet2FzBeiG8b30D5/2Vc=
 github.com/mendersoftware/progressbar v0.0.3/go.mod h1:NYaLNLhy3UXkRweGjhR3We3Q1ngmUmOWjC3+m8EzwjE=
+github.com/mendersoftware/progressbar v0.0.4 h1:R2uO9WiNRwF4pL278KlzSFFeIq4GBK2bSg1uD9uy9MI=
+github.com/mendersoftware/progressbar v0.0.4/go.mod h1:4opIJf3RMZWokFEMM7z1EdPjWtVWShdy9RvUDyHqmSk=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=

Diff for: vendor/github.com/mendersoftware/progressbar/LICENSE

@@ -257,8 +257,8 @@ github.com/mattn/go-isatty
 ## explicit
 github.com/mendersoftware/openssl
 github.com/mendersoftware/openssl/utils
-# github.com/mendersoftware/progressbar v0.0.3
-## explicit; go 1.15
+# github.com/mendersoftware/progressbar v0.0.4
+## explicit; go 1.17
 github.com/mendersoftware/progressbar
 # github.com/minio/sha256-simd v1.0.1
 ## explicit; go 1.17