Skip to content

Commit 1d9e219

Browse files
jenshujenshu
authored
Remove skv2 dep in e2e tests (#10556)
1 parent 1e88bf3 commit 1d9e219

File tree

36 files changed

+210
-191
lines changed

36 files changed

+210
-191
lines changed

‎pkg/utils/fsutils/fsutils.go

+28
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ package fsutils
22

33
import (
44
"fmt"
5+
"log"
56
"os"
7+
"os/exec"
8+
"path/filepath"
9+
"runtime"
10+
"strings"
611
)
712

813
// ToTempFile takes a string to write to a temp file. It returns the filename and an error.
@@ -33,3 +38,26 @@ func IsDirectory(dir string) bool {
3338
}
3439
return stat.IsDir()
3540
}
41+
42+
// MustGetThisDir returns the absolute path to the diretory containing the .go file containing the calling function
43+
func MustGetThisDir() string {
44+
_, thisFile, _, ok := runtime.Caller(1)
45+
if !ok {
46+
log.Fatalf("Failed to get runtime.Caller")
47+
}
48+
return filepath.Dir(thisFile)
49+
}
50+
51+
// GoModPath returns the absolute path to the go.mod file for the current dir
52+
func GoModPath() string {
53+
out, err := exec.Command("go", "env", "GOMOD").CombinedOutput()
54+
if err != nil {
55+
log.Fatal(err)
56+
}
57+
return strings.TrimSpace(string(out))
58+
}
59+
60+
// GetModuleRoot returns the project root dir (based on gomod location)
61+
func GetModuleRoot() string {
62+
return filepath.Dir(GoModPath())
63+
}

‎projects/gateway2/translator/gateway/gateway_translator_test.go

+3-12
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ package gateway_test
33
import (
44
"context"
55
"fmt"
6-
"log"
76
"path/filepath"
8-
"runtime"
97

8+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
109
. "github.com/onsi/ginkgo/v2"
1110
. "github.com/onsi/gomega"
1211
"k8s.io/apimachinery/pkg/api/meta"
@@ -29,7 +28,7 @@ var _ = DescribeTable("Basic GatewayTranslator Tests",
2928
func(in translatorTestCase) {
3029
ctx, cancel := context.WithCancel(context.Background())
3130
defer cancel()
32-
dir := MustGetThisDir()
31+
dir := fsutils.MustGetThisDir()
3332

3433
results, err := TestCase{
3534
InputFiles: []string{filepath.Join(dir, "testutils/inputs/", in.inputFile)},
@@ -306,7 +305,7 @@ var _ = DescribeTable("Basic GatewayTranslator Tests",
306305
var _ = DescribeTable("Route Delegation translator",
307306
func(inputFile string, errdesc string) {
308307
ctx := context.TODO()
309-
dir := MustGetThisDir()
308+
dir := fsutils.MustGetThisDir()
310309

311310
results, err := TestCase{
312311
InputFiles: []string{filepath.Join(dir, "testutils/inputs/delegation", inputFile)},
@@ -351,11 +350,3 @@ var _ = DescribeTable("Route Delegation translator",
351350
// https://github.com/k8sgateway/k8sgateway/issues/10379
352351
Entry("Multi-level multiple parents delegation", "bug-10379.yaml", ""),
353352
)
354-
355-
func MustGetThisDir() string {
356-
_, thisFile, _, ok := runtime.Caller(1)
357-
if !ok {
358-
log.Fatalf("Failed to get runtime.Caller")
359-
}
360-
return filepath.Dir(thisFile)
361-
}

‎test/kubernetes/e2e/defaults/defaults.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
corev1 "k8s.io/api/core/v1"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010

11+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
1112
"github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl"
12-
"github.com/solo-io/skv2/codegen/util"
1313
)
1414

1515
var (
@@ -26,7 +26,7 @@ var (
2626
},
2727
}
2828

29-
CurlPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "curl_pod.yaml")
29+
CurlPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "curl_pod.yaml")
3030

3131
HttpEchoPod = &corev1.Pod{
3232
ObjectMeta: metav1.ObjectMeta{
@@ -35,7 +35,7 @@ var (
3535
},
3636
}
3737

38-
HttpEchoPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "http_echo.yaml")
38+
HttpEchoPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "http_echo.yaml")
3939

4040
TcpEchoPod = &corev1.Pod{
4141
ObjectMeta: metav1.ObjectMeta{
@@ -44,7 +44,7 @@ var (
4444
},
4545
}
4646

47-
TcpEchoPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "tcp_echo.yaml")
47+
TcpEchoPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "tcp_echo.yaml")
4848

4949
NginxPod = &corev1.Pod{
5050
ObjectMeta: metav1.ObjectMeta{
@@ -60,7 +60,7 @@ var (
6060
},
6161
}
6262

63-
NginxPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "nginx_pod.yaml")
63+
NginxPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "nginx_pod.yaml")
6464

6565
NginxResponse = `<!DOCTYPE html>
6666
<html>

‎test/kubernetes/e2e/example/info_logging_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/kgateway-dev/kgateway/pkg/utils/envutils"
1515
"github.com/kgateway-dev/kgateway/test/testutils"
1616

17-
"github.com/solo-io/skv2/codegen/util"
17+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
1818
"github.com/stretchr/testify/suite"
1919

2020
"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
@@ -30,8 +30,8 @@ func TestInstallationWithInfoLogLevel(t *testing.T) {
3030
t,
3131
&gloogateway.Context{
3232
InstallNamespace: installNs,
33-
ProfileValuesManifestFile: filepath.Join(util.MustGetThisDir(), "manifests", "example-profile.yaml"),
34-
ValuesManifestFile: filepath.Join(util.MustGetThisDir(), "manifests", "info-example.yaml"),
33+
ProfileValuesManifestFile: filepath.Join(fsutils.MustGetThisDir(), "manifests", "example-profile.yaml"),
34+
ValuesManifestFile: filepath.Join(fsutils.MustGetThisDir(), "manifests", "info-example.yaml"),
3535
},
3636
)
3737

‎test/kubernetes/e2e/features/admin_server/types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ package admin_server
55
import (
66
"path/filepath"
77

8-
"github.com/solo-io/skv2/codegen/util"
8+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
)
1111

1212
var (
13-
upstreamManifest = filepath.Join(util.MustGetThisDir(), "testdata/upstream.yaml")
14-
gatewayParametersManifest = filepath.Join(util.MustGetThisDir(), "testdata/gateway-parameters.yaml")
13+
upstreamManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/upstream.yaml")
14+
gatewayParametersManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/gateway-parameters.yaml")
1515

1616
// Upstream resource to be created
1717
upstreamMeta = metav1.ObjectMeta{

‎test/kubernetes/e2e/features/client_tls/types.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ import (
66
"net/http"
77
"path/filepath"
88

9+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
910
"github.com/kgateway-dev/kgateway/test/gomega/matchers"
1011
"github.com/onsi/gomega"
11-
"github.com/solo-io/skv2/codegen/util"
1212
appsv1 "k8s.io/api/apps/v1"
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
)
1616

1717
var (
18-
annotatedNginxSvcManifestFile = filepath.Join(util.MustGetThisDir(), "testdata", "annotated-nginx-svc.yaml")
19-
annotatedNginxOneWaySvcManifestFile = filepath.Join(util.MustGetThisDir(), "testdata", "annotated-oneway-nginx-svc.yaml")
20-
nginxUpstreamManifestFile = filepath.Join(util.MustGetThisDir(), "testdata", "nginx-upstream.yaml")
21-
nginxOneWayUpstreamManifestFile = filepath.Join(util.MustGetThisDir(), "testdata", "nginx-oneway-upstream.yaml")
22-
tlsSecretManifestFile = filepath.Join(util.MustGetThisDir(), "testdata", "tls-secret.yaml")
18+
annotatedNginxSvcManifestFile = filepath.Join(fsutils.MustGetThisDir(), "testdata", "annotated-nginx-svc.yaml")
19+
annotatedNginxOneWaySvcManifestFile = filepath.Join(fsutils.MustGetThisDir(), "testdata", "annotated-oneway-nginx-svc.yaml")
20+
nginxUpstreamManifestFile = filepath.Join(fsutils.MustGetThisDir(), "testdata", "nginx-upstream.yaml")
21+
nginxOneWayUpstreamManifestFile = filepath.Join(fsutils.MustGetThisDir(), "testdata", "nginx-oneway-upstream.yaml")
22+
tlsSecretManifestFile = filepath.Join(fsutils.MustGetThisDir(), "testdata", "tls-secret.yaml")
2323

2424
// When we apply the deployer-provision.yaml file, we expect resources to be created with this metadata
2525
glooProxyObjectMeta = func(ns string) metav1.ObjectMeta {

‎test/kubernetes/e2e/features/crd_categories/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ package crd_categories
55
import (
66
"path/filepath"
77

8-
"github.com/solo-io/skv2/codegen/util"
8+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
99
)
1010

1111
var (
12-
emptyVsManifest = filepath.Join(util.MustGetThisDir(), "testdata/manifests", "empty-virtualservice.yaml")
12+
emptyVsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "empty-virtualservice.yaml")
1313

1414
installedVs = "virtualservice.gateway.solo.io/empty-virtualservice"
1515
)

‎test/kubernetes/e2e/features/deployer/types.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ package deployer
55
import (
66
"path/filepath"
77

8-
"github.com/solo-io/skv2/codegen/util"
98
appsv1 "k8s.io/api/apps/v1"
109
corev1 "k8s.io/api/core/v1"
1110
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1211
gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
1312

13+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
1414
"github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1"
1515
)
1616

1717
var (
18-
gatewayWithoutParameters = filepath.Join(util.MustGetThisDir(), "testdata", "gateway-without-parameters.yaml")
19-
gatewayWithParameters = filepath.Join(util.MustGetThisDir(), "testdata", "gateway-with-parameters.yaml")
20-
gatewayParametersCustom = filepath.Join(util.MustGetThisDir(), "testdata", "gatewayparameters-custom.yaml")
21-
istioGatewayParameters = filepath.Join(util.MustGetThisDir(), "testdata", "istio-gateway-parameters.yaml")
22-
selfManagedGateway = filepath.Join(util.MustGetThisDir(), "testdata", "self-managed-gateway.yaml")
18+
gatewayWithoutParameters = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway-without-parameters.yaml")
19+
gatewayWithParameters = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway-with-parameters.yaml")
20+
gatewayParametersCustom = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gatewayparameters-custom.yaml")
21+
istioGatewayParameters = filepath.Join(fsutils.MustGetThisDir(), "testdata", "istio-gateway-parameters.yaml")
22+
selfManagedGateway = filepath.Join(fsutils.MustGetThisDir(), "testdata", "self-managed-gateway.yaml")
2323

2424
// When we apply the deployer-provision.yaml file, we expect resources to be created with this metadata
2525
glooProxyObjectMeta = metav1.ObjectMeta{

‎test/kubernetes/e2e/features/directresponse/types.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ import (
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
gwv1 "sigs.k8s.io/gateway-api/apis/v1"
1212

13-
"github.com/solo-io/skv2/codegen/util"
13+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
1414
)
1515

1616
var (
17-
setupManifest = filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml")
18-
gatewayManifest = filepath.Join(util.MustGetThisDir(), "testdata", "gateway.yaml")
19-
basicDirectResposeManifests = filepath.Join(util.MustGetThisDir(), "testdata", "basic-direct-response.yaml")
20-
basicDelegationManifests = filepath.Join(util.MustGetThisDir(), "testdata", "basic-delegation-direct-response.yaml")
21-
invalidDelegationConflictingFiltersManifests = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-delegation-conflicting-filters.yaml")
22-
invalidMissingRefManifests = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-missing-ref-direct-response.yaml")
23-
invalidOverlappingFiltersManifests = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-overlapping-filters.yaml")
24-
invalidMultipleRouteActionsManifests = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-multiple-route-actions.yaml")
25-
invalidBackendRefFilterManifests = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-backendRef-filter.yaml")
17+
setupManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml")
18+
gatewayManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway.yaml")
19+
basicDirectResposeManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-direct-response.yaml")
20+
basicDelegationManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-delegation-direct-response.yaml")
21+
invalidDelegationConflictingFiltersManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-delegation-conflicting-filters.yaml")
22+
invalidMissingRefManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-missing-ref-direct-response.yaml")
23+
invalidOverlappingFiltersManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-overlapping-filters.yaml")
24+
invalidMultipleRouteActionsManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-multiple-route-actions.yaml")
25+
invalidBackendRefFilterManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-backendRef-filter.yaml")
2626

2727
glooProxyObjectMeta = metav1.ObjectMeta{
2828
Name: "gloo-proxy-gw",

‎test/kubernetes/e2e/features/discovery_watchlabels/types.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ package discovery_watchlabels
55
import (
66
"path/filepath"
77

8-
"github.com/solo-io/skv2/codegen/util"
8+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
99
)
1010

1111
var (
12-
serviceWithLabelsManifest = filepath.Join(util.MustGetThisDir(), "testdata/service-with-labels.yaml")
13-
serviceWithModifiedLabelsManifest = filepath.Join(util.MustGetThisDir(), "testdata/service-with-modified-labels.yaml")
14-
serviceWithoutLabelsManifest = filepath.Join(util.MustGetThisDir(), "testdata/service-without-labels.yaml")
15-
serviceWithNoMatchingLabelsManifest = filepath.Join(util.MustGetThisDir(), "testdata/service-with-no-matching-labels.yaml")
12+
serviceWithLabelsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-with-labels.yaml")
13+
serviceWithModifiedLabelsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-with-modified-labels.yaml")
14+
serviceWithoutLabelsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-without-labels.yaml")
15+
serviceWithNoMatchingLabelsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-with-no-matching-labels.yaml")
1616
)

‎test/kubernetes/e2e/features/headless_svc/generate/generate.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"log"
77
"path/filepath"
88

9+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
910
"github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults"
1011
"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc"
1112
"github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources"
12-
"github.com/solo-io/skv2/codegen/util"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414
)
1515

@@ -21,7 +21,7 @@ func main() {
2121

2222
// use the k8s gateway api resources
2323
k8sApiResources := []client.Object{headless_svc.K8sGateway, headless_svc.HeadlessSvcHTTPRoute}
24-
k8sApiRoutingGeneratedExample := filepath.Join(util.MustGetThisDir(), "generated_example", headless_svc.K8sApiRoutingGeneratedFileName)
24+
k8sApiRoutingGeneratedExample := filepath.Join(fsutils.MustGetThisDir(), "generated_example", headless_svc.K8sApiRoutingGeneratedFileName)
2525

2626
err := resources.WriteResourcesToFile(k8sApiResources, k8sApiRoutingGeneratedExample)
2727
if err != nil {
@@ -31,7 +31,7 @@ func main() {
3131
// use the Gloo Edge Gateway api resources
3232
exampleNs := defaults.GlooSystem
3333
edgeGatewayApiResources := headless_svc.GetEdgeGatewayResources(exampleNs)
34-
edgeGatewayApiRoutingGeneratedExample := filepath.Join(util.MustGetThisDir(), "generated_example", headless_svc.EdgeGatewayApiRoutingGeneratedFileName)
34+
edgeGatewayApiRoutingGeneratedExample := filepath.Join(fsutils.MustGetThisDir(), "generated_example", headless_svc.EdgeGatewayApiRoutingGeneratedFileName)
3535
err = resources.WriteResourcesToFile(edgeGatewayApiResources, edgeGatewayApiRoutingGeneratedExample)
3636
if err != nil {
3737
panic(err)

‎test/kubernetes/e2e/features/headless_svc/resources.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"sigs.k8s.io/controller-runtime/pkg/client"
1212
gwv1 "sigs.k8s.io/gateway-api/apis/v1"
1313

14-
"github.com/solo-io/skv2/codegen/util"
14+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
1515
v1 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1"
1616
soloapis_gloov1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1"
1717
"github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers"
@@ -31,7 +31,7 @@ const (
3131
)
3232

3333
var (
34-
headlessSvcSetupManifest = filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml")
34+
headlessSvcSetupManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml")
3535

3636
// GetEdgeGatewayResources returns the Gloo Gateway Edge API resources
3737
GetEdgeGatewayResources = func(installNamespace string) []client.Object {

‎test/kubernetes/e2e/features/helm/suite.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1818

1919
"github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli"
20+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
2021
"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
2122
"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
2223
"github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper"
23-
"github.com/solo-io/skv2/codegen/util"
2424
"github.com/solo-io/solo-kit/pkg/code-generator/schemagen"
2525
)
2626

@@ -79,7 +79,7 @@ func (s *testingSuite) TestChangedConfigMapTriggersRollout() {
7979

8080
func (s *testingSuite) TestApplyCRDs() {
8181
var crdsByFileName = map[string]v1.CustomResourceDefinition{}
82-
crdDir := filepath.Join(util.GetModuleRoot(), "install", "helm", s.TestHelper.HelmChartName, "crds")
82+
crdDir := filepath.Join(fsutils.GetModuleRoot(), "install", "helm", s.TestHelper.HelmChartName, "crds")
8383

8484
err := filepath.Walk(crdDir, func(crdFile string, info os.FileInfo, err error) error {
8585
if err != nil {

‎test/kubernetes/e2e/features/helm/types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ package helm
55
import (
66
"path/filepath"
77

8+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
89
"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
9-
"github.com/solo-io/skv2/codegen/util"
1010
)
1111

1212
var (
13-
productionRecommendationsSetup = filepath.Join(util.MustGetThisDir(), "testdata/manifests", "production-recommendations.yaml")
14-
configMapChangeSetup = filepath.Join(util.MustGetThisDir(), "testdata/manifests", "config-map-change.yaml")
13+
productionRecommendationsSetup = filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "production-recommendations.yaml")
14+
configMapChangeSetup = filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "config-map-change.yaml")
1515

1616
helmTestCases = map[string]*base.TestCase{
1717
"TestProductionRecommendations": {

‎test/kubernetes/e2e/features/helm_settings/suite.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414

1515
"text/template"
1616

17+
"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
1718
"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
18-
"github.com/solo-io/skv2/codegen/util"
1919
"github.com/stretchr/testify/suite"
2020
)
2121

@@ -56,7 +56,7 @@ func NewTestingSuite(ctx context.Context, testInst *e2e.TestInstallation) suite.
5656
}
5757

5858
func (s *testingSuite) TestApplySettingsManifestsFromUnitTests() {
59-
settingsFixturesFolder := filepath.Join(util.GetModuleRoot(), "install", "test", "fixtures", "settings")
59+
settingsFixturesFolder := filepath.Join(fsutils.GetModuleRoot(), "install", "test", "fixtures", "settings")
6060

6161
err := filepath.Walk(settingsFixturesFolder, func(settingsFixtureFile string, info os.FileInfo, err error) error {
6262
if err != nil {

0 commit comments

Comments
 (0)