lint, tests

Author: sammysclub

internal/controller/linodemachine_controller.go

@@ -829,6 +829,7 @@ func (r *LinodeMachineReconciler) reconcileFirewallID(ctx context.Context, logge
 	} else if machineScope.LinodeMachine.Spec.FirewallRef != nil {
 		fwID, err := getFirewallID(ctx, machineScope, logger)
 		if err != nil {
+			logger.Error(err, "Failed to get firewall ID from firewall ref")
 			return ctrl.Result{RequeueAfter: reconciler.DefaultMachineControllerRetryDelay}, nil
 		}
 		desiredFWIDs = []int{fwID}

internal/controller/linodemachine_controller_test.go

@@ -2048,8 +2048,9 @@ var _ = Describe("machine-update", Ordered, Label("machine", "machine-update"),
 					Name:      "test-firewall-ref",
 					Namespace: namespace,
 				} // this firewall does not exist
-				_, err := reconciler.reconcile(ctx, mck.Logger(), mScope)
-				Expect(err).To(HaveOccurred())
+				res, err := reconciler.reconcile(ctx, mck.Logger(), mScope)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(res.RequeueAfter).To(Equal(rutil.DefaultMachineControllerRetryDelay))
 				Expect(mck.Logs()).To(ContainSubstring("Failed to fetch LinodeFirewall"))
 			}),
 		),