Move GetAccountID function to utils package

cloud/scope/machine.go

@@ -37,6 +37,7 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 
 	infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
+	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/vpc"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/endpoints"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/options"
@@ -430,13 +431,17 @@ func fetchImageID(image *infrav1beta2.IBMVPCResourceReference, m *MachineScope)
 }
 
 // SetProviderID will set the provider id for the machine.
-func (m *MachineScope) SetProviderID(id *string) {
+func (m *MachineScope) SetProviderID(id *string) error {
 	// Based on the ProviderIDFormat version the providerID format will be decided.
 	if options.ProviderIDFormatType(options.ProviderIDFormat) == options.ProviderIDFormatV2 {
-		if id != nil {
-			m.IBMVPCMachine.Spec.ProviderID = pointer.String(fmt.Sprintf("ibm://%s///%s/%s", m.IBMVPCClient.GetAccountID(), m.Machine.Spec.ClusterName, *id))
+		accountID, err := utils.GetAccountID()
+		if err != nil {
+			m.Logger.Error(err, "failed to get cloud account id", err.Error())
+			return err
 		}
-		return
+		m.IBMVPCMachine.Spec.ProviderID = pointer.String(fmt.Sprintf("ibm://%s///%s/%s", accountID, m.Machine.Spec.ClusterName, *id))
+	} else {
+		m.IBMVPCMachine.Spec.ProviderID = pointer.String(fmt.Sprintf("ibmvpc://%s/%s", m.Machine.Spec.ClusterName, m.IBMVPCMachine.Name))
 	}
-	m.IBMVPCMachine.Spec.ProviderID = pointer.String(fmt.Sprintf("ibmvpc://%s/%s", m.Machine.Spec.ClusterName, m.IBMVPCMachine.Name))
+	return nil
 }

controllers/ibmvpcmachine_controller.go

@@ -167,7 +167,9 @@ func (r *IBMVPCMachineReconciler) reconcileNormal(machineScope *scope.MachineSco
 			},
 		}
 		_, ok := machineScope.IBMVPCMachine.Labels[capiv1beta1.MachineControlPlaneLabelName]
-		machineScope.SetProviderID(instance.ID)
+		if err = machineScope.SetProviderID(instance.ID); err != nil {
+			return ctrl.Result{}, errors.Wrapf(err, "failed to set provider id IBMVPCMachine %s/%s", machineScope.IBMVPCMachine.Namespace, machineScope.IBMVPCMachine.Name)
+		}
 		if ok {
 			if machineScope.IBMVPCCluster.Spec.ControlPlaneLoadBalancer == nil {
 				options := &vpcv1.AddInstanceNetworkInterfaceFloatingIPOptions{}

main.go

@@ -165,7 +165,7 @@ func initFlags(fs *pflag.FlagSet) {
 		"The minimum interval at which watched resources are reconciled.",
 	)
 
-	// TODO: Can we depreciate it to use provider-id-fmt for both vpc and power vs
+	// TODO: Depreciate it to use provider-id-fmt for both vpc and power vs
 	fs.StringVar(
 		&options.PowerVSProviderIDFormat,
 		"powervs-provider-id-fmt",

pkg/cloud/services/utils/accounts.go

@@ -24,6 +24,8 @@ import (
 	"github.com/golang-jwt/jwt"
 
 	"github.com/IBM/go-sdk-core/v5/core"
+
+	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
 )
 
 // GetAccount is function parses the account number from the token and returns it.
@@ -51,3 +53,12 @@ func GetAccount(auth core.Authenticator) (string, error) {
 
 	return token.Claims.(jwt.MapClaims)["account"].(map[string]interface{})["bss"].(string), nil
 }
+
+func GetAccountID() (string, error) {
+	auth, err := authenticator.GetAuthenticator()
+	if err != nil {
+		return "", err
+	}
+	accountID, err := GetAccount(auth)
+	return accountID, err
+}