More touchups

Author: markusthoemmes

pkg/apk/apk/installed_test.go

@@ -434,7 +434,6 @@ func TestUpdateTriggers(t *testing.T) {
 	}
 	triggers := "/bin /usr/bin /foo /bar/*"
 
-	require.NoError(t, err, "unable to create tarfs: %v", err)
 	err = a.updateTriggers(pkg, []string{triggers})
 	require.NoError(t, err, "unable to update triggers: %v", err)
 

pkg/apk/expandapk/expandapk_test.go

@@ -1,3 +1,17 @@
+// Copyright 2026 Chainguard, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package expandapk
 
 import (
@@ -12,14 +26,7 @@ import (
 )
 
 func TestPkgInfo(t *testing.T) {
-	tests := []struct {
-		name    string
-		content string
-		want    *types.PackageInfo
-	}{{
-		// See example at https://wiki.alpinelinux.org/wiki/Apk_spec
-		name: "example",
-		content: `
+	samplePackageInfo := `
 # Generated by abuild 3.9.0-r2
 # using fakeroot version 1.25.3
 # Wed Jul  6 19:09:49 UTC 2022
@@ -44,7 +51,19 @@ provides = cmd:busybox=1.35.0-r18
 provides = cmd:sh=1.35.0-r18
 depend = so:libc.musl-x86_64.so.1
 datahash = 7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7
-`,
+`
+
+	tests := []struct {
+		name    string
+		files   map[string]string
+		want    *types.PackageInfo
+		wantErr bool
+	}{{
+		// See example at https://wiki.alpinelinux.org/wiki/Apk_spec
+		name: "example",
+		files: map[string]string{
+			".PKGINFO": samplePackageInfo,
+		},
 		want: &types.PackageInfo{
 			Name:             "busybox",
 			Version:          "1.35.0-r18",
@@ -65,20 +84,31 @@ datahash = 7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7
 			DataHash:         "7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7",
 			Triggers:         []string{"/bin /usr/bin /sbin /usr/sbin /lib/modules/*"},
 		},
+	}, {
+		name: "empty",
+		files: map[string]string{
+			".PKGINFO": "",
+		},
+		want: &types.PackageInfo{},
+	}, {
+		name:    "no PKGINFO",
+		wantErr: true,
 	}}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			var buf bytes.Buffer
 			tw := tar.NewWriter(&buf)
-			err := tw.WriteHeader(&tar.Header{
-				Name: ".PKGINFO",
-				Mode: 0o644,
-				Size: int64(len([]byte(tt.content))),
-			})
-			require.NoError(t, err)
-			_, err = tw.Write([]byte(tt.content))
-			require.NoError(t, err)
+			for name, content := range tt.files {
+				err := tw.WriteHeader(&tar.Header{
+					Name: name,
+					Mode: 0o644,
+					Size: int64(len(content)),
+				})
+				require.NoError(t, err)
+				_, err = tw.Write([]byte(content))
+				require.NoError(t, err)
+			}
 			require.NoError(t, tw.Close())
 
 			controlFs, err := tarfs.New(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
@@ -87,6 +117,10 @@ datahash = 7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7
 			exp := &APKExpanded{ControlFS: controlFs}
 
 			got, err := exp.PkgInfo()
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
 			require.NoError(t, err)
 			require.Equal(t, tt.want, got)
 		})

pkg/apk/types/package.go

@@ -1,3 +1,17 @@
+// Copyright 2026 Chainguard, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package types
 
 import (
@@ -51,7 +65,6 @@ func (pkginfo *PackageInfo) AsPackage(controlHash []byte, size uint64) *Package
 		RepoCommit:       pkginfo.RepoCommit,
 		Replaces:         pkginfo.Replaces,
 		DataHash:         pkginfo.DataHash,
-		Triggers:         pkginfo.Triggers,
 
 		BuildTime: time.Unix(pkginfo.BuildDate, 0).UTC(),
 		Checksum:  controlHash,
@@ -82,7 +95,6 @@ type Package struct {
 	RepoCommit       string   `ini:"commit"`
 	Replaces         []string `ini:"replaces,,allowshadow"`
 	DataHash         string   `ini:"datahash"`
-	Triggers         []string `ini:"triggers,,allowshadow"`
 }
 
 func (p *Package) String() string {
@@ -109,7 +121,7 @@ func ParsePackageInfo(info io.Reader) (*PackageInfo, error) {
 		return nil, fmt.Errorf("ini.ShadowLoad(): %w", err)
 	}
 
-	pkg := new(PackageInfo)
+	pkg := &PackageInfo{}
 	if err = cfg.MapTo(pkg); err != nil {
 		return nil, fmt.Errorf("cfg.MapTo(): %w", err)
 	}

pkg/apk/types/package_test.go

@@ -1,3 +1,17 @@
+// Copyright 2026 Chainguard, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package types
 
 import (
@@ -106,7 +120,6 @@ func TestAsPackage(t *testing.T) {
 		RepoCommit:       "332d2fff53cd4537d415e15e55e8ceb6fe6eaedb",
 		Replaces:         []string{"busybox-initscripts"},
 		DataHash:         "7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7",
-		Triggers:         []string{"/bin /usr/bin /sbin /usr/sbin /lib/modules/*"},
 
 		BuildTime: time.Unix(1657134589, 0).UTC(),
 		Checksum:  controlHash,