fix: revert scanning all resources managed by Mozilla (#380)

datreeio · Jun 14, 2023 · 2df0027 · 2df0027
1 parent e46f154
commit 2df0027
Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/services/resourceFilterService_test.go b/pkg/services/resourceFilterService_test.go
@@ -148,11 +148,6 @@ func TestWhiteListFilters(t *testing.T) {
 			rootObject.Metadata.ManagedFields[0].Manager = "openshift-apiserver-some-postfix"
 			assert.Equal(t, true, ShouldResourceBeValidated(admissionReviewReq, rootObject))
 		})
-		t.Run("Mozilla", func(t *testing.T) {
-			admissionReviewReq, rootObject := extractAdmissionReviewReqAndRootObject(templateResource)
-			rootObject.Metadata.ManagedFields[0].Manager = "Mozilla"
-			assert.Equal(t, true, ShouldResourceBeValidated(admissionReviewReq, rootObject))
-		})
 	})
 	t.Run("resource should not be validated because it is not managed by openShift", func(t *testing.T) {
 		t.Run("oc-postfix", func(t *testing.T) {
@@ -170,6 +165,11 @@ func TestWhiteListFilters(t *testing.T) {
 			rootObject.Metadata.ManagedFields[0].Manager = "prefix-openshift-apiserver-some-postfix"
 			assert.Equal(t, false, ShouldResourceBeValidated(admissionReviewReq, rootObject))
 		})
+		t.Run("Mozilla should be skipped because we removed it", func(t *testing.T) {
+			admissionReviewReq, rootObject := extractAdmissionReviewReqAndRootObject(templateResource)
+			rootObject.Metadata.ManagedFields[0].Manager = "Mozilla"
+			assert.Equal(t, false, ShouldResourceBeValidated(admissionReviewReq, rootObject))
+		})
 		t.Run("Mozilla-postfix", func(t *testing.T) {
 			admissionReviewReq, rootObject := extractAdmissionReviewReqAndRootObject(templateResource)
 			rootObject.Metadata.ManagedFields[0].Manager = "Mozilla-postfix"

diff --git a/pkg/services/resourcesFilterService.go b/pkg/services/resourcesFilterService.go
@@ -200,5 +200,5 @@ func doesRegexMatchString(regex string, str string) bool {
 }
 
 func isOpenshiftResourceThatShouldBeEvaluated(managedFields []ManagedFields) bool {
-	return doesAtLeastOneFieldManagerStartWithOneOfThePrefixes(managedFields, []string{"openshift-controller-manager", "openshift-apiserver"}) || isAtLeastOneFieldManagerEqualToOneOfTheExpectedFieldManagers(managedFields, []string{"oc", "Mozilla"})
+	return doesAtLeastOneFieldManagerStartWithOneOfThePrefixes(managedFields, []string{"openshift-controller-manager", "openshift-apiserver"}) || isAtLeastOneFieldManagerEqualToOneOfTheExpectedFieldManagers(managedFields, []string{"oc"})
 }