Merge pull request #252 from CycloneDX/dependabot/github_actions/golangci/golangci-lint-action-9.2.0

Author: nscuro

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
         check-latest: true
         cache: false
     - name: Run golangci-lint
-      uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # tag=v6.2.0
+      uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # tag=v9.2.0
       with:
         version: latest
         args: --verbose

.golangci.yml

@@ -1,7 +1,27 @@
+version: "2"
 linters:
   enable:
-    - asciicheck
-    - errorlint
-    - gofmt
-    - gosec
-    - wastedassign
+  - asciicheck
+  - errorlint
+  - gosec
+  - wastedassign
+  exclusions:
+    generated: lax
+    presets:
+    - comments
+    - common-false-positives
+    - legacy
+    - std-error-handling
+    paths:
+    - third_party$
+    - builtin$
+    - examples$
+formatters:
+  enable:
+  - gofmt
+  exclusions:
+    generated: lax
+    paths:
+    - third_party$
+    - builtin$
+    - examples$

convert_test.go

@@ -59,7 +59,7 @@ func Test_componentConverter_convertEvidence(t *testing.T) {
 
 	t.Run("spec 1.5 and lower", func(t *testing.T) {
 		convert := componentConverter(SpecVersion1_5)
-		var val int = 42
+		var val = 42
 
 		comp := Component{
 			Evidence: &Evidence{

cyclonedx_xml.go

@@ -159,21 +159,22 @@ func (ev *EnvironmentVariables) UnmarshalXML(d *xml.Decoder, _ xml.StartElement)
 
 		switch tokenType := token.(type) {
 		case xml.StartElement:
-			if tokenType.Name.Local == "value" {
+			switch tokenType.Name.Local {
+			case "value":
 				var value string
 				err = d.DecodeElement(&value, &tokenType)
 				if err != nil {
 					return err
 				}
 				envVars = append(envVars, EnvironmentVariableChoice{Value: value})
-			} else if tokenType.Name.Local == "environmentVar" {
+			case "environmentVar":
 				var property Property
 				err = d.DecodeElement(&property, &tokenType)
 				if err != nil {
 					return err
 				}
 				envVars = append(envVars, EnvironmentVariableChoice{Property: &property})
-			} else {
+			default:
 				return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
 			}
 		}
@@ -225,19 +226,20 @@ func (l *Licenses) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
 
 		switch tokenType := token.(type) {
 		case xml.StartElement:
-			if tokenType.Name.Local == "expression" {
+			switch tokenType.Name.Local {
+			case "expression":
 				var expression string
 				if err = d.DecodeElement(&expression, &tokenType); err != nil {
 					return err
 				}
 				licenses = append(licenses, LicenseChoice{Expression: expression})
-			} else if tokenType.Name.Local == "license" {
+			case "license":
 				var license License
 				if err = d.DecodeElement(&license, &tokenType); err != nil {
 					return err
 				}
 				licenses = append(licenses, LicenseChoice{License: &license})
-			} else {
+			default:
 				return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
 			}
 		}
@@ -374,29 +376,30 @@ func (tc *ToolsChoice) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
 
 		switch tokenType := token.(type) {
 		case xml.StartElement:
-			if tokenType.Name.Local == "tool" {
+			switch tokenType.Name.Local {
+			case "tool":
 				var tool Tool
 				if err = d.DecodeElement(&tool, &tokenType); err != nil {
 					return err
 				}
 				legacyTools = append(legacyTools, tool)
-			} else if tokenType.Name.Local == "components" {
+			case "components":
 				var foo toolsChoiceUnmarshalXML
 				if err = d.DecodeElement(&foo, &tokenType); err != nil {
 					return err
 				}
 				if foo.Components != nil {
 					components = *foo.Components
 				}
-			} else if tokenType.Name.Local == "services" {
+			case "services":
 				var foo toolsChoiceUnmarshalXML
 				if err = d.DecodeElement(&foo, &tokenType); err != nil {
 					return err
 				}
 				if foo.Services != nil {
 					services = *foo.Services
 				}
-			} else {
+			default:
 				return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
 			}
 		}
@@ -486,45 +489,46 @@ func (ev *Evidence) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
 
 		switch tokenType := token.(type) {
 		case xml.StartElement:
-			if tokenType.Name.Local == "identity" {
+			switch tokenType.Name.Local {
+			case "identity":
 				var identity EvidenceIdentity
 				if err = d.DecodeElement(&identity, &tokenType); err != nil {
 					return err
 				}
 				identifies = append(identifies, identity)
-			} else if tokenType.Name.Local == "occurrences" {
+			case "occurrences":
 				var evidenceXml EvidenceUnmarshalXML
 				if err = d.DecodeElement(&evidenceXml, &tokenType); err != nil {
 					return err
 				}
 				if evidenceXml.Occurrences != nil {
 					evidence.Occurrences = evidenceXml.Occurrences
 				}
-			} else if tokenType.Name.Local == "callstack" {
+			case "callstack":
 				var cs Callstack
 				if err = d.DecodeElement(&cs, &tokenType); err != nil {
 					return err
 				}
 				if cs.Frames != nil {
 					evidence.Callstack = &cs
 				}
-			} else if tokenType.Name.Local == "licenses" {
+			case "licenses":
 				var licenses Licenses
 				if err = d.DecodeElement(&licenses, &tokenType); err != nil {
 					return err
 				}
 				if len(licenses) > 0 {
 					evidence.Licenses = &licenses
 				}
-			} else if tokenType.Name.Local == "copyright" {
+			case "copyright":
 				var evidenceXml EvidenceUnmarshalXML
 				if err = d.DecodeElement(&evidenceXml, &tokenType); err != nil {
 					return err
 				}
 				if evidenceXml.Copyright != nil {
 					evidence.Copyright = evidenceXml.Copyright
 				}
-			} else {
+			default:
 				return fmt.Errorf("unknown element: %s", tokenType.Name.Local)
 			}
 		}