Move known scope definitions to talismanrc

thoughtworks · Jun 24, 2021 · a719399 · a719399
1 parent 916b293
commit a719399
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/cmd/runner.go b/cmd/runner.go
@@ -36,8 +36,7 @@ func NewRunner(additions []gitrepo.Addition) *runner {
 //Run will validate the commit range for errors and return either COMPLETED_SUCCESSFULLY or COMPLETED_WITH_ERRORS
 func (r *runner) Run(tRC *talismanrc.TalismanRC, promptContext prompt.PromptContext) int {
 	setCustomSeverities(tRC)
-	scopeMap := getScopeConfig()
-	additionsToScan := tRC.IgnoreAdditionsByScope(r.additions, scopeMap)
+	additionsToScan := tRC.FilterAdditions(r.additions)
 	detector.DefaultChain(tRC).Test(additionsToScan, tRC, r.results)
 	r.printReport(promptContext)
 	exitStatus := r.exitStatus()
@@ -50,14 +49,6 @@ func setCustomSeverities(tRC *talismanrc.TalismanRC) {
 	}
 }
 
-func getScopeConfig() map[string][]string {
-	scopeConfig := map[string][]string{
-		"node": {"yarn.lock", "package-lock.json", "node_modules/"},
-		"go":   {"makefile", "go.mod", "go.sum", "Gopkg.toml", "Gopkg.lock", "glide.yaml", "glide.lock", "vendor/"},
-	}
-	return scopeConfig
-}
-
 func (r *runner) printReport(promptContext prompt.PromptContext) {
 	if r.results.HasWarnings() {
 		fmt.Println(r.results.ReportWarnings())

diff --git a/talismanrc/scopes.go b/talismanrc/scopes.go
@@ -0,0 +1,6 @@
+package talismanrc
+
+var knownScopes = map[string][]string{
+	"node": {"yarn.lock", "package-lock.json", "node_modules/"},
+	"go":   {"makefile", "go.mod", "go.sum", "Gopkg.toml", "Gopkg.lock", "glide.yaml", "glide.lock", "vendor/"},
+}
diff --git a/talismanrc/talismanrc.go b/talismanrc/talismanrc.go
@@ -41,12 +41,12 @@ func (tRC *TalismanRC) Accept(addition gitrepo.Addition, detectorName string) bo
 	return !tRC.Deny(addition, detectorName)
 }
 
-func (tRC *TalismanRC) IgnoreAdditionsByScope(additions []gitrepo.Addition, scopeMap map[string][]string) []gitrepo.Addition {
+func (tRC *TalismanRC) FilterAdditions(additions []gitrepo.Addition) []gitrepo.Addition {
 	var applicableScopeFileNames []string
 	if tRC.ScopeConfig != nil {
 		for _, scope := range tRC.ScopeConfig {
-			if len(scopeMap[scope.ScopeName]) > 0 {
-				applicableScopeFileNames = append(applicableScopeFileNames, scopeMap[scope.ScopeName]...)
+			if len(knownScopes[scope.ScopeName]) > 0 {
+				applicableScopeFileNames = append(applicableScopeFileNames, knownScopes[scope.ScopeName]...)
 			}
 		}
 	}

diff --git a/talismanrc/talismanrc_test.go b/talismanrc/talismanrc_test.go
@@ -55,8 +55,8 @@ func TestIgnoreAdditionsByScope(t *testing.T) {
 	javaIgnores := []string{"java.lock"}
 	goIgnores := []string{"go.lock", "Gopkg.lock", "vendors/"}
 	scopesMap := map[string][]string{"node": nodeIgnores, "java": javaIgnores, "go": goIgnores}
-
-	filteredAdditions := talismanRCConfig.IgnoreAdditionsByScope(additions, scopesMap)
+	knownScopes = scopesMap
+	filteredAdditions := talismanRCConfig.FilterAdditions(additions)
 
 	assert.NotContains(t, filteredAdditions, file1)
 	assert.NotContains(t, filteredAdditions, file2)