codereview #6: don't fail one warning

Josh Bialkowski created 5 years ago

* presence of an error in the import event doesn't indicate failure

Change summary

bridge/core/bridge.go |  2 +-
bridge/core/import.go | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)

Detailed changes

bridge/core/bridge.go

@@ -330,7 +330,7 @@ func (b *Bridge) ImportAllSince(ctx context.Context, since time.Time) (<-chan Im
 
 		// relay all events while checking that everything went well
 		for event := range events {
-			if event.Err != nil {
+			if event.Event == ImportEventError {
 				noError = false
 			}
 			out <- event

bridge/core/import.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/MichaelMure/git-bug/entity"
 )
@@ -71,10 +72,18 @@ func (er ImportResult) String() string {
 		}
 		return fmt.Sprintf("import error: %s", er.Err.Error())
 	case ImportEventWarning:
+		parts := make([]string, 0, 4)
+		parts = append(parts, "warning:")
 		if er.ID != "" {
-			return fmt.Sprintf("warning at id %s: %s", er.ID, er.Err.Error())
+			parts = append(parts, fmt.Sprintf("at id %s", er.ID))
 		}
-		return fmt.Sprintf("warning: %s", er.Err.Error())
+		if er.Reason != "" {
+			parts = append(parts, fmt.Sprintf("reason: %s", er.Reason))
+		}
+		if er.Err != nil {
+			parts = append(parts, fmt.Sprintf("err: %s", er.Err))
+		}
+		return strings.Join(parts, " ")
 
 	default:
 		panic("unknown import result")