From d8a4c709f8081b28b3311fc4f1039d9b54097e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?= Date: Wed, 11 May 2022 09:42:11 +0200 Subject: [PATCH] chore: enable containedctx linter (#3873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Charles-Edouard Brétéché Co-authored-by: shuting --- .golangci.yml | 1 + pkg/engine/utils.go | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index db17fa2d7e..b7fec9d549 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,6 +3,7 @@ linters: - asciicheck - bidichk - bodyclose + - containedctx - deadcode - durationcheck - errcheck diff --git a/pkg/engine/utils.go b/pkg/engine/utils.go index 83e210f179..dc3f54e859 100644 --- a/pkg/engine/utils.go +++ b/pkg/engine/utils.go @@ -199,14 +199,12 @@ func doesResourceMatchConditionBlock(conditionBlock kyverno.ResourceDescription, keys := append(admissionInfo.AdmissionUserInfo.Groups, admissionInfo.AdmissionUserInfo.Username) var userInfoErrors []error if len(userInfo.Roles) > 0 && !utils.SliceContains(keys, dynamicConfig...) { - if !utils.SliceContains(userInfo.Roles, admissionInfo.Roles...) { userInfoErrors = append(userInfoErrors, fmt.Errorf("user info does not match roles for the given conditionBlock")) } } if len(userInfo.ClusterRoles) > 0 && !utils.SliceContains(keys, dynamicConfig...) { - if !utils.SliceContains(userInfo.ClusterRoles, admissionInfo.ClusterRoles...) { userInfoErrors = append(userInfoErrors, fmt.Errorf("user info does not match clustersRoles for the given conditionBlock")) }