npm - couchbase - Versions diffs - 4.2.8 → 4.2.9 - Mend

couchbase 4.2.8 → 4.2.9

Files changed (315) hide show

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

@@ -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 CHANGED Viewed

@@ -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/error_utils.cxx CHANGED Viewed

@@ -18,6 +18,8 @@
 #include "error_utils.hxx"
 #include "core/utils/json.hxx"
+#include <regex>
 namespace couchbase::core::operations::management
 {
@@ -116,13 +118,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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/search_index_control_ingest.cxx CHANGED Viewed

@@ -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/search_index_control_plan_freeze.cxx CHANGED Viewed

@@ -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/search_index_control_query.cxx CHANGED Viewed

@@ -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/search_index_drop.cxx CHANGED Viewed

@@ -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/search_index_get.cxx CHANGED Viewed

@@ -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_index_get_all.cxx CHANGED Viewed

@@ -27,7 +27,7 @@ std::error_code
 search_index_get_all_request::encode_to(encoded_request_type& encoded, http_context& /* context */) const
 {
     encoded.method = "GET";
-    encoded.path = fmt::format("/api/index");
+    encoded.path = "/api/index";
     return {};
 }

package/deps/couchbase-cxx-client/core/operations/management/search_index_get_documents_count.cxx CHANGED Viewed

@@ -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/search_index_get_stats.cxx CHANGED Viewed

@@ -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/search_index_upsert.cxx CHANGED Viewed

@@ -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/view_index_drop.cxx CHANGED Viewed

@@ -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/view_index_get.cxx CHANGED Viewed

@@ -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/view_index_get_all.cxx CHANGED Viewed

@@ -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/view_index_upsert.cxx CHANGED Viewed

@@ -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.hxx CHANGED Viewed

@@ -43,4 +43,3 @@
 #include "core/operations/document_upsert.hxx"
 #include "core/operations/document_view.hxx"
 #include "core/operations/http_noop.hxx"
-#include "core/operations/mcbp_noop.hxx"