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

refactor: replace deprecated APIs for creating images in the search tests (#2173)

Browse Source 
Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
Andrei Aaron
2024-01-22 19:10:34 +02:00
committed by GitHub
parent 7dd1ca353f
commit ed6be0580e
5 changed files with 495 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/extensions/search/digest_test.go
+15 -21
View File
@@ -21,7 +21,6 @@ import (
"zotregistry.io/zot/pkg/common"
extconf "zotregistry.io/zot/pkg/extensions/config"
. "zotregistry.io/zot/pkg/test/common"
"zotregistry.io/zot/pkg/test/deprecated"
. "zotregistry.io/zot/pkg/test/image-utils"
)
@@ -75,38 +74,34 @@ func TestDigestSearchHTTP(t *testing.T) {
layers1 := [][]byte{
{3, 2, 2},
}
image1, err := deprecated.GetImageWithComponents( //nolint: staticcheck
ispec.Image{
image1 := CreateImageWith().
LayerBlobs(layers1).
ImageConfig(ispec.Image{
Created: &createdTime1,
History: []ispec.History{
{
Created: &createdTime1,
},
},
},
layers1,
)
So(err, ShouldBeNil)
}).Build()
const ver001 = "0.0.1"
err = UploadImage(image1, baseURL, "zot-cve-test", ver001)
err := UploadImage(image1, baseURL, "zot-cve-test", ver001)
So(err, ShouldBeNil)
createdTime2 := time.Date(2010, 1, 1, 12, 0, 0, 0, time.UTC)
image2, err := deprecated.GetImageWithComponents( //nolint: staticcheck
ispec.Image{
image2 := CreateImageWith().
LayerBlobs([][]byte{{0, 0, 2}}).
ImageConfig(ispec.Image{
History: []ispec.History{{Created: &createdTime2}},
Platform: ispec.Platform{
Architecture: "amd64",
OS: "linux",
},
},
[][]byte{
{0, 0, 2},
},
)
So(err, ShouldBeNil)
}).Build()
manifestDigest := image2.Digest()
@@ -293,13 +288,12 @@ func TestDigestSearchHTTPSubPaths(t *testing.T) {
// shut down server
defer ctrlManager.StopServer()
config, layers, manifest, err := deprecated.GetImageComponents(100) //nolint: staticcheck
image := CreateDefaultImage()
err := UploadImage(image, baseURL, "a/zot-cve-test", "0.0.1")
So(err, ShouldBeNil)
err = UploadImage(Image{Manifest: manifest, Config: config, Layers: layers}, baseURL, "a/zot-cve-test", "0.0.1")
So(err, ShouldBeNil)
err = UploadImage(Image{Manifest: manifest, Config: config, Layers: layers}, baseURL, "a/zot-test", "0.0.1")
err = UploadImage(image, baseURL, "a/zot-test", "0.0.1")
So(err, ShouldBeNil)
resp, err := resty.R().Get(baseURL + "/v2/")
pkg/extensions/search/search_test.go
+458 -664
View File
File diff suppressed because it is too large Load Diff
pkg/extensions/search/userprefs_test.go
+22 -32
View File
@@ -20,7 +20,6 @@ import (
extconf "zotregistry.io/zot/pkg/extensions/config"
"zotregistry.io/zot/pkg/log"
test "zotregistry.io/zot/pkg/test/common"
"zotregistry.io/zot/pkg/test/deprecated"
. "zotregistry.io/zot/pkg/test/image-utils"
. "zotregistry.io/zot/pkg/test/oci-utils"
)
@@ -94,25 +93,16 @@ func TestUserData(t *testing.T) {
ctlrManager.StartAndWait(port)
defer ctlrManager.StopServer()
config, layers, manifest, err := deprecated.GetImageComponents(100) //nolint:staticcheck
So(err, ShouldBeNil)
image := CreateDefaultImage()
err = UploadImageWithBasicAuth(
Image{
Config: config,
Layers: layers,
Manifest: manifest,
}, baseURL, accessibleRepo, tag,
err := UploadImageWithBasicAuth(
image, baseURL, accessibleRepo, tag,
adminUser, adminPassword,
)
So(err, ShouldBeNil)
err = UploadImageWithBasicAuth(
Image{
Config: config,
Layers: layers,
Manifest: manifest,
}, baseURL, forbiddenRepo, tag,
image, baseURL, forbiddenRepo, tag,
adminUser, adminPassword,
)
So(err, ShouldBeNil)
@@ -655,15 +645,15 @@ func TestGlobalSearchWithUserPrefFiltering(t *testing.T) {
// ------ Add simple repo
repo := "repo"
img, err := deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
err = UploadImageWithBasicAuth(img, baseURL, repo, "tag", simpleUser, simpleUserPassword)
img := CreateRandomImage()
err := UploadImageWithBasicAuth(img, baseURL, repo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)
// ------ Add repo and star it
sRepo := "starred-repo"
img, err = deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
img = CreateRandomImage()
err = UploadImageWithBasicAuth(img, baseURL, sRepo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)
@@ -673,8 +663,8 @@ func TestGlobalSearchWithUserPrefFiltering(t *testing.T) {
// ------ Add repo and bookmark it
bRepo := "bookmarked-repo"
img, err = deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
img = CreateRandomImage()
err = UploadImageWithBasicAuth(img, baseURL, bRepo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)
@@ -684,8 +674,8 @@ func TestGlobalSearchWithUserPrefFiltering(t *testing.T) {
// ------ Add repo, star and bookmark it
sbRepo := "starred-bookmarked-repo"
img, err = deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
img = CreateRandomImage()
err = UploadImageWithBasicAuth(img, baseURL, sbRepo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)
@@ -849,9 +839,9 @@ func TestExpandedRepoInfoWithUserPrefs(t *testing.T) {
// ------ Add sbrepo and star/bookmark it
sbrepo := "sbrepo"
img, err := deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
err = UploadImageWithBasicAuth(img, baseURL, sbrepo, "tag", simpleUser, simpleUserPassword)
img := CreateRandomImage()
err := UploadImageWithBasicAuth(img, baseURL, sbrepo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)
resp, err := simpleUserClient.Put(preferencesBaseURL + PutRepoStarURL(sbrepo))
@@ -889,8 +879,8 @@ func TestExpandedRepoInfoWithUserPrefs(t *testing.T) {
// ------ Add srepo and star it
srepo := "srepo"
img, err = deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
img = CreateRandomImage()
err = UploadImageWithBasicAuth(img, baseURL, srepo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)
@@ -924,8 +914,8 @@ func TestExpandedRepoInfoWithUserPrefs(t *testing.T) {
// ------ Add brepo and bookmark it
brepo := "brepo"
img, err = deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
img = CreateRandomImage()
err = UploadImageWithBasicAuth(img, baseURL, brepo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)
@@ -959,8 +949,8 @@ func TestExpandedRepoInfoWithUserPrefs(t *testing.T) {
// ------ Add repo without star/bookmark
repo := "repo"
img, err = deprecated.GetRandomImage() //nolint:staticcheck
So(err, ShouldBeNil)
img = CreateRandomImage()
err = UploadImageWithBasicAuth(img, baseURL, repo, "tag", simpleUser, simpleUserPassword)
So(err, ShouldBeNil)