couchbase 4.0.0 → 4.1.2

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

@@ -17,8 +17,8 @@
 
 #include "test_helper_integration.hxx"
 
+#include <couchbase/management/analytics_link.hxx>
 #include <couchbase/operations/management/analytics.hxx>
-#include <couchbase/operations/management/analytics_link.hxx>
 #include <couchbase/operations/management/bucket.hxx>
 #include <couchbase/operations/management/collections.hxx>
 #include <couchbase/operations/management/eventing.hxx>
@@ -53,6 +53,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,18 +65,19 @@ TEST_CASE("integration: bucket management", "[integration]")
 
     SECTION("crud")
     {
-        couchbase::operations::management::bucket_settings bucket_settings;
+        couchbase::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::operations::management::bucket_settings::bucket_type::couchbase;
-        bucket_settings.eviction_policy = couchbase::operations::management::bucket_settings::eviction_policy::value_only;
+        bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::couchbase;
+        bucket_settings.eviction_policy = couchbase::management::cluster::bucket_eviction_policy::value_only;
         bucket_settings.flush_enabled = true;
-        bucket_settings.max_expiry = 10;
-        bucket_settings.compression_mode = couchbase::operations::management::bucket_settings::compression_mode::active;
+        if (integration.cluster_version().is_enterprise()) {
+            bucket_settings.max_expiry = 10;
+            bucket_settings.compression_mode = couchbase::management::cluster::bucket_compression::active;
+        }
         bucket_settings.replica_indexes = true;
-        bucket_settings.conflict_resolution_type =
-          couchbase::operations::management::bucket_settings::conflict_resolution_type::sequence_number;
+        bucket_settings.conflict_resolution_type = couchbase::management::cluster::bucket_conflict_resolution::sequence_number;
 
         {
             couchbase::operations::management::bucket_create_request req;
@@ -154,7 +159,7 @@ TEST_CASE("integration: bucket management", "[integration]")
             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);
         }
     }
@@ -181,7 +186,7 @@ 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::operations::insert_request req{ id, couchbase::utils::json::generate_binary(value) };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
             }
@@ -236,9 +241,9 @@ TEST_CASE("integration: bucket management", "[integration]")
     SECTION("memcached")
     {
         {
-            couchbase::operations::management::bucket_settings bucket_settings;
+            couchbase::management::cluster::bucket_settings bucket_settings;
             bucket_settings.name = bucket_name;
-            bucket_settings.bucket_type = couchbase::operations::management::bucket_settings::bucket_type::memcached;
+            bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::memcached;
             bucket_settings.num_replicas = 0;
             couchbase::operations::management::bucket_create_request req{ bucket_settings };
             auto resp = test::utils::execute(integration.cluster, req);
@@ -248,15 +253,15 @@ 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::operations::management::bucket_settings::bucket_type::memcached);
+            REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::memcached);
         }
     }
 
     SECTION("ephemeral")
     {
-        couchbase::operations::management::bucket_settings bucket_settings;
+        couchbase::management::cluster::bucket_settings bucket_settings;
         bucket_settings.name = bucket_name;
-        bucket_settings.bucket_type = couchbase::operations::management::bucket_settings::bucket_type::ephemeral;
+        bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::ephemeral;
 
         SECTION("default eviction")
         {
@@ -270,15 +275,15 @@ 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::operations::management::bucket_settings::bucket_type::ephemeral);
-                REQUIRE(resp.bucket.eviction_policy == couchbase::operations::management::bucket_settings::eviction_policy::no_eviction);
+                REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::ephemeral);
+                REQUIRE(resp.bucket.eviction_policy == couchbase::management::cluster::bucket_eviction_policy::no_eviction);
             }
         }
 
         SECTION("nru eviction")
         {
             {
-                bucket_settings.eviction_policy = couchbase::operations::management::bucket_settings::eviction_policy::not_recently_used;
+                bucket_settings.eviction_policy = couchbase::management::cluster::bucket_eviction_policy::not_recently_used;
                 couchbase::operations::management::bucket_create_request req{ bucket_settings };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
@@ -287,9 +292,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::operations::management::bucket_settings::bucket_type::ephemeral);
-                REQUIRE(resp.bucket.eviction_policy ==
-                        couchbase::operations::management::bucket_settings::eviction_policy::not_recently_used);
+                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);
             }
         }
 
@@ -297,7 +301,7 @@ TEST_CASE("integration: bucket management", "[integration]")
             SECTION("storage backend")
             {
                 {
-                    bucket_settings.storage_backend = couchbase::operations::management::bucket_settings::storage_backend_type::couchstore;
+                    bucket_settings.storage_backend = couchbase::management::cluster::bucket_storage_backend::couchstore;
                     couchbase::operations::management::bucket_create_request req{ bucket_settings };
                     auto resp = test::utils::execute(integration.cluster, req);
                     REQUIRE_FALSE(resp.ctx.ec);
@@ -306,9 +310,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::operations::management::bucket_settings::bucket_type::ephemeral);
-                    REQUIRE(resp.bucket.storage_backend ==
-                            couchbase::operations::management::bucket_settings::storage_backend_type::unknown);
+                    REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::ephemeral);
+                    REQUIRE(resp.bucket.storage_backend == couchbase::management::cluster::bucket_storage_backend::unknown);
                 }
             }
         }
@@ -316,9 +319,9 @@ TEST_CASE("integration: bucket management", "[integration]")
 
     SECTION("couchbase")
     {
-        couchbase::operations::management::bucket_settings bucket_settings;
+        couchbase::management::cluster::bucket_settings bucket_settings;
         bucket_settings.name = bucket_name;
-        bucket_settings.bucket_type = couchbase::operations::management::bucket_settings::bucket_type::couchbase;
+        bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::couchbase;
 
         SECTION("default eviction")
         {
@@ -333,15 +336,15 @@ 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::operations::management::bucket_settings::bucket_type::couchbase);
-                REQUIRE(resp.bucket.eviction_policy == couchbase::operations::management::bucket_settings::eviction_policy::value_only);
+                REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
+                REQUIRE(resp.bucket.eviction_policy == couchbase::management::cluster::bucket_eviction_policy::value_only);
             }
         }
 
         SECTION("full eviction")
         {
             {
-                bucket_settings.eviction_policy = couchbase::operations::management::bucket_settings::eviction_policy::full;
+                bucket_settings.eviction_policy = couchbase::management::cluster::bucket_eviction_policy::full;
                 couchbase::operations::management::bucket_create_request req{ bucket_settings };
                 auto resp = test::utils::execute(integration.cluster, req);
                 REQUIRE_FALSE(resp.ctx.ec);
@@ -350,8 +353,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::operations::management::bucket_settings::bucket_type::couchbase);
-                REQUIRE(resp.bucket.eviction_policy == couchbase::operations::management::bucket_settings::eviction_policy::full);
+                REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
+                REQUIRE(resp.bucket.eviction_policy == couchbase::management::cluster::bucket_eviction_policy::full);
             }
         }
 
@@ -361,8 +364,7 @@ TEST_CASE("integration: bucket management", "[integration]")
                 SECTION("couchstore")
                 {
                     {
-                        bucket_settings.storage_backend =
-                          couchbase::operations::management::bucket_settings::storage_backend_type::couchstore;
+                        bucket_settings.storage_backend = couchbase::management::cluster::bucket_storage_backend::couchstore;
                         couchbase::operations::management::bucket_create_request req{ bucket_settings };
                         auto resp = test::utils::execute(integration.cluster, req);
                         REQUIRE_FALSE(resp.ctx.ec);
@@ -371,17 +373,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::operations::management::bucket_settings::bucket_type::couchbase);
-                        REQUIRE(resp.bucket.storage_backend ==
-                                couchbase::operations::management::bucket_settings::storage_backend_type::couchstore);
+                        REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
+                        REQUIRE(resp.bucket.storage_backend == couchbase::management::cluster::bucket_storage_backend::couchstore);
                     }
                 }
 
                 SECTION("magma")
                 {
                     {
-                        bucket_settings.ram_quota_mb = 256;
-                        bucket_settings.storage_backend = couchbase::operations::management::bucket_settings::storage_backend_type::magma;
+                        bucket_settings.ram_quota_mb = integration.cluster_version().is_neo() ? 1'024 : 256;
+                        bucket_settings.storage_backend = couchbase::management::cluster::bucket_storage_backend::magma;
                         couchbase::operations::management::bucket_create_request req{ bucket_settings };
                         auto resp = test::utils::execute(integration.cluster, req);
                         REQUIRE_FALSE(resp.ctx.ec);
@@ -390,9 +391,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::operations::management::bucket_settings::bucket_type::couchbase);
-                        REQUIRE(resp.bucket.storage_backend ==
-                                couchbase::operations::management::bucket_settings::storage_backend_type::magma);
+                        REQUIRE(resp.bucket.bucket_type == couchbase::management::cluster::bucket_type::couchbase);
+                        REQUIRE(resp.bucket.storage_backend == couchbase::management::cluster::bucket_storage_backend::magma);
                     }
                 }
             }
@@ -402,7 +402,7 @@ TEST_CASE("integration: bucket management", "[integration]")
     SECTION("update no bucket")
     {
 
-        couchbase::operations::management::bucket_settings bucket_settings;
+        couchbase::management::cluster::bucket_settings bucket_settings;
         bucket_settings.name = bucket_name;
         couchbase::operations::management::bucket_update_request req;
         req.bucket = bucket_settings;
@@ -413,7 +413,7 @@ TEST_CASE("integration: bucket management", "[integration]")
     if (integration.cluster_version().supports_minimum_durability_level()) {
         SECTION("minimum durability level")
         {
-            couchbase::operations::management::bucket_settings bucket_settings;
+            couchbase::management::cluster::bucket_settings bucket_settings;
             bucket_settings.name = bucket_name;
 
             SECTION("default")
@@ -461,11 +461,11 @@ TEST_CASE("integration: bucket management", "[integration]")
     }
 }
 
-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::topology::collections_manifest::collection>
+get_collection(std::shared_ptr<couchbase::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 };
     auto resp = test::utils::execute(cluster, req);
@@ -474,13 +474,13 @@ collection_exists(std::shared_ptr<couchbase::cluster> cluster,
             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
@@ -501,6 +501,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;
@@ -508,11 +509,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 };
         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);
     }
 
     {
@@ -527,19 +531,32 @@ TEST_CASE("integration: collection management", "[integration]")
     }
 
     {
-        couchbase::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name, 5 };
+        couchbase::operations::management::collection_create_request req{ integration.ctx.bucket, scope_name, collection_name };
+        if (integration.cluster_version().is_enterprise()) {
+            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::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 };
         auto resp = test::utils::execute(integration.cluster, req);
@@ -554,7 +571,7 @@ TEST_CASE("integration: collection management", "[integration]")
 
     {
         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);
     }
 
@@ -583,8 +600,8 @@ TEST_CASE("integration: collection management", "[integration]")
 }
 
 void
-assert_user_and_metadata(const couchbase::operations::management::rbac::user_and_metadata& user,
-                         const couchbase::operations::management::rbac::user_and_metadata& expected)
+assert_user_and_metadata(const couchbase::management::rbac::user_and_metadata& user,
+                         const couchbase::management::rbac::user_and_metadata& expected)
 {
     REQUIRE(user.username == expected.username);
     REQUIRE(user.groups == expected.groups);
@@ -635,11 +652,11 @@ 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::operations::management::rbac::group group{};
+        couchbase::management::rbac::group group{};
         group.name = group_name_1;
         group.description = "this is a test";
-        group.roles = { couchbase::operations::management::rbac::role{ "replication_target", integration.ctx.bucket },
-                        couchbase::operations::management::rbac::role{ "replication_admin" } };
+        group.roles = { couchbase::management::rbac::role{ "replication_target", integration.ctx.bucket },
+                        couchbase::management::rbac::role{ "replication_admin" } };
         group.ldap_group_reference = "asda=price";
 
         {
@@ -659,7 +676,7 @@ TEST_CASE("integration: user groups management", "[integration]")
 
         {
             group.description = "this is still a test";
-            group.roles.push_back(couchbase::operations::management::rbac::role{ "query_system_catalog" });
+            group.roles.push_back(couchbase::management::rbac::role{ "query_system_catalog" });
             couchbase::operations::management::group_upsert_request req{ group };
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
@@ -730,11 +747,11 @@ TEST_CASE("integration: user groups management", "[integration]")
         auto group_name = test::utils::uniq_id("group");
         auto user_name = test::utils::uniq_id("user");
 
-        couchbase::operations::management::rbac::group group{};
+        couchbase::management::rbac::group group{};
         group.name = group_name;
         group.description = "this is a test";
-        group.roles = { couchbase::operations::management::rbac::role{ "replication_target", integration.ctx.bucket },
-                        couchbase::operations::management::rbac::role{ "replication_admin" } };
+        group.roles = { couchbase::management::rbac::role{ "replication_target", integration.ctx.bucket },
+                        couchbase::management::rbac::role{ "replication_admin" } };
 
         {
             couchbase::operations::management::group_upsert_request req{ group };
@@ -742,11 +759,11 @@ TEST_CASE("integration: user groups management", "[integration]")
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        couchbase::operations::management::rbac::user user{ user_name };
+        couchbase::management::rbac::user user{ user_name };
         user.display_name = "display_name";
         user.password = "password";
         user.roles = {
-            couchbase::operations::management::rbac::role{ "bucket_admin", integration.ctx.bucket },
+            couchbase::management::rbac::role{ "bucket_admin", integration.ctx.bucket },
         };
         user.groups = { group_name };
 
@@ -757,26 +774,26 @@ TEST_CASE("integration: user groups management", "[integration]")
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        couchbase::operations::management::rbac::user_and_metadata expected{};
+        couchbase::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::operations::management::rbac::auth_domain::local;
+        expected.domain = couchbase::management::rbac::auth_domain::local;
 
-        couchbase::operations::management::rbac::role_and_origins expected_role_1{};
+        couchbase::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::operations::management::rbac::origin{ "user" } };
+        expected_role_1.origins = { couchbase::management::rbac::origin{ "user" } };
 
-        couchbase::operations::management::rbac::role_and_origins expected_role_2{};
+        couchbase::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::operations::management::rbac::origin{ "group", group_name } };
+        expected_role_2.origins = { couchbase::management::rbac::origin{ "group", group_name } };
 
-        couchbase::operations::management::rbac::role_and_origins expected_role_3{};
+        couchbase::management::rbac::role_and_origins expected_role_3{};
         expected_role_3.name = "replication_admin";
-        expected_role_3.origins = { couchbase::operations::management::rbac::origin{ "group", group_name } };
+        expected_role_3.origins = { couchbase::management::rbac::origin{ "group", group_name } };
 
         expected.effective_roles = { expected_role_1, expected_role_2, expected_role_3 };
 
@@ -837,6 +854,10 @@ 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);
     }
@@ -869,7 +890,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()) {
+    if (!integration.cluster_version().supports_user_management() || !integration.cluster_version().supports_collections() ||
+        integration.cluster_version().is_community()) {
         return;
     }
 
@@ -893,11 +915,11 @@ TEST_CASE("integration: user management collections roles", "[integration]")
         REQUIRE(created);
     }
 
-    couchbase::operations::management::rbac::user user{ user_name };
+    couchbase::management::rbac::user user{ user_name };
     user.display_name = "display_name";
     user.password = "password";
     user.roles = {
-        couchbase::operations::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name },
+        couchbase::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name },
     };
 
     {
@@ -918,7 +940,7 @@ TEST_CASE("integration: user management collections roles", "[integration]")
     }
 
     user.roles = {
-        couchbase::operations::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name, collection_name },
+        couchbase::management::rbac::role{ "data_reader", integration.ctx.bucket, scope_name, collection_name },
     };
 
     {
@@ -948,26 +970,244 @@ TEST_CASE("integration: query index management", "[integration]")
         return;
     }
 
-    auto bucket_name = test::utils::uniq_id("bucket");
     auto index_name = test::utils::uniq_id("index");
 
+    if (integration.cluster_version().supports_bucket_management()) {
+        SECTION("primary index")
+        {
+            auto bucket_name = test::utils::uniq_id("bucket");
+
+            {
+                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);
+
+            {
+                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{};
+                    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);
+            }
+
+            {
+                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::operations::management::bucket_drop_request req{ bucket_name };
+                test::utils::execute(integration.cluster, req);
+            }
+        }
+    }
+
+    SECTION("non primary index")
     {
-        couchbase::operations::management::bucket_create_request req;
-        req.bucket.name = bucket_name;
-        req.bucket.bucket_type = couchbase::operations::management::bucket_settings::bucket_type::couchbase;
-        req.bucket.num_replicas = 0;
+        {
+            couchbase::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &resp]() {
+                couchbase::operations::management::query_index_create_request req{};
+                req.bucket_name = integration.ctx.bucket;
+                req.index_name = index_name;
+                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;
+            });
+            REQUIRE(operation_completed);
+            REQUIRE_FALSE(resp.ctx.ec);
+        }
+
+        {
+            couchbase::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);
+        }
+
+        {
+            couchbase::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;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+        }
+
+        {
+            couchbase::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);
+            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 = 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 = 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);
+        }
+    }
+
+    SECTION("deferred index")
+    {
+        {
+            couchbase::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &resp]() {
+                couchbase::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;
+            });
+            REQUIRE(operation_completed);
+            REQUIRE_FALSE(resp.ctx.ec);
+        }
+
+        {
+            couchbase::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);
+            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 = integration.ctx.bucket;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+        }
+
+        test::utils::wait_until([&integration, &index_name]() {
+            couchbase::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;
+            }
+            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{};
+        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);
+    }
+
+    SECTION("get missing bucket")
+    {
+        couchbase::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);
+        REQUIRE(resp.indexes.empty());
+    }
+
+    SECTION("drop missing bucket")
+    {
+        couchbase::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);
+    }
+}
+
+TEST_CASE("integration: collections query index management", "[integration]")
+{
+    test::utils::integration_test_guard integration;
+
+    if (!integration.cluster_version().supports_query_index_management()) {
+        return;
+    }
+
+    if (!integration.cluster_version().supports_collections()) {
+        return;
+    }
+
+    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");
+
+    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{ 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);
     }
 
-    REQUIRE(!wait_for_bucket_created(integration, bucket_name).ctx.ec);
+    {
+        couchbase::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, &resp]() {
+            bool operation_completed = test::utils::wait_until([&integration, &scope_name, &collection_name, &resp]() {
                 couchbase::operations::management::query_index_create_request req{};
-                req.bucket_name = bucket_name;
+                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;
@@ -978,7 +1218,9 @@ TEST_CASE("integration: query index management", "[integration]")
 
         {
             couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            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);
@@ -987,14 +1229,58 @@ TEST_CASE("integration: query index management", "[integration]")
         }
     }
 
+    SECTION("named primary index")
+    {
+        {
+            couchbase::operations::management::query_index_create_response resp;
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &scope_name, &collection_name, &resp]() {
+                couchbase::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::error::common_errc::bucket_not_found;
+            });
+            REQUIRE(operation_completed);
+            REQUIRE_FALSE(resp.ctx.ec);
+        }
+
+        {
+            couchbase::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::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, &resp]() {
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &scope_name, &collection_name, &resp]() {
                 couchbase::operations::management::query_index_create_request req{};
-                req.bucket_name = bucket_name;
+                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::error::common_errc::bucket_not_found;
@@ -1005,8 +1291,10 @@ TEST_CASE("integration: query index management", "[integration]")
 
         {
             couchbase::operations::management::query_index_create_request req{};
-            req.bucket_name = bucket_name;
+            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);
@@ -1014,8 +1302,10 @@ TEST_CASE("integration: query index management", "[integration]")
 
         {
             couchbase::operations::management::query_index_create_request req{};
-            req.bucket_name = bucket_name;
+            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.ignore_if_exists = true;
             auto resp = test::utils::execute(integration.cluster, req);
@@ -1024,7 +1314,9 @@ TEST_CASE("integration: query index management", "[integration]")
 
         {
             couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            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);
@@ -1032,23 +1324,28 @@ TEST_CASE("integration: query index management", "[integration]")
             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].keyspace_id == bucket_name);
+            REQUIRE(resp.indexes[0].collection_name == collection_name);
+            REQUIRE(resp.indexes[0].scope_name == scope_name);
+            REQUIRE(resp.indexes[0].bucket_name == integration.ctx.bucket);
             REQUIRE(resp.indexes[0].state == "online");
-            REQUIRE(resp.indexes[0].namespace_id == "default");
         }
 
         {
             couchbase::operations::management::query_index_drop_request req{};
-            req.bucket_name = bucket_name;
+            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_FALSE(resp.ctx.ec);
         }
 
         {
             couchbase::operations::management::query_index_drop_request req{};
-            req.bucket_name = bucket_name;
+            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);
         }
@@ -1058,10 +1355,12 @@ TEST_CASE("integration: query index management", "[integration]")
     {
         {
             couchbase::operations::management::query_index_create_response resp;
-            bool operation_completed = test::utils::wait_until([&integration, &bucket_name, &index_name, &resp]() {
+            bool operation_completed = test::utils::wait_until([&integration, &index_name, &scope_name, &collection_name, &resp]() {
                 couchbase::operations::management::query_index_create_request req{};
-                req.bucket_name = bucket_name;
+                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);
@@ -1073,7 +1372,9 @@ TEST_CASE("integration: query index management", "[integration]")
 
         {
             couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            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);
@@ -1083,14 +1384,18 @@ TEST_CASE("integration: query index management", "[integration]")
 
         {
             couchbase::operations::management::query_index_build_deferred_request req{};
-            req.bucket_name = bucket_name;
+            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);
         }
 
-        test::utils::wait_until([&integration, bucket_name]() {
+        test::utils::wait_until([&integration, scope_name, collection_name]() {
             couchbase::operations::management::query_index_get_all_request req{};
-            req.bucket_name = bucket_name;
+            req.bucket_name = integration.ctx.bucket;
+            req.scope_name = scope_name;
+            req.collection_name = collection_name;
             auto resp = test::utils::execute(integration.cluster, req);
             if (resp.indexes.empty()) {
                 return false;
@@ -1099,37 +1404,59 @@ TEST_CASE("integration: query index management", "[integration]")
         });
     }
 
-    SECTION("create missing bucket")
+    SECTION("create missing collection")
     {
         couchbase::operations::management::query_index_create_request req{};
-        req.bucket_name = "missing_bucket";
+        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::bucket_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::collection_not_found);
     }
 
-    SECTION("get missing bucket")
+    SECTION("create missing scope")
+    {
+        couchbase::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);
+    }
+
+    SECTION("get missing collection")
     {
         couchbase::operations::management::query_index_get_all_request req{};
-        req.bucket_name = "missing_bucket";
+        req.bucket_name = integration.ctx.bucket;
+        req.scope_name = scope_name;
+        req.collection_name = "missing_collection";
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
         REQUIRE(resp.indexes.empty());
     }
 
-    SECTION("drop missing bucket")
+    SECTION("drop missing collection")
     {
         couchbase::operations::management::query_index_drop_request req{};
-        req.bucket_name = "missing_bucket";
+        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::bucket_not_found);
+        REQUIRE(resp.ctx.ec == couchbase::error::common_errc::collection_not_found);
     }
 
-    // drop any buckets that haven't already been dropped
+    SECTION("drop missing scope")
     {
-        couchbase::operations::management::bucket_drop_request req{ bucket_name };
-        test::utils::execute(integration.cluster, req);
+        couchbase::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);
     }
 }
 
@@ -1137,12 +1464,12 @@ TEST_CASE("integration: analytics index management", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
-    if (!integration.cluster_version().supports_analytics()) {
+    if (!integration.cluster_version().supports_analytics() || !integration.has_analytics_service()) {
         return;
     }
 
     // MB-47718
-    if (integration.storage_backend() == couchbase::operations::management::bucket_settings::storage_backend_type::magma) {
+    if (integration.storage_backend() == couchbase::management::cluster::bucket_storage_backend::magma) {
         return;
     }
 
@@ -1244,7 +1571,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
             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());
@@ -1259,7 +1586,7 @@ TEST_CASE("integration: analytics index management", "[integration]")
             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);
@@ -1430,7 +1757,7 @@ 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{};
@@ -1440,30 +1767,28 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
     }
 
     {
-        couchbase::operations::management::analytics_link::s3_external link{};
+        couchbase::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::operations::management::analytics_link::s3_external>
-          req{};
+        couchbase::operations::management::analytics_link_create_request<couchbase::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::s3_external link{};
+        couchbase::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::operations::management::analytics_link::s3_external>
-          req{};
+        couchbase::operations::management::analytics_link_create_request<couchbase::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);
@@ -1506,15 +1831,14 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
     }
 
     {
-        couchbase::operations::management::analytics_link::s3_external link{};
+        couchbase::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::operations::management::analytics_link::s3_external>
-          req{};
+        couchbase::operations::management::analytics_link_replace_request<couchbase::management::analytics::s3_external_link> req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -1547,7 +1871,7 @@ run_s3_link_test(test::utils::integration_test_guard& integration, std::string d
 }
 
 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{};
@@ -1557,30 +1881,26 @@ run_azure_link_test(test::utils::integration_test_guard& integration, std::strin
     }
 
     {
-        couchbase::operations::management::analytics_link::azure_blob_external link{};
+        couchbase::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::operations::management::analytics_link::azure_blob_external>
-          req{};
+        couchbase::operations::management::analytics_link_create_request<couchbase::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::azure_blob_external link{};
+        couchbase::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::operations::management::analytics_link::azure_blob_external>
-          req{};
+        couchbase::operations::management::analytics_link_create_request<couchbase::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);
@@ -1625,15 +1945,13 @@ run_azure_link_test(test::utils::integration_test_guard& integration, std::strin
     }
 
     {
-        couchbase::operations::management::analytics_link::azure_blob_external link{};
+        couchbase::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::operations::management::analytics_link::azure_blob_external>
-          req{};
+        couchbase::operations::management::analytics_link_replace_request<couchbase::management::analytics::azure_blob_external_link> req{};
         req.link = link;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -1669,12 +1987,12 @@ TEST_CASE("integration: analytics external link management", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
-    if (!integration.cluster_version().supports_analytics_links()) {
+    if (!integration.cluster_version().supports_analytics_links() || !integration.has_analytics_service()) {
         return;
     }
 
     // MB-47718
-    if (integration.storage_backend() == couchbase::operations::management::bucket_settings::storage_backend_type::magma) {
+    if (integration.storage_backend() == couchbase::management::cluster::bucket_storage_backend::magma) {
         return;
     }
 
@@ -1689,7 +2007,7 @@ TEST_CASE("integration: analytics external link management", "[integration]")
 
     SECTION("missing dataverse")
     {
-        couchbase::operations::management::analytics_link::s3_external link{};
+        couchbase::management::analytics::s3_external_link link{};
         link.dataverse = "missing_dataverse";
         link.access_key_id = "access_key";
         link.secret_access_key = "secret_access_key";
@@ -1698,8 +2016,7 @@ TEST_CASE("integration: analytics external link management", "[integration]")
         link.link_name = link_name;
 
         {
-            couchbase::operations::management::analytics_link_create_request<couchbase::operations::management::analytics_link::s3_external>
-              req{};
+            couchbase::operations::management::analytics_link_create_request<couchbase::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);
@@ -1708,9 +2025,8 @@ TEST_CASE("integration: analytics external link management", "[integration]")
 
     SECTION("missing argument")
     {
-        couchbase::operations::management::analytics_link_create_request<couchbase::operations::management::analytics_link::s3_external>
-          req{};
-        req.link = couchbase::operations::management::analytics_link::s3_external{};
+        couchbase::operations::management::analytics_link_create_request<couchbase::management::analytics::s3_external_link> req{};
+        req.link = couchbase::management::analytics::s3_external_link{};
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE(resp.ctx.ec == couchbase::error::common_errc::invalid_argument);
     }
@@ -1778,7 +2094,7 @@ TEST_CASE("integration: search index management", "[integration]")
         auto alias_name = test::utils::uniq_id("alias");
 
         {
-            couchbase::operations::management::search_index index;
+            couchbase::management::search::index index;
             index.name = index1_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
@@ -1790,7 +2106,7 @@ TEST_CASE("integration: search index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::search_index index;
+            couchbase::management::search::index index;
             index.name = index1_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
@@ -1802,7 +2118,7 @@ TEST_CASE("integration: search index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::search_index index;
+            couchbase::management::search::index index;
             index.name = index2_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
@@ -1816,7 +2132,7 @@ TEST_CASE("integration: search index management", "[integration]")
         }
 
         {
-            couchbase::operations::management::search_index index;
+            couchbase::management::search::index index;
             index.name = alias_name;
             index.type = "fulltext-alias";
             index.source_type = "nil";
@@ -1880,7 +2196,7 @@ TEST_CASE("integration: search index management", "[integration]")
 
     SECTION("upsert index no name")
     {
-        couchbase::operations::management::search_index index;
+        couchbase::management::search::index index;
         index.type = "fulltext-index";
         index.source_type = "couchbase";
         index.source_name = integration.ctx.bucket;
@@ -1895,7 +2211,7 @@ TEST_CASE("integration: search index management", "[integration]")
         auto index_name = test::utils::uniq_id("index");
 
         {
-            couchbase::operations::management::search_index index;
+            couchbase::management::search::index index;
             index.name = index_name;
             index.type = "fulltext-index";
             index.source_type = "couchbase";
@@ -2005,7 +2321,7 @@ TEST_CASE("integration: search index management analyze document", "[integration
     auto index_name = test::utils::uniq_id("index");
 
     {
-        couchbase::operations::management::search_index index;
+        couchbase::management::search::index index;
         index.name = index_name;
         index.type = "fulltext-index";
         index.source_type = "couchbase";
@@ -2047,7 +2363,7 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
         REQUIRE(resp.ctx.ec == couchbase::error::common_errc::invalid_argument);
     }
 
-    if (integration.cluster_version().supports_analytics()) {
+    if (integration.cluster_version().supports_analytics() && integration.has_analytics_service()) {
         SECTION("analytics")
         {
             couchbase::operations::management::freeform_request req{};
@@ -2093,23 +2409,25 @@ TEST_CASE("integration: freeform HTTP request", "[integration]")
         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::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");
+        }
     }
 
     SECTION("management")
@@ -2183,7 +2501,7 @@ 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::operations::management::eventing::function_status status)
+                               couchbase::management::eventing::function_status status)
 {
     return test::utils::wait_until(
       [&integration, function_name, status]() {
@@ -2238,7 +2556,7 @@ TEST_CASE("integration: eventing functions management", "[integration]")
         auto meta_bucket_name = test::utils::uniq_id("meta");
         {
 
-            couchbase::operations::management::bucket_settings bucket_settings;
+            couchbase::management::cluster::bucket_settings bucket_settings;
             bucket_settings.name = meta_bucket_name;
             bucket_settings.ram_quota_mb = 256;
 
@@ -2272,12 +2590,11 @@ function OnDelete(meta, options) {
             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::operations::management::eventing::function_constant_binding{ "PI", "3.14" });
-            req.function.bucket_bindings.emplace_back(couchbase::operations::management::eventing::function_bucket_binding{
-              "data", { integration.ctx.bucket }, couchbase::operations::management::eventing::function_bucket_access::read_write });
+            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.url_bindings.emplace_back(
-              couchbase::operations::management::eventing::function_url_binding{ "home", "https://couchbase.com" });
+              couchbase::management::eventing::function_url_binding{ "home", "https://couchbase.com" });
             auto resp = test::utils::execute(integration.cluster, req);
             REQUIRE_FALSE(resp.ctx.ec);
         }
@@ -2292,15 +2609,13 @@ function OnDelete(meta, options) {
             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::operations::management::eventing::function_deployment_status::undeployed);
-            REQUIRE(function->settings.processing_status ==
-                    couchbase::operations::management::eventing::function_processing_status::paused);
+            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.handler_headers.empty());
             REQUIRE(function->settings.handler_headers[0] == "// generated by Couchbase C++ SDK");
             REQUIRE(!function->constant_bindings.empty());
@@ -2309,12 +2624,11 @@ 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::operations::management::eventing::function_bucket_access::read_write);
+            REQUIRE(function->bucket_bindings[0].access == couchbase::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::operations::management::eventing::function_url_no_auth>(function->url_bindings[0].auth));
+            REQUIRE(std::holds_alternative<couchbase::management::eventing::function_url_no_auth>(function->url_bindings[0].auth));
         }
 
         {
@@ -2322,13 +2636,13 @@ function OnDelete(meta, options) {
             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::operations::management::eventing::function_status::undeployed);
-            REQUIRE(function->deployment_status == couchbase::operations::management::eventing::function_deployment_status::undeployed);
-            REQUIRE(function->processing_status == couchbase::operations::management::eventing::function_processing_status::paused);
+            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);
         }
 
         {
@@ -2343,8 +2657,7 @@ function OnDelete(meta, options) {
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(wait_for_function_reach_status(
-          integration, function_name, couchbase::operations::management::eventing::function_status::deployed));
+        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::deployed));
 
         {
             couchbase::operations::management::eventing_drop_function_request req{ function_name };
@@ -2364,8 +2677,7 @@ function OnDelete(meta, options) {
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(
-          wait_for_function_reach_status(integration, function_name, couchbase::operations::management::eventing::function_status::paused));
+        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::paused));
 
         {
             couchbase::operations::management::eventing_pause_function_request req{ function_name };
@@ -2379,8 +2691,7 @@ function OnDelete(meta, options) {
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(wait_for_function_reach_status(
-          integration, function_name, couchbase::operations::management::eventing::function_status::deployed));
+        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::deployed));
 
         {
             couchbase::operations::management::eventing_undeploy_function_request req{ function_name };
@@ -2388,8 +2699,7 @@ function OnDelete(meta, options) {
             REQUIRE_FALSE(resp.ctx.ec);
         }
 
-        REQUIRE(wait_for_function_reach_status(
-          integration, function_name, couchbase::operations::management::eventing::function_status::undeployed));
+        REQUIRE(wait_for_function_reach_status(integration, function_name, couchbase::management::eventing::function_status::undeployed));
 
         {
             couchbase::operations::management::eventing_drop_function_request req{ function_name };