lint(golangci): Fix GolangCI lints (#242)

fossas · Aug 30, 2018 · 92341dc · 92341dc
1 parent e7f9c39
commit 92341dc
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/analyzers/golang/project.go b/analyzers/golang/project.go
@@ -68,6 +68,9 @@ func (a *Analyzer) Project(pkg string) (Project, error) {
 
 	// Find the nearest lockfile.
 	tool, manifestDir, err := NearestLockfile(dir)
+	if err != nil {
+		return Project{}, err
+	}
 
 	// Find the nearest VCS repository.
 	_, repoRoot, err := vcs.Nearest(dir)

diff --git a/analyzers/maven/maven.go b/analyzers/maven/maven.go
@@ -43,6 +43,9 @@ func New(m module.Module) (*Analyzer, error) {
 
 	// Get Maven binary.
 	mvnBin, _, err := exec.Which("--version", options.Binary, os.Getenv("MAVEN_BINARY"), "mvn")
+	if err != nil {
+		log.Warnf("Could not find Maven binary: %s", err.Error())
+	}
 
 	analyzer := Analyzer{
 		Maven: maven.Maven{

diff --git a/buildtools/cocoapods/lockfile_test.go b/buildtools/cocoapods/lockfile_test.go
@@ -15,5 +15,6 @@ func TestLockfileParsing(t *testing.T) {
 	assert.NoError(t, err)
 
 	data, err := json.Marshal(lockfile)
+	assert.NoError(t, err)
 	fmt.Printf("%s", string(data))
 }
diff --git a/cmd/fossa/cmd/analyze/analyze.go b/cmd/fossa/cmd/analyze/analyze.go
@@ -66,7 +66,10 @@ func Run(ctx *cli.Context) error {
 				log.Fatalf("Could not parse template data: %s", err.Error())
 			}
 		} else {
-			display.JSON(normalized)
+			_, err := display.JSON(normalized)
+			if err != nil {
+				log.Fatalf("Could not serialize to JSON: %s", err.Error())
+			}
 		}
 
 		return nil

diff --git a/cmd/fossa/cmd/test/test.go b/cmd/fossa/cmd/test/test.go
@@ -21,8 +21,6 @@ import (
 var Timeout = "timeout"
 
 const pollRequestDelay = 8 * time.Second
-const buildsEndpoint = "/api/revisions/%s/build"
-const revisionsEndpoint = "/api/revisions/%s"
 
 var Cmd = cli.Command{
 	Name:   "test",

diff --git a/cmd/fossa/main.go b/cmd/fossa/main.go
@@ -58,13 +58,16 @@ func main() {
 }
 
 func Run(ctx *cli.Context) error {
-	setup.SetContext(ctx)
+	err := setup.SetContext(ctx)
+	if err != nil {
+		return err
+	}
 
 	if config.APIKey() == "" && !ctx.Bool(analyze.ShowOutput) {
 		return cli.ShowAppHelp(ctx)
 	}
 
-	err := initc.Run(ctx)
+	err = initc.Run(ctx)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/fossa/version/version_test.go b/cmd/fossa/version/version_test.go
@@ -41,12 +41,6 @@ var prod = versions{
 	goversion: "go version go1.10.2 linux/amd64",
 }
 
-func testShortStringSpaces(t *testing.T) {
-	if s := ShortString(); len(strings.Fields(s)) > 1 {
-		t.Errorf("ShortString() had whitespace: %#v", s)
-	}
-}
-
 func TestShortStringHasNoSpaces(t *testing.T) {
 	testCases := []versions{
 		noLdFlags, dev, prod,