From 3b52d53066388b472da6d961536885068c0f2695 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Wed, 11 Sep 2024 18:43:56 -0700 Subject: [PATCH] Fix tests Signed-off-by: Tamal Saha --- pkg/test/cel/backendtlspolicy_test.go | 27 ++++++++++++--------- pkg/test/cel/grpcroute_experimental_test.go | 18 +++++++------- pkg/test/cel/grpcroute_test.go | 3 ++- pkg/test/cel/httproute_experimental_test.go | 18 +++++++------- pkg/test/cel/httproute_test.go | 3 ++- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/pkg/test/cel/backendtlspolicy_test.go b/pkg/test/cel/backendtlspolicy_test.go index 2f1cc11aa3..f7ad6d97ae 100644 --- a/pkg/test/cel/backendtlspolicy_test.go +++ b/pkg/test/cel/backendtlspolicy_test.go @@ -26,9 +26,12 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/utils/ptr" + + gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1a3 "sigs.k8s.io/gateway-api/apis/v1alpha3" - v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" + "sigs.k8s.io/gateway-api/apis/v1beta1" ) func TestBackendTLSPolicyValidation(t *testing.T) { @@ -50,7 +53,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -69,7 +72,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -93,7 +96,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -107,7 +110,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -127,7 +130,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -147,7 +150,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -167,7 +170,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -187,7 +190,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -207,7 +210,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -227,7 +230,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, @@ -248,7 +251,7 @@ func TestBackendTLSPolicyValidation(t *testing.T) { routeConfig: gatewayv1a3.BackendTLSPolicyValidation{ CACertificateRefs: []v1beta1.LocalObjectReference{ { - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, diff --git a/pkg/test/cel/grpcroute_experimental_test.go b/pkg/test/cel/grpcroute_experimental_test.go index 781a1947c0..4897e5c137 100644 --- a/pkg/test/cel/grpcroute_experimental_test.go +++ b/pkg/test/cel/grpcroute_experimental_test.go @@ -55,7 +55,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { rules []gatewayv1.GRPCRouteRule }{ { - name: "GRPCRoute - Invalid because both percent and fraction are specified", + name: "GRPCRoute - Invalid because both percent and fraction are specified", wantErrors: []string{"Only one of percent or fraction may be specified in HTTPRequestMirrorFilter"}, rules: []gatewayv1.GRPCRouteRule{{ Filters: []gatewayv1.GRPCRouteFilter{{ @@ -67,7 +67,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { }, Percent: &percent, Fraction: &gatewayv1.Fraction{ - Numerator: 83, + Numerator: 83, Denominator: &denominator, }, }, @@ -75,7 +75,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { }}, }, { - name: "GRPCRoute - Invalid fraction - numerator greater than denominator", + name: "GRPCRoute - Invalid fraction - numerator greater than denominator", wantErrors: []string{"numerator must be less than or equal to denominator"}, rules: []gatewayv1.GRPCRouteRule{{ Filters: []gatewayv1.GRPCRouteFilter{{ @@ -86,7 +86,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: 1001, + Numerator: 1001, Denominator: &denominator, }, }, @@ -94,7 +94,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { }}, }, { - name: "GRPCRoute - Invalid fraction - denominator is 0", + name: "GRPCRoute - Invalid fraction - denominator is 0", wantErrors: []string{"spec.rules[0].filters[0].requestMirror.fraction.denominator in body should be greater than or equal to 1"}, rules: []gatewayv1.GRPCRouteRule{{ Filters: []gatewayv1.GRPCRouteFilter{{ @@ -105,7 +105,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: 0, + Numerator: 0, Denominator: &bad_denominator, }, }, @@ -113,7 +113,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { }}, }, { - name: "GRPCRoute - Invalid fraction - numerator is negative", + name: "GRPCRoute - Invalid fraction - numerator is negative", wantErrors: []string{"spec.rules[0].filters[0].requestMirror.fraction.numerator in body should be greater than or equal to 0"}, rules: []gatewayv1.GRPCRouteRule{{ Filters: []gatewayv1.GRPCRouteFilter{{ @@ -124,7 +124,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: -1, + Numerator: -1, Denominator: &denominator, }, }, @@ -157,7 +157,7 @@ func TestGRPCRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: 83, + Numerator: 83, Denominator: &denominator, }, }, diff --git a/pkg/test/cel/grpcroute_test.go b/pkg/test/cel/grpcroute_test.go index 366e91c1ed..a4177cbfb8 100644 --- a/pkg/test/cel/grpcroute_test.go +++ b/pkg/test/cel/grpcroute_test.go @@ -28,6 +28,7 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/utils/ptr" ) func TestGRPCRouteFilter(t *testing.T) { @@ -121,7 +122,7 @@ func TestGRPCRouteFilter(t *testing.T) { routeFilter: gatewayv1.GRPCRouteFilter{ Type: gatewayv1.GRPCRouteFilterExtensionRef, ExtensionRef: &gatewayv1.LocalObjectReference{ - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", }, diff --git a/pkg/test/cel/httproute_experimental_test.go b/pkg/test/cel/httproute_experimental_test.go index a141899e37..f6ff0d455b 100644 --- a/pkg/test/cel/httproute_experimental_test.go +++ b/pkg/test/cel/httproute_experimental_test.go @@ -444,7 +444,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { rules []gatewayv1.HTTPRouteRule }{ { - name: "HTTPRoute - Invalid because both percent and fraction are specified", + name: "HTTPRoute - Invalid because both percent and fraction are specified", wantErrors: []string{"Only one of percent or fraction may be specified in HTTPRequestMirrorFilter"}, rules: []gatewayv1.HTTPRouteRule{{ Filters: []gatewayv1.HTTPRouteFilter{{ @@ -456,7 +456,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { }, Percent: &percent, Fraction: &gatewayv1.Fraction{ - Numerator: 83, + Numerator: 83, Denominator: &denominator, }, }, @@ -464,7 +464,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { }}, }, { - name: "HTTPRoute - Invalid fraction - numerator greater than denominator", + name: "HTTPRoute - Invalid fraction - numerator greater than denominator", wantErrors: []string{"numerator must be less than or equal to denominator"}, rules: []gatewayv1.HTTPRouteRule{{ Filters: []gatewayv1.HTTPRouteFilter{{ @@ -475,7 +475,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: 1001, + Numerator: 1001, Denominator: &denominator, }, }, @@ -483,7 +483,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { }}, }, { - name: "HTTPRoute - Invalid fraction - denominator is 0", + name: "HTTPRoute - Invalid fraction - denominator is 0", wantErrors: []string{"spec.rules[0].filters[0].requestMirror.fraction.denominator in body should be greater than or equal to 1"}, rules: []gatewayv1.HTTPRouteRule{{ Filters: []gatewayv1.HTTPRouteFilter{{ @@ -494,7 +494,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: 0, + Numerator: 0, Denominator: &bad_denominator, }, }, @@ -502,7 +502,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { }}, }, { - name: "HTTPRoute - Invalid fraction - numerator is negative", + name: "HTTPRoute - Invalid fraction - numerator is negative", wantErrors: []string{"spec.rules[0].filters[0].requestMirror.fraction.numerator in body should be greater than or equal to 0"}, rules: []gatewayv1.HTTPRouteRule{{ Filters: []gatewayv1.HTTPRouteFilter{{ @@ -513,7 +513,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: -1, + Numerator: -1, Denominator: &denominator, }, }, @@ -546,7 +546,7 @@ func TestHTTPRequestMirrorFilterExperimental(t *testing.T) { Port: ptrTo(gatewayv1.PortNumber(8081)), }, Fraction: &gatewayv1.Fraction{ - Numerator: 83, + Numerator: 83, Denominator: &denominator, }, }, diff --git a/pkg/test/cel/httproute_test.go b/pkg/test/cel/httproute_test.go index f958ecd9c9..4fa3a51bb8 100644 --- a/pkg/test/cel/httproute_test.go +++ b/pkg/test/cel/httproute_test.go @@ -23,6 +23,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/utils/ptr" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" ) @@ -330,7 +331,7 @@ func TestHTTPRouteFilter(t *testing.T) { routeFilter: gatewayv1.HTTPRouteFilter{ Type: gatewayv1.HTTPRouteFilterExtensionRef, ExtensionRef: &gatewayv1.LocalObjectReference{ - Group: "group", + Group: ptr.To[gatewayv1.Group]("group"), Kind: "kind", Name: "name", },