Github Action: cloud feature is required in serverless

scylladb · Jan 12, 2024 · 83ced31 · 83ced31
1 parent a598b32
commit 83ced31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/serverless.yaml b/.github/workflows/serverless.yaml
@@ -3,12 +3,12 @@ name: Serverless
 on:
   push:
     branches:
-    - main
-    - 'branch-*'
+      - main
+      - "branch-*"
   pull_request:
     branches:
-    - main
-    - 'branch-*'
+      - main
+      - "branch-*"
 
 env:
   CARGO_TERM_COLOR: always
@@ -35,7 +35,7 @@ jobs:
       - name: Run cloud example
         run: cargo run --features cloud --example cloud -- $HOME/.ccm/serverless/config_data.yaml
       - name: Run cloud tests
-        run: CLOUD_CONFIG_PATH=$HOME/.ccm/serverless/config_data.yaml RUSTFLAGS="--cfg scylla_cloud_tests" cargo test --verbose
+        run: CLOUD_CONFIG_PATH=$HOME/.ccm/serverless/config_data.yaml RUSTFLAGS="--cfg scylla_cloud_tests" cargo test --features cloud --verbose
 
       - name: Remove serverless cluster
-        run: ccm remove serverless
+        run: ccm remove serverless
diff --git a/scylla/src/transport/connection.rs b/scylla/src/transport/connection.rs
@@ -292,9 +292,7 @@ mod ssl_config {
     #[cfg(feature = "rustls")]
     use std::{net::IpAddr, sync::Arc};
     #[cfg(feature = "rustls")]
-    use tokio_rustls::rustls::pki_types::ServerName;
-    #[cfg(feature = "rustls")]
-    use tokio_rustls::rustls::ClientConfig;
+    use tokio_rustls::rustls::{pki_types::ServerName, ClientConfig};
     #[cfg(feature = "cloud")]
     use uuid::Uuid;