From c8b16f6803a3a313c82de49cdca0769cdf81c763 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 28 Jan 2025 10:58:46 -0500 Subject: [PATCH] *.go: move the carrierd `archive/tar` to internal/ The feature of golang having source in a project path with "internal" makes the code only able to be imported by the project itself. https://docs.google.com/document/d/1e8kOo3r51b2BWtTs_1uADIA5djfXhPT36s6eHVRIvaU/edit?tab=t.0 Since we have this carried version of `archive/tar` with our byte accounting patches, it is also means the version of archive/tar has not kept up with upstream. our tar-split libraries do not even utilize all the function calls of our carried archive/tar, so might as well limit anyone else in the world from calling them as well. Signed-off-by: Vincent Batts --- cmd/tar-split/tar_benchmark_test.go | 2 +- {archive => internal/archive}/tar/common.go | 0 {archive => internal/archive}/tar/example_test.go | 3 ++- {archive => internal/archive}/tar/format.go | 0 {archive => internal/archive}/tar/reader.go | 0 {archive => internal/archive}/tar/reader_test.go | 0 {archive => internal/archive}/tar/stat_actime1.go | 0 {archive => internal/archive}/tar/stat_actime2.go | 0 {archive => internal/archive}/tar/stat_unix.go | 0 {archive => internal/archive}/tar/strconv.go | 0 {archive => internal/archive}/tar/strconv_test.go | 0 {archive => internal/archive}/tar/tar_test.go | 0 .../archive}/tar/testdata/file-and-dir.tar | Bin .../archive}/tar/testdata/gnu-incremental.tar | Bin .../archive}/tar/testdata/gnu-long-nul.tar | Bin .../archive}/tar/testdata/gnu-multi-hdrs.tar | Bin .../archive}/tar/testdata/gnu-nil-sparse-data.tar | Bin .../archive}/tar/testdata/gnu-nil-sparse-hole.tar | Bin .../archive}/tar/testdata/gnu-not-utf8.tar | Bin .../archive}/tar/testdata/gnu-sparse-big.tar | Bin .../archive}/tar/testdata/gnu-utf8.tar | Bin {archive => internal/archive}/tar/testdata/gnu.tar | Bin .../archive}/tar/testdata/hardlink.tar | Bin .../archive}/tar/testdata/hdr-only.tar | Bin .../archive}/tar/testdata/invalid-go17.tar | Bin .../archive}/tar/testdata/issue10968.tar | Bin .../archive}/tar/testdata/issue11169.tar | Bin .../archive}/tar/testdata/issue12435.tar | Bin .../archive}/tar/testdata/neg-size.tar | Bin .../archive}/tar/testdata/nil-uid.tar | Bin .../archive}/tar/testdata/pax-bad-hdr-file.tar | Bin .../archive}/tar/testdata/pax-bad-mtime-file.tar | Bin .../archive}/tar/testdata/pax-global-records.tar | Bin .../archive}/tar/testdata/pax-multi-hdrs.tar | Bin .../archive}/tar/testdata/pax-nil-sparse-data.tar | Bin .../archive}/tar/testdata/pax-nil-sparse-hole.tar | Bin .../archive}/tar/testdata/pax-nul-path.tar | Bin .../archive}/tar/testdata/pax-nul-xattrs.tar | Bin .../archive}/tar/testdata/pax-path-hdr.tar | Bin .../archive}/tar/testdata/pax-pos-size-file.tar | Bin .../archive}/tar/testdata/pax-records.tar | Bin .../archive}/tar/testdata/pax-sparse-big.tar | Bin {archive => internal/archive}/tar/testdata/pax.tar | Bin .../archive}/tar/testdata/small.txt | 0 .../archive}/tar/testdata/small2.txt | 0 .../archive}/tar/testdata/sparse-formats.tar | Bin {archive => internal/archive}/tar/testdata/star.tar | Bin .../archive}/tar/testdata/trailing-slash.tar | Bin .../archive}/tar/testdata/ustar-file-devs.tar | Bin .../archive}/tar/testdata/ustar-file-reg.tar | Bin .../archive}/tar/testdata/ustar.tar | Bin {archive => internal/archive}/tar/testdata/v7.tar | Bin .../archive}/tar/testdata/writer-big-long.tar | Bin .../archive}/tar/testdata/writer-big.tar | Bin .../archive}/tar/testdata/writer.tar | Bin .../archive}/tar/testdata/xattrs.tar | Bin {archive => internal/archive}/tar/writer.go | 0 {archive => internal/archive}/tar/writer_test.go | 0 tar/asm/disassemble.go | 2 +- tar/asm/iterate.go | 2 +- tar/asm/iterate_test.go | 2 +- 61 files changed, 6 insertions(+), 5 deletions(-) rename {archive => internal/archive}/tar/common.go (100%) rename {archive => internal/archive}/tar/example_test.go (96%) rename {archive => internal/archive}/tar/format.go (100%) rename {archive => internal/archive}/tar/reader.go (100%) rename {archive => internal/archive}/tar/reader_test.go (100%) rename {archive => internal/archive}/tar/stat_actime1.go (100%) rename {archive => internal/archive}/tar/stat_actime2.go (100%) rename {archive => internal/archive}/tar/stat_unix.go (100%) rename {archive => internal/archive}/tar/strconv.go (100%) rename {archive => internal/archive}/tar/strconv_test.go (100%) rename {archive => internal/archive}/tar/tar_test.go (100%) rename {archive => internal/archive}/tar/testdata/file-and-dir.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-incremental.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-long-nul.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-multi-hdrs.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-nil-sparse-data.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-nil-sparse-hole.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-not-utf8.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-sparse-big.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu-utf8.tar (100%) rename {archive => internal/archive}/tar/testdata/gnu.tar (100%) rename {archive => internal/archive}/tar/testdata/hardlink.tar (100%) rename {archive => internal/archive}/tar/testdata/hdr-only.tar (100%) rename {archive => internal/archive}/tar/testdata/invalid-go17.tar (100%) rename {archive => internal/archive}/tar/testdata/issue10968.tar (100%) rename {archive => internal/archive}/tar/testdata/issue11169.tar (100%) rename {archive => internal/archive}/tar/testdata/issue12435.tar (100%) rename {archive => internal/archive}/tar/testdata/neg-size.tar (100%) rename {archive => internal/archive}/tar/testdata/nil-uid.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-bad-hdr-file.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-bad-mtime-file.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-global-records.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-multi-hdrs.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-nil-sparse-data.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-nil-sparse-hole.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-nul-path.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-nul-xattrs.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-path-hdr.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-pos-size-file.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-records.tar (100%) rename {archive => internal/archive}/tar/testdata/pax-sparse-big.tar (100%) rename {archive => internal/archive}/tar/testdata/pax.tar (100%) rename {archive => internal/archive}/tar/testdata/small.txt (100%) rename {archive => internal/archive}/tar/testdata/small2.txt (100%) rename {archive => internal/archive}/tar/testdata/sparse-formats.tar (100%) rename {archive => internal/archive}/tar/testdata/star.tar (100%) rename {archive => internal/archive}/tar/testdata/trailing-slash.tar (100%) rename {archive => internal/archive}/tar/testdata/ustar-file-devs.tar (100%) rename {archive => internal/archive}/tar/testdata/ustar-file-reg.tar (100%) rename {archive => internal/archive}/tar/testdata/ustar.tar (100%) rename {archive => internal/archive}/tar/testdata/v7.tar (100%) rename {archive => internal/archive}/tar/testdata/writer-big-long.tar (100%) rename {archive => internal/archive}/tar/testdata/writer-big.tar (100%) rename {archive => internal/archive}/tar/testdata/writer.tar (100%) rename {archive => internal/archive}/tar/testdata/xattrs.tar (100%) rename {archive => internal/archive}/tar/writer.go (100%) rename {archive => internal/archive}/tar/writer_test.go (100%) diff --git a/cmd/tar-split/tar_benchmark_test.go b/cmd/tar-split/tar_benchmark_test.go index 8b7aaff..3baab65 100644 --- a/cmd/tar-split/tar_benchmark_test.go +++ b/cmd/tar-split/tar_benchmark_test.go @@ -7,7 +7,7 @@ import ( upTar "archive/tar" - ourTar "github.com/vbatts/tar-split/archive/tar" + ourTar "github.com/vbatts/tar-split/internal/archive/tar" ) var testfile = "../../archive/tar/testdata/sparse-formats.tar" diff --git a/archive/tar/common.go b/internal/archive/tar/common.go similarity index 100% rename from archive/tar/common.go rename to internal/archive/tar/common.go diff --git a/archive/tar/example_test.go b/internal/archive/tar/example_test.go similarity index 96% rename from archive/tar/example_test.go rename to internal/archive/tar/example_test.go index a2474b9..5189e04 100644 --- a/archive/tar/example_test.go +++ b/internal/archive/tar/example_test.go @@ -5,12 +5,13 @@ package tar_test import ( - "archive/tar" "bytes" "fmt" "io" "log" "os" + + "github.com/vbatts/tar-split/internal/archive/tar" ) func Example_minimal() { diff --git a/archive/tar/format.go b/internal/archive/tar/format.go similarity index 100% rename from archive/tar/format.go rename to internal/archive/tar/format.go diff --git a/archive/tar/reader.go b/internal/archive/tar/reader.go similarity index 100% rename from archive/tar/reader.go rename to internal/archive/tar/reader.go diff --git a/archive/tar/reader_test.go b/internal/archive/tar/reader_test.go similarity index 100% rename from archive/tar/reader_test.go rename to internal/archive/tar/reader_test.go diff --git a/archive/tar/stat_actime1.go b/internal/archive/tar/stat_actime1.go similarity index 100% rename from archive/tar/stat_actime1.go rename to internal/archive/tar/stat_actime1.go diff --git a/archive/tar/stat_actime2.go b/internal/archive/tar/stat_actime2.go similarity index 100% rename from archive/tar/stat_actime2.go rename to internal/archive/tar/stat_actime2.go diff --git a/archive/tar/stat_unix.go b/internal/archive/tar/stat_unix.go similarity index 100% rename from archive/tar/stat_unix.go rename to internal/archive/tar/stat_unix.go diff --git a/archive/tar/strconv.go b/internal/archive/tar/strconv.go similarity index 100% rename from archive/tar/strconv.go rename to internal/archive/tar/strconv.go diff --git a/archive/tar/strconv_test.go b/internal/archive/tar/strconv_test.go similarity index 100% rename from archive/tar/strconv_test.go rename to internal/archive/tar/strconv_test.go diff --git a/archive/tar/tar_test.go b/internal/archive/tar/tar_test.go similarity index 100% rename from archive/tar/tar_test.go rename to internal/archive/tar/tar_test.go diff --git a/archive/tar/testdata/file-and-dir.tar b/internal/archive/tar/testdata/file-and-dir.tar similarity index 100% rename from archive/tar/testdata/file-and-dir.tar rename to internal/archive/tar/testdata/file-and-dir.tar diff --git a/archive/tar/testdata/gnu-incremental.tar b/internal/archive/tar/testdata/gnu-incremental.tar similarity index 100% rename from archive/tar/testdata/gnu-incremental.tar rename to internal/archive/tar/testdata/gnu-incremental.tar diff --git a/archive/tar/testdata/gnu-long-nul.tar b/internal/archive/tar/testdata/gnu-long-nul.tar similarity index 100% rename from archive/tar/testdata/gnu-long-nul.tar rename to internal/archive/tar/testdata/gnu-long-nul.tar diff --git a/archive/tar/testdata/gnu-multi-hdrs.tar b/internal/archive/tar/testdata/gnu-multi-hdrs.tar similarity index 100% rename from archive/tar/testdata/gnu-multi-hdrs.tar rename to internal/archive/tar/testdata/gnu-multi-hdrs.tar diff --git a/archive/tar/testdata/gnu-nil-sparse-data.tar b/internal/archive/tar/testdata/gnu-nil-sparse-data.tar similarity index 100% rename from archive/tar/testdata/gnu-nil-sparse-data.tar rename to internal/archive/tar/testdata/gnu-nil-sparse-data.tar diff --git a/archive/tar/testdata/gnu-nil-sparse-hole.tar b/internal/archive/tar/testdata/gnu-nil-sparse-hole.tar similarity index 100% rename from archive/tar/testdata/gnu-nil-sparse-hole.tar rename to internal/archive/tar/testdata/gnu-nil-sparse-hole.tar diff --git a/archive/tar/testdata/gnu-not-utf8.tar b/internal/archive/tar/testdata/gnu-not-utf8.tar similarity index 100% rename from archive/tar/testdata/gnu-not-utf8.tar rename to internal/archive/tar/testdata/gnu-not-utf8.tar diff --git a/archive/tar/testdata/gnu-sparse-big.tar b/internal/archive/tar/testdata/gnu-sparse-big.tar similarity index 100% rename from archive/tar/testdata/gnu-sparse-big.tar rename to internal/archive/tar/testdata/gnu-sparse-big.tar diff --git a/archive/tar/testdata/gnu-utf8.tar b/internal/archive/tar/testdata/gnu-utf8.tar similarity index 100% rename from archive/tar/testdata/gnu-utf8.tar rename to internal/archive/tar/testdata/gnu-utf8.tar diff --git a/archive/tar/testdata/gnu.tar b/internal/archive/tar/testdata/gnu.tar similarity index 100% rename from archive/tar/testdata/gnu.tar rename to internal/archive/tar/testdata/gnu.tar diff --git a/archive/tar/testdata/hardlink.tar b/internal/archive/tar/testdata/hardlink.tar similarity index 100% rename from archive/tar/testdata/hardlink.tar rename to internal/archive/tar/testdata/hardlink.tar diff --git a/archive/tar/testdata/hdr-only.tar b/internal/archive/tar/testdata/hdr-only.tar similarity index 100% rename from archive/tar/testdata/hdr-only.tar rename to internal/archive/tar/testdata/hdr-only.tar diff --git a/archive/tar/testdata/invalid-go17.tar b/internal/archive/tar/testdata/invalid-go17.tar similarity index 100% rename from archive/tar/testdata/invalid-go17.tar rename to internal/archive/tar/testdata/invalid-go17.tar diff --git a/archive/tar/testdata/issue10968.tar b/internal/archive/tar/testdata/issue10968.tar similarity index 100% rename from archive/tar/testdata/issue10968.tar rename to internal/archive/tar/testdata/issue10968.tar diff --git a/archive/tar/testdata/issue11169.tar b/internal/archive/tar/testdata/issue11169.tar similarity index 100% rename from archive/tar/testdata/issue11169.tar rename to internal/archive/tar/testdata/issue11169.tar diff --git a/archive/tar/testdata/issue12435.tar b/internal/archive/tar/testdata/issue12435.tar similarity index 100% rename from archive/tar/testdata/issue12435.tar rename to internal/archive/tar/testdata/issue12435.tar diff --git a/archive/tar/testdata/neg-size.tar b/internal/archive/tar/testdata/neg-size.tar similarity index 100% rename from archive/tar/testdata/neg-size.tar rename to internal/archive/tar/testdata/neg-size.tar diff --git a/archive/tar/testdata/nil-uid.tar b/internal/archive/tar/testdata/nil-uid.tar similarity index 100% rename from archive/tar/testdata/nil-uid.tar rename to internal/archive/tar/testdata/nil-uid.tar diff --git a/archive/tar/testdata/pax-bad-hdr-file.tar b/internal/archive/tar/testdata/pax-bad-hdr-file.tar similarity index 100% rename from archive/tar/testdata/pax-bad-hdr-file.tar rename to internal/archive/tar/testdata/pax-bad-hdr-file.tar diff --git a/archive/tar/testdata/pax-bad-mtime-file.tar b/internal/archive/tar/testdata/pax-bad-mtime-file.tar similarity index 100% rename from archive/tar/testdata/pax-bad-mtime-file.tar rename to internal/archive/tar/testdata/pax-bad-mtime-file.tar diff --git a/archive/tar/testdata/pax-global-records.tar b/internal/archive/tar/testdata/pax-global-records.tar similarity index 100% rename from archive/tar/testdata/pax-global-records.tar rename to internal/archive/tar/testdata/pax-global-records.tar diff --git a/archive/tar/testdata/pax-multi-hdrs.tar b/internal/archive/tar/testdata/pax-multi-hdrs.tar similarity index 100% rename from archive/tar/testdata/pax-multi-hdrs.tar rename to internal/archive/tar/testdata/pax-multi-hdrs.tar diff --git a/archive/tar/testdata/pax-nil-sparse-data.tar b/internal/archive/tar/testdata/pax-nil-sparse-data.tar similarity index 100% rename from archive/tar/testdata/pax-nil-sparse-data.tar rename to internal/archive/tar/testdata/pax-nil-sparse-data.tar diff --git a/archive/tar/testdata/pax-nil-sparse-hole.tar b/internal/archive/tar/testdata/pax-nil-sparse-hole.tar similarity index 100% rename from archive/tar/testdata/pax-nil-sparse-hole.tar rename to internal/archive/tar/testdata/pax-nil-sparse-hole.tar diff --git a/archive/tar/testdata/pax-nul-path.tar b/internal/archive/tar/testdata/pax-nul-path.tar similarity index 100% rename from archive/tar/testdata/pax-nul-path.tar rename to internal/archive/tar/testdata/pax-nul-path.tar diff --git a/archive/tar/testdata/pax-nul-xattrs.tar b/internal/archive/tar/testdata/pax-nul-xattrs.tar similarity index 100% rename from archive/tar/testdata/pax-nul-xattrs.tar rename to internal/archive/tar/testdata/pax-nul-xattrs.tar diff --git a/archive/tar/testdata/pax-path-hdr.tar b/internal/archive/tar/testdata/pax-path-hdr.tar similarity index 100% rename from archive/tar/testdata/pax-path-hdr.tar rename to internal/archive/tar/testdata/pax-path-hdr.tar diff --git a/archive/tar/testdata/pax-pos-size-file.tar b/internal/archive/tar/testdata/pax-pos-size-file.tar similarity index 100% rename from archive/tar/testdata/pax-pos-size-file.tar rename to internal/archive/tar/testdata/pax-pos-size-file.tar diff --git a/archive/tar/testdata/pax-records.tar b/internal/archive/tar/testdata/pax-records.tar similarity index 100% rename from archive/tar/testdata/pax-records.tar rename to internal/archive/tar/testdata/pax-records.tar diff --git a/archive/tar/testdata/pax-sparse-big.tar b/internal/archive/tar/testdata/pax-sparse-big.tar similarity index 100% rename from archive/tar/testdata/pax-sparse-big.tar rename to internal/archive/tar/testdata/pax-sparse-big.tar diff --git a/archive/tar/testdata/pax.tar b/internal/archive/tar/testdata/pax.tar similarity index 100% rename from archive/tar/testdata/pax.tar rename to internal/archive/tar/testdata/pax.tar diff --git a/archive/tar/testdata/small.txt b/internal/archive/tar/testdata/small.txt similarity index 100% rename from archive/tar/testdata/small.txt rename to internal/archive/tar/testdata/small.txt diff --git a/archive/tar/testdata/small2.txt b/internal/archive/tar/testdata/small2.txt similarity index 100% rename from archive/tar/testdata/small2.txt rename to internal/archive/tar/testdata/small2.txt diff --git a/archive/tar/testdata/sparse-formats.tar b/internal/archive/tar/testdata/sparse-formats.tar similarity index 100% rename from archive/tar/testdata/sparse-formats.tar rename to internal/archive/tar/testdata/sparse-formats.tar diff --git a/archive/tar/testdata/star.tar b/internal/archive/tar/testdata/star.tar similarity index 100% rename from archive/tar/testdata/star.tar rename to internal/archive/tar/testdata/star.tar diff --git a/archive/tar/testdata/trailing-slash.tar b/internal/archive/tar/testdata/trailing-slash.tar similarity index 100% rename from archive/tar/testdata/trailing-slash.tar rename to internal/archive/tar/testdata/trailing-slash.tar diff --git a/archive/tar/testdata/ustar-file-devs.tar b/internal/archive/tar/testdata/ustar-file-devs.tar similarity index 100% rename from archive/tar/testdata/ustar-file-devs.tar rename to internal/archive/tar/testdata/ustar-file-devs.tar diff --git a/archive/tar/testdata/ustar-file-reg.tar b/internal/archive/tar/testdata/ustar-file-reg.tar similarity index 100% rename from archive/tar/testdata/ustar-file-reg.tar rename to internal/archive/tar/testdata/ustar-file-reg.tar diff --git a/archive/tar/testdata/ustar.tar b/internal/archive/tar/testdata/ustar.tar similarity index 100% rename from archive/tar/testdata/ustar.tar rename to internal/archive/tar/testdata/ustar.tar diff --git a/archive/tar/testdata/v7.tar b/internal/archive/tar/testdata/v7.tar similarity index 100% rename from archive/tar/testdata/v7.tar rename to internal/archive/tar/testdata/v7.tar diff --git a/archive/tar/testdata/writer-big-long.tar b/internal/archive/tar/testdata/writer-big-long.tar similarity index 100% rename from archive/tar/testdata/writer-big-long.tar rename to internal/archive/tar/testdata/writer-big-long.tar diff --git a/archive/tar/testdata/writer-big.tar b/internal/archive/tar/testdata/writer-big.tar similarity index 100% rename from archive/tar/testdata/writer-big.tar rename to internal/archive/tar/testdata/writer-big.tar diff --git a/archive/tar/testdata/writer.tar b/internal/archive/tar/testdata/writer.tar similarity index 100% rename from archive/tar/testdata/writer.tar rename to internal/archive/tar/testdata/writer.tar diff --git a/archive/tar/testdata/xattrs.tar b/internal/archive/tar/testdata/xattrs.tar similarity index 100% rename from archive/tar/testdata/xattrs.tar rename to internal/archive/tar/testdata/xattrs.tar diff --git a/archive/tar/writer.go b/internal/archive/tar/writer.go similarity index 100% rename from archive/tar/writer.go rename to internal/archive/tar/writer.go diff --git a/archive/tar/writer_test.go b/internal/archive/tar/writer_test.go similarity index 100% rename from archive/tar/writer_test.go rename to internal/archive/tar/writer_test.go diff --git a/tar/asm/disassemble.go b/tar/asm/disassemble.go index 80c2522..4e72985 100644 --- a/tar/asm/disassemble.go +++ b/tar/asm/disassemble.go @@ -3,7 +3,7 @@ package asm import ( "io" - "github.com/vbatts/tar-split/archive/tar" + "github.com/vbatts/tar-split/internal/archive/tar" "github.com/vbatts/tar-split/tar/storage" ) diff --git a/tar/asm/iterate.go b/tar/asm/iterate.go index 8a65887..c4a62d4 100644 --- a/tar/asm/iterate.go +++ b/tar/asm/iterate.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/vbatts/tar-split/archive/tar" + "github.com/vbatts/tar-split/internal/archive/tar" "github.com/vbatts/tar-split/tar/storage" ) diff --git a/tar/asm/iterate_test.go b/tar/asm/iterate_test.go index 884c019..5443a46 100644 --- a/tar/asm/iterate_test.go +++ b/tar/asm/iterate_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vbatts/tar-split/archive/tar" + "github.com/vbatts/tar-split/internal/archive/tar" "github.com/vbatts/tar-split/tar/storage" )