From dd44c5dccf52b3a95397d2cd4185302c47278cc2 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Mon, 26 Aug 2024 17:51:33 +0200 Subject: [PATCH] Tests: Use `framework.AllowSnippetConfiguration`. --- test/e2e/settings/validations/validations.go | 21 +++++--------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/test/e2e/settings/validations/validations.go b/test/e2e/settings/validations/validations.go index 881de39b4..fd412d541 100644 --- a/test/e2e/settings/validations/validations.go +++ b/test/e2e/settings/validations/validations.go @@ -31,14 +31,8 @@ var _ = framework.IngressNginxDescribeSerial("annotation validations", func() { f := framework.NewDefaultFramework("validations") //nolint:dupl // Ignore dupl errors for similar test case ginkgo.It("should allow ingress based on their risk on webhooks", func() { - f.SetNginxConfigMapData(map[string]string{ - "allow-snippet-annotations": "true", - }) - defer func() { - f.SetNginxConfigMapData(map[string]string{ - "allow-snippet-annotations": "false", - }) - }() + disableSnippet := f.AllowSnippetConfiguration() + defer disableSnippet() host := "annotation-validations" @@ -66,14 +60,9 @@ var _ = framework.IngressNginxDescribeSerial("annotation validations", func() { }) //nolint:dupl // Ignore dupl errors for similar test case ginkgo.It("should allow ingress based on their risk on webhooks", func() { - f.SetNginxConfigMapData(map[string]string{ - "allow-snippet-annotations": "true", - }) - defer func() { - f.SetNginxConfigMapData(map[string]string{ - "allow-snippet-annotations": "false", - }) - }() + disableSnippet := f.AllowSnippetConfiguration() + defer disableSnippet() + host := "annotation-validations" // Low and Medium Risk annotations should be allowed, the rest should be denied