Merge branch 'main' into licensed-in-docker

.buildkite/pipeline.yml

@@ -1,6 +1,6 @@
 steps:
-- name: "Docker Test %n"
+- name: "Go build and test %n"
   command: make
   plugins:
-    - docker-compose#v3.0.3:
+    - docker-compose#v3.7.0:
         run: app

Makefile

@@ -1,15 +1,19 @@
-all: build test
+.PHONY: all
+all: build test lint
 
-.PHONY: build test
+.PHONY: test
 test:
 	go test ./...
 
 .PHONY: build
 build:
 	go build ./...
 
-
 .PHONY: licensed
 licensed:
 	licensed cache
 	licensed status
+
+.PHONY: lint
+lint: 
+	@script/lint

internal/cmdutil/cmdutil.go

@@ -121,10 +121,7 @@ func IsUnderHomebrew(binpath string) bool {
 // HasHomebrew check whether the user has installed brew
 func HasHomebrew() bool {
 	_, err := exec.LookPath("brew")
-	if err == nil {
-		return true
-	}
-	return false
+	return err == nil
 }
 
 // MySQLClientPath checks whether the 'mysql' client exists and returns the

script/lint

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+# binary will be $(go env GOPATH)/bin/golangci-lint
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.40.1
+
+golangci-lint --version
+golangci-lint run ./...