Update bucket settings to be compatible with dp9 and not set defaults for optional fields

Author: DemetrisChr

ext/couchbase.cxx

@@ -4370,18 +4370,20 @@ cb_Backend_document_query(VALUE self, VALUE statement, VALUE options)
 static void
 cb_generate_bucket_settings(VALUE bucket, couchbase::core::management::cluster::bucket_settings& entry, bool is_create)
 {
-    if (VALUE bucket_type = rb_hash_aref(bucket, rb_id2sym(rb_intern("bucket_type"))); TYPE(bucket_type) == T_SYMBOL) {
-        if (bucket_type == rb_id2sym(rb_intern("couchbase")) || bucket_type == rb_id2sym(rb_intern("membase"))) {
-            entry.bucket_type = couchbase::core::management::cluster::bucket_type::couchbase;
-        } else if (bucket_type == rb_id2sym(rb_intern("memcached"))) {
-            entry.bucket_type = couchbase::core::management::cluster::bucket_type::memcached;
-        } else if (bucket_type == rb_id2sym(rb_intern("ephemeral"))) {
-            entry.bucket_type = couchbase::core::management::cluster::bucket_type::ephemeral;
+    if (VALUE bucket_type = rb_hash_aref(bucket, rb_id2sym(rb_intern("bucket_type"))); !NIL_P(bucket_type)) {
+        if (TYPE(bucket_type) == T_SYMBOL) {
+            if (bucket_type == rb_id2sym(rb_intern("couchbase")) || bucket_type == rb_id2sym(rb_intern("membase"))) {
+                entry.bucket_type = couchbase::core::management::cluster::bucket_type::couchbase;
+            } else if (bucket_type == rb_id2sym(rb_intern("memcached"))) {
+                entry.bucket_type = couchbase::core::management::cluster::bucket_type::memcached;
+            } else if (bucket_type == rb_id2sym(rb_intern("ephemeral"))) {
+                entry.bucket_type = couchbase::core::management::cluster::bucket_type::ephemeral;
+            } else {
+                throw ruby_exception(rb_eArgError, rb_sprintf("unknown bucket type, given %+" PRIsVALUE, bucket_type));
+            }
         } else {
-            throw ruby_exception(rb_eArgError, rb_sprintf("unknown bucket type, given %+" PRIsVALUE, bucket_type));
+            throw ruby_exception(rb_eArgError, rb_sprintf("bucket type must be a Symbol, given %+" PRIsVALUE, bucket_type));
         }
-    } else {
-        throw ruby_exception(rb_eArgError, rb_sprintf("bucket type must be a Symbol, given %+" PRIsVALUE, bucket_type));
     }
 
     if (VALUE name = rb_hash_aref(bucket, rb_id2sym(rb_intern("name"))); TYPE(name) == T_STRING) {
@@ -4390,10 +4392,12 @@ cb_generate_bucket_settings(VALUE bucket, couchbase::core::management::cluster::
         throw ruby_exception(rb_eArgError, rb_sprintf("bucket name must be a String, given %+" PRIsVALUE, name));
     }
 
-    if (VALUE quota = rb_hash_aref(bucket, rb_id2sym(rb_intern("ram_quota_mb"))); TYPE(quota) == T_FIXNUM) {
-        entry.ram_quota_mb = FIX2ULONG(quota);
-    } else {
-        throw ruby_exception(rb_eArgError, rb_sprintf("bucket RAM quota must be an Integer, given %+" PRIsVALUE, quota));
+    if (VALUE quota = rb_hash_aref(bucket, rb_id2sym(rb_intern("ram_quota_mb"))); !NIL_P(quota)) {
+        if (TYPE(quota) == T_FIXNUM) {
+            entry.ram_quota_mb = FIX2ULONG(quota);
+        } else {
+            throw ruby_exception(rb_eArgError, rb_sprintf("bucket RAM quota must be an Integer, given %+" PRIsVALUE, quota));
+        }
     }
 
     if (VALUE expiry = rb_hash_aref(bucket, rb_id2sym(rb_intern("max_expiry"))); !NIL_P(expiry)) {
@@ -4699,8 +4703,12 @@ cb_extract_bucket_settings(const couchbase::core::management::cluster::bucket_se
     if (const auto &val = entry.num_replicas; val.has_value()) {
         rb_hash_aset(bucket, rb_id2sym(rb_intern("num_replicas")), ULONG2NUM(val.value()));
     }
-    rb_hash_aset(bucket, rb_id2sym(rb_intern("replica_indexes")), entry.replica_indexes ? Qtrue : Qfalse);
-    rb_hash_aset(bucket, rb_id2sym(rb_intern("flush_enabled")), entry.flush_enabled ? Qtrue : Qfalse);
+    if (const auto &val = entry.replica_indexes; val.has_value()) {
+        rb_hash_aset(bucket, rb_id2sym(rb_intern("replica_indexes")), val.value() ? Qtrue : Qfalse);
+    }
+    if (const auto &val = entry.flush_enabled; val.has_value()) {
+        rb_hash_aset(bucket, rb_id2sym(rb_intern("flush_enabled")), val.value() ? Qtrue : Qfalse);
+    }
     switch (entry.eviction_policy) {
         case couchbase::core::management::cluster::bucket_eviction_policy::full:
             rb_hash_aset(bucket, rb_id2sym(rb_intern("eviction_policy")), rb_id2sym(rb_intern("full")));

lib/couchbase/management/bucket_manager.rb

@@ -436,22 +436,6 @@ def ejection_policy=(val)
 
       # @yieldparam [BucketSettings] self
       def initialize
-        @bucket_type = :couchbase
-        @name = nil
-        @minimum_durability_level = nil
-        @healthy = true
-        @flush_enabled = false
-        @ram_quota_mb = 100
-        @num_replicas = 1
-        @replica_indexes = false
-        @max_expiry = 0
-        @compression_mode = :passive
-        @conflict_resolution_type = :sequence_number
-        @eviction_policy = :value_only
-        @storage_backend = nil
-        @history_retention_collection_default = nil
-        @history_retention_bytes = nil
-        @history_retention_duration = nil
         yield self if block_given?
       end
     end

test/bucket_manager_test.rb

@@ -124,8 +124,8 @@ def test_update_bucket_history_retention_unsupported
       res = @bucket_manager.get_bucket(bucket_name)
 
       assert_nil res.history_retention_collection_default
-      assert_equal 0, res.history_retention_bytes
-      assert_equal 0, res.history_retention_duration
+      assert_nil res.history_retention_bytes
+      assert_nil res.history_retention_duration
 
       assert_raises(Error::InvalidArgument) do
         @bucket_manager.update_bucket(