From 4ee6419fad61b80c3f982b422e46acf89e18f658 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:10 -0800 Subject: [PATCH] Move pkg/randutil to internal/randutil Signed-off-by: Derek McGowan --- core/content/helpers.go | 2 +- core/mount/losetup_linux.go | 2 +- core/snapshots/testsuite/helpers.go | 2 +- core/snapshots/testsuite/testsuite.go | 2 +- internal/kmutex/kmutex_test.go | 2 +- {pkg => internal}/randutil/randutil.go | 0 plugins/content/local/store_test.go | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename {pkg => internal}/randutil/randutil.go (100%) diff --git a/core/content/helpers.go b/core/content/helpers.go index 6bbf95aaa..514127d0a 100644 --- a/core/content/helpers.go +++ b/core/content/helpers.go @@ -24,8 +24,8 @@ import ( "sync" "time" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/mount/losetup_linux.go b/core/mount/losetup_linux.go index 5c8c6a609..44852b955 100644 --- a/core/mount/losetup_linux.go +++ b/core/mount/losetup_linux.go @@ -26,7 +26,7 @@ import ( "unsafe" kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" - "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/internal/randutil" "golang.org/x/sys/unix" ) diff --git a/core/snapshots/testsuite/helpers.go b/core/snapshots/testsuite/helpers.go index 67a65aac3..07cdcc218 100644 --- a/core/snapshots/testsuite/helpers.go +++ b/core/snapshots/testsuite/helpers.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/continuity/fs/fstest" ) diff --git a/core/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go index 8f49d3588..54570c5d9 100644 --- a/core/snapshots/testsuite/testsuite.go +++ b/core/snapshots/testsuite/testsuite.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" diff --git a/internal/kmutex/kmutex_test.go b/internal/kmutex/kmutex_test.go index 80a30bc3e..35f6de685 100644 --- a/internal/kmutex/kmutex_test.go +++ b/internal/kmutex/kmutex_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/randutil/randutil.go b/internal/randutil/randutil.go similarity index 100% rename from pkg/randutil/randutil.go rename to internal/randutil/randutil.go diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go index 0d2a4d084..73409df15 100644 --- a/plugins/content/local/store_test.go +++ b/plugins/content/local/store_test.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/opencontainers/go-digest"