chore(account): Clean up API key lookup func

clevyr · Apr 9, 2024 · 93d0d02 · 93d0d02
1 parent eb394c1
commit 93d0d02
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -16,6 +16,11 @@ issues:
       linters:
         - dupl
         - lll
+
+linters-settings:
+  gocyclo:
+    min-complexity: 35
+
 linters:
   disable-all: true
   enable:

diff --git a/internal/controller/account_controller.go b/internal/controller/account_controller.go
@@ -62,7 +62,7 @@ func (r *AccountReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	account, apiKey, err := GetApiKey(ctx, r.Client, req.Name)
+	apiKey, err := GetApiKey(ctx, r.Client, account)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -132,25 +132,20 @@ func GetAccount(ctx context.Context, c client.Client, account *uptimerobotv1.Acc
 	return nil
 }
 
-func GetApiKey(ctx context.Context, c client.Client, name string) (*uptimerobotv1.Account, string, error) {
-	account := &uptimerobotv1.Account{}
-	if err := GetAccount(ctx, c, account, name); err != nil {
-		return account, "", err
-	}
-
+func GetApiKey(ctx context.Context, c client.Client, account *uptimerobotv1.Account) (string, error) {
 	secret := &corev1.Secret{}
 	err := c.Get(ctx, client.ObjectKey{
 		Namespace: ClusterResourceNamespace,
 		Name:      account.Spec.ApiKeySecretRef.Name,
 	}, secret)
 	if err != nil {
-		return account, "", err
+		return "", err
 	}
 
 	apiKey, ok := secret.Data[account.Spec.ApiKeySecretRef.Key]
 	if !ok {
-		return account, "", fmt.Errorf("%w: %s", ErrKeyNotFound, account.Spec.ApiKeySecretRef.Key)
+		return "", fmt.Errorf("%w: %s", ErrKeyNotFound, account.Spec.ApiKeySecretRef.Key)
 	}
 
-	return account, string(apiKey), nil
+	return string(apiKey), nil
 }
diff --git a/internal/controller/contact_controller.go b/internal/controller/contact_controller.go
@@ -55,7 +55,12 @@ func (r *ContactReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	_, apiKey, err := GetApiKey(ctx, r.Client, contact.Spec.Account.Name)
+	account := &uptimerobotv1.Account{}
+	if err := GetAccount(ctx, r.Client, account, contact.Spec.Account.Name); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	apiKey, err := GetApiKey(ctx, r.Client, account)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

diff --git a/internal/controller/monitor_controller.go b/internal/controller/monitor_controller.go
@@ -64,7 +64,12 @@ func (r *MonitorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	_, apiKey, err := GetApiKey(ctx, r.Client, monitor.Spec.Account.Name)
+	account := &uptimerobotv1.Account{}
+	if err := GetAccount(ctx, r.Client, account, monitor.Spec.Account.Name); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	apiKey, err := GetApiKey(ctx, r.Client, account)
 	if err != nil {
 		return ctrl.Result{}, err
 	}