Rework types a little

Author: markusthoemmes

pkg/apk/apk/implementation.go

@@ -786,9 +786,10 @@ func (a *APK) InstallPackages(ctx context.Context, sourceDateEpoch *time.Time, a
 				if err != nil {
 					return fmt.Errorf("failed to read .PKGINFO for %s: %w", pkg, err)
 				}
-				infos[i] = pkgInfo
+				asPackage := pkgInfo.AsPackage(exp.ControlHash, uint64(exp.Size))
+				infos[i] = &asPackage
 
-				installedFiles, err := a.installPackage(ctx, pkgInfo, exp, sourceDateEpoch)
+				installedFiles, err := a.installPackage(ctx, &asPackage, exp, sourceDateEpoch)
 				if err != nil {
 					return fmt.Errorf("installing %s: %w", pkg, err)
 				}

pkg/apk/expandapk/expandapk.go

@@ -21,7 +21,6 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
-	"time"
 
 	"chainguard.dev/apko/internal/tarfs"
 	"chainguard.dev/apko/pkg/apk/types"
@@ -104,12 +103,12 @@ type APKExpanded struct {
 	SignatureSize int64
 
 	sync.Mutex
-	parsedPkgInfo *types.Package
+	parsedPkgInfo *types.PackageInfo
 	controlData   []byte
 }
 
 // PkgInfo parses and returns the .PKGINFO file.
-func (a *APKExpanded) PkgInfo() (*types.Package, error) {
+func (a *APKExpanded) PkgInfo() (*types.PackageInfo, error) {
 	a.Lock()
 	defer a.Unlock()
 	if a.parsedPkgInfo != nil {
@@ -127,31 +126,7 @@ func (a *APKExpanded) PkgInfo() (*types.Package, error) {
 		return nil, fmt.Errorf("parsing .PKGINFO: %w", err)
 	}
 
-	pkg := &types.Package{
-		Name:             pkginfo.Name,
-		Version:          pkginfo.Version,
-		Arch:             pkginfo.Arch,
-		Description:      pkginfo.Description,
-		License:          pkginfo.License,
-		Origin:           pkginfo.Origin,
-		Maintainer:       pkginfo.Maintainer,
-		URL:              pkginfo.URL,
-		Checksum:         a.ControlHash,
-		Dependencies:     pkginfo.Dependencies,
-		Provides:         pkginfo.Provides,
-		InstallIf:        pkginfo.InstallIf,
-		Size:             uint64(a.Size),
-		InstalledSize:    pkginfo.Size,
-		ProviderPriority: pkginfo.ProviderPriority,
-		BuildTime:        time.Unix(pkginfo.BuildDate, 0).UTC(),
-		BuildDate:        pkginfo.BuildDate,
-		RepoCommit:       pkginfo.RepoCommit,
-		Replaces:         pkginfo.Replaces,
-		DataHash:         pkginfo.DataHash,
-		Triggers:         pkginfo.Triggers,
-	}
-
-	a.parsedPkgInfo = pkg
+	a.parsedPkgInfo = pkginfo
 	return a.parsedPkgInfo, nil
 }
 

pkg/apk/expandapk/expandapk_test.go

@@ -4,7 +4,6 @@ import (
 	"archive/tar"
 	"bytes"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -13,13 +12,10 @@ import (
 )
 
 func TestPkgInfo(t *testing.T) {
-	controlHash := []byte{0x01, 0x02, 0x03, 0x04}
-	size := int64(123456)
-
 	tests := []struct {
 		name    string
 		content string
-		want    *types.Package
+		want    *types.PackageInfo
 	}{{
 		// See example at https://wiki.alpinelinux.org/wiki/Apk_spec
 		name: "example",
@@ -49,7 +45,7 @@ provides = cmd:sh=1.35.0-r18
 depend = so:libc.musl-x86_64.so.1
 datahash = 7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7
 `,
-		want: &types.Package{
+		want: &types.PackageInfo{
 			Name:             "busybox",
 			Version:          "1.35.0-r18",
 			Arch:             "x86_64",
@@ -61,16 +57,13 @@ datahash = 7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7
 			Dependencies:     []string{"so:libc.musl-x86_64.so.1"},
 			Provides:         []string{"/bin/sh", "cmd:busybox=1.35.0-r18", "cmd:sh=1.35.0-r18"},
 			InstallIf:        nil,
-			Size:             uint64(size),
+			Size:             958464,
 			ProviderPriority: 100,
 			BuildDate:        1657134589,
 			RepoCommit:       "332d2fff53cd4537d415e15e55e8ceb6fe6eaedb",
 			Replaces:         []string{"busybox-initscripts"},
 			DataHash:         "7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7",
 			Triggers:         []string{"/bin /usr/bin /sbin /usr/sbin /lib/modules/*"},
-			Checksum:         controlHash,
-			InstalledSize:    958464,
-			BuildTime:        time.Unix(1657134589, 0).UTC(),
 		},
 	}}
 
@@ -91,11 +84,7 @@ datahash = 7d3351ac6c3ebaf18182efb5390061f50d077ce5ade60a15909d91278f70ada7
 			controlFs, err := tarfs.New(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
 			require.NoError(t, err)
 
-			exp := &APKExpanded{
-				ControlHash: controlHash,
-				ControlFS:   controlFs,
-				Size:        size,
-			}
+			exp := &APKExpanded{ControlFS: controlFs}
 
 			got, err := exp.PkgInfo()
 			if err != nil {

pkg/apk/types/package.go

@@ -31,6 +31,34 @@ type PackageInfo struct {
 	Triggers         []string `ini:"triggers,,allowshadow"`
 }
 
+// AsPackage converts PackageInfo to a Package struct with the given controlHash and size.
+func (pkginfo PackageInfo) AsPackage(controlHash []byte, size uint64) Package {
+	return Package{
+		Name:             pkginfo.Name,
+		Version:          pkginfo.Version,
+		Arch:             pkginfo.Arch,
+		Description:      pkginfo.Description,
+		License:          pkginfo.License,
+		Origin:           pkginfo.Origin,
+		Maintainer:       pkginfo.Maintainer,
+		URL:              pkginfo.URL,
+		Dependencies:     pkginfo.Dependencies,
+		Provides:         pkginfo.Provides,
+		InstallIf:        pkginfo.InstallIf,
+		InstalledSize:    pkginfo.Size,
+		ProviderPriority: pkginfo.ProviderPriority,
+		BuildDate:        pkginfo.BuildDate,
+		RepoCommit:       pkginfo.RepoCommit,
+		Replaces:         pkginfo.Replaces,
+		DataHash:         pkginfo.DataHash,
+		Triggers:         pkginfo.Triggers,
+
+		BuildTime: time.Unix(pkginfo.BuildDate, 0).UTC(),
+		Checksum:  controlHash,
+		Size:      size,
+	}
+}
+
 // Package represents a single package with the information present in an
 // APKINDEX.
 type Package struct {