fix: Better error handling

radiofrance · Jan 7, 2022 · fef7d44 · fef7d44
1 parent 87ec681
commit fef7d44
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/cmd/build.go b/cmd/build.go
@@ -97,7 +97,10 @@ func doBuild(opts buildOpts) (*dag.DAG, error) {
 		}
 	}
 
-	DAG.Rebuild(currentVersion, opts.forceRebuild, opts.runTests, opts.localOnly)
+	if err := DAG.Rebuild(currentVersion, opts.forceRebuild, opts.runTests, opts.localOnly); err != nil {
+		return nil, err
+	}
+
 	if opts.retagLatest {
 		logrus.Info("--retag-latest is set to true, latest tag will now use current image versions")
 		if err := DAG.RetagLatest(currentVersion); err != nil {

diff --git a/dag/dag.go b/dag/dag.go
@@ -126,16 +126,22 @@ func (dag *DAG) RetagLatest(tag string) error {
 	return nil
 }
 
-func (dag *DAG) Rebuild(newTag string, forceRebuild, runTests, localOnly bool) {
+func (dag *DAG) Rebuild(newTag string, forceRebuild, runTests, localOnly bool) error {
 	errs := make(chan error, 1)
 	for _, img := range dag.Images {
 		go img.Rebuild(newTag, forceRebuild, runTests, localOnly, errs)
 	}
+	var hasError bool
 	for i := 0; i < len(dag.Images); i++ {
 		err := <-errs
 		if err != nil {
+			hasError = true
 			logrus.Errorf("Error building image: %v", err)
 		}
 	}
 	close(errs)
+	if hasError {
+		return fmt.Errorf("one of the image build failed, see logs for more details")
+	}
+	return nil
 }
diff --git a/dag/image.go b/dag/image.go
@@ -83,12 +83,18 @@ func (img *Image) Rebuild(newTag string, forceRebuild, runTests, localOnly bool,
 	for _, child := range img.Children {
 		go child.Rebuild(newTag, forceRebuild, runTests, localOnly, errs)
 	}
+	var hasError bool
 	for i := 0; i < len(img.Children); i++ {
 		err := <-errs
 		if err != nil {
+			hasError = true
 			logrus.Errorf("Error building image: %v", err)
 		}
 	}
+	close(errs)
+	if hasError {
+		errChan <- fmt.Errorf("one of the image build failed, see logs for more details")
+	}
 	errChan <- nil
 }
 
@@ -102,7 +108,7 @@ func (img *Image) doRebuild(newTag string, localOnly bool) error {
 	logrus.Infof("Building \"%s:%s\" in context \"%s\"", img.Name, newTag, img.Dockerfile.ContextPath)
 
 	if err := dockerfile.ReplaceFromTag(*img.Dockerfile, newTag); err != nil {
-		return err
+		return fmt.Errorf("failed to replace tag in dockerfile %s: %w", img.Dockerfile.ContextPath, err)
 	}
 
 	now := time.Now()
@@ -124,11 +130,11 @@ func (img *Image) doRebuild(newTag string, localOnly bool) error {
 
 	err := img.Builder.Build(opts)
 	if err != nil {
-		return err
+		return fmt.Errorf("building image %s failed: %w", img.ShortName, err)
 	}
 
 	if err := dockerfile.ResetFromTag(*img.Dockerfile, newTag); err != nil {
-		return err
+		return fmt.Errorf("failed to reset tag in dockerfile %s: %w", img.Dockerfile.ContextPath, err)
 	}
 
 	return nil