fix(controller): align placement group delete test assertions with log messages

Updates the assertions in the LinodePlacementGroup controller test suite to correctly match the expected error log messages produced during deletion failures (fetch API error vs delete API error).

Author: komer3

internal/controller/linodeplacementgroup_controller.go

@@ -268,6 +268,7 @@ func (r *LinodePlacementGroupReconciler) reconcileDelete(ctx context.Context, lo
 				logger.Info("Placement Group not found via API, assuming already deleted")
 				// Skip to finalizer removal outside this block
 			} else {
+				logger.Error(err, "Failed to fetch Placement Group from API")
 				if pgScope.LinodePlacementGroup.ObjectMeta.DeletionTimestamp.Add(reconciler.DefaultTimeout(r.ReconcileTimeout, reconciler.DefaultPGControllerReconcileTimeout)).After(time.Now()) {
 					logger.Info("Re-queuing Placement Group deletion due to fetch error")
 					return ctrl.Result{RequeueAfter: reconciler.DefaultPGControllerReconcilerDelay}, nil
@@ -306,6 +307,7 @@ func (r *LinodePlacementGroupReconciler) reconcileDelete(ctx context.Context, lo
 					logger.Info("Placement Group already deleted (API 404 on delete call)")
 					// Skip to finalizer removal outside this block
 				} else {
+					logger.Error(err, "Failed to delete Placement Group via API")
 					if pgScope.LinodePlacementGroup.ObjectMeta.DeletionTimestamp.Add(reconciler.DefaultTimeout(r.ReconcileTimeout, reconciler.DefaultPGControllerReconcileTimeout)).After(time.Now()) {
 						// Need this requeue incase for some reason pg is not empty even though all the nodes are deleted.
 						// This should give enough time for PG to get updated on the backend and we can delete it next time.

internal/controller/linodeplacementgroup_controller_test.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/linode/linodego"
 	"go.uber.org/mock/gomock"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -135,7 +136,7 @@ var _ = Describe("lifecycle", Ordered, Label("placementgroup", "lifecycle"), fun
 						res, err := reconciler.reconcile(ctx, mck.Logger(), &pgScope)
 						Expect(err).NotTo(HaveOccurred())
 						Expect(res.RequeueAfter).To(Equal(rec.DefaultPGControllerReconcilerDelay))
-						Expect(mck.Logs()).To(ContainSubstring("Failed to fetch Placement Group"))
+						Expect(mck.Logs()).To(ContainSubstring("Failed to fetch Placement Group from API"))
 					})),
 					Path(Result("timeout error", func(ctx context.Context, mck Mock) {
 						reconciler.ReconcileTimeout = time.Nanosecond
@@ -160,7 +161,7 @@ var _ = Describe("lifecycle", Ordered, Label("placementgroup", "lifecycle"), fun
 						res, err := reconciler.reconcile(ctx, mck.Logger(), &pgScope)
 						Expect(err).NotTo(HaveOccurred())
 						Expect(res.RequeueAfter).To(Equal(rec.DefaultPGControllerReconcilerDelay))
-						Expect(mck.Logs()).To(ContainSubstring("Failed to delete Placement Group"))
+						Expect(mck.Logs()).To(ContainSubstring("Failed to delete Placement Group via API"))
 					})),
 					Path(Result("timeout error", func(ctx context.Context, mck Mock) {
 						reconciler.ReconcileTimeout = time.Nanosecond
@@ -190,14 +191,38 @@ var _ = Describe("lifecycle", Ordered, Label("placementgroup", "lifecycle"), fun
 					}, nil)
 				}),
 				OneOf(
-					Path(Result("requeues delete", func(ctx context.Context, mck Mock) {
+					Path(Result("delete requeues", func(ctx context.Context, mck Mock) {
 						res, err := reconciler.reconcile(ctx, mck.Logger(), &pgScope)
 						Expect(err).NotTo(HaveOccurred())
 						Expect(res.RequeueAfter).To(Equal(rec.DefaultPGControllerReconcilerDelay))
-						Expect(mck.Logs()).To(ContainSubstring("re-queuing deletion to wait for detachment"))
+						Expect(mck.Logs()).To(ContainSubstring("Placement Group has node(s) attached, re-queuing deletion to wait for detachment"))
+					})),
+					Path(Result("timeout error", func(ctx context.Context, mck Mock) {
+						reconciler.ReconcileTimeout = time.Nanosecond
+						res, err := reconciler.reconcile(ctx, mck.Logger(), &pgScope)
+						Expect(err).To(HaveOccurred())
+						Expect(res.RequeueAfter).To(Equal(time.Duration(0)))
+						Expect(mck.Events()).To(ContainSubstring("Will not delete Placement Group"))
 					})),
 				),
 			),
+			Path(
+				Call("with no nodes attached", func(ctx context.Context, mck Mock) {
+					getPG := mck.LinodeClient.EXPECT().GetPlacementGroup(ctx, gomock.Any()).Return(&linodego.PlacementGroup{
+						ID:      1,
+						Label:   "pg1",
+						Region:  "us-east",
+						Members: []linodego.PlacementGroupMember{},
+					}, nil)
+					mck.LinodeClient.EXPECT().DeletePlacementGroup(ctx, gomock.Any()).After(getPG).Return(nil)
+				}),
+				Result("delete success", func(ctx context.Context, mck Mock) {
+					res, err := reconciler.reconcile(ctx, mck.Logger(), &pgScope)
+					Expect(err).NotTo(HaveOccurred())
+					Expect(res.RequeueAfter).To(Equal(time.Duration(0)))
+					Expect(apierrors.IsNotFound(k8sClient.Get(ctx, objectKey, &linodePG))).To(BeTrue())
+				}),
+			),
 		),
 	)
 })