Add Makefile targets to run CEL test and re format test

Author: shaun-nx

tests/Makefile

@@ -17,6 +17,7 @@ STANDARD_CONFORMANCE_PROFILES = GATEWAY-HTTP,GATEWAY-GRPC
 EXPERIMENTAL_CONFORMANCE_PROFILES = GATEWAY-TLS
 CONFORMANCE_PROFILES = $(STANDARD_CONFORMANCE_PROFILES) # by default we use the standard conformance profiles. If experimental is enabled we override this and add the experimental profiles.
 SKIP_TESTS =
+CEL_TEST_TARGET =
 
 # Check if ENABLE_EXPERIMENTAL is true
 ifeq ($(ENABLE_EXPERIMENTAL),true)
@@ -186,3 +187,22 @@ uninstall-ngf: ## Uninstall NGF on configured kind cluster
 	-make uninstall-gateway-crds
 	-kubectl delete namespace nginx-gateway
 	-kubectl kustomize ../config/crd | kubectl delete -f -
+
+# Run CEL validation integration tests against a real cluster
+.PHONY: test-cel-validation
+test-cel-validation:
+	@if [ -z "$(CEL_TEST_TARGET)" ]; then \
+		echo "Running all tests in ./cel"; \
+		go test -v ./cel; \
+	else \
+		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

@@ -7,7 +7,6 @@ import (
 	"testing"
 	"time"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -36,7 +35,6 @@ const (
 )
 
 func TestClientSettingsPoliciesTargetRefKind(t *testing.T) {
-
 	tests := []struct {
 		policySpec ngfAPIv1alpha1.ClientSettingsPolicySpec
 		name       string
@@ -93,23 +91,12 @@ func TestClientSettingsPoliciesTargetRefKind(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Create a ClientSettingsPolicy with the targetRef from the test case.
-			clientSettingsPolicy := &ngfAPIv1alpha1.ClientSettingsPolicy{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-policy",
-					Namespace: "default",
-				},
-				Spec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
-					TargetRef: tt.policySpec.TargetRef,
-				},
-			}
-			validateClientSettingsPolicy(t, clientSettingsPolicy, tt.wantErrors)
+			validateClientSettingsPolicy(t, tt)
 		})
 	}
 }
 
 func TestClientSettingsPoliciesTargetRefGroup(t *testing.T) {
-
 	tests := []struct {
 		policySpec ngfAPIv1alpha1.ClientSettingsPolicySpec
 		name       string
@@ -148,33 +135,31 @@ func TestClientSettingsPoliciesTargetRefGroup(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Create a ClientSettingsPolicy with the targetRef from the test case.
-			clientSettingsPolicy := &ngfAPIv1alpha1.ClientSettingsPolicy{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-policy",
-					Namespace: "default",
-				},
-				Spec: ngfAPIv1alpha1.ClientSettingsPolicySpec{
-					TargetRef: tt.policySpec.TargetRef,
-				},
-			}
-			validateClientSettingsPolicy(t, clientSettingsPolicy, tt.wantErrors)
+			validateClientSettingsPolicy(t, tt)
 		})
 	}
 }
 
-func validateClientSettingsPolicy(t *testing.T,
-	clientSettingsPolicy *ngfAPIv1alpha1.ClientSettingsPolicy,
-	wantErrors []string,
+func validateClientSettingsPolicy(t *testing.T, tt struct {
+	policySpec ngfAPIv1alpha1.ClientSettingsPolicySpec
+	name       string
+	wantErrors []string
+},
 ) {
 	t.Helper()
 
 	// Get Kubernetes client from test framework
 	// This should be set up by your test framework to connect to a real cluster
 	k8sClient := getKubernetesClient(t)
 
-	// Make policy name unique to avoid conflicts
-	clientSettingsPolicy.Name = fmt.Sprintf("%s-%d", clientSettingsPolicy.Name, time.Now().UnixNano())
+	clientSettingsPolicy := &ngfAPIv1alpha1.ClientSettingsPolicy{
+		ObjectMeta: controllerruntime.ObjectMeta{
+			// Create a unique name and namespace for the policy to avoid conflicts
+			Name:      fmt.Sprintf("test-policy-%d", time.Now().UnixNano()),
+			Namespace: "default",
+		},
+		Spec: tt.policySpec,
+	}
 
 	err := k8sClient.Create(context.Background(), clientSettingsPolicy)
 
@@ -184,7 +169,7 @@ func validateClientSettingsPolicy(t *testing.T,
 	}()
 
 	// Check if we expected errors
-	if len(wantErrors) == 0 {
+	if len(tt.wantErrors) == 0 {
 		if err != nil {
 			t.Errorf("expected no error but got: %v", err)
 		}
@@ -199,7 +184,7 @@ func validateClientSettingsPolicy(t *testing.T,
 
 	// Check that we got the expected error messages
 	var missingErrors []string
-	for _, wantError := range wantErrors {
+	for _, wantError := range tt.wantErrors {
 		if !strings.Contains(err.Error(), wantError) {
 			missingErrors = append(missingErrors, wantError)
 		}
@@ -209,8 +194,9 @@ func validateClientSettingsPolicy(t *testing.T,
 	}
 }
 
-// getKubernetesClient returns a client connected to a real Kubernetes cluster
+// getKubernetesClient returns a client connected to a real Kubernetes cluster.
 func getKubernetesClient(t *testing.T) client.Client {
+	t.Helper()
 	// Use controller-runtime to get cluster connection
 	k8sConfig, err := controllerruntime.GetConfig()
 	if err != nil {