Merge branch 'master' into known-cpan

Author: shibumi

.github/workflows/test.yaml

@@ -4,22 +4,23 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.22.x, 1.23.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Download test data
-        run: curl -L https://raw.githubusercontent.com/package-url/purl-spec/master/test-suite-data.json -o testdata/test-suite-data.json
+        # TODO(@shibumi): Remove pinned version and reset to master, once the failing npm test-cases got fixed.
+        run: curl -L https://raw.githubusercontent.com/package-url/purl-spec/0dd92f26f8bb11956ffdf5e8acfcee71e8560407/test-suite-data.json -o testdata/test-suite-data.json
       - name: Test go fmt
         run: test -z $(go fmt ./...)
       - name: Golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v6
         with:
           only-new-issues: true
       - name: Test coverage

.golangci.yaml

@@ -1,17 +1,14 @@
 # individual linter configs go here
-linters-settings:
+linters-settings: {}
 
 # default linters are enabled `golangci-lint help linters`
 linters:
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - structcheck
     - typecheck
     - unused
-    - varcheck

packageurl.go

@@ -566,7 +566,6 @@ func typeAdjustNamespace(purlType, ns string) string {
 		TypeDebian,
 		TypeGithub,
 		TypeGolang,
-		TypeNPM,
 		TypeRPM,
 		TypeQpkg:
 		return strings.ToLower(ns)
@@ -586,8 +585,7 @@ func typeAdjustName(purlType, name string, qualifiers Qualifiers) string {
 		TypeComposer,
 		TypeDebian,
 		TypeGithub,
-		TypeGolang,
-		TypeNPM:
+		TypeGolang:
 		return strings.ToLower(name)
 	case TypePyPi:
 		return strings.ToLower(strings.ReplaceAll(name, "_", "-"))
@@ -657,6 +655,24 @@ func validCustomRules(p PackageURL) error {
 				}
 			}
 		}
+	case TypeCpan:
+		if p.Namespace != "" {
+			// The purl refers to a CPAN distribution.
+			publisher := p.Namespace
+			if publisher != strings.ToUpper(publisher) {
+				return errors.New("a cpan distribution namespace must be all uppercase")
+			}
+			distName := p.Name
+			if strings.Contains(distName, "::") {
+				return errors.New("a cpan distribution name must not contain '::'")
+			}
+		} else {
+			// The purl refers to a CPAN module.
+			moduleName := p.Name
+			if strings.Contains(moduleName, "-") {
+				return errors.New("a cpan module name may not contain dashes")
+			}
+		}
 	case TypeSwift:
 		if p.Namespace == "" {
 			return errors.New("namespace is required")

packageurl_test.go

@@ -515,24 +515,24 @@ func TestNormalize(t *testing.T) {
 	}, {
 		name: "known type namespace adjustments",
 		input: packageurl.PackageURL{
-			Type:      "npm",
+			Type:      "apk",
 			Namespace: "NaMeSpAcE",
 			Name:      "pkg",
 		},
 		want: packageurl.PackageURL{
-			Type:       "npm",
+			Type:       "apk",
 			Namespace:  "namespace",
 			Name:       "pkg",
 			Qualifiers: packageurl.Qualifiers{},
 		},
 	}, {
 		name: "known type name adjustments",
 		input: packageurl.PackageURL{
-			Type: "npm",
+			Type: "alpm",
 			Name: "nAmE",
 		},
 		want: packageurl.PackageURL{
-			Type:       "npm",
+			Type:       "alpm",
 			Name:       "name",
 			Qualifiers: packageurl.Qualifiers{},
 		},