Merge pull request #505 from chainguard-dev/chore/update-news

update NEWS for 0.6.1
chainguard-dev · Feb 14, 2023 · 5f9ef4e · 5f9ef4e
2 parents 19f4f35 + 6585bc2
commit 5f9ef4e
Show file tree

Hide file tree

Showing 64 changed files with 69 additions and 66 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -26,7 +26,6 @@ linters:
   - errorlint
   - forbidigo
   - gofmt
-  - goheader
   - goimports
   - gosec
   - gocritic

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# Changes from 0.6.0 to 0.6.1
+
+* Backport cosign v2 changes to the 0.6.x branch.
+
 # Changes from 0.5.0 to 0.6.0
 
 * Environment variables in the image configuration are now sorted

diff --git a/internal/cli/build-minirootfs.go b/internal/cli/build-minirootfs.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/internal/cli/build.go b/internal/cli/build.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/internal/cli/commands.go b/internal/cli/commands.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/internal/cli/publish.go b/internal/cli/publish.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/internal/cli/show-config.go b/internal/cli/show-config.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/internal/tools.go b/internal/tools.go
@@ -1,7 +1,7 @@
 //go:build tools
 // +build tools
 
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/main.go b/main.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/apk/apk.go b/pkg/apk/apk.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/apk/apk_implementation.go b/pkg/apk/apk_implementation.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/apk/apk_test.go b/pkg/apk/apk_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/apk/apk_unit_test.go b/pkg/apk/apk_unit_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/accounts.go b/pkg/build/accounts.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/build.go b/pkg/build/build.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/build_implementation.go b/pkg/build/build_implementation.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/build_test.go b/pkg/build/build_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/errors.go b/pkg/build/errors.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/image_builder.go b/pkg/build/image_builder.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/oci/oci.go b/pkg/build/oci/oci.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/options.go b/pkg/build/options.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/os-release.go b/pkg/build/os-release.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/paths.go b/pkg/build/paths.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/types/image_configuration.go b/pkg/build/types/image_configuration.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/types/types.go b/pkg/build/types/types.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/types/types_test.go b/pkg/build/types/types_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/build/validate.go b/pkg/build/validate.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/exec/cmd.go b/pkg/exec/cmd.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/exec/exec.go b/pkg/exec/exec.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/exec/exec_test.go b/pkg/exec/exec_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/exec/exec_unit_test.go b/pkg/exec/exec_unit_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/exec/implementation.go b/pkg/exec/implementation.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/exec/implementation_test.go b/pkg/exec/implementation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/fetch/fetch.go b/pkg/fetch/fetch.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/fs/fs.go b/pkg/fs/fs.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/fs/readlinkfs.go b/pkg/fs/readlinkfs.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/options/options.go b/pkg/options/options.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/passwd/doc.go b/pkg/passwd/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/passwd/group.go b/pkg/passwd/group.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/passwd/group_test.go b/pkg/passwd/group_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/passwd/passwd.go b/pkg/passwd/passwd.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/passwd/passwd_test.go b/pkg/passwd/passwd_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/s6/s6.go b/pkg/s6/s6.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/s6/supervision_tree.go b/pkg/s6/supervision_tree.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/generator/cyclonedx/cyclonedx.go b/pkg/sbom/generator/cyclonedx/cyclonedx.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/generator/generator.go b/pkg/sbom/generator/generator.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/generator/idb/idb.go b/pkg/sbom/generator/idb/idb.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/generator/spdx/spdx.go b/pkg/sbom/generator/spdx/spdx.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/generator/spdx/spdx_test.go b/pkg/sbom/generator/spdx/spdx_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ func TestStringToIdentifier(t *testing.T) {
 		"alpine",
 		"kindest/node:v1.21.1",
 		"v1.16.15@sha256:a89c771f7de234e6547d43695c7ab047809ffc71a0c3b65aa54eda051c45ed20",
-		"k8s.gcr.io/ingress-nginx/e2e-test-runner:v20220110-gfd820db46@sha256:273f7d9b1b2297cd96b4d51600e45d932186a1cc79d00d179dfb43654112fe8f",
+		"k8s.gcr.io/ingress-nginx/e2e-test-runner:v2022, 20230110-gfd820db46@sha256:273f7d9b1b2297cd96b4d51600e45d932186a1cc79d00d179dfb43654112fe8f",
 	} {
 		fmt.Println(stringToIdentifier(tc))
 		require.True(t, validIDRe.MatchString(stringToIdentifier(tc)))

diff --git a/pkg/sbom/options/options.go b/pkg/sbom/options/options.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/options/options_test.go b/pkg/sbom/options/options_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/sbom.go b/pkg/sbom/sbom.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/sbom_test.go b/pkg/sbom/sbom_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/sbom/sbom_unit_test.go b/pkg/sbom/sbom_unit_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ func TestReadReleaseData(t *testing.T) {
 	osinfoData := `ID=wolfi
 NAME="Wolfi"
 PRETTY_NAME="Wolfi"
-VERSION_ID="20220914"
+VERSION_ID="2022, 20230914"
 HOME_URL="https://wolfi.dev"
 `
 	tdir := t.TempDir()
@@ -51,7 +51,7 @@ HOME_URL="https://wolfi.dev"
 	require.NoError(t, di.ReadReleaseData(&opts, filepath.Join(tdir, "os-release")))
 	require.Equal(t, "wolfi", opts.OS.ID, "id")
 	require.Equal(t, "Wolfi", opts.OS.Name, "name")
-	require.Equal(t, "20220914", opts.OS.Version, "version")
+	require.Equal(t, "2022, 20230914", opts.OS.Version, "version")
 }
 
 func TestReadReleaseData_EmptyDefaults(t *testing.T) {

diff --git a/pkg/tarball/append.go b/pkg/tarball/append.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/tarball/append_test.go b/pkg/tarball/append_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/tarball/tarball.go b/pkg/tarball/tarball.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/tarball/write.go b/pkg/tarball/write.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/vcs/vcs.go b/pkg/vcs/vcs.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/vcs/vcs_unit_test.go b/pkg/vcs/vcs_unit_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/vfs/dirfs.go b/pkg/vfs/dirfs.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Chainguard, Inc.
+// Copyright 2022, 2023 Chainguard, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.