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>
hauler-dev · Aug 13, 2024 · c592551 · c592551
1 parent ef3eb05
commit c592551
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/content/oci.go b/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)
 			}
 		}
 	}