add unittests for vpc_controller

linode · Apr 24, 2024 · 346a4e6 · 346a4e6
1 parent 02ed313
commit 346a4e6
Show file tree

Hide file tree

Showing 6 changed files with 474 additions and 9 deletions.
diff --git a/cloud/scope/client.go b/cloud/scope/client.go
@@ -38,6 +38,9 @@ type LinodeInstanceClient interface {
 // LinodeVPCClient defines the methods that a Linode client must have to interact with Linode's VPC service.
 type LinodeVPCClient interface {
 	GetVPC(ctx context.Context, vpcID int) (*linodego.VPC, error)
+	ListVPCs(ctx context.Context, opts *linodego.ListOptions) ([]linodego.VPC, error)
+	CreateVPC(ctx context.Context, opts linodego.VPCCreateOptions) (*linodego.VPC, error)
+	DeleteVPC(ctx context.Context, vpcID int) error
 }
 
 // LinodeNodeBalancerClient defines the methods that a Linode client must have to interact with Linode's Node Balancer service.

diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -84,7 +84,7 @@ func NewClusterScope(ctx context.Context, apiKey string, params ClusterScopePara
 type ClusterScope struct {
 	client        k8sClient
 	PatchHelper   *patch.Helper
-	LinodeClient  LinodeNodeBalancerClient
+	LinodeClient  LinodeMachineClient
 	Cluster       *clusterv1.Cluster
 	LinodeCluster *infrav1alpha1.LinodeCluster
 }

diff --git a/cloud/scope/vpc.go b/cloud/scope/vpc.go
@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/linode/linodego"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
@@ -30,10 +29,10 @@ import (
 
 // VPCScope defines the basic context for an actuator to operate upon.
 type VPCScope struct {
-	client k8sClient
+	Client k8sClient
 
 	PatchHelper  *patch.Helper
-	LinodeClient *linodego.Client
+	LinodeClient LinodeVPCClient
 	LinodeVPC    *infrav1alpha1.LinodeVPC
 }
 
@@ -77,7 +76,7 @@ func NewVPCScope(ctx context.Context, apiKey string, params VPCScopeParams) (*VP
 	}
 
 	return &VPCScope{
-		client:       params.Client,
+		Client:       params.Client,
 		LinodeClient: linodeClient,
 		LinodeVPC:    params.LinodeVPC,
 		PatchHelper:  helper,

diff --git a/controller/linodevpc_controller.go b/controller/linodevpc_controller.go
@@ -100,13 +100,13 @@ func (r *LinodeVPCReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		return ctrl.Result{}, fmt.Errorf("failed to create VPC scope: %w", err)
 	}
 
-	return r.reconcile(ctx, vpcScope, log)
+	return r.reconcile(ctx, log, vpcScope)
 }
 
 func (r *LinodeVPCReconciler) reconcile(
 	ctx context.Context,
-	vpcScope *scope.VPCScope,
 	logger logr.Logger,
+	vpcScope *scope.VPCScope,
 ) (res ctrl.Result, err error) {
 	res = ctrl.Result{}
 
@@ -167,12 +167,12 @@ func (r *LinodeVPCReconciler) reconcile(
 	// Create
 	failureReason = infrav1alpha1.CreateVPCError
 
-	err = r.reconcileCreate(ctx, vpcScope, logger)
+	err = r.reconcileCreate(ctx, logger, vpcScope)
 
 	return
 }
 
-func (r *LinodeVPCReconciler) reconcileCreate(ctx context.Context, vpcScope *scope.VPCScope, logger logr.Logger) error {
+func (r *LinodeVPCReconciler) reconcileCreate(ctx context.Context, logger logr.Logger, vpcScope *scope.VPCScope) error {
 	logger.Info("creating vpc")
 
 	if err := r.reconcileVPC(ctx, vpcScope, logger); err != nil {