fix: golang autodiscovery module update (#2247)

Signed-off-by: Olblak <me@olblak.com>
updatecli · Jun 17, 2024 · 920ae78 · 920ae78
1 parent 28e1f8f
commit 920ae78
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 3 deletions.
diff --git a/pkg/plugins/autodiscovery/golang/dependency.go b/pkg/plugins/autodiscovery/golang/dependency.go
@@ -105,6 +105,7 @@ func (g Golang) discoverDependencyManifests() ([][]byte, error) {
 
 			manifests = append(manifests, moduleManifest)
 		}
+
 		// Test if the ignore rule based on path is respected
 		if len(g.spec.Ignore) > 0 {
 			if g.spec.Ignore.isMatchingRules(g.rootDir, relativeFoundFile, goVersion, "", "") {

diff --git a/pkg/plugins/autodiscovery/golang/matchingRule.go b/pkg/plugins/autodiscovery/golang/matchingRule.go
@@ -142,10 +142,17 @@ func (m MatchingRules) isGoVersionOnly() bool {
 	if len(m) == 0 {
 		return false
 	}
+
+	goOnlyFound := 0
 	for _, rule := range m {
-		if rule.GoVersion != "" && len(rule.Modules) > 0 {
-			return false
+		if rule.GoVersion != "" && len(rule.Modules) == 0 {
+			goOnlyFound++
 		}
 	}
-	return true
+
+	if goOnlyFound == len(m) && goOnlyFound > 0 {
+		return true
+	}
+
+	return false
 }
diff --git a/pkg/plugins/autodiscovery/golang/matchingRule_test.go b/pkg/plugins/autodiscovery/golang/matchingRule_test.go
@@ -157,3 +157,74 @@ func TestIsMatchingRule(t *testing.T) {
 		})
 	}
 }
+
+func TestIsGoOnly(t *testing.T) {
+
+	dataset := []struct {
+		name           string
+		rules          MatchingRules
+		expectedResult bool
+	}{
+		{
+			name: "Only path specified",
+			rules: MatchingRules{
+				MatchingRule{
+					Path: "go.mod",
+				},
+			},
+			expectedResult: false,
+		},
+		{
+			name: "Only go version specified",
+			rules: MatchingRules{
+				MatchingRule{
+					GoVersion: "*",
+				},
+			},
+			expectedResult: true,
+		},
+		{
+			name: "Multiple go version specified",
+			rules: MatchingRules{
+				MatchingRule{
+					GoVersion: "1.19.*",
+				},
+				MatchingRule{
+					GoVersion: ">=1.20.0",
+				},
+			},
+			expectedResult: true,
+		},
+		{
+			name: "Go version specified with second go module rule",
+			rules: MatchingRules{
+				MatchingRule{
+					GoVersion: "1.19.*",
+				},
+				MatchingRule{
+					Modules: map[string]string{
+						"github.com/updatecli/updatecli": "1.0.0",
+					},
+				},
+			},
+			expectedResult: false,
+		},
+		{
+			name: "Go version specified with go module within the same rule",
+			rules: MatchingRules{
+				MatchingRule{
+					GoVersion: "1.19.*",
+					Modules: map[string]string{
+						"github.com/updatecli/updatecli": "1.0.0",
+					},
+				},
+			},
+			expectedResult: false,
+		},
+	}
+
+	for _, d := range dataset {
+		gotReset := d.rules.isGoVersionOnly()
+		assert.Equal(t, d.expectedResult, gotReset)
+	}
+}