couchbase 4.2.8 → 4.2.10

package/deps/couchbase-cxx-client/core/operations/management/analytics_link_connect.cxx

@@ -21,6 +21,8 @@
 #include "core/utils/name_codec.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/analytics_link_disconnect.cxx

@@ -21,6 +21,8 @@
 #include "core/utils/name_codec.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/analytics_link_drop.cxx

@@ -21,6 +21,8 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/analytics_link_get_all.cxx

@@ -24,6 +24,8 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/bucket_create.cxx

@@ -31,7 +31,7 @@ std::error_code
 bucket_create_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
     encoded.method = "POST";
-    encoded.path = fmt::format("/pools/default/buckets");
+    encoded.path = "/pools/default/buckets";
 
     encoded.headers["content-type"] = "application/x-www-form-urlencoded";
     encoded.body.append(fmt::format("name={}", utils::string_codec::form_encode(bucket.name)));

package/deps/couchbase-cxx-client/core/operations/management/bucket_describe.cxx

@@ -20,6 +20,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/bucket_drop.cxx

@@ -19,6 +19,8 @@
 
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/bucket_flush.cxx

@@ -19,6 +19,8 @@
 
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/bucket_get.cxx

@@ -21,6 +21,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/change_password.cxx

@@ -19,13 +19,15 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code
 change_password_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
     encoded.method = "POST";
-    encoded.path = fmt::format("/controller/changePassword");
+    encoded.path = "/controller/changePassword";
     encoded.headers["content-type"] = "application/x-www-form-urlencoded";
     encoded.body = fmt::format("password={}", utils::string_codec::form_encode(newPassword));
 

package/deps/couchbase-cxx-client/core/operations/management/collection_create.cxx

@@ -23,17 +23,23 @@
 
 #include <regex>
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code
-collection_create_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
+collection_create_request::encode_to(encoded_request_type& encoded, http_context& /*context*/) const
 {
     encoded.method = "POST";
     encoded.path = fmt::format("/pools/default/buckets/{}/scopes/{}/collections", bucket_name, scope_name);
     encoded.headers["content-type"] = "application/x-www-form-urlencoded";
     encoded.body = fmt::format("name={}", utils::string_codec::form_encode(collection_name));
-    if (max_expiry > 0) {
-        encoded.body.append(fmt::format("&maxTTL={}", max_expiry));
+    if (max_expiry >= -1) {
+        if (max_expiry != 0) {
+            encoded.body.append(fmt::format("&maxTTL={}", max_expiry));
+        }
+    } else {
+        return couchbase::errc::common::invalid_argument;
     }
     if (history.has_value()) {
         encoded.body.append(fmt::format("&history={}", history.value()));
@@ -51,9 +57,6 @@ collection_create_request::make_response(error_context::http&& ctx, const encode
                 std::regex collection_exists("Collection with name .+ already exists");
                 if (std::regex_search(encoded.body.data(), collection_exists)) {
                     response.ctx.ec = errc::management::collection_exists;
-                } else if (encoded.body.data().find("Not allowed on this version of cluster") != std::string::npos ||
-                           encoded.body.data().find("Bucket must have storage_mode=magma") != std::string::npos) {
-                    response.ctx.ec = errc::common::feature_not_available;
                 } else {
                     response.ctx.ec = errc::common::invalid_argument;
                 }

package/deps/couchbase-cxx-client/core/operations/management/collection_create.hxx

@@ -41,7 +41,7 @@ struct collection_create_request {
     std::string bucket_name;
     std::string scope_name;
     std::string collection_name;
-    std::uint32_t max_expiry{ 0 };
+    std::int32_t max_expiry{ 0 };
     std::optional<bool> history{};
 
     std::optional<std::string> client_context_id{};

package/deps/couchbase-cxx-client/core/operations/management/collection_drop.cxx

@@ -22,6 +22,8 @@
 
 #include <regex>
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/collection_update.cxx

@@ -21,19 +21,25 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 #include <regex>
 
 namespace couchbase::core::operations::management
 {
 std::error_code
-collection_update_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
+collection_update_request::encode_to(encoded_request_type& encoded, http_context& /*context*/) const
 {
     encoded.method = "PATCH";
     encoded.path = fmt::format("/pools/default/buckets/{}/scopes/{}/collections/{}", bucket_name, scope_name, collection_name);
     encoded.headers["content-type"] = "application/x-www-form-urlencoded";
     std::map<std::string, std::string> values{};
     if (max_expiry.has_value()) {
-        values["maxTTL"] = std::to_string(max_expiry.value());
+        if (max_expiry.value() >= -1) {
+            values["maxTTL"] = std::to_string(max_expiry.value());
+        } else {
+            return errc::common::invalid_argument;
+        }
     }
     if (history.has_value()) {
         values["history"] = history.value() ? "true" : "false";
@@ -49,12 +55,7 @@ collection_update_request::make_response(error_context::http&& ctx, const encode
     if (!response.ctx.ec) {
         switch (encoded.status_code) {
             case 400: {
-                if (encoded.body.data().find("Not allowed on this version of cluster") != std::string::npos ||
-                    encoded.body.data().find("Bucket must have storage_mode=magma") != std::string::npos) {
-                    response.ctx.ec = errc::common::feature_not_available;
-                } else {
-                    response.ctx.ec = errc::common::invalid_argument;
-                }
+                response.ctx.ec = errc::common::invalid_argument;
             } break;
             case 404: {
                 std::regex scope_not_found("Scope with name .+ is not found");

package/deps/couchbase-cxx-client/core/operations/management/collection_update.hxx

@@ -41,7 +41,7 @@ struct collection_update_request {
     std::string bucket_name;
     std::string scope_name;
     std::string collection_name;
-    std::optional<std::uint32_t> max_expiry{};
+    std::optional<std::int32_t> max_expiry{};
     std::optional<bool> history{};
 
     std::optional<std::string> client_context_id{};

package/deps/couchbase-cxx-client/core/operations/management/error_utils.cxx

@@ -18,6 +18,8 @@
 #include "error_utils.hxx"
 #include "core/utils/json.hxx"
 
+#include <regex>
+
 namespace couchbase::core::operations::management
 {
 
@@ -45,6 +47,9 @@ extract_common_query_error_code(std::uint64_t code, const std::string& message)
         case 1194: /* ICode: E_SERVICE_USER_RESULT_SIZE_EXCEEDED, IKey: "service.result.size.exceeded" */
             return errc::common::rate_limited;
 
+        case 13014: /*ICode: E_DATASTORE_INSUFFICIENT_CREDENTIALS, IKey: "datastore.couchbase.insufficient_credentials" */
+            return errc::common::authentication_failure;
+
         case 5000:
             if (message.find("Limit for number of indexes that can be created per scope has been reached") != std::string::npos) {
                 return errc::common::quota_limited;
@@ -116,13 +121,12 @@ translate_query_error_code(std::uint64_t error, const std::string& message, std:
 {
     switch (error) {
         case 5000: /* IKey: "Internal Error" */
-            if (message.find(" already exists") != std::string::npos) {
+            if (std::regex_search(message, std::regex{ ".*[iI]ndex .*already exist.*" })) {
                 return errc::common::index_exists;
-            }
-            if (message.find("not found.") != std::string::npos) {
+            } else if (message.find("Index does not exist") != std::string::npos ||
+                       std::regex_search(message, std::regex{ ".*[iI]ndex .*[nN]ot [fF]ound.*" })) {
                 return errc::common::index_not_found;
-            }
-            if (message.find("Bucket Not Found") != std::string::npos) {
+            } else if (message.find("Bucket Not Found") != std::string::npos) {
                 return errc::common::bucket_not_found;
             }
             break;

package/deps/couchbase-cxx-client/core/operations/management/eventing_deploy_function.cxx

@@ -19,6 +19,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/eventing_drop_function.cxx

@@ -19,6 +19,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/eventing_get_function.cxx

@@ -20,6 +20,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/eventing_pause_function.cxx

@@ -19,6 +19,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/eventing_resume_function.cxx

@@ -19,6 +19,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/eventing_undeploy_function.cxx

@@ -19,6 +19,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/eventing_upsert_function.cxx

@@ -21,6 +21,8 @@
 
 #include <tao/json/contrib/traits.hpp>
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/group_drop.cxx

@@ -19,6 +19,8 @@
 
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/group_get.cxx

@@ -21,6 +21,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/group_get_all.cxx

@@ -27,7 +27,7 @@ std::error_code
 group_get_all_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
     encoded.method = "GET";
-    encoded.path = fmt::format("/settings/rbac/groups");
+    encoded.path = "/settings/rbac/groups";
     encoded.headers["content-type"] = "application/x-www-form-urlencoded";
     return {};
 }

package/deps/couchbase-cxx-client/core/operations/management/query_index_build_deferred.hxx

@@ -30,8 +30,8 @@ namespace management
 {
 struct query_index_build_deferred_response {
     struct query_problem {
-        std::uint64_t code;
-        std::string message;
+        std::uint64_t code{};
+        std::string message{};
     };
     error_context::http ctx;
     std::string status{};

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

@@ -22,6 +22,9 @@
 #include "core/utils/keyspace.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+#include <regex>
+
 namespace couchbase::core::operations::management
 {
 std::error_code
@@ -95,7 +98,7 @@ query_index_create_request::make_response(error_context::http&& ctx, const encod
                 error.message = entry.at("msg").get_string();
                 switch (error.code) {
                     case 5000: /* IKey: "Internal Error" */
-                        if (error.message.find(" already exists") != std::string::npos) {
+                        if (std::regex_search(error.message, std::regex{ ".*[iI]ndex .*already exist.*" })) {
                             index_already_exists = true;
                         }
                         if (error.message.find("Bucket Not Found") != std::string::npos) {

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

@@ -21,6 +21,9 @@
 #include "core/utils/keyspace.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+#include <regex>
+
 namespace couchbase::core::operations::management
 {
 std::error_code
@@ -78,7 +81,7 @@ query_index_drop_request::make_response(error_context::http&& ctx, const encoded
                 error.message = entry.at("msg").get_string();
                 switch (error.code) {
                     case 5000: /* IKey: "Internal Error" */
-                        if (error.message.find("not found.") != std::string::npos) {
+                        if (std::regex_search(error.message, std::regex{ ".*[iI]ndex .*[nN]ot [fF]ound.*" })) {
                             index_not_found = true;
                         }
                         break;

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

@@ -90,7 +90,7 @@ query_index_get_all_request::make_response(couchbase::core::error_context::http&
             return response;
         }
         for (const auto& entry : payload.at("results").get_array()) {
-            couchbase::management::query::index index;
+            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();

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

@@ -30,7 +30,7 @@ namespace couchbase::core::operations::management
 struct query_index_get_all_response {
     error_context::http ctx;
     std::string status{};
-    std::vector<couchbase::management::query::index> indexes{};
+    std::vector<couchbase::management::query_index> indexes{};
 };
 
 struct query_index_get_all_request {

package/deps/couchbase-cxx-client/core/operations/management/scope_create.cxx

@@ -21,6 +21,8 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 #include <regex>
 
 namespace couchbase::core::operations::management

package/deps/couchbase-cxx-client/core/operations/management/scope_drop.cxx

@@ -22,6 +22,8 @@
 
 #include <regex>
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/scope_get_all.cxx

@@ -21,6 +21,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code

package/deps/couchbase-cxx-client/core/operations/management/search_get_stats.cxx

@@ -22,17 +22,17 @@
 namespace couchbase::core::operations::management
 {
 std::error_code
-search_index_stats_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
+search_get_stats_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
     encoded.method = "GET";
     encoded.path = "/api/nsstats";
     return {};
 }
 
-search_index_stats_response
-search_index_stats_request::make_response(error_context::http&& ctx, const encoded_response_type& encoded) const
+search_get_stats_response
+search_get_stats_request::make_response(error_context::http&& ctx, const encoded_response_type& encoded) const
 {
-    search_index_stats_response response{ std::move(ctx) };
+    search_get_stats_response response{ std::move(ctx) };
     if (!response.ctx.ec) {
         response.stats = encoded.body.data();
     }

package/deps/couchbase-cxx-client/core/operations/management/search_get_stats.hxx

@@ -25,13 +25,13 @@
 
 namespace couchbase::core::operations::management
 {
-struct search_index_stats_response {
+struct search_get_stats_response {
     error_context::http ctx;
     std::string stats{};
 };
 
-struct search_index_stats_request {
-    using response_type = search_index_stats_response;
+struct search_get_stats_request {
+    using response_type = search_get_stats_response;
     using encoded_request_type = io::http_request;
     using encoded_response_type = io::http_response;
     using error_context_type = error_context::http;
@@ -43,6 +43,6 @@ struct search_index_stats_request {
 
     [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded, http_context& context) const;
 
-    [[nodiscard]] search_index_stats_response make_response(error_context::http&& ctx, const encoded_response_type& encoded) const;
+    [[nodiscard]] search_get_stats_response make_response(error_context::http&& ctx, const encoded_response_type& encoded) const;
 };
 } // namespace couchbase::core::operations::management

package/deps/couchbase-cxx-client/core/operations/management/search_index_analyze_document.cxx

@@ -20,6 +20,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code
@@ -31,7 +33,11 @@ search_index_analyze_document_request::encode_to(encoded_request_type& encoded,
     encoded.method = "POST";
     encoded.headers["cache-control"] = "no-cache";
     encoded.headers["content-type"] = "application/json";
-    encoded.path = fmt::format("/api/index/{}/analyzeDoc", index_name);
+    if (bucket_name.has_value() && scope_name.has_value()) {
+        encoded.path = fmt::format("/api/bucket/{}/scope/{}/index/{}/analyzeDoc", bucket_name.value(), scope_name.value(), index_name);
+    } else {
+        encoded.path = fmt::format("/api/index/{}/analyzeDoc", index_name);
+    }
     encoded.body = encoded_document;
     return {};
 }
@@ -76,6 +82,18 @@ search_index_analyze_document_request::make_response(error_context::http&& ctx,
                 response.ctx.ec = errc::common::index_exists;
                 return response;
             }
+        } else if (encoded.status_code == 404) {
+            tao::json::value payload{};
+            try {
+                payload = utils::json::parse(encoded.body.data());
+            } catch (const tao::pegtl::parse_error&) {
+                response.ctx.ec = errc::common::parsing_failure;
+                return response;
+            }
+            response.status = payload.at("status").get_string();
+            response.error = payload.at("error").get_string();
+            response.ctx.ec = errc::common::feature_not_available;
+            return response;
         }
         response.ctx.ec = extract_common_error_code(encoded.status_code, encoded.body.data());
     }

package/deps/couchbase-cxx-client/core/operations/management/search_index_analyze_document.hxx

@@ -43,6 +43,9 @@ struct search_index_analyze_document_request {
     std::string index_name;
     std::string encoded_document;
 
+    std::optional<std::string> bucket_name;
+    std::optional<std::string> scope_name;
+
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};
 

package/deps/couchbase-cxx-client/core/operations/management/search_index_control_ingest.cxx

@@ -20,6 +20,8 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
 
+#include <fmt/core.h>
+
 namespace couchbase::core::operations::management
 {
 std::error_code
@@ -29,7 +31,15 @@ search_index_control_ingest_request::encode_to(encoded_request_type& encoded, ht
         return errc::common::invalid_argument;
     }
     encoded.method = "POST";
-    encoded.path = fmt::format("/api/index/{}/ingestControl/{}", index_name, pause ? "pause" : "resume");
+    if (bucket_name.has_value() && scope_name.has_value()) {
+        encoded.path = fmt::format("/api/bucket/{}/scope/{}/index/{}/ingestControl/{}",
+                                   bucket_name.value(),
+                                   scope_name.value(),
+                                   index_name,
+                                   pause ? "pause" : "resume");
+    } else {
+        encoded.path = fmt::format("/api/index/{}/ingestControl/{}", index_name, pause ? "pause" : "resume");
+    }
     return {};
 }
 
@@ -64,6 +74,18 @@ search_index_control_ingest_request::make_response(error_context::http&& ctx, co
                 response.ctx.ec = errc::common::index_not_found;
                 return response;
             }
+        } else if (encoded.status_code == 404) {
+            tao::json::value payload{};
+            try {
+                payload = utils::json::parse(encoded.body.data());
+            } catch (const tao::pegtl::parse_error&) {
+                response.ctx.ec = errc::common::parsing_failure;
+                return response;
+            }
+            response.status = payload.at("status").get_string();
+            response.error = payload.at("error").get_string();
+            response.ctx.ec = errc::common::feature_not_available;
+            return response;
         }
         response.ctx.ec = extract_common_error_code(encoded.status_code, encoded.body.data());
     }

package/deps/couchbase-cxx-client/core/operations/management/search_index_control_ingest.hxx

@@ -42,6 +42,9 @@ struct search_index_control_ingest_request {
     std::string index_name;
     bool pause;
 
+    std::optional<std::string> bucket_name;
+    std::optional<std::string> scope_name;
+
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};