feat: add more crates to workspace

Cargo.toml

@@ -21,14 +21,15 @@ exclude = [
   "resources/static-folder"
 ]
 
-[workspace.package]
 # TODO: should we have the same version for all crates?
+# currently backend crates are 0.7.3 and client side are 0.7.2
+[workspace.package]
 # version = "0.7.2"
 edition = "2021"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-# TODO: these are a different versions, and setting their version here can't 
+# TODO: these are different versions, and setting their version here can't 
 # be done without them using the worspace version. Using the workspace version 
 # means the resources can't resolve their dependency on shuttle-service. Look at
 # other repos that have implemented inheritance to figure out a solution for this.
@@ -38,7 +39,13 @@ shuttle-service = { path = "service" }
 shuttle-codegen = { path = "codegen" }
 
 anyhow = "1.0.66"
+async-trait = "0.1.58"
+axum = "0.6.0"
+chrono = "0.4.23"
+once_cell = "1.16.0"
+uuid = "1.2.2"
 thiserror = "1.0.37"
+serde = "1.0.148"
+serde_json = "1.0.89"
 tracing = "0.1.37"
 tracing-subscriber = "0.3.16"
-once_cell = "1.16.0"

admin/Cargo.toml

@@ -8,8 +8,8 @@ anyhow = { workspace = true }
 clap = { version = "4.0.27", features = [ "derive", "env" ] }
 dirs = "4.0.0"
 reqwest = { version = "0.11.13", features = ["json"] }
-serde = { version = "1.0.148", features = ["derive"] }
-serde_json = "1.0.89"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] }
 toml = "0.5.9"
 tracing = { workspace = true }

cargo-shuttle/Cargo.toml

@@ -8,12 +8,12 @@ homepage = "https://www.shuttle.rs"
 
 [dependencies]
 anyhow = { workspace = true }
-async-trait = "0.1.58"
+async-trait = { workspace = true }
 bollard = "0.13.0"
 cargo = "0.64.0"
 cargo-edit = { version = "0.11.6", features = ["cli"] }
 cargo_metadata = "0.15.2"
-chrono = "0.4.23"
+chrono = { workspace = true }
 clap = { version = "3.2.17", features = ["derive", "env"] }
 clap_complete = "3.2.5"
 crossbeam-channel = "0.5.6"
@@ -29,8 +29,8 @@ portpicker = "0.1.1"
 reqwest = { version = "0.11.13", features = ["json"] }
 reqwest-middleware = "0.2.0"
 reqwest-retry = "0.2.0"
-serde = { version = "1.0.148", features = ["derive"] }
-serde_json = "1.0.89"
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
 tar = "0.4.38"
 tokio = { version = "1.22.0", features = ["macros"] }
@@ -40,7 +40,7 @@ toml_edit = "0.15.0"
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 url = "2.3.1"
-uuid = { version = "1.2.2", features = ["v4"] }
+uuid = { workspace = true, features = ["v4"] }
 webbrowser = "0.8.2"
 
 [dependencies.shuttle-common]

common/Cargo.toml

@@ -8,20 +8,20 @@ description = "Common library for the shuttle platform (https://www.shuttle.rs/)
 
 [dependencies]
 anyhow = { workspace = true, optional = true }
-async-trait = { version = "0.1.58", optional = true }
-axum = { version = "0.6.0", optional = true }
-chrono = { version = "0.4.23", features = ["serde"] }
+async-trait = { workspace = true , optional = true }
+axum = { workspace = true, optional = true }
+chrono = { workspace = true, features = ["serde"] }
 comfy-table = { version = "6.1.3", optional = true }
 crossterm =  { version = "0.25.0", optional = true }
 http = { version = "0.2.8", optional = true }
 once_cell = { workspace = true }
 reqwest = { version = "0.11.13", optional = true }
 rustrict = "0.5.5"
-serde = { version = "1.0.148", features = ["derive"] }
-serde_json = { version = "1.0.89", optional = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true, optional = true }
 strum = { version = "0.24.1", features = ["derive"] }
 tracing = { workspace = true }
-uuid = { version = "1.2.2", features = ["v4", "serde"] }
+uuid = { workspace = true, features = ["v4", "serde"] }
 
 [features]
 default = ["models"]

deployer/Cargo.toml

@@ -7,12 +7,12 @@ description = "Service with instances created per project for handling the compi
 
 [dependencies]
 anyhow = { workspace = true }
-async-trait = "0.1.58"
-axum = { version = "0.6.0", features = ["ws"] }
+async-trait = { workspace = true }
+axum = { workspace = true, features = ["ws"] }
 bytes = "1.3.0"
 cargo = "0.64.0"
 cargo_metadata = "0.15.2"
-chrono = "0.4.23"
+chrono = { workspace = true }
 clap = { version = "3.2.8", features = ["derive"] }
 crossbeam-channel = "0.5.6"
 flate2 = "1.0.25"
@@ -27,8 +27,8 @@ opentelemetry-datadog = { version = "0.6.0", features = ["reqwest-client"] }
 opentelemetry-http = "0.7.0"
 pipe = "0.4.0"
 portpicker = "0.1.1"
-serde = "1.0.148"
-serde_json = "1.0.89"
+serde = { workspace = true }
+serde_json = { workspace = true }
 sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "sqlite", "chrono", "json", "migrate", "uuid"] }
 strum = { version = "0.24.1", features = ["derive"] }
 tar = "0.4.38"
@@ -41,7 +41,7 @@ tower-http = { version = "0.3.4", features = ["auth", "trace"] }
 tracing = { workspace = true }
 tracing-opentelemetry = "0.18.0"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-uuid = { version = "1.2.2", features = ["v4"] }
+uuid = { workspace = true, features = ["v4"] }
 
 [dependencies.shuttle-common]
 workspace = true

gateway/Cargo.toml

@@ -7,12 +7,12 @@ publish = false
 
 [dependencies]
 acme2 = "0.5.1"
-async-trait = "0.1.58"
-axum = { version = "0.6.0", features = [ "headers" ] }
+async-trait = { workspace = true }
+axum = { workspace = true, features = [ "headers" ] }
 axum-server = { version = "0.4.4", features = [ "tls-rustls" ] }
 base64 = "0.13.1"
 bollard = "0.13.0"
-chrono = "0.4.23"
+chrono = { workspace = true }
 clap = { version = "4.0.27", features = [ "derive" ] }
 fqdn = "0.2.3"
 futures = "0.3.25"
@@ -31,8 +31,8 @@ rand = "0.8.5"
 rcgen = "0.10.0"
 rustls = "0.20.7"
 rustls-pemfile = "1.0.1"
-serde = { version = "1.0.148", features = [ "derive" ] }
-serde_json = "1.0.89"
+serde = { workspace = true, features = [ "derive" ] }
+serde_json = { workspace = true }
 sqlx = { version = "0.6.2", features = [ "sqlite", "json", "runtime-tokio-native-tls", "migrate" ] }
 strum = { version = "0.24.1", features = ["derive"] }
 tokio = { version = "1.22.0", features = [ "full" ] }
@@ -41,7 +41,7 @@ tower-http = { version = "0.3.4", features = ["trace"] }
 tracing = { workspace = true }
 tracing-opentelemetry = "0.18.0"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-uuid = { version = "1.2.2", features = [ "v4" ] }
+uuid = { workspace = true, features = [ "v4" ] }
 
 [dependencies.shuttle-common]
 workspace = true

provisioner/Cargo.toml

@@ -29,7 +29,7 @@ workspace = true
 ctor = "0.1.26"
 once_cell = { workspace = true }
 portpicker = "0.1.1"
-serde_json = "1.0.89"
+serde_json = { workspace = true }
 
 [build-dependencies]
 tonic-build = "0.8.3"

service/Cargo.toml

@@ -12,13 +12,13 @@ doctest = false
 [dependencies]
 actix-web = { version = "4.2.1", optional = true }
 anyhow = { workspace = true }
-async-trait = "0.1.58"
-axum = { version = "0.6.0", optional = true }
+async-trait = { workspace = true }
+axum = { workspace = true, optional = true }
 bincode = { version = "1.3.3", optional = true }
 # TODO: debug the libgit2-sys conflict arising from upgrading cargo to 0.66
 cargo = { version = "0.64.0", optional = true }
 cargo_metadata = "0.15.2"
-chrono = "0.4.23"
+chrono = { workspace = true }
 crossbeam-channel = "0.5.6"
 futures = { version = "0.3.25", features = ["std"] }
 hyper = { version = "0.14.23", features = ["server", "tcp", "http1"], optional = true }
@@ -27,7 +27,7 @@ pipe = "0.4.0"
 poem = { version = "1.3.49", optional = true }
 rocket = { version = "0.5.0-rc.2", optional = true }
 salvo = { version = "0.37.5", optional = true }
-serde_json = "1.0.89"
+serde_json = { workspace = true }
 serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"], optional = true }
 sync_wrapper = { version = "0.1.1", optional = true }
 thiserror = { workspace = true }
@@ -36,8 +36,8 @@ tide = { version = "0.16.0", optional = true }
 tokio = { version = "=1.22.0", features = ["rt", "rt-multi-thread", "sync"] }
 tower = { version = "0.4.13", features = ["make"], optional = true }
 tracing = { workspace = true }
-tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
-uuid = { version = "1.2.2", features = ["v4"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
+uuid = { workspace = true, features = ["v4"] }
 warp = { version = "0.3.3", optional = true }
 
 # Tide does not have tokio support. So make sure async-std is compatible with tokio
@@ -59,7 +59,7 @@ default-features = false
 portpicker = "0.1.1"
 sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
 tokio = { version = "1.22.0", features = ["macros"] }
-uuid = { version = "1.2.2", features = ["v4"] }
+uuid = { workspace = true, features = ["v4"] }
 
 [features]
 default = ["codegen"]