fix image ref keys getting squashed when containing sigs/atts (#291)

* fix image ref keys getting squashed when containing sigs/atts

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

---------

Signed-off-by: Adam Martin <adam.martin@rancherfederal.com>
Signed-off-by: Adam Martin <adam.martin@ranchergovernment.com>
Co-authored-by: Adam Martin <adam.martin@rancherfederal.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:

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