✨ Remove isScorecardRepo (#1236)

* remove isScorecardRepo * linter * linter Co-authored-by: Naveen <[email protected]>
ossf · Nov 10, 2021 · 795505f · 795505f
1 parent 5524c97
commit 795505f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 35 deletions.
diff --git a/checks/file_utils.go b/checks/file_utils.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"github.com/ossf/scorecard/v3/checker"
-	"github.com/ossf/scorecard/v3/clients"
 	sce "github.com/ossf/scorecard/v3/errors"
 )
 
@@ -49,10 +48,10 @@ func isMatchingPath(pattern, fullpath string, caseSensitive bool) (bool, error)
 	return match, nil
 }
 
-func isScorecardTestFile(repo clients.Repo, fullpath string) bool {
+func isTestdataFile(fullpath string) bool {
 	// testdata/ or /some/dir/testdata/some/other
-	return repo.IsScorecardRepo() && (strings.HasPrefix(fullpath, "testdata/") ||
-		strings.Contains(fullpath, "/testdata/"))
+	return strings.HasPrefix(fullpath, "testdata/") ||
+		strings.Contains(fullpath, "/testdata/")
 }
 
 // FileCbData is any data the caller can act upon
@@ -78,8 +77,8 @@ func CheckFilesContent(shellPathFnPattern string,
 	data FileCbData,
 ) error {
 	predicate := func(filepath string) (bool, error) {
-		// Filter out Scorecard's own test files.
-		if isScorecardTestFile(c.Repo, filepath) {
+		// Filter out test files.
+		if isTestdataFile(filepath) {
 			return false, nil
 		}
 		// Filter out files based on path/names using the pattern.

diff --git a/clients/githubrepo/repo.go b/clients/githubrepo/repo.go
@@ -24,9 +24,7 @@ import (
 )
 
 const (
-	githubOrgRepo  = ".github"
-	scorecardOwner = "ossf"
-	scorecardRepo  = "scorecard"
+	githubOrgRepo = ".github"
 )
 
 type repoURL struct {
@@ -116,11 +114,6 @@ func (r *repoURL) Metadata() []string {
 	return r.metadata
 }
 
-// IsScorecardRepo implements Repo.IsScorecardRepo.
-func (r *repoURL) IsScorecardRepo() bool {
-	return r.owner == scorecardOwner && r.repo == scorecardRepo
-}
-
 // MakeGithubRepo takes input of form "owner/repo" or "github.com/owner/repo"
 // and returns an implementation of clients.Repo interface.
 func MakeGithubRepo(input string) (clients.Repo, error) {

diff --git a/clients/localdir/repo.go b/clients/localdir/repo.go
@@ -76,11 +76,6 @@ func (r *repoLocal) AppendMetadata(m ...string) {
 	r.metadata = append(r.metadata, m...)
 }
 
-// IsScorecardRepo implements Repo.IsScorecardRepo.
-func (r *repoLocal) IsScorecardRepo() bool {
-	return false
-}
-
 // MakeLocalDirRepo returns an implementation of clients.Repo interface.
 func MakeLocalDirRepo(pathfn string) (clients.Repo, error) {
 	if !strings.HasPrefix(pathfn, filePrefix) {

diff --git a/clients/mockrepo/repo.go b/clients/mockrepo/repo.go
diff --git a/clients/repo.go b/clients/repo.go
@@ -22,6 +22,4 @@ type Repo interface {
 	IsValid() error
 	Metadata() []string
 	AppendMetadata(metadata ...string)
-	// TODO: Find a better alterntive.
-	IsScorecardRepo() bool
 }