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

test(refactor): change upload image function signature (#1655)

Browse Source 
Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>
This commit is contained in:
LaurentiuNiculae
2023-07-28 17:53:46 +03:00
committed by GitHub
parent 635d71853e
commit a5c92bcac3
26 changed files with 602 additions and 1255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cli/cve_cmd_test.go
+6 -7
View File
@@ -473,16 +473,15 @@ func TestNegativeServerResponse(t *testing.T) {
}
num := 10
config, layers, manifest, err := test.GetRandomImageComponents(num)
config, layers, manifest, err := test.GetRandomImageComponents(num) //nolint:staticcheck
So(err, ShouldBeNil)
err = test.WriteImageToFileSystem(
test.Image{
Manifest: manifest,
Layers: layers,
Config: config,
Reference: "0.0.1",
}, "zot-cve-test", storeController,
Manifest: manifest,
Layers: layers,
Config: config,
}, "zot-cve-test", "0.0.1", storeController,
)
So(err, ShouldBeNil)
@@ -614,7 +613,7 @@ func TestServerCVEResponse(t *testing.T) {
test.WaitTillServerReady(url)
config, layers, manifest, err := test.GetImageComponents(100)
config, layers, manifest, err := test.GetImageComponents(100) //nolint:staticcheck
if err != nil {
panic(err)
}
pkg/cli/image_cmd_test.go
+12 -14
View File
@@ -281,17 +281,16 @@ func TestSignature(t *testing.T) {
cm.StartAndWait(conf.HTTP.Port)
defer cm.StopServer()
cfg, layers, manifest, err := test.GetImageComponents(1)
cfg, layers, manifest, err := test.GetImageComponents(1) //nolint:staticcheck
So(err, ShouldBeNil)
repoName := "repo7"
err = test.UploadImage(
test.Image{
Config: cfg,
Layers: layers,
Manifest: manifest,
Reference: "test:1.0",
}, url, repoName)
Config: cfg,
Layers: layers,
Manifest: manifest,
}, url, repoName, "test:1.0")
So(err, ShouldBeNil)
content, err := json.Marshal(manifest)
@@ -375,17 +374,16 @@ func TestSignature(t *testing.T) {
cm.StartAndWait(conf.HTTP.Port)
defer cm.StopServer()
cfg, layers, manifest, err := test.GetImageComponents(1)
cfg, layers, manifest, err := test.GetImageComponents(1) //nolint:staticcheck
So(err, ShouldBeNil)
repoName := "repo7"
err = test.UploadImage(
test.Image{
Config: cfg,
Layers: layers,
Manifest: manifest,
Reference: "0.0.1",
}, url, repoName)
Config: cfg,
Layers: layers,
Manifest: manifest,
}, url, repoName, "0.0.1")
So(err, ShouldBeNil)
content, err := json.Marshal(manifest)
@@ -1578,9 +1576,9 @@ func uploadTestMultiarch(baseURL string) {
// ------- Upload The multiarch image
multiarch := test.GetMultiarchImageForImages([]test.Image{image1, image2})
multiarch := test.GetMultiarchImageForImages([]test.Image{image1, image2}) //nolint:staticcheck
err := test.UploadMultiarchImageWithRef(multiarch, baseURL, "repo", "multi-arch")
err := test.UploadMultiarchImage(multiarch, baseURL, "repo", "multi-arch")
So(err, ShouldBeNil)
}
pkg/cli/search_cmd_referrers_test.go
+12 -12
View File
@@ -206,7 +206,7 @@ func TestReferrerCLI(t *testing.T) {
repo := repoName
image := test.CreateRandomImage()
err := test.UploadImageWithRef(image, baseURL, repo, "tag")
err := test.UploadImage(image, baseURL, repo, "tag")
So(err, ShouldBeNil)
ref1 := test.CreateImageWith().
@@ -225,13 +225,13 @@ func TestReferrerCLI(t *testing.T) {
ArtifactType(customArtTypeV2).
Subject(image.DescriptorRef()).Build()
err = test.UploadImage(ref1, baseURL, repo)
err = test.UploadImage(ref1, baseURL, repo, ref1.DigestStr())
So(err, ShouldBeNil)
err = test.UploadImage(ref2, baseURL, repo)
err = test.UploadImage(ref2, baseURL, repo, ref2.DigestStr())
So(err, ShouldBeNil)
err = test.UploadImage(ref3, baseURL, repo)
err = test.UploadImage(ref3, baseURL, repo, ref3.DigestStr())
So(err, ShouldBeNil)
args := []string{"reftest", "--subject", repo + "@" + image.DigestStr()}
@@ -303,7 +303,7 @@ func TestReferrerCLI(t *testing.T) {
repo := repoName
image := test.CreateRandomImage()
err := test.UploadImageWithRef(image, baseURL, repo, "tag")
err := test.UploadImage(image, baseURL, repo, "tag")
So(err, ShouldBeNil)
ref1 := test.CreateImageWith().
@@ -322,13 +322,13 @@ func TestReferrerCLI(t *testing.T) {
ArtifactType(customArtTypeV2).
Subject(image.DescriptorRef()).Build()
err = test.UploadImage(ref1, baseURL, repo)
err = test.UploadImage(ref1, baseURL, repo, ref1.DigestStr())
So(err, ShouldBeNil)
err = test.UploadImage(ref2, baseURL, repo)
err = test.UploadImage(ref2, baseURL, repo, ref2.DigestStr())
So(err, ShouldBeNil)
err = test.UploadImage(ref3, baseURL, repo)
err = test.UploadImage(ref3, baseURL, repo, ref3.DigestStr())
So(err, ShouldBeNil)
// get referrers by digest
@@ -398,7 +398,7 @@ func TestFormatsReferrersCLI(t *testing.T) {
repo := repoName
image := test.CreateRandomImage()
err := test.UploadImageWithRef(image, baseURL, repo, "tag")
err := test.UploadImage(image, baseURL, repo, "tag")
So(err, ShouldBeNil)
// add referrers
@@ -418,13 +418,13 @@ func TestFormatsReferrersCLI(t *testing.T) {
ArtifactType(customArtTypeV2).
Subject(image.DescriptorRef()).Build()
err = test.UploadImage(ref1, baseURL, repo)
err = test.UploadImage(ref1, baseURL, repo, ref1.DigestStr())
So(err, ShouldBeNil)
err = test.UploadImage(ref2, baseURL, repo)
err = test.UploadImage(ref2, baseURL, repo, ref2.DigestStr())
So(err, ShouldBeNil)
err = test.UploadImage(ref3, baseURL, repo)
err = test.UploadImage(ref3, baseURL, repo, ref3.DigestStr())
So(err, ShouldBeNil)
Convey("JSON format", func() {
pkg/cli/search_cmd_test.go
+16 -41
View File
@@ -120,31 +120,19 @@ func TestSearchCLI(t *testing.T) {
Build()
formatterDigest2 := image2.Digest().Encoded()[:8]
// repo1
image1.Reference = r1tag1
err := test.UploadImage(image1, baseURL, repo1)
err := test.UploadImage(image1, baseURL, repo1, r1tag1)
So(err, ShouldBeNil)
err = test.UploadImage(image2, baseURL, repo1, r1tag2)
So(err, ShouldBeNil)
image2.Reference = r1tag2
err = test.UploadImage(image2, baseURL, repo1)
err = test.UploadImage(image1, baseURL, repo2, r2tag1)
So(err, ShouldBeNil)
err = test.UploadImage(image2, baseURL, repo2, r2tag2)
So(err, ShouldBeNil)
// repo2
image1.Reference = r2tag1
err = test.UploadImage(image1, baseURL, repo2)
err = test.UploadImage(image1, baseURL, repo3, r3tag1)
So(err, ShouldBeNil)
image2.Reference = r2tag2
err = test.UploadImage(image2, baseURL, repo2)
So(err, ShouldBeNil)
// repo3
image1.Reference = r3tag1
err = test.UploadImage(image1, baseURL, repo3)
So(err, ShouldBeNil)
image2.Reference = r3tag2
err = test.UploadImage(image2, baseURL, repo3)
err = test.UploadImage(image2, baseURL, repo3, r3tag2)
So(err, ShouldBeNil)
// search by repos
@@ -232,34 +220,21 @@ func TestFormatsSearchCLI(t *testing.T) {
)
image1 := test.CreateImageWith().RandomLayers(1, 10).DefaultConfig().Build()
image2 := test.CreateImageWith().RandomLayers(1, 10).DefaultConfig().Build()
// repo1
image1.Reference = r1tag1
err := test.UploadImage(image1, baseURL, repo1)
err := test.UploadImage(image1, baseURL, repo1, r1tag1)
So(err, ShouldBeNil)
err = test.UploadImage(image2, baseURL, repo1, r1tag2)
So(err, ShouldBeNil)
image2.Reference = r1tag2
err = test.UploadImage(image2, baseURL, repo1)
err = test.UploadImage(image1, baseURL, repo2, r2tag1)
So(err, ShouldBeNil)
err = test.UploadImage(image2, baseURL, repo2, r2tag2)
So(err, ShouldBeNil)
// repo2
image1.Reference = r2tag1
err = test.UploadImage(image1, baseURL, repo2)
err = test.UploadImage(image1, baseURL, repo3, r3tag1)
So(err, ShouldBeNil)
image2.Reference = r2tag2
err = test.UploadImage(image2, baseURL, repo2)
So(err, ShouldBeNil)
// repo3
image1.Reference = r3tag1
err = test.UploadImage(image1, baseURL, repo3)
So(err, ShouldBeNil)
image2.Reference = r3tag2
err = test.UploadImage(image2, baseURL, repo3)
err = test.UploadImage(image2, baseURL, repo3, r3tag2)
So(err, ShouldBeNil)
cmd := NewSearchCommand(new(searchService))