Backport of NET-7025 - ci: test-integrations failures in compatibility tests. panics occuring in selectionTracker.TrackIDForSelection into release/1.17.x (#20230)

hc-github-team-consul-core · jmurret · web-flow · commit 39d60cd8d83e · 2024-01-16T22:55:51.000Z
* backport of commit 2b3b309 * backport of commit 1740fe7 --------- Co-authored-by: John Murret <john.murret@hashicorp.com>
diff --git a/internal/resource/mappers/selectiontracker/selection_tracker.go b/internal/resource/mappers/selectiontracker/selection_tracker.go
@@ -72,6 +72,10 @@ func (t *WorkloadSelectionTracker) GetIDsForWorkload(id *pbresource.ID) []*pbres
 // TrackIDForSelector will associate workloads matching the specified workload
 // selector with the given resource id.
 func (t *WorkloadSelectionTracker) TrackIDForSelector(id *pbresource.ID, selector *pbcatalog.WorkloadSelector) {
+	if selector == nil {
+		return
+	}
+
 	t.lock.Lock()
 	defer t.lock.Unlock()
 
