TLS feature flag tweaks

Author: bobozaur

.github/workflows/ci.yaml

@@ -120,14 +120,14 @@ jobs:
 
       - name: Test IO combos (Rustls, no compression)
         timeout-minutes: ${{ fromJSON(env.TESTS_TIMEOUT) }}
-        run: cargo test --features runtime-tokio,etl,tls-rustls -- it_works_with_io_combo --ignored --nocapture
+        run: cargo test --features runtime-tokio,etl,tls-rustls-aws-lc-rs -- it_works_with_io_combo --ignored --nocapture
         env:
           DATABASE_URL: ${{ steps.exa-cluster.outputs.url }}
           SQLX_OFFLINE: true
 
       - name: Test IO combos (Rustls, with compression)
         timeout-minutes: ${{ fromJSON(env.TESTS_TIMEOUT) }}
-        run: cargo test --features runtime-tokio,etl,tls-rustls,compression -- it_works_with_io_combo --ignored --nocapture
+        run: cargo test --features runtime-tokio,etl,tls-rustls-aws-lc-rs,compression -- it_works_with_io_combo --ignored --nocapture
         env:
           DATABASE_URL: ${{ steps.exa-cluster.outputs.url }}
           SQLX_OFFLINE: true

Cargo.toml

@@ -53,14 +53,14 @@ runtime-tokio = ["sqlx/runtime-tokio"]
 
 # TLS features
 tls-native-tls = ["sqlx/tls-native-tls", "sqlx-exasol-impl/native-tls"]
-tls-rustls-aws-lc-rs = ["sqlx/tls-rustls-aws-lc-rs", "sqlx-exasol-impl/rustls"]
+tls-rustls-aws-lc-rs = ["sqlx/tls-rustls-aws-lc-rs", "sqlx-exasol-impl/rustls-aws-lc-rs"]
 tls-rustls-ring-webpki = [
     "sqlx/tls-rustls-ring-webpki",
-    "sqlx-exasol-impl/rustls",
+    "sqlx-exasol-impl/rustls-ring",
 ]
 tls-rustls-ring-native-roots = [
     "sqlx/tls-rustls-ring-native-roots",
-    "sqlx-exasol-impl/rustls",
+    "sqlx-exasol-impl/rustls-ring",
 ]
 
 # Database
@@ -137,10 +137,7 @@ rand = { version = "0.8", default-features = false, features = [
     "std",
     "std_rng",
 ] }
-rcgen = { version = "0.13", default-features = false, features = [
-    "pem",
-    "crypto",
-] }
+rcgen = { version = "0.13", default-features = false, features = ["pem"] }
 rsa = { version = "0.9", default-features = false, features = ["pem", "std"] }
 rust_decimal = { version = "1", default-features = false, features = ["serde"] }
 rustls = { version = "0.23", default-features = false, features = [

sqlx-exasol-impl/Cargo.toml

@@ -25,13 +25,20 @@ time = ["sqlx-core/time", "dep:time"]
 uuid = ["sqlx-core/uuid", "dep:uuid"]
 
 # TLS features
-tls = ["dep:rcgen"]
+tls = []
+native-tls = [
+    "dep:native-tls",
+    "sqlx-core/_tls-native-tls",
+    "tls",
+    "rcgen?/aws_lc_rs",
+]
+rustls-aws-lc-rs = ["rustls", "rcgen?/aws_lc_rs"]
+rustls-ring = ["rustls", "rcgen?/ring"]
 rustls = ["dep:rustls", "sqlx-core/_tls-rustls", "tls"]
-native-tls = ["dep:native-tls", "sqlx-core/_tls-native-tls", "tls"]
 
 # Driver specific features
 compression = ["dep:async-compression"]
-etl = ["dep:http-body-util", "dep:hyper", "dep:futures-channel"]
+etl = ["dep:http-body-util", "dep:hyper", "dep:futures-channel", "dep:rcgen"]
 
 [dependencies]
 arrayvec = { workspace = true }

tests/io.rs

@@ -37,6 +37,7 @@ async fn it_works_with_io_combo_preferred(
     let compression_supported = cfg!(feature = "compression");
     let tls_supported = cfg!(any(
         feature = "tls-native-tls",
+        feature = "tls-rustls-aws-lc-rs",
         feature = "tls-rustls-ring-webpki",
         feature = "tls-rustls-ring-native-roots"
     ));
@@ -69,7 +70,12 @@ async fn it_works_with_io_combo_required(
     #[allow(unused_mut, reason = "conditionally compiled")]
     let mut res = io_combo(pool_opts, exa_opts, true, true).await;
 
-    #[cfg(not(any(feature = "tls-native-tls", feature = "tls-rustls")))]
+    #[cfg(not(any(
+        feature = "tls-native-tls",
+        feature = "tls-rustls-aws-lc-rs",
+        feature = "tls-rustls-ring-webpki",
+        feature = "tls-rustls-ring-native-roots"
+    )))]
     {
         assert!(res.is_err());
         return Ok(());