Move public API management functionality to a new directory

Author: chvck

sdk/couchbase/src/bucket.rs

@@ -1,7 +1,7 @@
 use crate::clients::bucket_client::BucketClient;
 use crate::clients::collections_mgmt_client::CollectionsMgmtClient;
 use crate::collection::Collection;
-use crate::collection_manager::CollectionManager;
+use crate::management::collections::collection_manager::CollectionManager;
 use crate::scope::Scope;
 use std::sync::Arc;
 

sdk/couchbase/src/clients/bucket_mgmt_client.rs

@@ -1,6 +1,6 @@
-use crate::bucket_settings::BucketSettings;
 use crate::clients::agent_provider::CouchbaseAgentProvider;
 use crate::error;
+use crate::management::buckets::bucket_settings::BucketSettings;
 use crate::options::bucket_mgmt_options::{
     CreateBucketOptions, DeleteBucketOptions, FlushBucketOptions, GetAllBucketsOptions,
     GetBucketOptions, UpdateBucketOptions,

sdk/couchbase/src/clients/collections_mgmt_client.rs

@@ -1,8 +1,8 @@
 use crate::clients::agent_provider::CouchbaseAgentProvider;
-use crate::collection_manager::{
+use crate::error;
+use crate::management::collections::collection_settings::{
     CreateCollectionSettings, MaxExpiryValue, UpdateCollectionSettings,
 };
-use crate::error;
 use crate::options::collection_mgmt_options::*;
 use crate::results::collections_mgmt_results::{CollectionSpec, ScopeSpec};
 use couchbase_core::retry::RetryStrategy;

sdk/couchbase/src/cluster.rs

@@ -1,11 +1,11 @@
 use crate::bucket::Bucket;
-use crate::bucket_manager::BucketManager;
 use crate::clients::analytics_client::AnalyticsClient;
 use crate::clients::bucket_mgmt_client::BucketMgmtClient;
 use crate::clients::cluster_client::ClusterClient;
 use crate::clients::query_client::QueryClient;
 use crate::clients::search_client::SearchClient;
 use crate::error;
+use crate::management::buckets::bucket_manager::BucketManager;
 use crate::options::analytics_options::AnalyticsOptions;
 use crate::options::cluster_options::ClusterOptions;
 use crate::options::query_options::QueryOptions;

sdk/couchbase/src/collection.rs

@@ -1,7 +1,7 @@
 use crate::clients::collection_client::CollectionClient;
 use crate::clients::core_kv_client::CoreKvClient;
 use crate::clients::query_index_mgmt_client::QueryIndexMgmtClient;
-use crate::query_index_manager::CollectionQueryIndexManager;
+use crate::management::query::query_index_manager::CollectionQueryIndexManager;
 use std::sync::Arc;
 
 #[derive(Clone)]

sdk/couchbase/src/lib.rs

@@ -1,21 +1,18 @@
 extern crate core;
 
 pub mod bucket;
-pub mod bucket_manager;
-pub mod bucket_settings;
 mod capella_ca;
 mod clients;
 pub mod cluster;
 pub mod collection;
 pub mod collection_binary_crud;
 pub mod collection_crud;
 pub mod collection_ds;
-pub mod collection_manager;
 pub mod durability_level;
 pub mod error;
+pub mod management;
 pub mod mutation_state;
 pub mod options;
-pub mod query_index_manager;
 pub mod results;
 pub mod scope;
 pub mod search;

sdk/couchbase/src/bucket_manager.rs sdk/couchbase/src/management/buckets/bucket_manager.rs

@@ -1,6 +1,6 @@
-use crate::bucket_settings::BucketSettings;
 use crate::clients::bucket_mgmt_client::BucketMgmtClient;
 use crate::error;
+use crate::management::buckets::bucket_settings::BucketSettings;
 use crate::options::bucket_mgmt_options::*;
 use std::sync::Arc;
 

sdk/couchbase/src/bucket_settings.rs sdk/couchbase/src/management/buckets/bucket_settings.rs

@@ -0,0 +1,2 @@
+pub mod bucket_manager;
+pub mod bucket_settings;

sdk/couchbase/src/management/buckets/mod.rs

@@ -1,82 +1,11 @@
 use crate::clients::collections_mgmt_client::CollectionsMgmtClient;
 use crate::error;
+pub use crate::management::collections::collection_settings::{
+    CreateCollectionSettings, UpdateCollectionSettings,
+};
 use crate::options::collection_mgmt_options::*;
 use crate::results::collections_mgmt_results::ScopeSpec;
 use std::sync::Arc;
-use std::time::Duration;
-
-#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
-pub enum MaxExpiryValue {
-    Never,
-    InheritFromBucket,
-    Seconds(Duration),
-}
-
-impl From<MaxExpiryValue> for i32 {
-    fn from(value: MaxExpiryValue) -> Self {
-        match value {
-            MaxExpiryValue::Never => 0,
-            MaxExpiryValue::InheritFromBucket => -1,
-            MaxExpiryValue::Seconds(duration) => duration.as_secs() as i32,
-        }
-    }
-}
-
-impl From<i32> for MaxExpiryValue {
-    fn from(value: i32) -> Self {
-        match value {
-            0 => MaxExpiryValue::Never,
-            -1 => MaxExpiryValue::InheritFromBucket,
-            _ => MaxExpiryValue::Seconds(Duration::from_secs(value as u64)),
-        }
-    }
-}
-
-#[derive(Default, Debug, Clone)]
-#[non_exhaustive]
-pub struct CreateCollectionSettings {
-    pub max_expiry: Option<MaxExpiryValue>,
-    pub history: Option<bool>,
-}
-
-impl CreateCollectionSettings {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn max_expiry(mut self, max_expiry: MaxExpiryValue) -> Self {
-        self.max_expiry = Some(max_expiry);
-        self
-    }
-
-    pub fn history(mut self, history: bool) -> Self {
-        self.history = Some(history);
-        self
-    }
-}
-
-#[derive(Default, Debug, Clone)]
-#[non_exhaustive]
-pub struct UpdateCollectionSettings {
-    pub max_expiry: Option<MaxExpiryValue>,
-    pub history: Option<bool>,
-}
-
-impl UpdateCollectionSettings {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn max_expiry(mut self, max_expiry: MaxExpiryValue) -> Self {
-        self.max_expiry = Some(max_expiry);
-        self
-    }
-
-    pub fn history(mut self, history: bool) -> Self {
-        self.history = Some(history);
-        self
-    }
-}
 
 #[derive(Clone)]
 pub struct CollectionManager {

sdk/couchbase/src/collection_manager.rs sdk/couchbase/src/management/collections/collection_manager.rs

@@ -0,0 +1,74 @@
+use std::time::Duration;
+
+#[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
+pub enum MaxExpiryValue {
+    Never,
+    InheritFromBucket,
+    Seconds(Duration),
+}
+
+impl From<MaxExpiryValue> for i32 {
+    fn from(value: MaxExpiryValue) -> Self {
+        match value {
+            MaxExpiryValue::Never => 0,
+            MaxExpiryValue::InheritFromBucket => -1,
+            MaxExpiryValue::Seconds(duration) => duration.as_secs() as i32,
+        }
+    }
+}
+
+impl From<i32> for MaxExpiryValue {
+    fn from(value: i32) -> Self {
+        match value {
+            0 => MaxExpiryValue::Never,
+            -1 => MaxExpiryValue::InheritFromBucket,
+            _ => MaxExpiryValue::Seconds(Duration::from_secs(value as u64)),
+        }
+    }
+}
+
+#[derive(Default, Debug, Clone)]
+#[non_exhaustive]
+pub struct CreateCollectionSettings {
+    pub max_expiry: Option<MaxExpiryValue>,
+    pub history: Option<bool>,
+}
+
+impl CreateCollectionSettings {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    pub fn max_expiry(mut self, max_expiry: MaxExpiryValue) -> Self {
+        self.max_expiry = Some(max_expiry);
+        self
+    }
+
+    pub fn history(mut self, history: bool) -> Self {
+        self.history = Some(history);
+        self
+    }
+}
+
+#[derive(Default, Debug, Clone)]
+#[non_exhaustive]
+pub struct UpdateCollectionSettings {
+    pub max_expiry: Option<MaxExpiryValue>,
+    pub history: Option<bool>,
+}
+
+impl UpdateCollectionSettings {
+    pub fn new() -> Self {
+        Default::default()
+    }
+
+    pub fn max_expiry(mut self, max_expiry: MaxExpiryValue) -> Self {
+        self.max_expiry = Some(max_expiry);
+        self
+    }
+
+    pub fn history(mut self, history: bool) -> Self {
+        self.history = Some(history);
+        self
+    }
+}

sdk/couchbase/src/management/collections/collection_settings.rs

@@ -0,0 +1,2 @@
+pub mod collection_manager;
+pub mod collection_settings;

sdk/couchbase/src/management/collections/mod.rs

@@ -0,0 +1,3 @@
+pub mod buckets;
+pub mod collections;
+pub mod query;

sdk/couchbase/src/management/mod.rs

@@ -0,0 +1 @@
+pub mod query_index_manager;

sdk/couchbase/src/management/query/mod.rs

@@ -1,4 +1,4 @@
-use crate::collection_manager::MaxExpiryValue;
+use crate::management::collections::collection_settings::MaxExpiryValue;
 
 #[derive(Default, Debug, Clone)]
 pub struct ScopeSpec {

sdk/couchbase/src/query_index_manager.rs sdk/couchbase/src/management/query/query_index_manager.rs

@@ -2,10 +2,10 @@ use crate::common::consistency_utils::{verify_bucket_created, verify_bucket_dele
 use crate::common::features::TestFeatureCode;
 use crate::common::test_config::run_test;
 use crate::common::{generate_string_value, try_until};
-use couchbase::bucket_settings::{
+use couchbase::durability_level::DurabilityLevel;
+use couchbase::management::buckets::bucket_settings::{
     BucketSettings, CompressionMode, ConflictResolutionType, EvictionPolicyType, StorageBackend,
 };
-use couchbase::durability_level::DurabilityLevel;
 use serial_test::serial;
 use std::time::Duration;
 

sdk/couchbase/src/results/collections_mgmt_results.rs

@@ -5,7 +5,7 @@ use crate::common::consistency_utils::{
 use crate::common::features::TestFeatureCode;
 use crate::common::test_config::run_test;
 use crate::common::{generate_string_value, try_until};
-use couchbase::collection_manager::{
+use couchbase::management::collections::collection_settings::{
     CreateCollectionSettings, MaxExpiryValue, UpdateCollectionSettings,
 };
 use std::time::Duration;

sdk/couchbase/tests/bucket_management.rs

@@ -1,6 +1,6 @@
 use crate::common::try_until;
-use couchbase::bucket_manager::BucketManager;
-use couchbase::collection_manager::CollectionManager;
+use couchbase::management::buckets::bucket_manager::BucketManager;
+use couchbase::management::collections::collection_manager::CollectionManager;
 use couchbase::results::collections_mgmt_results::CollectionSpec;
 use std::time::Duration;
 
@@ -22,7 +22,7 @@ pub async fn verify_bucket_created(manager: &BucketManager, bucket_name: &str) {
 
 pub async fn verify_bucket_deleted(manager: &BucketManager, bucket_name: &str) {
     try_until(
-        tokio::time::Instant::now() + Duration::from_secs(30),
+        tokio::time::Instant::now() + Duration::from_secs(60),
         Duration::from_millis(100),
         "Bucket was not deleted in time",
         || async {

sdk/couchbase/tests/collections_management.rs

@@ -3,7 +3,7 @@ use crate::common::consistency_utils::{
 };
 use crate::common::test_config::run_test;
 use crate::common::try_until;
-use couchbase::collection_manager::CollectionManager;
+use couchbase::management::collections::collection_manager::CollectionManager;
 use couchbase::options::query_index_mgmt_options::{
     CreatePrimaryQueryIndexOptions, CreateQueryIndexOptions,
 };
@@ -233,7 +233,8 @@ async fn create_collection(manager: &CollectionManager) -> (String, String) {
     manager.create_scope(&scope_name, None).await.unwrap();
     verify_scope_created(manager, &scope_name).await;
 
-    let settings = couchbase::collection_manager::CreateCollectionSettings::new();
+    let settings =
+        couchbase::management::collections::collection_manager::CreateCollectionSettings::new();
     manager
         .create_collection(&scope_name, &collection_name, settings, None)
         .await