AB#2327 move debugd code into internal folder (#403)

* move debugd code into internal folder
* Fix paths in CMakeLists.txt
Signed-off-by: Fabian Kammel <fk@edgeless.systems>

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
 )
 

debugd/cdbg/cdbg.go

@@ -1,7 +0,0 @@
-package main
-
-import "github.com/edgelesssys/constellation/debugd/cdbg/cmd"
-
-func main() {
-	cmd.Execute()
-}

debugd/cmd/cdbg/cdbg.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/edgelesssys/constellation/debugd/internal/cdbg/cmd"
+
+func main() {
+	cmd.Execute()
+}

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/internal/bootstrapper"
-	"github.com/edgelesssys/constellation/debugd/debugd/deploy"
+	"github.com/edgelesssys/constellation/debugd/internal/debugd/deploy"
-	"github.com/edgelesssys/constellation/debugd/debugd/metadata"
+	"github.com/edgelesssys/constellation/debugd/internal/debugd/metadata"
-	"github.com/edgelesssys/constellation/debugd/debugd/metadata/cloudprovider"
+	"github.com/edgelesssys/constellation/debugd/internal/debugd/metadata/cloudprovider"
-	"github.com/edgelesssys/constellation/debugd/debugd/metadata/fallback"
+	"github.com/edgelesssys/constellation/debugd/internal/debugd/metadata/fallback"
-	"github.com/edgelesssys/constellation/debugd/debugd/server"
+	"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"

debugd/internal/cdbg/cmd/deploy.go

@@ -7,10 +7,10 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/edgelesssys/constellation/debugd/bootstrapper"
+	"github.com/edgelesssys/constellation/debugd/internal/bootstrapper"
-	"github.com/edgelesssys/constellation/debugd/cdbg/config"
+	"github.com/edgelesssys/constellation/debugd/internal/cdbg/config"
-	"github.com/edgelesssys/constellation/debugd/debugd"
+	"github.com/edgelesssys/constellation/debugd/internal/debugd"
-	depl "github.com/edgelesssys/constellation/debugd/debugd/deploy"
+	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"

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"
 )

debugd/internal/debugd/deploy/download.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/edgelesssys/constellation/debugd/bootstrapper"
+	"github.com/edgelesssys/constellation/debugd/internal/bootstrapper"
-	"github.com/edgelesssys/constellation/debugd/debugd"
+	"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"

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/internal/bootstrapper"
-	"github.com/edgelesssys/constellation/debugd/debugd"
+	"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"

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"

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"

debugd/internal/debugd/server/server.go

@@ -10,9 +10,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/edgelesssys/constellation/debugd/bootstrapper"
+	"github.com/edgelesssys/constellation/debugd/internal/bootstrapper"
-	"github.com/edgelesssys/constellation/debugd/debugd"
+	"github.com/edgelesssys/constellation/debugd/internal/debugd"
-	"github.com/edgelesssys/constellation/debugd/debugd/deploy"
+	"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"

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/internal/bootstrapper"
-	"github.com/edgelesssys/constellation/debugd/debugd/deploy"
+	"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"