From 7626765d87e063d0fac61c7bdfb795e4fce38288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Thu, 24 Mar 2022 15:17:57 +0100 Subject: [PATCH] Rework mount folder structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- mount/{pkg => }/cryptmapper/cryptmapper.go | 0 mount/{pkg => }/cryptmapper/cryptmapper_test.go | 2 +- mount/{pkg => }/kms/constellation.go | 0 mount/{pkg => }/kms/constellation_test.go | 0 mount/{pkg => }/kms/static.go | 0 mount/test/manual/main.go | 4 ++-- mount/test/mount_integration_test.go | 4 ++-- 7 files changed, 5 insertions(+), 5 deletions(-) rename mount/{pkg => }/cryptmapper/cryptmapper.go (100%) rename mount/{pkg => }/cryptmapper/cryptmapper_test.go (99%) rename mount/{pkg => }/kms/constellation.go (100%) rename mount/{pkg => }/kms/constellation_test.go (100%) rename mount/{pkg => }/kms/static.go (100%) diff --git a/mount/pkg/cryptmapper/cryptmapper.go b/mount/cryptmapper/cryptmapper.go similarity index 100% rename from mount/pkg/cryptmapper/cryptmapper.go rename to mount/cryptmapper/cryptmapper.go diff --git a/mount/pkg/cryptmapper/cryptmapper_test.go b/mount/cryptmapper/cryptmapper_test.go similarity index 99% rename from mount/pkg/cryptmapper/cryptmapper_test.go rename to mount/cryptmapper/cryptmapper_test.go index e0cf718fb..12d3b5cc4 100644 --- a/mount/pkg/cryptmapper/cryptmapper_test.go +++ b/mount/cryptmapper/cryptmapper_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/edgelesssys/constellation/mount/pkg/kms" + "github.com/edgelesssys/constellation/mount/kms" cryptsetup "github.com/martinjungblut/go-cryptsetup" "github.com/stretchr/testify/assert" ) diff --git a/mount/pkg/kms/constellation.go b/mount/kms/constellation.go similarity index 100% rename from mount/pkg/kms/constellation.go rename to mount/kms/constellation.go diff --git a/mount/pkg/kms/constellation_test.go b/mount/kms/constellation_test.go similarity index 100% rename from mount/pkg/kms/constellation_test.go rename to mount/kms/constellation_test.go diff --git a/mount/pkg/kms/static.go b/mount/kms/static.go similarity index 100% rename from mount/pkg/kms/static.go rename to mount/kms/static.go diff --git a/mount/test/manual/main.go b/mount/test/manual/main.go index c90395311..78d863e2f 100644 --- a/mount/test/manual/main.go +++ b/mount/test/manual/main.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/edgelesssys/constellation/mount/pkg/cryptmapper" - "github.com/edgelesssys/constellation/mount/pkg/kms" + "github.com/edgelesssys/constellation/mount/cryptmapper" + "github.com/edgelesssys/constellation/mount/kms" "k8s.io/klog" ) diff --git a/mount/test/mount_integration_test.go b/mount/test/mount_integration_test.go index c8beff252..233897596 100644 --- a/mount/test/mount_integration_test.go +++ b/mount/test/mount_integration_test.go @@ -9,8 +9,8 @@ import ( "os/exec" "testing" - "github.com/edgelesssys/constellation/mount/pkg/cryptmapper" - "github.com/edgelesssys/constellation/mount/pkg/kms" + "github.com/edgelesssys/constellation/mount/cryptmapper" + "github.com/edgelesssys/constellation/mount/kms" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/klog"