couchbase 4.1.1 → 4.1.3

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_integration_management.cxx

@@ -17,21 +17,23 @@
 
 #include "test_helper_integration.hxx"
 
-#include <couchbase/management/analytics_link.hxx>
-#include <couchbase/operations/management/analytics.hxx>
-#include <couchbase/operations/management/bucket.hxx>
-#include <couchbase/operations/management/collections.hxx>
-#include <couchbase/operations/management/eventing.hxx>
-#include <couchbase/operations/management/freeform.hxx>
-#include <couchbase/operations/management/query.hxx>
-#include <couchbase/operations/management/search.hxx>
-#include <couchbase/operations/management/user.hxx>
-
-static couchbase::operations::management::bucket_get_response
+#include "core/management/analytics_link.hxx"
+#include "core/operations/management/analytics.hxx"
+#include "core/operations/management/bucket.hxx"
+#include "core/operations/management/collections.hxx"
+#include "core/operations/management/eventing.hxx"
+#include "core/operations/management/freeform.hxx"
+#include "core/operations/management/query.hxx"
+#include "core/operations/management/search.hxx"
+#include "core/operations/management/user.hxx"
+
+#include <couchbase/cluster.hxx>
+
+static couchbase::core::operations::management::bucket_get_response
 wait_for_bucket_created(test::utils::integration_test_guard& integration, const std::string& bucket_name)
 {
     test::utils::wait_until_bucket_healthy(integration.cluster, bucket_name);
-    couchbase::operations::management::bucket_get_request req{ bucket_name };
+    couchbase::core::operations::management::bucket_get_request req{ bucket_name };
     auto resp = test::utils::execute(integration.cluster, req);
     return resp;
 }
@@ -53,6 +55,10 @@ TEST_CASE("integration: bucket management", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_bucket_management()) {
+        return;
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -61,22 +67,22 @@ TEST_CASE("integration: bucket management", "[integration]")
 
     SECTION("crud")
     {
-        couchbase::management::cluster::bucket_settings bucket_settings;
+        couchbase::core::management::cluster::bucket_settings bucket_settings;
         bucket_settings.name = bucket_name;
         bucket_settings.ram_quota_mb = 100;
         bucket_settings.num_replicas = 1;
-        bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::couchbase;
-        bucket_settings.eviction_policy = couchbase::management::cluster::bucket_eviction_policy::value_only;
+        bucket_settings.bucket_type = couchbase::core::management::cluster::bucket_type::couchbase;
+        bucket_settings.eviction_policy = couchbase::core::management::cluster::bucket_eviction_policy::value_only;
         bucket_settings.flush_enabled = true;
         if (integration.cluster_version().is_enterprise()) {
             bucket_settings.max_expiry = 10;
-            bucket_settings.compression_mode = couchbase::management::cluster::bucket_compression::active;
+            bucket_settings.compression_mode = couchbase::core::management::cluster::bucket_compression::active;
         }
         bucket_settings.replica_indexes = true;
-        bucket_settings.conflict_resolution_type = couchbase::management::cluster::bucket_conflict_resolution::sequence_number;
+        bucket_settings.conflict_resolution_type = couchbase::core::management::cluster::bucket_conflict_resolution::sequence_number;
 
         {
-            couchbase::operations::management::bucket_create_request req;
+            couchbase::core::operations::management::bucket_create_request req;
             req.bucket = bucket_settings;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
@@ -97,7 +103,7 @@ TEST_CASE("integration: bucket management", "[integration]")
         }
         std::uint64_t old_quota_mb{ 0 };
         {
-            couchbase::operations::management::bucket_get_all_request req{};
+            couchbase::core::operations::management::bucket_get_all_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             INFO(resp.ctx.http_body)
             REQUIRE_FALSE(resp.ctx.ec);
@@ -124,38 +130,38 @@ TEST_CASE("integration: bucket management", "[integration]")
 
         {
             bucket_settings.ram_quota_mb = old_quota_mb + 20;
-            couchbase::operations::management::bucket_update_request req;
+            couchbase::core::operations::management::bucket_update_request req;
             req.bucket = bucket_settings;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         auto ram_quota_updated = test::utils::wait_until([&integration, &bucket_name, old_quota_mb]() {
-            couchbase::operations::management::bucket_get_request req{ bucket_name };
+            couchbase::core::operations::management::bucket_get_request req{ bucket_name };
             auto resp = test::utils::execute(integration.cluster, req);
             return !resp.ctx.ec && resp.bucket.ram_quota_mb > old_quota_mb;
         });
         REQUIRE(ram_quota_updated);
 
         {
-            couchbase::operations::management::bucket_drop_request req{ bucket_name };
+            couchbase::core::operations::management::bucket_drop_request req{ bucket_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::bucket_get_request req{ bucket_name };
+            couchbase::core::operations::management::bucket_get_request req{ bucket_name };
             auto resp = retry_on_error(integration, req, {});
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::bucket_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::bucket_not_found);
         }
 
         {
-            couchbase::operations::management::bucket_get_all_request req;
+            couchbase::core::operations::management::bucket_get_all_request req;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE(!resp.buckets.empty());
             auto known_buckets =
-              std::count_if(resp.buckets.begin(), resp.buckets.end(), [bucket_name](auto& entry) { return entry.name == bucket_name; });
+              std::count_if(resp.buckets.begin(), resp.buckets.end(), [&bucket_name](auto& entry) { return entry.name == bucket_name; });
             REQUIRE(known_buckets == 0);
         }
     }
@@ -164,10 +170,10 @@ TEST_CASE("integration: bucket management", "[integration]")
     {
         SECTION("flush item")
         {
-            couchbase::document_id id{ bucket_name, "_default", "_default", test::utils::uniq_id("foo") };
+            couchbase::core::document_id id{ bucket_name, "_default", "_default", test::utils::uniq_id("foo") };
 
             {
-                couchbase::operations::management::bucket_create_request req;
+                couchbase::core::operations::management::bucket_create_request req;
                 req.bucket.name = bucket_name;
                 req.bucket.flush_enabled = true;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -182,42 +188,42 @@ TEST_CASE("integration: bucket management", "[integration]")
                 const tao::json::value value = {
                     { "a", 1.0 },
                 };
-                couchbase::operations::insert_request req{ id, couchbase::utils::json::generate(value) };
+                couchbase::core::operations::insert_request req{ id, couchbase::core::utils::json::generate_binary(value) };
                 auto resp = test::utils::execute(integration.cluster, req);
-                REQUIRE_FALSE(resp.ctx.ec);
+                REQUIRE_FALSE(resp.ctx.ec());
             }
 
             {
-                couchbase::operations::get_request req{ id };
+                couchbase::core::operations::get_request req{ id };
                 auto resp = test::utils::execute(integration.cluster, req);
-                REQUIRE_FALSE(resp.ctx.ec);
+                REQUIRE_FALSE(resp.ctx.ec());
             }
 
             {
-                couchbase::operations::management::bucket_flush_request req{ bucket_name };
+                couchbase::core::operations::management::bucket_flush_request req{ bucket_name };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
             }
 
             auto flushed = test::utils::wait_until([&integration, id]() {
-                couchbase::operations::get_request req{ id };
+                couchbase::core::operations::get_request req{ id };
                 auto resp = test::utils::execute(integration.cluster, req);
-                return resp.ctx.ec == couchbase::error::key_value_errc::document_not_found;
+                return resp.ctx.ec() == couchbase::errc::key_value::document_not_found;
             });
             REQUIRE(flushed);
         }
 
         SECTION("no bucket")
         {
-            couchbase::operations::management::bucket_flush_request req{ bucket_name };
+            couchbase::core::operations::management::bucket_flush_request req{ bucket_name };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::bucket_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::bucket_not_found);
         }
 
         SECTION("flush disabled")
         {
             {
-                couchbase::operations::management::bucket_create_request req;
+                couchbase::core::operations::management::bucket_create_request req;
                 req.bucket.name = bucket_name;
                 req.bucket.flush_enabled = false;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -227,9 +233,9 @@ TEST_CASE("integration: bucket management", "[integration]")
             REQUIRE(test::utils::wait_until_bucket_healthy(integration.cluster, bucket_name));
 
             {
-                couchbase::operations::management::bucket_flush_request req{ bucket_name };
+                couchbase::core::operations::management::bucket_flush_request req{ bucket_name };
                 auto resp = test::utils::execute(integration.cluster, req);
-                REQUIRE(resp.ctx.ec == couchbase::error::management_errc::bucket_not_flushable);
+                REQUIRE(resp.ctx.ec == couchbase::errc::management::bucket_not_flushable);
             }
         }
     }
@@ -237,11 +243,11 @@ TEST_CASE("integration: bucket management", "[integration]")
     SECTION("memcached")
     {
         {
-            couchbase::management::cluster::bucket_settings bucket_settings;
+            couchbase::core::management::cluster::bucket_settings bucket_settings;
             bucket_settings.name = bucket_name;
-            bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::memcached;
+            bucket_settings.bucket_type = couchbase::core::management::cluster::bucket_type::memcached;
             bucket_settings.num_replicas = 0;
-            couchbase::operations::management::bucket_create_request req{ bucket_settings };
+            couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
@@ -249,20 +255,20 @@ TEST_CASE("integration: bucket management", "[integration]")
         {
             auto resp = wait_for_bucket_created(integration, bucket_name);
             REQUIRE_FALSE(resp.ctx.ec);
-            REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::memcached);
+            REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::memcached);
         }
     }
 
     SECTION("ephemeral")
     {
-        couchbase::management::cluster::bucket_settings bucket_settings;
+        couchbase::core::management::cluster::bucket_settings bucket_settings;
         bucket_settings.name = bucket_name;
-        bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::ephemeral;
+        bucket_settings.bucket_type = couchbase::core::management::cluster::bucket_type::ephemeral;
 
         SECTION("default eviction")
         {
             {
-                couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                 auto resp = test::utils::execute(integration.cluster, req);
                 INFO(resp.error_message)
                 REQUIRE_FALSE(resp.ctx.ec);
@@ -271,16 +277,16 @@ TEST_CASE("integration: bucket management", "[integration]")
             {
                 auto resp = wait_for_bucket_created(integration, bucket_name);
                 REQUIRE_FALSE(resp.ctx.ec);
-                REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::ephemeral);
-                REQUIRE(resp.bucket.eviction_policy == couchbase::management::cluster::bucket_eviction_policy::no_eviction);
+                REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::ephemeral);
+                REQUIRE(resp.bucket.eviction_policy == couchbase::core::management::cluster::bucket_eviction_policy::no_eviction);
             }
         }
 
         SECTION("nru eviction")
         {
             {
-                bucket_settings.eviction_policy = couchbase::management::cluster::bucket_eviction_policy::not_recently_used;
-                couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                bucket_settings.eviction_policy = couchbase::core::management::cluster::bucket_eviction_policy::not_recently_used;
+                couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
             }
@@ -288,8 +294,8 @@ TEST_CASE("integration: bucket management", "[integration]")
             {
                 auto resp = wait_for_bucket_created(integration, bucket_name);
                 REQUIRE_FALSE(resp.ctx.ec);
-                REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::ephemeral);
-                REQUIRE(resp.bucket.eviction_policy == couchbase::management::cluster::bucket_eviction_policy::not_recently_used);
+                REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::ephemeral);
+                REQUIRE(resp.bucket.eviction_policy == couchbase::core::management::cluster::bucket_eviction_policy::not_recently_used);
             }
         }
 
@@ -297,8 +303,8 @@ TEST_CASE("integration: bucket management", "[integration]")
             SECTION("storage backend")
             {
                 {
-                    bucket_settings.storage_backend = couchbase::management::cluster::bucket_storage_backend::couchstore;
-                    couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                    bucket_settings.storage_backend = couchbase::core::management::cluster::bucket_storage_backend::couchstore;
+                    couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                     auto resp = test::utils::execute(integration.cluster, req);
                     REQUIRE_FALSE(resp.ctx.ec);
                 }
@@ -306,8 +312,8 @@ TEST_CASE("integration: bucket management", "[integration]")
                 {
                     auto resp = wait_for_bucket_created(integration, bucket_name);
                     REQUIRE_FALSE(resp.ctx.ec);
-                    REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::ephemeral);
-                    REQUIRE(resp.bucket.storage_backend == couchbase::management::cluster::bucket_storage_backend::unknown);
+                    REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::ephemeral);
+                    REQUIRE(resp.bucket.storage_backend == couchbase::core::management::cluster::bucket_storage_backend::unknown);
                 }
             }
         }
@@ -315,15 +321,15 @@ TEST_CASE("integration: bucket management", "[integration]")
 
     SECTION("couchbase")
     {
-        couchbase::management::cluster::bucket_settings bucket_settings;
+        couchbase::core::management::cluster::bucket_settings bucket_settings;
         bucket_settings.name = bucket_name;
-        bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::couchbase;
+        bucket_settings.bucket_type = couchbase::core::management::cluster::bucket_type::couchbase;
 
         SECTION("default eviction")
         {
             {
 
-                couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                 auto resp = test::utils::execute(integration.cluster, req);
                 INFO(resp.error_message)
                 REQUIRE_FALSE(resp.ctx.ec);
@@ -332,16 +338,16 @@ TEST_CASE("integration: bucket management", "[integration]")
             {
                 auto resp = wait_for_bucket_created(integration, bucket_name);
                 REQUIRE_FALSE(resp.ctx.ec);
-                REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
-                REQUIRE(resp.bucket.eviction_policy == couchbase::management::cluster::bucket_eviction_policy::value_only);
+                REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::couchbase);
+                REQUIRE(resp.bucket.eviction_policy == couchbase::core::management::cluster::bucket_eviction_policy::value_only);
             }
         }
 
         SECTION("full eviction")
         {
             {
-                bucket_settings.eviction_policy = couchbase::management::cluster::bucket_eviction_policy::full;
-                couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                bucket_settings.eviction_policy = couchbase::core::management::cluster::bucket_eviction_policy::full;
+                couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
             }
@@ -349,8 +355,8 @@ TEST_CASE("integration: bucket management", "[integration]")
             {
                 auto resp = wait_for_bucket_created(integration, bucket_name);
                 REQUIRE_FALSE(resp.ctx.ec);
-                REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
-                REQUIRE(resp.bucket.eviction_policy == couchbase::management::cluster::bucket_eviction_policy::full);
+                REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::couchbase);
+                REQUIRE(resp.bucket.eviction_policy == couchbase::core::management::cluster::bucket_eviction_policy::full);
             }
         }
 
@@ -360,8 +366,8 @@ TEST_CASE("integration: bucket management", "[integration]")
                 SECTION("couchstore")
                 {
                     {
-                        bucket_settings.storage_backend = couchbase::management::cluster::bucket_storage_backend::couchstore;
-                        couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                        bucket_settings.storage_backend = couchbase::core::management::cluster::bucket_storage_backend::couchstore;
+                        couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                         auto resp = test::utils::execute(integration.cluster, req);
                         REQUIRE_FALSE(resp.ctx.ec);
                     }
@@ -369,17 +375,17 @@ TEST_CASE("integration: bucket management", "[integration]")
                     {
                         auto resp = wait_for_bucket_created(integration, bucket_name);
                         REQUIRE_FALSE(resp.ctx.ec);
-                        REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
-                        REQUIRE(resp.bucket.storage_backend == couchbase::management::cluster::bucket_storage_backend::couchstore);
+                        REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::couchbase);
+                        REQUIRE(resp.bucket.storage_backend == couchbase::core::management::cluster::bucket_storage_backend::couchstore);
                     }
                 }
 
                 SECTION("magma")
                 {
                     {
-                        bucket_settings.ram_quota_mb = 256;
-                        bucket_settings.storage_backend = couchbase::management::cluster::bucket_storage_backend::magma;
-                        couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                        bucket_settings.ram_quota_mb = integration.cluster_version().is_neo() ? 1'024 : 256;
+                        bucket_settings.storage_backend = couchbase::core::management::cluster::bucket_storage_backend::magma;
+                        couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                         auto resp = test::utils::execute(integration.cluster, req);
                         REQUIRE_FALSE(resp.ctx.ec);
                     }
@@ -387,8 +393,8 @@ TEST_CASE("integration: bucket management", "[integration]")
                     {
                         auto resp = wait_for_bucket_created(integration, bucket_name);
                         REQUIRE_FALSE(resp.ctx.ec);
-                        REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
-                        REQUIRE(resp.bucket.storage_backend == couchbase::management::cluster::bucket_storage_backend::magma);
+                        REQUIRE(resp.bucket.bucket_type == couchbase::core::management::cluster::bucket_type::couchbase);
+                        REQUIRE(resp.bucket.storage_backend == couchbase::core::management::cluster::bucket_storage_backend::magma);
                     }
                 }
             }
@@ -398,24 +404,24 @@ TEST_CASE("integration: bucket management", "[integration]")
     SECTION("update no bucket")
     {
 
-        couchbase::management::cluster::bucket_settings bucket_settings;
+        couchbase::core::management::cluster::bucket_settings bucket_settings;
         bucket_settings.name = bucket_name;
-        couchbase::operations::management::bucket_update_request req;
+        couchbase::core::operations::management::bucket_update_request req;
         req.bucket = bucket_settings;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::bucket_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::bucket_not_found);
     }
 
     if (integration.cluster_version().supports_minimum_durability_level()) {
         SECTION("minimum durability level")
         {
-            couchbase::management::cluster::bucket_settings bucket_settings;
+            couchbase::core::management::cluster::bucket_settings bucket_settings;
             bucket_settings.name = bucket_name;
 
             SECTION("default")
             {
                 {
-                    couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                    couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                     auto resp = test::utils::execute(integration.cluster, req);
                     REQUIRE_FALSE(resp.ctx.ec);
                 }
@@ -423,7 +429,7 @@ TEST_CASE("integration: bucket management", "[integration]")
                 {
                     auto resp = wait_for_bucket_created(integration, bucket_name);
                     REQUIRE_FALSE(resp.ctx.ec);
-                    REQUIRE(resp.bucket.minimum_durability_level == couchbase::protocol::durability_level::none);
+                    REQUIRE(resp.bucket.minimum_durability_level == couchbase::durability_level::none);
                 }
             }
 
@@ -431,8 +437,8 @@ TEST_CASE("integration: bucket management", "[integration]")
                 SECTION("majority")
                 {
                     {
-                        bucket_settings.minimum_durability_level = couchbase::protocol::durability_level::majority;
-                        couchbase::operations::management::bucket_create_request req{ bucket_settings };
+                        bucket_settings.minimum_durability_level = couchbase::durability_level::majority;
+                        couchbase::core::operations::management::bucket_create_request req{ bucket_settings };
                         auto resp = test::utils::execute(integration.cluster, req);
                         INFO(resp.error_message)
                         REQUIRE_FALSE(resp.ctx.ec);
@@ -441,7 +447,7 @@ TEST_CASE("integration: bucket management", "[integration]")
                     {
                         auto resp = wait_for_bucket_created(integration, bucket_name);
                         REQUIRE_FALSE(resp.ctx.ec);
-                        REQUIRE(resp.bucket.minimum_durability_level == couchbase::protocol::durability_level::majority);
+                        REQUIRE(resp.bucket.minimum_durability_level == couchbase::durability_level::majority);
                     }
                 }
             }
@@ -452,37 +458,37 @@ TEST_CASE("integration: bucket management", "[integration]")
 
     // drop bucket if not already dropped
     {
-        couchbase::operations::management::bucket_drop_request req{ bucket_name };
+        couchbase::core::operations::management::bucket_drop_request req{ bucket_name };
         test::utils::execute(integration.cluster, req);
     }
 }
 
-bool
-collection_exists(std::shared_ptr<couchbase::cluster> cluster,
-                  const std::string& bucket_name,
-                  const std::string& scope_name,
-                  const std::string& collection_name)
+std::optional<couchbase::core::topology::collections_manifest::collection>
+get_collection(std::shared_ptr<couchbase::core::cluster> cluster,
+               const std::string& bucket_name,
+               const std::string& scope_name,
+               const std::string& collection_name)
 {
-    couchbase::operations::management::scope_get_all_request req{ bucket_name };
+    couchbase::core::operations::management::scope_get_all_request req{ bucket_name };
     auto resp = test::utils::execute(cluster, req);
     if (!resp.ctx.ec) {
         for (const auto& scope : resp.manifest.scopes) {
             if (scope.name == scope_name) {
                 for (const auto& collection : scope.collections) {
                     if (collection.name == collection_name) {
-                        return true;
+                        return collection;
                     }
                 }
             }
         }
     }
-    return false;
+    return std::nullopt;
 }
 
 bool
-scope_exists(std::shared_ptr<couchbase::cluster> cluster, const std::string& bucket_name, const std::string& scope_name)
+scope_exists(std::shared_ptr<couchbase::core::cluster> cluster, const std::string& bucket_name, const std::string& scope_name)
 {
-    couchbase::operations::management::scope_get_all_request req{ bucket_name };
+    couchbase::core::operations::management::scope_get_all_request req{ bucket_name };
     auto resp = test::utils::execute(cluster, req);
     if (!resp.ctx.ec) {
         for (const auto& scope : resp.manifest.scopes) {
@@ -497,6 +503,7 @@ scope_exists(std::shared_ptr<couchbase::cluster> cluster, const std::string& buc
 TEST_CASE("integration: collection management", "[integration]")
 {
     test::utils::integration_test_guard integration;
+    test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     if (!integration.cluster_version().supports_collections()) {
         return;
@@ -504,11 +511,14 @@ TEST_CASE("integration: collection management", "[integration]")
 
     auto scope_name = test::utils::uniq_id("scope");
     auto collection_name = test::utils::uniq_id("collection");
+    std::uint32_t max_expiry = 5;
 
     {
-        couchbase::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
+        couchbase::core::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
+        auto created = test::utils::wait_until_collection_manifest_propagated(integration.cluster, integration.ctx.bucket, resp.uid);
+        REQUIRE(created);
     }
 
     {
@@ -517,54 +527,64 @@ TEST_CASE("integration: collection management", "[integration]")
     }
 
     {
-        couchbase::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
+        couchbase::core::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::management_errc::scope_exists);
+        REQUIRE(resp.ctx.ec == couchbase::errc::management::scope_exists);
     }
 
     {
-        couchbase::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
+        couchbase::core::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
         if (integration.cluster_version().is_enterprise()) {
-            req.max_expiry = 5;
+            req.max_expiry = max_expiry;
         }
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
+        auto created = test::utils::wait_until_collection_manifest_propagated(integration.cluster, integration.ctx.bucket, resp.uid);
+        REQUIRE(created);
     }
 
     {
-        auto created = test::utils::wait_until(
-          [&]() { return collection_exists(integration.cluster, integration.ctx.bucket, scope_name, collection_name); });
+        couchbase::core::topology::collections_manifest::collection collection;
+        auto created = test::utils::wait_until([&]() {
+            auto coll = get_collection(integration.cluster, integration.ctx.bucket, scope_name, collection_name);
+            if (coll) {
+                collection = *coll;
+                return true;
+            }
+            return false;
+        });
         REQUIRE(created);
+        if (integration.cluster_version().is_enterprise()) {
+            REQUIRE(collection.max_expiry == max_expiry);
+        }
     }
 
-    // TODO: Check collection was created with correct max expiry when supported
-
     {
-        couchbase::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
+        couchbase::core::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::management_errc::collection_exists);
+        REQUIRE(resp.ctx.ec == couchbase::errc::management::collection_exists);
     }
 
     {
-        couchbase::operations::management::collection_drop_request req{ integration.ctx.bucket, scope_name, collection_name };
+        couchbase::core::operations::management::collection_drop_request req{ integration.ctx.bucket, scope_name, collection_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
         auto dropped = test::utils::wait_until(
-          [&]() { return !collection_exists(integration.cluster, integration.ctx.bucket, scope_name, collection_name); });
+          [&]() { return !get_collection(integration.cluster, integration.ctx.bucket, scope_name, collection_name).has_value(); });
         REQUIRE(dropped);
     }
 
     {
-        couchbase::operations::management::collection_drop_request req{ integration.ctx.bucket, scope_name, collection_name };
+        couchbase::core::operations::management::collection_drop_request req{ integration.ctx.bucket, scope_name, collection_name };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::collection_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::collection_not_found);
     }
 
     {
-        couchbase::operations::management::scope_drop_request req{ integration.ctx.bucket, scope_name };
+        couchbase::core::operations::management::scope_drop_request req{ integration.ctx.bucket, scope_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
@@ -575,15 +595,15 @@ TEST_CASE("integration: collection management", "[integration]")
     }
 
     {
-        couchbase::operations::management::scope_drop_request req{ integration.ctx.bucket, scope_name };
+        couchbase::core::operations::management::scope_drop_request req{ integration.ctx.bucket, scope_name };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::scope_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::scope_not_found);
     }
 }
 
 void
-assert_user_and_metadata(const couchbase::management::rbac::user_and_metadata& user,
-                         const couchbase::management::rbac::user_and_metadata& expected)
+assert_user_and_metadata(const couchbase::core::management::rbac::user_and_metadata& user,
+                         const couchbase::core::management::rbac::user_and_metadata& expected)
 {
     REQUIRE(user.username == expected.username);
     REQUIRE(user.groups == expected.groups);
@@ -634,22 +654,22 @@ TEST_CASE("integration: user groups management", "[integration]")
         auto group_name_1 = test::utils::uniq_id("group");
         auto group_name_2 = test::utils::uniq_id("group");
 
-        couchbase::management::rbac::group group{};
+        couchbase::core::management::rbac::group group{};
         group.name = group_name_1;
         group.description = "this is a test";
-        group.roles = { couchbase::management::rbac::role{ "replication_target", integration.ctx.bucket },
-                        couchbase::management::rbac::role{ "replication_admin" } };
+        group.roles = { couchbase::core::management::rbac::role{ "replication_target", integration.ctx.bucket },
+                        couchbase::core::management::rbac::role{ "replication_admin" } };
         group.ldap_group_reference = "asda=price";
 
         {
-            couchbase::operations::management::group_upsert_request req{ group };
+            couchbase::core::operations::management::group_upsert_request req{ group };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::group_get_request req{ group_name_1 };
-            auto resp = retry_on_error(integration, req, couchbase::error::management_errc::group_not_found);
+            couchbase::core::operations::management::group_get_request req{ group_name_1 };
+            auto resp = retry_on_error(integration, req, couchbase::errc::management::group_not_found);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE(resp.group.name == group.name);
             REQUIRE(resp.group.description == group.description);
@@ -658,15 +678,15 @@ TEST_CASE("integration: user groups management", "[integration]")
 
         {
             group.description = "this is still a test";
-            group.roles.push_back(couchbase::management::rbac::role{ "query_system_catalog" });
-            couchbase::operations::management::group_upsert_request req{ group };
+            group.roles.push_back(couchbase::core::management::rbac::role{ "query_system_catalog" });
+            couchbase::core::operations::management::group_upsert_request req{ group };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
             auto updated = test::utils::wait_until([&]() {
-                couchbase::operations::management::group_get_request req{ group_name_1 };
+                couchbase::core::operations::management::group_get_request req{ group_name_1 };
                 auto resp = test::utils::execute(integration.cluster, req);
                 return !resp.ctx.ec && resp.group.description == group.description;
             });
@@ -675,14 +695,14 @@ TEST_CASE("integration: user groups management", "[integration]")
 
         {
             group.name = group_name_2;
-            couchbase::operations::management::group_upsert_request req{ group };
+            couchbase::core::operations::management::group_upsert_request req{ group };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
             auto created = test::utils::wait_until([&]() {
-                couchbase::operations::management::group_get_all_request req{ group_name_2 };
+                couchbase::core::operations::management::group_get_all_request req{ group_name_2 };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
                 return resp.groups.size() == 2;
@@ -691,20 +711,20 @@ TEST_CASE("integration: user groups management", "[integration]")
         }
 
         {
-            couchbase::operations::management::role_get_all_request req{};
+            couchbase::core::operations::management::role_get_all_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE(resp.roles.size() > 0);
         }
 
         {
-            couchbase::operations::management::group_drop_request req{ group_name_1 };
+            couchbase::core::operations::management::group_drop_request req{ group_name_1 };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::group_drop_request req{ group_name_2 };
+            couchbase::core::operations::management::group_drop_request req{ group_name_2 };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
@@ -712,16 +732,16 @@ TEST_CASE("integration: user groups management", "[integration]")
 
     SECTION("get missing group")
     {
-        couchbase::operations::management::group_get_request req{ test::utils::uniq_id("group") };
+        couchbase::core::operations::management::group_get_request req{ test::utils::uniq_id("group") };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::management_errc::group_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::management::group_not_found);
     }
 
     SECTION("drop missing group")
     {
-        couchbase::operations::management::group_drop_request req{ test::utils::uniq_id("group") };
+        couchbase::core::operations::management::group_drop_request req{ test::utils::uniq_id("group") };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::management_errc::group_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::management::group_not_found);
     }
 
     SECTION("user and groups crud")
@@ -729,59 +749,59 @@ TEST_CASE("integration: user groups management", "[integration]")
         auto group_name = test::utils::uniq_id("group");
         auto user_name = test::utils::uniq_id("user");
 
-        couchbase::management::rbac::group group{};
+        couchbase::core::management::rbac::group group{};
         group.name = group_name;
         group.description = "this is a test";
-        group.roles = { couchbase::management::rbac::role{ "replication_target", integration.ctx.bucket },
-                        couchbase::management::rbac::role{ "replication_admin" } };
+        group.roles = { couchbase::core::management::rbac::role{ "replication_target", integration.ctx.bucket },
+                        couchbase::core::management::rbac::role{ "replication_admin" } };
 
         {
-            couchbase::operations::management::group_upsert_request req{ group };
+            couchbase::core::operations::management::group_upsert_request req{ group };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        couchbase::management::rbac::user user{ user_name };
+        couchbase::core::management::rbac::user user{ user_name };
         user.display_name = "display_name";
         user.password = "password";
         user.roles = {
-            couchbase::management::rbac::role{ "bucket_admin", integration.ctx.bucket },
+            couchbase::core::management::rbac::role{ "bucket_admin", integration.ctx.bucket },
         };
         user.groups = { group_name };
 
         {
-            couchbase::operations::management::user_upsert_request req{};
+            couchbase::core::operations::management::user_upsert_request req{};
             req.user = user;
-            auto resp = retry_on_error(integration, req, couchbase::error::common_errc::invalid_argument);
+            auto resp = retry_on_error(integration, req, couchbase::errc::common::invalid_argument);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        couchbase::management::rbac::user_and_metadata expected{};
+        couchbase::core::management::rbac::user_and_metadata expected{};
         expected.username = user.username;
         expected.display_name = user.display_name;
         expected.roles = user.roles;
         expected.groups = user.groups;
-        expected.domain = couchbase::management::rbac::auth_domain::local;
+        expected.domain = couchbase::core::management::rbac::auth_domain::local;
 
-        couchbase::management::rbac::role_and_origins expected_role_1{};
+        couchbase::core::management::rbac::role_and_origins expected_role_1{};
         expected_role_1.name = "bucket_admin";
         expected_role_1.bucket = integration.ctx.bucket;
-        expected_role_1.origins = { couchbase::management::rbac::origin{ "user" } };
+        expected_role_1.origins = { couchbase::core::management::rbac::origin{ "user" } };
 
-        couchbase::management::rbac::role_and_origins expected_role_2{};
+        couchbase::core::management::rbac::role_and_origins expected_role_2{};
         expected_role_2.name = "replication_target";
         expected_role_2.bucket = integration.ctx.bucket;
-        expected_role_2.origins = { couchbase::management::rbac::origin{ "group", group_name } };
+        expected_role_2.origins = { couchbase::core::management::rbac::origin{ "group", group_name } };
 
-        couchbase::management::rbac::role_and_origins expected_role_3{};
+        couchbase::core::management::rbac::role_and_origins expected_role_3{};
         expected_role_3.name = "replication_admin";
-        expected_role_3.origins = { couchbase::management::rbac::origin{ "group", group_name } };
+        expected_role_3.origins = { couchbase::core::management::rbac::origin{ "group", group_name } };
 
         expected.effective_roles = { expected_role_1, expected_role_2, expected_role_3 };
 
         {
-            couchbase::operations::management::user_get_request req{ user_name };
-            auto resp = retry_on_error(integration, req, couchbase::error::management_errc::user_not_found);
+            couchbase::core::operations::management::user_get_request req{ user_name };
+            auto resp = retry_on_error(integration, req, couchbase::errc::management::user_not_found);
             REQUIRE_FALSE(resp.ctx.ec);
             assert_user_and_metadata(resp.user, expected);
         }
@@ -790,16 +810,16 @@ TEST_CASE("integration: user groups management", "[integration]")
         expected.display_name = "different_display_name";
 
         {
-            couchbase::operations::management::user_upsert_request req{};
+            couchbase::core::operations::management::user_upsert_request req{};
             req.user = user;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::user_get_response resp;
+            couchbase::core::operations::management::user_get_response resp;
             test::utils::wait_until([&]() {
-                couchbase::operations::management::user_get_request req{ user.username };
+                couchbase::core::operations::management::user_get_request req{ user.username };
                 resp = test::utils::execute(integration.cluster, req);
                 return !resp.ctx.ec && resp.user.display_name == user.display_name;
             });
@@ -808,7 +828,7 @@ TEST_CASE("integration: user groups management", "[integration]")
         }
 
         {
-            couchbase::operations::management::user_get_all_request req{};
+            couchbase::core::operations::management::user_get_all_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE_FALSE(resp.users.empty());
@@ -819,13 +839,13 @@ TEST_CASE("integration: user groups management", "[integration]")
         }
 
         {
-            couchbase::operations::management::user_drop_request req{ user_name };
+            couchbase::core::operations::management::user_drop_request req{ user_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::group_drop_request req{ group_name };
+            couchbase::core::operations::management::group_drop_request req{ group_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
@@ -836,27 +856,31 @@ TEST_CASE("integration: user management", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_user_management()) {
+        return;
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
 
     SECTION("get missing user")
     {
-        couchbase::operations::management::user_get_request req{ test::utils::uniq_id("user") };
+        couchbase::core::operations::management::user_get_request req{ test::utils::uniq_id("user") };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::management_errc::user_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::management::user_not_found);
     }
 
     SECTION("drop missing user")
     {
-        couchbase::operations::management::user_drop_request req{ test::utils::uniq_id("user") };
+        couchbase::core::operations::management::user_drop_request req{ test::utils::uniq_id("user") };
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::management_errc::user_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::management::user_not_found);
     }
 
     SECTION("get roles")
     {
-        couchbase::operations::management::role_get_all_request req{};
+        couchbase::core::operations::management::role_get_all_request req{};
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
         REQUIRE(resp.roles.size() > 0);
@@ -868,7 +892,8 @@ TEST_CASE("integration: user management collections roles", "[integration]")
     test::utils::integration_test_guard integration;
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
-    if (!integration.cluster_version().supports_collections() || integration.cluster_version().is_community()) {
+    if (!integration.cluster_version().supports_user_management() || !integration.cluster_version().supports_collections() ||
+        integration.cluster_version().is_community()) {
         return;
     }
 
@@ -877,7 +902,7 @@ TEST_CASE("integration: user management collections roles", "[integration]")
     auto user_name = test::utils::uniq_id("user");
 
     {
-        couchbase::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
+        couchbase::core::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
         auto created = test::utils::wait_until_collection_manifest_propagated(integration.cluster, integration.ctx.bucket, resp.uid);
@@ -885,30 +910,30 @@ TEST_CASE("integration: user management collections roles", "[integration]")
     }
 
     {
-        couchbase::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
+        couchbase::core::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
         auto created = test::utils::wait_until_collection_manifest_propagated(integration.cluster, integration.ctx.bucket, resp.uid);
         REQUIRE(created);
     }
 
-    couchbase::management::rbac::user user{ user_name };
+    couchbase::core::management::rbac::user user{ user_name };
     user.display_name = "display_name";
     user.password = "password";
     user.roles = {
-        couchbase::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name },
+        couchbase::core::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name },
     };
 
     {
-        couchbase::operations::management::user_upsert_request req{};
+        couchbase::core::operations::management::user_upsert_request req{};
         req.user = user;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::operations::management::user_get_request req{ user_name };
-        auto resp = retry_on_error(integration, req, couchbase::error::management_errc::user_not_found);
+        couchbase::core::operations::management::user_get_request req{ user_name };
+        auto resp = retry_on_error(integration, req, couchbase::errc::management::user_not_found);
         REQUIRE_FALSE(resp.ctx.ec);
         REQUIRE(resp.user.roles.size() == 1);
         REQUIRE(resp.user.roles[0].name == "data_reader");
@@ -917,18 +942,18 @@ TEST_CASE("integration: user management collections roles", "[integration]")
     }
 
     user.roles = {
-        couchbase::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name, collection_name },
+        couchbase::core::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name, collection_name },
     };
 
     {
-        couchbase::operations::management::user_upsert_request req{};
+        couchbase::core::operations::management::user_upsert_request req{};
         req.user = user;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::operations::management::user_get_request req{ user_name };
+        couchbase::core::operations::management::user_get_request req{ user_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
         REQUIRE(resp.user.roles.size() == 1);
@@ -947,73 +972,81 @@ TEST_CASE("integration: query index management", "[integration]")
         return;
     }
 
-    auto bucket_name = test::utils::uniq_id("bucket");
     auto index_name = test::utils::uniq_id("index");
 
-    {
-        couchbase::operations::management::bucket_create_request req;
-        req.bucket.name = bucket_name;
-        req.bucket.bucket_type = couchbase::management::cluster::bucket_type::couchbase;
-        req.bucket.num_replicas = 0;
-        auto resp = test::utils::execute(integration.cluster, req);
-    }
+    if (integration.cluster_version().supports_bucket_management()) {
+        SECTION("primary index")
+        {
+            auto bucket_name = test::utils::uniq_id("bucket");
 
-    REQUIRE(!wait_for_bucket_created(integration, bucket_name).ctx.ec);
+            {
+                couchbase::core::operations::management::bucket_create_request req;
+                req.bucket.name = bucket_name;
+                req.bucket.bucket_type = couchbase::core::management::cluster::bucket_type::couchbase;
+                req.bucket.num_replicas = 0;
+                auto resp = test::utils::execute(integration.cluster, req);
+            }
 
-    SECTION("primary index")
-    {
-        {
-            couchbase::operations::management::query_index_create_response resp;
-            bool operation_completed = test::utils::wait_until([&integration, &bucket_name, &resp]() {
-                couchbase::operations::management::query_index_create_request req{};
+            REQUIRE(!wait_for_bucket_created(integration, bucket_name).ctx.ec);
+
+            {
+                couchbase::core::operations::management::query_index_create_response resp;
+                bool operation_completed = test::utils::wait_until([&integration, &bucket_name, &resp]() {
+                    couchbase::core::operations::management::query_index_create_request req{};
+                    req.bucket_name = bucket_name;
+                    req.is_primary = true;
+                    resp = test::utils::execute(integration.cluster, req);
+                    return resp.ctx.ec != couchbase::errc::common::bucket_not_found;
+                });
+                REQUIRE(operation_completed);
+                REQUIRE_FALSE(resp.ctx.ec);
+            }
+
+            {
+                couchbase::core::operations::management::query_index_get_all_request req{};
                 req.bucket_name = bucket_name;
-                req.is_primary = true;
-                resp = test::utils::execute(integration.cluster, req);
-                return resp.ctx.ec != couchbase::error::common_errc::bucket_not_found;
-            });
-            REQUIRE(operation_completed);
-            REQUIRE_FALSE(resp.ctx.ec);
-        }
+                auto resp = test::utils::execute(integration.cluster, req);
+                REQUIRE_FALSE(resp.ctx.ec);
+                REQUIRE(resp.indexes.size() == 1);
+                REQUIRE(resp.indexes[0].name == "#primary");
+                REQUIRE(resp.indexes[0].is_primary);
+            }
 
-        {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
-            auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE_FALSE(resp.ctx.ec);
-            REQUIRE(resp.indexes.size() == 1);
-            REQUIRE(resp.indexes[0].name == "#primary");
-            REQUIRE(resp.indexes[0].is_primary);
+            {
+                couchbase::core::operations::management::bucket_drop_request req{ bucket_name };
+                test::utils::execute(integration.cluster, req);
+            }
         }
     }
 
     SECTION("non primary index")
     {
         {
-            couchbase::operations::management::query_index_create_response resp;
-            bool operation_completed = test::utils::wait_until([&integration, &bucket_name, &index_name, &resp]() {
-                couchbase::operations::management::query_index_create_request req{};
-                req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &resp]() {
+                couchbase::core::operations::management::query_index_create_request req{};
+                req.bucket_name = integration.ctx.bucket;
                 req.index_name = index_name;
-                req.fields = { "field" };
+                req.fields = { "field", "field2 DESC", "`two words` DESC" };
                 resp = test::utils::execute(integration.cluster, req);
-                return resp.ctx.ec != couchbase::error::common_errc::bucket_not_found;
+                return resp.ctx.ec != couchbase::errc::common::bucket_not_found;
             });
             REQUIRE(operation_completed);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::query_index_create_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_create_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             req.fields = { "field" };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_exists);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_exists);
         }
 
         {
-            couchbase::operations::management::query_index_create_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_create_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             req.fields = { "field" };
             req.ignore_if_exists = true;
@@ -1022,93 +1055,100 @@ TEST_CASE("integration: query index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
-            REQUIRE(resp.indexes.size() == 1);
-            REQUIRE(resp.indexes[0].name == index_name);
-            REQUIRE_FALSE(resp.indexes[0].is_primary);
-            REQUIRE(resp.indexes[0].index_key.size() == 1);
-            REQUIRE(resp.indexes[0].index_key[0] == "`field`");
-            REQUIRE(resp.indexes[0].bucket_name == bucket_name);
-            REQUIRE(resp.indexes[0].state == "online");
+            auto index = std::find_if(
+              resp.indexes.begin(), resp.indexes.end(), [&index_name](const auto& exp_index) { return exp_index.name == index_name; });
+            REQUIRE(index != resp.indexes.end());
+            REQUIRE(index->name == index_name);
+            REQUIRE_FALSE(index->is_primary);
+            REQUIRE(index->index_key.size() == 3);
+            REQUIRE(index->index_key[0] == "`field`");
+            REQUIRE(index->index_key[1] == "`field2` DESC");
+            REQUIRE(index->index_key[2] == "`two words` DESC");
+            REQUIRE(index->bucket_name == integration.ctx.bucket);
+            REQUIRE(index->state == "online");
         }
 
         {
-            couchbase::operations::management::query_index_drop_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_drop_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::query_index_drop_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_drop_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_not_found);
         }
     }
 
     SECTION("deferred index")
     {
         {
-            couchbase::operations::management::query_index_create_response resp;
-            bool operation_completed = test::utils::wait_until([&integration, &bucket_name, &index_name, &resp]() {
-                couchbase::operations::management::query_index_create_request req{};
-                req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &resp]() {
+                couchbase::core::operations::management::query_index_create_request req{};
+                req.bucket_name = integration.ctx.bucket;
                 req.index_name = index_name;
                 req.fields = { "field" };
                 req.deferred = true;
                 resp = test::utils::execute(integration.cluster, req);
-                return resp.ctx.ec != couchbase::error::common_errc::bucket_not_found;
+                return resp.ctx.ec != couchbase::errc::common::bucket_not_found;
             });
             REQUIRE(operation_completed);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
-            REQUIRE(resp.indexes.size() == 1);
-            REQUIRE(resp.indexes[0].name == index_name);
-            REQUIRE(resp.indexes[0].state == "deferred");
+            auto index = std::find_if(
+              resp.indexes.begin(), resp.indexes.end(), [&index_name](const auto& exp_index) { return exp_index.name == index_name; });
+            REQUIRE(index != resp.indexes.end());
+            REQUIRE(index->name == index_name);
+            REQUIRE(index->state == "deferred");
         }
 
         {
-            couchbase::operations::management::query_index_build_deferred_request req{};
-            req.bucket_name = bucket_name;
-            auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE_FALSE(resp.ctx.ec);
+            auto manager = couchbase::cluster(integration.cluster).query_indexes();
+            auto ctx = manager.build_deferred_indexes(integration.ctx.bucket, {}).get();
+            REQUIRE_FALSE(ctx.ec());
         }
 
-        test::utils::wait_until([&integration, bucket_name]() {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+        test::utils::wait_until([&integration, &index_name]() {
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
             auto resp = test::utils::execute(integration.cluster, req);
             if (resp.indexes.empty()) {
                 return false;
             }
-            return resp.indexes[0].state == "online";
+            auto index = std::find_if(
+              resp.indexes.begin(), resp.indexes.end(), [&index_name](const auto& exp_index) { return exp_index.name == index_name; });
+            return index->state == "online";
         });
     }
 
     SECTION("create missing bucket")
     {
-        couchbase::operations::management::query_index_create_request req{};
+        couchbase::core::operations::management::query_index_create_request req{};
         req.bucket_name = "missing_bucket";
         req.is_primary = true;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::bucket_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::bucket_not_found);
     }
 
     SECTION("get missing bucket")
     {
-        couchbase::operations::management::query_index_get_all_request req{};
+        couchbase::core::operations::management::query_index_get_all_request req{};
         req.bucket_name = "missing_bucket";
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -1117,17 +1157,11 @@ TEST_CASE("integration: query index management", "[integration]")
 
     SECTION("drop missing bucket")
     {
-        couchbase::operations::management::query_index_drop_request req{};
+        couchbase::core::operations::management::query_index_drop_request req{};
         req.bucket_name = "missing_bucket";
         req.is_primary = true;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::bucket_not_found);
-    }
-
-    // drop any buckets that haven't already been dropped
-    {
-        couchbase::operations::management::bucket_drop_request req{ bucket_name };
-        test::utils::execute(integration.cluster, req);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::bucket_not_found);
     }
 }
 
@@ -1138,58 +1172,54 @@ TEST_CASE("integration: collections query index management", "[integration]")
     if (!integration.cluster_version().supports_query_index_management()) {
         return;
     }
+
     if (!integration.cluster_version().supports_collections()) {
         return;
     }
 
-    auto bucket_name = test::utils::uniq_id("collections_bucket");
     auto index_name = test::utils::uniq_id("collections_index");
     auto scope_name = test::utils::uniq_id("indexscope");
     auto collection_name = test::utils::uniq_id("indexcollection");
 
-    {
-        couchbase::operations::management::bucket_create_request req;
-        req.bucket.name = bucket_name;
-        req.bucket.bucket_type = couchbase::management::cluster::bucket_type::couchbase;
-        req.bucket.num_replicas = 0;
-        auto resp = test::utils::execute(integration.cluster, req);
-    }
-
-    REQUIRE(!wait_for_bucket_created(integration, bucket_name).ctx.ec);
+    test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     // create the scope and collection that we'll do index management on.
     {
-        couchbase::operations::management::scope_create_request req{ bucket_name, scope_name };
+        couchbase::core::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
+        auto created = test::utils::wait_until_collection_manifest_propagated(integration.cluster, integration.ctx.bucket, resp.uid);
+        REQUIRE(created);
     }
 
     {
-        couchbase::operations::management::collection_create_request req{ bucket_name, scope_name, collection_name };
+        couchbase::core::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
+        auto created = test::utils::wait_until_collection_manifest_propagated(integration.cluster, integration.ctx.bucket, resp.uid);
+        REQUIRE(created);
     }
 
     SECTION("primary index")
     {
         {
-            couchbase::operations::management::query_index_create_response resp;
-            bool operation_completed = test::utils::wait_until([&integration, &bucket_name, &scope_name, &collection_name, &resp]() {
-                couchbase::operations::management::query_index_create_request req{};
-                req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &scope_name, &collection_name, &resp]() {
+                couchbase::core::operations::management::query_index_create_request req{};
+                req.bucket_name = integration.ctx.bucket;
                 req.scope_name = scope_name;
                 req.collection_name = collection_name;
                 req.is_primary = true;
                 resp = test::utils::execute(integration.cluster, req);
-                return resp.ctx.ec != couchbase::error::common_errc::bucket_not_found;
+                return resp.ctx.ec != couchbase::errc::common::bucket_not_found;
             });
             REQUIRE(operation_completed);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1200,39 +1230,80 @@ TEST_CASE("integration: collections query index management", "[integration]")
         }
     }
 
+    SECTION("named primary index")
+    {
+        {
+            couchbase::core::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &scope_name, &collection_name, &resp]() {
+                couchbase::core::operations::management::query_index_create_request req{};
+                req.bucket_name = integration.ctx.bucket;
+                req.scope_name = scope_name;
+                req.collection_name = collection_name;
+                req.index_name = index_name;
+                req.is_primary = true;
+                resp = test::utils::execute(integration.cluster, req);
+                return resp.ctx.ec != couchbase::errc::common::bucket_not_found;
+            });
+            REQUIRE(operation_completed);
+            REQUIRE_FALSE(resp.ctx.ec);
+        }
+
+        {
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
+            req.scope_name = scope_name;
+            req.collection_name = collection_name;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+            REQUIRE(resp.indexes.size() == 1);
+            REQUIRE(resp.indexes[0].name == index_name);
+            REQUIRE(resp.indexes[0].is_primary);
+        }
+
+        {
+            couchbase::core::operations::management::query_index_drop_request req{};
+            req.bucket_name = integration.ctx.bucket;
+            req.index_name = index_name;
+            req.scope_name = scope_name;
+            req.is_primary = true;
+            req.collection_name = collection_name;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+        }
+    }
+
     SECTION("non primary index")
     {
         {
-            couchbase::operations::management::query_index_create_response resp;
-            bool operation_completed =
-              test::utils::wait_until([&integration, &bucket_name, &index_name, &scope_name, &collection_name, &resp]() {
-                  couchbase::operations::management::query_index_create_request req{};
-                  req.bucket_name = bucket_name;
-                  req.index_name = index_name;
-                  req.scope_name = scope_name;
-                  req.collection_name = collection_name;
-                  req.fields = { "field" };
-                  resp = test::utils::execute(integration.cluster, req);
-                  return resp.ctx.ec != couchbase::error::common_errc::bucket_not_found;
-              });
+            couchbase::core::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &scope_name, &collection_name, &resp]() {
+                couchbase::core::operations::management::query_index_create_request req{};
+                req.bucket_name = integration.ctx.bucket;
+                req.index_name = index_name;
+                req.scope_name = scope_name;
+                req.collection_name = collection_name;
+                req.fields = { "field" };
+                resp = test::utils::execute(integration.cluster, req);
+                return resp.ctx.ec != couchbase::errc::common::bucket_not_found;
+            });
             REQUIRE(operation_completed);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::query_index_create_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_create_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
             req.fields = { "field" };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_exists);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_exists);
         }
 
         {
-            couchbase::operations::management::query_index_create_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_create_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
@@ -1243,8 +1314,8 @@ TEST_CASE("integration: collections query index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1256,13 +1327,13 @@ TEST_CASE("integration: collections query index management", "[integration]")
             REQUIRE(resp.indexes[0].index_key[0] == "`field`");
             REQUIRE(resp.indexes[0].collection_name == collection_name);
             REQUIRE(resp.indexes[0].scope_name == scope_name);
-            REQUIRE(resp.indexes[0].bucket_name == bucket_name);
+            REQUIRE(resp.indexes[0].bucket_name == integration.ctx.bucket);
             REQUIRE(resp.indexes[0].state == "online");
         }
 
         {
-            couchbase::operations::management::query_index_drop_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_drop_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
@@ -1271,39 +1342,38 @@ TEST_CASE("integration: collections query index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::query_index_drop_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_drop_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.index_name = index_name;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_not_found);
         }
     }
 
     SECTION("deferred index")
     {
         {
-            couchbase::operations::management::query_index_create_response resp;
-            bool operation_completed =
-              test::utils::wait_until([&integration, &bucket_name, &index_name, &scope_name, &collection_name, &resp]() {
-                  couchbase::operations::management::query_index_create_request req{};
-                  req.bucket_name = bucket_name;
-                  req.index_name = index_name;
-                  req.scope_name = scope_name;
-                  req.collection_name = collection_name;
-                  req.fields = { "field" };
-                  req.deferred = true;
-                  resp = test::utils::execute(integration.cluster, req);
-                  return resp.ctx.ec != couchbase::error::common_errc::bucket_not_found;
-              });
+            couchbase::core::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &scope_name, &collection_name, &resp]() {
+                couchbase::core::operations::management::query_index_create_request req{};
+                req.bucket_name = integration.ctx.bucket;
+                req.index_name = index_name;
+                req.scope_name = scope_name;
+                req.collection_name = collection_name;
+                req.fields = { "field" };
+                req.deferred = true;
+                resp = test::utils::execute(integration.cluster, req);
+                return resp.ctx.ec != couchbase::errc::common::bucket_not_found;
+            });
             REQUIRE(operation_completed);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1314,17 +1384,14 @@ TEST_CASE("integration: collections query index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::query_index_build_deferred_request req{};
-            req.bucket_name = bucket_name;
-            req.scope_name = scope_name;
-            req.collection_name = collection_name;
-            auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE_FALSE(resp.ctx.ec);
+            auto manager = couchbase::cluster(integration.cluster).query_indexes();
+            auto ctx = manager.build_deferred_indexes(integration.ctx.bucket, {}).get();
+            REQUIRE_FALSE(ctx.ec());
         }
 
-        test::utils::wait_until([&integration, bucket_name, scope_name, collection_name]() {
-            couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+        test::utils::wait_until([&integration, scope_name, collection_name]() {
+            couchbase::core::operations::management::query_index_get_all_request req{};
+            req.bucket_name = integration.ctx.bucket;
             req.scope_name = scope_name;
             req.collection_name = collection_name;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1337,30 +1404,30 @@ TEST_CASE("integration: collections query index management", "[integration]")
 
     SECTION("create missing collection")
     {
-        couchbase::operations::management::query_index_create_request req{};
-        req.bucket_name = bucket_name;
+        couchbase::core::operations::management::query_index_create_request req{};
+        req.bucket_name = integration.ctx.bucket;
         req.scope_name = scope_name;
         req.collection_name = "missing_collection";
         req.is_primary = true;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::collection_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::collection_not_found);
     }
 
     SECTION("create missing scope")
     {
-        couchbase::operations::management::query_index_create_request req{};
-        req.bucket_name = bucket_name;
+        couchbase::core::operations::management::query_index_create_request req{};
+        req.bucket_name = integration.ctx.bucket;
         req.scope_name = "missing_scope";
         req.collection_name = collection_name;
         req.is_primary = true;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::scope_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::scope_not_found);
     }
 
     SECTION("get missing collection")
     {
-        couchbase::operations::management::query_index_get_all_request req{};
-        req.bucket_name = bucket_name;
+        couchbase::core::operations::management::query_index_get_all_request req{};
+        req.bucket_name = integration.ctx.bucket;
         req.scope_name = scope_name;
         req.collection_name = "missing_collection";
         auto resp = test::utils::execute(integration.cluster, req);
@@ -1370,30 +1437,24 @@ TEST_CASE("integration: collections query index management", "[integration]")
 
     SECTION("drop missing collection")
     {
-        couchbase::operations::management::query_index_drop_request req{};
-        req.bucket_name = bucket_name;
+        couchbase::core::operations::management::query_index_drop_request req{};
+        req.bucket_name = integration.ctx.bucket;
         req.scope_name = scope_name;
         req.collection_name = "missing_collection";
         req.is_primary = true;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::collection_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::collection_not_found);
     }
 
     SECTION("drop missing scope")
     {
-        couchbase::operations::management::query_index_drop_request req{};
-        req.bucket_name = bucket_name;
+        couchbase::core::operations::management::query_index_drop_request req{};
+        req.bucket_name = integration.ctx.bucket;
         req.scope_name = "missing_scope";
         req.collection_name = collection_name;
         req.is_primary = true;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::scope_not_found);
-    }
-
-    // drop any buckets that haven't already been dropped
-    {
-        couchbase::operations::management::bucket_drop_request req{ bucket_name };
-        test::utils::execute(integration.cluster, req);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::scope_not_found);
     }
 }
 
@@ -1406,7 +1467,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
     }
 
     // MB-47718
-    if (integration.storage_backend() == couchbase::management::cluster::bucket_storage_backend::magma) {
+    if (integration.storage_backend() == couchbase::core::management::cluster::bucket_storage_backend::magma) {
         return;
     }
 
@@ -1417,21 +1478,21 @@ TEST_CASE("integration: analytics index management", "[integration]")
         auto index_name = test::utils::uniq_id("index");
 
         {
-            couchbase::operations::management::analytics_dataverse_create_request req{};
+            couchbase::core::operations::management::analytics_dataverse_create_request req{};
             req.dataverse_name = dataverse_name;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::analytics_dataverse_create_request req{};
+            couchbase::core::operations::management::analytics_dataverse_create_request req{};
             req.dataverse_name = dataverse_name;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::dataverse_exists);
+            REQUIRE(resp.ctx.ec == couchbase::errc::analytics::dataverse_exists);
         }
 
         {
-            couchbase::operations::management::analytics_dataverse_create_request req{};
+            couchbase::core::operations::management::analytics_dataverse_create_request req{};
             req.dataverse_name = dataverse_name;
             req.ignore_if_exists = true;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1439,7 +1500,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_dataset_create_request req{};
+            couchbase::core::operations::management::analytics_dataset_create_request req{};
             req.dataset_name = dataset_name;
             req.bucket_name = integration.ctx.bucket;
             req.dataverse_name = dataverse_name;
@@ -1448,16 +1509,16 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_dataset_create_request req{};
+            couchbase::core::operations::management::analytics_dataset_create_request req{};
             req.dataset_name = dataset_name;
             req.bucket_name = integration.ctx.bucket;
             req.dataverse_name = dataverse_name;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::dataset_exists);
+            REQUIRE(resp.ctx.ec == couchbase::errc::analytics::dataset_exists);
         }
 
         {
-            couchbase::operations::management::analytics_dataset_create_request req{};
+            couchbase::core::operations::management::analytics_dataset_create_request req{};
             req.dataset_name = dataset_name;
             req.bucket_name = integration.ctx.bucket;
             req.dataverse_name = dataverse_name;
@@ -1467,7 +1528,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_index_create_request req{};
+            couchbase::core::operations::management::analytics_index_create_request req{};
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
             req.index_name = index_name;
@@ -1477,17 +1538,17 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_index_create_request req{};
+            couchbase::core::operations::management::analytics_index_create_request req{};
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
             req.index_name = index_name;
             req.fields["testkey"] = "string";
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_exists);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_exists);
         }
 
         {
-            couchbase::operations::management::analytics_index_create_request req{};
+            couchbase::core::operations::management::analytics_index_create_request req{};
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
             req.index_name = index_name;
@@ -1498,17 +1559,17 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_link_connect_request req{};
+            couchbase::core::operations::management::analytics_link_connect_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::analytics_dataset_get_all_request req{};
+            couchbase::core::operations::management::analytics_dataset_get_all_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE_FALSE(resp.datasets.empty());
-            auto dataset = std::find_if(resp.datasets.begin(), resp.datasets.end(), [dataset_name](const auto& exp_dataset) {
+            auto dataset = std::find_if(resp.datasets.begin(), resp.datasets.end(), [&dataset_name](const auto& exp_dataset) {
                 return exp_dataset.name == dataset_name;
             });
             REQUIRE(dataset != resp.datasets.end());
@@ -1518,12 +1579,12 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_index_get_all_request req{};
+            couchbase::core::operations::management::analytics_index_get_all_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE_FALSE(resp.indexes.empty());
             auto index = std::find_if(
-              resp.indexes.begin(), resp.indexes.end(), [index_name](const auto& exp_index) { return exp_index.name == index_name; });
+              resp.indexes.begin(), resp.indexes.end(), [&index_name](const auto& exp_index) { return exp_index.name == index_name; });
             REQUIRE(index != resp.indexes.end());
             REQUIRE(index->dataverse_name == dataverse_name);
             REQUIRE(index->dataset_name == dataset_name);
@@ -1531,20 +1592,20 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         if (integration.cluster_version().supports_analytics_pending_mutations()) {
-            couchbase::operations::management::analytics_get_pending_mutations_request req{};
+            couchbase::core::operations::management::analytics_get_pending_mutations_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE(resp.stats[index_name] == 0);
         }
 
         {
-            couchbase::operations::management::analytics_link_disconnect_request req{};
+            couchbase::core::operations::management::analytics_link_disconnect_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::analytics_index_drop_request req{};
+            couchbase::core::operations::management::analytics_index_drop_request req{};
             req.index_name = index_name;
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
@@ -1553,16 +1614,16 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_index_drop_request req{};
+            couchbase::core::operations::management::analytics_index_drop_request req{};
             req.index_name = index_name;
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_not_found);
         }
 
         {
-            couchbase::operations::management::analytics_index_drop_request req{};
+            couchbase::core::operations::management::analytics_index_drop_request req{};
             req.index_name = index_name;
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
@@ -1572,7 +1633,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_dataset_drop_request req{};
+            couchbase::core::operations::management::analytics_dataset_drop_request req{};
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1580,15 +1641,15 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_dataset_drop_request req{};
+            couchbase::core::operations::management::analytics_dataset_drop_request req{};
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::dataset_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::analytics::dataset_not_found);
         }
 
         {
-            couchbase::operations::management::analytics_dataset_drop_request req{};
+            couchbase::core::operations::management::analytics_dataset_drop_request req{};
             req.dataverse_name = dataverse_name;
             req.dataset_name = dataset_name;
             req.ignore_if_does_not_exist = true;
@@ -1597,21 +1658,21 @@ TEST_CASE("integration: analytics index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::analytics_dataverse_drop_request req{};
+            couchbase::core::operations::management::analytics_dataverse_drop_request req{};
             req.dataverse_name = dataverse_name;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::analytics_dataverse_drop_request req{};
+            couchbase::core::operations::management::analytics_dataverse_drop_request req{};
             req.dataverse_name = dataverse_name;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::dataverse_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::analytics::dataverse_not_found);
         }
 
         {
-            couchbase::operations::management::analytics_dataverse_drop_request req{};
+            couchbase::core::operations::management::analytics_dataverse_drop_request req{};
             req.dataverse_name = dataverse_name;
             req.ignore_if_does_not_exist = true;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1627,14 +1688,14 @@ TEST_CASE("integration: analytics index management", "[integration]")
             auto index_name = test::utils::uniq_id("index");
 
             {
-                couchbase::operations::management::analytics_dataverse_create_request req{};
+                couchbase::core::operations::management::analytics_dataverse_create_request req{};
                 req.dataverse_name = dataverse_name;
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
             }
 
             {
-                couchbase::operations::management::analytics_dataset_create_request req{};
+                couchbase::core::operations::management::analytics_dataset_create_request req{};
                 req.bucket_name = integration.ctx.bucket;
                 req.dataverse_name = dataverse_name;
                 req.dataset_name = dataset_name;
@@ -1643,7 +1704,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
             }
 
             {
-                couchbase::operations::management::analytics_index_create_request req{};
+                couchbase::core::operations::management::analytics_index_create_request req{};
                 req.dataverse_name = dataverse_name;
                 req.dataset_name = dataset_name;
                 req.index_name = index_name;
@@ -1653,21 +1714,21 @@ TEST_CASE("integration: analytics index management", "[integration]")
             }
 
             {
-                couchbase::operations::management::analytics_link_connect_request req{};
+                couchbase::core::operations::management::analytics_link_connect_request req{};
                 req.dataverse_name = dataverse_name;
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
             }
 
             {
-                couchbase::operations::management::analytics_link_disconnect_request req{};
+                couchbase::core::operations::management::analytics_link_disconnect_request req{};
                 req.dataverse_name = dataverse_name;
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
             }
 
             {
-                couchbase::operations::management::analytics_index_drop_request req{};
+                couchbase::core::operations::management::analytics_index_drop_request req{};
                 req.dataverse_name = dataverse_name;
                 req.dataset_name = dataset_name;
                 req.index_name = index_name;
@@ -1676,7 +1737,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
             }
 
             {
-                couchbase::operations::management::analytics_dataset_drop_request req{};
+                couchbase::core::operations::management::analytics_dataset_drop_request req{};
                 req.dataverse_name = dataverse_name;
                 req.dataset_name = dataset_name;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -1684,7 +1745,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
             }
 
             {
-                couchbase::operations::management::analytics_dataverse_drop_request req{};
+                couchbase::core::operations::management::analytics_dataverse_drop_request req{};
                 req.dataverse_name = dataverse_name;
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
@@ -1694,45 +1755,47 @@ TEST_CASE("integration: analytics index management", "[integration]")
 }
 
 void
-run_s3_link_test(test::utils::integration_test_guard& integration, std::string dataverse_name, std::string link_name)
+run_s3_link_test(test::utils::integration_test_guard& integration, const std::string& dataverse_name, const std::string& link_name)
 {
     {
-        couchbase::operations::management::analytics_dataverse_create_request req{};
+        couchbase::core::operations::management::analytics_dataverse_create_request req{};
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::management::analytics::s3_external_link link{};
+        couchbase::core::management::analytics::s3_external_link link{};
         link.dataverse = dataverse_name;
         link.access_key_id = "access_key";
         link.secret_access_key = "secret_access_key";
         link.region = "us-east-1";
         link.service_endpoint = "service_endpoint";
         link.link_name = link_name;
-        couchbase::operations::management::analytics_link_create_request<couchbase::management::analytics::s3_external_link> req{};
+        couchbase::core::operations::management::analytics_link_create_request<couchbase::core::management::analytics::s3_external_link>
+          req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::management::analytics::s3_external_link link{};
+        couchbase::core::management::analytics::s3_external_link link{};
         link.dataverse = dataverse_name;
         link.access_key_id = "access_key";
         link.secret_access_key = "secret_access_key";
         link.region = "us-east-1";
         link.service_endpoint = "service_endpoint";
         link.link_name = link_name;
-        couchbase::operations::management::analytics_link_create_request<couchbase::management::analytics::s3_external_link> req{};
+        couchbase::core::operations::management::analytics_link_create_request<couchbase::core::management::analytics::s3_external_link>
+          req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::link_exists);
+        REQUIRE(resp.ctx.ec == couchbase::errc::analytics::link_exists);
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -1746,7 +1809,7 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.link_type = "s3";
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
@@ -1757,7 +1820,7 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.link_type = "couchbase";
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
@@ -1768,21 +1831,22 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
     }
 
     {
-        couchbase::management::analytics::s3_external_link link{};
+        couchbase::core::management::analytics::s3_external_link link{};
         link.dataverse = dataverse_name;
         link.access_key_id = "access_key";
         link.secret_access_key = "secret_access_key";
         link.region = "eu-west-1";
         link.service_endpoint = "service_endpoint";
         link.link_name = link_name;
-        couchbase::operations::management::analytics_link_replace_request<couchbase::management::analytics::s3_external_link> req{};
+        couchbase::core::operations::management::analytics_link_replace_request<couchbase::core::management::analytics::s3_external_link>
+          req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -1791,7 +1855,7 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
     }
 
     {
-        couchbase::operations::management::analytics_link_drop_request req{};
+        couchbase::core::operations::management::analytics_link_drop_request req{};
         req.dataverse_name = dataverse_name;
         req.link_name = link_name;
         auto resp = test::utils::execute(integration.cluster, req);
@@ -1799,52 +1863,56 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
     }
 
     {
-        couchbase::operations::management::analytics_link_drop_request req{};
+        couchbase::core::operations::management::analytics_link_drop_request req{};
         req.dataverse_name = dataverse_name;
         req.link_name = link_name;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::link_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::analytics::link_not_found);
     }
 }
 
 void
-run_azure_link_test(test::utils::integration_test_guard& integration, std::string dataverse_name, std::string link_name)
+run_azure_link_test(test::utils::integration_test_guard& integration, const std::string& dataverse_name, const std::string& link_name)
 {
     {
-        couchbase::operations::management::analytics_dataverse_create_request req{};
+        couchbase::core::operations::management::analytics_dataverse_create_request req{};
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::management::analytics::azure_blob_external_link link{};
+        couchbase::core::management::analytics::azure_blob_external_link link{};
         link.dataverse = dataverse_name;
         link.connection_string = "connection_string";
         link.blob_endpoint = "blob_endpoint";
         link.endpoint_suffix = "endpoint_suffix";
         link.link_name = link_name;
-        couchbase::operations::management::analytics_link_create_request<couchbase::management::analytics::azure_blob_external_link> req{};
+        couchbase::core::operations::management::analytics_link_create_request<
+          couchbase::core::management::analytics::azure_blob_external_link>
+          req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::management::analytics::azure_blob_external_link link{};
+        couchbase::core::management::analytics::azure_blob_external_link link{};
         link.dataverse = dataverse_name;
         link.connection_string = "connection_string";
         link.blob_endpoint = "blob_endpoint";
         link.endpoint_suffix = "endpoint_suffix";
         link.link_name = link_name;
-        couchbase::operations::management::analytics_link_create_request<couchbase::management::analytics::azure_blob_external_link> req{};
+        couchbase::core::operations::management::analytics_link_create_request<
+          couchbase::core::management::analytics::azure_blob_external_link>
+          req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::link_exists);
+        REQUIRE(resp.ctx.ec == couchbase::errc::analytics::link_exists);
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -1860,7 +1928,7 @@ run_azure_link_test(test::utils::integration_test_guard& integration, std::strin
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.link_type = "azureblob";
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
@@ -1871,7 +1939,7 @@ run_azure_link_test(test::utils::integration_test_guard& integration, std::strin
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.link_type = "couchbase";
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
@@ -1882,20 +1950,22 @@ run_azure_link_test(test::utils::integration_test_guard& integration, std::strin
     }
 
     {
-        couchbase::management::analytics::azure_blob_external_link link{};
+        couchbase::core::management::analytics::azure_blob_external_link link{};
         link.dataverse = dataverse_name;
         link.connection_string = "connection_string";
         link.blob_endpoint = "new_blob_endpoint";
         link.endpoint_suffix = "endpoint_suffix";
         link.link_name = link_name;
-        couchbase::operations::management::analytics_link_replace_request<couchbase::management::analytics::azure_blob_external_link> req{};
+        couchbase::core::operations::management::analytics_link_replace_request<
+          couchbase::core::management::analytics::azure_blob_external_link>
+          req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
     {
-        couchbase::operations::management::analytics_link_get_all_request req{};
+        couchbase::core::operations::management::analytics_link_get_all_request req{};
         req.dataverse_name = dataverse_name;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -1904,7 +1974,7 @@ run_azure_link_test(test::utils::integration_test_guard& integration, std::strin
     }
 
     {
-        couchbase::operations::management::analytics_link_drop_request req{};
+        couchbase::core::operations::management::analytics_link_drop_request req{};
         req.dataverse_name = dataverse_name;
         req.link_name = link_name;
         auto resp = test::utils::execute(integration.cluster, req);
@@ -1912,11 +1982,11 @@ run_azure_link_test(test::utils::integration_test_guard& integration, std::strin
     }
 
     {
-        couchbase::operations::management::analytics_link_drop_request req{};
+        couchbase::core::operations::management::analytics_link_drop_request req{};
         req.dataverse_name = dataverse_name;
         req.link_name = link_name;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::link_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::analytics::link_not_found);
     }
 }
 
@@ -1929,7 +1999,7 @@ TEST_CASE("integration: analytics external link management", "[integration]")
     }
 
     // MB-47718
-    if (integration.storage_backend() == couchbase::management::cluster::bucket_storage_backend::magma) {
+    if (integration.storage_backend() == couchbase::core::management::cluster::bucket_storage_backend::magma) {
         return;
     }
 
@@ -1944,7 +2014,7 @@ TEST_CASE("integration: analytics external link management", "[integration]")
 
     SECTION("missing dataverse")
     {
-        couchbase::management::analytics::s3_external_link link{};
+        couchbase::core::management::analytics::s3_external_link link{};
         link.dataverse = "missing_dataverse";
         link.access_key_id = "access_key";
         link.secret_access_key = "secret_access_key";
@@ -1953,19 +2023,21 @@ TEST_CASE("integration: analytics external link management", "[integration]")
         link.link_name = link_name;
 
         {
-            couchbase::operations::management::analytics_link_create_request<couchbase::management::analytics::s3_external_link> req{};
+            couchbase::core::operations::management::analytics_link_create_request<couchbase::core::management::analytics::s3_external_link>
+              req{};
             req.link = link;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::analytics_errc::dataverse_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::analytics::dataverse_not_found);
         }
     }
 
     SECTION("missing argument")
     {
-        couchbase::operations::management::analytics_link_create_request<couchbase::management::analytics::s3_external_link> req{};
-        req.link = couchbase::management::analytics::s3_external_link{};
+        couchbase::core::operations::management::analytics_link_create_request<couchbase::core::management::analytics::s3_external_link>
+          req{};
+        req.link = couchbase::core::management::analytics::s3_external_link{};
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::invalid_argument);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::invalid_argument);
     }
 
     SECTION("link crud")
@@ -1991,7 +2063,7 @@ TEST_CASE("integration: analytics external link management", "[integration]")
             auto scope_name = test::utils::uniq_id("scope");
 
             {
-                couchbase::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
+                couchbase::core::operations::management::scope_create_request req{ integration.ctx.bucket, scope_name };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
                 auto created =
@@ -2026,63 +2098,68 @@ TEST_CASE("integration: search index management", "[integration]")
 
     SECTION("search indexes crud")
     {
-        auto index1_name = test::utils::uniq_id("index");
-        auto index2_name = test::utils::uniq_id("index");
+        auto index1_name = test::utils::uniq_id("index1");
+        auto index2_name = test::utils::uniq_id("index2");
         auto alias_name = test::utils::uniq_id("alias");
 
         {
-            couchbase::management::search::index index;
+            couchbase::core::management::search::index index;
             index.name = index1_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
             index.source_name = integration.ctx.bucket;
-            couchbase::operations::management::search_index_upsert_request req{};
+            couchbase::core::operations::management::search_index_upsert_request req{};
             req.index = index;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::management::search::index index;
+            couchbase::core::management::search::index index;
             index.name = index1_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
             index.source_name = integration.ctx.bucket;
-            couchbase::operations::management::search_index_upsert_request req{};
+            couchbase::core::operations::management::search_index_upsert_request req{};
             req.index = index;
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_exists);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_exists);
         }
 
         {
-            couchbase::management::search::index index;
+            couchbase::core::management::search::index index;
             index.name = index2_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
             index.source_name = integration.ctx.bucket;
             index.plan_params_json = R"({ "indexPartition": 3 })";
             index.params_json = R"({ "store": { "indexType": "upside_down", "kvStoreName": "moss" }})";
-            couchbase::operations::management::search_index_upsert_request req{};
+            couchbase::core::operations::management::search_index_upsert_request req{};
             req.index = index;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
+            if (resp.name != index2_name) {
+                // FIXME: server 7.2 might automatically prepend "{scope}.{collection}." in front of the index name
+                // to workaround it, we "patch" our variable with the name returned by the server
+                index2_name = resp.name;
+            }
         }
 
         {
-            couchbase::management::search::index index;
+            couchbase::core::management::search::index index;
             index.name = alias_name;
             index.type = "fulltext-alias";
             index.source_type = "nil";
-            index.params_json = couchbase::utils::json::generate(
+            index.params_json = couchbase::core::utils::json::generate(
               tao::json::value{ { "targets", { { index1_name, tao::json::empty_object }, { index2_name, tao::json::empty_object } } } });
-            couchbase::operations::management::search_index_upsert_request req{};
+            couchbase::core::operations::management::search_index_upsert_request req{};
             req.index = index;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::search_index_get_request req{};
+            couchbase::core::operations::management::search_index_get_request req{};
             req.index_name = index1_name;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
@@ -2091,56 +2168,81 @@ TEST_CASE("integration: search index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::search_index_get_request req{};
+            couchbase::core::operations::management::search_index_get_request req{};
+            req.index_name = index2_name;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+            REQUIRE(resp.index.name == index2_name);
+            REQUIRE(resp.index.type == "fulltext-index");
+        }
+
+        {
+            couchbase::core::operations::management::search_index_get_request req{};
+            req.index_name = alias_name;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+            REQUIRE(resp.index.name == alias_name);
+            REQUIRE(resp.index.type == "fulltext-alias");
+        }
+
+        {
+            couchbase::core::operations::management::search_index_get_request req{};
             req.index_name = "missing_index";
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::common::index_not_found);
         }
 
         {
-            couchbase::operations::management::search_index_get_all_request req{};
+            couchbase::core::operations::management::search_index_get_all_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE_FALSE(resp.indexes.empty());
+
+            REQUIRE(1 == std::count_if(
+                           resp.indexes.begin(), resp.indexes.end(), [&index1_name](const auto& i) { return i.name == index1_name; }));
+            REQUIRE(1 == std::count_if(
+                           resp.indexes.begin(), resp.indexes.end(), [&index2_name](const auto& i) { return i.name == index2_name; }));
+            REQUIRE(1 ==
+                    std::count_if(resp.indexes.begin(), resp.indexes.end(), [&alias_name](const auto& i) { return i.name == alias_name; }));
         }
 
         {
-            couchbase::operations::management::search_index_drop_request req{};
+            couchbase::core::operations::management::search_index_drop_request req{};
             req.index_name = index1_name;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::search_index_drop_request req{};
+            couchbase::core::operations::management::search_index_drop_request req{};
             req.index_name = index2_name;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::search_index_drop_request req{};
+            couchbase::core::operations::management::search_index_drop_request req{};
             req.index_name = alias_name;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        couchbase::operations::management::search_index_drop_request req{};
+        couchbase::core::operations::management::search_index_drop_request req{};
         req.index_name = "missing_index";
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::index_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::index_not_found);
     }
 
     SECTION("upsert index no name")
     {
-        couchbase::management::search::index index;
+        couchbase::core::management::search::index index;
         index.type = "fulltext-index";
         index.source_type = "couchbase";
         index.source_name = integration.ctx.bucket;
-        couchbase::operations::management::search_index_upsert_request req{};
+        couchbase::core::operations::management::search_index_upsert_request req{};
         req.index = index;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::invalid_argument);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::invalid_argument);
     }
 
     SECTION("control")
@@ -2148,12 +2250,12 @@ TEST_CASE("integration: search index management", "[integration]")
         auto index_name = test::utils::uniq_id("index");
 
         {
-            couchbase::management::search::index index;
+            couchbase::core::management::search::index index;
             index.name = index_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
             index.source_name = integration.ctx.bucket;
-            couchbase::operations::management::search_index_upsert_request req{};
+            couchbase::core::operations::management::search_index_upsert_request req{};
             req.index = index;
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
@@ -2162,7 +2264,7 @@ TEST_CASE("integration: search index management", "[integration]")
         SECTION("ingest control")
         {
             {
-                couchbase::operations::management::search_index_control_ingest_request req{};
+                couchbase::core::operations::management::search_index_control_ingest_request req{};
                 req.index_name = index_name;
                 req.pause = true;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -2170,7 +2272,7 @@ TEST_CASE("integration: search index management", "[integration]")
             }
 
             {
-                couchbase::operations::management::search_index_control_ingest_request req{};
+                couchbase::core::operations::management::search_index_control_ingest_request req{};
                 req.index_name = index_name;
                 req.pause = false;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -2181,7 +2283,7 @@ TEST_CASE("integration: search index management", "[integration]")
         SECTION("query control")
         {
             {
-                couchbase::operations::management::search_index_control_query_request req{};
+                couchbase::core::operations::management::search_index_control_query_request req{};
                 req.index_name = index_name;
                 req.allow = true;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -2189,7 +2291,7 @@ TEST_CASE("integration: search index management", "[integration]")
             }
 
             {
-                couchbase::operations::management::search_index_control_query_request req{};
+                couchbase::core::operations::management::search_index_control_query_request req{};
                 req.index_name = index_name;
                 req.allow = false;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -2200,7 +2302,7 @@ TEST_CASE("integration: search index management", "[integration]")
         SECTION("partition control")
         {
             {
-                couchbase::operations::management::search_index_control_plan_freeze_request req{};
+                couchbase::core::operations::management::search_index_control_plan_freeze_request req{};
                 req.index_name = index_name;
                 req.freeze = true;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -2208,7 +2310,7 @@ TEST_CASE("integration: search index management", "[integration]")
             }
 
             {
-                couchbase::operations::management::search_index_control_plan_freeze_request req{};
+                couchbase::core::operations::management::search_index_control_plan_freeze_request req{};
                 req.index_name = index_name;
                 req.freeze = false;
                 auto resp = test::utils::execute(integration.cluster, req);
@@ -2216,7 +2318,7 @@ TEST_CASE("integration: search index management", "[integration]")
             }
         }
 
-        couchbase::operations::management::search_index_drop_request req{};
+        couchbase::core::operations::management::search_index_drop_request req{};
         req.index_name = index_name;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -2228,12 +2330,12 @@ wait_for_search_pindexes_ready(test::utils::integration_test_guard& integration,
 {
     return test::utils::wait_until(
       [&integration, &index_name]() {
-          couchbase::operations::management::search_index_stats_request req{};
+          couchbase::core::operations::management::search_index_stats_request req{};
           auto resp = test::utils::execute(integration.cluster, req);
           if (resp.ctx.ec || resp.stats.empty()) {
               return false;
           }
-          auto stats = couchbase::utils::json::parse(resp.stats);
+          auto stats = couchbase::core::utils::json::parse(resp.stats);
           const auto* num_pindexes_actual = stats.find(fmt::format("{}:{}:num_pindexes_actual", integration.ctx.bucket, index_name));
           if (num_pindexes_actual == nullptr || !num_pindexes_actual->is_number()) {
               return false;
@@ -2258,12 +2360,12 @@ TEST_CASE("integration: search index management analyze document", "[integration
     auto index_name = test::utils::uniq_id("index");
 
     {
-        couchbase::management::search::index index;
+        couchbase::core::management::search::index index;
         index.name = index_name;
         index.type = "fulltext-index";
         index.source_type = "couchbase";
         index.source_name = integration.ctx.bucket;
-        couchbase::operations::management::search_index_upsert_request req{};
+        couchbase::core::operations::management::search_index_upsert_request req{};
         req.index = index;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -2271,13 +2373,13 @@ TEST_CASE("integration: search index management analyze document", "[integration
 
     REQUIRE(wait_for_search_pindexes_ready(integration, index_name));
 
-    couchbase::operations::management::search_index_analyze_document_response resp;
+    couchbase::core::operations::management::search_index_analyze_document_response resp;
     bool operation_completed = test::utils::wait_until([&integration, &index_name, &resp]() {
-        couchbase::operations::management::search_index_analyze_document_request req{};
+        couchbase::core::operations::management::search_index_analyze_document_request req{};
         req.index_name = index_name;
         req.encoded_document = R"({ "name": "hello world" })";
         resp = test::utils::execute(integration.cluster, req);
-        return resp.ctx.ec != couchbase::error::common_errc::internal_server_failure;
+        return resp.ctx.ec != couchbase::errc::common::internal_server_failure;
     });
     REQUIRE(operation_completed);
     REQUIRE_FALSE(resp.ctx.ec);
@@ -2294,17 +2396,17 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
 
     SECTION("key_value")
     {
-        couchbase::operations::management::freeform_request req{};
-        req.type = couchbase::service_type::key_value;
+        couchbase::core::operations::management::freeform_request req{};
+        req.type = couchbase::core::service_type::key_value;
         auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::invalid_argument);
+        REQUIRE(resp.ctx.ec == couchbase::errc::common::invalid_argument);
     }
 
     if (integration.cluster_version().supports_analytics() && integration.has_analytics_service()) {
         SECTION("analytics")
         {
-            couchbase::operations::management::freeform_request req{};
-            req.type = couchbase::service_type::analytics;
+            couchbase::core::operations::management::freeform_request req{};
+            req.type = couchbase::core::service_type::analytics;
             req.method = "GET";
             req.path = "/admin/ping";
             auto resp = test::utils::execute(integration.cluster, req);
@@ -2312,15 +2414,15 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
             REQUIRE(resp.status == 200);
             REQUIRE_FALSE(resp.body.empty());
             INFO(resp.body)
-            auto result = couchbase::utils::json::parse(resp.body);
+            auto result = couchbase::core::utils::json::parse(resp.body);
             REQUIRE(result.is_object());
         }
     }
 
     SECTION("search")
     {
-        couchbase::operations::management::freeform_request req{};
-        req.type = couchbase::service_type::search;
+        couchbase::core::operations::management::freeform_request req{};
+        req.type = couchbase::core::service_type::search;
         req.method = "GET";
         req.path = "/api/ping";
         auto resp = test::utils::execute(integration.cluster, req);
@@ -2333,8 +2435,8 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
 
     SECTION("query")
     {
-        couchbase::operations::management::freeform_request req{};
-        req.type = couchbase::service_type::query;
+        couchbase::core::operations::management::freeform_request req{};
+        req.type = couchbase::core::service_type::query;
         req.method = "GET";
         req.path = "/admin/ping";
         auto resp = test::utils::execute(integration.cluster, req);
@@ -2342,40 +2444,42 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
         REQUIRE(resp.status == 200);
         REQUIRE_FALSE(resp.body.empty());
         INFO(resp.body)
-        auto result = couchbase::utils::json::parse(resp.body);
+        auto result = couchbase::core::utils::json::parse(resp.body);
         REQUIRE(result.is_object());
     }
 
-    SECTION("view")
-    {
-        auto document_name = test::utils::uniq_id("design_document");
-        auto view_name = test::utils::uniq_id("view");
+    if (integration.cluster_version().supports_views()) {
+        SECTION("view")
+        {
+            auto document_name = test::utils::uniq_id("design_document");
+            auto view_name = test::utils::uniq_id("view");
 
-        couchbase::operations::management::freeform_request req{};
-        req.type = couchbase::service_type::view;
-        req.method = "POST";
-        req.path = fmt::format("/{}/_design/{}/_view/{}", integration.ctx.bucket, document_name, view_name);
-        req.body = R"({"keys":["foo","bar"]})";
-        auto resp = test::utils::execute(integration.cluster, req);
-        REQUIRE_FALSE(resp.ctx.ec);
-        REQUIRE(resp.status == 404);
-        REQUIRE_FALSE(resp.body.empty());
-        auto result = couchbase::utils::json::parse(resp.body);
-        INFO(resp.body)
-        REQUIRE(result["error"].get_string() == "not_found");
+            couchbase::core::operations::management::freeform_request req{};
+            req.type = couchbase::core::service_type::view;
+            req.method = "POST";
+            req.path = fmt::format("/{}/_design/{}/_view/{}", integration.ctx.bucket, document_name, view_name);
+            req.body = R"({"keys":["foo","bar"]})";
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+            REQUIRE(resp.status == 404);
+            REQUIRE_FALSE(resp.body.empty());
+            auto result = couchbase::core::utils::json::parse(resp.body);
+            INFO(resp.body)
+            REQUIRE(result["error"].get_string() == "not_found");
+        }
     }
 
     SECTION("management")
     {
-        couchbase::operations::management::freeform_request req{};
-        req.type = couchbase::service_type::management;
+        couchbase::core::operations::management::freeform_request req{};
+        req.type = couchbase::core::service_type::management;
         req.method = "GET";
         req.path = "/pools";
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
         REQUIRE(resp.status == 200);
         REQUIRE_FALSE(resp.body.empty());
-        auto result = couchbase::utils::json::parse(resp.body);
+        auto result = couchbase::core::utils::json::parse(resp.body);
         INFO(resp.body)
         REQUIRE(result.find("uuid") != nullptr);
     }
@@ -2385,18 +2489,18 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
         {
             auto scope_name = test::utils::uniq_id("freeform_scope");
 
-            couchbase::operations::management::freeform_request req{};
-            req.type = couchbase::service_type::management;
+            couchbase::core::operations::management::freeform_request req{};
+            req.type = couchbase::core::service_type::management;
             req.method = "POST";
             req.path = fmt::format("/pools/default/buckets/{}/scopes", integration.ctx.bucket);
             req.headers["content-type"] = "application/x-www-form-urlencoded";
-            req.body = fmt::format("name={}", couchbase::utils::string_codec::form_encode(scope_name));
+            req.body = fmt::format("name={}", couchbase::core::utils::string_codec::form_encode(scope_name));
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE(resp.status == 200);
             REQUIRE_FALSE(resp.headers.empty());
             REQUIRE(resp.headers["content-type"].find("application/json") != std::string::npos);
-            auto result = couchbase::utils::json::parse(resp.body);
+            auto result = couchbase::core::utils::json::parse(resp.body);
             REQUIRE(result.is_object());
             REQUIRE(result.find("uid") != nullptr);
         }
@@ -2406,27 +2510,27 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
         SECTION("eventing")
         {
 
-            couchbase::operations::management::freeform_request req{};
-            req.type = couchbase::service_type::eventing;
+            couchbase::core::operations::management::freeform_request req{};
+            req.type = couchbase::core::service_type::eventing;
             req.method = "GET";
             req.path = "/api/v1/functions";
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE(resp.status == 200);
             REQUIRE_FALSE(resp.body.empty());
-            auto result = couchbase::utils::json::parse(resp.body);
+            auto result = couchbase::core::utils::json::parse(resp.body);
             INFO(resp.body)
             REQUIRE(result.is_array());
         }
     }
 }
 
-static couchbase::operations::management::eventing_get_function_response
+static couchbase::core::operations::management::eventing_get_function_response
 wait_for_function_created(test::utils::integration_test_guard& integration, const std::string& function_name)
 {
-    couchbase::operations::management::eventing_get_function_response resp{};
+    couchbase::core::operations::management::eventing_get_function_response resp{};
     test::utils::wait_until([&integration, &resp, function_name]() {
-        couchbase::operations::management::eventing_get_function_request req{ function_name };
+        couchbase::core::operations::management::eventing_get_function_request req{ function_name };
         resp = test::utils::execute(integration.cluster, req);
         return !resp.ctx.ec;
     });
@@ -2436,11 +2540,11 @@ wait_for_function_created(test::utils::integration_test_guard& integration, cons
 static bool
 wait_for_function_reach_status(test::utils::integration_test_guard& integration,
                                const std::string& function_name,
-                               couchbase::management::eventing::function_status status)
+                               couchbase::core::management::eventing::function_status status)
 {
     return test::utils::wait_until(
       [&integration, function_name, status]() {
-          couchbase::operations::management::eventing_get_status_request req{};
+          couchbase::core::operations::management::eventing_get_status_request req{};
           auto resp = test::utils::execute(integration.cluster, req);
           if (resp.ctx.ec) {
               return false;
@@ -2473,30 +2577,30 @@ TEST_CASE("integration: eventing functions management", "[integration]")
         auto function_name = test::utils::uniq_id("name");
 
         {
-            couchbase::operations::management::eventing_drop_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_drop_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
             if (integration.cluster_version().is_cheshire_cat()) {
-                REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_not_deployed);
+                REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_not_deployed);
             } else {
-                REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_not_found);
+                REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_not_found);
             }
         }
 
         {
-            couchbase::operations::management::eventing_get_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_get_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_not_found);
         }
 
         auto meta_bucket_name = test::utils::uniq_id("meta");
         {
 
-            couchbase::management::cluster::bucket_settings bucket_settings;
+            couchbase::core::management::cluster::bucket_settings bucket_settings;
             bucket_settings.name = meta_bucket_name;
             bucket_settings.ram_quota_mb = 256;
 
             {
-                couchbase::operations::management::bucket_create_request req;
+                couchbase::core::operations::management::bucket_create_request req;
                 req.bucket = bucket_settings;
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
@@ -2519,17 +2623,17 @@ function OnDelete(meta, options) {
 )";
 
         {
-            couchbase::operations::management::eventing_upsert_function_request req{};
+            couchbase::core::operations::management::eventing_upsert_function_request req{};
             req.function.source_keyspace.bucket = integration.ctx.bucket;
             req.function.metadata_keyspace.bucket = meta_bucket_name;
             req.function.name = function_name;
             req.function.code = source_code;
             req.function.settings.handler_headers = { "// generated by Couchbase C++ SDK" };
-            req.function.constant_bindings.emplace_back(couchbase::management::eventing::function_constant_binding{ "PI", "3.14" });
-            req.function.bucket_bindings.emplace_back(couchbase::management::eventing::function_bucket_binding{
-              "data", { integration.ctx.bucket }, couchbase::management::eventing::function_bucket_access::read_write });
+            req.function.constant_bindings.emplace_back(couchbase::core::management::eventing::function_constant_binding{ "PI", "3.14" });
+            req.function.bucket_bindings.emplace_back(couchbase::core::management::eventing::function_bucket_binding{
+              "data", { integration.ctx.bucket }, couchbase::core::management::eventing::function_bucket_access::read_write });
             req.function.url_bindings.emplace_back(
-              couchbase::management::eventing::function_url_binding{ "home", "https://couchbase.com" });
+              couchbase::core::management::eventing::function_url_binding{ "home", "https://couchbase.com" });
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
@@ -2540,17 +2644,17 @@ function OnDelete(meta, options) {
         }
 
         {
-            couchbase::operations::management::eventing_get_all_functions_request req{};
+            couchbase::core::operations::management::eventing_get_all_functions_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             auto function = std::find_if(
-              resp.functions.begin(), resp.functions.end(), [function_name](const auto& fun) { return function_name == fun.name; });
+              resp.functions.begin(), resp.functions.end(), [&function_name](const auto& fun) { return function_name == fun.name; });
             REQUIRE(function != resp.functions.end());
             REQUIRE(function->code == source_code);
             REQUIRE(function->source_keyspace.bucket == integration.ctx.bucket);
             REQUIRE(function->metadata_keyspace.bucket == meta_bucket_name);
-            REQUIRE(function->settings.deployment_status == couchbase::management::eventing::function_deployment_status::undeployed);
-            REQUIRE(function->settings.processing_status == couchbase::management::eventing::function_processing_status::paused);
+            REQUIRE(function->settings.deployment_status == couchbase::core::management::eventing::function_deployment_status::undeployed);
+            REQUIRE(function->settings.processing_status == couchbase::core::management::eventing::function_processing_status::paused);
             REQUIRE(!function->settings.handler_headers.empty());
             REQUIRE(function->settings.handler_headers[0] == "// generated by Couchbase C++ SDK");
             REQUIRE(!function->constant_bindings.empty());
@@ -2559,97 +2663,100 @@ function OnDelete(meta, options) {
             REQUIRE(!function->bucket_bindings.empty());
             REQUIRE(function->bucket_bindings[0].alias == "data");
             REQUIRE(function->bucket_bindings[0].name.bucket == "default");
-            REQUIRE(function->bucket_bindings[0].access == couchbase::management::eventing::function_bucket_access::read_write);
+            REQUIRE(function->bucket_bindings[0].access == couchbase::core::management::eventing::function_bucket_access::read_write);
             REQUIRE(!function->url_bindings.empty());
             REQUIRE(function->url_bindings[0].alias == "home");
             REQUIRE(function->url_bindings[0].hostname == "https://couchbase.com");
-            REQUIRE(std::holds_alternative<couchbase::management::eventing::function_url_no_auth>(function->url_bindings[0].auth));
+            REQUIRE(std::holds_alternative<couchbase::core::management::eventing::function_url_no_auth>(function->url_bindings[0].auth));
         }
 
         {
-            couchbase::operations::management::eventing_get_status_request req{};
+            couchbase::core::operations::management::eventing_get_status_request req{};
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
             REQUIRE(resp.status.num_eventing_nodes > 0);
-            auto function = std::find_if(resp.status.functions.begin(), resp.status.functions.end(), [function_name](const auto& fun) {
+            auto function = std::find_if(resp.status.functions.begin(), resp.status.functions.end(), [&function_name](const auto& fun) {
                 return function_name == fun.name;
             });
             REQUIRE(function != resp.status.functions.end());
-            REQUIRE(function->status == couchbase::management::eventing::function_status::undeployed);
-            REQUIRE(function->deployment_status == couchbase::management::eventing::function_deployment_status::undeployed);
-            REQUIRE(function->processing_status == couchbase::management::eventing::function_processing_status::paused);
+            REQUIRE(function->status == couchbase::core::management::eventing::function_status::undeployed);
+            REQUIRE(function->deployment_status == couchbase::core::management::eventing::function_deployment_status::undeployed);
+            REQUIRE(function->processing_status == couchbase::core::management::eventing::function_processing_status::paused);
         }
 
         {
-            couchbase::operations::management::eventing_undeploy_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_undeploy_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_not_deployed);
+            REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_not_deployed);
         }
 
         {
-            couchbase::operations::management::eventing_deploy_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_deploy_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::deployed));
+        REQUIRE(
+          wait_for_function_reach_status(integration, function_name, couchbase::core::management::eventing::function_status::deployed));
 
         {
-            couchbase::operations::management::eventing_drop_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_drop_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_deployed);
+            REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_deployed);
         }
 
         {
-            couchbase::operations::management::eventing_resume_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_resume_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_deployed);
+            REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_deployed);
         }
 
         {
-            couchbase::operations::management::eventing_pause_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_pause_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::paused));
+        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::core::management::eventing::function_status::paused));
 
         {
-            couchbase::operations::management::eventing_pause_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_pause_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_paused);
+            REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_paused);
         }
 
         {
-            couchbase::operations::management::eventing_resume_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_resume_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::deployed));
+        REQUIRE(
+          wait_for_function_reach_status(integration, function_name, couchbase::core::management::eventing::function_status::deployed));
 
         {
-            couchbase::operations::management::eventing_undeploy_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_undeploy_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::undeployed));
+        REQUIRE(
+          wait_for_function_reach_status(integration, function_name, couchbase::core::management::eventing::function_status::undeployed));
 
         {
-            couchbase::operations::management::eventing_drop_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_drop_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
         {
-            couchbase::operations::management::eventing_get_function_request req{ function_name };
+            couchbase::core::operations::management::eventing_get_function_request req{ function_name };
             auto resp = test::utils::execute(integration.cluster, req);
-            REQUIRE(resp.ctx.ec == couchbase::error::management_errc::eventing_function_not_found);
+            REQUIRE(resp.ctx.ec == couchbase::errc::management::eventing_function_not_found);
         }
 
         {
-            couchbase::operations::management::bucket_drop_request req{ meta_bucket_name };
+            couchbase::core::operations::management::bucket_drop_request req{ meta_bucket_name };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }