couchbase 3.4.3 → 3.4.4

data/ext/couchbase/couchbase/security_options.hxx

@@ -45,11 +45,20 @@ class security_options
         return *this;
     }
 
+    auto trust_certificate_value(std::string certificate_value) -> security_options&
+    {
+        trust_certificate_value_ = certificate_value;
+        return *this;
+    }
+
     struct built {
         bool enabled;
         tls_verify_mode tls_verify;
         std::optional<std::string> trust_certificate;
+        std::optional<std::string> trust_certificate_value;
         bool disable_mozilla_ca_certificates;
+        bool disable_deprecated_protocols;
+        bool disable_tls_v1_2;
     };
 
     [[nodiscard]] auto build() const -> built
@@ -58,7 +67,10 @@ class security_options
             enabled_,
             tls_verify_,
             trust_certificate_,
+            trust_certificate_value_,
             disable_mozilla_ca_certificates_,
+            disable_deprecated_protocols,
+            disable_tls_v1_2,
         };
     }
 
@@ -66,6 +78,9 @@ class security_options
     bool enabled_{ true };
     tls_verify_mode tls_verify_{ tls_verify_mode::peer };
     std::optional<std::string> trust_certificate_{};
+    std::optional<std::string> trust_certificate_value_{};
     bool disable_mozilla_ca_certificates_{ false };
+    bool disable_deprecated_protocols{ true };
+    bool disable_tls_v1_2{ false };
 };
 } // namespace couchbase

data/ext/couchbase/couchbase/subdocument_error_context.hxx

@@ -62,7 +62,8 @@ class subdocument_error_context : public key_value_error_context
      * @since 1.0.0
      * @internal
      */
-    subdocument_error_context(std::error_code ec,
+    subdocument_error_context(std::string operation_id,
+                              std::error_code ec,
                               std::optional<std::string> last_dispatched_to,
                               std::optional<std::string> last_dispatched_from,
                               std::size_t retry_attempts,
@@ -79,7 +80,8 @@ class subdocument_error_context : public key_value_error_context
                               std::optional<std::string> first_error_path,
                               std::optional<std::uint64_t> first_error_index,
                               bool deleted)
-      : key_value_error_context{ ec,
+      : key_value_error_context{ std::move(operation_id),
+                                 ec,
                                  std::move(last_dispatched_to),
                                  std::move(last_dispatched_from),
                                  retry_attempts,

data/ext/couchbase/couchbase/touch_options.hxx

@@ -86,8 +86,8 @@ initiate_touch_operation(std::shared_ptr<couchbase::core::cluster> core,
                          std::string collection_name,
                          std::string document_key,
                          std::uint32_t expiry,
-                         touch_options::built options,
-                         touch_handler&& handler);
+                         couchbase::touch_options::built options,
+                         couchbase::touch_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

data/ext/couchbase/couchbase/unlock_options.hxx

@@ -89,8 +89,8 @@ initiate_unlock_operation(std::shared_ptr<couchbase::core::cluster> core,
                           std::string collection_name,
                           std::string document_key,
                           couchbase::cas cas,
-                          unlock_options::built options,
-                          unlock_handler&& handler);
+                          couchbase::unlock_options::built options,
+                          couchbase::unlock_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

data/ext/couchbase/couchbase/update_bucket_options.hxx

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
+
+namespace couchbase
+{
+struct update_bucket_options : public common_options<update_bucket_options> {
+  public:
+    struct built : public common_options<update_bucket_options>::built {
+    };
+
+    [[nodiscard]] auto build() const -> built
+    {
+        return { build_common_options() };
+    }
+
+  private:
+};
+
+using update_bucket_handler = std::function<void(couchbase::manager_error_context)>;
+} // namespace couchbase

data/ext/couchbase/couchbase/upsert_options.hxx

@@ -149,9 +149,9 @@ initiate_upsert_operation(std::shared_ptr<couchbase::core::cluster> core,
                           std::string scope_name,
                           std::string collection_name,
                           std::string document_key,
-                          codec::encoded_value encoded,
-                          upsert_options::built options,
-                          upsert_handler&& handler);
+                          couchbase::codec::encoded_value encoded,
+                          couchbase::upsert_options::built options,
+                          couchbase::upsert_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

data/ext/couchbase/couchbase/watch_query_indexes_options.hxx

@@ -81,35 +81,4 @@ class watch_query_indexes_options : public common_options<watch_query_indexes_op
  */
 
 using watch_query_indexes_handler = std::function<void(couchbase::manager_error_context)>;
-
-#ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
-namespace core
-{
-class cluster;
-class query_context;
-namespace impl
-{
-
-/**
- * @since 1.0.0
- * @internal
- */
-void
-initiate_watch_query_indexes(std::shared_ptr<couchbase::core::cluster> core,
-                             std::string bucket_name,
-                             std::vector<std::string> index_names,
-                             couchbase::watch_query_indexes_options::built options,
-                             query_context query_ctx,
-                             std::string collection_name,
-                             watch_query_indexes_handler&& handler);
-void
-initiate_watch_query_indexes(std::shared_ptr<couchbase::core::cluster> core,
-                             std::string bucket_name,
-                             std::vector<std::string> index_names,
-                             couchbase::watch_query_indexes_options::built options,
-                             watch_query_indexes_handler&& handler);
-
-#endif
-} // namespace impl
-} // namespace core
 } // namespace couchbase

data/ext/couchbase/test/CMakeLists.txt

@@ -26,6 +26,7 @@ unit_test(jsonsl)
 unit_test(config_profiles)
 unit_test(options)
 unit_test(search)
+unit_test(query)
 target_link_libraries(test_unit_jsonsl jsonsl)
 
 integration_benchmark(get)

data/ext/couchbase/test/test_integration_collections.cxx

@@ -113,6 +113,12 @@ TEST_CASE("integration: get and insert non default scope and collection", "[inte
         REQUIRE_SUCCESS(resp.ctx.ec());
         REQUIRE(resp.value == couchbase::core::utils::to_binary(key));
     }
+
+    {
+        couchbase::core::operations::management::scope_drop_request req{ integration.ctx.bucket, scope_name };
+        auto resp = test::utils::execute(integration.cluster, req);
+        REQUIRE_SUCCESS(resp.ctx.ec);
+    }
 }
 
 TEST_CASE("integration: insert into dropped scope", "[integration]")

data/ext/couchbase/test/test_integration_crud.cxx

@@ -315,6 +315,11 @@ TEST_CASE("integration: lock/unlock without lock time", "[integration]")
 TEST_CASE("integration: touch with zero expiry resets expiry", "[integration]")
 {
     test::utils::integration_test_guard integration;
+
+    if (integration.ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("Timeout is too strict for sanity test env");
+    }
+
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     couchbase::core::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("get_reset_expiry_key") };

data/ext/couchbase/test/test_integration_examples.cxx

@@ -132,6 +132,9 @@ row: {"airline":{"callsign":"MILE-AIR","country":"United States","iata":"Q5","ic
 TEST_CASE("example: start using", "[integration]")
 {
     test::utils::integration_test_guard integration;
+    if (integration.cluster_version().is_capella()) {
+        SKIP("Capella does not allow to use REST API to load sample buckets");
+    }
     if (!integration.cluster_version().supports_collections()) {
         SKIP("cluster does not support collections");
     }
@@ -438,8 +441,12 @@ row: {"airline":{"callsign":"MILE-AIR","country":"United States","iata":"Q5","ic
 TEST_CASE("example: search", "[integration]")
 {
     test::utils::integration_test_guard integration;
+
+    if (integration.cluster_version().is_capella()) {
+        SKIP("Capella does not allow to use REST API to load sample buckets");
+    }
     if (!integration.cluster_version().supports_collections()) {
-        return;
+        SKIP("cluster does not support collections");
     }
 
     const auto env = test::utils::test_context::load_from_environment();
@@ -452,3 +459,132 @@ TEST_CASE("example: search", "[integration]")
 
     REQUIRE(example_search::main(4, argv) == 0);
 }
+
+namespace example_buckets
+{
+//! [example-buckets]
+#include <couchbase/cluster.hxx>
+
+int
+main(int argc, const char* argv[])
+{
+    if (argc != 4) {
+        fmt::print("USAGE: ./example_buckets couchbase://127.0.0.1 Administrator password\n");
+        return 1;
+    }
+
+    std::string connection_string{ argv[1] }; // "couchbase://127.0.0.1"
+    std::string username{ argv[2] };          // "Administrator"
+    std::string password{ argv[3] };          // "password"
+    std::string bucket_name{ "travel-sample" };
+
+    // run IO context on separate thread
+    asio::io_context io;
+    auto guard = asio::make_work_guard(io);
+    std::thread io_thread([&io]() { io.run(); });
+
+    auto options = couchbase::cluster_options(username, password);
+    // customize through the 'options'.
+    // For example, optimize timeouts for WAN
+    options.apply_profile("wan_development");
+
+    auto [cluster, ec] = couchbase::cluster::connect(io, connection_string, options).get();
+    if (ec) {
+        fmt::print("unable to connect to the cluster: {}\n", ec.message());
+        return 1;
+    }
+    auto manager = cluster.buckets();
+
+    couchbase::management::cluster::bucket_settings bucket_settings{};
+    std::string test_bucket_name = "cxx_test_integration_examples_bucket";
+    bucket_settings.name = test_bucket_name;
+    bucket_settings.ram_quota_mb = 150;
+    bucket_settings.bucket_type = couchbase::management::cluster::bucket_type::couchbase;
+    bucket_settings.eviction_policy = couchbase::management::cluster::bucket_eviction_policy::value_only;
+    bucket_settings.flush_enabled = true;
+    bucket_settings.replica_indexes = true;
+    bucket_settings.conflict_resolution_type = couchbase::management::cluster::bucket_conflict_resolution::sequence_number;
+    {
+        fmt::print("--- create bucket\n");
+        auto ctx = manager.create_bucket(bucket_settings).get();
+        if (ctx.ec()) {
+            if (ctx.ec() == couchbase::errc::common::invalid_argument) {
+                fmt::print("bucket already exists\n");
+            } else {
+                fmt::print("unable to create the bucket: {}\n", ctx.ec().message());
+                return 1;
+            }
+        } else {
+            fmt::print("--- bucket has been successfully created\n");
+        }
+    }
+    {
+        fmt::print("--- get bucket\n");
+        auto [ctx, bucket] = manager.get_bucket(bucket_name).get();
+        if (ctx.ec()) {
+            fmt::print("unable to get the bucket: {}\n", ctx.ec().message());
+            return 1;
+        }
+        fmt::print("name of fetched bucket: {}\n", bucket.name);
+    }
+    {
+        fmt::print("--- get all buckets\n");
+        auto [ctx, buckets] = manager.get_all_buckets().get();
+        if (ctx.ec()) {
+            fmt::print("unable to get all buckets: {}\n", ctx.ec().message());
+            return 1;
+        }
+        for (const auto& fetched_bucket : buckets) {
+            fmt::print("Bucket name: {}\n", fetched_bucket.name);
+        }
+    }
+    {
+        fmt::print("--- update bucket\n");
+        bucket_settings.ram_quota_mb = 150;
+        auto ctx = manager.update_bucket(bucket_settings).get();
+        if (ctx.ec()) {
+            fmt::print("unable to update the bucket: {}\n", ctx.ec().message());
+            return 1;
+        }
+        fmt::print("bucket has been updated\n");
+    }
+    {
+        fmt::print("--- drop bucket\n");
+        auto ctx = manager.drop_bucket(test_bucket_name).get();
+        if (ctx.ec()) {
+            fmt::print("unable to drop the bucket: {}\n", ctx.ec().message());
+            return 1;
+        }
+        fmt::print("bucket has been dropped\n");
+    }
+
+    // close cluster connection
+    cluster.close();
+    guard.reset();
+
+    io_thread.join();
+    return 0;
+}
+
+//! [example-buckets]
+} // namespace example_buckets
+
+TEST_CASE("example: bucket management", "[integration]")
+{
+    test::utils::integration_test_guard integration;
+
+    if (integration.cluster_version().is_capella()) {
+        SKIP("Capella does not allow to use REST API to load sample buckets");
+    }
+
+    const auto env = test::utils::test_context::load_from_environment();
+
+    const char* argv[] = {
+        "example_buckets", // name of the "executable"
+        env.connection_string.c_str(),
+        env.username.c_str(),
+        env.password.c_str(),
+    };
+
+    REQUIRE(example_buckets::main(4, argv) == 0);
+}