From 83ced317054c6d42d58110e08657784fd9bca5a9 Mon Sep 17 00:00:00 2001 From: Nimi Wariboko Jr Date: Thu, 11 Jan 2024 22:23:32 -0800 Subject: [PATCH] Github Action: cloud feature is required in serverless --- .github/workflows/serverless.yaml | 12 ++++++------ scylla/src/transport/connection.rs | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/serverless.yaml b/.github/workflows/serverless.yaml index c6344b075e..229d270686 100644 --- 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 \ No newline at end of file + run: ccm remove serverless diff --git a/scylla/src/transport/connection.rs b/scylla/src/transport/connection.rs index 587865e764..f0aa7f327b 100644 --- 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;