🐛 Report ruleErr outside of builder stream. (#113)

To support succeeded with errors, the RuleError cannot be returned in the builder stream because it is interpreted as a streaming error by the multi-part form send. related: konveyor/tackle2-hub#729 closes #114 --------- Signed-off-by: Jeff Ortel <[email protected]>
konveyor · Jul 17, 2024 · 19873f4 · 19873f4
1 parent a35f376
commit 19873f4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/builder/issue.go b/builder/issue.go
@@ -26,6 +26,11 @@ type Issues struct {
 	Path    string
 }
 
+// RuleError returns the rule error.
+func (b *Issues) RuleError() (r *RuleError) {
+	return &b.ruleErr
+}
+
 // Reader returns a reader.
 func (b *Issues) Reader() (r io.Reader) {
 	r, w := io.Pipe()
@@ -93,13 +98,6 @@ func (b *Issues) Write(writer io.Writer) (err error) {
 			}
 		}
 	}
-	if err != nil {
-		return
-	}
-	if b.ruleErr.NotEmpty() {
-		err = &b.ruleErr
-		return
-	}
 	return
 }
 
@@ -178,6 +176,9 @@ func (e *RuleError) NotEmpty() (b bool) {
 }
 
 func (e *RuleError) Report() {
+	if len(e.items) == 0 {
+		return
+	}
 	var errors []api.TaskError
 	for ruleid, err := range e.items {
 		errors = append(

diff --git a/cmd/main.go b/cmd/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"os"
 	"path"
 	"time"
@@ -130,17 +129,14 @@ func main() {
 				binding.MIMEYAML,
 				issues.Reader(),
 				deps.Reader())
-			if err == nil {
-				addon.Activity("Analysis reported. duration: %s", time.Since(mark))
-			} else {
-				ruleErr := &RuleError{}
-				if errors.As(err, &ruleErr) {
-					ruleErr.Report()
-					err = nil
-				} else {
-					return
-				}
+			if err != nil {
+				return
 			}
+			addon.Activity("Analysis reported. duration: %s", time.Since(mark))
+			//
+			// RuleError
+			ruleErr := issues.RuleError()
+			ruleErr.Report()
 			//
 			// Facts
 			facts := addon.Application.Facts(application.ID)