fixup! refactor: client.go file helper methods

nutanix-cloud-native · Jan 25, 2024 · d8b6f45 · d8b6f45
1 parent bac3fb4
commit d8b6f45
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/api/v1beta1/nutanixcluster_types.go b/api/v1beta1/nutanixcluster_types.go
@@ -147,7 +147,7 @@ func (ncl *NutanixCluster) SetConditions(conditions capiv1.Conditions) {
 	ncl.Status.Conditions = conditions
 }
 
-func (ncl *NutanixCluster) GetCredentialRefForCluster() (*credentialTypes.NutanixCredentialReference, error) {
+func (ncl *NutanixCluster) GetPrismCentralCredentialRef() (*credentialTypes.NutanixCredentialReference, error) {
 	prismCentralInfo := ncl.Spec.PrismCentral
 	if prismCentralInfo == nil {
 		return nil, nil

diff --git a/api/v1beta1/nutanixcluster_types_test.go b/api/v1beta1/nutanixcluster_types_test.go
@@ -106,7 +106,7 @@ func TestGetCredentialRefForCluster(t *testing.T) {
 		tt := tt // Capture range variable.
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			ref, err := tt.nutanixCluster.GetCredentialRefForCluster()
+			ref, err := tt.nutanixCluster.GetPrismCentralCredentialRef()
 			assert.Equal(t, tt.expectedCredentialsRef, ref)
 			assert.Equal(t, tt.expectedErr, err)
 		})

diff --git a/controllers/nutanixcluster_controller.go b/controllers/nutanixcluster_controller.go
@@ -331,7 +331,7 @@ func (r *NutanixClusterReconciler) reconcileCategoriesDelete(rctx *nctx.ClusterC
 
 func (r *NutanixClusterReconciler) reconcileCredentialRefDelete(ctx context.Context, nutanixCluster *infrav1.NutanixCluster) error {
 	log := ctrl.LoggerFrom(ctx)
-	credentialRef, err := mustGetCredentialRefForCluster(nutanixCluster)
+	credentialRef, err := getPrismCentralCredentialRefForCluster(nutanixCluster)
 	if err != nil {
 		log.Error(err, fmt.Sprintf("error occurred while getting credential ref for cluster %s", nutanixCluster.Name))
 		return err
@@ -372,7 +372,7 @@ func (r *NutanixClusterReconciler) reconcileCredentialRefDelete(ctx context.Cont
 
 func (r *NutanixClusterReconciler) reconcileCredentialRef(ctx context.Context, nutanixCluster *infrav1.NutanixCluster) error {
 	log := ctrl.LoggerFrom(ctx)
-	credentialRef, err := mustGetCredentialRefForCluster(nutanixCluster)
+	credentialRef, err := getPrismCentralCredentialRefForCluster(nutanixCluster)
 	if err != nil {
 		return err
 	}
@@ -419,9 +419,11 @@ func (r *NutanixClusterReconciler) reconcileCredentialRef(ctx context.Context, n
 	return nil
 }
 
-func mustGetCredentialRefForCluster(nutanixCluster *infrav1.NutanixCluster) (*credentialTypes.NutanixCredentialReference, error) {
+// getPrismCentralCredentialRefForCluster calls nutanixCluster.GetPrismCentralCredentialRef() function
+// and returns an error if nutanixCluster is nil
+func getPrismCentralCredentialRefForCluster(nutanixCluster *infrav1.NutanixCluster) (*credentialTypes.NutanixCredentialReference, error) {
 	if nutanixCluster == nil {
 		return nil, fmt.Errorf("cannot get credential reference if nutanix cluster object is nil")
 	}
-	return nutanixCluster.GetCredentialRefForCluster()
+	return nutanixCluster.GetPrismCentralCredentialRef()
 }
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -145,7 +145,7 @@ func (n *NutanixClientHelper) buildProviderFromNutanixCluster(nutanixCluster *in
 	if prismCentralInfo.Port == 0 {
 		return nil, ErrPrismPortNotSet
 	}
-	credentialRef, err := nutanixCluster.GetCredentialRefForCluster()
+	credentialRef, err := nutanixCluster.GetPrismCentralCredentialRef()
 	if err != nil {
 		//nolint:wrapcheck // error is already wrapped
 		return nil, err