From 23170e20dfcd9ba3524a8cf1d4198ecc9e76a377 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Mon, 1 Jul 2024 09:20:32 -0700 Subject: [PATCH] Move fsverity package to internal This functionality is not directly related to containerd and could move to external package at some point. Signed-off-by: Derek McGowan --- {pkg => internal}/fsverity/fsverity_linux.go | 0 {pkg => internal}/fsverity/fsverity_other.go | 0 {pkg => internal}/fsverity/fsverity_test.go | 0 plugins/content/local/store.go | 7 ++++--- plugins/content/local/store_test.go | 5 +++-- plugins/content/local/writer.go | 5 +++-- 6 files changed, 10 insertions(+), 7 deletions(-) rename {pkg => internal}/fsverity/fsverity_linux.go (100%) rename {pkg => internal}/fsverity/fsverity_other.go (100%) rename {pkg => internal}/fsverity/fsverity_test.go (100%) diff --git a/pkg/fsverity/fsverity_linux.go b/internal/fsverity/fsverity_linux.go similarity index 100% rename from pkg/fsverity/fsverity_linux.go rename to internal/fsverity/fsverity_linux.go diff --git a/pkg/fsverity/fsverity_other.go b/internal/fsverity/fsverity_other.go similarity index 100% rename from pkg/fsverity/fsverity_other.go rename to internal/fsverity/fsverity_other.go diff --git a/pkg/fsverity/fsverity_test.go b/internal/fsverity/fsverity_test.go similarity index 100% rename from pkg/fsverity/fsverity_test.go rename to internal/fsverity/fsverity_test.go diff --git a/plugins/content/local/store.go b/plugins/content/local/store.go index a15265864..bc3102ffe 100644 --- a/plugins/content/local/store.go +++ b/plugins/content/local/store.go @@ -27,12 +27,13 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/pkg/filters" - "github.com/containerd/containerd/v2/pkg/fsverity" "github.com/containerd/errdefs" "github.com/containerd/log" + "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/internal/fsverity" + "github.com/containerd/containerd/v2/pkg/filters" + "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go index 9c1795c46..6e4219094 100644 --- a/plugins/content/local/store_test.go +++ b/plugins/content/local/store_test.go @@ -32,12 +32,13 @@ import ( "testing" "time" + "github.com/containerd/errdefs" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" + "github.com/containerd/containerd/v2/internal/fsverity" "github.com/containerd/containerd/v2/internal/randutil" - "github.com/containerd/containerd/v2/pkg/fsverity" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/plugins/content/local/writer.go b/plugins/content/local/writer.go index 1829a3bdd..5058912b7 100644 --- a/plugins/content/local/writer.go +++ b/plugins/content/local/writer.go @@ -26,11 +26,12 @@ import ( "runtime" "time" - "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/pkg/fsverity" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" + + "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/internal/fsverity" ) // writer represents a write transaction against the blob store.