couchbase 4.0.0 → 4.1.0

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_query.cxx

@@ -74,13 +74,13 @@ query_request::encode_to(query_request::encoded_request_type& encoded, http_cont
         body["args"] = std::move(parameters);
     }
     switch (profile) {
-        case profile_mode::phases:
+        case couchbase::query_profile_mode::phases:
             body["profile"] = "phases";
             break;
-        case profile_mode::timings:
+        case couchbase::query_profile_mode::timings:
             body["profile"] = "timings";
             break;
-        case profile_mode::off:
+        case couchbase::query_profile_mode::off:
             break;
     }
     if (max_parallelism) {
@@ -110,10 +110,10 @@ query_request::encode_to(query_request::encoded_request_type& encoded, http_cont
     bool check_scan_wait = false;
     if (scan_consistency) {
         switch (scan_consistency.value()) {
-            case scan_consistency_type::not_bounded:
+            case couchbase::query_scan_consistency::not_bounded:
                 body["scan_consistency"] = "not_bounded";
                 break;
-            case scan_consistency_type::request_plus:
+            case couchbase::query_scan_consistency::request_plus:
                 check_scan_wait = true;
                 body["scan_consistency"] = "request_plus";
                 break;
@@ -190,7 +190,7 @@ query_request::make_response(error_context::query&& ctx, const encoded_response_
     query_response response{ std::move(ctx) };
     response.ctx.statement = statement;
     response.ctx.parameters = body_str;
-    response.served_by_node = response.ctx.last_dispatched_to.value_or("");
+    response.served_by_node = fmt::format("{}:{}", response.ctx.hostname, response.ctx.port);
     if (!response.ctx.ec) {
         tao::json::value payload;
         try {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_query.hxx

@@ -22,8 +22,10 @@
 #include <couchbase/io/http_message.hxx>
 #include <couchbase/io/http_traits.hxx>
 #include <couchbase/json_string.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/platform/uuid.h>
-#include <couchbase/protocol/mutation_token.hxx>
+#include <couchbase/query_profile_mode.hxx>
+#include <couchbase/query_scan_consistency.hxx>
 #include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations
@@ -71,8 +73,6 @@ struct query_request {
     using encoded_response_type = io::http_response;
     using error_context_type = error_context::query;
 
-    enum class scan_consistency_type { not_bounded, request_plus };
-
     static const inline service_type type = service_type::query;
 
     std::string statement;
@@ -88,7 +88,7 @@ struct query_request {
     std::optional<std::chrono::milliseconds> scan_wait{};
     std::optional<std::uint64_t> pipeline_batch{};
     std::optional<std::uint64_t> pipeline_cap{};
-    std::optional<scan_consistency_type> scan_consistency{};
+    std::optional<couchbase::query_scan_consistency> scan_consistency{};
     std::vector<mutation_token> mutation_state{};
     std::optional<std::string> bucket_name{};
     std::optional<std::string> scope_name{};
@@ -96,12 +96,7 @@ struct query_request {
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};
 
-    enum class profile_mode {
-        off,
-        phases,
-        timings,
-    };
-    profile_mode profile{ profile_mode::off };
+    couchbase::query_profile_mode profile{ couchbase::query_profile_mode::off };
 
     std::map<std::string, couchbase::json_string> raw{};
     std::vector<couchbase::json_string> positional_parameters{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_remove.cxx

@@ -28,9 +28,6 @@ remove_request::encode_to(remove_request::encoded_request_type& encoded, mcbp_co
     encoded.partition(partition);
     encoded.cas(cas);
     encoded.body().id(id);
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     return {};
 }
 

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_remove.hxx

@@ -19,6 +19,7 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
 #include <couchbase/protocol/cmd_remove.hxx>
@@ -30,7 +31,7 @@ namespace couchbase::operations
 
 struct remove_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -42,9 +43,8 @@ struct remove_request {
     document_id id;
     uint16_t partition{};
     uint32_t opaque{};
-    protocol::cas cas{ 0 };
+    couchbase::cas cas{ 0 };
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
 
@@ -54,3 +54,10 @@ struct remove_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::remove_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_replace.cxx

@@ -31,9 +31,6 @@ replace_request::encode_to(replace_request::encoded_request_type& encoded, mcbp_
     encoded.body().expiry(expiry);
     encoded.body().flags(flags);
     encoded.body().content(value);
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     if (preserve_expiry) {
         encoded.body().preserve_expiry();
     }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_replace.hxx

@@ -19,6 +19,7 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
 #include <couchbase/protocol/cmd_replace.hxx>
@@ -30,7 +31,7 @@ namespace couchbase::operations
 
 struct replace_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -45,9 +46,8 @@ struct replace_request {
     uint32_t opaque{};
     uint32_t flags{ 0 };
     uint32_t expiry{ 0 };
-    protocol::cas cas{ 0 };
+    couchbase::cas cas{ 0 };
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
     bool preserve_expiry{ false };
@@ -58,3 +58,10 @@ struct replace_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::replace_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_search.cxx

@@ -49,10 +49,10 @@ search_request::encode_to(search_request::encoded_request_type& encoded, http_co
         tao::json::value highlight;
         if (highlight_style) {
             switch (*highlight_style) {
-                case highlight_style_type::html:
+                case couchbase::search_highlight_style::html:
                     highlight["style"] = "html";
                     break;
-                case highlight_style_type::ansi:
+                case couchbase::search_highlight_style::ansi:
                     highlight["style"] = "ansi";
                     break;
             }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_search.hxx

@@ -21,8 +21,10 @@
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
 #include <couchbase/json_string.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/platform/uuid.h>
-#include <couchbase/protocol/mutation_token.hxx>
+#include <couchbase/search_highlight_style.hxx>
+#include <couchbase/search_scan_consistency.hxx>
 #include <couchbase/timeout_defaults.hxx>
 
 #include <map>
@@ -123,15 +125,13 @@ struct search_request {
      */
     bool include_locations{ false };
 
-    enum class highlight_style_type { html, ansi };
-    std::optional<highlight_style_type> highlight_style{};
+    std::optional<couchbase::search_highlight_style> highlight_style{};
     std::vector<std::string> highlight_fields{};
     std::vector<std::string> fields{};
     std::optional<std::string> scope_name{};
     std::vector<std::string> collections{};
 
-    enum class scan_consistency_type { not_bounded };
-    std::optional<scan_consistency_type> scan_consistency{};
+    std::optional<couchbase::search_scan_consistency> scan_consistency{};
     std::vector<mutation_token> mutation_state{};
 
     std::vector<std::string> sort_specs{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_touch.hxx

@@ -21,15 +21,15 @@
 #include <couchbase/io/mcbp_context.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
-#include <couchbase/timeout_defaults.hxx>
 #include <couchbase/protocol/cmd_touch.hxx>
+#include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations
 {
 
 struct touch_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
 };
 
 struct touch_request {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_unlock.hxx

@@ -29,7 +29,7 @@ namespace couchbase::operations
 
 struct unlock_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
 };
 
 struct unlock_request {
@@ -40,7 +40,7 @@ struct unlock_request {
     document_id id;
     uint16_t partition{};
     uint32_t opaque{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
 

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_upsert.cxx

@@ -31,9 +31,6 @@ upsert_request::encode_to(upsert_request::encoded_request_type& encoded, mcbp_co
     encoded.body().expiry(expiry);
     encoded.body().flags(flags);
     encoded.body().content(value);
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     if (preserve_expiry) {
         encoded.body().preserve_expiry();
     }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_upsert.hxx

@@ -19,6 +19,7 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
 #include <couchbase/protocol/cmd_upsert.hxx>
@@ -30,7 +31,7 @@ namespace couchbase::operations
 
 struct upsert_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -46,7 +47,6 @@ struct upsert_request {
     uint32_t flags{ 0 };
     uint32_t expiry{ 0 };
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
     bool preserve_expiry{ false };
@@ -57,3 +57,10 @@ struct upsert_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::upsert_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_view.cxx

@@ -38,13 +38,13 @@ document_view_request::encode_to(document_view_request::encoded_request_type& en
     }
     if (consistency) {
         switch (*consistency) {
-            case scan_consistency::not_bounded:
+            case couchbase::view_scan_consistency::not_bounded:
                 query_string.emplace_back("stale=ok");
                 break;
-            case scan_consistency::update_after:
+            case couchbase::view_scan_consistency::update_after:
                 query_string.emplace_back("stale=update_after");
                 break;
-            case scan_consistency::request_plus:
+            case couchbase::view_scan_consistency::request_plus:
                 query_string.emplace_back("stale=false");
                 break;
         }
@@ -78,10 +78,10 @@ document_view_request::encode_to(document_view_request::encoded_request_type& en
     }
     if (order) {
         switch (*order) {
-            case sort_order::descending:
+            case couchbase::view_sort_order::descending:
                 query_string.emplace_back("descending=true");
                 break;
-            case sort_order::ascending:
+            case couchbase::view_sort_order::ascending:
                 query_string.emplace_back("descending=false");
                 break;
         }
@@ -101,7 +101,7 @@ document_view_request::encode_to(document_view_request::encoded_request_type& en
     encoded.headers["content-type"] = "application/json";
     encoded.path = fmt::format("/{}/_design/{}{}/_view/{}?{}",
                                bucket_name,
-                               name_space == design_document::name_space::development ? "dev_" : "",
+                               ns == design_document_namespace::development ? "dev_" : "",
                                document_name,
                                view_name,
                                utils::join_strings(query_string, "&"));

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/document_view.hxx

@@ -17,12 +17,14 @@
 
 #pragma once
 
+#include <couchbase/design_document_namespace.hxx>
 #include <couchbase/error_context/view.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>
+#include <couchbase/view_scan_consistency.hxx>
+#include <couchbase/view_sort_order.hxx>
 
 namespace couchbase::operations
 {
@@ -60,17 +62,12 @@ struct document_view_request {
     std::string bucket_name;
     std::string document_name;
     std::string view_name;
-    design_document::name_space name_space;
+    design_document_namespace ns;
 
     std::optional<std::uint64_t> limit;
     std::optional<std::uint64_t> skip;
 
-    enum class scan_consistency {
-        not_bounded,
-        update_after,
-        request_plus,
-    };
-    std::optional<scan_consistency> consistency;
+    std::optional<couchbase::view_scan_consistency> consistency;
 
     std::vector<std::string> keys;
 
@@ -86,8 +83,7 @@ struct document_view_request {
     std::optional<std::uint32_t> group_level;
     bool debug{ false };
 
-    enum class sort_order { ascending, descending };
-    std::optional<sort_order> order;
+    std::optional<couchbase::view_sort_order> order;
     std::vector<std::string> query_string{};
     std::optional<std::function<utils::json::stream_control(std::string)>> row_callback{};
     std::optional<std::string> client_context_id{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/CMakeLists.txt

@@ -9,15 +9,12 @@ add_library(
   analytics_index_create.cxx
   analytics_index_drop.cxx
   analytics_index_get_all.cxx
-  analytics_link_azure_blob_external.cxx
   analytics_link_connect.cxx
-  analytics_link_couchbase_remote.cxx
   analytics_link_create.cxx
   analytics_link_disconnect.cxx
   analytics_link_drop.cxx
   analytics_link_get_all.cxx
   analytics_link_replace.cxx
-  analytics_link_s3_external.cxx
   bucket_create.cxx
   bucket_describe.cxx
   bucket_drop.cxx

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

@@ -65,7 +65,7 @@ analytics_dataset_create_request::make_response(error_context::http&& ctx, const
 
             if (const auto* errors = payload.find("errors"); errors != nullptr && errors->is_array()) {
                 for (const auto& error : errors->get_array()) {
-                    analytics_dataset_create_response::problem err{
+                    analytics_problem err{
                         error.at("code").as<std::uint32_t>(),
                         error.at("msg").get_string(),
                     };

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

@@ -20,20 +20,16 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/operations/management/analytics_problem.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations::management
 {
 struct analytics_dataset_create_response {
-    struct problem {
-        std::uint32_t code;
-        std::string message;
-    };
-
     error_context::http ctx;
     std::string status{};
-    std::vector<problem> errors{};
+    std::vector<analytics_problem> errors{};
 };
 
 struct analytics_dataset_create_request {

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

@@ -59,7 +59,7 @@ analytics_dataset_drop_request::make_response(error_context::http&& ctx, const e
 
             if (auto* errors = payload.find("errors"); errors != nullptr && errors->is_array()) {
                 for (const auto& error : errors->get_array()) {
-                    analytics_dataset_drop_response::problem err{
+                    analytics_problem err{
                         error.at("code").as<std::uint32_t>(),
                         error.at("msg").get_string(),
                     };

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

@@ -17,23 +17,19 @@
 
 #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/operations/management/analytics_problem.hxx>
+#include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
-#include <couchbase/error_context/http.hxx>
 
 namespace couchbase::operations::management
 {
 struct analytics_dataset_drop_response {
-    struct problem {
-        std::uint32_t code;
-        std::string message;
-    };
-
     error_context::http ctx;
     std::string status{};
-    std::vector<problem> errors{};
+    std::vector<analytics_problem> errors{};
 };
 
 struct analytics_dataset_drop_request {

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

@@ -53,7 +53,7 @@ analytics_dataset_get_all_request::make_response(error_context::http&& ctx, cons
         if (response.status != "success") {
             if (const auto* errors = payload.find("errors"); errors != nullptr && errors->is_array()) {
                 for (const auto& error : errors->get_array()) {
-                    analytics_dataset_get_all_response::problem err{
+                    analytics_problem err{
                         error.at("code").as<std::uint32_t>(),
                         error.at("msg").get_string(),
                     };
@@ -66,7 +66,7 @@ analytics_dataset_get_all_request::make_response(error_context::http&& ctx, cons
         auto* results = payload.find("results");
         if (results != nullptr && results->is_array()) {
             for (const auto& res : results->get_array()) {
-                analytics_dataset_get_all_response::dataset ds;
+                couchbase::management::analytics::dataset ds;
                 ds.name = res.at("DatasetName").get_string();
                 ds.dataverse_name = res.at("DataverseName").get_string();
                 ds.link_name = res.at("LinkName").get_string();

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

@@ -20,28 +20,18 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/management/analytics_dataset.hxx>
+#include <couchbase/operations/management/analytics_problem.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations::management
 {
 struct analytics_dataset_get_all_response {
-    struct dataset {
-        std::string name;
-        std::string dataverse_name;
-        std::string link_name;
-        std::string bucket_name;
-    };
-
-    struct problem {
-        std::uint32_t code;
-        std::string message;
-    };
-
     error_context::http ctx;
     std::string status{};
-    std::vector<dataset> datasets{};
-    std::vector<problem> errors{};
+    std::vector<couchbase::management::analytics::dataset> datasets{};
+    std::vector<analytics_problem> errors{};
 };
 
 struct analytics_dataset_get_all_request {

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

@@ -58,7 +58,7 @@ analytics_dataverse_create_request::make_response(error_context::http&& ctx, con
 
             if (auto* errors = payload.find("errors"); errors != nullptr && errors->is_array()) {
                 for (const auto& error : errors->get_array()) {
-                    analytics_dataverse_create_response::problem err{
+                    analytics_problem err{
                         error.at("code").as<std::uint32_t>(),
                         error.at("msg").get_string(),
                     };

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

@@ -20,20 +20,16 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/operations/management/analytics_problem.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations::management
 {
 struct analytics_dataverse_create_response {
-    struct problem {
-        std::uint32_t code;
-        std::string message;
-    };
-
     error_context::http ctx;
     std::string status{};
-    std::vector<problem> errors{};
+    std::vector<analytics_problem> errors{};
 };
 
 struct analytics_dataverse_create_request {

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

@@ -58,7 +58,7 @@ analytics_dataverse_drop_request::make_response(error_context::http&& ctx, const
 
             if (auto* errors = payload.find("errors"); errors != nullptr && errors->is_array()) {
                 for (const auto& error : errors->get_array()) {
-                    analytics_dataverse_drop_response::problem err{
+                    analytics_problem err{
                         error.at("code").as<std::uint32_t>(),
                         error.at("msg").get_string(),
                     };

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

@@ -20,20 +20,16 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/operations/management/analytics_problem.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations::management
 {
 struct analytics_dataverse_drop_response {
-    struct problem {
-        std::uint32_t code;
-        std::string message;
-    };
-
     error_context::http ctx;
     std::string status{};
-    std::vector<problem> errors{};
+    std::vector<analytics_problem> errors{};
 };
 
 struct analytics_dataverse_drop_request {

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

@@ -56,7 +56,7 @@ analytics_get_pending_mutations_request::make_response(error_context::http&& ctx
         response.status = payload.optional<std::string>("status").value_or("unknown");
         if (auto* errors = payload.find("errors"); errors != nullptr && errors->is_array()) {
             for (const auto& error : errors->get_array()) {
-                analytics_get_pending_mutations_response::problem err{
+                analytics_problem err{
                     error.at("code").as<std::uint32_t>(),
                     error.at("msg").get_string(),
                 };

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

@@ -20,20 +20,16 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
+#include <couchbase/operations/management/analytics_problem.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations::management
 {
 struct analytics_get_pending_mutations_response {
-    struct problem {
-        std::uint32_t code;
-        std::string message;
-    };
-
     error_context::http ctx;
     std::string status{};
-    std::vector<problem> errors{};
+    std::vector<analytics_problem> errors{};
     std::map<std::string, std::uint64_t> stats{};
 };
 

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

@@ -72,7 +72,7 @@ analytics_index_create_request::make_response(error_context::http&& ctx, const e
 
             if (auto* errors = payload.find("errors"); errors != nullptr && errors->is_array()) {
                 for (const auto& error : errors->get_array()) {
-                    analytics_index_create_response::problem err{
+                    analytics_problem err{
                         error.at("code").as<std::uint32_t>(),
                         error.at("msg").get_string(),
                     };