unexport consnts and functions in cel common file

Author: shaun-nx

tests/Makefile

@@ -198,11 +198,3 @@ test-cel-validation:
 		echo "Running test: $(CEL_TEST_TARGET) in ./cel"; \
 		go test -v ./cel -run "$(CEL_TEST_TARGET)"; \
 	fi
-
-
-# Set up a kind cluster, install NGF CRDs, and run CEL validation tests
-.PHONY: setup-and-test-cel-validation
-setup-and-test-cel-validation:
-	kind create cluster --name $(CLUSTER_NAME) || true
-	kubectl kustomize ../config/crd | kubectl apply -f -
-	$(MAKE) test-cel-validation

tests/cel/clientsettingspolicy_test.go

@@ -22,46 +22,46 @@ func TestClientSettingsPoliciesTargetRefKind(t *testing.T) {
 			name: "Validate TargetRef of kind Gateway is allowed",
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  GatewayKind,
-					Group: GatewayGroup,
+					Kind:  gatewayKind,
+					Group: gatewayGroup,
 				},
 			},
 		},
 		{
 			name: "Validate TargetRef of kind HTTPRoute is allowed",
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  HTTPRouteKind,
-					Group: GatewayGroup,
+					Kind:  httpRouteKind,
+					Group: gatewayGroup,
 				},
 			},
 		},
 		{
 			name: "Validate TargetRef of kind GRPCRoute is allowed",
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  GRPCRouteKind,
-					Group: GatewayGroup,
+					Kind:  grpcRouteKind,
+					Group: gatewayGroup,
 				},
 			},
 		},
 		{
 			name:       "Validate Invalid TargetRef Kind is not allowed",
-			wantErrors: []string{ExpectedTargetRefKindError},
+			wantErrors: []string{expectedTargetRefKindError},
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  InvalidKind,
-					Group: GatewayGroup,
+					Kind:  invalidKind,
+					Group: gatewayGroup,
 				},
 			},
 		},
 		{
 			name:       "Validate TCPRoute TargetRef Kind is not allowed",
-			wantErrors: []string{ExpectedTargetRefKindError},
+			wantErrors: []string{expectedTargetRefKindError},
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  TCPRouteKind,
-					Group: GatewayGroup,
+					Kind:  tcpRouteKind,
+					Group: gatewayGroup,
 				},
 			},
 		},
@@ -86,28 +86,28 @@ func TestClientSettingsPoliciesTargetRefGroup(t *testing.T) {
 			name: "Validate gateway.networking.k8s.io TargetRef Group is allowed",
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  GatewayKind,
-					Group: GatewayGroup,
+					Kind:  gatewayKind,
+					Group: gatewayGroup,
 				},
 			},
 		},
 		{
 			name:       "Validate invalid.networking.k8s.io TargetRef Group is not allowed",
-			wantErrors: []string{ExpectedTargetRefGroupError},
+			wantErrors: []string{expectedTargetRefGroupError},
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  GatewayKind,
-					Group: InvalidGroup,
+					Kind:  gatewayKind,
+					Group: invalidGroup,
 				},
 			},
 		},
 		{
 			name:       "Validate discovery.k8s.io/v1 TargetRef Group is not allowed",
-			wantErrors: []string{ExpectedTargetRefGroupError},
+			wantErrors: []string{expectedTargetRefGroupError},
 			policySpec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
 				TargetRef: gatewayv1alpha2.LocalPolicyTargetReference{
-					Kind:  GatewayKind,
-					Group: DiscoveryGroup,
+					Kind:  gatewayKind,
+					Group: discoveryGroup,
 				},
 			},
 		},
@@ -130,19 +130,19 @@ func validateClientSettingsPolicy(t *testing.T, tt struct {
 	t.Helper()
 	g := NewWithT(t)
 
-	k8sClient, err := GetKubernetesClient(t)
+	k8sClient, err := getKubernetesClient(t)
 
 	g.Expect(err).ToNot(HaveOccurred())
 
 	g.Expect(err).ToNot(HaveOccurred())
 	policySpec := tt.policySpec
-	policySpec.TargetRef.Name = gatewayv1alpha2.ObjectName(UniqueResourceName(TargetRef))
-	policyName := UniqueResourceName(PolicyName)
+	policySpec.TargetRef.Name = gatewayv1alpha2.ObjectName(UniqueResourceName(testTargetRefName))
+	policyName := UniqueResourceName(testPolicyName)
 
 	clientSettingsPolicy := &ngfAPIv1alpha1.ClientSettingsPolicy{
 		ObjectMeta: controllerruntime.ObjectMeta{
 			Name:      policyName,
-			Namespace: "default",
+			Namespace: defaultNamespace,
 		},
 		Spec: policySpec,
 	}

tests/cel/common.go

@@ -14,31 +14,35 @@ import (
 )
 
 const (
-	GatewayKind   = "Gateway"
-	HTTPRouteKind = "HTTPRoute"
-	GRPCRouteKind = "GRPCRoute"
-	TCPRouteKind  = "TCPRoute"
-	InvalidKind   = "InvalidKind"
+	gatewayKind   = "Gateway"
+	httpRouteKind = "HTTPRoute"
+	grpcRouteKind = "GRPCRoute"
+	tcpRouteKind  = "TCPRoute"
+	invalidKind   = "InvalidKind"
 )
 
 const (
-	GatewayGroup   = "gateway.networking.k8s.io"
-	InvalidGroup   = "invalid.networking.k8s.io"
-	DiscoveryGroup = "discovery.k8s.io/v1"
+	gatewayGroup   = "gateway.networking.k8s.io"
+	invalidGroup   = "invalid.networking.k8s.io"
+	discoveryGroup = "discovery.k8s.io/v1"
 )
 
 const (
-	ExpectedTargetRefKindError  = `TargetRef Kind must be one of: Gateway, HTTPRoute, or GRPCRoute`
-	ExpectedTargetRefGroupError = `TargetRef Group must be gateway.networking.k8s.io.`
+	expectedTargetRefKindError  = `TargetRef Kind must be one of: Gateway, HTTPRoute, or GRPCRoute`
+	expectedTargetRefGroupError = `TargetRef Group must be gateway.networking.k8s.io.`
 )
 
 const (
-	PolicyName = "test-policy"
-	TargetRef  = "targetRef-name"
+	defaultNamespace = "default"
+)
+
+const (
+	testPolicyName    = "test-policy"
+	testTargetRefName = "test-targetRef"
 )
 
 // GetKubernetesClient returns a client connected to a real Kubernetes cluster.
-func GetKubernetesClient(t *testing.T) (k8sClient client.Client, err error) {
+func getKubernetesClient(t *testing.T) (k8sClient client.Client, err error) {
 	t.Helper()
 	// Use controller-runtime to get cluster connection
 	k8sConfig, err := controllerruntime.GetConfig()