Application: further simplify reconcile logic

Author: tkan145

controllers/capabilities/application_controller.go

@@ -54,12 +54,11 @@ const (
 // +kubebuilder:rbac:groups=capabilities.3scale.net,resources=applications/status,verbs=get;update;patch
 
 func (r *ApplicationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	_ = context.Background()
 	reqLogger := r.Logger().WithValues("application", req.NamespacedName)
 	reqLogger.Info("Reconcile Application", "Operator version", version.Version)
 
 	application := &capabilitiesv1beta1.Application{}
-	err := r.Client().Get(context.TODO(), req.NamespacedName, application)
+	err := r.Client().Get(ctx, req.NamespacedName, application)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			// Request object not found, could have been deleted after reconcile request.
@@ -119,17 +118,6 @@ func (r *ApplicationReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 				return statusResult, nil
 			}
 		}
-	}
-
-	// get providerAccountRef from account
-	providerAccount, err := controllerhelper.LookupProviderAccount(r.Client(), accountResource.Namespace, accountResource.Spec.ProviderAccountRef, r.Logger())
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-
-	insecureSkipVerify := controllerhelper.GetInsecureSkipVerifyAnnotation(application.GetAnnotations())
-	threescaleAPIClient, err := controllerhelper.PortaClient(providerAccount, insecureSkipVerify)
-	if err != nil {
 		return ctrl.Result{}, err
 	}
 
@@ -148,7 +136,7 @@ func (r *ApplicationReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, nil
 	}
 
-	statusReconciler, reconcileErr := r.applicationReconciler(application, req, threescaleAPIClient, providerAccount.AdminURLStr, accountResource)
+	statusReconciler, reconcileErr := r.applicationReconciler(application, accountResource)
 	statusResult, statusUpdateErr := statusReconciler.Reconcile()
 	if statusUpdateErr != nil {
 		if reconcileErr != nil {
@@ -220,12 +208,12 @@ func (r *ApplicationReconciler) reconcileMetadata(application *capabilitiesv1bet
 	return changed, nil
 }
 
-func (r *ApplicationReconciler) applicationReconciler(applicationResource *capabilitiesv1beta1.Application, req ctrl.Request, threescaleAPIClient *threescaleapi.ThreeScaleClient, providerAccountAdminURLStr string, accountResource *capabilitiesv1beta1.DeveloperAccount) (*ApplicationStatusReconciler, error) {
+func (r *ApplicationReconciler) applicationReconciler(applicationResource *capabilitiesv1beta1.Application, accountResource *capabilitiesv1beta1.DeveloperAccount) (*ApplicationStatusReconciler, error) {
 	// get product
 	productResource := &capabilitiesv1beta1.Product{}
 	projectMeta := types.NamespacedName{
 		Name:      applicationResource.Spec.ProductCR.Name,
-		Namespace: req.Namespace,
+		Namespace: applicationResource.Namespace,
 	}
 
 	err := r.Client().Get(r.Context(), projectMeta, productResource)
@@ -242,13 +230,27 @@ func (r *ApplicationReconciler) applicationReconciler(applicationResource *capab
 		return statusReconciler, err
 	}
 
+	// get providerAccountRef from account
+	providerAccount, err := controllerhelper.LookupProviderAccount(r.Client(), accountResource.Namespace, accountResource.Spec.ProviderAccountRef, r.Logger())
+	if err != nil {
+		statusReconciler := NewApplicationStatusReconciler(r.BaseReconciler, applicationResource, nil, "", err)
+		return statusReconciler, err
+	}
+
+	insecureSkipVerify := controllerhelper.GetInsecureSkipVerifyAnnotation(applicationResource.GetAnnotations())
+	threescaleAPIClient, err := controllerhelper.PortaClient(providerAccount, insecureSkipVerify)
+	if err != nil {
+		statusReconciler := NewApplicationStatusReconciler(r.BaseReconciler, applicationResource, nil, "", err)
+		return statusReconciler, err
+	}
+
 	reconciler := NewApplicationReconciler(r.BaseReconciler, applicationResource, *accountResource.Status.ID, *productResource.Status.ID, threescaleAPIClient)
-	ApplicationEntity, err := reconciler.Reconcile()
+	applicationEntity, err := reconciler.Reconcile()
 	if err != nil {
-		statusReconciler := NewApplicationStatusReconciler(r.BaseReconciler, applicationResource, nil, providerAccountAdminURLStr, err)
+		statusReconciler := NewApplicationStatusReconciler(r.BaseReconciler, applicationResource, nil, providerAccount.AdminURLStr, err)
 		return statusReconciler, err
 	}
-	statusReconciler := NewApplicationStatusReconciler(r.BaseReconciler, applicationResource, ApplicationEntity, providerAccountAdminURLStr, err)
+	statusReconciler := NewApplicationStatusReconciler(r.BaseReconciler, applicationResource, applicationEntity, providerAccount.AdminURLStr, err)
 	return statusReconciler, err
 }