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

fix(cov): coverage boltdb+dynamo (#2018)

Browse Source 
Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>
This commit is contained in:
LaurentiuNiculae
2023-11-08 23:37:52 +02:00
committed by GitHub
parent c9cc5b9acb
commit 2db6e86fb5
22 changed files with 1796 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/meta/common/common.go
+11 -7
View File
@@ -40,6 +40,10 @@ func ReferenceIsDigest(reference string) bool {
return err == nil
}
func ReferenceIsTag(reference string) bool {
return !ReferenceIsDigest(reference)
}
func ValidateRepoReferenceInput(repo, reference string, manifestDigest godigest.Digest) error {
if repo == "" {
return zerr.ErrEmptyRepoName
@@ -188,7 +192,7 @@ func CheckImageLastUpdated(repoLastUpdated time.Time, isSigned bool, noImageChec
func AddImageMetaToRepoMeta(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go.RepoBlobs, reference string,
imageMeta mTypes.ImageMeta,
) (*proto_go.RepoMeta, *proto_go.RepoBlobs, error) {
) (*proto_go.RepoMeta, *proto_go.RepoBlobs) {
switch imageMeta.MediaType {
case ispec.MediaTypeImageManifest:
manifestData := imageMeta.Manifests[0]
@@ -203,7 +207,7 @@ func AddImageMetaToRepoMeta(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go.Rep
vendors = append(vendors, vendor)
}
platforms := []*proto_go.Platform{getProtoPlatform(&manifestData.Config.Platform)}
platforms := []*proto_go.Platform{GetProtoPlatform(&manifestData.Config.Platform)}
if platforms[0].OS == "" && platforms[0].Architecture == "" {
platforms = []*proto_go.Platform{}
}
@@ -241,7 +245,7 @@ func AddImageMetaToRepoMeta(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go.Rep
// update info only when a tag is added
if zcommon.IsDigest(reference) {
return repoMeta, repoBlobs, nil
return repoMeta, repoBlobs
}
size, platforms, vendors := recalculateAggregateFields(repoMeta, repoBlobs)
@@ -258,11 +262,11 @@ func AddImageMetaToRepoMeta(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go.Rep
Tag: reference,
})
return repoMeta, repoBlobs, nil
return repoMeta, repoBlobs
}
func RemoveImageFromRepoMeta(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go.RepoBlobs, ref string,
) (*proto_go.RepoMeta, *proto_go.RepoBlobs, error) {
) (*proto_go.RepoMeta, *proto_go.RepoBlobs) {
var updatedLastImage *proto_go.RepoLastUpdatedImage
updatedBlobs := map[string]*proto_go.BlobInfo{}
@@ -308,7 +312,7 @@ func RemoveImageFromRepoMeta(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go.Re
repoBlobs.Blobs = updatedBlobs
return repoMeta, repoBlobs, nil
return repoMeta, repoBlobs
}
func recalculateAggregateFields(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go.RepoBlobs,
@@ -348,7 +352,7 @@ func recalculateAggregateFields(repoMeta *proto_go.RepoMeta, repoBlobs *proto_go
return size, platforms, vendors
}
func getProtoPlatform(platform *ispec.Platform) *proto_go.Platform {
func GetProtoPlatform(platform *ispec.Platform) *proto_go.Platform {
if platform == nil {
return nil
}
pkg/meta/common/common_test.go
+14
View File
@@ -22,6 +22,20 @@ func TestUtils(t *testing.T) {
So(res, ShouldBeFalse)
})
Convey("GetProtoPlatform", t, func() {
platform := common.GetProtoPlatform(nil)
So(platform, ShouldBeNil)
})
Convey("ValidateRepoReferenceInput", t, func() {
err := common.ValidateRepoReferenceInput("", "tag", "digest")
So(err, ShouldNotBeNil)
err = common.ValidateRepoReferenceInput("repo", "", "digest")
So(err, ShouldNotBeNil)
err = common.ValidateRepoReferenceInput("repo", "tag", "")
So(err, ShouldNotBeNil)
})
Convey("CheckImageLastUpdated", t, func() {
Convey("No image checked, it doesn't have time", func() {
repoLastUpdated := time.Time{}