ci: refactor and improve speed and caching. add rustls flags to aws-rds

DEVELOPING.md

@@ -136,8 +136,11 @@ In order to test local changes to the library crates, you may want to add the be
 
 ```toml
 [patch.crates-io]
-shuttle-service = { path = "[base]/shuttle/service" }
+shuttle-codegen = { path = "[base]/shuttle/codegen" }
+shuttle-common = { path = "[base]/shuttle/common" }
+shuttle-proto = { path = "[base]/shuttle/proto" }
 shuttle-runtime = { path = "[base]/shuttle/runtime" }
+shuttle-service = { path = "[base]/shuttle/service" }
 
 shuttle-aws-rds = { path = "[base]/shuttle/resources/aws-rds" }
 shuttle-persist = { path = "[base]/shuttle/resources/persist" }

cargo-shuttle/Cargo.toml

@@ -11,6 +11,7 @@ homepage = "https://www.shuttle.rs"
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 bollard = { workspace = true }
+cargo-generate = "0.18.3"
 cargo_metadata = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["env"] }
@@ -34,12 +35,15 @@ reqwest = { workspace = true, features = ["json"] }
 reqwest-middleware = "0.2.0"
 reqwest-retry = "0.2.0"
 rmp-serde = { workspace = true }
+semver = "1.0.17"
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 strum = { workspace = true }
 tar = { workspace = true }
 tokio = { workspace = true, features = ["macros", "signal"] }
-tokio-tungstenite = { version = "0.19.0", features = ["rustls-tls-webpki-roots"] }
+tokio-tungstenite = { version = "0.19.0", features = [
+  "rustls-tls-webpki-roots",
+] }
 toml = { workspace = true }
 toml_edit = { workspace = true }
 tonic = { workspace = true }
@@ -52,8 +56,6 @@ tracing-subscriber = { workspace = true, features = [
 url = "2.3.1"
 uuid = { workspace = true, features = ["v4"] }
 webbrowser = "0.8.2"
-semver = "1.0.17"
-cargo-generate = "0.18.3"
 
 [dependencies.shuttle-common]
 workspace = true

deployer/prepare.sh

@@ -33,8 +33,11 @@ touch $CARGO_HOME/config.toml
 if [[ $PROD != "true" ]]; then
     echo '
     [patch.crates-io]
-    shuttle-service = { path = "/usr/src/shuttle/service" }
+    shuttle-codegen = { path = "/usr/src/shuttle/codegen" }
+    shuttle-common = { path = "/usr/src/shuttle/common" }
+    shuttle-proto = { path = "/usr/src/shuttle/proto" }
     shuttle-runtime = { path = "/usr/src/shuttle/runtime" }
+    shuttle-service = { path = "/usr/src/shuttle/service" }
 
     shuttle-aws-rds = { path = "/usr/src/shuttle/resources/aws-rds" }
     shuttle-persist = { path = "/usr/src/shuttle/resources/persist" }

e2e/tests/integration/helpers/mod.rs

@@ -38,15 +38,18 @@ impl TempCargoHome {
                 write!(
                     config,
                     r#"[patch.crates-io]
-shuttle-service = {{ path = "{}" }}
+shuttle-codegen = {{ path = "{}" }}
+shuttle-common = {{ path = "{}" }}
+shuttle-proto = {{ path = "{}" }}
 shuttle-runtime = {{ path = "{}" }}
+shuttle-service = {{ path = "{}" }}
 
 shuttle-aws-rds = {{ path = "{}" }}
+shuttle-metadata = {{ path = "{}" }}
 shuttle-persist = {{ path = "{}" }}
 shuttle-shared-db = {{ path = "{}" }}
 shuttle-secrets = {{ path = "{}" }}
 shuttle-static-folder = {{ path = "{}" }}
-shuttle-metadata = {{ path = "{}" }}
 
 shuttle-axum = {{ path = "{}" }}
 shuttle-actix-web = {{ path = "{}" }}
@@ -60,20 +63,20 @@ shuttle-thruster = {{ path = "{}" }}
 shuttle-tide = {{ path = "{}" }}
 shuttle-tower = {{ path = "{}" }}
 shuttle-warp = {{ path = "{}" }}"#,
-                    WORKSPACE_ROOT.join("service").display(),
+                    WORKSPACE_ROOT.join("codegen").display(),
+                    WORKSPACE_ROOT.join("common").display(),
+                    WORKSPACE_ROOT.join("proto").display(),
                     WORKSPACE_ROOT.join("runtime").display(),
+                    WORKSPACE_ROOT.join("service").display(),
                     WORKSPACE_ROOT.join("resources").join("aws-rds").display(),
+                    WORKSPACE_ROOT.join("resources").join("metadata").display(),
                     WORKSPACE_ROOT.join("resources").join("persist").display(),
                     WORKSPACE_ROOT.join("resources").join("shared-db").display(),
                     WORKSPACE_ROOT.join("resources").join("secrets").display(),
                     WORKSPACE_ROOT
                         .join("resources")
                         .join("static-folder")
                         .display(),
-                    WORKSPACE_ROOT
-                        .join("resources")
-                        .join("metadata")
-                        .display(),
                     WORKSPACE_ROOT
                         .join("services")
                         .join("shuttle-axum")

resources/aws-rds/Cargo.toml

@@ -10,10 +10,13 @@ keywords = ["shuttle-service", "rds"]
 async-trait = "0.1.56"
 paste = "1.0.7"
 serde = { version = "1.0.148", features = ["derive"] }
-shuttle-service = { path = "../../service", version = "0.24.0" }
-sqlx = { version = "0.7.1", features = ["runtime-tokio-native-tls"] }
+shuttle-service = { path = "../../service", version = "0.24.0", default-features = false }
+sqlx = "0.7.1"
 
 [features]
-postgres = ["sqlx/postgres"]
-mysql = ["sqlx/mysql"]
-mariadb = ["sqlx/mysql"]
+postgres = ["sqlx/postgres", "sqlx/runtime-tokio-native-tls"]
+postgres-rustls = ["sqlx/postgres", "sqlx/runtime-tokio-rustls"]
+mysql = ["sqlx/mysql", "sqlx/runtime-tokio-native-tls"]
+mysql-rustls = ["sqlx/mysql", "sqlx/runtime-tokio-rustls"]
+mariadb = ["sqlx/mysql", "sqlx/runtime-tokio-native-tls"]
+mariadb-rustls = ["sqlx/mysql", "sqlx/runtime-tokio-rustls"]

resources/aws-rds/README.md

@@ -16,6 +16,8 @@ Add `shuttle-aws-rds` to the dependencies for your service. Every engine is behi
 | MySql    | mysql        | shuttle_aws_rds::MySql    |
 | MariaDB  | mariadb      | shuttle_aws_rds::MariaDB  |
 
+Note: You can also add `-rustls` after the feature flag, `postgres-rustls` etc
+
 An example using the Tide framework can be found on [GitHub](https://github.com/shuttle-hq/shuttle-examples/tree/main/tide/postgres)
 
 ### Options

resources/aws-rds/src/lib.rs

@@ -1,4 +1,5 @@
 #![doc = include_str!("../README.md")]
+#![allow(unused_imports)]
 
 use async_trait::async_trait;
 use paste::paste;