Skip to content

Commit e284740

Browse files
committed
Add common finctions for cel tests
1 parent c45403a commit e284740

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

internal/framework/helpers/helpers.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ import (
99

1010
"github.com/google/go-cmp/cmp"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12-
"k8s.io/apimachinery/pkg/runtime"
13-
controllerruntime "sigs.k8s.io/controller-runtime"
1412
"sigs.k8s.io/controller-runtime/pkg/client"
15-
16-
ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
1713
)
1814

1915
// Diff prints the diff between two structs.
@@ -107,20 +103,3 @@ func RandomPrimeNumber() int64 {
107103
func UniqueResourceName(name string) string {
108104
return fmt.Sprintf("%s-%d", name, RandomPrimeNumber())
109105
}
110-
111-
// GetKubernetesClient returns a client connected to a real Kubernetes cluster.
112-
func GetKubernetesClient() (k8sClient client.Client, err error) {
113-
// Use controller-runtime to get cluster connection
114-
k8sConfig, err := controllerruntime.GetConfig()
115-
if err != nil {
116-
return nil, err
117-
}
118-
119-
// Set up scheme with NGF types
120-
scheme := runtime.NewScheme()
121-
if err = ngfAPIv1alpha1.AddToScheme(scheme); err != nil {
122-
return nil, err
123-
}
124-
// Create a new client with the scheme and return it
125-
return client.New(k8sConfig, client.Options{Scheme: scheme})
126-
}

tests/cel/clientsettingspolicy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func validateClientSettingsPolicy(t *testing.T, tt struct {
155155
t.Helper()
156156
g := NewWithT(t)
157157

158-
k8sClient, err := ngfHelpers.GetKubernetesClient()
158+
k8sClient, err := GetKubernetesClient()
159159

160160
g.Expect(err).ToNot(HaveOccurred())
161161

tests/cel/common.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package cel
2+
3+
import (
4+
"k8s.io/apimachinery/pkg/runtime"
5+
controllerruntime "sigs.k8s.io/controller-runtime"
6+
"sigs.k8s.io/controller-runtime/pkg/client"
7+
8+
ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
9+
)
10+
11+
// GetKubernetesClient returns a client connected to a real Kubernetes cluster.
12+
func GetKubernetesClient() (k8sClient client.Client, err error) {
13+
// Use controller-runtime to get cluster connection
14+
k8sConfig, err := controllerruntime.GetConfig()
15+
if err != nil {
16+
return nil, err
17+
}
18+
19+
// Set up scheme with NGF types
20+
scheme := runtime.NewScheme()
21+
if err = ngfAPIv1alpha1.AddToScheme(scheme); err != nil {
22+
return nil, err
23+
}
24+
// Create a new client with the scheme and return it
25+
return client.New(k8sConfig, client.Options{Scheme: scheme})
26+
}

0 commit comments

Comments
 (0)