DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

appease the linter by promoting re-used header name to const and removing unnessary Sprintfs

Browse source
This commit is contained in:
Tomás Pinho 2023-11-29 08:45:13 +00:00
parent 93f0afc60f
commit fbb2c3bfe7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/e2e/settings/enable_real_ip_recursive.go
View file

@ -17,7 +17,6 @@ limitations under the License.
package settings package settings
import ( import (
"fmt"
"net/http" "net/http"
"strings" "strings"
@ -27,6 +26,8 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework" "k8s.io/ingress-nginx/test/e2e/framework"
) )
const forwardedForHost = "forwarded-for-header"
var _ = framework.DescribeSetting("enable-real-ip-recursive", func() { var _ = framework.DescribeSetting("enable-real-ip-recursive", func() {
f := framework.NewDefaultFramework("enable-real-ip-recursive") f := framework.NewDefaultFramework("enable-real-ip-recursive")
@ -44,7 +45,7 @@ var _ = framework.DescribeSetting("enable-real-ip-recursive", func() {
}) })
ginkgo.It("should use the first IP in X-Forwarded-For header when setting is true", func() { ginkgo.It("should use the first IP in X-Forwarded-For header when setting is true", func() {
host := "forwarded-for-header" host := forwardedForHost
f.UpdateNginxConfigMapData(setting, "true") f.UpdateNginxConfigMapData(setting, "true")
@ -65,7 +66,7 @@ var _ = framework.DescribeSetting("enable-real-ip-recursive", func() {
Body(). Body().
Raw() Raw()
assert.Contains(ginkgo.GinkgoT(), body, fmt.Sprintf("x-forwarded-for=127.0.0.1")) assert.Contains(ginkgo.GinkgoT(), body, "x-forwarded-for=127.0.0.1")
logs, err := f.NginxLogs() logs, err := f.NginxLogs()
assert.Nil(ginkgo.GinkgoT(), err, "obtaining nginx logs") assert.Nil(ginkgo.GinkgoT(), err, "obtaining nginx logs")
@ -73,7 +74,7 @@ var _ = framework.DescribeSetting("enable-real-ip-recursive", func() {
}) })
ginkgo.It("should use the last IP in X-Forwarded-For header when setting is false", func() { ginkgo.It("should use the last IP in X-Forwarded-For header when setting is false", func() {
host := "forwarded-for-header" host := forwardedForHost
f.UpdateNginxConfigMapData(setting, "false") f.UpdateNginxConfigMapData(setting, "false")
@ -92,7 +93,7 @@ var _ = framework.DescribeSetting("enable-real-ip-recursive", func() {
Body(). Body().
Raw() Raw()
assert.Contains(ginkgo.GinkgoT(), body, fmt.Sprintf("x-forwarded-for=1.2.3.4")) assert.Contains(ginkgo.GinkgoT(), body, "x-forwarded-for=1.2.3.4")
logs, err := f.NginxLogs() logs, err := f.NginxLogs()
assert.Nil(ginkgo.GinkgoT(), err, "obtaining nginx logs") assert.Nil(ginkgo.GinkgoT(), err, "obtaining nginx logs")