wip

Signed-off-by: Kit Patella <[email protected]>

Author: mkcp

src/pkg/layout/package.go

@@ -21,7 +21,6 @@ import (
 	"github.com/zarf-dev/zarf/src/api/v1alpha1"
 	"github.com/zarf-dev/zarf/src/pkg/interactive"
 	"github.com/zarf-dev/zarf/src/pkg/logger"
-	"github.com/zarf-dev/zarf/src/pkg/message"
 	"github.com/zarf-dev/zarf/src/pkg/packager/deprecated"
 	"github.com/zarf-dev/zarf/src/pkg/utils"
 )
@@ -230,26 +229,19 @@ func (pp *PackagePaths) GenerateChecksums() (string, error) {
 // ArchivePackage creates an archive for a Zarf package.
 func (pp *PackagePaths) ArchivePackage(ctx context.Context, destinationTarball string, maxPackageSizeMB int) error {
 	l := logger.From(ctx)
-	// TODO(mkcp): Remove message on logger release
-	spinner := message.NewProgressSpinner("Writing %s to %s", pp.Base, destinationTarball)
-	defer spinner.Stop()
 	l.Info("archiving zarf package", "base", pp.Base, "destination", destinationTarball)
 
 	// Make the archive
 	archiveSrc := []string{pp.Base + string(os.PathSeparator)}
 	if err := archiver.Archive(archiveSrc, destinationTarball); err != nil {
 		return fmt.Errorf("unable to create package: %w", err)
 	}
-	// TODO(mkcp): Remove message on logger release
-	spinner.Updatef("Wrote %s to %s", pp.Base, destinationTarball)
 	l.Debug("ArchivePackage wrote", "base", pp.Base, "destination", destinationTarball)
 
 	fi, err := os.Stat(destinationTarball)
 	if err != nil {
 		return fmt.Errorf("unable to read the package archive: %w", err)
 	}
-	// TODO(mkcp): Remove message on logger release
-	spinner.Successf("Package saved to %q", destinationTarball)
 	l.Debug("package saved", "destination", destinationTarball)
 
 	// Convert Megabytes to bytes.
@@ -260,7 +252,6 @@ func (pp *PackagePaths) ArchivePackage(ctx context.Context, destinationTarball s
 		if fi.Size()/int64(chunkSize) > 999 {
 			return fmt.Errorf("unable to split the package archive into multiple files: must be less than 1,000 files")
 		}
-		message.Notef("Package is larger than %dMB, splitting into multiple files", maxPackageSizeMB)
 		l.Info("package is larger than max, splitting into multiple files", "maxPackageSize", maxPackageSizeMB)
 		err := splitFile(ctx, destinationTarball, chunkSize)
 		if err != nil {
@@ -342,7 +333,8 @@ func (pp *PackagePaths) Files() map[string]string {
 	stripBase := func(path string) string {
 		rel, err := filepath.Rel(pp.Base, path)
 		if err != nil {
-			message.Debug("unable to strip base from path", "error", err)
+			// HACK(mkcp): Source this logger from ctx chain instead or this logging behavior gets weird in testing.
+			logger.Default().Debug("unable to strip base from path", "error", err)
 		}
 		// Convert from the OS path separator to the standard '/' for Windows support
 		return filepath.ToSlash(rel)

src/pkg/layout/package_test.go

@@ -5,7 +5,6 @@
 package layout
 
 import (
-	"context"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -36,7 +35,6 @@ func TestPackageFiles(t *testing.T) {
 
 	t.Run("Verify Files()", func(t *testing.T) {
 		t.Parallel()
-
 		pp := New("test")
 
 		files := pp.Files()
@@ -104,7 +102,7 @@ func TestPackageFiles(t *testing.T) {
 
 	t.Run("Verify Files() with paths mapped to package paths", func(t *testing.T) {
 		t.Parallel()
-		ctx := context.Background()
+		ctx := t.Context()
 
 		pp := New("test")
 
@@ -136,7 +134,7 @@ func TestPackageFiles(t *testing.T) {
 
 	t.Run("Verify Files() with image layers mapped to package paths", func(t *testing.T) {
 		t.Parallel()
-		ctx := context.Background()
+		ctx := t.Context()
 
 		pp := New("test")