merge #594 into opencontainers/umoci:main

Aleksa Sarai (6):
  internal: move pkg/system to internal
  internal: move pkg/testutils to internal/testhelpers
  internal: move pkg/iohelpers to internal
  internal: move pkg/funchelpers to internal
  internal: move pkg/pathtrie to internal
  internal: move pkg/idtools to internal

LGTMs: cyphar

Author: cyphar

Makefile

@@ -65,10 +65,10 @@ BASE_LDFLAGS := -s -w -X ${PROJECT}.gitCommit=${COMMIT}
 # Specific build flags for build type.
 ifeq ($(GOOS), linux)
 	DYN_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS}"
-	TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test"
+	TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/internal/testhelpers.binaryType=test"
 else
 	DYN_BUILD_FLAGS := ${BASE_FLAGS} -ldflags "${BASE_LDFLAGS}"
-	TEST_BUILD_FLAGS := ${BASE_FLAGS} -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test"
+	TEST_BUILD_FLAGS := ${BASE_FLAGS} -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/internal/testhelpers.binaryType=test"
 endif
 
 

cmd/umoci/config.go

@@ -29,11 +29,11 @@ import (
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/urfave/cli"
 
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/mutate"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
 	igen "github.com/opencontainers/umoci/oci/config/generate"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 // FIXME: We should also implement a raw mode that just does modifications of

cmd/umoci/gc.go

@@ -25,9 +25,9 @@ import (
 
 	"github.com/urfave/cli"
 
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 var gcCommand = cli.Command{

cmd/umoci/insert.go

@@ -29,13 +29,13 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/opencontainers/umoci"
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/mutate"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/opencontainers/umoci/oci/casext/blobcompress"
 	igen "github.com/opencontainers/umoci/oci/config/generate"
 	"github.com/opencontainers/umoci/oci/layer"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 var insertCommand = uxCompress(uxRemap(uxHistory(uxTag(cli.Command{

cmd/umoci/new.go

@@ -25,9 +25,9 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/opencontainers/umoci"
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 var newCommand = cli.Command{

cmd/umoci/raw-add-layer.go

@@ -30,12 +30,12 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/opencontainers/umoci"
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/mutate"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/opencontainers/umoci/oci/casext/blobcompress"
 	igen "github.com/opencontainers/umoci/oci/config/generate"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 var rawAddLayerCommand = uxCompress(uxHistory(uxTag(cli.Command{

cmd/umoci/raw-runtime-config.go

@@ -29,10 +29,10 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/opencontainers/umoci"
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/opencontainers/umoci/oci/layer"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 var rawConfigCommand = uxRemap(cli.Command{

cmd/umoci/raw-unpack.go

@@ -28,10 +28,10 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/opencontainers/umoci"
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/opencontainers/umoci/oci/layer"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 var rawUnpackCommand = uxRemap(cli.Command{

cmd/umoci/repack.go

@@ -29,12 +29,12 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/opencontainers/umoci"
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/mutate"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/opencontainers/umoci/oci/casext/blobcompress"
 	igen "github.com/opencontainers/umoci/oci/config/generate"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 	"github.com/opencontainers/umoci/pkg/mtreefilter"
 )
 

cmd/umoci/stat.go

@@ -29,9 +29,9 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/opencontainers/umoci"
+	"github.com/opencontainers/umoci/internal/funchelpers"
 	"github.com/opencontainers/umoci/oci/cas/dir"
 	"github.com/opencontainers/umoci/oci/casext"
-	"github.com/opencontainers/umoci/pkg/funchelpers"
 )
 
 var statCommand = cli.Command{