ocm: added unit tests and increased policy coverage

This PR adds unit tests for list and validate for the policy resource in the OCM package.

Author: klaskosk

pkg/ocm/ocm_test.go

@@ -206,13 +206,14 @@ func (builder *PolicyBuilder) Update(force bool) (*PolicyBuilder, error) {
 	if err != nil {
 		if force {
 			glog.V(100).Infof(
-				msg.FailToUpdateNotification("policy", builder.Definition.Name))
+				msg.FailToUpdateNotification("policy", builder.Definition.Name, builder.Definition.Namespace))
 
 			builder, err := builder.Delete()
+			builder.Definition.ResourceVersion = ""
 
 			if err != nil {
 				glog.V(100).Infof(
-					msg.FailToUpdateError("policy", builder.Definition.Name))
+					msg.FailToUpdateError("policy", builder.Definition.Name, builder.Definition.Namespace))
 
 				return nil, err
 			}

pkg/ocm/policy.go

@@ -278,6 +278,11 @@ func TestPolicyUpdate(t *testing.T) {
 			assert.Nil(t, err)
 		}
 
+		// This causes an error while updating and allows us to test the code path for force updates.
+		if testCase.force {
+			testBuilder.Definition.ResourceVersion = testBuilder.Definition.Name
+		}
+
 		assert.NotNil(t, testBuilder.Definition)
 		assert.False(t, testBuilder.Definition.Spec.Disabled)
 
@@ -422,6 +427,82 @@ func TestPolicyWaitUntilComplianceState(t *testing.T) {
 	}
 }
 
+func TestPolicyValidate(t *testing.T) {
+	testCases := []struct {
+		builderNil      bool
+		definitionNil   bool
+		apiClientNil    bool
+		builderErrorMsg string
+		expectedError   error
+	}{
+		{
+			builderNil:      false,
+			definitionNil:   false,
+			apiClientNil:    false,
+			builderErrorMsg: "",
+			expectedError:   nil,
+		},
+		{
+			builderNil:      true,
+			definitionNil:   false,
+			apiClientNil:    false,
+			builderErrorMsg: "",
+			expectedError:   fmt.Errorf("error: received nil policy builder"),
+		},
+		{
+			builderNil:      false,
+			definitionNil:   true,
+			apiClientNil:    false,
+			builderErrorMsg: "",
+			expectedError:   fmt.Errorf("can not redefine the undefined policy"),
+		},
+		{
+			builderNil:      false,
+			definitionNil:   false,
+			apiClientNil:    true,
+			builderErrorMsg: "",
+			expectedError:   fmt.Errorf("policy builder cannot have nil apiClient"),
+		},
+		{
+			builderNil:      false,
+			definitionNil:   false,
+			apiClientNil:    false,
+			builderErrorMsg: "test error",
+			expectedError:   fmt.Errorf("test error"),
+		},
+	}
+
+	for _, testCase := range testCases {
+		policyBuilder := buildValidPolicyTestBuilder(clients.GetTestClients(clients.TestClientParams{}))
+
+		if testCase.builderNil {
+			policyBuilder = nil
+		}
+
+		if testCase.definitionNil {
+			policyBuilder.Definition = nil
+		}
+
+		if testCase.apiClientNil {
+			policyBuilder.apiClient = nil
+		}
+
+		if testCase.builderErrorMsg != "" {
+			policyBuilder.errorMsg = testCase.builderErrorMsg
+		}
+
+		valid, err := policyBuilder.validate()
+
+		if testCase.expectedError != nil {
+			assert.False(t, valid)
+			assert.Equal(t, testCase.expectedError, err)
+		} else {
+			assert.True(t, valid)
+			assert.Nil(t, err)
+		}
+	}
+}
+
 // buildDummyPolicy returns a Policy with the provided name and namespace.
 func buildDummyPolicy(name, nsname string) *policiesv1.Policy {
 	return &policiesv1.Policy{

pkg/ocm/policy_test.go

@@ -14,6 +14,12 @@ import (
 func ListPoliciesInAllNamespaces(apiClient *clients.Settings,
 	options ...runtimeclient.ListOptions) (
 	[]*PolicyBuilder, error) {
+	if apiClient == nil {
+		glog.V(100).Info("Policies 'apiClient' parameter cannot be nil")
+
+		return nil, fmt.Errorf("failed to list policies, 'apiClient' parameter is nil")
+	}
+
 	logMessage := string("Listing all policies in all namespaces")
 	passedOptions := runtimeclient.ListOptions{}
 

pkg/ocm/policylist.go

@@ -0,0 +1,71 @@
+package ocm
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/openshift-kni/eco-goinfra/pkg/clients"
+	"github.com/stretchr/testify/assert"
+	"k8s.io/apimachinery/pkg/labels"
+	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func TestListPoliciesInAllNamespaces(t *testing.T) {
+	testCases := []struct {
+		policies      []*PolicyBuilder
+		listOptions   []runtimeclient.ListOptions
+		expectedError error
+		client        bool
+	}{
+		{
+			policies: []*PolicyBuilder{
+				buildValidPolicyTestBuilder(buildTestClientWithDummyPolicy()),
+			},
+			listOptions:   nil,
+			expectedError: nil,
+			client:        true,
+		},
+		{
+			policies: []*PolicyBuilder{
+				buildValidPolicyTestBuilder(buildTestClientWithDummyPolicy()),
+			},
+			listOptions:   []runtimeclient.ListOptions{{LabelSelector: labels.NewSelector()}},
+			expectedError: nil,
+			client:        true,
+		},
+		{
+			policies: []*PolicyBuilder{
+				buildValidPolicyTestBuilder(buildTestClientWithDummyPolicy()),
+			},
+			listOptions: []runtimeclient.ListOptions{
+				{LabelSelector: labels.NewSelector()},
+				{LabelSelector: labels.NewSelector()},
+			},
+			expectedError: fmt.Errorf("error: more than one ListOptions was passed"),
+			client:        true,
+		},
+		{
+			policies: []*PolicyBuilder{
+				buildValidPolicyTestBuilder(buildTestClientWithDummyPolicy()),
+			},
+			listOptions:   []runtimeclient.ListOptions{{LabelSelector: labels.NewSelector()}},
+			expectedError: fmt.Errorf("failed to list policies, 'apiClient' parameter is nil"),
+			client:        false,
+		},
+	}
+
+	for _, testCase := range testCases {
+		var testSettings *clients.Settings
+
+		if testCase.client {
+			testSettings = buildTestClientWithDummyPolicy()
+		}
+
+		builders, err := ListPoliciesInAllNamespaces(testSettings, testCase.listOptions...)
+		assert.Equal(t, err, testCase.expectedError)
+
+		if testCase.expectedError == nil && len(testCase.listOptions) == 0 {
+			assert.Equal(t, len(testCase.policies), len(builders))
+		}
+	}
+}