mirror of
https://github.com/pomerium/pomerium.git
synced 2025-05-03 04:16:03 +02:00
ci: use revive instead of golint (#2370)
This commit is contained in:
parent
d45a7e9996
commit
2a5dcc2848
2 changed files with 4 additions and 11 deletions
|
@ -29,8 +29,6 @@ linters-settings:
|
||||||
min-complexity: 15
|
min-complexity: 15
|
||||||
goimports:
|
goimports:
|
||||||
local-prefixes: github.com/pomerium/pomerium
|
local-prefixes: github.com/pomerium/pomerium
|
||||||
golint:
|
|
||||||
min-confidence: 0
|
|
||||||
govet:
|
govet:
|
||||||
check-shadowing: false
|
check-shadowing: false
|
||||||
lll:
|
lll:
|
||||||
|
@ -55,7 +53,6 @@ linters:
|
||||||
- errcheck
|
- errcheck
|
||||||
- gofmt
|
- gofmt
|
||||||
- goimports
|
- goimports
|
||||||
- golint
|
|
||||||
- goprintffuncname
|
- goprintffuncname
|
||||||
- gosec
|
- gosec
|
||||||
- gosimple
|
- gosimple
|
||||||
|
@ -65,6 +62,7 @@ linters:
|
||||||
- misspell
|
- misspell
|
||||||
- nakedret
|
- nakedret
|
||||||
- nolintlint
|
- nolintlint
|
||||||
|
- revive
|
||||||
- rowserrcheck
|
- rowserrcheck
|
||||||
- staticcheck
|
- staticcheck
|
||||||
- structcheck
|
- structcheck
|
||||||
|
@ -144,8 +142,6 @@ issues:
|
||||||
# EXC0001 errcheck: Almost all programs ignore errors on these functions and in most cases it's ok
|
# EXC0001 errcheck: Almost all programs ignore errors on these functions and in most cases it's ok
|
||||||
- Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked
|
- Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
exclude-rules:
|
exclude-rules:
|
||||||
# https://github.com/go-critic/go-critic/issues/926
|
# https://github.com/go-critic/go-critic/issues/926
|
||||||
- linters:
|
- linters:
|
||||||
|
|
|
@ -58,15 +58,12 @@ func newDeltaCollection(p *Provider) *deltaCollection {
|
||||||
//
|
//
|
||||||
// Only the changed groups/members are returned. Removed groups/members have an @removed property.
|
// Only the changed groups/members are returned. Removed groups/members have an @removed property.
|
||||||
func (dc *deltaCollection) Sync(ctx context.Context) error {
|
func (dc *deltaCollection) Sync(ctx context.Context) error {
|
||||||
if err := dc.syncGroups(ctx); err != nil {
|
err := dc.syncGroups(ctx)
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := dc.syncUsers(ctx); err != nil {
|
return dc.syncUsers(ctx)
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dc *deltaCollection) syncGroups(ctx context.Context) error {
|
func (dc *deltaCollection) syncGroups(ctx context.Context) error {
|
||||||
|
|
Loading…
Add table
Reference in a new issue