fix linter and unit-test errors

ossf · Sep 23, 2022 · 259fde0 · 259fde0
1 parent ebdd392
commit 259fde0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/checks/raw/branch_protection.go b/checks/raw/branch_protection.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/ossf/scorecard/v4/checker"
 	"github.com/ossf/scorecard/v4/clients"
+	mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
 )
 
 const master = "master"
@@ -73,8 +74,15 @@ func BranchProtection(c clients.RepoClient) (checker.BranchProtectionsData, erro
 		}
 
 		// TODO: if this is a sha, get the associated branch. for now, ignore.
-		if commit.MatchString(release.TargetCommitish) && !strings.Contains(c.URI(), "gitlab.") {
-			continue
+		switch c.(type) {
+		case *mockrepo.MockRepoClient:
+			if commit.MatchString(release.TargetCommitish) {
+				continue
+			}
+		default:
+			if commit.MatchString(release.TargetCommitish) && !strings.Contains(c.URI(), "gitlab.") {
+				continue
+			}
 		}
 
 		if branches.contains(release.TargetCommitish) ||

diff --git a/clients/gitlabrepo/branches.go b/clients/gitlabrepo/branches.go
@@ -43,7 +43,6 @@ func (handler *branchesHandler) init(repourl *repoURL) {
 	handler.once = new(sync.Once)
 }
 
-
 // nolint: nestif
 func (handler *branchesHandler) setup() error {
 	handler.once.Do(func() {
@@ -77,7 +76,7 @@ func (handler *branchesHandler) setup() error {
 
 			projectStatusChecks, resp, err := handler.glClient.ExternalStatusChecks.ListProjectStatusChecks(
 				handler.repourl.projectID, &gitlab.ListOptions{})
-        
+
 			if err != nil && resp.StatusCode != 404 && resp.StatusCode != 401 {
 				handler.errSetup = fmt.Errorf("request for external status checks failed with error %w", err)
 				return
@@ -111,6 +110,7 @@ func (handler *branchesHandler) getDefaultBranch() (*clients.BranchRef, error) {
 	return handler.defaultBranchRef, nil
 }
 
+// nolint: gocognit, nestif
 func (handler *branchesHandler) getBranch(commitOrBranch string) (*clients.BranchRef, error) {
 	// If the given string is a branch name then the branch can be found by simply getting branch by it's name.
 	bran, resp, err := handler.glClient.Branches.GetBranch(handler.repourl.projectID, commitOrBranch)
@@ -190,7 +190,7 @@ func (handler *branchesHandler) getBranch(commitOrBranch string) (*clients.Branc
 
 		projectStatusChecks, resp, err := handler.glClient.ExternalStatusChecks.ListProjectStatusChecks(
 			handler.repourl.projectID, &gitlab.ListOptions{})
-      
+
 		// Project Status Checks are only allowed for GitLab ultimate members so we will assume they are
 		// null if user does not have permissions.
 		if err != nil && resp.StatusCode != 404 && resp.StatusCode != 401 {

diff --git a/clients/gitlabrepo/commits.go b/clients/gitlabrepo/commits.go
@@ -38,8 +38,7 @@ func (handler *commitsHandler) init(repourl *repoURL) {
 	handler.once = new(sync.Once)
 }
 
-
-// nolint: gocognit
+// nolint: gocognit, nestif
 func (handler *commitsHandler) setup() error {
 	handler.once.Do(func() {
 		commits, _, err := handler.glClient.Commits.ListCommits(handler.repourl.projectID, &gitlab.ListCommitsOptions{})

diff --git a/clients/gitlabrepo/tarball_test.go b/clients/gitlabrepo/tarball_test.go
@@ -71,7 +71,7 @@ func setup(inputFile string) (tarballHandler, error) {
 	return tarballHandler, nil
 }
 
-//nolint: gocognit
+// nolint: gocognit
 func TestExtractTarball(t *testing.T) {
 	t.Parallel()
 	testcases := []struct {