Merge pull request containerd#10407 from dmcgowan/fsverity-internal

Move fsverity package to internal
oci-playground · Jul 1, 2024 · 3b2a14b · 3b2a14b
2 parents ebcbbe5 + 23170e2
commit 3b2a14b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/pkg/fsverity/fsverity_linux.go → internal/fsverity/fsverity_linux.go b/pkg/fsverity/fsverity_linux.go → internal/fsverity/fsverity_linux.go
diff --git a/pkg/fsverity/fsverity_other.go → internal/fsverity/fsverity_other.go b/pkg/fsverity/fsverity_other.go → internal/fsverity/fsverity_other.go
diff --git a/pkg/fsverity/fsverity_test.go → internal/fsverity/fsverity_test.go b/pkg/fsverity/fsverity_test.go → internal/fsverity/fsverity_test.go
diff --git 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
@@ -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
@@ -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.