From d40a4a4b3266e018be6ab94849d1c3e4089f7c7c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 22 Jun 2021 13:26:37 +0200
Subject: [PATCH] Enable go vet for ci (#230)

* enable go vet for ci

* fix vet issues

* move `./.cli.sh` into `make release-cli`
---
 .cli.sh                                       | 23 -------------------
 .drone.yml                                    |  3 ++-
 Makefile                                      | 18 +++++++++++++++
 .../pipeline/rpc/client_grpc_health.go        |  2 --
 remote/gogs/helper_test.go                    |  6 ++---
 5 files changed, 23 insertions(+), 29 deletions(-)
 delete mode 100755 .cli.sh

diff --git a/.cli.sh b/.cli.sh
deleted file mode 100755
index bda21c69e..000000000
--- a/.cli.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-set -x
-
-# disable CGO for cross-compiling
-export CGO_ENABLED=0
-
-# compile for all architectures
-GOOS=linux   GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/amd64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
-GOOS=linux   GOARCH=arm64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
-GOOS=linux   GOARCH=arm   go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm/woodpecker     github.com/woodpecker-ci/woodpecker/cli/drone
-GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/windows/amd64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone
-GOOS=darwin  GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/darwin/amd64/woodpecker  github.com/woodpecker-ci/woodpecker/cli/drone
-
-# tar binary files prior to upload
-tar -cvzf cli/release/woodpecker_linux_amd64.tar.gz   -C cli/release/linux/amd64   woodpecker
-tar -cvzf cli/release/woodpecker_linux_arm64.tar.gz   -C cli/release/linux/arm64   woodpecker
-tar -cvzf cli/release/woodpecker_linux_arm.tar.gz     -C cli/release/linux/arm     woodpecker
-tar -cvzf cli/release/woodpecker_windows_amd64.tar.gz -C cli/release/windows/amd64 woodpecker
-tar -cvzf cli/release/woodpecker_darwin_amd64.tar.gz  -C cli/release/darwin/amd64  woodpecker
-
-# generate shas for tar files
-sha256sum cli/release/*.tar.gz > cli/release/woodpecker_checksums.txt
diff --git a/.drone.yml b/.drone.yml
index 9fe58659b..06864cc2c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,6 +9,7 @@ pipeline:
     commands:
       - make deps
       - make test
+      - make vet
       - make formatcheck
 
   test-frontend:
@@ -64,7 +65,7 @@ pipeline:
 
   build-cli:
     image: golang:1.16
-    commands: sh .cli.sh
+    commands: make release-cli
 
   publish-server:
     image: plugins/docker
diff --git a/Makefile b/Makefile
index c45cb2407..56576cec9 100644
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,24 @@ release-agent:
 release-server:
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o release/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
 
+release-cli:
+	# disable CGO for cross-compiling
+	export CGO_ENABLED=0
+	# compile for all architectures
+	GOOS=linux   GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/amd64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
+	GOOS=linux   GOARCH=arm64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm64/woodpecker   github.com/woodpecker-ci/woodpecker/cli/drone
+	GOOS=linux   GOARCH=arm   go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm/woodpecker     github.com/woodpecker-ci/woodpecker/cli/drone
+	GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/windows/amd64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone
+	GOOS=darwin  GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/darwin/amd64/woodpecker  github.com/woodpecker-ci/woodpecker/cli/drone
+	# tar binary files prior to upload
+	tar -cvzf cli/release/woodpecker_linux_amd64.tar.gz   -C cli/release/linux/amd64   woodpecker
+	tar -cvzf cli/release/woodpecker_linux_arm64.tar.gz   -C cli/release/linux/arm64   woodpecker
+	tar -cvzf cli/release/woodpecker_linux_arm.tar.gz     -C cli/release/linux/arm     woodpecker
+	tar -cvzf cli/release/woodpecker_windows_amd64.tar.gz -C cli/release/windows/amd64 woodpecker
+	tar -cvzf cli/release/woodpecker_darwin_amd64.tar.gz  -C cli/release/darwin/amd64  woodpecker
+	# generate shas for tar files
+	sha256sum cli/release/*.tar.gz > cli/release/woodpecker_checksums.txt
+
 release: release-agent release-server
 
 install:
diff --git a/cncd/pipeline/pipeline/rpc/client_grpc_health.go b/cncd/pipeline/pipeline/rpc/client_grpc_health.go
index 3b96ecc7d..3359f70f9 100644
--- a/cncd/pipeline/pipeline/rpc/client_grpc_health.go
+++ b/cncd/pipeline/pipeline/rpc/client_grpc_health.go
@@ -58,6 +58,4 @@ func (c *healthClient) Check(ctx context.Context) (bool, error) {
 		}
 		<-time.After(backoff)
 	}
-
-	return true, nil
 }
diff --git a/remote/gogs/helper_test.go b/remote/gogs/helper_test.go
index 2621cd12c..2ffe2a916 100644
--- a/remote/gogs/helper_test.go
+++ b/remote/gogs/helper_test.go
@@ -145,9 +145,9 @@ func Test_parse(t *testing.T) {
 
 		g.It("Should return a Perm struct from a Gogs Perm", func() {
 			perms := []gogs.Permission{
-				{true, true, true},
-				{true, true, false},
-				{true, false, false},
+				{Admin: true, Pull: true, Push: true},
+				{Admin: true, Pull: true, Push: false},
+				{Admin: true, Push: false, Pull: false},
 			}
 			for _, from := range perms {
 				perm := toPerm(from)