Lint fix - Add sentinel error for VPC

Author: komer3

internal/controller/linodevpc_controller.go

@@ -372,6 +372,9 @@ func (r *LinodeVPCReconciler) handleRetainedVPC(ctx context.Context, logger logr
 func (r *LinodeVPCReconciler) handleRetainedSubnets(ctx context.Context, logger logr.Logger, vpcScope *scope.VPCScope) error {
 	vpc, err := getVPC(ctx, vpcScope)
 	if err != nil {
+		if errors.Is(err, ErrVPCNotFound) {
+			return nil
+		}
 		logger.Error(err, "Failed to fetch VPC for subnet deletion")
 		if vpcScope.LinodeVPC.ObjectMeta.DeletionTimestamp.Add(reconciler.DefaultTimeout(r.ReconcileTimeout, reconciler.DefaultVPCControllerReconcileTimeout)).After(time.Now()) {
 			logger.Info("re-queuing VPC deletion due to fetch error for subnet deletion")
@@ -380,10 +383,6 @@ func (r *LinodeVPCReconciler) handleRetainedSubnets(ctx context.Context, logger
 		return err
 	}
 
-	if vpc == nil {
-		return nil
-	}
-
 	// index the subnets by ID for quick lookup
 	apiSubnets := make(map[int]linodego.VPCSubnet)
 	for _, s := range vpc.Subnets {
@@ -433,17 +432,17 @@ func (r *LinodeVPCReconciler) handleRetainedSubnets(ctx context.Context, logger
 func (r *LinodeVPCReconciler) deleteVPCResources(ctx context.Context, logger logr.Logger, vpcScope *scope.VPCScope) error {
 	vpc, err := getVPC(ctx, vpcScope)
 	if err != nil {
+		if errors.Is(err, ErrVPCNotFound) {
+			logger.Info("VPC not found, nothing to do")
+			return nil
+		}
 		logger.Error(err, "Failed to fetch VPC")
 		if vpcScope.LinodeVPC.ObjectMeta.DeletionTimestamp.Add(reconciler.DefaultTimeout(r.ReconcileTimeout, reconciler.DefaultVPCControllerReconcileTimeout)).After(time.Now()) {
 			logger.Info("re-queuing VPC deletion due to fetch error")
 			return util.ErrReconcileAgain
 		}
 		return err
 	}
-	if vpc == nil {
-		logger.Info("VPC not found, nothing to do")
-		return nil
-	}
 
 	for i := range vpc.Subnets {
 		if len(vpc.Subnets[i].Linodes) == 0 {

internal/controller/linodevpc_controller_helpers.go

@@ -29,6 +29,11 @@ import (
 	"github.com/linode/cluster-api-provider-linode/util"
 )
 
+var (
+	// ErrVPCNotFound is a sentinel error to indicate that a VPC was not found.
+	ErrVPCNotFound = errors.New("VPC not found")
+)
+
 func reconcileVPC(ctx context.Context, vpcScope *scope.VPCScope, logger logr.Logger) error {
 	createConfig := linodeVPCSpecToVPCCreateConfig(vpcScope.LinodeVPC.Spec)
 	if createConfig == nil {
@@ -132,17 +137,17 @@ func linodeVPCSpecToVPCCreateConfig(vpcSpec infrav1alpha2.LinodeVPCSpec) *linode
 
 // getVPC fetches a VPC and handles not-found errors.
 // It returns the VPC if found.
-// It returns nil, nil if the VPC is not found.
+// It returns nil, ErrVPCNotFound if the VPC is not found.
 // It returns nil and an error for other API errors.
 func getVPC(ctx context.Context, vpcScope *scope.VPCScope) (*linodego.VPC, error) {
 	if vpcScope.LinodeVPC.Spec.VPCID == nil {
-		return nil, nil
+		return nil, ErrVPCNotFound
 	}
 
 	vpc, err := vpcScope.LinodeClient.GetVPC(ctx, *vpcScope.LinodeVPC.Spec.VPCID)
 	if err != nil {
 		if util.IgnoreLinodeAPIError(err, http.StatusNotFound) == nil {
-			return nil, nil
+			return nil, ErrVPCNotFound
 		}
 		return nil, err
 	}