Revert "Utilize internal/archiver package only."

This reverts commit 8d602ad.

Author: mitchell-as

internal/archiver/archiver.go

@@ -15,16 +15,17 @@ type FileMap struct {
 	Target string // Note: Target paths should always be relative to the archive root, do not use absolute paths
 }
 
-func CreateArchive(archive archiver.Writer, archivePath string, workDir string, fileMaps []FileMap) error {
+func CreateTgz(archivePath string, workDir string, fileMaps []FileMap) error {
 	f, err := os.OpenFile(archivePath, os.O_CREATE|os.O_WRONLY, 0644)
 	if err != nil {
 		return errs.Wrap(err, "Could not create temp file")
 	}
 	defer f.Close()
-	if err := archive.Create(f); err != nil {
+	tgz := archiver.NewTarGz()
+	if err := tgz.Create(f); err != nil {
 		return errs.Wrap(err, "Could not create tar.gz")
 	}
-	defer archive.Close()
+	defer tgz.Close()
 
 	for _, fileMap := range fileMaps {
 		source := fileMap.Source
@@ -44,7 +45,7 @@ func CreateArchive(archive archiver.Writer, archivePath string, workDir string,
 		}
 
 		// write it to the archive
-		err = archive.Write(archiver.File{
+		err = tgz.Write(archiver.File{
 			FileInfo: archiver.FileInfo{
 				FileInfo:   fileInfo,
 				CustomName: fileMap.Target,
@@ -60,14 +61,6 @@ func CreateArchive(archive archiver.Writer, archivePath string, workDir string,
 	return nil
 }
 
-func CreateTgz(archivePath string, workDir string, fileMaps []FileMap) error {
-	return CreateArchive(archiver.NewTarGz(), archivePath, workDir, fileMaps)
-}
-
-func CreateZip(archivePath string, workDir string, fileMaps []FileMap) error {
-	return CreateArchive(archiver.NewZip(), archivePath, workDir, fileMaps)
-}
-
 func FilesWithCommonParent(filepaths ...string) []FileMap {
 	var fileMaps []FileMap
 	common := fileutils.CommonParentPath(filepaths)

scripts/ci/update-generator/main.go

@@ -11,7 +11,8 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/ActiveState/cli/internal/archiver"
+	"github.com/mholt/archiver/v3"
+
 	"github.com/ActiveState/cli/internal/condition"
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/environment"
@@ -57,28 +58,28 @@ func generateSha256(path string) string {
 	return hex.EncodeToString(hasher.Sum(nil))
 }
 
+func archiveMeta() (archiveMethod archiver.Archiver, ext string) {
+	if runtime.GOOS == "windows" {
+		return archiver.NewZip(), ".zip"
+	}
+	return archiver.NewTarGz(), ".tar.gz"
+}
+
 func createUpdate(outputPath, channel, version, versionNumber, platform, target string) error {
 	relChannelPath := filepath.Join(channel, platform)
 	relVersionedPath := filepath.Join(channel, versionNumber, platform)
 	_ = os.MkdirAll(filepath.Join(outputPath, relChannelPath), 0o755)
 	_ = os.MkdirAll(filepath.Join(outputPath, relVersionedPath), 0o755)
 
-	archiveExt := ".tar.gz"
-	if runtime.GOOS == "windows" {
-		archiveExt = ".zip"
-	}
+	archive, archiveExt := archiveMeta()
 	relArchivePath := filepath.Join(relVersionedPath, fmt.Sprintf("state-%s-%s%s", platform, version, archiveExt))
 	archivePath := filepath.Join(outputPath, relArchivePath)
 
 	// Remove archive path if it already exists
 	_ = os.Remove(archivePath)
 	// Create main archive
 	fmt.Printf("Creating %s\n", archivePath)
-	archive := archiver.CreateTgz
-	if runtime.GOOS == "windows" {
-		archive = archiver.CreateZip
-	}
-	if err := archive(archivePath, "", []archiver.FileMap{{Source: target, Target: filepath.Base(target)}}); err != nil {
+	if err := archive.Archive([]string{target}, archivePath); err != nil {
 		return errs.Wrap(err, "Archiving failed")
 	}
 
@@ -109,22 +110,15 @@ func createInstaller(buildPath, outputPath, channel, platform string) error {
 		return errs.New("state-installer does not exist in build dir")
 	}
 
-	archiveExt := ".tar.gz"
-	if runtime.GOOS == "windows" {
-		archiveExt = ".zip"
-	}
+	archive, archiveExt := archiveMeta()
 	relArchivePath := filepath.Join(channel, platform, "state-installer"+archiveExt)
 	archivePath := filepath.Join(outputPath, relArchivePath)
 
 	// Remove archive path if it already exists
 	_ = os.Remove(archivePath)
 	// Create main archive
 	fmt.Printf("Creating %s\n", archivePath)
-	archive := archiver.CreateTgz
-	if runtime.GOOS == "windows" {
-		archive = archiver.CreateZip
-	}
-	err := archive(archivePath, "", []archiver.FileMap{{Source: installer, Target: filepath.Base(installer)}})
+	err := archive.Archive([]string{installer}, archivePath)
 	if err != nil {
 		return errs.Wrap(err, "Archiving failed")
 	}

test/integration/checkout_int_test.go

@@ -9,7 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ActiveState/cli/internal/archiver"
+	"github.com/mholt/archiver/v3"
+
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/environment"
 	"github.com/ActiveState/cli/internal/fileutils"
@@ -375,11 +376,8 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutFromArchive() {
 	tgz := fileutils.TempFilePath("", runtime.GOOS+".tar.gz")
 	files, err := fileutils.ListDirSimple(dir, false)
 	suite.Require().NoError(err)
-	fileMaps := make([]archiver.FileMap, len(files))
-	for i, file := range files {
-		fileMaps[i] = archiver.FileMap{Source: file, Target: filepath.Base(file)} // strip all leading dirs
-	}
-	suite.Require().NoError(archiver.CreateTgz(tgz, "", fileMaps))
+	gz := archiver.TarGz{Tar: &archiver.Tar{StripComponents: 1000}} // use a big number to strip all leading dirs
+	suite.Require().NoError(gz.Archive(files, tgz))
 	defer os.Remove(tgz)
 
 	cp := ts.SpawnWithOpts(