Merge pull request #532 from roots/migrate-archiver-package

Migrate to mholt/archives

Author: swalkinshaw

github/main.go

@@ -1,6 +1,7 @@
 package github
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -10,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mholt/archiver"
+	"github.com/mholt/archives"
 )
 
 var (
@@ -53,7 +54,19 @@ func DownloadRelease(repo string, version string, path string, dest string) (rel
 		return nil, err
 	}
 
-	if err := archiver.Unarchive(archivePath, path); err != nil {
+	ctx := context.TODO()
+
+	archiveFile, err := os.Open(archivePath)
+	if err != nil {
+		return nil, fmt.Errorf("Error opening release archive: %v", err)
+	}
+	defer archiveFile.Close()
+
+	var format archives.Zip
+
+	if err := format.Extract(ctx, archiveFile, func(ctx context.Context, fi archives.FileInfo) error {
+		return extractToDisk(fi, path)
+	}); err != nil {
 		return nil, fmt.Errorf("Error extracting the release archive: %v", err)
 	}
 
@@ -135,3 +148,28 @@ func DownloadFile(filepath string, url string, client *http.Client) error {
 
 	return nil
 }
+
+func extractToDisk(fi archives.FileInfo, dest string) error {
+	destPath := filepath.Join(dest, fi.NameInArchive)
+	if fi.IsDir() {
+		return os.MkdirAll(destPath, os.ModePerm)
+	}
+
+	src, err := fi.Open()
+	if err != nil {
+		return err
+	}
+	defer src.Close()
+
+	dst, err := os.Create(destPath)
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(dst, src)
+	if err != nil {
+		return err
+	}
+
+	return os.Chmod(destPath, fi.Mode().Perm())
+}

github/main_test.go

@@ -1,6 +1,7 @@
 package github
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net/http"
@@ -10,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/mholt/archiver"
+	"github.com/mholt/archives"
 )
 
 func TestNewReleaseFromVersion(t *testing.T) {
@@ -37,11 +38,16 @@ func TestDownloadRelease(t *testing.T) {
 		t.Error(err)
 	}
 
+	_, err = os.Create(filepath.Join(dir, "test_file"))
+	if err != nil {
+		t.Error(err)
+	}
+
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 		rw.Header().Set("Content-type", "application/octet-stream")
 		rw.Header().Set("Content-Disposition", "attachment; filename='release.zip'")
 
-		err = createZipFile([]string{dir}, rw)
+		err = createZipFile(filepath.Join(tmpDir, dir), rw)
 		if err != nil {
 			t.Error(err)
 		}
@@ -54,7 +60,13 @@ func TestDownloadRelease(t *testing.T) {
 
 	const expectedVersion = "1.0.0"
 
-	release, err := DownloadRelease("roots/trellis", expectedVersion, tmpDir, filepath.Join(tmpDir, "test_release_dir"))
+	destPath := filepath.Join(tmpDir, "test_release_dir")
+	release, err := DownloadRelease("roots/trellis", expectedVersion, tmpDir, destPath)
+
+	expectedPath := filepath.Join(tmpDir, "test_release_dir", "test_file")
+	if _, err := os.Stat(expectedPath); os.IsNotExist(err) {
+		t.Errorf("expected extracted file %s to exist", expectedPath)
+	}
 
 	if expectedVersion != release.Version {
 		t.Errorf("expected version %s but got %s", expectedVersion, release.Version)
@@ -111,44 +123,21 @@ func TestFetechLatestRelease(t *testing.T) {
 	}
 }
 
-func createZipFile(files []string, writer io.Writer) error {
-	zip := archiver.NewZip()
+func createZipFile(dir string, writer io.Writer) error {
+	var format archives.Zip
+	ctx := context.Background()
+
+	files, err := archives.FilesFromDisk(ctx, nil, map[string]string{
+		dir: filepath.Base(dir),
+	})
 
-	err := zip.Create(writer)
 	if err != nil {
 		return err
 	}
 
-	defer zip.Close()
-
-	for _, fname := range files {
-		info, err := os.Stat(fname)
-		if err != nil {
-			return err
-		}
-
-		internalName, err := archiver.NameInArchive(info, fname, fname)
-		if err != nil {
-			return err
-		}
-
-		file, err := os.Open(fname)
-		if err != nil {
-			return err
-		}
-
-		err = zip.Write(archiver.File{
-			FileInfo: archiver.FileInfo{
-				FileInfo:   info,
-				CustomName: internalName,
-			},
-			ReadCloser: file,
-		})
-
-		if err != nil {
-			return err
-		}
+	err = format.Archive(ctx, writer, files)
+	if err != nil {
+		return err
 	}
-
 	return nil
 }

go.mod

@@ -27,33 +27,47 @@ require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
+	github.com/STARRY-S/zip v0.2.1 // indirect
 	github.com/alessio/shellescape v1.4.1 // indirect
+	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
+	github.com/bodgit/plumbing v1.3.0 // indirect
+	github.com/bodgit/sevenzip v1.6.0 // indirect
+	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/chzyer/readline v1.5.0 // indirect
 	github.com/chzyer/test v1.0.0 // indirect
-	github.com/dsnet/compress v0.0.1 // indirect
+	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mholt/archives v0.1.0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/nwaples/rardecode v1.1.3 // indirect
+	github.com/nwaples/rardecode/v2 v2.0.0-beta.4.0.20241112120701-034e449c6e78 // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/sorairolake/lzip-go v0.3.5 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
-	github.com/ulikunitz/xz v0.5.10 // indirect
+	github.com/therootcompany/xz v1.0.1 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
 	golang.org/x/net v0.27.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect