From 180534cd7229bdbf8e4d3bea4cc1f09c818cb70d Mon Sep 17 00:00:00 2001 From: unnatiagg Date: Tue, 10 Sep 2024 10:44:30 -0400 Subject: [PATCH] handling cyclomatic complexity for all controllers --- cloud/scope/object_storage_key.go | 13 ++++++++----- cloud/scope/placement_group.go | 13 ++++++++----- cloud/scope/vpc.go | 13 ++++++++----- controller/linodeobjectstoragekey_controller.go | 8 +++----- controller/linodeplacementgroup_controller.go | 8 +++----- controller/linodevpc_controller.go | 8 +++----- 6 files changed, 33 insertions(+), 30 deletions(-) diff --git a/cloud/scope/object_storage_key.go b/cloud/scope/object_storage_key.go index e9642e2b..1d0e7dbb 100644 --- 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 index 299d4697..4c62cfdd 100644 --- 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 index 65acb9b4..c25df574 100644 --- 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 index 2e9beaf4..93df76d0 100644 --- 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 index 427763c4..fe4c02a3 100644 --- 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 index 3a69bce5..619b4076 100644 --- 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