fix(deps): update all non-major dependencies

castai · Oct 22, 2024 · 626e222 · 626e222
1 parent 2524fd7
commit 626e222
Show file tree

Hide file tree

Showing 5 changed files with 548 additions and 499 deletions.
diff --git a/apk/apk_test.go b/apk/apk_test.go
@@ -34,7 +34,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "1.24.2-r9",
 					SrcName:    "busybox",
 					SrcVersion: "1.24.2-r9",
-					Licenses:   []string{"GPL-2.0"},
+					Licenses:   []string{"GPL-2.0-only"},
 					DependsOn:  []string{"[email protected]"},
 				},
 				{
@@ -43,7 +43,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "3.0.3-r0",
 					SrcName:    "alpine-baselayout",
 					SrcVersion: "3.0.3-r0",
-					Licenses:   []string{"GPL-2.0"},
+					Licenses:   []string{"GPL-2.0-only"},
 					DependsOn:  []string{"[email protected]", "[email protected]"},
 				},
 				{
@@ -52,7 +52,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "1.1-r0",
 					SrcName:    "alpine-keys",
 					SrcVersion: "1.1-r0",
-					Licenses:   []string{"GPL-3.0"},
+					Licenses:   []string{"GPL-2.0-or-later"},
 				},
 				{
 					ID:         "[email protected]",
@@ -69,7 +69,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "1.0.2h-r1",
 					SrcName:    "openssl",
 					SrcVersion: "1.0.2h-r1",
-					Licenses:   []string{"openssl"},
+					Licenses:   []string{"OpenSSL"},
 					DependsOn:  []string{"[email protected]", "[email protected]"},
 				},
 				{
@@ -78,7 +78,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "1.0.2h-r1",
 					SrcName:    "openssl",
 					SrcVersion: "1.0.2h-r1",
-					Licenses:   []string{"openssl"},
+					Licenses:   []string{"OpenSSL"},
 					DependsOn: []string{
 						"[email protected]",
 						"[email protected]",
@@ -90,7 +90,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "2.6.7-r0",
 					SrcName:    "apk-tools",
 					SrcVersion: "2.6.7-r0",
-					Licenses:   []string{"GPL-2.0"},
+					Licenses:   []string{"GPL-2.0-only"},
 					DependsOn: []string{
 						"[email protected]",
 						"[email protected]",
@@ -104,7 +104,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "1.1.6-r0",
 					SrcName:    "pax-utils",
 					SrcVersion: "1.1.6-r0",
-					Licenses:   []string{"GPL-2.0"},
+					Licenses:   []string{"GPL-2.0-only"},
 					DependsOn:  []string{"[email protected]"},
 				},
 				{
@@ -113,7 +113,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "1.1.14-r10",
 					SrcName:    "musl",
 					SrcVersion: "1.1.14-r10",
-					Licenses:   []string{"MIT", "BSD-3-Clause", "GPL-2.0"},
+					Licenses:   []string{"MIT", "BSD-3-Clause", "GPL-2.0-or-later"},
 					DependsOn: []string{
 						"[email protected]",
 						"[email protected]",
@@ -125,7 +125,7 @@ func TestParseApkInfo(t *testing.T) {
 					Version:    "0.7-r0",
 					SrcName:    "libc-dev",
 					SrcVersion: "0.7-r0",
-					Licenses:   []string{"GPL-3.0"},
+					Licenses:   []string{"GPL-2.0-or-later"},
 					DependsOn:  []string{"[email protected]"},
 				},
 				{

diff --git a/artifact.go b/artifact.go
@@ -199,7 +199,7 @@ func (a Artifact) getCachedLayers(ctx context.Context, ids []string) (map[string
 	return blobs, nil
 }
 
-func (Artifact) Clean(_ types.ArtifactReference) error {
+func (Artifact) Clean(_ artifact.Reference) error {
 	return nil
 }
 

diff --git a/dpkg/copyright_test.go b/dpkg/copyright_test.go
@@ -28,8 +28,8 @@ func Test_dpkgLicenseAnalyzer_Analyze(t *testing.T) {
 						Type:     types.LicenseTypeDpkg,
 						FilePath: "usr/share/doc/zlib1g/copyright",
 						Findings: []types.LicenseFinding{
-							{Name: "GPL-1.0"},
-							{Name: "Artistic"},
+							{Name: "GPL-1.0-or-later"},
+							{Name: "Artistic-2.0"},
 							{Name: "BSD-4-clause-POWERDOG"},
 							{Name: "Zlib"},
 						},
@@ -48,7 +48,7 @@ func Test_dpkgLicenseAnalyzer_Analyze(t *testing.T) {
 						Type:     types.LicenseTypeDpkg,
 						FilePath: "usr/share/doc/adduser/copyright",
 						Findings: []types.LicenseFinding{
-							{Name: "GPL-2.0"},
+							{Name: "GPL-2.0-only"},
 						},
 						PkgName: "adduser",
 					},
@@ -65,7 +65,8 @@ func Test_dpkgLicenseAnalyzer_Analyze(t *testing.T) {
 						Type:     types.LicenseTypeDpkg,
 						FilePath: "usr/share/doc/apt/copyright",
 						Findings: []types.LicenseFinding{
-							{Name: "GPL-2.0"},
+							{Name: "GPL-2.0-or-later"},
+							{Name: "GPL-2.0-only"},
 						},
 						PkgName: "apt",
 					},