Skip to content

Commit

Permalink
golangci-lint instead of gometalinter
Browse files Browse the repository at this point in the history
  • Loading branch information
jelmersnoeck committed Mar 24, 2019
1 parent 26357c6 commit 1c74e4c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@ test: vendor
CGO_ENABLED=0 go test -v ./...

linters:
go get -u github.com/alecthomas/gometalinter
gometalinter --install
go get -u github.com/golangci/golangci-lint/cmd/golangci-lint

lint:
gometalinter --tests --disable-all --vendor --deadline=5m -e ".*generated.*" \
-E gofmt -E golint -E gosimple -E vet -E misspell -E ineffassign -E deadcode \
$(LINTER_PKGS)
golangci-lint run -D errcheck -D staticcheck ./...

cover: vendor
CGO_ENABLED=0 go test -v -coverprofile=coverage.txt -covermode=atomic ./...
Expand Down
10 changes: 1 addition & 9 deletions internal/ingressmonitor/operator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
imfake "github.com/jelmersnoeck/ingress-monitor/pkg/client/generated/clientset/versioned/fake"
"github.com/prometheus/client_golang/prometheus"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -349,7 +349,6 @@ type operatorConfig struct {

providers []runtime.Object
templates []runtime.Object
monitors []runtime.Object
ingressmonitors []runtime.Object
crdObjects []runtime.Object
}
Expand Down Expand Up @@ -377,13 +376,6 @@ func withTemplates(obj ...runtime.Object) optionFunc {
}
}

func withMonitors(obj ...runtime.Object) optionFunc {
return func(op *operatorConfig) {
op.monitors = append(op.monitors, obj...)
op.crdObjects = append(op.crdObjects, obj...)
}
}

func withIngressMonitors(obj ...runtime.Object) optionFunc {
return func(op *operatorConfig) {
op.ingressmonitors = append(op.ingressmonitors, obj...)
Expand Down

0 comments on commit 1c74e4c

Please sign in to comment.