couchbase 3.4.2 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78899f9fd7614787a46a54ca185e869cc93a7714ff0a1ef4c38feef98d7d54be
-  data.tar.gz: f42e90dc0e70b2f690f9c4f7dffe3cd9675db7d8f9025bb5db315b6e59407199
+  metadata.gz: b3c1e2edfe7f74eb3f3094dd526e7dc1896f3002caca935ddeb76923b593f341
+  data.tar.gz: b5409f7083156b38aee870037ce0c5d3a14dc7ffe3aa3ac64b5862245b47e4d5
 SHA512:
-  metadata.gz: 804b0a4c05754a5349b19f4b06ee1017f62790e2f5f50696639d9cfc1b785d4f43d688cb05c325f5e10cb1e36fca1e4775c93f91cbf10ad600a5f4755a091a28
-  data.tar.gz: cbb64fe3e1c2f5925584032cd69bb626e87c9ff61c7735a570a7e291287874076e366e2282e15d432c18832b9853c749d806cab28aa65716dc91ab835910bd6b
+  metadata.gz: 16705649dc3954db461a7f8a63ee1168a4b191cacb0744e4e5b5b7b110788491d42fab78611b4898078a0276bbe0d9930352e24b4f95db87ab79ed6b6e8f9101
+  data.tar.gz: 157af7be99dc745ef7d95ef45490c0025f16ead6abb2f75079188405e82fcec9a64abb681695720e9080fd36b3c17883a56f84bafd06062e56c22ad9286c7ed4

data/README.md

@@ -2,7 +2,7 @@
 
 [![license](https://img.shields.io/github/license/couchbase/couchbase-ruby-client?color=brightgreen)](https://opensource.org/licenses/Apache-2.0)
 [![gem](https://img.shields.io/gem/v/couchbase?color=brightgreen)](https://rubygems.org/gems/couchbase)
-[![commits](https://img.shields.io/github/commits-since/couchbase/couchbase-ruby-client/latest?color=brightgreen)](https://github.com/couchbase/couchbase-ruby-client/commits/master)
+[![commits](https://img.shields.io/github/commits-since/couchbase/couchbase-ruby-client/latest?color=brightgreen)](https://github.com/couchbase/couchbase-ruby-client/commits/main)
 [![linters](https://img.shields.io/github/actions/workflow/status/couchbase/couchbase-ruby-client/linters.yml?branch=main&label=linters)](https://github.com/couchbase/couchbase-ruby-client/actions?query=workflow%3Alinters)
 
 This repository contains the third generation of the official Couchbase SDK for Ruby (aka. SDKv3)
@@ -23,7 +23,7 @@ The library has been tested with MRI 3.0, 3.1 and 3.2. Supported platforms are L
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.4.2"
+gem "couchbase", "3.4.4"
 ```
 
 And then execute:

data/ext/couchbase/CMakeLists.txt

@@ -80,6 +80,7 @@ add_subdirectory(core/tracing)
 add_subdirectory(core/metrics)
 
 set(couchbase_cxx_client_FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx
         core/agent.cxx
         core/agent_config.cxx
         core/agent_group.cxx
@@ -91,7 +92,7 @@ set(couchbase_cxx_client_FILES
         core/cluster_agent_config.cxx
         core/cluster_options.cxx
         core/collections_component.cxx
-        core/config_profile.cxx
+        core/config_profiles.cxx
         core/core_sdk_shim.cxx
         core/crud_component.cxx
         core/dispatcher.cxx
@@ -99,6 +100,7 @@ set(couchbase_cxx_client_FILES
         core/free_form_http_request.cxx
         core/key_value_config.cxx
         core/n1ql_query_options.cxx
+        core/origin.cxx
         core/range_scan_options.cxx
         core/range_scan_orchestrator.cxx
         core/retry_orchestrator.cxx
@@ -231,6 +233,7 @@ set(couchbase_cxx_client_FILES
         core/protocol/cmd_increment.cxx
         core/protocol/cmd_insert.cxx
         core/protocol/cmd_lookup_in.cxx
+        core/protocol/cmd_lookup_in_replica.cxx
         core/protocol/cmd_mutate_in.cxx
         core/protocol/cmd_noop.cxx
         core/protocol/cmd_observe_seqno.cxx
@@ -256,41 +259,84 @@ set(couchbase_cxx_client_FILES
         core/utils/split_string.cxx
         core/utils/url_codec.cxx
         core/impl/analytics.cxx
+        core/impl/search.cxx
         core/impl/analytics_error_category.cxx
         core/impl/append.cxx
         core/impl/best_effort_retry_strategy.cxx
+        core/impl/boolean_field_query.cxx
+        core/impl/boolean_query.cxx
         core/impl/build_deferred_query_indexes.cxx
-        core/impl/collection_query_index_manager.cxx
         core/impl/cluster.cxx
         core/impl/common_error_category.cxx
         core/impl/configuration_profiles_registry.cxx
+        core/impl/conjunction_query.cxx
+        core/impl/create_bucket.cxx
         core/impl/create_query_index.cxx
+        core/impl/date_range.cxx
+        core/impl/date_range_facet.cxx
+        core/impl/date_range_facet_result.cxx
+        core/impl/date_range_query.cxx
         core/impl/decrement.cxx
+        core/impl/disjunction_query.cxx
         core/impl/dns_srv_tracker.cxx
+        core/impl/drop_bucket.cxx
         core/impl/drop_query_index.cxx
         core/impl/exists.cxx
         core/impl/expiry.cxx
         core/impl/fail_fast_retry_strategy.cxx
         core/impl/field_level_encryption_error_category.cxx
+        core/impl/flush_bucket.cxx
+        core/impl/geo_bounding_box_query.cxx
+        core/impl/geo_distance_query.cxx
+        core/impl/geo_polygon_query.cxx
         core/impl/get.cxx
+        core/impl/get_all_buckets.cxx
+        core/impl/get_all_query_indexes.cxx
         core/impl/get_all_replicas.cxx
         core/impl/get_and_lock.cxx
         core/impl/get_and_touch.cxx
-        core/impl/get_all_query_indexes.cxx
         core/impl/get_any_replica.cxx
+        core/impl/get_bucket.cxx
         core/impl/get_replica.cxx
         core/impl/increment.cxx
         core/impl/insert.cxx
+        core/impl/internal_date_range_facet_result.cxx
+        core/impl/internal_manager_error_context.cxx
+        core/impl/internal_numeric_range_facet_result.cxx
+        core/impl/internal_search_error_context.cxx
+        core/impl/internal_search_meta_data.cxx
+        core/impl/internal_search_result.cxx
+        core/impl/internal_search_row.cxx
+        core/impl/internal_search_row_locations.cxx
+        core/impl/internal_term_facet_result.cxx
         core/impl/key_value_error_category.cxx
+        core/impl/key_value_error_context.cxx
         core/impl/lookup_in.cxx
+        core/impl/lookup_in_replica.cxx
+        core/impl/lookup_in_all_replicas.cxx
+        core/impl/lookup_in_any_replica.cxx
         core/impl/management_error_category.cxx
+        core/impl/manager_error_context.cxx
+        core/impl/match_all_query.cxx
+        core/impl/match_none_query.cxx
+        core/impl/match_phrase_query.cxx
+        core/impl/match_query.cxx
         core/impl/mutate_in.cxx
         core/impl/network_error_category.cxx
+        core/impl/numeric_range.cxx
+        core/impl/numeric_range_facet.cxx
+        core/impl/numeric_range_facet_result.cxx
+        core/impl/numeric_range_query.cxx
         core/impl/observe_poll.cxx
         core/impl/observe_seqno.cxx
+        core/impl/phrase_query.cxx
+        core/impl/prefix_query.cxx
         core/impl/prepend.cxx
         core/impl/query.cxx
         core/impl/query_error_category.cxx
+        core/impl/query_error_context.cxx
+        core/impl/query_string_query.cxx
+        core/impl/regexp_query.cxx
         core/impl/remove.cxx
         core/impl/replace.cxx
         core/impl/retry_action.cxx
@@ -314,14 +360,30 @@ set(couchbase_cxx_client_FILES
         core/impl/subdoc/remove.cxx
         core/impl/subdoc/replace.cxx
         core/impl/subdoc/upsert.cxx
+        core/impl/search.cxx
+        core/impl/search_error_context.cxx
+        core/impl/search_meta_data.cxx
+        core/impl/search_result.cxx
+        core/impl/search_row.cxx
+        core/impl/search_row_location.cxx
+        core/impl/search_row_locations.cxx
+        core/impl/search_sort_field.cxx
+        core/impl/search_sort_id.cxx
+        core/impl/search_sort_score.cxx
+        core/impl/term_facet.cxx
+        core/impl/term_facet_result.cxx
+        core/impl/term_query.cxx
+        core/impl/term_range_query.cxx
         core/impl/touch.cxx
         core/impl/transaction_error_category.cxx
         core/impl/transaction_get_result.cxx
         core/impl/transaction_op_error_category.cxx
         core/impl/unlock.cxx
+        core/impl/update_bucket.cxx
         core/impl/upsert.cxx
         core/impl/view_error_category.cxx
         core/impl/watch_query_indexes.cxx
+        core/impl/wildcard_query.cxx
         core/io/dns_client.cxx
         core/io/dns_config.cxx
         core/io/http_parser.cxx
@@ -331,11 +393,12 @@ set(couchbase_cxx_client_FILES
         core/transactions/atr_cleanup_entry.cxx
         core/transactions/atr_ids.cxx
         core/transactions/attempt_context_impl.cxx
+        core/transactions/attempt_context_testing_hooks.cxx
         core/transactions/binary.cxx
+        core/transactions/cleanup_testing_hooks.cxx
         core/transactions/exceptions.cxx
         core/transactions/result.cxx
         core/transactions/staged_mutation.cxx
-        core/transactions/utils.cxx
         core/transactions/transaction_attempt.cxx
         core/transactions/transaction_context.cxx
         core/transactions/transaction_get_result.cxx
@@ -344,7 +407,8 @@ set(couchbase_cxx_client_FILES
         core/transactions/transactions.cxx
         core/transactions/transactions_cleanup.cxx
         core/transactions/transactions_config.cxx
-        core/transactions/uid_generator.cxx)
+        core/transactions/uid_generator.cxx
+        core/transactions/utils.cxx)
 
 if (COUCHBASE_CXX_CLIENT_BUILD_SHARED)
     add_library(couchbase_cxx_client SHARED ${couchbase_cxx_client_FILES})
@@ -403,9 +467,9 @@ endif ()
 if (NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
     if (TARGET PkgConfig::PKG_CONFIG_OPENSSL)
         target_link_libraries(couchbase_cxx_client PUBLIC PkgConfig::PKG_CONFIG_OPENSSL)
-    else()
+    else ()
         target_link_libraries(couchbase_cxx_client PUBLIC OpenSSL::SSL OpenSSL::Crypto)
-    endif()
+    endif ()
 endif ()
 
 option(COUCHBASE_CXX_CLIENT_BUILD_TESTS "Build test programs" TRUE)

data/ext/couchbase/cmake/Documentation.cmake

@@ -20,7 +20,6 @@ if(DOXYGEN_FOUND AND DOT)
   set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/html/index.html)
   set(DOXYGEN_CONFIG_TEMPLATE ${PROJECT_SOURCE_DIR}/docs/Doxyfile.in)
   set(DOXYGEN_CONFIG ${PROJECT_BINARY_DIR}/Doxyfile)
-  file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR})
   configure_file(${DOXYGEN_CONFIG_TEMPLATE} ${DOXYGEN_CONFIG})
   add_custom_command(
     OUTPUT ${DOXYGEN_INDEX_FILE}

data/ext/couchbase/cmake/OpenSSL.cmake

@@ -49,7 +49,7 @@ else()
       OPENSSL_USABLE ${CMAKE_CURRENT_BINARY_DIR}
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test_openssl.cxx
       LINK_LIBRARIES OpenSSL::SSL CXX_STANDARD 17)
-    if( OPENSSL_USABLE)
+    if(OPENSSL_USABLE)
       message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
       message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
       message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
@@ -60,7 +60,12 @@ else()
             "Cannot use OpenSSL ${OPENSSL_VERSION} at \"${OPENSSL_INCLUDE_DIR}\" and \"${OPENSSL_LIBRARIES}\". Will try to use from pkg-config."
         )
         find_package(PkgConfig REQUIRED)
-        pkg_check_modules(PKG_CONFIG_OPENSSL REQUIRED IMPORTED_TARGET GLOBAL openssl11)
+        pkg_check_modules(
+          PKG_CONFIG_OPENSSL
+          REQUIRED
+          IMPORTED_TARGET
+          GLOBAL
+          openssl11)
         if(PKG_CONFIG_OPENSSL_FOUND)
           message(STATUS "PKG_CONFIG_OPENSSL_VERSION: ${PKG_CONFIG_OPENSSL_VERSION}")
           message(STATUS "PKG_CONFIG_OPENSSL_INCLUDE_DIRS: ${PKG_CONFIG_OPENSSL_INCLUDE_DIRS}")
@@ -74,7 +79,12 @@ else()
     endif()
   elseif(UNIX)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(PKG_CONFIG_OPENSSL REQUIRED IMPORTED_TARGET GLOBAL openssl11)
+    pkg_check_modules(
+      PKG_CONFIG_OPENSSL
+      REQUIRED
+      IMPORTED_TARGET
+      GLOBAL
+      openssl11)
     if(PKG_CONFIG_OPENSSL_FOUND)
       message(STATUS "PKG_CONFIG_OPENSSL_VERSION: ${PKG_CONFIG_OPENSSL_VERSION}")
       message(STATUS "PKG_CONFIG_OPENSSL_INCLUDE_DIRS: ${PKG_CONFIG_OPENSSL_INCLUDE_DIRS}")
@@ -90,3 +100,88 @@ endif()
 # Read more at https://wiki.wireshark.org/TLS
 option(COUCHBASE_CXX_CLIENT_TLS_KEY_LOG_FILE
        "Path to file to write per-session secrets (Useful for Wireshark SSL/TLS dissection)")
+
+option(COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE
+       "Download and embed Mozilla certificates from https://curl.se/ca/cacert.pem" TRUE)
+
+if(COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE)
+  file(DOWNLOAD "https://curl.se/ca/cacert.pem.sha256" "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.sha256"
+       TLS_VERIFY ON)
+  file(READ "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.sha256" HASH_FILE_CONTENT)
+  string(
+    REGEX MATCH
+          "^([0-9a-f]+)"
+          COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256
+          ${HASH_FILE_CONTENT})
+  if(NOT COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256)
+    message(FATAL_ERROR "Failed to extract expected hash from file")
+  endif()
+  file(
+    DOWNLOAD "https://curl.se/ca/cacert.pem" "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.crt"
+    TLS_VERIFY ON
+    EXPECTED_HASH SHA256=${COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256})
+
+  file(READ "${CMAKE_CURRENT_BINARY_DIR}/mozilla-ca-bundle.crt" CA_BUNDLE_CONTENT)
+  string(
+    REGEX MATCH
+          "Certificate data from Mozilla as of: ([^\n]*)"
+          CA_BUNDLE_DATE_LINE
+          ${CA_BUNDLE_CONTENT})
+  set(COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE "${CMAKE_MATCH_1}")
+else()
+  set(CA_BUNDLE_CONTENT "")
+endif()
+
+set(CA_BUNDLE_CPP_FILE "${CMAKE_CURRENT_BINARY_DIR}/generated/mozilla_ca_bundle.cxx")
+
+# We parse CRT file because C++ does not allow string literals over 64k, and turning everything into bytes does not
+# seems to be cross-platform and fast.
+string(
+  REGEX MATCHALL
+        "[^=#]+=+\n-----BEGIN CERTIFICATE-----[^-]+-----END CERTIFICATE-----"
+        CERTIFICATES
+        "${CA_BUNDLE_CONTENT}")
+list(LENGTH CERTIFICATES NUMBER_OF_CERTIFICATES)
+file(
+  WRITE ${CA_BUNDLE_CPP_FILE}
+  "
+#include \"core/mozilla_ca_bundle.hxx\"
+
+namespace couchbase::core::default_ca
+{
+constexpr inline std::size_t number_of_certificates{ ${NUMBER_OF_CERTIFICATES} };
+constexpr inline certificate certificates[]{
+")
+foreach(CERTIFICATE ${CERTIFICATES})
+  string(
+    REGEX MATCH
+          "[ \t\r\n]*([^=\n]+)[ \t\r\n]*=+\n(-----BEGIN CERTIFICATE-----[^-]+-----END CERTIFICATE-----)"
+          PARTS
+          ${CERTIFICATE})
+  file(APPEND ${CA_BUNDLE_CPP_FILE} "    { R\"(${CMAKE_MATCH_1})\",\n      R\"(${CMAKE_MATCH_2})\" },\n\n")
+endforeach()
+
+file(
+  APPEND ${CA_BUNDLE_CPP_FILE}
+  "    { \"\", \"\" },
+};
+
+auto
+mozilla_ca_certs() -> gsl::span<const certificate>
+{
+    return { certificates, number_of_certificates };
+}
+
+auto
+mozilla_ca_certs_date() -> std::string_view
+{
+    return \"${COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE}\";
+}
+
+auto
+mozilla_ca_certs_sha256() -> std::string_view
+{
+    return \"${COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256}\";
+}
+} // namespace couchbase::core::default_ca
+")

data/ext/couchbase/cmake/Testing.cmake

@@ -17,7 +17,7 @@ macro(integration_test name)
     test_integration_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -25,6 +25,8 @@ macro(integration_test name)
   catch_discover_tests(
     test_integration_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "integration")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_INTEGRATION_TESTS "test_integration_${name}")
@@ -44,7 +46,7 @@ macro(transaction_test name)
     test_transaction_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -52,6 +54,8 @@ macro(transaction_test name)
   catch_discover_tests(
     test_transaction_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "transaction")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_TRANSACTION_TESTS "test_transaction_${name}")
@@ -70,7 +74,7 @@ macro(unit_test name)
     test_unit_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -78,6 +82,8 @@ macro(unit_test name)
   catch_discover_tests(
     test_unit_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "unit")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_UNIT_TESTS "test_unit_${name}")
@@ -96,7 +102,7 @@ macro(integration_benchmark name)
     benchmark_integration_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -104,6 +110,8 @@ macro(integration_benchmark name)
   catch_discover_tests(
     benchmark_integration_${name}
     PROPERTIES
+    SKIP_REGULAR_EXPRESSION
+    "SKIP"
     LABELS
     "benchmark")
   set_property(GLOBAL APPEND PROPERTY COUCHBASE_BENCHMARKS "benchmark_integration_${name}")

data/ext/couchbase/cmake/build_config.hxx.in

@@ -18,3 +18,6 @@
 #pragma once
 
 #cmakedefine TLS_KEY_LOG_FILE "@TLS_KEY_LOG_FILE@"
+#cmakedefine COUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE
+#cmakedefine COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE "@COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_DATE@"
+#cmakedefine COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256 "@COUCHBASE_CXX_CLIENT_MOZILLA_CA_BUNDLE_SHA256@"