Allow for gRPC and proxy set in rewrite

nginx · Nov 11, 2021 · 0a96ebe · 0a96ebe
1 parent 1e91f2e
commit 0a96ebe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go
@@ -1339,11 +1339,10 @@ func upstreamHasKeepalive(upstream conf_v1.Upstream, cfgParams *ConfigParams) bo
 }
 
 func generateRewrites(path string, proxy *conf_v1.ActionProxy, internal bool, originalPath string, grpcEnabled bool) []string {
-	if grpcEnabled && internal {
-		return []string{"^ $request_uri break"}
-	}
-
 	if proxy == nil || proxy.RewritePath == "" {
+		if grpcEnabled && internal {
+			return []string{"^ $request_uri break"}
+		}
 		return nil
 	}
 

diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go
@@ -6838,6 +6838,13 @@ func TestGenerateRewrites(t *testing.T) {
 			},
 			originalPath: "/path",
 			grpcEnabled:  true,
+			expected:     []string{`^ $request_uri`, `"^/path(.*)$" "/rewrite$1" break`},
+		},
+		{
+			path:         "/_internal_path",
+			internal:     true,
+			originalPath: "/path",
+			grpcEnabled:  true,
 			expected:     []string{`^ $request_uri break`},
 		},
 	}