From 3c87cb764ff20b97a6b2e7a0344be123197b1255 Mon Sep 17 00:00:00 2001 From: jay-dee7 Date: Wed, 15 Nov 2023 14:35:05 +0000 Subject: [PATCH] chore: Bump OCI workflows to v1.1.0-rc.3 Signed-off-by: jay-dee7 --- .github/workflows/oci-dist-spec-content-discovery.yml | 2 +- .../workflows/oci-dist-spec-content-management.yml | 2 +- .github/workflows/oci-dist-spec-pull.yml | 2 +- .github/workflows/oci-dist-spec-push.yml | 2 +- store/v2/registry/registry_impl.go | 11 +---------- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/oci-dist-spec-content-discovery.yml b/.github/workflows/oci-dist-spec-content-discovery.yml index c436a671..b78bbcdf 100644 --- a/.github/workflows/oci-dist-spec-content-discovery.yml +++ b/.github/workflows/oci-dist-spec-content-discovery.yml @@ -72,7 +72,7 @@ jobs: run: | git clone https://github.com/opencontainers/distribution-spec.git pushd distribution-spec/conformance - git checkout v1.1.0-rc.2 + git checkout v1.1.0-rc.3 go test -c ./conformance.test popd diff --git a/.github/workflows/oci-dist-spec-content-management.yml b/.github/workflows/oci-dist-spec-content-management.yml index 748f4c5a..f7878050 100644 --- a/.github/workflows/oci-dist-spec-content-management.yml +++ b/.github/workflows/oci-dist-spec-content-management.yml @@ -72,7 +72,7 @@ jobs: run: | git clone https://github.com/opencontainers/distribution-spec.git pushd distribution-spec/conformance - git checkout v1.1.0-rc.2 + git checkout v1.1.0-rc.3 go test -c ./conformance.test popd diff --git a/.github/workflows/oci-dist-spec-pull.yml b/.github/workflows/oci-dist-spec-pull.yml index e1af449e..3f9a4652 100644 --- a/.github/workflows/oci-dist-spec-pull.yml +++ b/.github/workflows/oci-dist-spec-pull.yml @@ -72,7 +72,7 @@ jobs: run: | git clone https://github.com/opencontainers/distribution-spec.git pushd distribution-spec/conformance - git checkout v1.1.0-rc.2 + git checkout v1.1.0-rc.3 go test -c ./conformance.test popd diff --git a/.github/workflows/oci-dist-spec-push.yml b/.github/workflows/oci-dist-spec-push.yml index 3ed66abd..2c25e12d 100644 --- a/.github/workflows/oci-dist-spec-push.yml +++ b/.github/workflows/oci-dist-spec-push.yml @@ -73,7 +73,7 @@ jobs: cd ../ git clone https://github.com/opencontainers/distribution-spec.git pushd distribution-spec/conformance - git checkout v1.1.0-rc.2 + git checkout v1.1.0-rc.3 go test -c ./conformance.test popd diff --git a/store/v2/registry/registry_impl.go b/store/v2/registry/registry_impl.go index e19817f7..9f7f05f4 100644 --- a/store/v2/registry/registry_impl.go +++ b/store/v2/registry/registry_impl.go @@ -3,7 +3,6 @@ package registry import ( "context" "database/sql" - "encoding/json" "fmt" "strings" "time" @@ -600,12 +599,6 @@ func (s *registryStore) GetReferrers( }) if len(artifactTypes) > 0 { - color.Yellow("ArtifactType: %s", artifactTypes) - - var mfl []*types.ImageManifest - s.db.NewSelect().Model(&mfl).Scan(ctx) - bz, _ := json.MarshalIndent(mfl, "", "\t") - color.Green("Available manifests: \n%s", bz) // q. // WhereOr("artifact_type IN (?)", bun.In(artifactTypes)). // WhereOr("COALESCE(artifact_type, '') = '' AND config_media_type IN (?)", bun.In(artifactTypes)) @@ -629,7 +622,7 @@ func (s *registryStore) GetReferrers( }) if err := q.Scan(ctx); err != nil { - return imgIndex, nil + return imgIndex, err } // q := s. @@ -783,9 +776,7 @@ func (s *registryStore) GetReferrers( } func (s *registryStore) descriptorFound(descriptors []img_spec_v1.Descriptor, digest string) bool { - color.Yellow("total descriptors: %d", len(descriptors)) for _, d := range descriptors { - color.Yellow("d.digest=%s - digest=%s - matched: %v", d.Digest.String(), digest, d.Digest.String() == digest) if d.Digest.String() == digest { return true }