From 764c907003a1fe5b73c57c42dbbce9c52b1a7a90 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:37 -0800 Subject: [PATCH] Move pkg/tomlext to internal/tomlext Signed-off-by: Derek McGowan --- {pkg => internal}/tomlext/toml_v2_util.go | 0 pkg/imageverifier/bindir/bindir.go | 2 +- pkg/imageverifier/bindir/bindir_test.go | 2 +- pkg/nri/config.go | 2 +- plugins/imageverifier/plugin.go | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename {pkg => internal}/tomlext/toml_v2_util.go (100%) diff --git a/pkg/tomlext/toml_v2_util.go b/internal/tomlext/toml_v2_util.go similarity index 100% rename from pkg/tomlext/toml_v2_util.go rename to internal/tomlext/toml_v2_util.go diff --git a/pkg/imageverifier/bindir/bindir.go b/pkg/imageverifier/bindir/bindir.go index c832713be..198f7643a 100644 --- a/pkg/imageverifier/bindir/bindir.go +++ b/pkg/imageverifier/bindir/bindir.go @@ -29,8 +29,8 @@ import ( "strings" "time" + "github.com/containerd/containerd/v2/internal/tomlext" "github.com/containerd/containerd/v2/pkg/imageverifier" - "github.com/containerd/containerd/v2/pkg/tomlext" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/imageverifier/bindir/bindir_test.go b/pkg/imageverifier/bindir/bindir_test.go index d7a4d1440..099f6dc3c 100644 --- a/pkg/imageverifier/bindir/bindir_test.go +++ b/pkg/imageverifier/bindir/bindir_test.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/containerd/containerd/v2/pkg/tomlext" + "github.com/containerd/containerd/v2/internal/tomlext" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/pkg/nri/config.go b/pkg/nri/config.go index c1fc3db4b..d03180c81 100644 --- a/pkg/nri/config.go +++ b/pkg/nri/config.go @@ -17,7 +17,7 @@ package nri import ( - "github.com/containerd/containerd/v2/pkg/tomlext" + "github.com/containerd/containerd/v2/internal/tomlext" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/plugins/imageverifier/plugin.go b/plugins/imageverifier/plugin.go index 94f559b04..9f73f16fc 100644 --- a/plugins/imageverifier/plugin.go +++ b/plugins/imageverifier/plugin.go @@ -19,8 +19,8 @@ package imageverifier import ( "time" + "github.com/containerd/containerd/v2/internal/tomlext" "github.com/containerd/containerd/v2/pkg/imageverifier/bindir" - "github.com/containerd/containerd/v2/pkg/tomlext" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry"