Skip to content

Commit

Permalink
Bump golangci-lint to v1.55.2
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas De Loof <[email protected]>
  • Loading branch information
ndeloof authored and glours committed Dec 7, 2023
1 parent a0943a0 commit 6537c6c
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
cache: true
- uses: golangci/golangci-lint-action@v3
with:
version: v1.51.2
version: v1.55.2
args: --timeout 5m
- name: Test
run: go test ./...
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ FROM golang:1.20

WORKDIR /go/src

ARG GOLANGCILINT_VERSION=v1.51.2
ARG GOLANGCILINT_VERSION=v1.55.2
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCILINT_VERSION}
RUN go install github.com/kunalkushwaha/ltag@latest && rm -rf /go/src/github.com/kunalkushwaha

Expand Down
2 changes: 1 addition & 1 deletion loader/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (l localResourceLoader) Accept(p string) bool {
return err == nil
}

func (l localResourceLoader) Load(ctx context.Context, p string) (string, error) {
func (l localResourceLoader) Load(_ context.Context, p string) (string, error) {
return l.abs(p), nil
}

Expand Down
2 changes: 1 addition & 1 deletion loader/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2598,7 +2598,7 @@ func (c customLoader) Accept(s string) bool {
return strings.HasPrefix(s, c.prefix+":")
}

func (c customLoader) Load(ctx context.Context, s string) (string, error) {
func (c customLoader) Load(_ context.Context, s string) (string, error) {
path := filepath.Join("testdata", c.prefix, s[len(c.prefix)+1:])
_, err := os.Stat(path)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions override/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func mergeLogging(c any, o any, p tree.Path) (any, error) {
}

// environment must be first converted into yaml sequence syntax so we can append
func mergeEnvironment(c any, o any, p tree.Path) (any, error) {
func mergeEnvironment(c any, o any, _ tree.Path) (any, error) {
right := convertIntoSequence(c)
left := convertIntoSequence(o)
return append(right, left...), nil
Expand Down Expand Up @@ -136,14 +136,14 @@ func convertIntoSequence(value any) []any {
return nil
}

func mergeUlimit(c any, o any, p tree.Path) (any, error) {
func mergeUlimit(_ any, o any, p tree.Path) (any, error) {
over, ismapping := o.(map[string]any)
if base, ok := o.(map[string]any); ok && ismapping {
return mergeMappings(base, over, p)
}
return o, nil
}

func override(c any, other any, p tree.Path) (any, error) {
func override(_ any, other any, _ tree.Path) (any, error) {
return other, nil
}
2 changes: 1 addition & 1 deletion override/uncity.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func enforceUnicity(value any, p tree.Path) (any, error) {
return value, nil
}

func environmentIndexer(y any, p tree.Path) (string, error) {
func environmentIndexer(y any, _ tree.Path) (string, error) {
value := y.(string)
key, _, found := strings.Cut(value, "=")
if !found {
Expand Down
2 changes: 1 addition & 1 deletion transform/include.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/pkg/errors"
)

func transformInclude(data any, p tree.Path) (any, error) {
func transformInclude(data any, _ tree.Path) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil
Expand Down
2 changes: 1 addition & 1 deletion transform/ports.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pkg/errors"
)

func transformPorts(data any, p tree.Path) (any, error) {
func transformPorts(data any, _ tree.Path) (any, error) {
switch entries := data.(type) {
case []any:
// We process the list instead of individual items here.
Expand Down
2 changes: 1 addition & 1 deletion transform/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func transformService(data any, p tree.Path) (any, error) {
return transformMapping(value, p)
}

func transformServiceNetworks(data any, p tree.Path) (any, error) {
func transformServiceNetworks(data any, _ tree.Path) (any, error) {
if slice, ok := data.([]any); ok {
networks := make(map[string]any, len(slice))
for _, net := range slice {
Expand Down
2 changes: 1 addition & 1 deletion transform/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
)

func transformSSH(data any, p tree.Path) (any, error) {
func transformSSH(data any, _ tree.Path) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil
Expand Down
2 changes: 1 addition & 1 deletion transform/ulimits.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/pkg/errors"
)

func transformUlimits(data any, p tree.Path) (any, error) {
func transformUlimits(data any, _ tree.Path) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil
Expand Down
2 changes: 1 addition & 1 deletion transform/volume.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/pkg/errors"
)

func transformVolumeMount(data any, p tree.Path) (any, error) {
func transformVolumeMount(data any, _ tree.Path) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil
Expand Down

0 comments on commit 6537c6c

Please sign in to comment.