From 23914a01b84c1e453e60b2051fa0df937382e890 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:43 -0800 Subject: [PATCH] Move pkg/failpoint to internal/failpoint Signed-off-by: Derek McGowan --- integration/failpoint/cmd/cni-bridge-fp/main_linux.go | 2 +- .../failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go | 2 +- integration/sandbox_run_rollback_test.go | 2 +- {pkg => internal}/failpoint/fail.go | 0 {pkg => internal}/failpoint/fail_test.go | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {pkg => internal}/failpoint/fail.go (100%) rename {pkg => internal}/failpoint/fail_test.go (100%) diff --git a/integration/failpoint/cmd/cni-bridge-fp/main_linux.go b/integration/failpoint/cmd/cni-bridge-fp/main_linux.go index 853a3b2d7..7a8ee01d9 100644 --- a/integration/failpoint/cmd/cni-bridge-fp/main_linux.go +++ b/integration/failpoint/cmd/cni-bridge-fp/main_linux.go @@ -25,7 +25,7 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/v2/pkg/failpoint" + "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/continuity" "github.com/containernetworking/cni/pkg/invoke" "github.com/containernetworking/cni/pkg/skel" diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go index 91de8df06..bf2d4c02c 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go @@ -25,7 +25,7 @@ import ( taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" - "github.com/containerd/containerd/v2/pkg/failpoint" + "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" diff --git a/integration/sandbox_run_rollback_test.go b/integration/sandbox_run_rollback_test.go index 71ab2bf42..cfaeab1c5 100644 --- a/integration/sandbox_run_rollback_test.go +++ b/integration/sandbox_run_rollback_test.go @@ -35,8 +35,8 @@ import ( "github.com/stretchr/testify/require" criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/containerd/v2/pkg/cri/server/base" - "github.com/containerd/containerd/v2/pkg/failpoint" ) const ( diff --git a/pkg/failpoint/fail.go b/internal/failpoint/fail.go similarity index 100% rename from pkg/failpoint/fail.go rename to internal/failpoint/fail.go diff --git a/pkg/failpoint/fail_test.go b/internal/failpoint/fail_test.go similarity index 100% rename from pkg/failpoint/fail_test.go rename to internal/failpoint/fail_test.go