Enable HTTPRouteRewritePath test

Fixes: #2004 Signed-off-by: Arko Dasgupta <[email protected]>
envoyproxy · Oct 29, 2023 · 4836348 · 4836348
1 parent d65ab59
commit 4836348
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/internal/xds/translator/route.go b/internal/xds/translator/route.go
@@ -268,7 +268,12 @@ func buildXdsURLRewriteAction(destName string, urlRewrite *ir.URLRewrite) *route
 				Substitution: *urlRewrite.Path.FullReplace,
 			}
 		} else if urlRewrite.Path.PrefixMatchReplace != nil {
-			routeAction.PrefixRewrite = *urlRewrite.Path.PrefixMatchReplace
+			// Circumvent "//" case
+			if *urlRewrite.Path.PrefixMatchReplace == "/" {
+				routeAction.PrefixRewrite = ""
+			} else {
+				routeAction.PrefixRewrite = *urlRewrite.Path.PrefixMatchReplace
+			}
 		}
 	}
 

diff --git a/...al/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml b/...al/xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.routes.yaml
@@ -14,4 +14,3 @@
       name: rewrite-route
       route:
         cluster: rewrite-route-dest
-        prefixRewrite: /
diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go
@@ -48,7 +48,6 @@ func TestGatewayAPIConformance(t *testing.T) {
 		CleanupBaseResources: *flags.CleanupBaseResources,
 		SupportedFeatures:    suite.AllFeatures,
 		SkipTests: []string{
-			tests.HTTPRouteRewritePath.ShortName,
 			tests.GatewayStaticAddresses.ShortName,
 			tests.GatewayWithAttachedRoutes.ShortName,
 			tests.HTTPRouteBackendProtocolH2C.ShortName,

diff --git a/test/conformance/experimental_conformance_test.go b/test/conformance/experimental_conformance_test.go
@@ -97,7 +97,6 @@ func experimentalConformance(t *testing.T) {
 				CleanupBaseResources: *flags.CleanupBaseResources,
 				SupportedFeatures:    suite.AllFeatures,
 				SkipTests: []string{
-					tests.HTTPRouteRewritePath.ShortName,
 					tests.GatewayStaticAddresses.ShortName,
 					tests.GatewayWithAttachedRoutes.ShortName,
 					tests.HTTPRouteBackendProtocolH2C.ShortName,