couchbase 4.0.0 → 4.1.0

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/query_index_create.cxx

@@ -27,6 +27,9 @@ namespace couchbase::operations::management
 std::error_code
 query_index_create_request::encode_to(encoded_request_type& encoded, http_context&) const
 {
+    if ((scope_name.empty() && !collection_name.empty()) || (!scope_name.empty() && collection_name.empty())) {
+        return error::common_errc::invalid_argument;
+    }
     encoded.headers["content-type"] = "application/json";
     tao::json::value with{};
     if (deferred) {
@@ -85,6 +88,8 @@ query_index_create_request::make_response(error_context::http&& ctx, const encod
         if (response.status != "success") {
             bool index_already_exists = false;
             bool bucket_not_found = false;
+            bool collection_not_found = false;
+            bool scope_not_found = false;
             std::optional<std::error_code> common_ec{};
             for (const auto& entry : payload.at("errors").get_array()) {
                 query_index_create_response::query_problem error;
@@ -101,7 +106,15 @@ query_index_create_request::make_response(error_context::http&& ctx, const encod
                         break;
 
                     case 12003: /* IKey: "datastore.couchbase.keyspace_not_found" */
-                        bucket_not_found = true;
+                        if (error.message.find("missing_collection") != std::string::npos) {
+                            collection_not_found = true;
+                        } else {
+                            bucket_not_found = true;
+                        }
+                        break;
+
+                    case 12021:
+                        scope_not_found = true;
                         break;
 
                     case 4300: /* IKey: "plan.new_index_already_exists" */
@@ -120,6 +133,10 @@ query_index_create_request::make_response(error_context::http&& ctx, const encod
                 }
             } else if (bucket_not_found) {
                 response.ctx.ec = error::common_errc::bucket_not_found;
+            } else if (collection_not_found) {
+                response.ctx.ec = error::common_errc::collection_not_found;
+            } else if (scope_not_found) {
+                response.ctx.ec = error::common_errc::scope_not_found;
             } else if (common_ec) {
                 response.ctx.ec = common_ec.value();
             } else if (!response.errors.empty()) {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/query_index_drop.cxx

@@ -26,6 +26,9 @@ namespace couchbase::operations::management
 std::error_code
 query_index_drop_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
+    if ((scope_name.empty() && !collection_name.empty()) || (!scope_name.empty() && collection_name.empty())) {
+        return error::common_errc::invalid_argument;
+    }
     encoded.headers["content-type"] = "application/json";
     std::string keyspace = fmt::format("`{}`", bucket_name);
     if (!scope_name.empty()) {
@@ -34,9 +37,14 @@ query_index_drop_request::encode_to(encoded_request_type& encoded, http_context&
     if (!collection_name.empty()) {
         keyspace += ".`" + collection_name + "`";
     }
-    tao::json::value body{ { "statement",
-                             is_primary ? fmt::format(R"(DROP PRIMARY INDEX ON {} USING GSI)", keyspace)
-                                        : fmt::format(R"(DROP INDEX {}.`{}` USING GSI)", keyspace, index_name) },
+
+    std::string drop_index_stmt;
+    if (!scope_name.empty() || !collection_name.empty()) {
+        drop_index_stmt = fmt::format(R"(DROP INDEX `{}` ON {} USING GSI)", index_name, keyspace);
+    } else {
+        drop_index_stmt = fmt::format(R"(DROP INDEX {}.`{}` USING GSI)", keyspace, index_name);
+    }
+    tao::json::value body{ { "statement", is_primary ? fmt::format(R"(DROP PRIMARY INDEX ON {} USING GSI)", keyspace) : drop_index_stmt },
                            { "client_context_id", encoded.client_context_id } };
     encoded.method = "POST";
     encoded.path = "/query/service";
@@ -61,6 +69,8 @@ query_index_drop_request::make_response(error_context::http&& ctx, const encoded
         if (response.status != "success") {
             bool bucket_not_found = false;
             bool index_not_found = false;
+            bool collection_not_found = false;
+            bool scope_not_found = false;
             std::optional<std::error_code> common_ec{};
             for (const auto& entry : payload.at("errors").get_array()) {
                 query_index_drop_response::query_problem error;
@@ -74,7 +84,15 @@ query_index_drop_request::make_response(error_context::http&& ctx, const encoded
                         break;
 
                     case 12003: /* IKey: "datastore.couchbase.keyspace_not_found" */
-                        bucket_not_found = true;
+                        if (error.message.find("missing_collection") != std::string::npos) {
+                            collection_not_found = true;
+                        } else {
+                            bucket_not_found = true;
+                        }
+                        break;
+
+                    case 12021:
+                        scope_not_found = true;
                         break;
 
                     case 12004: /* IKey: "datastore.couchbase.primary_idx_not_found" */
@@ -94,6 +112,10 @@ query_index_drop_request::make_response(error_context::http&& ctx, const encoded
                 }
             } else if (bucket_not_found) {
                 response.ctx.ec = error::common_errc::bucket_not_found;
+            } else if (collection_not_found) {
+                response.ctx.ec = error::common_errc::collection_not_found;
+            } else if (scope_not_found) {
+                response.ctx.ec = error::common_errc::scope_not_found;
             } else if (common_ec) {
                 response.ctx.ec = common_ec.value();
             } else if (!response.errors.empty()) {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/query_index_get_all.cxx

@@ -26,15 +26,26 @@ namespace couchbase::operations::management
 std::error_code
 query_index_get_all_request::encode_to(encoded_request_type& encoded, couchbase::http_context& /* context */) const
 {
+    std::string statement;
+    if (!scope_name.empty() && !collection_name.empty()) {
+        statement = fmt::format(
+          R"(SELECT idx.* FROM system:indexes AS idx WHERE keyspace_id = "{}" AND bucket_id = "{}" AND scope_id = "{}" AND `using`="gsi" ORDER BY is_primary DESC, name ASC)",
+          collection_name,
+          bucket_name,
+          scope_name);
+    } else if (!scope_name.empty()) {
+        statement = fmt::format(
+          R"(SELECT idx.* FROM system:indexes AS idx WHERE bucket_id = "{}" AND scope_id = "{}" AND `using`="gsi" ORDER BY is_primary DESC, name ASC)",
+          bucket_name,
+          scope_name);
+    } else {
+        statement = fmt::format(
+          R"(SELECT idx.* FROM system:indexes AS idx WHERE ((keyspace_id = "{}" AND bucket_id IS MISSING) OR (bucket_id = "{}")) AND `using`="gsi" ORDER BY is_primary DESC, name ASC)",
+          bucket_name,
+          bucket_name);
+    }
     encoded.headers["content-type"] = "application/json";
-    tao::json::value body{
-        { "statement",
-          fmt::format(
-            R"(SELECT idx.* FROM system:indexes AS idx WHERE ((keyspace_id = "{}" AND bucket_id IS MISSING) OR (bucket_id = "{}")) AND `using`="gsi" ORDER BY is_primary DESC, name ASC)",
-            bucket_name,
-            bucket_name) },
-        { "client_context_id", encoded.client_context_id }
-    };
+    tao::json::value body{ { "statement", statement }, { "client_context_id", encoded.client_context_id } };
     encoded.method = "POST";
     encoded.path = "/query/service";
     encoded.body = utils::json::generate(body);
@@ -62,20 +73,10 @@ query_index_get_all_request::make_response(couchbase::error_context::http&& ctx,
             return response;
         }
         for (const auto& entry : payload.at("results").get_array()) {
-            query_index_get_all_response::query_index index;
-            index.id = entry.at("id").get_string();
-            index.datastore_id = entry.at("datastore_id").get_string();
-            index.namespace_id = entry.at("namespace_id").get_string();
-            index.keyspace_id = entry.at("keyspace_id").get_string();
+            couchbase::management::query::index index;
             index.type = entry.at("using").get_string();
             index.name = entry.at("name").get_string();
             index.state = entry.at("state").get_string();
-            if (const auto* prop = entry.find("bucket_id")) {
-                index.bucket_id = prop->get_string();
-            }
-            if (const auto* prop = entry.find("scope_id")) {
-                index.scope_id = prop->get_string();
-            }
             if (const auto* prop = entry.find("is_primary")) {
                 index.is_primary = prop->get_boolean();
             }
@@ -88,6 +89,25 @@ query_index_get_all_request::make_response(couchbase::error_context::http&& ctx,
             for (const auto& key : entry.at("index_key").get_array()) {
                 index.index_key.emplace_back(key.get_string());
             }
+
+            std::string bucket_id, scope_id, keyspace_id;
+            if (const auto* prop = entry.find("bucket_id")) {
+                bucket_id = prop->get_string();
+            }
+            if (const auto* prop = entry.find("scope_id")) {
+                scope_id = prop->get_string();
+            }
+            if (const auto* prop = entry.find("keyspace_id")) {
+                keyspace_id = prop->get_string();
+            }
+            if (bucket_id.empty()) {
+                index.bucket_name = keyspace_id;
+            } else {
+                index.bucket_name = bucket_id;
+                index.scope_name = scope_id;
+                index.collection_name = keyspace_id;
+            }
+
             response.indexes.emplace_back(index);
         }
     }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/query_index_get_all.hxx

@@ -20,31 +20,16 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/management/query_index.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations::management
 {
 struct query_index_get_all_response {
-    struct query_index {
-        bool is_primary{ false };
-        std::string id;
-        std::string name;
-        std::string state;
-        std::string datastore_id;
-        std::string keyspace_id;
-        std::string namespace_id;
-        std::string collection_name;
-        std::string type;
-        std::vector<std::string> index_key{};
-        std::optional<std::string> partition{};
-        std::optional<std::string> condition{};
-        std::optional<std::string> bucket_id{};
-        std::optional<std::string> scope_id{};
-    };
     error_context::http ctx;
     std::string status{};
-    std::vector<query_index> indexes{};
+    std::vector<couchbase::management::query::index> indexes{};
 };
 
 struct query_index_get_all_request {
@@ -56,6 +41,8 @@ struct query_index_get_all_request {
     static const inline service_type type = service_type::query;
 
     std::string bucket_name;
+    std::string scope_name;
+    std::string collection_name;
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/role_get_all.cxx

@@ -18,8 +18,8 @@
 #include <couchbase/operations/management/role_get_all.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/rbac_json.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/rbac_json.hxx>
 #include <couchbase/utils/json.hxx>
 
 namespace couchbase::operations::management
@@ -50,7 +50,7 @@ role_get_all_request::make_response(error_context::http&& ctx, const encoded_res
             return response;
         }
         for (const auto& entry : payload.get_array()) {
-            response.roles.emplace_back(entry.as<rbac::role_and_description>());
+            response.roles.emplace_back(entry.as<couchbase::management::rbac::role_and_description>());
         }
     }
     return response;

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/role_get_all.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/rbac.hxx>
+#include <couchbase/management/rbac.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -28,7 +28,7 @@ namespace couchbase::operations::management
 {
 struct role_get_all_response {
     error_context::http ctx;
-    std::vector<rbac::role_and_description> roles{};
+    std::vector<couchbase::management::rbac::role_and_description> roles{};
 };
 
 struct role_get_all_request {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/search_index_get.cxx

@@ -18,8 +18,8 @@
 #include <couchbase/operations/management/search_index_get.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/search_index_json.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/search_index_json.hxx>
 #include <couchbase/utils/json.hxx>
 
 namespace couchbase::operations::management
@@ -50,7 +50,7 @@ search_index_get_request::make_response(error_context::http&& ctx, const encoded
             }
             response.status = payload.at("status").get_string();
             if (response.status == "ok") {
-                response.index = payload.at("indexDef").as<search_index>();
+                response.index = payload.at("indexDef").as<couchbase::management::search::index>();
                 return response;
             }
         } else if (encoded.status_code == 400) {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/search_index_get.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/search_index.hxx>
+#include <couchbase/management/search_index.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -29,7 +29,7 @@ namespace couchbase::operations::management
 struct search_index_get_response {
     error_context::http ctx;
     std::string status{};
-    search_index index{};
+    couchbase::management::search::index index{};
     std::string error{};
 };
 

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/search_index_get_all.cxx

@@ -18,8 +18,8 @@
 #include <couchbase/operations/management/search_index_get_all.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/search_index_json.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/search_index_json.hxx>
 #include <couchbase/utils/json.hxx>
 
 namespace couchbase::operations::management
@@ -58,7 +58,7 @@ search_index_get_all_request::make_response(error_context::http&& ctx, const enc
             }
             const auto* indexes = indexDefs->find("indexDefs");
             for (const auto& [name, index] : indexes->get_object()) {
-                response.indexes.emplace_back(index.as<search_index>());
+                response.indexes.emplace_back(index.as<couchbase::management::search::index>());
             }
         }
     }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/search_index_get_all.hxx

@@ -17,12 +17,12 @@
 
 #pragma once
 
-#include <couchbase/platform/uuid.h>
+#include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/management/search_index.hxx>
+#include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
-#include <couchbase/error_context/http.hxx>
-#include <couchbase/operations/management/search_index.hxx>
 
 namespace couchbase::operations::management
 {
@@ -30,7 +30,7 @@ struct search_index_get_all_response {
     error_context::http ctx;
     std::string status{};
     std::string impl_version{};
-    std::vector<search_index> indexes{};
+    std::vector<couchbase::management::search::index> indexes{};
 };
 
 struct search_index_get_all_request {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/search_index_upsert.cxx

@@ -18,8 +18,8 @@
 #include <couchbase/operations/management/search_index_upsert.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/search_index_json.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/search_index_json.hxx>
 #include <couchbase/utils/json.hxx>
 
 namespace couchbase::operations::management

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/search_index_upsert.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/search_index.hxx>
+#include <couchbase/management/search_index.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -40,7 +40,7 @@ struct search_index_upsert_request {
 
     static const inline service_type type = service_type::search;
 
-    search_index index;
+    couchbase::management::search::index index;
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_drop.cxx

@@ -18,8 +18,8 @@
 #include <couchbase/operations/management/user_drop.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/rbac_fmt.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/rbac_fmt.hxx>
 
 namespace couchbase::operations::management
 {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_drop.hxx

@@ -17,12 +17,12 @@
 
 #pragma once
 
-#include <couchbase/platform/uuid.h>
+#include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/management/rbac.hxx>
+#include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
-#include <couchbase/error_context/http.hxx>
-#include <couchbase/operations/management/rbac.hxx>
 
 namespace couchbase::operations::management
 {
@@ -39,7 +39,7 @@ struct user_drop_request {
     static const inline service_type type = service_type::management;
 
     std::string username{};
-    rbac::auth_domain domain{ rbac::auth_domain::local };
+    couchbase::management::rbac::auth_domain domain{ couchbase::management::rbac::auth_domain::local };
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_get.cxx

@@ -18,9 +18,9 @@
 #include <couchbase/operations/management/user_get.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/rbac_fmt.hxx>
+#include <couchbase/management/rbac_json.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/rbac_fmt.hxx>
-#include <couchbase/operations/management/rbac_json.hxx>
 #include <couchbase/utils/json.hxx>
 
 namespace couchbase::operations::management
@@ -42,7 +42,7 @@ user_get_request::make_response(error_context::http&& ctx, const encoded_respons
         switch (encoded.status_code) {
             case 200: {
                 try {
-                    response.user = utils::json::parse(encoded.body.data()).as<rbac::user_and_metadata>();
+                    response.user = utils::json::parse(encoded.body.data()).as<couchbase::management::rbac::user_and_metadata>();
                 } catch (const tao::pegtl::parse_error&) {
                     response.ctx.ec = error::common_errc::parsing_failure;
                     return response;

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_get.hxx

@@ -17,18 +17,18 @@
 
 #pragma once
 
-#include <couchbase/platform/uuid.h>
+#include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/management/rbac.hxx>
+#include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
-#include <couchbase/error_context/http.hxx>
-#include <couchbase/operations/management/rbac.hxx>
 
 namespace couchbase::operations::management
 {
 struct user_get_response {
     error_context::http ctx;
-    rbac::user_and_metadata user{};
+    couchbase::management::rbac::user_and_metadata user{};
 };
 
 struct user_get_request {
@@ -40,7 +40,7 @@ struct user_get_request {
     static const inline service_type type = service_type::management;
 
     std::string username{};
-    rbac::auth_domain domain{ rbac::auth_domain::local };
+    couchbase::management::rbac::auth_domain domain{ couchbase::management::rbac::auth_domain::local };
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_get_all.cxx

@@ -18,9 +18,9 @@
 #include <couchbase/operations/management/user_get_all.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/rbac_fmt.hxx>
+#include <couchbase/management/rbac_json.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/rbac_fmt.hxx>
-#include <couchbase/operations/management/rbac_json.hxx>
 #include <couchbase/utils/json.hxx>
 
 namespace couchbase::operations::management
@@ -48,7 +48,7 @@ user_get_all_request::make_response(error_context::http&& ctx, const encoded_res
                 return response;
             }
             for (const auto& entry : payload.get_array()) {
-                response.users.emplace_back(entry.as<rbac::user_and_metadata>());
+                response.users.emplace_back(entry.as<couchbase::management::rbac::user_and_metadata>());
             }
         } else {
             response.ctx.ec = extract_common_error_code(encoded.status_code, encoded.body.data());

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_get_all.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/rbac.hxx>
+#include <couchbase/management/rbac.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -28,7 +28,7 @@ namespace couchbase::operations::management
 {
 struct user_get_all_response {
     error_context::http ctx;
-    std::vector<rbac::user_and_metadata> users{};
+    std::vector<couchbase::management::rbac::user_and_metadata> users{};
 };
 
 struct user_get_all_request {
@@ -39,7 +39,7 @@ struct user_get_all_request {
 
     static const inline service_type type = service_type::management;
 
-    rbac::auth_domain domain{ rbac::auth_domain::local };
+    couchbase::management::rbac::auth_domain domain{ couchbase::management::rbac::auth_domain::local };
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_upsert.cxx

@@ -18,8 +18,8 @@
 #include <couchbase/operations/management/user_upsert.hxx>
 
 #include <couchbase/errors.hxx>
+#include <couchbase/management/rbac_fmt.hxx>
 #include <couchbase/operations/management/error_utils.hxx>
-#include <couchbase/operations/management/rbac_fmt.hxx>
 #include <couchbase/utils/join_strings.hxx>
 #include <couchbase/utils/json.hxx>
 #include <couchbase/utils/url_codec.hxx>

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/user_upsert.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/rbac.hxx>
+#include <couchbase/management/rbac.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -39,8 +39,8 @@ struct user_upsert_request {
 
     static const inline service_type type = service_type::management;
 
-    rbac::auth_domain domain{ rbac::auth_domain::local };
-    rbac::user user{};
+    couchbase::management::rbac::auth_domain domain{ couchbase::management::rbac::auth_domain::local };
+    couchbase::management::rbac::user user{};
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_drop.cxx

@@ -26,8 +26,7 @@ std::error_code
 view_index_drop_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
     encoded.method = "DELETE";
-    encoded.path =
-      fmt::format("/{}/_design/{}{}", bucket_name, name_space == design_document::name_space::development ? "dev_" : "", document_name);
+    encoded.path = fmt::format("/{}/_design/{}{}", bucket_name, ns == design_document_namespace::development ? "dev_" : "", document_name);
     return {};
 }
 

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_drop.hxx

@@ -17,10 +17,10 @@
 
 #pragma once
 
+#include <couchbase/design_document_namespace.hxx>
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/design_document.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -40,7 +40,7 @@ struct view_index_drop_request {
 
     std::string bucket_name;
     std::string document_name;
-    design_document::name_space name_space;
+    design_document_namespace ns;
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_get.cxx

@@ -27,8 +27,7 @@ std::error_code
 view_index_get_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
     encoded.method = "GET";
-    encoded.path =
-      fmt::format("/{}/_design/{}{}", bucket_name, name_space == design_document::name_space::development ? "dev_" : "", document_name);
+    encoded.path = fmt::format("/{}/_design/{}{}", bucket_name, ns == design_document_namespace::development ? "dev_" : "", document_name);
     return {};
 }
 
@@ -39,7 +38,7 @@ view_index_get_request::make_response(error_context::http&& ctx, const encoded_r
     if (!response.ctx.ec) {
         if (encoded.status_code == 200) {
             response.document.name = document_name;
-            response.document.ns = name_space;
+            response.document.ns = ns;
 
             tao::json::value payload{};
             try {
@@ -51,7 +50,7 @@ view_index_get_request::make_response(error_context::http&& ctx, const encoded_r
             const auto* views = payload.find("views");
             if (views != nullptr && views->is_object()) {
                 for (const auto& [name, view_entry] : views->get_object()) {
-                    couchbase::operations::design_document::view view;
+                    couchbase::management::views::design_document::view view;
                     view.name = name;
                     if (view_entry.is_object()) {
                         if (const auto* map = view_entry.find("map"); map != nullptr && map->is_string()) {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_get.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/design_document.hxx>
+#include <couchbase/management/design_document.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -28,7 +28,7 @@ namespace couchbase::operations::management
 {
 struct view_index_get_response {
     error_context::http ctx;
-    design_document document{};
+    couchbase::management::views::design_document document{};
 };
 
 struct view_index_get_request {
@@ -41,7 +41,7 @@ struct view_index_get_request {
 
     std::string bucket_name;
     std::string document_name;
-    design_document::name_space name_space;
+    design_document_namespace ns;
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};