From 10ef443006d6002c961bd3a3548307794c1ea111 Mon Sep 17 00:00:00 2001 From: Ved Ratan <82467006+VedRatan@users.noreply.github.com> Date: Tue, 16 May 2023 15:24:26 +0530 Subject: [PATCH] [Bug] Enforce message wrong (#7208) * fix Signed-off-by: Ved Ratan * fixed tests Signed-off-by: Ved Ratan --------- Signed-off-by: Ved Ratan --- pkg/webhooks/utils/block.go | 7 +------ pkg/webhooks/utils/block_test.go | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkg/webhooks/utils/block.go b/pkg/webhooks/utils/block.go index 1043df2012..78622ca819 100644 --- a/pkg/webhooks/utils/block.go +++ b/pkg/webhooks/utils/block.go @@ -40,15 +40,11 @@ func GetBlockedMessages(engineResponses []engineapi.EngineResponse) string { return "" } failures := make(map[string]interface{}) - hasViolations := false for _, er := range engineResponses { ruleToReason := make(map[string]string) for _, rule := range er.PolicyResponse.Rules { if rule.Status() != engineapi.RuleStatusPass { ruleToReason[rule.Name()] = rule.Message() - if rule.Status() == engineapi.RuleStatusFail { - hasViolations = true - } } } if len(ruleToReason) != 0 { @@ -60,8 +56,7 @@ func GetBlockedMessages(engineResponses []engineapi.EngineResponse) string { } r := engineResponses[0].Resource resourceName := fmt.Sprintf("%s/%s/%s", r.GetKind(), r.GetNamespace(), r.GetName()) - action := getAction(hasViolations, len(failures)) results, _ := yaml.Marshal(failures) - msg := fmt.Sprintf("\n\npolicy %s for resource %s: \n\n%s", resourceName, action, results) + msg := fmt.Sprintf("\n\nresource %s was blocked due to the following policies \n\n%s", resourceName, results) return msg } diff --git a/pkg/webhooks/utils/block_test.go b/pkg/webhooks/utils/block_test.go index 6d62d6414a..93c929a337 100644 --- a/pkg/webhooks/utils/block_test.go +++ b/pkg/webhooks/utils/block_test.go @@ -209,7 +209,7 @@ func TestGetBlockedMessages(t *testing.T) { }), }, }, - want: "\n\npolicy foo/bar/baz for resource violation: \n\ntest:\n rule-fail: message fail\n", + want: "\n\nresource foo/bar/baz was blocked due to the following policies \n\ntest:\n rule-fail: message fail\n", }, { name: "error - enforce", args: args{ @@ -221,7 +221,7 @@ func TestGetBlockedMessages(t *testing.T) { }), }, }, - want: "\n\npolicy foo/bar/baz for resource error: \n\ntest:\n rule-error: message error\n", + want: "\n\nresource foo/bar/baz was blocked due to the following policies \n\ntest:\n rule-error: message error\n", }, { name: "error and failure - enforce", args: args{ @@ -234,7 +234,7 @@ func TestGetBlockedMessages(t *testing.T) { }), }, }, - want: "\n\npolicy foo/bar/baz for resource violation: \n\ntest:\n rule-error: message error\n rule-fail: message fail\n", + want: "\n\nresource foo/bar/baz was blocked due to the following policies \n\ntest:\n rule-error: message error\n rule-fail: message fail\n", }} for _, tt := range tests { t.Run(tt.name, func(t *testing.T) {