Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump golangci lint v1.30.0 #4739

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/golangci-lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -e -o pipefail

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BIN=${DIR}/bin
VERSION=1.27.0
VERSION=1.30.0

function install_linter() {
echo "Installing GolangCI-Lint"
Expand Down
1 change: 1 addition & 0 deletions hack/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ linters:
- bodyclose
- deadcode
- dogsled
- gci
- goconst
- gocritic
- goimports
Expand Down
1 change: 0 additions & 1 deletion hack/linters.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ echo "Running linters..."
scripts=(
"hack/boilerplate.sh"
"hack/gofmt.sh"
"hack/pedantic-imports.sh"
"hack/golangci-lint.sh"
)
fail=0
Expand Down
46 changes: 0 additions & 46 deletions hack/pedantic-imports.sh

This file was deleted.

3 changes: 2 additions & 1 deletion integration/rpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import (
"testing"
"time"

"github.com/golang/protobuf/jsonpb" //nolint:golint,staticcheck
//nolint:golint,staticcheck
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/ptypes/empty"
"google.golang.org/grpc"

Expand Down
5 changes: 2 additions & 3 deletions pkg/skaffold/initializer/analyze/analyze_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ import (
"strings"
"testing"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
initconfig "github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer/config"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/jib"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
initconfig "github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer/config"
"github.com/GoogleContainerTools/skaffold/testutil"
)

Expand Down
4 changes: 3 additions & 1 deletion pkg/skaffold/kubernetes/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (

"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
_ "k8s.io/client-go/plugin/pkg/client/auth" // Initialize all known client auth plugins

// Initialize all known client auth plugins
_ "k8s.io/client-go/plugin/pkg/client/auth"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/context"
)
Expand Down
3 changes: 1 addition & 2 deletions pkg/skaffold/schema/v1beta5/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ package v1beta5
import (
"testing"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/yaml"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta6"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/yaml"
"github.com/GoogleContainerTools/skaffold/testutil"
)

Expand Down