test: implemented tests for Events

Signed-off-by: Mateusz Urbanek <[email protected]>

Author: shanduur

Diff for: container-object-storage-interface-controller/pkg/bucketclaim/bucketclaim.go

@@ -126,7 +126,7 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
 		bucketName = bucketClaim.Spec.ExistingBucketName
 		bucket, err := b.buckets().Get(ctx, bucketName, metav1.GetOptions{})
 		if kubeerrors.IsNotFound(err) {
-			b.recordEvent(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, "Bucket %v provided in the BucketClaim does not exist.", bucketName)
+			b.recordEvent(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err.Error())
 			return err
 		} else if err != nil {
 			klog.V(3).ErrorS(err, "Get Bucket with ExistingBucketName error", "name", bucketClaim.Spec.ExistingBucketName)
@@ -161,8 +161,8 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
 
 		bucketClass, err := b.bucketClasses().Get(ctx, bucketClassName, metav1.GetOptions{})
 		if kubeerrors.IsNotFound(err) {
-			b.recordEvent(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, "BucketClass %v provided in the BucketClaim does not exist.", bucketClassName)
-			return util.ErrInvalidBucketClass
+			b.recordEvent(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err.Error())
+			return err
 		} else if err != nil {
 			klog.V(3).ErrorS(err, "Get Bucketclass Error", "name", bucketClassName)
 			return err

Diff for: container-object-storage-interface-controller/pkg/bucketclaim/bucketclaim_test.go

@@ -6,12 +6,13 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
+	kubeerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes/fake"
+	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/record"
-
+	"sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1"
 	types "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1"
-	bucketclientset "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned/fake"
+	fakebucketclientset "sigs.k8s.io/container-object-storage-interface-api/client/clientset/versioned/fake"
 	"sigs.k8s.io/container-object-storage-interface-api/controller/events"
 	"sigs.k8s.io/container-object-storage-interface-controller/pkg/util"
 )
@@ -81,64 +82,12 @@ func TestAddBRIdempotency(t *testing.T) {
 	runCreateBucketIdempotency(t, "addWithMultipleBR")
 }
 
-// Test recording events
-func TestRecordEvents(t *testing.T) {
-	t.Parallel()
-
-	ctx := context.TODO()
-
-	for _, tc := range []struct {
-		name          string
-		expectedEvent string
-		eventTrigger  func(context.Context, *BucketClaimListener)
-	}{
-		{
-			name: "",
-			expectedEvent: newEvent(
-				v1.EventTypeWarning,
-				events.FailedCreateBucket,
-				""),
-			eventTrigger: func(ctx context.Context, bcl *BucketClaimListener) {
-				panic("unimplemented")
-			},
-		},
-		{
-			name: "",
-			expectedEvent: newEvent(
-				v1.EventTypeWarning,
-				events.FailedCreateBucket,
-				""),
-			eventTrigger: func(ctx context.Context, bcl *BucketClaimListener) {
-				panic("unimplemented")
-			},
-		},
-	} {
-		tc := tc
-
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			recorder := record.NewFakeRecorder(1)
-
-			bcl := &BucketClaimListener{}
-			bcl.InitializeEventRecorder(recorder)
-
-			tc.eventTrigger(ctx, bcl)
-
-			event := <-recorder.Events
-			if event != tc.expectedEvent {
-				t.Errorf("Expected %s \n got %s", tc.expectedEvent, event)
-			}
-		})
-	}
-}
-
 func runCreateBucket(t *testing.T, name string) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	client := bucketclientset.NewSimpleClientset()
-	kubeClient := fake.NewSimpleClientset()
+	client := fakebucketclientset.NewSimpleClientset()
+	kubeClient := fakekubeclientset.NewSimpleClientset()
 	eventRecorder := record.NewFakeRecorder(3)
 
 	listener := NewBucketClaimListener()
@@ -182,8 +131,8 @@ func runCreateBucketWithMultipleBR(t *testing.T, name string) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	client := bucketclientset.NewSimpleClientset()
-	kubeClient := fake.NewSimpleClientset()
+	client := fakebucketclientset.NewSimpleClientset()
+	kubeClient := fakekubeclientset.NewSimpleClientset()
 	eventRecorder := record.NewFakeRecorder(3)
 
 	listener := NewBucketClaimListener()
@@ -238,8 +187,8 @@ func runCreateBucketIdempotency(t *testing.T, name string) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	client := bucketclientset.NewSimpleClientset()
-	kubeClient := fake.NewSimpleClientset()
+	client := fakebucketclientset.NewSimpleClientset()
+	kubeClient := fakekubeclientset.NewSimpleClientset()
 	eventRecorder := record.NewFakeRecorder(3)
 
 	listener := NewBucketClaimListener()
@@ -287,6 +236,92 @@ func runCreateBucketIdempotency(t *testing.T, name string) {
 	}
 }
 
+// Test recording events
+func TestRecordEvents(t *testing.T) {
+	t.Parallel()
+
+	defaultBucketClaim := &v1alpha1.BucketClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test-bucketClaim",
+			Namespace: "test-ns",
+		},
+		Spec: v1alpha1.BucketClaimSpec{
+			BucketClassName: "test-bucketClass",
+		},
+	}
+
+	for _, tc := range []struct {
+		name          string
+		expectedEvent string
+		eventTrigger  func(*testing.T, *BucketClaimListener)
+	}{
+		{
+			name: "ExistingBucketNotFound",
+			expectedEvent: newEvent(
+				v1.EventTypeWarning,
+				events.FailedCreateBucket,
+				"buckets.objectstorage.k8s.io \"existing-bucket\" not found"),
+			eventTrigger: func(t *testing.T, bcl *BucketClaimListener) {
+				ctx := context.TODO()
+
+				bucketClaim := defaultBucketClaim.DeepCopy()
+				bucketClaim.Spec.ExistingBucketName = "existing-bucket"
+
+				err := bcl.Add(ctx, bucketClaim)
+				if !kubeerrors.IsNotFound(err) {
+					t.Errorf("expected Not Found error got %v", err)
+				}
+			},
+		},
+		{
+			name: "BucketClassNotFound",
+			expectedEvent: newEvent(
+				v1.EventTypeWarning,
+				events.FailedCreateBucket,
+				"bucketclasses.objectstorage.k8s.io \"test-bucketClass\" not found"),
+			eventTrigger: func(t *testing.T, listener *BucketClaimListener) {
+				ctx := context.TODO()
+				bucketClaim := defaultBucketClaim.DeepCopy()
+
+				err := listener.Add(ctx, bucketClaim)
+				if !kubeerrors.IsNotFound(err) {
+					t.Errorf("expected Not Found error got %v", err)
+				}
+			},
+		},
+	} {
+		tc := tc
+
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			client := fakebucketclientset.NewSimpleClientset()
+			kubeClient := fakekubeclientset.NewSimpleClientset()
+			eventRecorder := record.NewFakeRecorder(1)
+
+			listener := NewBucketClaimListener()
+			listener.InitializeKubeClient(kubeClient)
+			listener.InitializeBucketClient(client)
+			listener.InitializeEventRecorder(eventRecorder)
+
+			tc.eventTrigger(t, listener)
+
+			select {
+			case event, ok := <-eventRecorder.Events:
+				if ok {
+					if event != tc.expectedEvent {
+						t.Errorf("Expected %s \n got %s", tc.expectedEvent, event)
+					}
+				} else {
+					t.Error("channel closed, no event")
+				}
+			default:
+				t.Errorf("no event after trigger")
+			}
+		})
+	}
+}
+
 func newEvent(eventType, reason, message string) string {
 	return fmt.Sprintf("%s %s %s", eventType, reason, message)
 }