Skip to content

Commit 3c33da3

Browse files
shaneuttk8s-ci-robot
authored andcommitted
chore: remove implicit HTTPRoute assumption
Previously all test runs implicitly assumed HTTPRoute conformance tests must run. As we move into a future with some implementations which don't implement HTTPRoute at all (e.g. L4 implementations, e.t.c.) this patch is needed to enable them.
1 parent 5349f54 commit 3c33da3

29 files changed

+122
-35
lines changed

conformance/tests/httproute-cross-namespace.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPRouteCrossNamespace = suite.ConformanceTest{
3434
ShortName: "HTTPRouteCrossNamespace",
3535
Description: "A single HTTPRoute in the gateway-conformance-web-backend namespace should attach to Gateway in another namespace",
36-
Manifests: []string{"tests/httproute-cross-namespace.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-cross-namespace.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
routeNN := types.NamespacedName{Name: "cross-namespace", Namespace: "gateway-conformance-web-backend"}
3942
gwNN := types.NamespacedName{Name: "backend-namespaces", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-disallowed-kind.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ func init() {
3434
var HTTPRouteDisallowedKind = suite.ConformanceTest{
3535
ShortName: "HTTPRouteDisallowedKind",
3636
Description: "A single HTTPRoute in the gateway-conformance-infra namespace should fail to attach to a Gateway with no listeners that allow the HTTPRoute kind",
37-
Features: []suite.SupportedFeature{suite.SupportTLSRoute},
38-
Manifests: []string{"tests/httproute-disallowed-kind.yaml"},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
suite.SupportTLSRoute,
40+
},
41+
Manifests: []string{"tests/httproute-disallowed-kind.yaml"},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
// This test creates an additional Gateway in the gateway-conformance-infra
4144
// namespace so we have to wait for it to be ready.

conformance/tests/httproute-exact-path-matching.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPExactPathMatching = suite.ConformanceTest{
3434
ShortName: "HTTPExactPathMatching",
3535
Description: "A single HTTPRoute with exact path matching for different backends",
36-
Manifests: []string{"tests/httproute-exact-path-matching.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-exact-path-matching.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
ns := "gateway-conformance-infra"
3942
routeNN := types.NamespacedName{Name: "exact-matching", Namespace: ns}

conformance/tests/httproute-header-matching.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPRouteHeaderMatching = suite.ConformanceTest{
3434
ShortName: "HTTPRouteHeaderMatching",
3535
Description: "A single HTTPRoute with header matching for different backends",
36-
Manifests: []string{"tests/httproute-header-matching.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-header-matching.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
ns := "gateway-conformance-infra"
3942
routeNN := types.NamespacedName{Name: "header-matching", Namespace: ns}

conformance/tests/httproute-hostname-intersection.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ func init() {
3535
var HTTPRouteHostnameIntersection = suite.ConformanceTest{
3636
ShortName: "HTTPRouteHostnameIntersection",
3737
Description: "HTTPRoutes should attach to listeners only if they have intersecting hostnames, and should accept requests only for the intersecting hostnames",
38-
Manifests: []string{"tests/httproute-hostname-intersection.yaml"},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
},
41+
Manifests: []string{"tests/httproute-hostname-intersection.yaml"},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
ns := "gateway-conformance-infra"
4144
gwNN := types.NamespacedName{Name: "httproute-hostname-intersection", Namespace: ns}

conformance/tests/httproute-invalid-backendref-nonexistent.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ func init() {
3535
var HTTPRouteInvalidNonExistentBackendRef = suite.ConformanceTest{
3636
ShortName: "HTTPRouteInvalidNonExistentBackendRef",
3737
Description: "A single HTTPRoute in the gateway-conformance-infra namespace should set a ResolvedRefs status False with reason BackendNotFound and return 500 when binding to a Gateway in the same namespace if the route has a BackendRef Service that does not exist",
38-
Manifests: []string{"tests/httproute-invalid-backendref-nonexistent.yaml"},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
},
41+
Manifests: []string{"tests/httproute-invalid-backendref-nonexistent.yaml"},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
routeNN := types.NamespacedName{Name: "invalid-nonexistent-backend-ref", Namespace: "gateway-conformance-infra"}
4144
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-invalid-backendref-unknown-kind.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ func init() {
3535
var HTTPRouteInvalidBackendRefUnknownKind = suite.ConformanceTest{
3636
ShortName: "HTTPRouteInvalidBackendRefUnknownKind",
3737
Description: "A single HTTPRoute in the gateway-conformance-infra namespace should set a ResolvedRefs status False with reason InvalidKind when attempting to bind to a Gateway in the same namespace if the route has a BackendRef that points to an unknown Kind.",
38-
Manifests: []string{"tests/httproute-invalid-backendref-unknown-kind.yaml"},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
},
41+
Manifests: []string{"tests/httproute-invalid-backendref-unknown-kind.yaml"},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
routeNN := types.NamespacedName{Name: "invalid-backend-ref-unknown-kind", Namespace: "gateway-conformance-infra"}
4144
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-invalid-cross-namespace-backend-ref.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,11 @@ func init() {
3535
var HTTPRouteInvalidCrossNamespaceBackendRef = suite.ConformanceTest{
3636
ShortName: "HTTPRouteInvalidCrossNamespaceBackendRef",
3737
Description: "A single HTTPRoute in the gateway-conformance-infra namespace should set a ResolvedRefs status False with reason RefNotPermitted when attempting to bind to a Gateway in the same namespace if the route has a BackendRef Service in the gateway-conformance-web-backend namespace and a ReferenceGrant granting permission to route to that Service does not exist",
38-
Features: []suite.SupportedFeature{suite.SupportReferenceGrant},
39-
Manifests: []string{"tests/httproute-invalid-cross-namespace-backend-ref.yaml"},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
suite.SupportReferenceGrant,
41+
},
42+
Manifests: []string{"tests/httproute-invalid-cross-namespace-backend-ref.yaml"},
4043
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4144
routeNN := types.NamespacedName{Name: "invalid-cross-namespace-backend-ref", Namespace: "gateway-conformance-infra"}
4245
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-invalid-cross-namespace-parent-ref.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ func init() {
3434
var HTTPRouteInvalidCrossNamespaceParentRef = suite.ConformanceTest{
3535
ShortName: "HTTPRouteInvalidCrossNamespaceParentRef",
3636
Description: "A single HTTPRoute in the gateway-conformance-web-backend namespace should fail to attach to a Gateway in another namespace that it is not allowed to",
37-
Manifests: []string{"tests/httproute-invalid-cross-namespace-parent-ref.yaml"},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
},
40+
Manifests: []string{"tests/httproute-invalid-cross-namespace-parent-ref.yaml"},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}
4043
routeNN := types.NamespacedName{Name: "invalid-cross-namespace-parent-ref", Namespace: "gateway-conformance-web-backend"}

conformance/tests/httproute-invalid-parentref-not-matching-listener-port.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ func init() {
3434
var HTTPRouteInvalidParentRefNotMatchingListenerPort = suite.ConformanceTest{
3535
ShortName: "HTTPRouteInvalidParentRefNotMatchingListenerPort",
3636
Description: "A single HTTPRoute in the gateway-conformance-infra namespace should set the Accepted status to False with reason NoMatchingParent when attempting to bind to a Gateway that does not have a matching ListenerPort.",
37-
Features: []suite.SupportedFeature{suite.SupportRouteDestinationPortMatching},
38-
Manifests: []string{"tests/httproute-invalid-parentref-not-matching-listener-port.yaml"},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
suite.SupportRouteDestinationPortMatching,
40+
},
41+
Manifests: []string{"tests/httproute-invalid-parentref-not-matching-listener-port.yaml"},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
routeNN := types.NamespacedName{Name: "httproute-listener-not-matching-route-port", Namespace: "gateway-conformance-infra"}
4144
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-invalid-parentref-not-matching-section-name.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ func init() {
3434
var HTTPRouteInvalidParentRefNotMatchingSectionName = suite.ConformanceTest{
3535
ShortName: "HTTPRouteInvalidParentRefNotMatchingSectionName",
3636
Description: "A single HTTPRoute in the gateway-conformance-infra namespace should set the Accepted status to False with reason NoMatchingParent when attempting to bind to a Gateway that does not have a matching SectionName.",
37-
Manifests: []string{"tests/httproute-invalid-parentref-not-matching-section-name.yaml"},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
},
40+
Manifests: []string{"tests/httproute-invalid-parentref-not-matching-section-name.yaml"},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
routeNN := types.NamespacedName{Name: "httproute-listener-not-matching-section-name", Namespace: "gateway-conformance-infra"}
4043
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-listener-hostname-matching.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPRouteListenerHostnameMatching = suite.ConformanceTest{
3434
ShortName: "HTTPRouteListenerHostnameMatching",
3535
Description: "Multiple HTTP listeners with the same port and different hostnames, each with a different HTTPRoute",
36-
Manifests: []string{"tests/httproute-listener-hostname-matching.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-listener-hostname-matching.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
ns := "gateway-conformance-infra"
3942

conformance/tests/httproute-matching-across-routes.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPRouteMatchingAcrossRoutes = suite.ConformanceTest{
3434
ShortName: "HTTPRouteMatchingAcrossRoutes",
3535
Description: "Two HTTPRoutes with path matching for different backends",
36-
Manifests: []string{"tests/httproute-matching-across-routes.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-matching-across-routes.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
ns := "gateway-conformance-infra"
3942
routeNN1 := types.NamespacedName{Name: "matching-part1", Namespace: ns}

conformance/tests/httproute-matching.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPRouteMatching = suite.ConformanceTest{
3434
ShortName: "HTTPRouteMatching",
3535
Description: "A single HTTPRoute with path and header matching for different backends",
36-
Manifests: []string{"tests/httproute-matching.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-matching.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
ns := "gateway-conformance-infra"
3942
routeNN := types.NamespacedName{Name: "matching", Namespace: ns}

conformance/tests/httproute-method-matching.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ var HTTPRouteMethodMatching = suite.ConformanceTest{
3434
ShortName: "HTTPRouteMethodMatching",
3535
Description: "A single HTTPRoute with method matching for different backends",
3636
Manifests: []string{"tests/httproute-method-matching.yaml"},
37-
Features: []suite.SupportedFeature{suite.SupportHTTPRouteMethodMatching},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
suite.SupportHTTPRouteMethodMatching,
40+
},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
ns := "gateway-conformance-infra"
4043
routeNN := types.NamespacedName{Name: "method-matching", Namespace: ns}

conformance/tests/httproute-observed-generation-bump.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ func init() {
3838
var HTTPRouteObservedGenerationBump = suite.ConformanceTest{
3939
ShortName: "HTTPRouteObservedGenerationBump",
4040
Description: "A HTTPRoute in the gateway-conformance-infra namespace should update the observedGeneration in all of it's Status.Conditions after an update to the spec",
41-
Manifests: []string{"tests/httproute-observed-generation-bump.yaml"},
41+
Features: []suite.SupportedFeature{
42+
suite.SupportHTTPRoute,
43+
},
44+
Manifests: []string{"tests/httproute-observed-generation-bump.yaml"},
4245
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4346
routeNN := types.NamespacedName{Name: "observed-generation-bump", Namespace: "gateway-conformance-infra"}
4447
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-partially-invalid-via-reference-grant.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,11 @@ func init() {
3535
var HTTPRoutePartiallyInvalidViaInvalidReferenceGrant = suite.ConformanceTest{
3636
ShortName: "HTTPRoutePartiallyInvalidViaInvalidReferenceGrant",
3737
Description: "A single HTTPRoute in the gateway-conformance-infra namespace should attach to a Gateway in the same namespace if the route has a backendRef Service in the gateway-conformance-app-backend namespace and a ReferenceGrant exists but does not grant permission to route to that specific Service",
38-
Features: []suite.SupportedFeature{suite.SupportReferenceGrant},
39-
Manifests: []string{"tests/httproute-partially-invalid-via-reference-grant.yaml"},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
suite.SupportReferenceGrant,
41+
},
42+
Manifests: []string{"tests/httproute-partially-invalid-via-reference-grant.yaml"},
4043
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
4144
routeNN := types.NamespacedName{Name: "invalid-reference-grant", Namespace: "gateway-conformance-infra"}
4245
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-path-match-order.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPRoutePathMatchOrder = suite.ConformanceTest{
3434
ShortName: "HTTPRoutePathMatchOrder",
3535
Description: "An HTTPRoute where there are multiple matches routing to any given backend follows match order precedence",
36-
Manifests: []string{"tests/httproute-path-match-order.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-path-match-order.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
ns := "gateway-conformance-infra"
3942
routeNN := types.NamespacedName{Namespace: ns, Name: "path-matching-order"}

conformance/tests/httproute-query-param-matching.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ var HTTPRouteQueryParamMatching = suite.ConformanceTest{
3434
ShortName: "HTTPRouteQueryParamMatching",
3535
Description: "A single HTTPRoute with query param matching for different backends",
3636
Manifests: []string{"tests/httproute-query-param-matching.yaml"},
37-
Features: []suite.SupportedFeature{suite.SupportHTTPRouteQueryParamMatching},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
suite.SupportHTTPRouteQueryParamMatching,
40+
},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
ns := "gateway-conformance-infra"
4043
routeNN := types.NamespacedName{Namespace: ns, Name: "query-param-matching"}

conformance/tests/httproute-redirect-host-and-status.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ func init() {
3434
var HTTPRouteRedirectHostAndStatus = suite.ConformanceTest{
3535
ShortName: "HTTPRouteRedirectHostAndStatus",
3636
Description: "An HTTPRoute with hostname and statusCode redirect filters",
37-
Manifests: []string{"tests/httproute-redirect-host-and-status.yaml"},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
},
40+
Manifests: []string{"tests/httproute-redirect-host-and-status.yaml"},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
ns := "gateway-conformance-infra"
4043
routeNN := types.NamespacedName{Name: "redirect-host-and-status", Namespace: ns}

conformance/tests/httproute-redirect-path.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ var HTTPRouteRedirectPath = suite.ConformanceTest{
3535
ShortName: "HTTPRouteRedirectPath",
3636
Description: "An HTTPRoute with scheme redirect filter",
3737
Manifests: []string{"tests/httproute-redirect-path.yaml"},
38-
Features: []suite.SupportedFeature{suite.SupportHTTPRoutePathRedirect},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
suite.SupportHTTPRoutePathRedirect,
41+
},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
ns := "gateway-conformance-infra"
4144
routeNN := types.NamespacedName{Name: "redirect-path", Namespace: ns}

conformance/tests/httproute-redirect-port.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ var HTTPRouteRedirectPort = suite.ConformanceTest{
3535
ShortName: "HTTPRouteRedirectPort",
3636
Description: "An HTTPRoute with a port redirect filter",
3737
Manifests: []string{"tests/httproute-redirect-port.yaml"},
38-
Features: []suite.SupportedFeature{suite.SupportHTTPRoutePortRedirect},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
suite.SupportHTTPRoutePortRedirect,
41+
},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
ns := "gateway-conformance-infra"
4144
routeNN := types.NamespacedName{Name: "redirect-port", Namespace: ns}

conformance/tests/httproute-redirect-scheme.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ var HTTPRouteRedirectScheme = suite.ConformanceTest{
3535
ShortName: "HTTPRouteRedirectScheme",
3636
Description: "An HTTPRoute with a scheme redirect filter",
3737
Manifests: []string{"tests/httproute-redirect-scheme.yaml"},
38-
Features: []suite.SupportedFeature{suite.SupportHTTPRouteSchemeRedirect},
38+
Features: []suite.SupportedFeature{
39+
suite.SupportHTTPRoute,
40+
suite.SupportHTTPRouteSchemeRedirect,
41+
},
3942
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
4043
ns := "gateway-conformance-infra"
4144
routeNN := types.NamespacedName{Name: "redirect-scheme", Namespace: ns}

conformance/tests/httproute-reference-grant.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ func init() {
3333
var HTTPRouteReferenceGrant = suite.ConformanceTest{
3434
ShortName: "HTTPRouteReferenceGrant",
3535
Description: "A single HTTPRoute in the gateway-conformance-infra namespace, with a backendRef in the gateway-conformance-web-backend namespace, should attach to Gateway in the gateway-conformance-infra namespace",
36-
Features: []suite.SupportedFeature{suite.SupportReferenceGrant},
37-
Manifests: []string{"tests/httproute-reference-grant.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
suite.SupportReferenceGrant,
39+
},
40+
Manifests: []string{"tests/httproute-reference-grant.yaml"},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
routeNN := types.NamespacedName{Name: "reference-grant", Namespace: "gateway-conformance-infra"}
4043
gwNN := types.NamespacedName{Name: "same-namespace", Namespace: "gateway-conformance-infra"}

conformance/tests/httproute-request-header-modifier.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ func init() {
3333
var HTTPRouteRequestHeaderModifier = suite.ConformanceTest{
3434
ShortName: "HTTPRouteRequestHeaderModifier",
3535
Description: "An HTTPRoute has request header modifier filters applied correctly",
36-
Manifests: []string{"tests/httproute-request-header-modifier.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
},
39+
Manifests: []string{"tests/httproute-request-header-modifier.yaml"},
3740
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3841
ns := "gateway-conformance-infra"
3942
routeNN := types.NamespacedName{Name: "request-header-modifier", Namespace: ns}

conformance/tests/httproute-response-header-modifier.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ func init() {
3333
var HTTPRouteResponseHeaderModifier = suite.ConformanceTest{
3434
ShortName: "HTTPRouteResponseHeaderModifier",
3535
Description: "An HTTPRoute has response header modifier filters applied correctly",
36-
Features: []suite.SupportedFeature{suite.SupportHTTPResponseHeaderModification},
37-
Manifests: []string{"tests/httproute-response-header-modifier.yaml"},
36+
Features: []suite.SupportedFeature{
37+
suite.SupportHTTPRoute,
38+
suite.SupportHTTPResponseHeaderModification,
39+
},
40+
Manifests: []string{"tests/httproute-response-header-modifier.yaml"},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
ns := "gateway-conformance-infra"
4043
routeNN := types.NamespacedName{Name: "response-header-modifier", Namespace: ns}

conformance/tests/httproute-rewrite-host.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ var HTTPRouteRewriteHost = suite.ConformanceTest{
3434
ShortName: "HTTPRouteRewriteHost",
3535
Description: "An HTTPRoute with hostname rewrite filter",
3636
Manifests: []string{"tests/httproute-rewrite-host.yaml"},
37-
Features: []suite.SupportedFeature{suite.SupportHTTPRouteHostRewrite},
37+
Features: []suite.SupportedFeature{
38+
suite.SupportHTTPRoute,
39+
suite.SupportHTTPRouteHostRewrite,
40+
},
3841
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
3942
ns := "gateway-conformance-infra"
4043
routeNN := types.NamespacedName{Name: "rewrite-host", Namespace: ns}

0 commit comments

Comments
 (0)