add option to use rustls instead of native-tls in shuttle-shared-db

.circleci/config.yml

@@ -202,6 +202,10 @@ jobs:
       path:
         description: "Path to crate external from workspace"
         type: string
+      features:
+        description: "Features to enable"
+        type: string
+        default: --all-features
     executor: docker-rust
     environment:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: "sparse"
@@ -218,13 +222,13 @@ jobs:
       - run: |
           cargo clippy --tests \
                        --all-targets \
-                       --all-features \
+                       << parameters.features >> \
                        --manifest-path << parameters.path >>/Cargo.toml \
                        --no-deps -- \
                        --D warnings \
                        -A clippy::let-unit-value \
                        -A clippy::format-push-string
-      - run: cargo test --all-features --manifest-path << parameters.path >>/Cargo.toml -- --nocapture
+      - run: cargo test << parameters.features >> --manifest-path << parameters.path >>/Cargo.toml -- --nocapture
       - save-cargo-cache
   platform-test:
     parameters:
@@ -491,7 +495,6 @@ workflows:
                 - resources/aws-rds
                 - resources/persist
                 - resources/secrets
-                - resources/shared-db
                 - resources/static-folder
                 - services/shuttle-actix-web
                 - services/shuttle-axum
@@ -505,6 +508,18 @@ workflows:
                 - services/shuttle-tide
                 - services/shuttle-tower
                 - services/shuttle-warp
+      - check-standalone:
+        # shuttle-shared-db has mutually exclusive features
+        # so we run checks for each feature separately
+          name: "resources/shared-db: << matrix.features >>"
+          matrix:
+            alias: check-standalone-shared-db
+            parameters:
+              path: [resources/shared-db]
+              features:
+                - "-F mongodb"
+                - "-F postgres"
+                - "-F postgres-rustls"
       - platform-test:
           name: << matrix.crate >>
           requires:
@@ -527,6 +542,7 @@ workflows:
           requires:
             - platform-test
             - check-standalone
+            - check-standalone-shared-db
           filters:
             branches:
               only: production

resources/shared-db/Cargo.toml

@@ -11,7 +11,8 @@ async-trait = "0.1.56"
 mongodb = { version = "2.3.0", optional = true }
 serde = { version = "1.0.148", features = ["derive"] }
 shuttle-service = { path = "../../service", version = "0.16.0", default-features = false }
-sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"], optional = true }
+sqlx = { version = "0.6.2", optional = true }
 
 [features]
-postgres = ["sqlx/postgres"]
+postgres = ["sqlx/postgres", "sqlx/runtime-tokio-native-tls"]
+postgres-rustls = ["sqlx/postgres", "sqlx/runtime-tokio-rustls"]

resources/shared-db/README.md

@@ -4,12 +4,12 @@ This plugin manages databases that are shared with other services on [shuttle](h
 
 ## Usage
 
-Add `shuttle-shared-db` to the dependencies for your service. Every type of shareable database is behind the following feature flag and attribute path
+Add `shuttle-shared-db` to the dependencies for your service. Every type of shareable database is behind the following feature flag and attribute path (`*-rustls` uses rustls for TLS, the default uses native-tls).
 
-| Engine   | Feature flag | Attribute path              |
-|----------|--------------|-----------------------------|
-| Postgres | postgres     | shuttle_shared_db::Postgres |
-| MongoDB  | mongodb      | shuttle_shared_db::MongoDb  |
+| Engine   | Feature flags                  | Attribute path              |
+|----------|--------------------------------|-----------------------------|
+| Postgres | `postgres` / `postgres-rustls` | shuttle_shared_db::Postgres |
+| MongoDB  | `mongodb`                      | shuttle_shared_db::MongoDb  |
 
 An example using the Rocket framework can be found on [GitHub](https://github.com/shuttle-hq/shuttle-examples/tree/main/rocket/postgres)
 

resources/shared-db/src/lib.rs

@@ -5,8 +5,8 @@ mod mongo;
 #[cfg(feature = "mongodb")]
 pub use mongo::MongoDb;
 
-#[cfg(feature = "postgres")]
+#[cfg(any(feature = "postgres", feature = "postgres-rustls"))]
 mod postgres;
 
-#[cfg(feature = "postgres")]
+#[cfg(any(feature = "postgres", feature = "postgres-rustls"))]
 pub use postgres::Postgres;