Add silent option to patch

Signed-off-by: Shishir Kushwaha <[email protected]>
project-copacetic · Jul 11, 2024 · 9e4308b · 9e4308b
1 parent 1fcc6e0
commit 9e4308b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 16 deletions.
diff --git a/pkg/patch/cmd.go b/pkg/patch/cmd.go
@@ -25,6 +25,7 @@ type patchArgs struct {
 	ignoreError   bool
 	format        string
 	output        string
+	silent        bool
 	bkOpts        buildkit.Opts
 }
 
@@ -50,6 +51,7 @@ func NewPatchCmd() *cobra.Command {
 				ua.scanner,
 				ua.format,
 				ua.output,
+				ua.silent,
 				ua.ignoreError,
 				bkopts)
 		},
@@ -66,6 +68,7 @@ func NewPatchCmd() *cobra.Command {
 	flags.DurationVar(&ua.timeout, "timeout", 5*time.Minute, "Timeout for the operation, defaults to '5m'")
 	flags.StringVarP(&ua.scanner, "scanner", "s", "trivy", "Scanner used to generate the report, defaults to 'trivy'")
 	flags.BoolVar(&ua.ignoreError, "ignore-errors", false, "Ignore errors and continue patching")
+	flags.BoolVar(&ua.silent, "silent", false, "silences output while processing")
 	flags.StringVarP(&ua.format, "format", "f", "openvex", "Output format, defaults to 'openvex'")
 	flags.StringVarP(&ua.output, "output", "o", "", "Output file path")
 

diff --git a/pkg/patch/patch.go b/pkg/patch/patch.go
@@ -43,13 +43,13 @@ const (
 )
 
 // Patch command applies package updates to an OCI image given a vulnerability report.
-func Patch(ctx context.Context, timeout time.Duration, image, reportFile, patchedTag, workingFolder, scanner, format, output string, ignoreError bool, bkOpts buildkit.Opts) error {
+func Patch(ctx context.Context, timeout time.Duration, image, reportFile, patchedTag, workingFolder, scanner, format, output string, silent, ignoreError bool, bkOpts buildkit.Opts) error {
 	timeoutCtx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 
 	ch := make(chan error)
 	go func() {
-		ch <- patchWithContext(timeoutCtx, ch, image, reportFile, patchedTag, workingFolder, scanner, format, output, ignoreError, bkOpts)
+		ch <- patchWithContext(timeoutCtx, ch, image, reportFile, patchedTag, workingFolder, scanner, format, output, silent, ignoreError, bkOpts)
 	}()
 
 	select {
@@ -74,7 +74,7 @@ func removeIfNotDebug(workingFolder string) {
 	}
 }
 
-func patchWithContext(ctx context.Context, ch chan error, image, reportFile, patchedTag, workingFolder, scanner, format, output string, ignoreError bool, bkOpts buildkit.Opts) error {
+func patchWithContext(ctx context.Context, ch chan error, image, reportFile, patchedTag, workingFolder, scanner, format, output string, silent, ignoreError bool, bkOpts buildkit.Opts) error {
 	imageName, err := reference.ParseNormalizedNamed(image)
 	if err != nil {
 		return err
@@ -275,21 +275,35 @@ func patchWithContext(ctx context.Context, ch chan error, image, reportFile, pat
 
 		return err
 	})
+	if silent {
+		eg.Go(func() error {
+			for {
+				select {
+				case <-ctx.Done():
+					return context.Cause(ctx)
+				case _, ok := <-buildChannel:
+					if !ok {
+						return nil
+					}
+				}
+			}
+		})
+	} else {
+		eg.Go(func() error {
+			// not using shared context to not disrupt display but let us finish reporting errors
+			mode := progressui.AutoMode
+			if log.GetLevel() >= log.DebugLevel {
+				mode = progressui.PlainMode
+			}
+			display, err := progressui.NewDisplay(os.Stderr, mode)
+			if err != nil {
+				return err
+			}
 
-	eg.Go(func() error {
-		// not using shared context to not disrupt display but let us finish reporting errors
-		mode := progressui.AutoMode
-		if log.GetLevel() >= log.DebugLevel {
-			mode = progressui.PlainMode
-		}
-		display, err := progressui.NewDisplay(os.Stderr, mode)
-		if err != nil {
+			_, err = display.UpdateFrom(ctx, buildChannel)
 			return err
-		}
-
-		_, err = display.UpdateFrom(ctx, buildChannel)
-		return err
-	})
+		})
+	}
 
 	eg.Go(func() error {
 		if err := dockerLoad(ctx, pipeR); err != nil {