handling cyclomatic complexity for all controllers

linode · Sep 10, 2024 · 180534c · 180534c
1 parent 0ca521f
commit 180534c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/cloud/scope/object_storage_key.go b/cloud/scope/object_storage_key.go
@@ -170,11 +170,14 @@ func (s *ObjectStorageKeyScope) ShouldRotateKey() bool {
 
 // Override the controller credentials with ones from the Cluster's Secret reference (if supplied).
 func (s *ObjectStorageKeyScope) SetCredentialRefTokenForLinodeClients(ctx context.Context) error {
-	// TODO: This key is hard-coded (for now) to match the externally-managed `manager-credentials` Secret.
-	apiToken, err := getCredentialDataFromRef(ctx, s.Client, *s.Key.Spec.CredentialsRef, s.Key.GetNamespace(), "apiToken")
-	if err != nil {
-		return fmt.Errorf("credentials from secret ref: %w", err)
+	if s.Key.Spec.CredentialsRef != nil {
+		// TODO: This key is hard-coded (for now) to match the externally-managed `manager-credentials` Secret.
+		apiToken, err := getCredentialDataFromRef(ctx, s.Client, *s.Key.Spec.CredentialsRef, s.Key.GetNamespace(), "apiToken")
+		if err != nil {
+			return fmt.Errorf("credentials from secret ref: %w", err)
+		}
+		s.LinodeClient = s.LinodeClient.SetToken(string(apiToken))
+		return nil
 	}
-	s.LinodeClient = s.LinodeClient.SetToken(string(apiToken))
 	return nil
 }
diff --git a/cloud/scope/placement_group.go b/cloud/scope/placement_group.go
@@ -122,11 +122,14 @@ func NewPlacementGroupScope(ctx context.Context, linodeClientConfig ClientConfig
 }
 
 func (s *PlacementGroupScope) SetCredentialRefTokenForLinodeClients(ctx context.Context) error {
-	// TODO: This key is hard-coded (for now) to match the externally-managed `manager-credentials` Secret.
-	apiToken, err := getCredentialDataFromRef(ctx, s.Client, *s.LinodePlacementGroup.Spec.CredentialsRef, s.LinodePlacementGroup.GetNamespace(), "apiToken")
-	if err != nil {
-		return fmt.Errorf("credentials from secret ref: %w", err)
+	if s.LinodePlacementGroup.Spec.CredentialsRef != nil {
+		// TODO: This key is hard-coded (for now) to match the externally-managed `manager-credentials` Secret.
+		apiToken, err := getCredentialDataFromRef(ctx, s.Client, *s.LinodePlacementGroup.Spec.CredentialsRef, s.LinodePlacementGroup.GetNamespace(), "apiToken")
+		if err != nil {
+			return fmt.Errorf("credentials from secret ref: %w", err)
+		}
+		s.LinodeClient = s.LinodeClient.SetToken(string(apiToken))
+		return nil
 	}
-	s.LinodeClient = s.LinodeClient.SetToken(string(apiToken))
 	return nil
 }
diff --git a/cloud/scope/vpc.go b/cloud/scope/vpc.go
@@ -121,11 +121,14 @@ func (s *VPCScope) RemoveCredentialsRefFinalizer(ctx context.Context) error {
 }
 
 func (s *VPCScope) SetCredentialRefTokenForLinodeClients(ctx context.Context) error {
-	// TODO: This key is hard-coded (for now) to match the externally-managed `manager-credentials` Secret.
-	apiToken, err := getCredentialDataFromRef(ctx, s.Client, *s.LinodeVPC.Spec.CredentialsRef, s.LinodeVPC.GetNamespace(), "apiToken")
-	if err != nil {
-		return fmt.Errorf("credentials from secret ref: %w", err)
+	if s.LinodeVPC.Spec.CredentialsRef != nil {
+		// TODO: This key is hard-coded (for now) to match the externally-managed `manager-credentials` Secret.
+		apiToken, err := getCredentialDataFromRef(ctx, s.Client, *s.LinodeVPC.Spec.CredentialsRef, s.LinodeVPC.GetNamespace(), "apiToken")
+		if err != nil {
+			return fmt.Errorf("credentials from secret ref: %w", err)
+		}
+		s.LinodeClient = s.LinodeClient.SetToken(string(apiToken))
+		return nil
 	}
-	s.LinodeClient = s.LinodeClient.SetToken(string(apiToken))
 	return nil
 }
diff --git a/controller/linodeobjectstoragekey_controller.go b/controller/linodeobjectstoragekey_controller.go
@@ -132,11 +132,9 @@ func (r *LinodeObjectStorageKeyReconciler) reconcile(ctx context.Context, keySco
 	}
 
 	// Override the controller credentials with ones from the Key's Secret reference (if supplied).
-	if keyScope.Key.Spec.CredentialsRef != nil {
-		if err := keyScope.SetCredentialRefTokenForLinodeClients(ctx); err != nil {
-			keyScope.Logger.Error(err, "failed to update linode client token from Credential Ref")
-			return res, err
-		}
+	if err := keyScope.SetCredentialRefTokenForLinodeClients(ctx); err != nil {
+		keyScope.Logger.Error(err, "failed to update linode client token from Credential Ref")
+		return res, err
 	}
 
 	if err := r.reconcileApply(ctx, keyScope); err != nil {

diff --git a/controller/linodeplacementgroup_controller.go b/controller/linodeplacementgroup_controller.go
@@ -153,11 +153,9 @@ func (r *LinodePlacementGroupReconciler) reconcile(
 	}
 
 	// Override the controller credentials with ones from the Placement Groups's Secret reference (if supplied).
-	if pgScope.LinodePlacementGroup.Spec.CredentialsRef != nil {
-		if err := pgScope.SetCredentialRefTokenForLinodeClients(ctx); err != nil {
-			logger.Error(err, "failed to update linode client token from Credential Ref")
-			return res, err
-		}
+	if err := pgScope.SetCredentialRefTokenForLinodeClients(ctx); err != nil {
+		logger.Error(err, "failed to update linode client token from Credential Ref")
+		return res, err
 	}
 
 	// Update

diff --git a/controller/linodevpc_controller.go b/controller/linodevpc_controller.go
@@ -159,11 +159,9 @@ func (r *LinodeVPCReconciler) reconcile(
 	}
 
 	// Override the controller credentials with ones from the VPC's Secret reference (if supplied).
-	if vpcScope.LinodeVPC.Spec.CredentialsRef != nil {
-		if err := vpcScope.SetCredentialRefTokenForLinodeClients(ctx); err != nil {
-			logger.Error(err, "failed to update linode client token from Credential Ref")
-			return res, err
-		}
+	if err := vpcScope.SetCredentialRefTokenForLinodeClients(ctx); err != nil {
+		logger.Error(err, "failed to update linode client token from Credential Ref")
+		return res, err
 	}
 
 	// Update