Fixing issue with out of range indices when removing items from resou…

…rce lists.

controllers/core/orphaned_resource_reconciler.go

@@ -59,13 +59,13 @@ func (h *OrphanedResourceEventHandler) On(e eventsource.Event) {
 	case *tenant.ResourceAdded:
 		h.state.Active = append(h.state.Active, event.Resource)
 		index, _ := h.state.Deleted.Find(event.Resource.Id)
-		if index >= 0 {
-			h.state.Deleted = h.state.Deleted.Remove(index)
-		}
+		h.state.Deleted = h.state.Deleted.Remove(index)
 	case *tenant.ResourceRemoved:
 		index, r := h.state.Active.Find(event.ResourceId)
-		h.state.Active = h.state.Active.Remove(index)
-		h.state.Deleted = append(h.state.Deleted, *r)
+		if index >= 0 && r != nil {
+			h.state.Active = h.state.Active.Remove(index)
+			h.state.Deleted = append(h.state.Deleted, *r)
+		}
 	case *tenant.ResourceGenererationFailed:
 		h.state.DeleteAllowed = false
 	case *tenant.ResourceGenererationSuccessful:

controllers/core/resourceset_reconciler.go

@@ -217,6 +217,9 @@ func NewResourceSet() *corev1alpha1.ResourceSet {
 }
 
 func remove(slice corev1alpha1.ResourceSetResourceList, index int) corev1alpha1.ResourceSetResourceList {
+	if index < 0 {
+		return slice
+	}
 	return append(slice[:index], slice[index+1:]...)
 }
 

internal/pkg/tenant/types.go

@@ -70,6 +70,9 @@ func (rl ResourceList) Find(id string) (index int, existing *Resource) {
 }
 
 func (rl ResourceList) Remove(index int) ResourceList {
+	if index < 0 {
+		return rl
+	}
 	return append(rl[:index], rl[index+1:]...)
 }