refactor: replace deprecated APIs for creating images in the search t…

…ests

Signed-off-by: Andrei Aaron <aaaron@luxoft.com>

pkg/extensions/search/digest_test.go

@@ -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
-		So(err, ShouldBeNil)
+		image := CreateDefaultImage()
 
-		err = UploadImage(Image{Manifest: manifest, Config: config, Layers: layers}, baseURL, "a/zot-cve-test", "0.0.1")
+		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-test", "0.0.1")
+		err = UploadImage(image, baseURL, "a/zot-test", "0.0.1")
 		So(err, ShouldBeNil)
 
 		resp, err := resty.R().Get(baseURL + "/v2/")