From 33061b8cdffd7cd6dd91d68275eb39afea4dfce4 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Tue, 7 Sep 2021 13:35:22 -0400 Subject: [PATCH] put modsecurity e2e tests into their own packages (#7560) --- test/e2e/annotations/{ => modsecurity}/modsecurity.go | 2 +- test/e2e/e2e.go | 2 ++ test/e2e/settings/{ => modsecurity}/modsecurity_snippet.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename test/e2e/annotations/{ => modsecurity}/modsecurity.go (99%) rename test/e2e/settings/{ => modsecurity}/modsecurity_snippet.go (98%) diff --git a/test/e2e/annotations/modsecurity.go b/test/e2e/annotations/modsecurity/modsecurity.go similarity index 99% rename from test/e2e/annotations/modsecurity.go rename to test/e2e/annotations/modsecurity/modsecurity.go index d83803c93..fad3a2dee 100644 --- a/test/e2e/annotations/modsecurity.go +++ b/test/e2e/annotations/modsecurity/modsecurity.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package annotations +package modsecurity import ( "net/http" diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 9bb8937ea..c0829f5ee 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -32,6 +32,7 @@ import ( // tests to run _ "k8s.io/ingress-nginx/test/e2e/admission" _ "k8s.io/ingress-nginx/test/e2e/annotations" + _ "k8s.io/ingress-nginx/test/e2e/annotations/modsecurity" _ "k8s.io/ingress-nginx/test/e2e/dbg" _ "k8s.io/ingress-nginx/test/e2e/defaultbackend" _ "k8s.io/ingress-nginx/test/e2e/gracefulshutdown" @@ -42,6 +43,7 @@ import ( _ "k8s.io/ingress-nginx/test/e2e/security" _ "k8s.io/ingress-nginx/test/e2e/servicebackend" _ "k8s.io/ingress-nginx/test/e2e/settings" + _ "k8s.io/ingress-nginx/test/e2e/settings/modsecurity" _ "k8s.io/ingress-nginx/test/e2e/settings/ocsp" _ "k8s.io/ingress-nginx/test/e2e/ssl" _ "k8s.io/ingress-nginx/test/e2e/status" diff --git a/test/e2e/settings/modsecurity_snippet.go b/test/e2e/settings/modsecurity/modsecurity_snippet.go similarity index 98% rename from test/e2e/settings/modsecurity_snippet.go rename to test/e2e/settings/modsecurity/modsecurity_snippet.go index c0b962236..f912db984 100644 --- a/test/e2e/settings/modsecurity_snippet.go +++ b/test/e2e/settings/modsecurity/modsecurity_snippet.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package settings +package modsecurity import ( "strings"