Skip to content

Commit 48a212c

Browse files
committed
fix: migrate golangci-lint config and address issues
Signed-off-by: nscuro <nscuro@protonmail.com>
1 parent af64af3 commit 48a212c

File tree

3 files changed

+46
-22
lines changed

3 files changed

+46
-22
lines changed

.golangci.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
1+
version: "2"
12
linters:
23
enable:
3-
- asciicheck
4-
- errorlint
5-
- gofmt
6-
- gosec
7-
- wastedassign
4+
- asciicheck
5+
- errorlint
6+
- gosec
7+
- wastedassign
8+
exclusions:
9+
generated: lax
10+
presets:
11+
- comments
12+
- common-false-positives
13+
- legacy
14+
- std-error-handling
15+
paths:
16+
- third_party$
17+
- builtin$
18+
- examples$
19+
formatters:
20+
enable:
21+
- gofmt
22+
exclusions:
23+
generated: lax
24+
paths:
25+
- third_party$
26+
- builtin$
27+
- examples$

convert_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func Test_componentConverter_convertEvidence(t *testing.T) {
5959

6060
t.Run("spec 1.5 and lower", func(t *testing.T) {
6161
convert := componentConverter(SpecVersion1_5)
62-
var val int = 42
62+
var val = 42
6363

6464
comp := Component{
6565
Evidence: &Evidence{

cyclonedx_xml.go

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,22 @@ func (ev *EnvironmentVariables) UnmarshalXML(d *xml.Decoder, _ xml.StartElement)
142142

143143
switch tokenType := token.(type) {
144144
case xml.StartElement:
145-
if tokenType.Name.Local == "value" {
145+
switch tokenType.Name.Local {
146+
case "value":
146147
var value string
147148
err = d.DecodeElement(&value, &tokenType)
148149
if err != nil {
149150
return err
150151
}
151152
envVars = append(envVars, EnvironmentVariableChoice{Value: value})
152-
} else if tokenType.Name.Local == "environmentVar" {
153+
case "environmentVar":
153154
var property Property
154155
err = d.DecodeElement(&property, &tokenType)
155156
if err != nil {
156157
return err
157158
}
158159
envVars = append(envVars, EnvironmentVariableChoice{Property: &property})
159-
} else {
160+
default:
160161
return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
161162
}
162163
}
@@ -208,19 +209,20 @@ func (l *Licenses) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
208209

209210
switch tokenType := token.(type) {
210211
case xml.StartElement:
211-
if tokenType.Name.Local == "expression" {
212+
switch tokenType.Name.Local {
213+
case "expression":
212214
var expression string
213215
if err = d.DecodeElement(&expression, &tokenType); err != nil {
214216
return err
215217
}
216218
licenses = append(licenses, LicenseChoice{Expression: expression})
217-
} else if tokenType.Name.Local == "license" {
219+
case "license":
218220
var license License
219221
if err = d.DecodeElement(&license, &tokenType); err != nil {
220222
return err
221223
}
222224
licenses = append(licenses, LicenseChoice{License: &license})
223-
} else {
225+
default:
224226
return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
225227
}
226228
}
@@ -357,29 +359,30 @@ func (tc *ToolsChoice) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
357359

358360
switch tokenType := token.(type) {
359361
case xml.StartElement:
360-
if tokenType.Name.Local == "tool" {
362+
switch tokenType.Name.Local {
363+
case "tool":
361364
var tool Tool
362365
if err = d.DecodeElement(&tool, &tokenType); err != nil {
363366
return err
364367
}
365368
legacyTools = append(legacyTools, tool)
366-
} else if tokenType.Name.Local == "components" {
369+
case "components":
367370
var foo toolsChoiceUnmarshalXML
368371
if err = d.DecodeElement(&foo, &tokenType); err != nil {
369372
return err
370373
}
371374
if foo.Components != nil {
372375
components = *foo.Components
373376
}
374-
} else if tokenType.Name.Local == "services" {
377+
case "services":
375378
var foo toolsChoiceUnmarshalXML
376379
if err = d.DecodeElement(&foo, &tokenType); err != nil {
377380
return err
378381
}
379382
if foo.Services != nil {
380383
services = *foo.Services
381384
}
382-
} else {
385+
default:
383386
return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
384387
}
385388
}
@@ -469,45 +472,46 @@ func (ev *Evidence) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
469472

470473
switch tokenType := token.(type) {
471474
case xml.StartElement:
472-
if tokenType.Name.Local == "identity" {
475+
switch tokenType.Name.Local {
476+
case "identity":
473477
var identity EvidenceIdentity
474478
if err = d.DecodeElement(&identity, &tokenType); err != nil {
475479
return err
476480
}
477481
identifies = append(identifies, identity)
478-
} else if tokenType.Name.Local == "occurrences" {
482+
case "occurrences":
479483
var evidenceXml EvidenceUnmarshalXML
480484
if err = d.DecodeElement(&evidenceXml, &tokenType); err != nil {
481485
return err
482486
}
483487
if evidenceXml.Occurrences != nil {
484488
evidence.Occurrences = evidenceXml.Occurrences
485489
}
486-
} else if tokenType.Name.Local == "callstack" {
490+
case "callstack":
487491
var cs Callstack
488492
if err = d.DecodeElement(&cs, &tokenType); err != nil {
489493
return err
490494
}
491495
if cs.Frames != nil {
492496
evidence.Callstack = &cs
493497
}
494-
} else if tokenType.Name.Local == "licenses" {
498+
case "licenses":
495499
var licenses Licenses
496500
if err = d.DecodeElement(&licenses, &tokenType); err != nil {
497501
return err
498502
}
499503
if len(licenses) > 0 {
500504
evidence.Licenses = &licenses
501505
}
502-
} else if tokenType.Name.Local == "copyright" {
506+
case "copyright":
503507
var evidenceXml EvidenceUnmarshalXML
504508
if err = d.DecodeElement(&evidenceXml, &tokenType); err != nil {
505509
return err
506510
}
507511
if evidenceXml.Copyright != nil {
508512
evidence.Copyright = evidenceXml.Copyright
509513
}
510-
} else {
514+
default:
511515
return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
512516
}
513517
}

0 commit comments

Comments
 (0)