From 01eebd54af6194ff31ee56ebf942d113bc62db91 Mon Sep 17 00:00:00 2001 From: Adam Martin <42001113+amartin120@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:56:22 -0400 Subject: [PATCH] bump to cosign v2.2.3-carbide.3 for new annotation (#322) * bump cosign to v2.2.3-carbide.3 * use new annotation in 'store info' when listing images Signed-off-by: Adam Martin --------- Signed-off-by: Adam Martin --- .goreleaser.yaml | 2 +- Makefile | 2 +- cmd/hauler/cli/store/info.go | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 59cc612..00aad83 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -13,7 +13,7 @@ release: env: - vpkg=hauler.dev/go/hauler/internal/version - - cosign_version=v2.2.3+carbide.2 + - cosign_version=v2.2.3+carbide.3 builds: - main: cmd/hauler/main.go diff --git a/Makefile b/Makefile index a40dc6b..9291926 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ GO_FILES=$(shell go list ./... | grep -v /vendor/) GO_COVERPROFILE=coverage.out # set cosign variables -COSIGN_VERSION=v2.2.3+carbide.2 +COSIGN_VERSION=v2.2.3+carbide.3 # set build variables BIN_DIRECTORY=bin diff --git a/cmd/hauler/cli/store/info.go b/cmd/hauler/cli/store/info.go index 2f6612e..b237bee 100644 --- a/cmd/hauler/cli/store/info.go +++ b/cmd/hauler/cli/store/info.go @@ -238,7 +238,11 @@ func newItem(s *store.Layout, desc ocispec.Descriptor, m ocispec.Manifest, plat ctype = "sbom" } - ref, err := reference.Parse(desc.Annotations[ocispec.AnnotationRefName]) + refName := desc.Annotations["io.containerd.image.name"] + if refName == "" { + refName = desc.Annotations[ocispec.AnnotationRefName] + } + ref, err := reference.Parse(refName) if err != nil { return item{} }