fix: added events to each error

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

Author: shanduur

Diff for: pkg/bucketclaim/bucketclaim.go

@@ -84,7 +84,7 @@ func (b *BucketClaimListener) Update(ctx context.Context, old, new *v1alpha1.Buc
 				klog.V(3).ErrorS(err, "Error deleting bucket",
 					"bucket", bucketName,
 					"bucketClaim", bucketClaim.ObjectMeta.Name)
-				return err
+				return b.recordError(bucketClaim, v1.EventTypeWarning, events.FailedDeleteBucket, err)
 			}
 
 			klog.V(5).Infof("Successfully deleted bucket: %s from bucketClaim: %s", bucketName, bucketClaim.ObjectMeta.Name)
@@ -126,11 +126,10 @@ 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, err.Error())
-			return err
+			return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 		} else if err != nil {
 			klog.V(3).ErrorS(err, "Get Bucket with ExistingBucketName error", "name", bucketClaim.Spec.ExistingBucketName)
-			return err
+			return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 		}
 
 		bucket.Spec.BucketClaim = &v1.ObjectReference{
@@ -148,24 +147,23 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
 			klog.V(3).ErrorS(err, "Error updating existing bucket",
 				"bucket", bucket.ObjectMeta.Name,
 				"bucketClaim", bucketClaim.ObjectMeta.Name)
-			return err
+			return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 		}
 
 		bucketClaim.Status.BucketName = bucketName
 		bucketClaim.Status.BucketReady = true
 	} else {
 		bucketClassName := bucketClaim.Spec.BucketClassName
 		if bucketClassName == "" {
-			return util.ErrInvalidBucketClass
+			return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, util.ErrInvalidBucketClass)
 		}
 
 		bucketClass, err := b.bucketClasses().Get(ctx, bucketClassName, metav1.GetOptions{})
 		if kubeerrors.IsNotFound(err) {
-			b.recordEvent(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err.Error())
-			return err
+			return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 		} else if err != nil {
 			klog.V(3).ErrorS(err, "Get Bucketclass Error", "name", bucketClassName)
-			return err
+			return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 		}
 
 		bucketName = bucketClassName + string(bucketClaim.ObjectMeta.UID)
@@ -194,7 +192,7 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
 			klog.V(3).ErrorS(err, "Error creationg bucket",
 				"bucket", bucketName,
 				"bucketClaim", bucketClaim.ObjectMeta.Name)
-			return err
+			return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 		}
 
 		bucketClaim.Status.BucketName = bucketName
@@ -206,7 +204,7 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
 	bucketClaim, err = b.bucketClaims(bucketClaim.ObjectMeta.Namespace).UpdateStatus(ctx, bucketClaim, metav1.UpdateOptions{})
 	if err != nil {
 		klog.V(3).ErrorS(err, "Failed to update status of BucketClaim", "name", bucketClaim.ObjectMeta.Name)
-		return err
+		return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 	}
 
 	// Add the finalizers so that bucketClaim is deleted
@@ -215,7 +213,7 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
 	_, err = b.bucketClaims(bucketClaim.ObjectMeta.Namespace).Update(ctx, bucketClaim, metav1.UpdateOptions{})
 	if err != nil {
 		klog.V(3).ErrorS(err, "Failed to add finalizer BucketClaim", "name", bucketClaim.ObjectMeta.Name)
-		return err
+		return b.recordError(inputBucketClaim, v1.EventTypeWarning, events.FailedCreateBucket, err)
 	}
 
 	klog.V(3).Infof("Finished creating Bucket %v", bucketName)
@@ -258,6 +256,16 @@ func (b *BucketClaimListener) bucketClaims(namespace string) objectstoragev1alph
 	panic("uninitialized listener")
 }
 
+// recordError during the processing of the objects
+func (b *BucketClaimListener) recordError(subject runtime.Object, eventtype, reason string, err error) error {
+	if b.eventRecorder == nil {
+		return err
+	}
+	b.eventRecorder.Event(subject, eventtype, reason, err.Error())
+
+	return err
+}
+
 // recordEvent during the processing of the objects
 func (b *BucketClaimListener) recordEvent(subject runtime.Object, eventtype, reason, message string, args ...any) {
 	if b.eventRecorder == nil {

Diff for: pkg/bucketclaim/bucketclaim_test.go

@@ -69,20 +69,20 @@ var bucketClaim2 = types.BucketClaim{
 
 // Test basic add functionality
 func TestAddBR(t *testing.T) {
-	runCreateBucket(t, "add")
+	runCreateBucket(t)
 }
 
 // Test add with multipleBRs
 func TestAddWithMultipleBR(t *testing.T) {
-	runCreateBucketWithMultipleBR(t, "addWithMultipleBR")
+	runCreateBucketWithMultipleBR(t)
 }
 
 // Test add idempotency
 func TestAddBRIdempotency(t *testing.T) {
-	runCreateBucketIdempotency(t, "addWithMultipleBR")
+	runCreateBucketIdempotency(t)
 }
 
-func runCreateBucket(t *testing.T, name string) {
+func runCreateBucket(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -127,7 +127,7 @@ func runCreateBucket(t *testing.T, name string) {
 	}
 }
 
-func runCreateBucketWithMultipleBR(t *testing.T, name string) {
+func runCreateBucketWithMultipleBR(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -183,7 +183,7 @@ func runCreateBucketWithMultipleBR(t *testing.T, name string) {
 	}
 }
 
-func runCreateBucketIdempotency(t *testing.T, name string) {
+func runCreateBucketIdempotency(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()