Skip to content

Commit 2e807be

Browse files
jrsmrozjrsmroz
authored
chore(tests) replace duplicate objects def with existing obeject ref in parser tests (#3107)
1 parent f532651 commit 2e807be

File tree

1 file changed

+2
-146
lines changed

1 file changed

+2
-146
lines changed

‎internal/dataplane/parser/translate_httproute_test.go‎

Lines changed: 2 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,6 @@ func getIngressRulesFromHTTPRoutesCommonTestCases() []testCaseIngressRulesFromHT
365365
}
366366

367367
func getIngressRulesFromHTTPRoutesCombinedRoutesTestCases() []testCaseIngressRulesFromHTTPRoutes {
368-
ingressRulesFromHTTPRoutesCommonCasesHTTPPort1 := gatewayv1beta1.PortNumber(80)
369-
ingressRulesFromHTTPRoutesCommonCasesHTTPPort2 := gatewayv1beta1.PortNumber(8080)
370-
371368
return []testCaseIngressRulesFromHTTPRoutes{
372369
{
373370
msg: "a single HTTPRoute with multiple rules with equal backendRefs results in a single service",
@@ -517,53 +514,7 @@ func getIngressRulesFromHTTPRoutesCombinedRoutesTestCases() []testCaseIngressRul
517514
},
518515
Ingress: k8sObjectInfoOfHTTPRoute(routes[0]),
519516
}},
520-
Parent: &gatewayv1beta1.HTTPRoute{
521-
Spec: gatewayv1beta1.HTTPRouteSpec{
522-
CommonRouteSpec: commonRouteSpecMock("fake-gateway"),
523-
Rules: []gatewayv1beta1.HTTPRouteRule{
524-
{
525-
Matches: []gatewayv1beta1.HTTPRouteMatch{
526-
builder.NewHTTPRouteMatch().WithPathPrefix("/httpbin-1").Build(),
527-
},
528-
BackendRefs: []gatewayv1beta1.HTTPBackendRef{
529-
{
530-
BackendRef: gatewayv1beta1.BackendRef{
531-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
532-
Name: gatewayv1beta1.ObjectName("fake-service"),
533-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort1,
534-
Kind: util.StringToGatewayAPIKindPtr("Service"),
535-
},
536-
},
537-
},
538-
},
539-
},
540-
{
541-
Matches: []gatewayv1beta1.HTTPRouteMatch{
542-
builder.NewHTTPRouteMatch().WithPathPrefix("/httpbin-2").Build(),
543-
},
544-
BackendRefs: []gatewayv1beta1.HTTPBackendRef{
545-
{
546-
BackendRef: gatewayv1beta1.BackendRef{
547-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
548-
Name: gatewayv1beta1.ObjectName("fake-service"),
549-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort2,
550-
Kind: util.StringToGatewayAPIKindPtr("Service"),
551-
},
552-
},
553-
},
554-
},
555-
},
556-
},
557-
},
558-
ObjectMeta: metav1.ObjectMeta{
559-
Name: "basic-httproute",
560-
Namespace: "default",
561-
},
562-
TypeMeta: metav1.TypeMeta{
563-
Kind: "HTTPRoute",
564-
APIVersion: "gateway.networking.k8s.io/v1beta1",
565-
},
566-
},
517+
Parent: routes[0],
567518
},
568519

569520
"httproute.default.basic-httproute.1": {
@@ -695,102 +646,7 @@ func getIngressRulesFromHTTPRoutesCombinedRoutesTestCases() []testCaseIngressRul
695646
Ingress: k8sObjectInfoOfHTTPRoute(routes[0]),
696647
},
697648
},
698-
Parent: &gatewayv1beta1.HTTPRoute{
699-
Spec: gatewayv1beta1.HTTPRouteSpec{
700-
CommonRouteSpec: commonRouteSpecMock("fake-gateway"),
701-
Rules: []gatewayv1beta1.HTTPRouteRule{
702-
{
703-
Matches: []gatewayv1beta1.HTTPRouteMatch{
704-
builder.NewHTTPRouteMatch().WithPathPrefix("/httpbin-1").Build(),
705-
},
706-
BackendRefs: []gatewayv1beta1.HTTPBackendRef{
707-
{
708-
BackendRef: gatewayv1beta1.BackendRef{
709-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
710-
Name: gatewayv1beta1.ObjectName("foo-v1"),
711-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort1,
712-
Kind: util.StringToGatewayAPIKindPtr("Service"),
713-
},
714-
Weight: pointer.Int32(90),
715-
},
716-
},
717-
{
718-
BackendRef: gatewayv1beta1.BackendRef{
719-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
720-
Name: gatewayv1beta1.ObjectName("foo-v2"),
721-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort2,
722-
Kind: util.StringToGatewayAPIKindPtr("Service"),
723-
},
724-
Weight: pointer.Int32(10),
725-
},
726-
},
727-
},
728-
},
729-
{
730-
Matches: []gatewayv1beta1.HTTPRouteMatch{
731-
builder.NewHTTPRouteMatch().WithPathPrefix("/httpbin-2").Build(),
732-
},
733-
BackendRefs: []gatewayv1beta1.HTTPBackendRef{
734-
{
735-
BackendRef: gatewayv1beta1.BackendRef{
736-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
737-
Name: gatewayv1beta1.ObjectName("foo-v1"),
738-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort1,
739-
Kind: util.StringToGatewayAPIKindPtr("Service"),
740-
},
741-
Weight: pointer.Int32(90),
742-
},
743-
},
744-
{
745-
BackendRef: gatewayv1beta1.BackendRef{
746-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
747-
Name: gatewayv1beta1.ObjectName("foo-v2"),
748-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort2,
749-
Kind: util.StringToGatewayAPIKindPtr("Service"),
750-
},
751-
Weight: pointer.Int32(10),
752-
},
753-
},
754-
},
755-
},
756-
{
757-
Matches: []gatewayv1beta1.HTTPRouteMatch{
758-
builder.NewHTTPRouteMatch().WithPathPrefix("/httpbin-2").Build(),
759-
},
760-
BackendRefs: []gatewayv1beta1.HTTPBackendRef{
761-
{
762-
BackendRef: gatewayv1beta1.BackendRef{
763-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
764-
Name: gatewayv1beta1.ObjectName("foo-v1"),
765-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort2,
766-
Kind: util.StringToGatewayAPIKindPtr("Service"),
767-
},
768-
Weight: pointer.Int32(90),
769-
},
770-
},
771-
{
772-
BackendRef: gatewayv1beta1.BackendRef{
773-
BackendObjectReference: gatewayv1beta1.BackendObjectReference{
774-
Name: gatewayv1beta1.ObjectName("foo-v3"),
775-
Port: &ingressRulesFromHTTPRoutesCommonCasesHTTPPort2,
776-
Kind: util.StringToGatewayAPIKindPtr("Service"),
777-
},
778-
Weight: pointer.Int32(10),
779-
},
780-
},
781-
},
782-
},
783-
},
784-
},
785-
ObjectMeta: metav1.ObjectMeta{
786-
Name: "basic-httproute",
787-
Namespace: "default",
788-
},
789-
TypeMeta: metav1.TypeMeta{
790-
Kind: "HTTPRoute",
791-
APIVersion: "gateway.networking.k8s.io/v1beta1",
792-
},
793-
},
649+
Parent: routes[0],
794650
},
795651

796652
"httproute.default.basic-httproute.2": {

0 commit comments

Comments
 (0)