🐛 Refactor asset duplication check to use reusable IsSubsetOf function and add unit tests

Author: slntopp

discovery/discovery.go

@@ -15,6 +15,7 @@ import (
 	"go.mondoo.com/mql/v13/cli/execruntime"
 	"go.mondoo.com/mql/v13/internal/workerpool"
 	"go.mondoo.com/mql/v13/llx"
+	"go.mondoo.com/mql/v13/utils/slicesx"
 	"go.mondoo.com/mql/v13/logger"
 	"go.mondoo.com/mql/v13/providers"
 	inventory "go.mondoo.com/mql/v13/providers-sdk/v1/inventory"
@@ -68,7 +69,7 @@ func (d *DiscoveredAssets) Add(asset *inventory.Asset, runtime *providers.Runtim
 	}
 
 	for _, existing := range d.Assets {
-		if isSubsetOf(asset.PlatformIds, existing.Asset.PlatformIds) {
+		if slicesx.IsSubsetOf(asset.PlatformIds, existing.Asset.PlatformIds) {
 			log.Debug().Str("asset", asset.Name).Strs("platform-ids", asset.PlatformIds).Msg("discovery> skipping duplicate asset")
 			return false
 		}
@@ -79,22 +80,6 @@ func (d *DiscoveredAssets) Add(asset *inventory.Asset, runtime *providers.Runtim
 	return true
 }
 
-// isSubsetOf returns true if every element in sub exists in super.
-func isSubsetOf(sub, super []string) bool {
-	if len(sub) > len(super) {
-		return false
-	}
-	set := make(map[string]struct{}, len(super))
-	for _, id := range super {
-		set[id] = struct{}{}
-	}
-	for _, id := range sub {
-		if _, ok := set[id]; !ok {
-			return false
-		}
-	}
-	return true
-}
 
 func (d *DiscoveredAssets) AddError(asset *inventory.Asset, err error) {
 	d.assetsLock.Lock()

utils/slicesx/subset.go

@@ -0,0 +1,21 @@
+// Copyright (c) Mondoo, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package slicesx
+
+// IsSubsetOf returns true if every element in sub exists in super.
+func IsSubsetOf[T comparable](sub, super []T) bool {
+	if len(sub) > len(super) {
+		return false
+	}
+	set := make(map[T]struct{}, len(super))
+	for _, v := range super {
+		set[v] = struct{}{}
+	}
+	for _, v := range sub {
+		if _, ok := set[v]; !ok {
+			return false
+		}
+	}
+	return true
+}

utils/slicesx/subset_test.go

@@ -0,0 +1,41 @@
+// Copyright (c) Mondoo, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+
+package slicesx
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsSubsetOf(t *testing.T) {
+	t.Run("equal sets", func(t *testing.T) {
+		assert.True(t, IsSubsetOf([]string{"a", "b"}, []string{"a", "b"}))
+	})
+
+	t.Run("proper subset", func(t *testing.T) {
+		assert.True(t, IsSubsetOf([]string{"a"}, []string{"a", "b", "c"}))
+	})
+
+	t.Run("not a subset", func(t *testing.T) {
+		assert.False(t, IsSubsetOf([]string{"a", "d"}, []string{"a", "b", "c"}))
+	})
+
+	t.Run("sub longer than super", func(t *testing.T) {
+		assert.False(t, IsSubsetOf([]string{"a", "b", "c"}, []string{"a"}))
+	})
+
+	t.Run("empty sub is always a subset", func(t *testing.T) {
+		assert.True(t, IsSubsetOf([]string{}, []string{"a", "b"}))
+	})
+
+	t.Run("both empty", func(t *testing.T) {
+		assert.True(t, IsSubsetOf([]string{}, []string{}))
+	})
+
+	t.Run("works with ints", func(t *testing.T) {
+		assert.True(t, IsSubsetOf([]int{1, 2}, []int{1, 2, 3}))
+		assert.False(t, IsSubsetOf([]int{1, 4}, []int{1, 2, 3}))
+	})
+}