ocm: added unit tests and increased policy set coverage

This PR adds unit tests for list and validate for the policy set resource in the OCM package. It also removes policiesv1beta1 from the clients package.

Author: klaskosk

pkg/clients/clients.go

@@ -116,7 +116,6 @@ import (
 	veleroFakeClient "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/fake"
 	veleroV1Client "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned/typed/velero/v1"
 	dynamicFake "k8s.io/client-go/dynamic/fake"
-	policiesv1beta1 "open-cluster-management.io/governance-policy-propagator/api/v1beta1"
 )
 
 // Settings provides the struct to talk with relevant API.
@@ -355,10 +354,6 @@ func SetScheme(crScheme *runtime.Scheme) error {
 		return err
 	}
 
-	if err := policiesv1beta1.AddToScheme(crScheme); err != nil {
-		return err
-	}
-
 	if err := routev1.AddToScheme(crScheme); err != nil {
 		return err
 	}
@@ -523,8 +518,6 @@ func GetTestClients(tcp TestClientParams) *Settings {
 			genericClientObjects = append(genericClientObjects, v)
 		case *routev1.Route:
 			genericClientObjects = append(genericClientObjects, v)
-		case *policiesv1beta1.PolicySet:
-			genericClientObjects = append(genericClientObjects, v)
 		case *configV1.Node:
 			genericClientObjects = append(genericClientObjects, v)
 		case *operatorv1.IngressController:

pkg/ocm/policyset.go

@@ -21,7 +21,7 @@ type PolicySetBuilder struct {
 	// created policySet object.
 	Object *policiesv1beta1.PolicySet
 	// api client to interact with the cluster.
-	apiClient *clients.Settings
+	apiClient runtimeclient.Client
 	// used to store latest error message upon defining or mutating policySet definition.
 	errorMsg string
 }
@@ -33,8 +33,21 @@ func NewPolicySetBuilder(
 		"Initializing new policy set structure with the following params: name: %s, nsname: %s, policy: %v",
 		name, nsname, policy)
 
+	if apiClient == nil {
+		glog.V(100).Infof("The apiClient is nil")
+
+		return nil
+	}
+
+	err := apiClient.AttachScheme(policiesv1beta1.AddToScheme)
+	if err != nil {
+		glog.V(100).Info("Failed to add PolicySet scheme to client schemes")
+
+		return nil
+	}
+
 	builder := PolicySetBuilder{
-		apiClient: apiClient,
+		apiClient: apiClient.Client,
 		Definition: &policiesv1beta1.PolicySet{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      name,
@@ -72,13 +85,20 @@ func PullPolicySet(apiClient *clients.Settings, name, nsname string) (*PolicySet
 	glog.V(100).Infof("Pulling existing policySet name %s under namespace %s from cluster", name, nsname)
 
 	if apiClient == nil {
-		glog.V(100).Infof("The apiClient is empty")
+		glog.V(100).Infof("The apiClient is nil")
+
+		return nil, fmt.Errorf("policyset's 'apiClient' cannot be nil")
+	}
+
+	err := apiClient.AttachScheme(policiesv1beta1.AddToScheme)
+	if err != nil {
+		glog.V(100).Info("Failed to add PolicySet scheme to client schemes")
 
-		return nil, fmt.Errorf("policyset's 'apiClient' cannot be empty")
+		return nil, err
 	}
 
 	builder := PolicySetBuilder{
-		apiClient: apiClient,
+		apiClient: apiClient.Client,
 		Definition: &policiesv1beta1.PolicySet{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      name,
@@ -196,21 +216,30 @@ func (builder *PolicySetBuilder) Update(force bool) (*PolicySetBuilder, error) {
 		return builder, err
 	}
 
+	if !builder.Exists() {
+		glog.V(100).Infof(
+			"PolicySet %s does not exist in namespace %s", builder.Definition.Name, builder.Definition.Namespace)
+
+		return nil, fmt.Errorf("cannot update non-existent policySet")
+	}
+
 	glog.V(100).Infof("Updating the policySet object: %s in namespace: %s",
 		builder.Definition.Name, builder.Definition.Namespace)
 
+	builder.Definition.ResourceVersion = builder.Object.ResourceVersion
 	err := builder.apiClient.Update(context.TODO(), builder.Definition)
 
 	if err != nil {
 		if force {
 			glog.V(100).Infof(
-				msg.FailToUpdateNotification("policySet", builder.Definition.Name))
+				msg.FailToUpdateNotification("policySet", builder.Definition.Name, builder.Definition.Namespace))
 
 			builder, err := builder.Delete()
+			builder.Definition.ResourceVersion = ""
 
 			if err != nil {
 				glog.V(100).Infof(
-					msg.FailToUpdateError("policySet", builder.Definition.Name))
+					msg.FailToUpdateError("policySet", builder.Definition.Name, builder.Definition.Namespace))
 
 				return nil, err
 			}
@@ -219,9 +248,7 @@ func (builder *PolicySetBuilder) Update(force bool) (*PolicySetBuilder, error) {
 		}
 	}
 
-	if err == nil {
-		builder.Object = builder.Definition
-	}
+	builder.Object = builder.Definition
 
 	return builder, err
 }