From 3e68f6131bc5fa446313f9eb7e935dc537fda4ab Mon Sep 17 00:00:00 2001 From: Chunyi Lyu Date: Fri, 12 Mar 2021 15:29:09 +0000 Subject: [PATCH] Extract common error msgs from controllers --- controllers/binding_controller.go | 8 ++++---- controllers/common.go | 7 ++++++- controllers/exchange_controller.go | 8 ++++---- controllers/policy_controller.go | 8 ++++---- controllers/queue_controller.go | 8 ++++---- controllers/user_controller.go | 8 ++++---- controllers/vhost_controller.go | 8 ++++---- 7 files changed, 30 insertions(+), 25 deletions(-) diff --git a/controllers/binding_controller.go b/controllers/binding_controller.go index 38b063fa..548bb90e 100644 --- a/controllers/binding_controller.go +++ b/controllers/binding_controller.go @@ -48,13 +48,13 @@ func (r *BindingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct rabbitClient, err := rabbitholeClient(ctx, r.Client, binding.Spec.RabbitmqClusterReference) if err != nil { - logger.Error(err, "Failed to generate http rabbitClient") + logger.Error(err, failedGenerateRabbitClient) return reconcile.Result{}, err } spec, err := json.Marshal(binding.Spec) if err != nil { - logger.Error(err, "Failed to marshal binding spec") + logger.Error(err, failedMarshalSpec) } logger.Info("Start reconciling", @@ -66,7 +66,7 @@ func (r *BindingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, binding) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } return ctrl.Result{}, err } @@ -75,7 +75,7 @@ func (r *BindingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, binding) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } logger.Info("Finished reconciling") diff --git a/controllers/common.go b/controllers/common.go index e876e15f..e520c202 100644 --- a/controllers/common.go +++ b/controllers/common.go @@ -1,3 +1,8 @@ package controllers -const failedConditionsUpdateMsg = "Failed to update status conditions" +// common error messages shared across controllers +const ( + failedConditionsUpdate = "Failed to update status conditions" + failedMarshalSpec = "Failed to marshal spec" + failedGenerateRabbitClient = "Failed to generate http rabbitClient" +) diff --git a/controllers/exchange_controller.go b/controllers/exchange_controller.go index b983ec3b..38032371 100644 --- a/controllers/exchange_controller.go +++ b/controllers/exchange_controller.go @@ -52,7 +52,7 @@ func (r *ExchangeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c rabbitClient, err := rabbitholeClient(ctx, r.Client, exchange.Spec.RabbitmqClusterReference) if err != nil { - logger.Error(err, "Failed to generate http rabbitClient") + logger.Error(err, failedGenerateRabbitClient) return reconcile.Result{}, err } @@ -67,7 +67,7 @@ func (r *ExchangeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c spec, err := json.Marshal(exchange.Spec) if err != nil { - logger.Error(err, "Failed to marshal exchange spec") + logger.Error(err, failedMarshalSpec) } logger.Info("Start reconciling", @@ -79,7 +79,7 @@ func (r *ExchangeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, exchange) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } return ctrl.Result{}, err } @@ -88,7 +88,7 @@ func (r *ExchangeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, exchange) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } logger.Info("Finished reconciling") diff --git a/controllers/policy_controller.go b/controllers/policy_controller.go index 9b8cf334..7857c5e6 100644 --- a/controllers/policy_controller.go +++ b/controllers/policy_controller.go @@ -53,7 +53,7 @@ func (r *PolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr rabbitClient, err := rabbitholeClient(ctx, r.Client, policy.Spec.RabbitmqClusterReference) if err != nil { - logger.Error(err, "Failed to generate http rabbit client") + logger.Error(err, failedGenerateRabbitClient) } if !policy.ObjectMeta.DeletionTimestamp.IsZero() { @@ -67,7 +67,7 @@ func (r *PolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr spec, err := json.Marshal(policy.Spec) if err != nil { - logger.Error(err, "Failed to marshal policy spec") + logger.Error(err, failedMarshalSpec) } logger.Info("Start reconciling", @@ -79,7 +79,7 @@ func (r *PolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, policy) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } return ctrl.Result{}, err } @@ -88,7 +88,7 @@ func (r *PolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, policy) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } logger.Info("Finished reconciling") diff --git a/controllers/queue_controller.go b/controllers/queue_controller.go index 8b95398c..c10e4cc2 100644 --- a/controllers/queue_controller.go +++ b/controllers/queue_controller.go @@ -57,7 +57,7 @@ func (r *QueueReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl // create rabbitmq http rabbitClient rabbitClient, err := rabbitholeClient(ctx, r.Client, q.Spec.RabbitmqClusterReference) if err != nil { - logger.Error(err, "Failed to generate http rabbitClient") + logger.Error(err, failedGenerateRabbitClient) return reconcile.Result{}, err } @@ -73,7 +73,7 @@ func (r *QueueReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl queueSpec, err := json.Marshal(q.Spec) if err != nil { - logger.Error(err, "Failed to marshal q spec") + logger.Error(err, failedMarshalSpec) } logger.Info("Start reconciling", @@ -85,7 +85,7 @@ func (r *QueueReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, q) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } return ctrl.Result{}, err } @@ -94,7 +94,7 @@ func (r *QueueReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, q) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } logger.Info("Finished reconciling") diff --git a/controllers/user_controller.go b/controllers/user_controller.go index 2c582a11..4e43d392 100644 --- a/controllers/user_controller.go +++ b/controllers/user_controller.go @@ -61,7 +61,7 @@ func (r *UserReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl. rabbitClient, err := rabbitholeClient(ctx, r.Client, user.Spec.RabbitmqClusterReference) if err != nil { - logger.Error(err, "Failed to generate http rabbitClient") + logger.Error(err, failedGenerateRabbitClient) return reconcile.Result{}, err } @@ -77,7 +77,7 @@ func (r *UserReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl. spec, err := json.Marshal(user.Spec) if err != nil { - logger.Error(err, "Failed to marshal binding spec") + logger.Error(err, failedMarshalSpec) } logger.Info("Start reconciling", @@ -100,7 +100,7 @@ func (r *UserReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl. if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, user) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } return ctrl.Result{}, err } @@ -109,7 +109,7 @@ func (r *UserReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl. if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, user) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } logger.Info("Finished reconciling") diff --git a/controllers/vhost_controller.go b/controllers/vhost_controller.go index 73dc87d0..9abe4d2e 100644 --- a/controllers/vhost_controller.go +++ b/controllers/vhost_controller.go @@ -43,7 +43,7 @@ func (r *VhostReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl rabbitClient, err := rabbitholeClient(ctx, r.Client, vhost.Spec.RabbitmqClusterReference) if err != nil { - logger.Error(err, "Failed to generate http rabbitClient") + logger.Error(err, failedGenerateRabbitClient) return reconcile.Result{}, err } @@ -59,7 +59,7 @@ func (r *VhostReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl spec, err := json.Marshal(vhost.Spec) if err != nil { - logger.Error(err, "Failed to marshal vhost spec") + logger.Error(err, failedMarshalSpec) } logger.Info("Start reconciling", @@ -71,7 +71,7 @@ func (r *VhostReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, vhost) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } return ctrl.Result{}, err } @@ -80,7 +80,7 @@ func (r *VhostReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl if writerErr := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error { return r.Status().Update(ctx, vhost) }); writerErr != nil { - logger.Error(writerErr, failedConditionsUpdateMsg) + logger.Error(writerErr, failedConditionsUpdate) } logger.Info("Finished reconciling")