From 281139d1a7bf3c7e2768ef395906ff844e9fbb6b Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Tue, 11 Feb 2020 13:48:42 -0300 Subject: [PATCH] Only set mirror source when a target is configured (#5055) --- internal/ingress/annotations/mirror/main.go | 1 + internal/ingress/annotations/mirror/main_test.go | 2 +- test/e2e/annotations/mirror.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/ingress/annotations/mirror/main.go b/internal/ingress/annotations/mirror/main.go index dcd6244be..b2591347e 100644 --- a/internal/ingress/annotations/mirror/main.go +++ b/internal/ingress/annotations/mirror/main.go @@ -82,6 +82,7 @@ func (a mirror) Parse(ing *networking.Ingress) (interface{}, error) { config.Target, err = parser.GetStringAnnotation("mirror-target", ing) if err != nil { config.Target = "" + config.Source = "" } return config, nil diff --git a/internal/ingress/annotations/mirror/main_test.go b/internal/ingress/annotations/mirror/main_test.go index 3712a0a11..1ecaef3b9 100644 --- a/internal/ingress/annotations/mirror/main_test.go +++ b/internal/ingress/annotations/mirror/main_test.go @@ -47,7 +47,7 @@ func TestParse(t *testing.T) { Target: "https://test.env.com/$request_uri", }}, {map[string]string{requestBody: "off"}, &Config{ - Source: ngxURI, + Source: "", RequestBody: "off", Target: "", }}, diff --git a/test/e2e/annotations/mirror.go b/test/e2e/annotations/mirror.go index 9ada90974..d2d809d6c 100644 --- a/test/e2e/annotations/mirror.go +++ b/test/e2e/annotations/mirror.go @@ -69,7 +69,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Mirror", func() { It("should disable mirror-request-body", func() { annotations := map[string]string{ - "nginx.ingress.kubernetes.io/mirror-uri": "http://localhost/mirror", + "nginx.ingress.kubernetes.io/mirror-target": "http://localhost/mirror", "nginx.ingress.kubernetes.io/mirror-request-body": "off", }