diff --git a/internal/ingress/controller/template/template.go b/internal/ingress/controller/template/template.go
index 0b90441101..ff4ca1e5ba 100644
--- a/internal/ingress/controller/template/template.go
+++ b/internal/ingress/controller/template/template.go
@@ -334,7 +334,7 @@ func buildLocation(input interface{}, rewrite bool) string {
return fmt.Sprintf(`~* ^%s%s`, path, baseuri)
}
- if rewrite == true {
+ if rewrite {
if path == slash {
return path
}
diff --git a/internal/ingress/controller/template/template_test.go b/internal/ingress/controller/template/template_test.go
index 7f75689f56..5e489d8672 100644
--- a/internal/ingress/controller/template/template_test.go
+++ b/internal/ingress/controller/template/template_test.go
@@ -50,6 +50,7 @@ var (
XForwardedPrefix bool
DynamicConfigurationEnabled bool
SecureBackend bool
+ atLeastOneNeedsRewrite bool
}{
"when secure backend enabled": {
"/",
@@ -61,7 +62,8 @@ var (
false,
false,
false,
- true},
+ true,
+ false},
"when secure backend and stickeness enabled": {
"/",
"/",
@@ -72,7 +74,8 @@ var (
true,
false,
false,
- true},
+ true,
+ false},
"when secure backend and dynamic config enabled": {
"/",
"/",
@@ -83,7 +86,8 @@ var (
false,
false,
true,
- true},
+ true,
+ false},
"when secure backend, stickeness and dynamic config enabled": {
"/",
"/",
@@ -94,7 +98,8 @@ var (
true,
false,
true,
- true},
+ true,
+ false},
"invalid redirect / to / with dynamic config enabled": {
"/",
"/",
@@ -105,6 +110,7 @@ var (
false,
false,
true,
+ false,
false},
"invalid redirect / to /": {
"/",
@@ -116,6 +122,7 @@ var (
false,
false,
false,
+ false,
false},
"redirect / to /jenkins": {
"/",
@@ -131,7 +138,8 @@ proxy_pass http://upstream-name;
false,
false,
false,
- false},
+ false,
+ true},
"redirect /something to /": {
"/something",
"/",
@@ -146,7 +154,8 @@ proxy_pass http://upstream-name;
false,
false,
false,
- false},
+ false,
+ true},
"redirect /end-with-slash/ to /not-root": {
"/end-with-slash/",
"/not-root",
@@ -161,7 +170,8 @@ proxy_pass http://upstream-name;
false,
false,
false,
- false},
+ false,
+ true},
"redirect /something-complex to /not-root": {
"/something-complex",
"/not-root",
@@ -176,7 +186,8 @@ proxy_pass http://upstream-name;
false,
false,
false,
- false},
+ false,
+ true},
"redirect / to /jenkins and rewrite": {
"/",
"/jenkins",
@@ -194,7 +205,8 @@ subs_filter '(<(?:H|h)(?:E|e)(?:A|a)(?:D|d)(?:[^">]|"[^"]*")*>)' '$1]|"[^"]*")*>)' '$1]|"[^"]*")*>)' '$1]|"[^"]*")*>)' '$1]|"[^"]*")*>)' '$1