update scope error handling

pluralsh · Jan 29, 2025 · 9d77951 · 9d77951
1 parent 269bdbc
commit 9d77951
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 22 deletions.
diff --git a/go/controller/internal/controller/bootstraptoken_controller.go b/go/controller/internal/controller/bootstraptoken_controller.go
@@ -63,7 +63,6 @@ func (in *BootstrapTokenReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 	scope, err := NewDefaultScope(ctx, in.Client, bootstrapToken)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(bootstrapToken.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/catalog_controller.go b/go/controller/internal/controller/catalog_controller.go
@@ -56,7 +56,6 @@ func (r *CatalogReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 
 	scope, err := NewDefaultScope(ctx, r.Client, catalog)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(catalog.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/generatedsecret_controller.go b/go/controller/internal/controller/generatedsecret_controller.go
@@ -47,7 +47,6 @@ type GeneratedSecretReconciler struct {
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 func (r *GeneratedSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
-	logger := log.FromContext(ctx)
 	generatedSecret := &v1alpha1.GeneratedSecret{}
 
 	if err := r.Get(ctx, req.NamespacedName, generatedSecret); err != nil {
@@ -59,7 +58,6 @@ func (r *GeneratedSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	utils.MarkCondition(generatedSecret.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
 	scope, err := NewDefaultScope(ctx, r.Client, generatedSecret)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(generatedSecret.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/gitrepository_controller.go b/go/controller/internal/controller/gitrepository_controller.go
@@ -62,7 +62,6 @@ func (r *GitRepositoryReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	utils.MarkCondition(repo.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
 	scope, err := NewDefaultScope(ctx, r.Client, repo)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(repo.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/globalservice_controller.go b/go/controller/internal/controller/globalservice_controller.go
@@ -74,7 +74,6 @@ func (r *GlobalServiceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	utils.MarkCondition(globalService.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
 	scope, err := NewDefaultScope(ctx, r.Client, globalService)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(globalService.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/helmrepository_controller.go b/go/controller/internal/controller/helmrepository_controller.go
@@ -62,7 +62,6 @@ func (in *HelmRepositoryReconciler) Reconcile(ctx context.Context, req reconcile
 
 	scope, err := NewDefaultScope(ctx, in.Client, helmRepository)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(helmRepository.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/managednamespace_controller.go b/go/controller/internal/controller/managednamespace_controller.go
@@ -73,7 +73,6 @@ func (r *ManagedNamespaceReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	scope, err := NewDefaultScope(ctx, r.Client, managedNamespace)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(managedNamespace.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/notificationrouter_controller.go b/go/controller/internal/controller/notificationrouter_controller.go
@@ -71,7 +71,6 @@ func (r *NotificationRouterReconciler) Reconcile(ctx context.Context, req ctrl.R
 	utils.MarkCondition(notificationRouter.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
 	scope, err := NewDefaultScope(ctx, r.Client, notificationRouter)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(notificationRouter.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/notificationsink_controller.go b/go/controller/internal/controller/notificationsink_controller.go
@@ -75,7 +75,6 @@ func (r *NotificationSinkReconciler) Reconcile(ctx context.Context, req ctrl.Req
 
 	scope, err := NewDefaultScope(ctx, r.Client, notificationSink)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(notificationSink.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/project_controller.go b/go/controller/internal/controller/project_controller.go
@@ -60,7 +60,6 @@ func (in *ProjectReconciler) Reconcile(ctx context.Context, req reconcile.Reques
 
 	scope, err := NewDefaultScope(ctx, in.Client, project)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(project.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/provider_controller.go b/go/controller/internal/controller/provider_controller.go
@@ -57,7 +57,6 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req reconcile.Reques
 	utils.MarkCondition(provider.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
 	scope, err := NewDefaultScope(ctx, r.Client, provider)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(provider.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/scmconnection_controller.go b/go/controller/internal/controller/scmconnection_controller.go
@@ -59,7 +59,6 @@ func (r *ScmConnectionReconciler) Reconcile(ctx context.Context, req reconcile.R
 
 	scope, err := NewDefaultScope(ctx, r.Client, scm)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(scm.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/scope.go b/go/controller/internal/controller/scope.go
@@ -2,10 +2,8 @@ package controller
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
-	"github.com/samber/lo"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -26,13 +24,9 @@ func (in *DefaultScope[T]) PatchObject() error {
 }
 
 func NewDefaultScope[T client.Object](ctx context.Context, client client.Client, object T) (Scope[T], error) {
-	if lo.IsNil(object) {
-		return nil, errors.New("object cannot be nil")
-	}
-
 	helper, err := patch.NewHelper(object, client)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create new helper, go error: %s", err)
+		return nil, fmt.Errorf("failed to create scope: %s", err)
 	}
 
 	return &DefaultScope[T]{

diff --git a/go/controller/internal/controller/service_account_controller.go b/go/controller/internal/controller/service_account_controller.go
@@ -52,7 +52,6 @@ func (r *ServiceAccountReconciler) Reconcile(ctx context.Context, req reconcile.
 	utils.MarkCondition(sa.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
 	scope, err := NewDefaultScope(ctx, r.Client, sa)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(sa.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}

diff --git a/go/controller/internal/controller/servicedeployment_controller.go b/go/controller/internal/controller/servicedeployment_controller.go
@@ -64,7 +64,6 @@ func (r *ServiceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 	utils.MarkCondition(service.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "")
 	scope, err := NewDefaultScope(ctx, r.Client, service)
 	if err != nil {
-		logger.Error(err, "failed to create scope")
 		utils.MarkCondition(service.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReasonError, err.Error())
 		return ctrl.Result{}, err
 	}