From e42f72f4b889e89db7d8c95f96d32f7048278083 Mon Sep 17 00:00:00 2001 From: Adam Martin <42001113+amartin120@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:11:07 -0400 Subject: [PATCH] continue on error when adding images to store (#317) * continue on error when adding images to store Signed-off-by: Adam Martin * Update cmd/hauler/cli/store/add.go Co-authored-by: Jacob Blain Christen Signed-off-by: Adam Martin <42001113+amartin120@users.noreply.github.com> --------- Signed-off-by: Adam Martin Signed-off-by: Adam Martin <42001113+amartin120@users.noreply.github.com> Co-authored-by: Jacob Blain Christen --- cmd/hauler/cli/store/add.go | 6 ++++-- pkg/cosign/cosign.go | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/hauler/cli/store/add.go b/cmd/hauler/cli/store/add.go index e640a39a..ed75eb6e 100644 --- a/cmd/hauler/cli/store/add.go +++ b/cmd/hauler/cli/store/add.go @@ -99,12 +99,14 @@ func storeImage(ctx context.Context, s *store.Layout, i v1alpha1.Image, platform r, err := name.ParseReference(i.Name) if err != nil { - return err + l.Warnf("unable to parse 'image' [%s], skipping...", r.Name()) + return nil } err = cosign.SaveImage(ctx, s, r.Name(), platform) if err != nil { - return err + l.Warnf("unable to add 'image' [%s] to store. skipping...", r.Name()) + return nil } l.Infof("successfully added 'image' [%s]", r.Name()) diff --git a/pkg/cosign/cosign.go b/pkg/cosign/cosign.go index a1b57cb8..01fddf30 100644 --- a/pkg/cosign/cosign.go +++ b/pkg/cosign/cosign.go @@ -92,7 +92,7 @@ func SaveImage(ctx context.Context, s *store.Layout, ref string, platform string // read command's stderr line by line errors := bufio.NewScanner(stderr) for errors.Scan() { - l.Errorf(errors.Text()) // write each line to your log, or anything you need + l.Warnf(errors.Text()) // write each line to your log, or anything you need } if err := errors.Err(); err != nil { cmd.Wait() @@ -200,7 +200,7 @@ func RetryOperation(ctx context.Context, operation func() error) error { } // Log the error for the current attempt. - l.Errorf("error (attempt %d/%d): %v", attempt, maxRetries, err) + l.Warnf("error (attempt %d/%d): %v", attempt, maxRetries, err) // If this is not the last attempt, wait before retrying. if attempt < maxRetries {