From c35b3989a94e28b65fe18461d43a43186d9c4774 Mon Sep 17 00:00:00 2001 From: Marvin Preuss Date: Fri, 7 Jan 2022 20:17:12 +0100 Subject: [PATCH] happy linting --- .goreleaser.yml | 10 +++++----- assets/assets.go | 2 +- cmd/root.go | 4 ++-- main.go | 2 -- tools/pidof/pidof_test.go | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index b8cf6a2..489d75c 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -38,11 +38,11 @@ builds: pre: - make wireguard-go GOARCH={{.Arch}} - - id: 386 + - id: "386" env: - CGO_ENABLED=0 goarch: - - 386 + - "386" goos: - linux ldflags: @@ -62,7 +62,7 @@ builds: goarch: - arm goarm: - - 5 + - "5" goos: - linux ldflags: @@ -82,7 +82,7 @@ builds: goarch: - arm goarm: - - 6 + - "6" goos: - linux ldflags: @@ -102,7 +102,7 @@ builds: goarch: - arm goarm: - - 7 + - "7" goos: - linux ldflags: diff --git a/assets/assets.go b/assets/assets.go index aeb8834..cc796a7 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -1,4 +1,4 @@ -// nolint:gochecknoglobals,golint,stylecheck +// nolint:golint package assets import _ "embed" diff --git a/cmd/root.go b/cmd/root.go index fe1d216..356906a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,4 +1,4 @@ -// nolint: gochecknoglobals, exhaustivestruct, gochecknoinits +// nolint:gochecknoglobals,exhaustivestruct,gochecknoinits package cmd import ( @@ -102,7 +102,7 @@ var showCmd = &cobra.Command{ }, } -func loadConfig(cfg string) (*wgquick.Config, logrus.FieldLogger) { +func loadConfig(cfg string) (*wgquick.Config, logrus.FieldLogger) { //nolint:ireturn log := logrus.WithField("iface", iface) _, err := os.Stat(cfg) diff --git a/main.go b/main.go index 171bb55..70a5fef 100644 --- a/main.go +++ b/main.go @@ -2,8 +2,6 @@ package main import "go.xsfx.dev/wg-quicker/cmd" -//go:generate go-bindata -pkg assets -o assets/bindata.go -nomemcopy third_party/wireguard-go/wireguard-go - func main() { cmd.Execute() } diff --git a/tools/pidof/pidof_test.go b/tools/pidof/pidof_test.go index cb44712..91ae069 100644 --- a/tools/pidof/pidof_test.go +++ b/tools/pidof/pidof_test.go @@ -1,4 +1,4 @@ -// nolint:gochecknoglobals,paralleltest,goerr113,funlen +// nolint:paralleltest,goerr113,funlen package pidof_test import (