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.

Sign up for GitHub

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

build(deps): bump github.com/golangci/golangci-lint from 1.61.0 to 1.62.0 in /tools #8386

Merged
merged 3 commits into from
Nov 12, 2024
Merged

build(deps): bump github.com/golangci/golangci-lint from 1.61.0 to 1.62.0 in /tools #8386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
486bb49
build(deps): bump github.com/golangci/golangci-lint in /tools
dependabot[bot] Nov 11, 2024
63bd83e
Remove deprecated Error* aliases
vdemeester Nov 12, 2024
562bf43
Update golangci-lint to exclude some new linters…
vdemeester Nov 12, 2024
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
3 changes: 2 additions & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ linters:
- godox
- err113
- gofumpt
- gomnd
- gomoddirectives
- iface
- ireturn
- lll
- mnd
Expand All @@ -98,6 +98,7 @@ linters:
- paralleltest
- prealloc
- predeclared
- recvcheck
- revive
- staticcheck
- stylecheck
Expand Down
14 changes: 2 additions & 12 deletions cmd/entrypoint/subcommands/subcommands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,8 @@ func (err OK) Error() string {
return err.message
}

// SubcommandSuccessful is an alias for the OK type.
//
// Deprecated: replace usage with OK type.
type SubcommandSuccessful = OK

var (
// Compile-time check that OK is an error type.
_ error = OK{}
// Compile-time check that objects of type OK are cast to deprecated
// SubcommandSuccessful type.
_ SubcommandSuccessful = OK{}
)
// Compile-time check that OK is an error type.
var _ error = OK{}

// SubcommandError is returned for failed subcommand executions.
type SubcommandError struct {
Expand Down
16 changes: 4 additions & 12 deletions pkg/remote/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@ package remote

import "errors"

var (
// ErrRequestInProgress is a sentinel value that indicates
// resolving a remote file like a pipeline in a bundle or
// a task in git hasn't completed yet.
ErrRequestInProgress = errors.New("resource request in progress")

// ErrorRequestInProgress is an alias for ErrRequestInProgress and will be
// removed in a future release..
//
// Deprecated: use ErrRequestInProgress instead
ErrorRequestInProgress = ErrRequestInProgress
)
// ErrRequestInProgress is a sentinel value that indicates
// resolving a remote file like a pipeline in a bundle or
// a task in git hasn't completed yet.
var ErrRequestInProgress = errors.New("resource request in progress")
34 changes: 5 additions & 29 deletions pkg/remote/resolution/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,17 @@ import (
"fmt"
)

var (
// ErrNilResource is returned when remote resolution
// appears to have succeeded but the resolved resource is nil.
ErrNilResource = errors.New("unknown error occurred: requested resource is nil")

// ErrorRequestedResourceIsNil is a deprecated alias for ErrNilResource and will
// be removed in a future release.
//
// Deprecated: use ErrNilResource instead.
ErrorRequestedResourceIsNil = ErrNilResource
)
// ErrNilResource is returned when remote resolution
// appears to have succeeded but the resolved resource is nil.
var ErrNilResource = errors.New("unknown error occurred: requested resource is nil")

// InvalidRuntimeObjectError is returned when remote resolution
// succeeded but the returned data is not a valid runtime.Object.
type InvalidRuntimeObjectError struct {
Original error
}

// ErrorInvalidRuntimeObject is an alias to InvalidRuntimeObjectError.
//
// Deprecated: use InvalidRuntimeObjectError instead.
type ErrorInvalidRuntimeObject = InvalidRuntimeObjectError

var (
_ error = &InvalidRuntimeObjectError{}
_ error = &ErrorInvalidRuntimeObject{}
)
var _ error = &InvalidRuntimeObjectError{}

// Error returns the string representation of this error.
func (e *InvalidRuntimeObjectError) Error() string {
Expand All @@ -71,15 +55,7 @@ type DataAccessError struct {
Original error
}

// ErrorAccessingData is an alias to DataAccessError
//
// Deprecated: use DataAccessError instead.
type ErrorAccessingData = DataAccessError

var (
_ error = &DataAccessError{}
_ error = &ErrorAccessingData{}
)
var _ error = &DataAccessError{}

// Error returns the string representation of this error.
func (e *DataAccessError) Error() string {
Expand Down
33 changes: 3 additions & 30 deletions pkg/resolution/common/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,9 @@ func NewError(reason string, err error) *Error {
}
}

var (
// ErrRequestInProgress is a sentinel value to indicate that
// a resource request is still in progress.
ErrRequestInProgress = NewError("RequestInProgress", errors.New("Resource request is still in-progress"))

// ErrorRequestInProgress is an alias to ErrRequestInProgress
//
// Deprecated: use ErrRequestInProgress instead.
ErrorRequestInProgress = ErrRequestInProgress
)
// ErrRequestInProgress is a sentinel value to indicate that
// a resource request is still in progress.
var ErrRequestInProgress = NewError("RequestInProgress", errors.New("Resource request is still in-progress"))

// InvalidResourceKeyError indicates that a string key given to the
// Reconcile function does not match the expected "name" or "namespace/name"
Expand All @@ -80,11 +73,6 @@ type InvalidResourceKeyError struct {
Original error
}

// ErrorInvalidResourceKey is an alias to type InvalidResourceKeyError.
//
// Deprecated: use type InvalidResourceKeyError instead.
type ErrorInvalidResourceKey = InvalidResourceKeyError

var _ error = &InvalidResourceKeyError{}

func (e *InvalidResourceKeyError) Error() string {
Expand All @@ -104,11 +92,6 @@ type InvalidRequestError struct {
Message string
}

// ErrorInvalidRequest is an alias to type InvalidRequestError.
//
// Deprecated: use type InvalidRequestError instead.
type ErrorInvalidRequest = InvalidRequestError

var _ error = &InvalidRequestError{}

func (e *InvalidRequestError) Error() string {
Expand All @@ -123,11 +106,6 @@ type GetResourceError struct {
Original error
}

// ErrorGettingResource is an alias to type GetResourceError.
//
// Deprecated: use type GetResourceError instead.
type ErrorGettingResource = GetResourceError

var _ error = &GetResourceError{}

func (e *GetResourceError) Error() string {
Expand All @@ -146,11 +124,6 @@ type UpdatingRequestError struct {
Original error
}

// ErrorUpdatingRequest is an alias to UpdatingRequestError
//
// Deprecated: use UpdatingRequestError instead.
type ErrorUpdatingRequest = UpdatingRequestError

var _ error = &UpdatingRequestError{}

func (e *UpdatingRequestError) Error() string {
Expand Down
13 changes: 3 additions & 10 deletions pkg/resolution/resolver/framework/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,16 +173,9 @@ func LeaderAwareFuncs(lister rrlister.ResolutionRequestLister) reconciler.Leader
}
}

var (
// ErrMissingTypeSelector is returned when a resolver does not return
// a selector with a type label from its GetSelector method.
ErrMissingTypeSelector = fmt.Errorf("invalid resolver: minimum selector must include %q", common.LabelKeyResolverType)

// ErrorMissingTypeSelector is an alias to ErrMissingTypeSelector
//
// Deprecated: use ErrMissingTypeSelector instead.
ErrorMissingTypeSelector = ErrMissingTypeSelector
)
// ErrMissingTypeSelector is returned when a resolver does not return
// a selector with a type label from its GetSelector method.
var ErrMissingTypeSelector = fmt.Errorf("invalid resolver: minimum selector must include %q", common.LabelKeyResolverType)

func ValidateResolver(ctx context.Context, sel map[string]string) error {
if sel == nil {
Expand Down
73 changes: 38 additions & 35 deletions tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,68 @@ go 1.22.1

toolchain go1.22.5

require github.com/golangci/golangci-lint v1.61.0
require github.com/golangci/golangci-lint v1.62.0

require (
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
4d63.com/gochecknoglobals v0.2.1 // indirect
github.com/4meepo/tagalign v1.3.4 // indirect
github.com/Abirdcfly/dupword v0.1.1 // indirect
github.com/Antonboom/errname v0.1.13 // indirect
github.com/Antonboom/nilnil v0.1.9 // indirect
github.com/Antonboom/testifylint v1.4.3 // indirect
github.com/Abirdcfly/dupword v0.1.3 // indirect
github.com/Antonboom/errname v1.0.0 // indirect
github.com/Antonboom/nilnil v1.0.0 // indirect
github.com/Antonboom/testifylint v1.5.0 // indirect
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
github.com/Crocmagnon/fatcontext v0.5.2 // indirect
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
github.com/alecthomas/go-check-sumtype v0.2.0 // indirect
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
github.com/alexkohler/prealloc v1.0.0 // indirect
github.com/alingse/asasalint v0.0.11 // indirect
github.com/ashanbrown/forbidigo v1.6.0 // indirect
github.com/ashanbrown/makezero v1.1.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bkielbasa/cyclop v1.2.1 // indirect
github.com/bkielbasa/cyclop v1.2.3 // indirect
github.com/blizzy78/varnamelen v0.8.0 // indirect
github.com/bombsimon/wsl/v4 v4.4.1 // indirect
github.com/breml/bidichk v0.2.7 // indirect
github.com/breml/errchkjson v0.3.6 // indirect
github.com/breml/bidichk v0.3.2 // indirect
github.com/breml/errchkjson v0.4.0 // indirect
github.com/butuzov/ireturn v0.3.0 // indirect
github.com/butuzov/mirror v1.2.0 // indirect
github.com/catenacyber/perfsprint v0.7.1 // indirect
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/charithe/durationcheck v0.0.10 // indirect
github.com/chavacava/garif v0.1.0 // indirect
github.com/ckaznocha/intrange v0.2.0 // indirect
github.com/ckaznocha/intrange v0.2.1 // indirect
github.com/curioswitch/go-reassign v0.2.0 // indirect
github.com/daixiang0/gci v0.13.5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/denis-tingaikin/go-header v0.5.0 // indirect
github.com/ettle/strcase v0.2.0 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/firefart/nonamedreturns v1.0.5 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/fzipp/gocyclo v0.6.0 // indirect
github.com/ghostiam/protogetter v0.3.6 // indirect
github.com/go-critic/go-critic v0.11.4 // indirect
github.com/ghostiam/protogetter v0.3.8 // indirect
github.com/go-critic/go-critic v0.11.5 // indirect
github.com/go-toolsmith/astcast v1.1.0 // indirect
github.com/go-toolsmith/astcopy v1.1.0 // indirect
github.com/go-toolsmith/astequal v1.2.0 // indirect
github.com/go-toolsmith/astfmt v1.1.0 // indirect
github.com/go-toolsmith/astp v1.1.0 // indirect
github.com/go-toolsmith/strparse v1.1.0 // indirect
github.com/go-toolsmith/typep v1.1.0 // indirect
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/flock v0.12.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
github.com/golangci/go-printf-func-name v0.1.0 // indirect
github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
github.com/golangci/misspell v0.6.0 // indirect
github.com/golangci/modinfo v0.3.4 // indirect
Expand All @@ -83,37 +84,35 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jgautheron/goconst v1.7.1 // indirect
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
github.com/jjti/go-spancheck v0.6.2 // indirect
github.com/julz/importas v0.1.0 // indirect
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
github.com/kisielk/errcheck v1.7.0 // indirect
github.com/kisielk/errcheck v1.8.0 // indirect
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
github.com/kulti/thelper v0.6.3 // indirect
github.com/kunwardeep/paralleltest v1.0.10 // indirect
github.com/kyoh86/exportloopref v0.1.11 // indirect
github.com/lasiar/canonicalheader v1.1.1 // indirect
github.com/lasiar/canonicalheader v1.1.2 // indirect
github.com/ldez/gomoddirectives v0.2.4 // indirect
github.com/ldez/tagliatelle v0.5.0 // indirect
github.com/leonklingele/grouper v1.1.2 // indirect
github.com/lufeee/execinquery v1.2.1 // indirect
github.com/macabu/inamedparam v0.1.3 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/maratori/testableexamples v1.0.0 // indirect
github.com/maratori/testpackage v1.1.1 // indirect
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mgechev/revive v1.3.9 // indirect
github.com/mgechev/revive v1.5.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moricho/tparallel v0.3.2 // indirect
github.com/nakabonne/nestif v0.3.1 // indirect
github.com/nishanths/exhaustive v0.12.0 // indirect
github.com/nishanths/predeclared v0.2.2 // indirect
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
github.com/nunnatsa/ginkgolinter v0.18.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
Expand All @@ -128,18 +127,21 @@ require (
github.com/quasilyte/gogrep v0.5.0 // indirect
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
github.com/raeperd/recvcheck v0.1.2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/ryancurrah/gomodguard v1.3.5 // indirect
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
github.com/securego/gosec/v2 v2.21.2 // indirect
github.com/securego/gosec/v2 v2.21.4 // indirect
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sivchari/containedctx v1.0.3 // indirect
github.com/sivchari/tenv v1.10.0 // indirect
github.com/sonatard/noctx v0.0.2 // indirect
github.com/sivchari/tenv v1.12.1 // indirect
github.com/sonatard/noctx v0.1.0 // indirect
github.com/sourcegraph/go-diff v0.7.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.5.0 // indirect
Expand All @@ -153,32 +155,33 @@ require (
github.com/stretchr/testify v1.9.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/tdakkota/asciicheck v0.2.0 // indirect
github.com/tetafro/godot v1.4.17 // indirect
github.com/tetafro/godot v1.4.18 // indirect
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
github.com/timonwong/loggercheck v0.9.4 // indirect
github.com/timonwong/loggercheck v0.10.1 // indirect
github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
github.com/ultraware/funlen v0.1.0 // indirect
github.com/ultraware/whitespace v0.1.1 // indirect
github.com/uudashr/gocognit v1.1.3 // indirect
github.com/uudashr/iface v1.2.0 // indirect
github.com/xen0n/gosmopolitan v1.2.2 // indirect
github.com/yagipy/maintidx v1.0.0 // indirect
github.com/yeya24/promlinter v0.3.0 // indirect
github.com/ykadowak/zerologlint v0.1.5 // indirect
gitlab.com/bosi/decorder v0.4.2 // indirect
go-simpler.org/musttag v0.12.2 // indirect
go-simpler.org/musttag v0.13.0 // indirect
go-simpler.org/sloglint v0.7.2 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/tools v0.27.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading