fix: fix KustomizeImage Match function to pass added unit tests (#1044)

Signed-off-by: Cheng Fang <cfang@redhat.com>

Author: chengfang

registry-scanner/pkg/image/kustomize.go

@@ -20,10 +20,9 @@ func (i KustomizeImage) delim() string {
 // if the image name matches (i.e. up to the first delimiter)
 func (i KustomizeImage) Match(j KustomizeImage) bool {
 	delim := j.delim()
-	if !strings.Contains(string(j), delim) {
-		return false
-	}
-	return strings.HasPrefix(string(i), strings.Split(string(j), delim)[0])
+	imageName, _, _ := strings.Cut(string(i), delim)
+	otherImageName, _, _ := strings.Cut(string(j), delim)
+	return imageName == otherImageName
 }
 
 type KustomizeImages []KustomizeImage

registry-scanner/pkg/image/kustomize_test.go

@@ -6,6 +6,21 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestKustomizeImage_Match(t *testing.T) {
+	// no prefix
+	assert.False(t, KustomizeImage("foo=1").Match("bar=1"))
+	// mismatched delimiter
+	assert.False(t, KustomizeImage("foo=1").Match("bar:1"))
+	assert.False(t, KustomizeImage("foo:1").Match("bar=1"))
+	assert.False(t, KustomizeImage("foobar:2").Match("foo:2"))
+	assert.False(t, KustomizeImage("foobar@2").Match("foo@2"))
+	// matches
+	assert.True(t, KustomizeImage("foo=1").Match("foo=2"))
+	assert.True(t, KustomizeImage("foo:1").Match("foo:2"))
+	assert.True(t, KustomizeImage("foo@1").Match("foo@2"))
+	assert.True(t, KustomizeImage("nginx").Match("nginx"))
+}
+
 func Test_KustomizeImages_Find(t *testing.T) {
 	images := KustomizeImages{
 		"a/b:1.0",
@@ -17,10 +32,10 @@ func Test_KustomizeImages_Find(t *testing.T) {
 	for _, image := range images {
 		assert.True(t, images.Find(image) >= 0)
 	}
-	for _, image := range []string{"a/b:2", "x/y=foo.bar"} {
+	for _, image := range []string{"a/b", "a/b:2", "x/y=foo.bar"} {
 		assert.True(t, images.Find(KustomizeImage(image)) >= 0)
 	}
-	for _, image := range []string{"a/b", "x", "x/y"} {
+	for _, image := range []string{"x", "x/y"} {
 		assert.Equal(t, -1, images.Find(KustomizeImage(image)))
 	}
 }