added error and warn for old haul chunks

Author: zackbradys

cmd/hauler/cli/store/load.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"hauler.dev/go/hauler/v2/internal/flags"
@@ -20,6 +21,10 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+// matches the old <base>_NNN.<ext> chunk naming of haul_0.tar.zst
+// used only to print a hint when a load fails on a file shaped like a stale chunk
+var legacyChunkRe = regexp.MustCompile(`_\d+\.`)
+
 // extracts the contents of an archived oci layout to an existing oci layout
 func LoadCmd(ctx context.Context, o *flags.LoadOpts, rso *flags.StoreRootOpts, ro *flags.CliRootOpts) error {
 	l := log.FromContext(ctx)
@@ -41,7 +46,7 @@ func LoadCmd(ctx context.Context, o *flags.LoadOpts, rso *flags.StoreRootOpts, r
 	for _, fileName := range o.FileName {
 		resolved := resolveHaulPath(fileName)
 		l.Infof("loading haul [%s] to [%s]", resolved, o.StoreDir)
-		err := unarchiveLayoutTo(ctx, resolved, o.StoreDir, tempDir)
+		err := unarchiveLayoutTo(ctx, resolved, o.StoreDir, tempDir, ro)
 		if err != nil {
 			return err
 		}
@@ -52,7 +57,7 @@ func LoadCmd(ctx context.Context, o *flags.LoadOpts, rso *flags.StoreRootOpts, r
 }
 
 // accepts an archived OCI layout, extracts the contents to an existing OCI layout, and preserves the index
-func unarchiveLayoutTo(ctx context.Context, haulPath string, dest string, tempDir string) error {
+func unarchiveLayoutTo(ctx context.Context, haulPath string, dest string, tempDir string, ro *flags.CliRootOpts) error {
 	l := log.FromContext(ctx)
 
 	if strings.HasPrefix(haulPath, "http://") || strings.HasPrefix(haulPath, "https://") {
@@ -94,6 +99,19 @@ func unarchiveLayoutTo(ctx context.Context, haulPath string, dest string, tempDi
 	haulPath = joined
 
 	if err := archives.Unarchive(ctx, haulPath, tempDir); err != nil {
+		if legacyChunkRe.MatchString(filepath.Base(haulPath)) {
+			ignoreErrors := ro.IgnoreErrors
+			if !ignoreErrors && os.Getenv(consts.HaulerIgnoreErrors) == "true" {
+				ignoreErrors = true
+			}
+			if ignoreErrors {
+				l.Warnf("possibly detected an old chunk format for haul: [%s]", haulPath)
+				l.Warnf("attempt to rename to '<base>.<ext>.NNN' and try loading it again...")
+				return nil
+			}
+			l.Errorf("possibly detected an old chunk format for haul: [%s]", haulPath)
+			l.Errorf("attempt to rename to '<base>.<ext>.NNN' and try loading it again...")
+		}
 		return err
 	}
 

cmd/hauler/cli/store/load_test.go

@@ -71,7 +71,7 @@ func TestUnarchiveLayoutTo(t *testing.T) {
 	destDir := t.TempDir()
 	tempDir := t.TempDir()
 
-	if err := unarchiveLayoutTo(ctx, testHaulArchive, destDir, tempDir); err != nil {
+	if err := unarchiveLayoutTo(ctx, testHaulArchive, destDir, tempDir, defaultCliOpts()); err != nil {
 		t.Fatalf("unarchiveLayoutTo: %v", err)
 	}
 
@@ -262,7 +262,7 @@ func TestUnarchiveLayoutTo_AnnotationBackfill(t *testing.T) {
 	// Step 4: Load the stripped archive.
 	destDir := t.TempDir()
 	tempDir := t.TempDir()
-	if err := unarchiveLayoutTo(ctx, strippedArchive, destDir, tempDir); err != nil {
+	if err := unarchiveLayoutTo(ctx, strippedArchive, destDir, tempDir, defaultCliOpts()); err != nil {
 		t.Fatalf("unarchiveLayoutTo stripped: %v", err)
 	}
 
@@ -354,7 +354,7 @@ func TestUnarchiveLayoutTo_LegacyKindMigration(t *testing.T) {
 	// Step 4: Load the legacy archive.
 	destDir := t.TempDir()
 	tempDir := t.TempDir()
-	if err := unarchiveLayoutTo(ctx, legacyArchive, destDir, tempDir); err != nil {
+	if err := unarchiveLayoutTo(ctx, legacyArchive, destDir, tempDir, defaultCliOpts()); err != nil {
 		t.Fatalf("unarchiveLayoutTo legacy: %v", err)
 	}