Change IBMPowerVSClient type for better mocking (#577)

Amulyam24 · web-flow · commit deab125740ee · 2022-02-24T07:26:32.000-08:00
PowerVS client would be mocked for unit tests. gomock expects the mocked type
to be an interface, hence change the IBMPowerVSClient to be of type PowerVS.

Signed-off-by: Amulyam24 &lt;amulmek1@in.ibm.com&gt;
diff --git a/cloud/scope/powervs_cluster.go b/cloud/scope/powervs_cluster.go
@@ -58,7 +58,7 @@ type PowerVSClusterScope struct {
 	client      client.Client
 	patchHelper *patch.Helper
 
-	IBMPowerVSClient  *powervs.Service
+	IBMPowerVSClient  powervs.PowerVS
 	Cluster           *clusterv1.Cluster
 	IBMPowerVSCluster *v1beta1.IBMPowerVSCluster
 }
diff --git a/cloud/scope/powervs_image.go b/cloud/scope/powervs_image.go
@@ -55,7 +55,7 @@ type PowerVSImageScope struct {
 	client      client.Client
 	patchHelper *patch.Helper
 
-	IBMPowerVSClient *powervs.Service
+	IBMPowerVSClient powervs.PowerVS
 	IBMPowerVSImage  *v1beta1.IBMPowerVSImage
 }
 
diff --git a/cloud/scope/powervs_machine.go b/cloud/scope/powervs_machine.go
@@ -65,7 +65,7 @@ type PowerVSMachineScope struct {
 	client      client.Client
 	patchHelper *patch.Helper
 
-	IBMPowerVSClient  *powervs.Service
+	IBMPowerVSClient  powervs.PowerVS
 	Cluster           *clusterv1.Cluster
 	Machine           *clusterv1.Machine
 	IBMPowerVSCluster *v1beta1.IBMPowerVSCluster
diff --git a/pkg/cloud/services/powervs/service.go b/pkg/cloud/services/powervs/service.go
@@ -110,7 +110,7 @@ func (s *Service) GetAllNetwork() (*models.Networks, error) {
 }
 
 // NewService returns a new service for the Power VS api client.
-func NewService(options ServiceOptions) (*Service, error) {
+func NewService(options ServiceOptions) (PowerVS, error) {
 	auth, err := authenticator.GetAuthenticator()
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ type PowerVSClusterScope struct {`
`58`	`58`	`client client.Client`
`59`	`59`	`patchHelper *patch.Helper`
`60`	`60`
`61`		`- IBMPowerVSClient *powervs.Service`
	`61`	`+ IBMPowerVSClient powervs.PowerVS`
`62`	`62`	`Cluster *clusterv1.Cluster`
`63`	`63`	`IBMPowerVSCluster *v1beta1.IBMPowerVSCluster`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ type PowerVSImageScope struct {`
`55`	`55`	`client client.Client`
`56`	`56`	`patchHelper *patch.Helper`
`57`	`57`
`58`		`- IBMPowerVSClient *powervs.Service`
	`58`	`+ IBMPowerVSClient powervs.PowerVS`
`59`	`59`	`IBMPowerVSImage *v1beta1.IBMPowerVSImage`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (s Service) GetAllNetwork() (models.Networks, error) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`// NewService returns a new service for the Power VS api client.`
`113`		`-func NewService(options ServiceOptions) (*Service, error) {`
	`113`	`+func NewService(options ServiceOptions) (PowerVS, error) {`
`114`	`114`	`auth, err := authenticator.GetAuthenticator()`
`115`	`115`	`if err != nil {`
`116`	`116`	`return nil, err`