Handle success conditions

Author: hazim1093

controllers/channel_controller.go

@@ -59,10 +59,10 @@ func (r *ChannelReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 			// Request object not found, could have been deleted after reconcile request.
 			// Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
 			// Return and don't requeue
-			return ctrl.Result{}, nil
+			return reconcilerUtil.DoNotRequeue()
 		}
 		// Error reading channel, requeue
-		return ctrl.Result{}, err
+		return reconcilerUtil.RequeueWithError(err)
 	}
 
 	isChannelMarkedToBeDeleted := channel.GetDeletionTimestamp() != nil
@@ -104,7 +104,7 @@ func (r *ChannelReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		err = r.Status().Update(ctx, channel)
 		if err != nil {
 			log.Error(err, "Failed to update Channel status")
-			return ctrl.Result{}, err
+			return reconcilerUtil.ManageError(r.Client, channel, err, true)
 		}
 		return r.updateSlackChannel(ctx, channel)
 	}
@@ -147,7 +147,7 @@ func (r *ChannelReconciler) updateSlackChannel(ctx context.Context, channel *sla
 		return reconcilerUtil.ManageError(r.Client, channel, err, false)
 	}
 
-	return ctrl.Result{}, nil
+	return reconcilerUtil.ManageSuccess(r.Client, channel)
 }
 
 func (r *ChannelReconciler) finalizeChannel(req ctrl.Request, channel *slackv1alpha1.Channel) (ctrl.Result, error) {

controllers/channel_controller_test.go

@@ -29,8 +29,9 @@ var _ = Describe("ChannelController", func() {
 				_ = util.CreateChannel(channelName, false, "", "", []string{}, ns)
 				channel := util.GetChannel(channelName, ns)
 
-				Expect(channel.Status.Conditions).To(BeNil())
 				Expect(channel.Status.ID).To(Equal(slackMock.PublicConversationID))
+				Expect(len(channel.Status.Conditions)).To(Equal(1))
+				Expect(channel.Status.Conditions[0].Reason).To(Equal(status.ConditionReason("Successful")))
 			})
 
 			It("should set error condition if channel with same name already exists", func() {
@@ -49,8 +50,9 @@ var _ = Describe("ChannelController", func() {
 				_ = util.CreateChannel(channelName, true, "", "", []string{}, ns)
 				channel := util.GetChannel(channelName, ns)
 
-				Expect(channel.Status.Conditions).To(BeNil())
 				Expect(channel.Status.ID).To(Equal(slackMock.PrivateConversationID))
+				Expect(len(channel.Status.Conditions)).To(Equal(1))
+				Expect(channel.Status.Conditions[0].Reason).To(Equal(status.ConditionReason("Successful")))
 			})
 		})
 
@@ -61,8 +63,9 @@ var _ = Describe("ChannelController", func() {
 				_ = util.CreateChannel(channelName, true, "", description, []string{}, ns)
 				channel := util.GetChannel(channelName, ns)
 
-				Expect(channel.Status.Conditions).To(BeNil())
 				Expect(channel.Spec.Description).To(Equal(description))
+				Expect(len(channel.Status.Conditions)).To(Equal(1))
+				Expect(channel.Status.Conditions[0].Reason).To(Equal(status.ConditionReason("Successful")))
 			})
 		})
 
@@ -73,18 +76,20 @@ var _ = Describe("ChannelController", func() {
 				_ = util.CreateChannel(channelName, true, topic, "", []string{}, ns)
 				channel := util.GetChannel(channelName, ns)
 
-				Expect(channel.Status.Conditions).To(BeNil())
 				Expect(channel.Spec.Topic).To(Equal(topic))
+				Expect(len(channel.Status.Conditions)).To(Equal(1))
+				Expect(channel.Status.Conditions[0].Reason).To(Equal(status.ConditionReason("Successful")))
 			})
 		})
 
 		Context("With user emails", func() {
-			It("should not set error condition when user exists", func() {
+			It("should set success condition when user exists", func() {
 
 				_ = util.CreateChannel(channelName, true, "", "", []string{mock.ExistingUserEmail}, ns)
 				channel := util.GetChannel(channelName, ns)
 
-				Expect(channel.Status.Conditions).To(BeNil())
+				Expect(len(channel.Status.Conditions)).To(Equal(1))
+				Expect(channel.Status.Conditions[0].Reason).To(Equal(status.ConditionReason("Successful")))
 			})
 
 			It("should set error condition when user does not exists", func() {
@@ -121,8 +126,10 @@ var _ = Describe("ChannelController", func() {
 
 				updatedChannel := util.GetChannel(channelName, ns)
 
-				Expect(channel.Status.Conditions).To(BeNil())
 				Expect(updatedChannel.Spec.Name).To(Equal(newName))
+
+				Expect(len(channel.Status.Conditions)).To(Equal(1))
+				Expect(channel.Status.Conditions[0].Reason).To(Equal(status.ConditionReason("Successful")))
 			})
 		})
 	})
@@ -133,8 +140,9 @@ var _ = Describe("ChannelController", func() {
 				_ = util.CreateChannel(channelName, false, "", "", []string{}, ns)
 				channel := util.GetChannel(channelName, ns)
 
-				Expect(channel.Status.Conditions).To(BeNil())
 				Expect(channel.Status.ID).ToNot(BeEmpty())
+				Expect(len(channel.Status.Conditions)).To(Equal(1))
+				Expect(channel.Status.Conditions[0].Reason).To(Equal(status.ConditionReason("Successful")))
 
 				util.DeleteChannel(channelName, ns)