Minor UT coverage improvements

cloud/scope/common_test.go

@@ -21,11 +21,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
-
-	. "github.com/onsi/gomega"
 )
 
 const (
@@ -91,16 +88,3 @@ func newBootstrapSecret(clusterName, machineName string) *corev1.Secret {
 		},
 	}
 }
-
-func createObject(g *WithT, obj client.Object, namespace string) {
-	if obj.DeepCopyObject() != nil {
-		obj.SetNamespace(namespace)
-		g.Expect(testEnv.Create(ctx, obj)).To(Succeed())
-	}
-}
-
-func cleanupObject(g *WithT, obj client.Object) {
-	if obj.DeepCopyObject() != nil {
-		g.Expect(testEnv.Cleanup(ctx, obj)).To(Succeed())
-	}
-}

cloud/scope/machine_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package scope
 
 import (
+	"context"
 	"errors"
 	"testing"
 
@@ -145,20 +146,6 @@ func TestCreateMachine(t *testing.T) {
 		t.Run("Should create Machine", func(t *testing.T) {
 			scope := setupMachineScope(clusterName, machineName, mockvpc)
 			scope.IBMVPCMachine.Spec = vpcMachine.Spec
-			secret := &corev1.Secret{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{
-						capiv1beta1.ClusterLabelName: scope.Cluster.Name,
-					},
-					Name:      scope.Machine.Name,
-					Namespace: "default",
-				},
-				Data: map[string][]byte{
-					"value": []byte("user data"),
-				},
-			}
-			createObject(g, secret, "default")
-			defer cleanupObject(g, secret)
 			instance := &vpcv1.Instance{
 				Name: &scope.Machine.Name,
 			}
@@ -203,6 +190,25 @@ func TestCreateMachine(t *testing.T) {
 			g.Expect(err).To(Not(BeNil()))
 		})
 
+		t.Run("Failed to retrieve bootstrap data, secret value key is missing", func(t *testing.T) {
+			scope := setupMachineScope(clusterName, machineName, mockvpc)
+			secret := &corev1.Secret{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						capiv1beta1.ClusterLabelName: clusterName,
+					},
+					Name:      machineName,
+					Namespace: "default",
+				},
+				Data: map[string][]byte{
+					"val": []byte("user data"),
+				}}
+			g.Expect(scope.Client.Update(context.Background(), secret)).To(Succeed())
+			mockvpc.EXPECT().ListInstances(gomock.AssignableToTypeOf(listInstancesOptions)).Return(instanceCollection, detailedResponse, nil)
+			_, err := scope.CreateMachine()
+			g.Expect(err).To(Not(BeNil()))
+		})
+
 		t.Run("Failed to create instance", func(t *testing.T) {
 			scope := setupMachineScope(clusterName, machineName, mockvpc)
 			mockvpc.EXPECT().ListInstances(gomock.AssignableToTypeOf(listInstancesOptions)).Return(instanceCollection, detailedResponse, nil)

cloud/scope/powervs_cluster.go

@@ -32,10 +32,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/resourcecontroller"
-	servicesutils "sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/endpoints"
 )
 
@@ -101,18 +99,6 @@ func NewPowerVSClusterScope(params PowerVSClusterScopeParams) (scope *PowerVSClu
 
 	spec := params.IBMPowerVSCluster.Spec
 
-	auth, err := authenticator.GetAuthenticator()
-	if err != nil {
-		err = errors.Wrap(err, "failed to get authenticator")
-		return
-	}
-
-	account, err := servicesutils.GetAccount(auth)
-	if err != nil {
-		err = errors.Wrap(err, "failed to get account")
-		return
-	}
-
 	rc, err := resourcecontroller.NewService(resourcecontroller.ServiceOptions{})
 	if err != nil {
 		return
@@ -143,10 +129,9 @@ func NewPowerVSClusterScope(params PowerVSClusterScopeParams) (scope *PowerVSClu
 
 	options := powervs.ServiceOptions{
 		IBMPIOptions: &ibmpisession.IBMPIOptions{
-			Debug:       params.Logger.V(DEBUGLEVEL).Enabled(),
-			UserAccount: account,
-			Region:      region,
-			Zone:        *res.RegionID,
+			Debug:  params.Logger.V(DEBUGLEVEL).Enabled(),
+			Region: region,
+			Zone:   *res.RegionID,
 		},
 		CloudInstanceID: spec.ServiceInstanceID,
 	}

cloud/scope/powervs_image.go

@@ -32,10 +32,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/resourcecontroller"
-	servicesutils "sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/endpoints"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/record"
 )
@@ -94,18 +92,6 @@ func NewPowerVSImageScope(params PowerVSImageScopeParams) (scope *PowerVSImageSc
 
 	spec := params.IBMPowerVSImage.Spec
 
-	auth, err := authenticator.GetAuthenticator()
-	if err != nil {
-		err = errors.Wrap(err, "failed to get authenticator")
-		return
-	}
-
-	account, err := servicesutils.GetAccount(auth)
-	if err != nil {
-		err = errors.Wrap(err, "failed to get account")
-		return
-	}
-
 	rc, err := resourcecontroller.NewService(resourcecontroller.ServiceOptions{})
 	if err != nil {
 		return
@@ -136,10 +122,9 @@ func NewPowerVSImageScope(params PowerVSImageScopeParams) (scope *PowerVSImageSc
 
 	options := powervs.ServiceOptions{
 		IBMPIOptions: &ibmpisession.IBMPIOptions{
-			Debug:       params.Logger.V(DEBUGLEVEL).Enabled(),
-			UserAccount: account,
-			Region:      region,
-			Zone:        *res.RegionID,
+			Debug:  params.Logger.V(DEBUGLEVEL).Enabled(),
+			Region: region,
+			Zone:   *res.RegionID,
 		},
 		CloudInstanceID: spec.ServiceInstanceID,
 	}

cloud/scope/powervs_machine.go

@@ -42,10 +42,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/resourcecontroller"
-	servicesutils "sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/endpoints"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/options"
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/record"
@@ -124,18 +122,6 @@ func NewPowerVSMachineScope(params PowerVSMachineScopeParams) (scope *PowerVSMac
 
 	m := params.IBMPowerVSMachine
 
-	auth, err := authenticator.GetAuthenticator()
-	if err != nil {
-		err = errors.Wrap(err, "failed to get authenticator")
-		return
-	}
-
-	account, err := servicesutils.GetAccount(auth)
-	if err != nil {
-		err = errors.Wrap(err, "failed to get account")
-		return
-	}
-
 	rc, err := resourcecontroller.NewService(resourcecontroller.ServiceOptions{})
 	if err != nil {
 		return
@@ -168,10 +154,9 @@ func NewPowerVSMachineScope(params PowerVSMachineScopeParams) (scope *PowerVSMac
 
 	serviceOptions := powervs.ServiceOptions{
 		IBMPIOptions: &ibmpisession.IBMPIOptions{
-			Debug:       params.Logger.V(DEBUGLEVEL).Enabled(),
-			UserAccount: account,
-			Region:      region,
-			Zone:        *res.RegionID,
+			Debug:  params.Logger.V(DEBUGLEVEL).Enabled(),
+			Region: region,
+			Zone:   *res.RegionID,
 		},
 		CloudInstanceID: m.Spec.ServiceInstanceID,
 	}

cloud/scope/powervs_machine_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package scope
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"testing"
@@ -223,21 +224,6 @@ func TestCreateMachinePVS(t *testing.T) {
 
 		t.Run("Should create Machine", func(t *testing.T) {
 			scope := setupPowerVSMachineScope(clusterName, machineName, core.StringPtr(pvsImage), core.StringPtr(pvsNetwork), true, mockpowervs)
-			secret := &corev1.Secret{
-				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{
-						capiv1beta1.ClusterLabelName: scope.Cluster.Name,
-					},
-					Name:      scope.Machine.Name,
-					Namespace: "default",
-				},
-				Data: map[string][]byte{
-					"value": []byte("user data"),
-				},
-			}
-			createObject(g, secret, "default")
-			defer cleanupObject(g, secret)
-
 			mockpowervs.EXPECT().GetAllInstance().Return(pvmInstances, nil)
 			mockpowervs.EXPECT().GetAllImage().Return(images, nil)
 			mockpowervs.EXPECT().GetAllNetwork().Return(networks, nil)
@@ -281,6 +267,25 @@ func TestCreateMachinePVS(t *testing.T) {
 			g.Expect(err).To(Not(BeNil()))
 		})
 
+		t.Run("Failed to retrieve bootstrap data, secret value key is missing", func(t *testing.T) {
+			scope := setupPowerVSMachineScope(clusterName, machineName, core.StringPtr(pvsImage), core.StringPtr(pvsNetwork), true, mockpowervs)
+			secret := &corev1.Secret{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						capiv1beta1.ClusterLabelName: clusterName,
+					},
+					Name:      machineName,
+					Namespace: "default",
+				},
+				Data: map[string][]byte{
+					"val": []byte("user data"),
+				}}
+			g.Expect(scope.Client.Update(context.Background(), secret)).To(Succeed())
+			mockpowervs.EXPECT().GetAllInstance().Return(pvmInstances, nil)
+			_, err := scope.CreateMachine()
+			g.Expect(err).To(Not(BeNil()))
+		})
+
 		t.Run("Invalid memory value", func(t *testing.T) {
 			scope := setupPowerVSMachineScope(clusterName, machineName, core.StringPtr(pvsImage), core.StringPtr(pvsNetwork), true, mockpowervs)
 			scope.IBMPowerVSMachine.Spec.Memory = "illegal"

pkg/cloud/services/powervs/service.go

@@ -25,6 +25,7 @@ import (
 	"github.com/IBM-Cloud/power-go-client/power/models"
 
 	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
+	"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"
 )
 
 var _ PowerVS = &Service{}
@@ -128,6 +129,11 @@ func NewService(options ServiceOptions) (PowerVS, error) {
 		return nil, err
 	}
 	options.Authenticator = auth
+	account, err := utils.GetAccount(auth)
+	if err != nil {
+		return nil, err
+	}
+	options.IBMPIOptions.UserAccount = account
 	session, err := ibmpisession.NewIBMPISession(options.IBMPIOptions)
 	if err != nil {
 		return nil, err

pkg/endpoints/endpoints_test.go

@@ -153,3 +153,105 @@ func TestParseFlags(t *testing.T) {
 		})
 	}
 }
+
+func TestFetchVPCEndpoint(t *testing.T) {
+	testCases := []struct {
+		name            string
+		region          string
+		serviceEndpoint []ServiceEndpoint
+		expectedOutput  string
+	}{
+		{
+			name:            "Return constructed endpoint",
+			region:          "us-south",
+			serviceEndpoint: []ServiceEndpoint{},
+			expectedOutput:  "https://us-south.iaas.cloud.ibm.com/v1",
+		},
+		{
+			name:   "Return fetched endpoint",
+			region: "us-south",
+			serviceEndpoint: []ServiceEndpoint{
+				{
+					ID:     "vpc",
+					URL:    "https://vpchost:8080",
+					Region: "us-south",
+				},
+			},
+			expectedOutput: "https://vpchost:8080",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			out := FetchVPCEndpoint(tc.region, tc.serviceEndpoint)
+			require.Equal(t, tc.expectedOutput, out)
+		})
+	}
+}
+
+func TestFetchPVSEndpoint(t *testing.T) {
+	testCases := []struct {
+		name            string
+		region          string
+		serviceEndpoint []ServiceEndpoint
+		expectedOutput  string
+	}{
+		{
+			name:            "Return empty endpoint",
+			region:          "us-south",
+			serviceEndpoint: []ServiceEndpoint{},
+			expectedOutput:  "",
+		},
+		{
+			name:   "Return fetched endpoint",
+			region: "us-south",
+			serviceEndpoint: []ServiceEndpoint{
+				{
+					ID:     "powervs",
+					URL:    "https://powervshost:8080",
+					Region: "us-south",
+				},
+			},
+			expectedOutput: "https://powervshost:8080",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			out := FetchPVSEndpoint(tc.region, tc.serviceEndpoint)
+			require.Equal(t, tc.expectedOutput, out)
+		})
+	}
+}
+
+func TestFetchRCEndpoint(t *testing.T) {
+	testCases := []struct {
+		name            string
+		serviceEndpoint []ServiceEndpoint
+		expectedOutput  string
+	}{
+		{
+			name:            "Return empty endpoint",
+			serviceEndpoint: []ServiceEndpoint{},
+			expectedOutput:  "",
+		},
+		{
+			name: "Return fetched endpoint",
+			serviceEndpoint: []ServiceEndpoint{
+				{
+					ID:     "rc",
+					URL:    "https://rchost:8080",
+					Region: "us-south",
+				},
+			},
+			expectedOutput: "https://rchost:8080",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			out := FetchRCEndpoint(tc.serviceEndpoint)
+			require.Equal(t, tc.expectedOutput, out)
+		})
+	}
+}