github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-16 20:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(metadb): use type aliases for metadb types to be easier to read (#2043)

Browse Source 
Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>
This commit is contained in:
LaurentiuNiculae
2024-02-14 19:08:08 +02:00
committed by GitHub
parent 36e04a40c2
commit de90abd5dc
14 changed files with 90 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/extensions/imagetrust/image_trust.go
+1 -1
View File
@@ -160,7 +160,7 @@ func IsResourceExistsException(err error) bool {
func (imgTrustStore *ImageTrustStore) VerifySignature(
signatureType string, rawSignature []byte, sigKey string, manifestDigest godigest.Digest, imageMeta mTypes.ImageMeta,
repo string,
) (string, time.Time, bool, error) {
) (mTypes.Author, mTypes.ExpiryDate, mTypes.Validity, error) {
desc := ispec.Descriptor{
MediaType: imageMeta.MediaType,
Digest: imageMeta.Digest,
pkg/extensions/search/convert/convert_test.go
+1 -1
View File
@@ -806,7 +806,7 @@ func TestConvertErrors(t *testing.T) {
Convey("RepoMeta2ExpandedRepoInfo", func() {
_, imgSums := convert.RepoMeta2ExpandedRepoInfo(ctx,
mTypes.RepoMeta{
Tags: map[string]mTypes.Descriptor{"tag": {MediaType: "bad-type", Digest: "digest"}},
Tags: map[mTypes.Tag]mTypes.Descriptor{"tag": {MediaType: "bad-type", Digest: "digest"}},
},
map[string]mTypes.ImageMeta{
"digest": {},
pkg/extensions/search/cve/cve_test.go
+2 -2
View File
@@ -387,7 +387,7 @@ func TestImageFormat(t *testing.T) {
metaDB := &mocks.MetaDBMock{
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"tag": {
MediaType: ispec.MediaTypeImageIndex,
Digest: godigest.FromString("digest").String(),
@@ -860,7 +860,7 @@ func TestCVEStruct(t *testing.T) { //nolint:gocyclo
err = metaDB.SetRepoMeta("repo-with-bad-tag-digest", mTypes.RepoMeta{
Name: "repo-with-bad-tag-digest",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"tag": {MediaType: ispec.MediaTypeImageManifest, Digest: godigest.FromString("1").String()},
},
})
pkg/extensions/search/cve/scan_test.go
+1 -1
View File
@@ -158,7 +158,7 @@ func TestScanGeneratorWithMockedData(t *testing.T) { //nolint: gocyclo
err = metaDB.SetRepoMeta("repo-with-bad-tag-digest", mTypes.RepoMeta{
Name: "repo-with-bad-tag-digest",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"tag": {MediaType: ispec.MediaTypeImageManifest, Digest: godigest.FromString("1").String()},
"tag-multi-arch": {MediaType: ispec.MediaTypeImageIndex, Digest: godigest.FromString("2").String()},
},
pkg/extensions/search/cve/update_test.go
+1 -1
View File
@@ -44,7 +44,7 @@ func TestCVEDBGenerator(t *testing.T) {
metaDB := &mocks.MetaDBMock{
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"tag": {MediaType: ispec.MediaTypeImageIndex},
},
}, nil
pkg/extensions/search/resolver.go
+1 -1
View File
@@ -165,7 +165,7 @@ func getImageSummary(ctx context.Context, repo, tag string, digest *string, skip
return nil, gqlerror.Errorf("can't find image: %s:%s", repo, tag)
}
repoMeta.Tags = map[string]mTypes.Descriptor{tag: manifestDescriptor}
repoMeta.Tags = map[mTypes.Tag]mTypes.Descriptor{tag: manifestDescriptor}
imageDigest := manifestDescriptor.Digest
if digest != nil {
pkg/extensions/search/resolver_test.go
+21 -21
View File
@@ -229,13 +229,13 @@ func TestRepoListWithNewestImage(t *testing.T) {
repos := []mTypes.RepoMeta{
{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.1": {
Digest: img1.DigestStr(),
MediaType: ispec.MediaTypeImageManifest,
},
},
Signatures: map[string]mTypes.ManifestSignatures{
Signatures: map[mTypes.ImageDigest]mTypes.ManifestSignatures{
img1.DigestStr(): {
"cosign": []mTypes.SignatureInfo{
{SignatureManifestDigest: "testSignature", LayersInfo: []mTypes.LayerInfo{}},
@@ -254,13 +254,13 @@ func TestRepoListWithNewestImage(t *testing.T) {
},
{
Name: "repo2",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.2": {
Digest: img2.DigestStr(),
MediaType: ispec.MediaTypeImageManifest,
},
},
Signatures: map[string]mTypes.ManifestSignatures{
Signatures: map[mTypes.ImageDigest]mTypes.ManifestSignatures{
img1.DigestStr(): {
"cosign": []mTypes.SignatureInfo{
{SignatureManifestDigest: "testSignature", LayersInfo: []mTypes.LayerInfo{}},
@@ -395,9 +395,9 @@ func TestGetStarredRepos(t *testing.T) {
}
func getTestRepoMetaWithImages(repo string, images []Image) mTypes.RepoMeta {
tags := map[string]mTypes.Descriptor{"": {}}
statistics := map[string]mTypes.DescriptorStatistics{"": {}}
signatures := map[string]mTypes.ManifestSignatures{"": {}}
tags := map[mTypes.Tag]mTypes.Descriptor{"": {}}
statistics := map[mTypes.Tag]mTypes.DescriptorStatistics{"": {}}
signatures := map[mTypes.ImageDigest]mTypes.ManifestSignatures{"": {}}
referrers := map[string][]mTypes.ReferrerInfo{"": {}}
for i := range images {
@@ -542,7 +542,7 @@ func TestGetImageSummaryError(t *testing.T) {
Convey("getImageSummary", t, func() {
metaDB := mocks.MetaDBMock{
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{Tags: map[string]mTypes.Descriptor{"tag": {}}}, nil
return mTypes.RepoMeta{Tags: map[mTypes.Tag]mTypes.Descriptor{"tag": {}}}, nil
},
FilterImageMetaFn: func(ctx context.Context, digests []string) (map[string]mTypes.ImageMeta, error) {
return nil, ErrTestError
@@ -597,7 +597,7 @@ func TestImageListError(t *testing.T) {
image := CreateDefaultImage()
repoMeta := mTypes.RepoMeta{
Name: "repo",
Tags: map[string]mTypes.Descriptor{image.DigestStr(): {
Tags: map[mTypes.Tag]mTypes.Descriptor{image.DigestStr(): {
Digest: image.DigestStr(),
MediaType: ispec.MediaTypeImageManifest,
}},
@@ -944,7 +944,7 @@ func TestQueryResolverErrors(t *testing.T) {
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Name: "repo",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"tag": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
},
}, nil
@@ -1632,7 +1632,7 @@ func TestCVEResolvers(t *testing.T) { //nolint:gocyclo
pageInput, mocks.MetaDBMock{
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.1.0": {
Digest: godigest.FromString("str").String(),
MediaType: ispec.MediaTypeImageManifest,
@@ -1893,7 +1893,7 @@ func TestMockedDerivedImageList(t *testing.T) {
mocks.MetaDBMock{
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.1": {
Digest: image.DigestStr(),
MediaType: ispec.MediaTypeImageManifest,
@@ -1923,7 +1923,7 @@ func TestMockedDerivedImageList(t *testing.T) {
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.1": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
},
}, nil
@@ -1979,7 +1979,7 @@ func TestMockedDerivedImageList(t *testing.T) {
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.1": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
},
}, nil
@@ -2001,7 +2001,7 @@ func TestMockedDerivedImageList(t *testing.T) {
fullImageMetaList := []mTypes.FullImageMeta{}
repos := []mTypes.RepoMeta{{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.1": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
"1.0.2": {Digest: derivedImage.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
"1.0.3": {Digest: derivedImage.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
@@ -2084,7 +2084,7 @@ func TestMockedBaseImageList(t *testing.T) {
mocks.MetaDBMock{
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.2": {
Digest: image.DigestStr(),
MediaType: ispec.MediaTypeImageManifest,
@@ -2112,7 +2112,7 @@ func TestMockedBaseImageList(t *testing.T) {
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.2": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
},
}, nil
@@ -2162,7 +2162,7 @@ func TestMockedBaseImageList(t *testing.T) {
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.2": {Digest: derivedImage.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
},
}, nil
@@ -2175,7 +2175,7 @@ func TestMockedBaseImageList(t *testing.T) {
fullImageMetaList := []mTypes.FullImageMeta{}
repos := []mTypes.RepoMeta{{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.1": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
"1.0.3": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
"1.0.2": {Digest: derivedImage.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
@@ -2257,7 +2257,7 @@ func TestMockedBaseImageList(t *testing.T) {
GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
return mTypes.RepoMeta{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.2": {Digest: derivedImage.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
},
}, nil
@@ -2270,7 +2270,7 @@ func TestMockedBaseImageList(t *testing.T) {
fullImageMetaList := []mTypes.FullImageMeta{}
repos := []mTypes.RepoMeta{{
Name: "repo1",
Tags: map[string]mTypes.Descriptor{
Tags: map[mTypes.Tag]mTypes.Descriptor{
"1.0.1": {Digest: image.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
"1.0.2": {Digest: derivedImage.DigestStr(), MediaType: ispec.MediaTypeImageManifest},
},