From 0029a8ce32a5f45c1982a784b930db06bf3a4ee5 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 7 Nov 2019 07:56:02 -0800 Subject: [PATCH] Update Makefile with licenseadder and golangci-lint --- kyaml/.golangci.yml | 54 ++++++++++++++++++++++++++++++++++++++++++ kyaml/LICENSE_TEMPLATE | 2 ++ kyaml/Makefile | 17 +++++++++---- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 kyaml/.golangci.yml create mode 100644 kyaml/LICENSE_TEMPLATE diff --git a/kyaml/.golangci.yml b/kyaml/.golangci.yml new file mode 100644 index 000000000..4b800e332 --- /dev/null +++ b/kyaml/.golangci.yml @@ -0,0 +1,54 @@ +# Copyright 2019 The Kubernetes Authors. +# SPDX-License-Identifier: Apache-2.0 + +run: + deadline: 5m + +linters: + # please, do not use `enable-all`: it's deprecated and will be removed soon. + # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint + disable-all: true + enable: + - bodyclose + - deadcode + - depguard + - dogsled + - dupl +# - errcheck +# - funlen +# - gochecknoinits +# - goconst +# - gocritic + - gocyclo + - gofmt + - goimports +# - golint + - gosec + - gosimple + - govet + - ineffassign + - interfacer +# - lll + - misspell + - nakedret +# - scopelint + - staticcheck + - structcheck +# - stylecheck + - typecheck + - unconvert +# - unparam + - unused + - varcheck +# - whitespace + + +linters-settings: + dupl: + threshold: 400 + lll: + line-length: 170 + gocyclo: + min-complexity: 30 + golint: + min-confidence: 0.85 diff --git a/kyaml/LICENSE_TEMPLATE b/kyaml/LICENSE_TEMPLATE new file mode 100644 index 000000000..0c2b3b655 --- /dev/null +++ b/kyaml/LICENSE_TEMPLATE @@ -0,0 +1,2 @@ +Copyright {{.Year}} {{.Holder}} +SPDX-License-Identifier: Apache-2.0 diff --git a/kyaml/Makefile b/kyaml/Makefile index 9bdd630b2..de4536c95 100644 --- a/kyaml/Makefile +++ b/kyaml/Makefile @@ -1,9 +1,14 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -.PHONY: generate fix vet fmt test build tidy +.PHONY: generate license fix vet fmt test build tidy -all: generate fix vet fmt test build tidy +GOPATH := $(shell go env GOPATH) + +build: + go build -v -o $(GOPATH)/bin/kyaml . + +all: generate license fix vet fmt test lint lint tidy fix: go fix ./... @@ -14,12 +19,16 @@ fmt: generate: go generate ./... +license: + (which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense) + $(GOPATH)/bin/addlicense -y 2019 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE . + tidy: go mod tidy lint: - (which $(go env GOPATH)/bin/golangci-lint || go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.19.1) - $(go env GOPATH)/bin/golangci-lint run ./... + (which $(GOPATH)/bin/golangci-lint || go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.19.1) + $(GOPATH)/bin/golangci-lint run ./... test: go test -cover ./...