diff --git a/CMakeLists.txt b/CMakeLists.txt index d14e9e9b3..071f544f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ add_custom_target(debug_bootstrapper add_custom_target(debugd ALL CGO_ENABLED=0 go build -o ${CMAKE_BINARY_DIR}/debugd -buildvcs=false -ldflags "-buildid=''" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debugd/debugd/cmd/debugd + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debugd/cmd/debugd BYPRODUCTS debugd ) @@ -62,7 +62,7 @@ add_custom_target(debugd ALL add_custom_target(cdbg ALL CGO_ENABLED=0 go build -o ${CMAKE_BINARY_DIR}/cdbg -buildvcs=false -ldflags "-buildid=''" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debugd/cdbg + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debugd/cmd/cdbg BYPRODUCTS cdbg ) diff --git a/debugd/cdbg/cdbg.go b/debugd/cdbg/cdbg.go deleted file mode 100644 index cc1dd7cf7..000000000 --- a/debugd/cdbg/cdbg.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/edgelesssys/constellation/debugd/cdbg/cmd" - -func main() { - cmd.Execute() -} diff --git a/debugd/cmd/cdbg/cdbg.go b/debugd/cmd/cdbg/cdbg.go new file mode 100644 index 000000000..d38ef4cc8 --- /dev/null +++ b/debugd/cmd/cdbg/cdbg.go @@ -0,0 +1,7 @@ +package main + +import "github.com/edgelesssys/constellation/debugd/internal/cdbg/cmd" + +func main() { + cmd.Execute() +} diff --git a/debugd/debugd/cmd/debugd/debugd.go b/debugd/cmd/debugd/debugd.go similarity index 87% rename from debugd/debugd/cmd/debugd/debugd.go rename to debugd/cmd/debugd/debugd.go index 110e3e3b7..f1cc05959 100644 --- a/debugd/debugd/cmd/debugd/debugd.go +++ b/debugd/cmd/debugd/debugd.go @@ -9,12 +9,12 @@ import ( "sync" "github.com/edgelesssys/constellation/bootstrapper/role" - "github.com/edgelesssys/constellation/debugd/bootstrapper" - "github.com/edgelesssys/constellation/debugd/debugd/deploy" - "github.com/edgelesssys/constellation/debugd/debugd/metadata" - "github.com/edgelesssys/constellation/debugd/debugd/metadata/cloudprovider" - "github.com/edgelesssys/constellation/debugd/debugd/metadata/fallback" - "github.com/edgelesssys/constellation/debugd/debugd/server" + "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" + "github.com/edgelesssys/constellation/debugd/internal/debugd/metadata" + "github.com/edgelesssys/constellation/debugd/internal/debugd/metadata/cloudprovider" + "github.com/edgelesssys/constellation/debugd/internal/debugd/metadata/fallback" + "github.com/edgelesssys/constellation/debugd/internal/debugd/server" platform "github.com/edgelesssys/constellation/internal/cloud/cloudprovider" "github.com/edgelesssys/constellation/internal/deploy/ssh" "github.com/edgelesssys/constellation/internal/deploy/user" diff --git a/debugd/bootstrapper/streamer.go b/debugd/internal/bootstrapper/streamer.go similarity index 100% rename from debugd/bootstrapper/streamer.go rename to debugd/internal/bootstrapper/streamer.go diff --git a/debugd/bootstrapper/streamer_test.go b/debugd/internal/bootstrapper/streamer_test.go similarity index 100% rename from debugd/bootstrapper/streamer_test.go rename to debugd/internal/bootstrapper/streamer_test.go diff --git a/debugd/cdbg/cmd/deploy.go b/debugd/internal/cdbg/cmd/deploy.go similarity index 96% rename from debugd/cdbg/cmd/deploy.go rename to debugd/internal/cdbg/cmd/deploy.go index 71431f64f..ae3b11b76 100644 --- a/debugd/cdbg/cmd/deploy.go +++ b/debugd/internal/cdbg/cmd/deploy.go @@ -7,10 +7,10 @@ import ( "net" "strconv" - "github.com/edgelesssys/constellation/debugd/bootstrapper" - "github.com/edgelesssys/constellation/debugd/cdbg/config" - "github.com/edgelesssys/constellation/debugd/debugd" - depl "github.com/edgelesssys/constellation/debugd/debugd/deploy" + "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/debugd/internal/cdbg/config" + "github.com/edgelesssys/constellation/debugd/internal/debugd" + depl "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" pb "github.com/edgelesssys/constellation/debugd/service" configc "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/constants" diff --git a/debugd/cdbg/cmd/root.go b/debugd/internal/cdbg/cmd/root.go similarity index 100% rename from debugd/cdbg/cmd/root.go rename to debugd/internal/cdbg/cmd/root.go diff --git a/debugd/cdbg/config/config.go b/debugd/internal/cdbg/config/config.go similarity index 93% rename from debugd/cdbg/config/config.go rename to debugd/internal/cdbg/config/config.go index 3c427c88f..893048f0a 100644 --- a/debugd/cdbg/config/config.go +++ b/debugd/internal/cdbg/config/config.go @@ -5,7 +5,7 @@ import ( "fmt" "io/fs" - "github.com/edgelesssys/constellation/debugd/debugd/deploy" + "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" configc "github.com/edgelesssys/constellation/internal/config" "github.com/edgelesssys/constellation/internal/file" ) diff --git a/debugd/cdbg/state/state.go b/debugd/internal/cdbg/state/state.go similarity index 100% rename from debugd/cdbg/state/state.go rename to debugd/internal/cdbg/state/state.go diff --git a/debugd/debugd/constants.go b/debugd/internal/debugd/constants.go similarity index 100% rename from debugd/debugd/constants.go rename to debugd/internal/debugd/constants.go diff --git a/debugd/debugd/deploy/download.go b/debugd/internal/debugd/deploy/download.go similarity index 96% rename from debugd/debugd/deploy/download.go rename to debugd/internal/debugd/deploy/download.go index 84039a700..335373b1c 100644 --- a/debugd/debugd/deploy/download.go +++ b/debugd/internal/debugd/deploy/download.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/edgelesssys/constellation/debugd/bootstrapper" - "github.com/edgelesssys/constellation/debugd/debugd" + "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/debugd/internal/debugd" pb "github.com/edgelesssys/constellation/debugd/service" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/deploy/ssh" diff --git a/debugd/debugd/deploy/download_test.go b/debugd/internal/debugd/deploy/download_test.go similarity index 97% rename from debugd/debugd/deploy/download_test.go rename to debugd/internal/debugd/deploy/download_test.go index 8c723ef37..42b39f95e 100644 --- a/debugd/debugd/deploy/download_test.go +++ b/debugd/internal/debugd/deploy/download_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/debugd/bootstrapper" - "github.com/edgelesssys/constellation/debugd/debugd" + "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/debugd/internal/debugd" pb "github.com/edgelesssys/constellation/debugd/service" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/deploy/ssh" diff --git a/debugd/debugd/deploy/service.go b/debugd/internal/debugd/deploy/service.go similarity index 98% rename from debugd/debugd/deploy/service.go rename to debugd/internal/debugd/deploy/service.go index a3b789c3d..27c51a911 100644 --- a/debugd/debugd/deploy/service.go +++ b/debugd/internal/debugd/deploy/service.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/edgelesssys/constellation/debugd/debugd" + "github.com/edgelesssys/constellation/debugd/internal/debugd" "github.com/edgelesssys/constellation/internal/logger" "github.com/spf13/afero" "go.uber.org/zap" diff --git a/debugd/debugd/deploy/service_test.go b/debugd/internal/debugd/deploy/service_test.go similarity index 100% rename from debugd/debugd/deploy/service_test.go rename to debugd/internal/debugd/deploy/service_test.go diff --git a/debugd/debugd/deploy/systemdaction_string.go b/debugd/internal/debugd/deploy/systemdaction_string.go similarity index 100% rename from debugd/debugd/deploy/systemdaction_string.go rename to debugd/internal/debugd/deploy/systemdaction_string.go diff --git a/debugd/debugd/deploy/wrappers.go b/debugd/internal/debugd/deploy/wrappers.go similarity index 100% rename from debugd/debugd/deploy/wrappers.go rename to debugd/internal/debugd/deploy/wrappers.go diff --git a/debugd/debugd/metadata/cloudprovider/cloudprovider.go b/debugd/internal/debugd/metadata/cloudprovider/cloudprovider.go similarity index 100% rename from debugd/debugd/metadata/cloudprovider/cloudprovider.go rename to debugd/internal/debugd/metadata/cloudprovider/cloudprovider.go diff --git a/debugd/debugd/metadata/cloudprovider/cloudprovider_test.go b/debugd/internal/debugd/metadata/cloudprovider/cloudprovider_test.go similarity index 100% rename from debugd/debugd/metadata/cloudprovider/cloudprovider_test.go rename to debugd/internal/debugd/metadata/cloudprovider/cloudprovider_test.go diff --git a/debugd/debugd/metadata/fallback/fallback.go b/debugd/internal/debugd/metadata/fallback/fallback.go similarity index 100% rename from debugd/debugd/metadata/fallback/fallback.go rename to debugd/internal/debugd/metadata/fallback/fallback.go diff --git a/debugd/debugd/metadata/fallback/fallback_test.go b/debugd/internal/debugd/metadata/fallback/fallback_test.go similarity index 100% rename from debugd/debugd/metadata/fallback/fallback_test.go rename to debugd/internal/debugd/metadata/fallback/fallback_test.go diff --git a/debugd/debugd/metadata/scheduler.go b/debugd/internal/debugd/metadata/scheduler.go similarity index 98% rename from debugd/debugd/metadata/scheduler.go rename to debugd/internal/debugd/metadata/scheduler.go index 2c8743331..a9ba65445 100644 --- a/debugd/debugd/metadata/scheduler.go +++ b/debugd/internal/debugd/metadata/scheduler.go @@ -8,7 +8,7 @@ import ( "time" "github.com/edgelesssys/constellation/bootstrapper/role" - "github.com/edgelesssys/constellation/debugd/debugd" + "github.com/edgelesssys/constellation/debugd/internal/debugd" "github.com/edgelesssys/constellation/internal/deploy/ssh" "github.com/edgelesssys/constellation/internal/logger" "go.uber.org/zap" diff --git a/debugd/debugd/metadata/scheduler_test.go b/debugd/internal/debugd/metadata/scheduler_test.go similarity index 100% rename from debugd/debugd/metadata/scheduler_test.go rename to debugd/internal/debugd/metadata/scheduler_test.go diff --git a/debugd/debugd/server/server.go b/debugd/internal/debugd/server/server.go similarity index 96% rename from debugd/debugd/server/server.go rename to debugd/internal/debugd/server/server.go index 1496dc740..bec7c2f1e 100644 --- a/debugd/debugd/server/server.go +++ b/debugd/internal/debugd/server/server.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/edgelesssys/constellation/debugd/bootstrapper" - "github.com/edgelesssys/constellation/debugd/debugd" - "github.com/edgelesssys/constellation/debugd/debugd/deploy" + "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/debugd/internal/debugd" + "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" pb "github.com/edgelesssys/constellation/debugd/service" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/deploy/ssh" diff --git a/debugd/debugd/server/server_test.go b/debugd/internal/debugd/server/server_test.go similarity index 98% rename from debugd/debugd/server/server_test.go rename to debugd/internal/debugd/server/server_test.go index ba7b272e8..0d317999c 100644 --- a/debugd/debugd/server/server_test.go +++ b/debugd/internal/debugd/server/server_test.go @@ -9,8 +9,8 @@ import ( "strconv" "testing" - "github.com/edgelesssys/constellation/debugd/bootstrapper" - "github.com/edgelesssys/constellation/debugd/debugd/deploy" + "github.com/edgelesssys/constellation/debugd/internal/bootstrapper" + "github.com/edgelesssys/constellation/debugd/internal/debugd/deploy" pb "github.com/edgelesssys/constellation/debugd/service" "github.com/edgelesssys/constellation/internal/constants" "github.com/edgelesssys/constellation/internal/deploy/ssh"