continue on error when adding images to store (#317)

* continue on error when adding images to store

Signed-off-by: Adam Martin <adam.martin@ranchergovernment.com>

* Update cmd/hauler/cli/store/add.go

Co-authored-by: Jacob Blain Christen <dweomer5@gmail.com>
Signed-off-by: Adam Martin <42001113+amartin120@users.noreply.github.com>

---------

Signed-off-by: Adam Martin <adam.martin@ranchergovernment.com>
Signed-off-by: Adam Martin <42001113+amartin120@users.noreply.github.com>
Co-authored-by: Jacob Blain Christen <dweomer5@gmail.com>

.goreleaser.yaml

@@ -12,7 +12,7 @@ release:
   make_latest: false
 
 env:
-  - vpkg=github.com/hauler-dev/hauler/internal/version
+  - vpkg=github.com/rancherfederal/hauler/internal/version
   - cosign_version=v2.2.3+carbide.2
 
 builds:
@@ -29,7 +29,7 @@ builds:
     hooks:
       pre:
         - mkdir -p cmd/hauler/binaries
-        - wget -P cmd/hauler/binaries/ https://github.com/rancher-government-carbide/cosign/releases/download/{{ .Env.cosign_version }}/cosign-{{ .Os }}-{{ .Arch }}{{ if eq .Os "windows" }}.exe{{ end }}
+        - wget -P cmd/hauler/binaries/ https://github.com/hauler-dev/cosign/releases/download/{{ .Env.cosign_version }}/cosign-{{ .Os }}-{{ .Arch }}{{ if eq .Os "windows" }}.exe{{ end }}
       post:
         - rm -rf cmd/hauler/binaries
     env:

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())

pkg/content/oci.go

@@ -55,9 +55,9 @@ func (o *OCI) AddIndex(desc ocispec.Descriptor) error {
 	if strings.TrimSpace(key.String()) != "--" {
 		switch key.(type) {
 		case name.Digest:
-			o.nameMap.Store(key.Context().String(), desc)
+			o.nameMap.Store(fmt.Sprintf("%s-%s", key.Context().String(), desc.Annotations[consts.KindAnnotationName]), desc)
 		case name.Tag:
-			o.nameMap.Store(key.String(), desc)
+			o.nameMap.Store(fmt.Sprintf("%s-%s", key.String(), desc.Annotations[consts.KindAnnotationName]), desc)
 		}
 	}
 	return o.SaveIndex()
@@ -93,9 +93,9 @@ func (o *OCI) LoadIndex() error {
 		if strings.TrimSpace(key.String()) != "--" {
 			switch key.(type) {
 			case name.Digest:
-				o.nameMap.Store(key.Context().String(), desc)
+				o.nameMap.Store(fmt.Sprintf("%s-%s", key.Context().String(), desc.Annotations[consts.KindAnnotationName]), desc)
 			case name.Tag:
-				o.nameMap.Store(key.String(), desc)
+				o.nameMap.Store(fmt.Sprintf("%s-%s", key.String(), desc.Annotations[consts.KindAnnotationName]), desc)
 			}
 		}
 	}

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 {