From 2133edb2ca18820585f260db287bd40a57e7b4a2 Mon Sep 17 00:00:00 2001
From: Aditya R <arajan@redhat.com>
Date: Mon, 23 May 2022 14:37:51 +0530
Subject: compat, build: suppress step errors when quiet is set

Match with docker API and suppress step errors when field quiet is set.

Closes: https://github.com/containers/podman/issues/14315

Signed-off-by: Aditya R <arajan@redhat.com>
---
 pkg/api/handlers/compat/images_build.go | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'pkg')

diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index bcd102901..0a1bc941d 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -674,15 +674,17 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 
 	enc := json.NewEncoder(body)
 	enc.SetEscapeHTML(true)
+	var stepErrors []string
 
 	for {
-		m := struct {
+		type BuildResponse struct {
 			Stream string                 `json:"stream,omitempty"`
 			Error  *jsonmessage.JSONError `json:"errorDetail,omitempty"`
 			// NOTE: `error` is being deprecated check https://github.com/moby/moby/blob/master/pkg/jsonmessage/jsonmessage.go#L148
 			ErrorMessage string          `json:"error,omitempty"` // deprecate this slowly
 			Aux          json.RawMessage `json:"aux,omitempty"`
-		}{}
+		}
+		m := BuildResponse{}
 
 		select {
 		case e := <-stdout.Chan():
@@ -698,12 +700,27 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 			}
 			flush()
 		case e := <-auxout.Chan():
-			m.Stream = string(e)
-			if err := enc.Encode(m); err != nil {
-				stderr.Write([]byte(err.Error()))
+			if !query.Quiet {
+				m.Stream = string(e)
+				if err := enc.Encode(m); err != nil {
+					stderr.Write([]byte(err.Error()))
+				}
+				flush()
+			} else {
+				stepErrors = append(stepErrors, string(e))
 			}
-			flush()
 		case e := <-stderr.Chan():
+			// Docker-API Compat parity : Build failed so
+			// output all step errors irrespective of quiet
+			// flag.
+			for _, stepError := range stepErrors {
+				t := BuildResponse{}
+				t.Stream = stepError
+				if err := enc.Encode(t); err != nil {
+					stderr.Write([]byte(err.Error()))
+				}
+				flush()
+			}
 			m.ErrorMessage = string(e)
 			m.Error = &jsonmessage.JSONError{
 				Message: m.ErrorMessage,
-- 
cgit v1.2.3-54-g00ecf