Skip to content

Commit 40f4c06

Browse files
mmorel-35mmorel-35
committed
chore: explicit revive rules
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent cc66d6d commit 40f4c06

File tree

37 files changed

+134
-137
lines changed

37 files changed

+134
-137
lines changed

‎.golangci.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,48 @@ linters-settings:
9494
strconcat: false
9595
revive:
9696
ignore-generated-header: true
97+
min-confidence: 0.8
98+
rules:
99+
- name: blank-imports
100+
disabled: true
101+
- name: context-as-argument
102+
disabled: true
103+
arguments:
104+
- allowTypesBefore: "*testing.T"
105+
- name: context-keys-type
106+
- name: dot-imports
107+
- name: early-return
108+
arguments:
109+
- "preserveScope"
110+
- name: empty-block
111+
- name: error-naming
112+
disabled: true
113+
- name: error-return
114+
- name: error-strings
115+
- name: errorf
116+
- name: increment-decrement
117+
disabled: true
118+
- name: indent-error-flow
119+
arguments:
120+
- "preserveScope"
121+
- name: range
122+
- name: receiver-naming
123+
disabled: true
124+
- name: redefines-builtin-id
125+
- name: superfluous-else
126+
arguments:
127+
- "preserveScope"
128+
- name: time-naming
129+
- name: unexported-return
130+
disabled: true
131+
- name: unreachable-code
132+
- name: unused-parameter
133+
disabled: true
134+
- name: use-any
135+
- name: var-declaration
136+
disabled: true
137+
- name: var-naming
138+
disabled: true
97139
testifylint:
98140
enable-all: true
99141
linters:

‎magefiles/magefile.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ func init() {
4141
}
4242

4343
func version() (string, error) {
44-
if ver, err := sh.Output("git", "describe", "--tags", "--always"); err != nil {
44+
ver, err := sh.Output("git", "describe", "--tags", "--always")
45+
if err != nil {
4546
return "", err
46-
} else {
47-
// Strips the v prefix from the tag
48-
return strings.TrimPrefix(ver, "v"), nil
4947
}
48+
// Strips the v prefix from the tag
49+
return strings.TrimPrefix(ver, "v"), nil
5050
}
5151

5252
func buildLdflags() (string, error) {

‎pkg/cache/fs_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,8 @@ func TestFSCache_PutBlob(t *testing.T) {
289289
require.Error(t, err)
290290
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
291291
return
292-
} else {
293-
require.NoError(t, err, tt.name)
294292
}
293+
require.NoError(t, err, tt.name)
295294

296295
fs.db.View(func(tx *bolt.Tx) error {
297296
layerBucket := tx.Bucket([]byte(blobBucket))
@@ -369,9 +368,8 @@ func TestFSCache_PutArtifact(t *testing.T) {
369368
require.Error(t, err)
370369
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
371370
return
372-
} else {
373-
require.NoError(t, err, tt.name)
374371
}
372+
require.NoError(t, err, tt.name)
375373

376374
err = fs.db.View(func(tx *bolt.Tx) error {
377375
// check decompressedDigestBucket

‎pkg/cache/remote_test.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,8 @@ func TestRemoteCache_PutArtifact(t *testing.T) {
155155
require.Error(t, err, tt.name)
156156
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
157157
return
158-
} else {
159-
require.NoError(t, err, tt.name)
160158
}
159+
require.NoError(t, err, tt.name)
161160
})
162161
}
163162
}
@@ -220,9 +219,8 @@ func TestRemoteCache_PutBlob(t *testing.T) {
220219
require.Error(t, err, tt.name)
221220
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
222221
return
223-
} else {
224-
require.NoError(t, err, tt.name)
225222
}
223+
require.NoError(t, err, tt.name)
226224
})
227225
}
228226
}
@@ -302,10 +300,8 @@ func TestRemoteCache_MissingBlobs(t *testing.T) {
302300
require.Error(t, err, tt.name)
303301
assert.Contains(t, err.Error(), tt.wantErr, tt.name)
304302
return
305-
} else {
306-
require.NoError(t, err, tt.name)
307303
}
308-
304+
require.NoError(t, err, tt.name)
309305
assert.Equal(t, tt.wantMissingImage, gotMissingImage)
310306
assert.Equal(t, tt.wantMissingLayerIDs, gotMissingLayerIDs)
311307
})

‎pkg/commands/app.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,8 @@ func NewRootCommand(globalFlags *flag.GlobalFlagGroup) *cobra.Command {
230230
if globalOptions.ShowVersion {
231231
// Customize version output
232232
return showVersion(globalOptions.CacheDir, versionFormat, cmd.OutOrStdout())
233-
} else {
234-
return cmd.Help()
235233
}
234+
return cmd.Help()
236235
},
237236
}
238237

‎pkg/commands/convert/run.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ func compat(r *types.Report) {
6868
if vuln.PkgIdentifier.UID != "" {
6969
continue
7070
}
71-
if pkg, ok := pkgs[vuln.PkgID+vuln.PkgPath]; !ok {
71+
pkg, ok := pkgs[vuln.PkgID+vuln.PkgPath]
72+
if !ok {
7273
continue
73-
} else {
74-
r.Results[i].Vulnerabilities[j].PkgIdentifier = pkg.Identifier
7574
}
75+
r.Results[i].Vulnerabilities[j].PkgIdentifier = pkg.Identifier
7676
}
7777
}
7878
}

‎pkg/dependency/parser/c/conan/parse.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,10 @@ func (p *Parser) Parse(r xio.ReadSeekerAt) ([]ftypes.Package, []ftypes.Dependenc
131131
if lock.GraphLock.Nodes != nil {
132132
p.logger.Debug("Handling conan lockfile as v1.x")
133133
return p.parseV1(lock)
134-
} else {
135-
// try to parse requirements as conan v2.x
136-
p.logger.Debug("Handling conan lockfile as v2.x")
137-
return p.parseV2(lock)
138134
}
135+
// try to parse requirements as conan v2.x
136+
p.logger.Debug("Handling conan lockfile as v2.x")
137+
return p.parseV2(lock)
139138
}
140139

141140
func parsePackage(text string) (string, string, error) {

‎pkg/dependency/parser/java/pom/parse.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -549,28 +549,25 @@ func (p *Parser) retrieveParent(currentPath, relativePath string, target artifac
549549
// Try relativePath
550550
if relativePath != "" {
551551
pom, err := p.tryRelativePath(target, currentPath, relativePath)
552-
if err != nil {
553-
errs = multierror.Append(errs, err)
554-
} else {
552+
if err == nil {
555553
return pom, nil
556554
}
555+
errs = multierror.Append(errs, err)
557556
}
558557

559558
// If not found, search the parent director
560559
pom, err := p.tryRelativePath(target, currentPath, "../pom.xml")
561-
if err != nil {
562-
errs = multierror.Append(errs, err)
563-
} else {
560+
if err == nil {
564561
return pom, nil
565562
}
563+
errs = multierror.Append(errs, err)
566564

567565
// If not found, search local/remote remoteRepositories
568566
pom, err = p.tryRepository(target.GroupID, target.ArtifactID, target.Version.String())
569-
if err != nil {
570-
errs = multierror.Append(errs, err)
571-
} else {
567+
if err == nil {
572568
return pom, nil
573569
}
570+
errs = multierror.Append(errs, err)
574571

575572
// Reaching here means the POM wasn't found
576573
return nil, errs

‎pkg/dependency/parser/nodejs/yarn/parse.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,10 @@ func (p *Parser) parseBlock(block []byte, lineNum int) (lib Library, deps []stri
221221
continue
222222
}
223223
continue
224-
} else {
225-
lib.Patterns = patterns
226-
lib.Name = name
227-
continue
228224
}
225+
lib.Patterns = patterns
226+
lib.Name = name
227+
continue
229228
}
230229
}
231230

@@ -251,23 +250,23 @@ func (p *Parser) parseBlock(block []byte, lineNum int) (lib Library, deps []stri
251250
func parseDependencies(scanner *LineScanner) (deps []string) {
252251
for scanner.Scan() {
253252
line := scanner.Text()
254-
if dep, err := parseDependency(line); err != nil {
253+
dep, err := parseDependency(line)
254+
if err != nil {
255255
// finished dependencies block
256256
return deps
257-
} else {
258-
deps = append(deps, dep)
259257
}
258+
deps = append(deps, dep)
260259
}
261260

262261
return
263262
}
264263

265264
func parseDependency(line string) (string, error) {
266-
if name, version, err := getDependency(line); err != nil {
265+
name, version, err := getDependency(line)
266+
if err != nil {
267267
return "", err
268-
} else {
269-
return packageID(name, version), nil
270268
}
269+
return packageID(name, version), nil
271270
}
272271

273272
func (p *Parser) Parse(r xio.ReadSeekerAt) ([]ftypes.Package, []ftypes.Dependency, map[string][]string, error) {

‎pkg/dependency/parser/ruby/bundler/parse.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,10 @@ func (p *Parser) Parse(r xio.ReadSeekerAt) ([]ftypes.Package, []ftypes.Dependenc
111111
func countLeadingSpace(line string) int {
112112
i := 0
113113
for _, runeValue := range line {
114-
if runeValue == ' ' {
115-
i++
116-
} else {
114+
if runeValue != ' ' {
117115
break
118116
}
117+
i++
119118
}
120119
return i
121120
}

‎pkg/dependency/parser/rust/cargo/parse.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ func (p *Parser) parseDependencies(pkgId string, pkg cargoPkg, pkgs map[string]c
121121
ID: pkgId,
122122
DependsOn: dependOn,
123123
}
124-
} else {
125-
return nil
126124
}
125+
return nil
127126
}
128127

129128
func packageID(name, version string) string {

‎pkg/detector/ospkg/oracle/oracle_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,8 @@ func TestScanner_Detect(t *testing.T) {
346346
require.Error(t, err)
347347
assert.Contains(t, err.Error(), tt.wantErr)
348348
return
349-
} else {
350-
require.NoError(t, err)
351349
}
352-
350+
require.NoError(t, err)
353351
assert.Equal(t, tt.want, got)
354352
})
355353
}

‎pkg/fanal/analyzer/analyzer.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,8 @@ func (r *AnalysisResult) Sort() {
216216
sort.Slice(r.Misconfigurations, func(i, j int) bool {
217217
if r.Misconfigurations[i].FileType != r.Misconfigurations[j].FileType {
218218
return r.Misconfigurations[i].FileType < r.Misconfigurations[j].FileType
219-
} else {
220-
return r.Misconfigurations[i].FilePath < r.Misconfigurations[j].FilePath
221219
}
220+
return r.Misconfigurations[i].FilePath < r.Misconfigurations[j].FilePath
222221
})
223222

224223
// Secrets
@@ -239,9 +238,8 @@ func (r *AnalysisResult) Sort() {
239238
if r.Licenses[i].Type == r.Licenses[j].Type {
240239
if r.Licenses[i].FilePath == r.Licenses[j].FilePath {
241240
return r.Licenses[i].Layer.DiffID < r.Licenses[j].Layer.DiffID
242-
} else {
243-
return r.Licenses[i].FilePath < r.Licenses[j].FilePath
244241
}
242+
return r.Licenses[i].FilePath < r.Licenses[j].FilePath
245243
}
246244

247245
return r.Licenses[i].Type < r.Licenses[j].Type

‎pkg/fanal/analyzer/language/golang/mod/mod.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,21 +165,21 @@ func (a *gomodAnalyzer) fillAdditionalData(apps []types.Application) error {
165165
}
166166

167167
// Collect dependencies of the direct dependency
168-
if dep, err := a.collectDeps(modDir, lib.ID); err != nil {
168+
dep, err := a.collectDeps(modDir, lib.ID)
169+
if err != nil {
169170
return xerrors.Errorf("dependency graph error: %w", err)
170171
} else if dep.ID == "" {
171172
// go.mod not found
172173
continue
173-
} else {
174-
// Filter out unused dependencies and convert module names to module IDs
175-
apps[i].Packages[j].DependsOn = lo.FilterMap(dep.DependsOn, func(modName string, _ int) (string, bool) {
176-
if m, ok := usedPkgs[modName]; !ok {
177-
return "", false
178-
} else {
179-
return m.ID, true
180-
}
181-
})
182174
}
175+
// Filter out unused dependencies and convert module names to module IDs
176+
apps[i].Packages[j].DependsOn = lo.FilterMap(dep.DependsOn, func(modName string, _ int) (string, bool) {
177+
m, ok := usedPkgs[modName]
178+
if !ok {
179+
return "", false
180+
}
181+
return m.ID, true
182+
})
183183
}
184184
}
185185
return nil

‎pkg/fanal/analyzer/os/amazonlinux/amazonlinux_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,8 @@ func Test_amazonlinuxOSAnalyzer_Analyze(t *testing.T) {
9898
require.Error(t, err)
9999
assert.Contains(t, err.Error(), tt.wantErr)
100100
return
101-
} else {
102-
require.NoError(t, err)
103101
}
104-
102+
require.NoError(t, err)
105103
assert.Equal(t, tt.want, got)
106104
})
107105
}

‎pkg/fanal/analyzer/os/debian/debian_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ func Test_debianOSAnalyzer_Analyze(t *testing.T) {
6262
require.Error(t, err)
6363
assert.Contains(t, err.Error(), tt.wantErr)
6464
return
65-
} else {
66-
require.NoError(t, err)
6765
}
66+
require.NoError(t, err)
6867
assert.Equal(t, tt.want, got)
6968
})
7069
}

‎pkg/fanal/analyzer/os/redhatbase/centos_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ func Test_centosOSAnalyzer_Analyze(t *testing.T) {
4848
require.Error(t, err)
4949
assert.Contains(t, err.Error(), tt.wantErr)
5050
return
51-
} else {
52-
require.NoError(t, err)
5351
}
52+
require.NoError(t, err)
5453
assert.Equal(t, tt.want, got)
5554
})
5655
}

‎pkg/fanal/analyzer/os/redhatbase/fedora_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ func Test_fedoraOSAnalyzer_Analyze(t *testing.T) {
4848
require.Error(t, err)
4949
assert.Contains(t, err.Error(), tt.wantErr)
5050
return
51-
} else {
52-
require.NoError(t, err)
5351
}
52+
require.NoError(t, err)
5453
assert.Equal(t, tt.want, got)
5554
})
5655
}

‎pkg/fanal/analyzer/os/redhatbase/oracle_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ func Test_oracleOSAnalyzer_Analyze(t *testing.T) {
4848
require.Error(t, err)
4949
assert.Contains(t, err.Error(), tt.wantErr)
5050
return
51-
} else {
52-
require.NoError(t, err)
5351
}
52+
require.NoError(t, err)
5453
assert.Equal(t, tt.want, got)
5554
})
5655
}

0 commit comments

Comments
 (0)