test: use original components.json for prefetch tests

vhdbuilder/prefetch/Makefile

@@ -5,13 +5,9 @@ SHELL = bash
 all: generate
 
 .PHONY: generate
-generate: generate-testdata
+generate:
 	REGENERATE_CONTAINER_IMAGE_PREFETCH_TESTDATA="true" go test ./...
 
 .PHONY: test
 test:
-	go test ./...
-
-.PHONY: generate-testdata
-generate-testdata:
-	@bash ./hack/generate-testdata.sh
+	go test ./...

vhdbuilder/prefetch/internal/containerimage/containerimage.go

@@ -19,7 +19,7 @@ var (
 // GeneratePrefetchScript generates the container image prefetch script based on the specified component list.
 func GeneratePrefetchScript(list *components.List) ([]byte, error) {
 	if list == nil {
-		return nil, fmt.Errorf("components list generate opt must be non-nil")
+		return nil, fmt.Errorf("components list must be non-nil")
 	}
 	var args TemplateArgs
 	for _, image := range list.Images {

vhdbuilder/prefetch/internal/containerimage/containerimage_test.go

@@ -2,6 +2,7 @@ package containerimage_test
 
 import (
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -13,23 +14,25 @@ import (
 
 const (
 	testDataPath       = "testdata/"
+	artifactsRelPath   = "parts/linux/cloud-init/artifacts"
 	regenerateTestData = "REGENERATE_CONTAINER_IMAGE_PREFETCH_TESTDATA"
 )
 
 var (
-	componentsTestDataPath     = filepath.Join(testDataPath, "components.json")
 	prefetchScriptTestDataPath = filepath.Join(testDataPath, "prefetch.sh")
 )
 
 func TestContianerImage(t *testing.T) {
+	componentsPath := resolveComponentsBasePath(t)
+
 	if strings.EqualFold(os.Getenv(regenerateTestData), "true") {
-		generate(t)
+		generate(t, componentsPath)
 	}
 
 	expectedContent, err := os.ReadFile(prefetchScriptTestDataPath)
 	assert.NoError(t, err)
 
-	list, err := components.ParseList(componentsTestDataPath)
+	list, err := components.ParseList(componentsPath)
 	assert.NoError(t, err)
 
 	actualContent, err := containerimage.GeneratePrefetchScript(list)
@@ -38,13 +41,13 @@ func TestContianerImage(t *testing.T) {
 	assert.Equal(t, expectedContent, actualContent)
 }
 
-func generate(t *testing.T) {
+func generate(t *testing.T, componentsPath string) {
 	t.Log("generating container image prefetch.sh testdata...")
 
 	err := os.MkdirAll(testDataPath, os.ModePerm)
 	assert.NoError(t, err)
 
-	list, err := components.ParseList(componentsTestDataPath)
+	list, err := components.ParseList(componentsPath)
 	assert.NoError(t, err)
 
 	content, err := containerimage.GeneratePrefetchScript(list)
@@ -53,3 +56,11 @@ func generate(t *testing.T) {
 	err = os.WriteFile(prefetchScriptTestDataPath, content, os.ModePerm)
 	assert.NoError(t, err)
 }
+
+func resolveComponentsBasePath(t *testing.T) string {
+	// this is hack until we can get rid of storing static testdata altogether
+	repoBasePath, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
+	assert.NoError(t, err, "unable to determine repo root with git rev-parse")
+	basePath := strings.ReplaceAll(string(repoBasePath), "\n", "")
+	return filepath.Join(filepath.Join(basePath, artifactsRelPath), "components.json")
+}