refactor: Addressed linting errors

Signed-off-by: Robison, Jim B <jim.b.robison@lmco.com>
ossf · May 3, 2023 · 0881a68 · 0881a68
1 parent 91d8f6c
commit 0881a68
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/checks/packaging.go b/checks/packaging.go
@@ -15,8 +15,6 @@
 package checks
 
 import (
-	"errors"
-
 	"github.com/ossf/scorecard/v4/checker"
 	"github.com/ossf/scorecard/v4/checks/evaluation"
 	"github.com/ossf/scorecard/v4/checks/raw/github"
@@ -42,13 +40,15 @@ func Packaging(c *checker.CheckRequest) checker.CheckResult {
 	var rawData checker.PackagingData
 	var err error
 
-	if _, clientType := c.RepoClient.(*githubrepo.Client); clientType {
+	switch v := c.RepoClient.(type) {
+	case *githubrepo.Client:
 		rawData, err = github.Packaging(c)
-	} else if _, clientType := c.RepoClient.(*gitlabrepo.Client); clientType {
+	case *gitlabrepo.Client:
 		rawData, err = gitlab.Packaging(c)
-	} else {
-		err = errors.New("invalid RepoClient")
+	default:
+		_ = v
 	}
+
 	if err != nil {
 		e := sce.WithMessage(sce.ErrScorecardInternal, err.Error())
 		return checker.CreateRuntimeErrorResult(CheckPackaging, e)

diff --git a/checks/raw/gitlab/packaging.go b/checks/raw/gitlab/packaging.go
@@ -59,7 +59,7 @@ func StringPointer(s string) *string {
 }
 
 func isGitlabPackagingWorkflow(fc []byte, fp string) (checker.File, bool) {
-	var lineNumber uint = checker.OffsetDefault
+	lineNumber := checker.OffsetDefault
 
 	packagingStrings := []string{
 		"docker push",

diff --git a/checks/raw/gitlab/packaging_test.go b/checks/raw/gitlab/packaging_test.go
@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
+
 	"github.com/ossf/scorecard/v4/checker"
 	mockrepo "github.com/ossf/scorecard/v4/clients/mockclients"
 )
@@ -135,6 +136,7 @@ func TestGitlabPackagingPackager(t *testing.T) {
 
 			moqRepoClient.EXPECT().GetFileContent(tt.filename).
 				DoAndReturn(func(b string) ([]byte, error) {
+					//nolint: errcheck
 					content, _ := os.ReadFile(b)
 					return content, nil
 				}).AnyTimes()
@@ -148,6 +150,7 @@ func TestGitlabPackagingPackager(t *testing.T) {
 				Repo:       moqRepo,
 			}
 
+			//nolint: errcheck
 			packagingData, _ := Packaging(&req)
 
 			if !tt.exists {

diff --git a/checks/raw/permissions.go b/checks/raw/permissions.go
@@ -22,10 +22,9 @@ import (
 
 	"github.com/ossf/scorecard/v4/checker"
 	"github.com/ossf/scorecard/v4/checks/fileparser"
+	"github.com/ossf/scorecard/v4/checks/raw/github"
 	sce "github.com/ossf/scorecard/v4/errors"
 	"github.com/ossf/scorecard/v4/finding"
-
-	"github.com/ossf/scorecard/v4/checks/raw/github"
 )
 
 type permission string