From 45fe129c632ed05e31bc90bbe58413ee380f80f0 Mon Sep 17 00:00:00 2001 From: Ramkumar Chinchani Date: Mon, 31 Jan 2022 21:33:07 +0000 Subject: [PATCH] notaryv2: fix 'notation list' Signed-off-by: Ramkumar Chinchani --- pkg/api/controller_test.go | 9 +++++++++ pkg/api/routes.go | 4 ++-- pkg/storage/s3/storage.go | 4 ++-- pkg/storage/storage.go | 4 ++-- pkg/storage/storage_fs.go | 12 +++++++----- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go index 4e5766fd..d946adb8 100644 --- a/pkg/api/controller_test.go +++ b/pkg/api/controller_test.go @@ -3322,6 +3322,15 @@ func TestImageSignatures(t *testing.T) { So(msg, ShouldNotBeEmpty) So(strings.Contains(msg, "verification failure"), ShouldBeFalse) + // check list + cmd = exec.Command("notation", "list", "--plain-http", image) + out, err = cmd.CombinedOutput() + So(err, ShouldBeNil) + msg = strings.TrimSuffix(string(out), "\n") + So(msg, ShouldNotBeEmpty) + _, err = godigest.Parse(msg) + So(err, ShouldBeNil) + // verify the image with incorrect key cmd = exec.Command("notation", "verify", "--cert", "bad", "--plain-http", image) out, err = cmd.CombinedOutput() diff --git a/pkg/api/routes.go b/pkg/api/routes.go index 85efee37..1c148a91 100644 --- a/pkg/api/routes.go +++ b/pkg/api/routes.go @@ -24,9 +24,9 @@ import ( "github.com/gorilla/mux" jsoniter "github.com/json-iterator/go" - "github.com/notaryproject/notation-go-lib" notreg "github.com/notaryproject/notation/pkg/registry" ispec "github.com/opencontainers/image-spec/specs-go/v1" + artifactspec "github.com/oras-project/artifacts-spec/specs-go/v1" httpSwagger "github.com/swaggo/http-swagger" zerr "zotregistry.io/zot/errors" ext "zotregistry.io/zot/pkg/extensions" @@ -1361,7 +1361,7 @@ func getImageManifest(routeHandler *RouteHandler, imgStore storage.ImageStore, n } type ReferenceList struct { - References []notation.Descriptor `json:"references"` + References []artifactspec.Descriptor `json:"references"` } // GetReferrers godoc diff --git a/pkg/storage/s3/storage.go b/pkg/storage/s3/storage.go index 8bac23d1..af65e9a8 100644 --- a/pkg/storage/s3/storage.go +++ b/pkg/storage/s3/storage.go @@ -20,9 +20,9 @@ import ( // Load s3 driver. _ "github.com/docker/distribution/registry/storage/driver/s3-aws" guuid "github.com/gofrs/uuid" - "github.com/notaryproject/notation-go-lib" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" + artifactspec "github.com/oras-project/artifacts-spec/specs-go/v1" "github.com/rs/zerolog" zerr "zotregistry.io/zot/errors" "zotregistry.io/zot/pkg/extensions/monitoring" @@ -1109,7 +1109,7 @@ func (is *ObjectStorage) GetBlobContent(repo string, digest string) ([]byte, err return buf.Bytes(), nil } -func (is *ObjectStorage) GetReferrers(repo, digest string, mediaType string) ([]notation.Descriptor, error) { +func (is *ObjectStorage) GetReferrers(repo, digest string, mediaType string) ([]artifactspec.Descriptor, error) { return nil, zerr.ErrMethodNotSupported } diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 7d483eb7..7ff075a7 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -4,8 +4,8 @@ import ( "io" "time" - "github.com/notaryproject/notation-go-lib" "github.com/opencontainers/go-digest" + artifactspec "github.com/oras-project/artifacts-spec/specs-go/v1" ) const ( @@ -42,5 +42,5 @@ type ImageStore interface { DeleteBlob(repo string, digest string) error GetIndexContent(repo string) ([]byte, error) GetBlobContent(repo, digest string) ([]byte, error) - GetReferrers(repo, digest string, mediaType string) ([]notation.Descriptor, error) + GetReferrers(repo, digest string, mediaType string) ([]artifactspec.Descriptor, error) } diff --git a/pkg/storage/storage_fs.go b/pkg/storage/storage_fs.go index f4a5deaf..f9a2c4c3 100644 --- a/pkg/storage/storage_fs.go +++ b/pkg/storage/storage_fs.go @@ -19,6 +19,7 @@ import ( guuid "github.com/gofrs/uuid" "github.com/minio/sha256-simd" "github.com/notaryproject/notation-go-lib" + notreg "github.com/notaryproject/notation/pkg/registry" godigest "github.com/opencontainers/go-digest" ispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/umoci" @@ -1381,7 +1382,7 @@ func (is *ImageStoreFS) DeleteBlob(repo string, digest string) error { return nil } -func (is *ImageStoreFS) GetReferrers(repo, digest string, mediaType string) ([]notation.Descriptor, error) { +func (is *ImageStoreFS) GetReferrers(repo, digest string, mediaType string) ([]artifactspec.Descriptor, error) { var lockLatency time.Time dir := path.Join(is.rootDir, repo) @@ -1419,7 +1420,7 @@ func (is *ImageStoreFS) GetReferrers(repo, digest string, mediaType string) ([]n found := false - result := []notation.Descriptor{} + result := []artifactspec.Descriptor{} for _, manifest := range index.Manifests { if manifest.MediaType != artifactspec.MediaTypeArtifactManifest { @@ -1451,9 +1452,10 @@ func (is *ImageStoreFS) GetReferrers(repo, digest string, mediaType string) ([]n continue } - result = append(result, notation.Descriptor{ - MediaType: manifest.MediaType, - Digest: manifest.Digest, Size: manifest.Size, Annotations: manifest.Annotations, + result = append(result, artifactspec.Descriptor{ + MediaType: manifest.MediaType, + ArtifactType: notreg.ArtifactTypeNotation, + Digest: manifest.Digest, Size: manifest.Size, Annotations: manifest.Annotations, }) found = true