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

chore: fix dependabot alerts (#1621)

Browse Source 
* chore: fix dependabot alerts

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>

* test: fix the validation for digests

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>

---------

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
This commit is contained in:
Ramkumar Chinchani
2023-07-15 02:56:09 -07:00
committed by GitHub
parent 74f769d2c1
commit 6cd4455da1
6 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/extensions/search/resolver_test.go
+1 -1
View File
@@ -1478,7 +1478,7 @@ func TestGetReferrers(t *testing.T) {
So(*referrers[0].ArtifactType, ShouldEqual, referrerDescriptor.ArtifactType)
So(*referrers[0].MediaType, ShouldEqual, referrerDescriptor.MediaType)
So(*referrers[0].Size, ShouldEqual, referrerDescriptor.Size)
So(*referrers[0].Digest, ShouldEqual, referrerDescriptor.Digest)
So(*referrers[0].Digest, ShouldEqual, referrerDescriptor.Digest.String())
So(*referrers[0].Annotations[0].Value, ShouldEqual, referrerDescriptor.Annotations["key"])
})
})
pkg/extensions/search/search_test.go
+2 -2
View File
@@ -949,7 +949,7 @@ func TestGetReferrersGQL(t *testing.T) {
So(referrersResp.Referrers[0].Annotations[0].Key, ShouldEqual, "com.artifact.format")
So(referrersResp.Referrers[0].Annotations[0].Value, ShouldEqual, "test")
So(referrersResp.Referrers[0].Digest, ShouldEqual, artifactManifestDigest)
So(referrersResp.Referrers[0].Digest, ShouldEqual, artifactManifestDigest.String())
})
Convey("referrers for image index", t, func() {
@@ -1080,7 +1080,7 @@ func TestGetReferrersGQL(t *testing.T) {
So(referrersResp.Referrers[0].Annotations[0].Key, ShouldEqual, "com.artifact.format")
So(referrersResp.Referrers[0].Annotations[0].Value, ShouldEqual, "test")
So(referrersResp.Referrers[0].Digest, ShouldEqual, artifactManifestDigest)
So(referrersResp.Referrers[0].Digest, ShouldEqual, artifactManifestDigest.String())
})
Convey("Get referrers with index as referrer", t, func() {
pkg/extensions/sync/content_internal_test.go
+2 -1
View File
@@ -150,7 +150,8 @@ func TestGetContentByLocalRepo(t *testing.T) {
cm := NewContentManager(test.content, log.Logger{})
actualResult := cm.getContentByLocalRepo(test.repo)
if test.expected == -1 {
So(actualResult, ShouldEqual, nil)
var tnil *syncconf.Content = nil
So(actualResult, ShouldEqual, tnil)
} else {
So(actualResult, ShouldEqual, &test.content[test.expected])
}
pkg/meta/repodb/repodb_test.go
+4 -4
View File
@@ -334,7 +334,7 @@ func RunRepoDBTests(t *testing.T, repoDB repodb.RepoDB, preparationFuncs ...func
repoMeta, err := repoDB.GetRepoMeta(repo1)
So(err, ShouldBeNil)
So(repoMeta.Name, ShouldResemble, repo1)
So(repoMeta.Tags[tag1].Digest, ShouldEqual, manifestDigest1)
So(repoMeta.Tags[tag1].Digest, ShouldEqual, manifestDigest1.String())
err = repoDB.SetRepoMeta(repo2, repodb.RepoMetadata{Tags: map[string]repodb.Descriptor{
tag2: {
@@ -346,7 +346,7 @@ func RunRepoDBTests(t *testing.T, repoDB repodb.RepoDB, preparationFuncs ...func
repoMeta, err = repoDB.GetRepoMeta(repo2)
So(err, ShouldBeNil)
So(repoMeta.Name, ShouldResemble, repo2)
So(repoMeta.Tags[tag2].Digest, ShouldEqual, manifestDigest2)
So(repoMeta.Tags[tag2].Digest, ShouldEqual, manifestDigest2.String())
})
Convey("Setting a good repo using a digest", func() {
@@ -371,8 +371,8 @@ func RunRepoDBTests(t *testing.T, repoDB repodb.RepoDB, preparationFuncs ...func
repoMeta, err := repoDB.GetRepoMeta(repo1)
So(err, ShouldBeNil)
So(repoMeta.Tags[tag1].Digest, ShouldEqual, manifestDigest1)
So(repoMeta.Tags[tag2].Digest, ShouldEqual, manifestDigest2)
So(repoMeta.Tags[tag1].Digest, ShouldEqual, manifestDigest1.String())
So(repoMeta.Tags[tag2].Digest, ShouldEqual, manifestDigest2.String())
})
Convey("Set multiple repos", func() {