Skip to content

Commit

Permalink
cleanup: Update golangci-lint and address new linter issues (#637)
Browse files Browse the repository at this point in the history
  • Loading branch information
3v1n0 authored Nov 14, 2024
2 parents 13082cf + 025381c commit 33931bb
Show file tree
Hide file tree
Showing 11 changed files with 136 additions and 128 deletions.
2 changes: 1 addition & 1 deletion internal/brokers/dbusbroker.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (b dbusBroker) call(ctx context.Context, method string, args ...interface{}
if errors.As(err, &dbusError) && dbusError.Name == "org.freedesktop.DBus.Error.ServiceUnknown" {
err = fmt.Errorf("couldn't connect to broker %q. Is it running?", b.name)
}
return nil, errmessages.NewErrorToDisplay(err)
return nil, errmessages.NewToDisplayError(err)
}

return call, nil
Expand Down
10 changes: 5 additions & 5 deletions internal/services/errmessages/error.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package errmessages

// ErrToDisplay defines an error that needs to be sent unaltered to the client.
type ErrToDisplay struct {
// ToDisplayError defines an error that needs to be sent unaltered to the client.
type ToDisplayError struct {
error
}

// NewErrorToDisplay returns a new ErrorToDisplay.
func NewErrorToDisplay(err error) error {
return ErrToDisplay{err}
// NewToDisplayError returns a new ErrorToDisplay.
func NewToDisplayError(err error) error {
return ToDisplayError{err}
}
2 changes: 1 addition & 1 deletion internal/services/errmessages/internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestRedactErrorInterceptor(t *testing.T) {
wantMessage string
}{
"Trim input down to ErrToDisplay": {
inputError: fmt.Errorf("Error to be redacted: %w", ErrToDisplay{errors.New("Error to be shown")}),
inputError: fmt.Errorf("Error to be redacted: %w", ToDisplayError{errors.New("Error to be shown")}),
wantMessage: "Error to be shown",
},
"Return original error": {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/errmessages/redactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func RedactErrorInterceptor(ctx context.Context, req any, _ *grpc.UnaryServerInf
m, err := handler(ctx, req)
if err != nil {
log.Warning(context.TODO(), err.Error())
var redactedError ErrToDisplay
var redactedError ToDisplayError
if !errors.As(err, &redactedError) {
return m, err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/services/nss/nss.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (s Service) GetPasswdByName(ctx context.Context, req *authd.GetPasswdByName
return nssPasswdFromUsersPasswd(u), nil
}

if !errors.Is(err, users.ErrNoDataFound{}) || !req.GetShouldPreCheck() {
if !errors.Is(err, users.NoDataFoundError{}) || !req.GetShouldPreCheck() {
return nil, noDataFoundErrorToGRPCError(err)
}

Expand Down Expand Up @@ -231,7 +231,7 @@ func nssShadowFromUsersShadow(u users.ShadowEntry) *authd.ShadowEntry {
// noDataFoundErrorToGRPCError converts a data not found to proper GRPC status code.
// This code is picked up by the NSS module to return corresponding NSS status.
func noDataFoundErrorToGRPCError(err error) error {
if !errors.Is(err, users.ErrNoDataFound{}) {
if !errors.Is(err, users.NoDataFoundError{}) {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion internal/services/pam/pam.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (s Service) GetPreviousBroker(ctx context.Context, req *authd.GPBRequest) (
// Load from database cache.
brokerID, err := s.userManager.BrokerForUser(req.GetUsername())
// User is not in our cache.
if err != nil && errors.Is(err, users.ErrNoDataFound{}) {
if err != nil && errors.Is(err, users.NoDataFoundError{}) {
// FIXME: this part will not be here in the v2 API version, as we won’t have GetPreviousBroker and handle
// autoselection silently in authd.
// User not in cache, if there is only the local broker available, return this one without saving it.
Expand Down
4 changes: 2 additions & 2 deletions internal/users/defs.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@ func groupEntryFromGroupDB(g cache.GroupDB) GroupEntry {
}
}

// ErrNoDataFound is the error returned when no entry is found in the cache.
type ErrNoDataFound = cache.NoDataFoundError
// NoDataFoundError is the error returned when no entry is found in the cache.
type NoDataFoundError = cache.NoDataFoundError
2 changes: 1 addition & 1 deletion internal/users/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (m *Manager) BrokerForUser(username string) (string, error) {
brokerID, err := m.cache.BrokerForUser(username)
// User not in cache.
if err != nil && errors.Is(err, cache.NoDataFoundError{}) {
return "", ErrNoDataFound{}
return "", NoDataFoundError{}
} else if err != nil {
return "", err
}
Expand Down
6 changes: 3 additions & 3 deletions pam/internal/adapter/pwquality_c.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
var challengeQualityMu sync.Mutex

// checkChallengeQuality checks the quality of the new password using the pwquality library.
func checkChallengeQuality(old, new string) error {
func checkChallengeQuality(oldChallenge, newChallenge string) error {
challengeQualityMu.Lock()
defer challengeQualityMu.Unlock()

Expand All @@ -35,10 +35,10 @@ func checkChallengeQuality(old, new string) error {
return fmt.Errorf("can't ready pwquality configuration: %s", errMsg)
}

oldC := C.CString(old)
oldC := C.CString(oldChallenge)
defer C.free(unsafe.Pointer(oldC))

newC := C.CString(new)
newC := C.CString(newChallenge)
defer C.free(unsafe.Pointer(newC))

if ret := C.pwquality_check(pwq, newC, oldC, nil, &auxErrPointer); ret < 0 {
Expand Down
73 changes: 38 additions & 35 deletions tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.23.0

require (
github.com/golang/protobuf v1.5.4
github.com/golangci/golangci-lint v1.61.0
github.com/golangci/golangci-lint v1.62.0
github.com/msteinert/pam/v2 v2.0.0-00010101000000-000000000000
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
)
Expand All @@ -13,60 +13,61 @@ 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/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 @@ -85,37 +86,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 @@ -130,18 +129,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 @@ -155,32 +157,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.35.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit 33931bb

Please sign in to comment.