Add SPDX-Copyright-Text tag

Signed-off-by: Adam Moss <[email protected]>

Author: adam-moss

.pre-commit-config.yaml

@@ -6,16 +6,16 @@ repos:
   - repo: https://github.com/hashicorp/copywrite
     rev: v0.15.0 # Use any release tag
     hooks:
-      - id: copywrite-headers
+      - id: check-headers
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.4.0
     hooks:
       - id: end-of-file-fixer
         exclude: ^addLicense/testdata/
       - id: trailing-whitespace
         exclude: ^addLicense/testdata/
   - repo: https://github.com/dnephin/pre-commit-golang
-    rev: v0.5.0
+    rev: v0.5.1
     hooks:
       - id: go-fmt
       - id: go-vet

addlicense/main.go

@@ -295,13 +295,13 @@ func walk(ch chan<- *file, start string, logger *log.Logger) error {
 // Patterns are assumed to be valid.
 func fileMatches(path string, patterns []string) bool {
 	for _, p := range patterns {
-		
+
 		if runtime.GOOS == "windows" {
 			// If on windows, change path seperators to /
-			// in order for patterns to compare correctly 
+			// in order for patterns to compare correctly
 			path = filepath.ToSlash(path)
 		}
-		
+
 		// ignore error, since we assume patterns are valid
 		if match, _ := doublestar.Match(p, path); match {
 			return true
@@ -451,7 +451,7 @@ func hasLicense(b []byte) bool {
 	if len(b) < 1000 {
 		n = len(b)
 	}
-	return bytes.Contains(bytes.ToLower(b[:n]), []byte("copyright")) ||
+	return bytes.Contains(bytes.ToLower(b[:n]), []byte("spdx-filecopyrighttext")) ||
 		bytes.Contains(bytes.ToLower(b[:n]), []byte("mozilla public")) ||
 		bytes.Contains(bytes.ToLower(b[:n]), []byte("spdx-license-identifier"))
 }

addlicense/tmpl.go

@@ -144,9 +144,9 @@ const tmplMPL = `This Source Code Form is subject to the terms of the Mozilla Pu
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at https://mozilla.org/MPL/2.0/.`
 
-const tmplSPDX = `Copyright (c){{ if .Year }} {{.Year}}{{ end }}{{ if .Holder }} {{.Holder}}{{ end }}
+const tmplSPDX = `SPDX-FileCopyrightText: Copyright (c){{ if .Year }} {{.Year}}{{ end }}{{ if .Holder }} {{.Holder}}{{ end }}
 {{ if .SPDXID }}SPDX-License-Identifier: {{.SPDXID}}{{ end }}`
 
-const tmplCopyrightOnly = `Copyright (c){{ if .Year }} {{.Year}}{{ end }}{{ if .Holder }} {{.Holder}}{{ end }}`
+const tmplCopyrightOnly = `SPDX-FileCopyrightText: Copyright (c){{ if .Year }} {{.Year}}{{ end }}{{ if .Holder }} {{.Holder}}{{ end }}`
 
 const spdxSuffix = "\n\nSPDX-License-Identifier: {{.SPDXID}}"