Merge pull request #36 from avnik/avnik/restruct

Cleanup project root, restructuring
tiiuae · Jan 7, 2025 · 20c1024 · 20c1024
2 parents e0f702c + 0eff133
commit 20c1024
Show file tree

Hide file tree

Showing 34 changed files with 43 additions and 42 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,43 +1,6 @@
 [workspace]
 members = [
-  "client",
-  "common",
-  "."
+  "crates/client",
+  "crates/common",
+  "crates/admin"
 ]
-
-[package]
-authors = ["Alexander Nikolaev <[email protected]>"]
-edition = "2021"
-license = "Apache 2.0"
-name = "givc"
-publish = false
-version = "0.0.1"
-
-[dependencies]
-anyhow = "1.0.86"
-async-stream = "0.3"
-async-channel = "2.3.1"
-strum = {version = "0.26", features = ["derive"]}
-clap = {version = "4.5.4", features = ["derive", "env"]}
-console = "0.15"
-prost = "0.13"
-regex = "1.11"
-tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros", "fs"]}
-tokio-stream = "0.1"
-tokio-vsock = "0.5"
-tonic = {version="0.12", features = ["tls"]}
-tonic-types = {version="0.12"}
-tonic-reflection = {version="0.12"}
-tower = {version = "0.4"}
-tracing = "0.1"
-tracing-subscriber = {version = "0.3", features = ["env-filter", "tracing-log", "time", "local-time"]}
-tracing-journald = {version =" 0.2.0"}
-serde = { version = "1.0.202", features = ["derive"]}
-serde_json = "1.0.120"
-x509-parser = { version = "0.16" }
-
-tokio-listener = { features = ["multi-listener", "tonic012", "vsock"], git = "https://github.com/avnik/tokio-listener", branch = "avnik/vsock-ghaf" }
-
-# GIVC subparts
-givc-common = { path="common" } 
-givc-client = { path="client" } 
diff --git a/common/api b/common/api
diff --git a/crates/admin/Cargo.toml b/crates/admin/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+authors = ["Alexander Nikolaev <[email protected]>"]
+edition = "2021"
+license = "Apache 2.0"
+name = "givc"
+publish = false
+version = "0.0.1"
+
+[dependencies]
+anyhow = "1.0.86"
+async-stream = "0.3"
+async-channel = "2.3.1"
+strum = {version = "0.26", features = ["derive"]}
+clap = {version = "4.5.4", features = ["derive", "env"]}
+console = "0.15"
+prost = "0.13"
+regex = "1.11"
+tokio = {version = "1.0", features = ["rt-multi-thread", "time", "macros", "fs"]}
+tokio-stream = "0.1"
+tokio-vsock = "0.5"
+tonic = {version="0.12", features = ["tls"]}
+tonic-types = {version="0.12"}
+tonic-reflection = {version="0.12"}
+tower = {version = "0.4"}
+tracing = "0.1"
+tracing-subscriber = {version = "0.3", features = ["env-filter", "tracing-log", "time", "local-time"]}
+tracing-journald = {version =" 0.2.0"}
+serde = { version = "1.0.202", features = ["derive"]}
+serde_json = "1.0.120"
+x509-parser = { version = "0.16" }
+
+tokio-listener = { features = ["multi-listener", "tonic012", "vsock"], git = "https://github.com/avnik/tokio-listener", branch = "avnik/vsock-ghaf" }
+
+# GIVC subparts
+givc-common = { path="../common" } 
+givc-client = { path="../client" } 
diff --git a/src/admin/entry.rs → crates/admin/src/admin/entry.rs b/src/admin/entry.rs → crates/admin/src/admin/entry.rs
diff --git a/src/admin/mod.rs → crates/admin/src/admin/mod.rs b/src/admin/mod.rs → crates/admin/src/admin/mod.rs
diff --git a/src/admin/registry.rs → crates/admin/src/admin/registry.rs b/src/admin/registry.rs → crates/admin/src/admin/registry.rs
diff --git a/src/admin/server.rs → crates/admin/src/admin/server.rs b/src/admin/server.rs → crates/admin/src/admin/server.rs
diff --git a/src/bin/givc-admin.rs → crates/admin/src/bin/givc-admin.rs b/src/bin/givc-admin.rs → crates/admin/src/bin/givc-admin.rs
diff --git a/src/bin/givc-agent.rs → crates/admin/src/bin/givc-agent.rs b/src/bin/givc-agent.rs → crates/admin/src/bin/givc-agent.rs
diff --git a/src/bin/givc-cli.rs → crates/admin/src/bin/givc-cli.rs b/src/bin/givc-cli.rs → crates/admin/src/bin/givc-cli.rs
diff --git a/src/bin/givc-x509.rs → crates/admin/src/bin/givc-x509.rs b/src/bin/givc-x509.rs → crates/admin/src/bin/givc-x509.rs
diff --git a/src/lib.rs → crates/admin/src/lib.rs b/src/lib.rs → crates/admin/src/lib.rs
diff --git a/src/systemd_api/client.rs → crates/admin/src/systemd_api/client.rs b/src/systemd_api/client.rs → crates/admin/src/systemd_api/client.rs
diff --git a/src/systemd_api/mod.rs → crates/admin/src/systemd_api/mod.rs b/src/systemd_api/mod.rs → crates/admin/src/systemd_api/mod.rs
diff --git a/src/systemd_api/server.rs → crates/admin/src/systemd_api/server.rs b/src/systemd_api/server.rs → crates/admin/src/systemd_api/server.rs
diff --git a/src/utils/auth.rs → crates/admin/src/utils/auth.rs b/src/utils/auth.rs → crates/admin/src/utils/auth.rs
diff --git a/src/utils/mod.rs → crates/admin/src/utils/mod.rs b/src/utils/mod.rs → crates/admin/src/utils/mod.rs
diff --git a/src/utils/naming.rs → crates/admin/src/utils/naming.rs b/src/utils/naming.rs → crates/admin/src/utils/naming.rs
diff --git a/src/utils/tonic.rs → crates/admin/src/utils/tonic.rs b/src/utils/tonic.rs → crates/admin/src/utils/tonic.rs
diff --git a/src/utils/vsock.rs → crates/admin/src/utils/vsock.rs b/src/utils/vsock.rs → crates/admin/src/utils/vsock.rs
diff --git a/src/utils/x509.rs → crates/admin/src/utils/x509.rs b/src/utils/x509.rs → crates/admin/src/utils/x509.rs
diff --git a/client/Cargo.toml → crates/client/Cargo.toml b/client/Cargo.toml → crates/client/Cargo.toml
diff --git a/client/src/client.rs → crates/client/src/client.rs b/client/src/client.rs → crates/client/src/client.rs
diff --git a/client/src/endpoint.rs → crates/client/src/endpoint.rs b/client/src/endpoint.rs → crates/client/src/endpoint.rs
diff --git a/client/src/error.rs → crates/client/src/error.rs b/client/src/error.rs → crates/client/src/error.rs
diff --git a/client/src/lib.rs → crates/client/src/lib.rs b/client/src/lib.rs → crates/client/src/lib.rs
diff --git a/common/Cargo.toml → crates/common/Cargo.toml b/common/Cargo.toml → crates/common/Cargo.toml
diff --git a/crates/common/api b/crates/common/api
@@ -0,0 +1 @@
+../../api
diff --git a/common/build.rs → crates/common/build.rs b/common/build.rs → crates/common/build.rs
diff --git a/common/src/address.rs → crates/common/src/address.rs b/common/src/address.rs → crates/common/src/address.rs
diff --git a/common/src/lib.rs → crates/common/src/lib.rs b/common/src/lib.rs → crates/common/src/lib.rs
diff --git a/common/src/query.rs → crates/common/src/query.rs b/common/src/query.rs → crates/common/src/query.rs
diff --git a/common/src/types.rs → crates/common/src/types.rs b/common/src/types.rs → crates/common/src/types.rs
diff --git a/nixos/packages/givc-admin-rs.nix b/nixos/packages/givc-admin-rs.nix
@@ -13,6 +13,8 @@ let
   # Common arguments can be set here to avoid repeating them later
   # Note: changes here will rebuild all dependency crates
   commonArgs = {
+    pname = "givc";
+    version = "0.0.1";
     src = lib.cleanSourceWith {
       src = craneLib.path src;
       filter = protoOrCargo;
@@ -42,7 +44,7 @@ let
       # MY_CUSTOM_VAR = "some value";
       postUnpack = ''
         # Avoid issue with source filtering, put symlink back into source tree
-        ln -sf ../api $sourceRoot/common/api
+        ln -sf ../../api $sourceRoot/crates/common/api
       '';
       postInstall = ''
         mkdir -p $cli/bin $agent/bin