rename feature: cloud -> unstable-cloud

As the Serverless Cloud is a highly unstable feature, it must be marked
as such in order not to break API after 1.0 in case we need to introduce
breaking changes to the feature.

Author: wprzytula

examples/Cargo.toml

@@ -13,7 +13,7 @@ rustyline-derive = "0.6"
 scylla = { path = "../scylla", features = [
     "openssl-010",
     "rustls-023",
-    "cloud",
+    "unstable-cloud",
     "chrono-04",
     "time-03",
     "num-bigint-03",

scylla/Cargo.toml

@@ -18,7 +18,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 default = []
 openssl-010 = ["dep:tokio-openssl", "dep:openssl"]
 rustls-023 = ["dep:tokio-rustls", "dep:rustls"]
-cloud = [
+unstable-cloud = [
     "scylla-cql/serde",
     "dep:serde_yaml",
     "dep:serde",

scylla/src/client/session.rs

@@ -7,9 +7,9 @@ use super::{Compression, PoolSize, SelfIdentity};
 use crate::authentication::AuthenticatorProvider;
 use crate::batch::batch_values;
 use crate::batch::{Batch, BatchStatement};
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 use crate::cloud::CloudConfig;
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 use crate::cluster::node::CloudEndpoint;
 use crate::cluster::node::{InternalKnownNode, KnownNode, NodeRef};
 use crate::cluster::{Cluster, ClusterNeatDebug, ClusterState};
@@ -51,7 +51,7 @@ use std::num::NonZeroU32;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::time::timeout;
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 use tracing::warn;
 use tracing::{debug, error, trace, trace_span, Instrument};
 use uuid::Uuid;
@@ -201,7 +201,7 @@ pub struct SessionConfig {
     pub host_filter: Option<Arc<dyn HostFilter>>,
 
     /// If the driver is to connect to ScyllaCloud, there is a config for it.
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     pub cloud_config: Option<Arc<CloudConfig>>,
 
     /// If true, the driver will inject a small delay before flushing data
@@ -280,7 +280,7 @@ impl SessionConfig {
             address_translator: None,
             host_filter: None,
             refresh_metadata_on_auto_schema_agreement: true,
-            #[cfg(feature = "cloud")]
+            #[cfg(feature = "unstable-cloud")]
             cloud_config: None,
             enable_write_coalescing: true,
             tracing_info_fetch_attempts: NonZeroU32::new(10).unwrap(),
@@ -781,7 +781,7 @@ impl Session {
     pub async fn connect(config: SessionConfig) -> Result<Self, NewSessionError> {
         let known_nodes = config.known_nodes;
 
-        #[cfg(feature = "cloud")]
+        #[cfg(feature = "unstable-cloud")]
         let cloud_known_nodes: Option<Vec<InternalKnownNode>> =
             if let Some(ref cloud_config) = config.cloud_config {
                 let cloud_servers = cloud_config
@@ -799,7 +799,7 @@ impl Session {
                 None
             };
 
-        #[cfg(not(feature = "cloud"))]
+        #[cfg(not(feature = "unstable-cloud"))]
         let cloud_known_nodes: Option<Vec<InternalKnownNode>> = None;
 
         let known_nodes = cloud_known_nodes
@@ -814,7 +814,7 @@ impl Session {
 
         #[allow(unused_labels)] // Triggers when `cloud` feature is disabled.
         let address_translator = 'translator: {
-            #[cfg(feature = "cloud")]
+            #[cfg(feature = "unstable-cloud")]
             if let Some(translator) = config.cloud_config.clone() {
                 if config.address_translator.is_some() {
                     // This can only happen if the user builds SessionConfig by hand, as SessionBuilder in cloud mode prevents setting custom AddressTranslator.
@@ -832,7 +832,7 @@ impl Session {
         };
 
         let tls_provider = 'provider: {
-            #[cfg(feature = "cloud")]
+            #[cfg(feature = "unstable-cloud")]
             if let Some(cloud_config) = config.cloud_config {
                 if config.tls_context.is_some() {
                     // This can only happen if the user builds SessionConfig by hand, as SessionBuilder in cloud mode prevents setting custom TlsContext.

scylla/src/client/session_builder.rs

@@ -1,13 +1,13 @@
 //! SessionBuilder provides an easy way to create new Sessions
 
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 use super::execution_profile::ExecutionProfile;
 use super::execution_profile::ExecutionProfileHandle;
 use super::session::{Session, SessionConfig};
 use super::{Compression, PoolSize, SelfIdentity};
 use crate::authentication::{AuthenticatorProvider, PlainTextAuthenticator};
 use crate::client::session::TlsContext;
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 use crate::cloud::{CloudConfig, CloudConfigError, CloudTlsProvider};
 use crate::errors::NewSessionError;
 use crate::policies::address_translator::AddressTranslator;
@@ -18,7 +18,7 @@ use std::borrow::Borrow;
 use std::marker::PhantomData;
 use std::net::SocketAddr;
 use std::num::NonZeroU32;
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 use std::path::Path;
 use std::sync::Arc;
 use std::time::Duration;
@@ -40,15 +40,15 @@ impl SessionBuilderKind for DefaultMode {}
 
 pub type SessionBuilder = GenericSessionBuilder<DefaultMode>;
 
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 #[derive(Clone)]
 pub enum CloudMode {}
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 impl sealed::Sealed for CloudMode {}
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 impl SessionBuilderKind for CloudMode {}
 
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 pub type CloudSessionBuilder = GenericSessionBuilder<CloudMode>;
 
 /// SessionBuilder is used to create new Session instances
@@ -359,7 +359,7 @@ impl GenericSessionBuilder<DefaultMode> {
 // NOTE: this `impl` block contains configuration options specific for **Cloud** [`Session`].
 // This means that if an option fits both non-Cloud and Cloud `Session`s, it should NOT be put
 // here, but rather in `impl<K> GenericSessionBuilder<K>` block.
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 impl CloudSessionBuilder {
     /// Creates a new SessionBuilder with default configuration,
     /// based on provided path to Scylla Cloud Config yaml.

scylla/src/cloud/mod.rs

@@ -5,9 +5,9 @@ pub use config::CloudConfigError;
 pub use config::CloudTlsProvider;
 
 #[cfg(all(
-    feature = "cloud",
+    feature = "unstable-cloud",
     not(any(feature = "rustls-023", feature = "openssl-010"))
 ))]
 compile_error!(
-    r#""cloud" feature requires a TLS backend: at least one of ["rustls-023", "openssl-010"] is needed"#
+    r#""unstable-cloud" feature requires a TLS backend: at least one of ["rustls-023", "openssl-010"] is needed"#
 );

scylla/src/cluster/node.rs

@@ -253,7 +253,7 @@ pub enum KnownNode {
 pub(crate) enum InternalKnownNode {
     Hostname(String),
     Address(SocketAddr),
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     CloudEndpoint(CloudEndpoint),
 }
 
@@ -267,7 +267,7 @@ impl From<KnownNode> for InternalKnownNode {
 }
 
 /// Describes a database server in the serverless Scylla Cloud.
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub(crate) struct CloudEndpoint {
     pub(crate) hostname: String,
@@ -278,7 +278,7 @@ pub(crate) struct CloudEndpoint {
 #[derive(Debug, Clone)]
 pub(crate) struct ResolvedContactPoint {
     pub(crate) address: SocketAddr,
-    #[cfg_attr(not(feature = "cloud"), allow(unused))]
+    #[cfg_attr(not(feature = "unstable-cloud"), allow(unused))]
     pub(crate) datacenter: Option<String>,
 }
 
@@ -328,7 +328,7 @@ pub(crate) async fn resolve_contact_points(
                 address: *address,
                 datacenter: None,
             }),
-            #[cfg(feature = "cloud")]
+            #[cfg(feature = "unstable-cloud")]
             InternalKnownNode::CloudEndpoint(CloudEndpoint {
                 hostname,
                 datacenter,

scylla/src/lib.rs

@@ -241,7 +241,7 @@ pub mod deserialize {
 
 pub mod authentication;
 pub mod client;
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 pub mod cloud;
 
 pub mod cluster;

scylla/src/network/connection.rs

@@ -228,28 +228,28 @@ mod tls_config {
     //!     ↳Tls (wrapper over TCP stream which adds encryption)
 
     use std::io;
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     use std::sync::Arc;
 
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     use tracing::warn;
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     use uuid::Uuid;
 
     use crate::client::session::TlsContext;
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     use crate::cloud::CloudConfig;
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     use crate::cluster::metadata::PeerEndpoint;
     use crate::cluster::metadata::UntranslatedEndpoint;
-    #[cfg(feature = "cloud")]
+    #[cfg(feature = "unstable-cloud")]
     use crate::cluster::node::ResolvedContactPoint;
 
     /// Abstraction capable of producing [TlsConfig] for connections on-demand.
     #[derive(Clone)] // Cheaply clonable (reference-counted)
     pub(crate) enum TlsProvider {
         GlobalContext(TlsContext),
-        #[cfg(feature = "cloud")]
+        #[cfg(feature = "unstable-cloud")]
         ScyllaCloud(Arc<CloudConfig>),
     }
 
@@ -260,7 +260,7 @@ mod tls_config {
         }
 
         /// Used in the cloud case.
-        #[cfg(feature = "cloud")]
+        #[cfg(feature = "unstable-cloud")]
         pub(crate) fn new_cloud(cloud_config: Arc<CloudConfig>) -> Self {
             Self::ScyllaCloud(cloud_config)
         }
@@ -276,7 +276,7 @@ mod tls_config {
                 TlsProvider::GlobalContext(context) => {
                     Some(TlsConfig::new_with_global_context(context.clone()))
                 }
-                #[cfg(feature = "cloud")]
+                #[cfg(feature = "unstable-cloud")]
                 TlsProvider::ScyllaCloud(cloud_config) => {
                     let (host_id, address, dc) = match *endpoint {
                         UntranslatedEndpoint::ContactPoint(ResolvedContactPoint {
@@ -317,7 +317,7 @@ mod tls_config {
     #[derive(Clone)]
     pub(crate) struct TlsConfig {
         context: TlsContext,
-        #[cfg(feature = "cloud")]
+        #[cfg(feature = "unstable-cloud")]
         sni: Option<String>,
     }
 
@@ -328,7 +328,7 @@ mod tls_config {
         #[cfg(feature = "rustls-023")]
         Rustls023 {
             connector: tokio_rustls::TlsConnector,
-            #[cfg(feature = "cloud")]
+            #[cfg(feature = "unstable-cloud")]
             sni: Option<rustls::pki_types::ServerName<'static>>,
         },
     }
@@ -370,21 +370,21 @@ mod tls_config {
         pub(crate) fn new_with_global_context(context: TlsContext) -> Self {
             Self {
                 context,
-                #[cfg(feature = "cloud")]
+                #[cfg(feature = "unstable-cloud")]
                 sni: None,
             }
         }
 
         /// Used in case of Serverless Cloud connections.
-        #[cfg(feature = "cloud")]
+        #[cfg(feature = "unstable-cloud")]
         pub(crate) fn new_for_sni(
             context: TlsContext,
             domain_name: &str,
             host_id: Option<Uuid>,
         ) -> Self {
             Self {
                 context,
-                #[cfg(feature = "cloud")]
+                #[cfg(feature = "unstable-cloud")]
                 sni: Some(if let Some(host_id) = host_id {
                     format!("{}.{}", host_id, domain_name)
                 } else {
@@ -402,7 +402,7 @@ mod tls_config {
                 TlsContext::OpenSsl010(ref context) => {
                     #[allow(unused_mut)]
                     let mut ssl = openssl::ssl::Ssl::new(context)?;
-                    #[cfg(feature = "cloud")]
+                    #[cfg(feature = "unstable-cloud")]
                     if let Some(sni) = self.sni.as_ref() {
                         ssl.set_hostname(sni)?;
                     }
@@ -411,7 +411,7 @@ mod tls_config {
                 #[cfg(feature = "rustls-023")]
                 TlsContext::Rustls023(ref config) => {
                     let connector = tokio_rustls::TlsConnector::from(config.clone());
-                    #[cfg(feature = "cloud")]
+                    #[cfg(feature = "unstable-cloud")]
                     let sni = self
                         .sni
                         .as_deref()
@@ -421,7 +421,7 @@ mod tls_config {
 
                     Ok(Tls::Rustls023 {
                         connector,
-                        #[cfg(feature = "cloud")]
+                        #[cfg(feature = "unstable-cloud")]
                         sni,
                     })
                 }
@@ -1619,14 +1619,14 @@ impl Connection {
                 #[cfg(feature = "rustls-023")]
                 tls_config::Tls::Rustls023 {
                     connector,
-                    #[cfg(feature = "cloud")]
+                    #[cfg(feature = "unstable-cloud")]
                     sni,
                 } => {
                     use rustls::pki_types::ServerName;
-                    #[cfg(feature = "cloud")]
+                    #[cfg(feature = "unstable-cloud")]
                     let server_name =
                         sni.unwrap_or_else(|| ServerName::IpAddress(node_address.into()));
-                    #[cfg(not(feature = "cloud"))]
+                    #[cfg(not(feature = "unstable-cloud"))]
                     let server_name = ServerName::IpAddress(node_address.into());
                     let stream = connector.connect(server_name, stream).await?;
                     return Ok(spawn_router_and_get_handle(

scylla/src/network/mod.rs

@@ -5,7 +5,7 @@
 //! - NodeConnectionPool - a manager that keeps a desired number of connections opened to each shard.
 
 mod connection;
-#[cfg(feature = "cloud")]
+#[cfg(feature = "unstable-cloud")]
 pub(crate) use connection::TlsConfig;
 pub use connection::TlsError;
 pub(crate) use connection::TlsProvider;