Merge pull request #1 from steady-bytes/restructure-and-dctl

Big restructure and adding `dctl`
steady-bytes · Jan 20, 2024 · 346fa63 · 346fa63
2 parents af67421 + 141cc06
commit 346fa63
Show file tree

Hide file tree

Showing 169 changed files with 3,942 additions and 2,224 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
 api/target
-internal/blueprint/web-client/target
+services/blueprint/web-client/target
 
 .node_1/
 .node_2/
 .node_3/
 
-.DS_Store
+.DS_Store
+node_modules/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "internal/gateway/main.go",
+            "program": "services/core/gateway/main.go",
             "cwd": "${workspaceFolder}",
             "debugAdapter": "dlv-dap",
             "args": ["run"]
@@ -19,7 +19,7 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "internal/host/main.go",
+            "program": "services/core/host/main.go",
             "cwd": "${workspaceFolder}",
             "debugAdapter": "dlv-dap",
         },
@@ -64,7 +64,7 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "internal/blueprint/main.go",
+            "program": "services/core/blueprint/main.go",
             "cwd": "${workspaceFolder}",
             "debugAdapter": "dlv-dap",
             "env": {
@@ -81,7 +81,7 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "internal/blueprint/main.go",
+            "program": "services/core/blueprint/main.go",
             "cwd": "${workspaceFolder}",
             "debugAdapter": "dlv-dap",
             "env": {
@@ -97,7 +97,7 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "internal/blueprint/main.go",
+            "program": "services/core/blueprint/main.go",
             "cwd": "${workspaceFolder}",
             "debugAdapter": "dlv-dap",
             "env": {
@@ -113,7 +113,7 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "internal/healthz/main.go",
+            "program": "services/core/healthz/main.go",
             "cwd": "${workspaceFolder}",
             "debugAdapter": "dlv-dap",
             "env": {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,6 +5,6 @@
         "titleBar.activeBackground": "#ff9d00",
         "titleBar.inactiveBackground": "#632e2e"
     },
-    "editor.wordWrap": "wordWrapColumn",
-    "editor.wordWrapColumn": 100
+    // "editor.wordWrap": "wordWrapColumn",
+    // "editor.wordWrapColumn": 100
 }
diff --git a/Makefile b/Makefile
@@ -31,13 +31,13 @@ clean:
 blueprint: clean_blueprint blueprint_1 blueprint_2 blueprint_3
 
 blueprint_1:
-	BOOTSTRAP_RAFT=true RAFT_IP=localhost RAFT_PORT=1111 SERVER_PORT=2221 RAFT_NODE_ID="node_1" go run internal/blueprint/main.go
+	BOOTSTRAP_RAFT=true RAFT_IP=localhost RAFT_PORT=1111 SERVER_PORT=2221 RAFT_NODE_ID="node_1" go run services/blueprint/main.go
 
 blueprint_2:
-	RAFT_PORT=1112 RAFT_IP=localhost SERVER_PORT=2222 RAFT_NODE_ID="node_2" go run internal/blueprint/main.go
+	RAFT_PORT=1112 RAFT_IP=localhost SERVER_PORT=2222 RAFT_NODE_ID="node_2" go run services/blueprint/main.go
 
 blueprint_3:
-	RAFT_PORT=1113 SERVER_PORT=2223 RAFT_IP=localhost RAFT_NODE_ID="node_3" go run internal/blueprint/main.go
+	RAFT_PORT=1113 SERVER_PORT=2223 RAFT_IP=localhost RAFT_NODE_ID="node_3" go run services/blueprint/main.go
 
 blueprint_register_leader:
 	go run pkg/blueprint-client/main.go

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ $ make api
 $ make clean
 ```
 
-## internal/
+## services/
 Each directory is a self contained implementation of one of the system components.
 __Current List:__
 1. Blueprint (in progress)