From 0f5b378f60c6c5721681445bf1ef7452eeaf597d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 25 Nov 2024 13:52:13 +0000
Subject: [PATCH 001/100] WIP- able to fetch generation and list of soft
 deleted bucket

---
 .../lib/google/cloud/storage/bucket.rb        | 15 +++++-
 .../lib/google/cloud/storage/bucket/list.rb   | 21 ++++----
 .../lib/google/cloud/storage/project.rb       | 19 +++++--
 .../samples/storage_restore_bucket.rb         | 54 +++++++++++++++++++
 4 files changed, 93 insertions(+), 16 deletions(-)
 create mode 100644 google-cloud-storage/samples/storage_restore_bucket.rb

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 5f80729ad74a..5e5e47d68441 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -23,6 +23,8 @@
 require "google/cloud/storage/policy"
 require "google/cloud/storage/post_object"
 require "pathname"
+require "pry"
+
 
 module Google
   module Cloud
@@ -81,6 +83,8 @@ class Bucket
         #   files = bucket.files # Billed to "my-other-project"
         #
         attr_accessor :user_project
+        attr_accessor :soft_deleted
+        attr_accessor :generation
 
         ##
         # @private Create an empty Bucket object.
@@ -222,6 +226,10 @@ def cors
           cors_builder.freeze # always return frozen objects
         end
 
+        def generation
+          @gapi.generation
+        end
+
         ##
         # Returns the current Object Lifecycle Management rules configuration
         # for the bucket.
@@ -2450,6 +2458,10 @@ def post_object path,
                            policy: policy
         end
 
+        def generation
+          @gapi.generation
+        end
+
         ##
         # Generate a `PostObject` that includes the fields and URL to
         # upload objects via HTML forms. The resulting `PostObject` is
@@ -3144,11 +3156,12 @@ def lazy?
 
         ##
         # @private New Bucket from a Google API Client object.
-        def self.from_gapi gapi, service, user_project: nil
+        def self.from_gapi gapi, service, user_project: nil, soft_deleted: nil
           new.tap do |b|
             b.gapi = gapi
             b.service = service
             b.user_project = user_project
+            b.soft_deleted = soft_deleted
           end
         end
 
diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
index e596fb4fda8a..b6a6492e3b27 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
@@ -14,6 +14,7 @@
 
 
 require "delegate"
+require "pry"
 
 module Google
   module Cloud
@@ -146,16 +147,16 @@ def all request_limit: nil, &block
           # @private New Bucket::List from a Google API Client
           # Google::Apis::StorageV1::Buckets object.
           def self.from_gapi gapi_list, service, prefix = nil, max = nil,
-                             user_project: nil
-            buckets = new(Array(gapi_list.items).map do |gapi_object|
-              Bucket.from_gapi gapi_object, service, user_project: user_project
-            end)
-            buckets.instance_variable_set :@token, gapi_list.next_page_token
-            buckets.instance_variable_set :@service, service
-            buckets.instance_variable_set :@prefix, prefix
-            buckets.instance_variable_set :@max, max
-            buckets.instance_variable_set :@user_project, user_project
-            buckets
+                             user_project: nil, soft_deleted: nil
+              buckets = new(Array(gapi_list.items).map do |gapi_object|
+                Bucket.from_gapi gapi_object, service, user_project: user_project, soft_deleted: soft_deleted
+              end)
+              buckets.instance_variable_set :@token, gapi_list.next_page_token
+              buckets.instance_variable_set :@service, service
+              buckets.instance_variable_set :@prefix, prefix
+              buckets.instance_variable_set :@max, max
+              buckets.instance_variable_set :@user_project, user_project
+              buckets
           end
 
           protected
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 89ee56952620..db363b103cc5 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -193,11 +193,11 @@ def add_custom_header header_name, header_value
         #     puts bucket.name
         #   end
         #
-        def buckets prefix: nil, token: nil, max: nil, user_project: nil
+        def buckets prefix: nil, token: nil, max: nil, user_project: nil , soft_deleted: nil
           gapi = service.list_buckets \
-            prefix: prefix, token: token, max: max, user_project: user_project
+            prefix: prefix, token: token, max: max, user_project: user_project,options: {soft_deleted: soft_deleted}
           Bucket::List.from_gapi \
-            gapi, service, prefix, max, user_project: user_project
+            gapi, service, prefix, max, user_project: user_project, soft_deleted: soft_deleted
         end
         alias find_buckets buckets
 
@@ -259,6 +259,8 @@ def buckets prefix: nil, token: nil, max: nil, user_project: nil
         #
         def bucket bucket_name,
                    skip_lookup: false,
+                   generation: nil,
+                   soft_deleted: nil,
                    if_metageneration_match: nil,
                    if_metageneration_not_match: nil,
                    user_project: nil
@@ -269,8 +271,15 @@ def bucket bucket_name,
           gapi = service.get_bucket bucket_name,
                                     if_metageneration_match: if_metageneration_match,
                                     if_metageneration_not_match: if_metageneration_not_match,
-                                    user_project: user_project
-          Bucket.from_gapi gapi, service, user_project: user_project
+                                    user_project: user_project,
+                                    options: {
+                                      soft_deleted: soft_deleted,
+                                    generation: generation
+
+                                    }
+
+          binding.pry
+          Bucket.from_gapi gapi, service, user_project: user_project,soft_deleted: soft_deleted,generation: generation
         rescue Google::Cloud::NotFoundError
           nil
         end
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
new file mode 100644
index 000000000000..8f62c06b8243
--- /dev/null
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -0,0 +1,54 @@
+# Copyright 2024 Google LLC
+#
+# 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.
+
+# [START storage_delete_bucket]
+def delete_bucket bucket_name:
+  # The ID of your GCS bucket
+  # bucket_name = "your-unique-bucket-name"
+
+  #{}require "google/cloud/storage"
+  require_relative '../lib/google/cloud/storage'
+  require_relative '../lib/google/cloud/storage/project'
+  require_relative '../lib/google/cloud/storage/bucket'
+  # require_relative '../lib/google/cloud/storage/bucket/list'
+  require_relative '../lib/google/cloud/storage/service'
+
+  require 'pry'
+
+  storage = Google::Cloud::Storage.new
+  deleted_bucket  = storage.create_bucket bucket_name
+
+  deleted_bucket.delete
+ 
+  # fetching generation
+  generation = deleted_bucket.generation
+
+  # fetching soft deleted buckets
+  deleted_buckets = storage.buckets soft_deleted: true
+
+  #{}storage.bucket deleted_bucket.name, generation: generation, soft_deleted: true
+
+  puts "Deleted bucket: #{deleted_bucket.name}"
+  puts deleted_bucket
+  puts "bucket generation #{generation}"
+  puts "count of soft deleted buckets #{deleted_buckets.count}"
+  #{}puts Gem.loaded_specs["google-cloud-storage"].full_gem_path
+
+end
+# [END storage_delete_bucket]
+
+bucket_name = "ruby_try_2"
+delete_bucket bucket_name: bucket_name
+
+#{}compose_file bucket_name: ARGV.shift if $PROGRAM_NAME == __FILE__

From c13c271117f1b4407995bf69169458cd3dbf1191 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 27 Nov 2024 05:37:26 +0000
Subject: [PATCH 002/100] wip- fetch soft deleted bucket and restore bucket

---
 .../lib/google/cloud/storage/bucket.rb        |  7 ++---
 .../lib/google/cloud/storage/project.rb       | 25 ++++++++++++---
 .../lib/google/cloud/storage/service.rb       | 25 +++++++++++++++
 .../samples/storage_restore_bucket.rb         | 31 ++++++++++++++-----
 4 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 5e5e47d68441..8174f38049bb 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -2458,10 +2458,6 @@ def post_object path,
                            policy: policy
         end
 
-        def generation
-          @gapi.generation
-        end
-
         ##
         # Generate a `PostObject` that includes the fields and URL to
         # upload objects via HTML forms. The resulting `PostObject` is
@@ -3156,11 +3152,12 @@ def lazy?
 
         ##
         # @private New Bucket from a Google API Client object.
-        def self.from_gapi gapi, service, user_project: nil, soft_deleted: nil
+        def self.from_gapi gapi, service, user_project: nil,generation: nil, soft_deleted: nil
           new.tap do |b|
             b.gapi = gapi
             b.service = service
             b.user_project = user_project
+            b.generation = generation
             b.soft_deleted = soft_deleted
           end
         end
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index db363b103cc5..ff18095fd2ba 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -272,13 +272,9 @@ def bucket bucket_name,
                                     if_metageneration_match: if_metageneration_match,
                                     if_metageneration_not_match: if_metageneration_not_match,
                                     user_project: user_project,
-                                    options: {
-                                      soft_deleted: soft_deleted,
+                                    soft_deleted: soft_deleted,
                                     generation: generation
 
-                                    }
-
-          binding.pry
           Bucket.from_gapi gapi, service, user_project: user_project,soft_deleted: soft_deleted,generation: generation
         rescue Google::Cloud::NotFoundError
           nil
@@ -563,6 +559,25 @@ def hmac_keys service_account_email: nil, project_id: nil,
             max: max, user_project: user_project
         end
 
+        def restore_bucket bucket_name,
+                            generation,
+                            soft_deleted: nil,
+                            timeout: nil,
+                            if_generation_match: nil,
+                            if_generation_not_match: nil,
+                            projection: nil,
+                            user_project: nil,
+                            options: {soft_deleted: nil}
+
+            gapi = service.restore_bucket \
+                      bucket_name, generation,
+                      if_generation_match: if_generation_match,
+                      if_generation_not_match: if_generation_not_match,
+                      user_project: user_project,
+                      options: options
+            Bucket.from_gapi gapi, service, user_project: user_project, generation: generation
+        end
+
         ##
         # Generates a signed URL. See [Signed
         # URLs](https://cloud.google.com/storage/docs/access-control/signed-urls)
diff --git a/google-cloud-storage/lib/google/cloud/storage/service.rb b/google-cloud-storage/lib/google/cloud/storage/service.rb
index 49abcf43dcb8..3069f0c21242 100644
--- a/google-cloud-storage/lib/google/cloud/storage/service.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/service.rb
@@ -112,12 +112,16 @@ def get_bucket bucket_name,
                        if_metageneration_match: nil,
                        if_metageneration_not_match: nil,
                        user_project: nil,
+                       soft_deleted: nil,
+                       generation: nil,
                        options: {}
           execute do
             service.get_bucket bucket_name,
                                if_metageneration_match: if_metageneration_match,
                                if_metageneration_not_match: if_metageneration_not_match,
                                user_project: user_project(user_project),
+                               soft_deleted: soft_deleted,
+                               generation: generation,
                                options: options
           end
         end
@@ -654,6 +658,27 @@ def delete_file bucket_name,
           end
         end
 
+        ##
+        # Restore soft deleted bucket
+        def restore_bucket bucket_name,
+                           generation,
+                           timeout: nil,
+                           if_generation_match: nil,
+                           if_generation_not_match: nil,
+                           projection: nil,
+                           user_project: nil,
+                           options: {soft_deleted: nil}
+            if options[:retries].nil?
+              is_idempotent = retry? generation: generation, if_generation_match: if_generation_match
+              options = is_idempotent ? {} : { retries: 0 }
+            end
+
+            execute do
+              service.restore_bucket bucket_name, generation,
+                                     options: options
+            end
+        end
+
         ##
         # Restores a soft-deleted object.
         def restore_file bucket_name,
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
index 8f62c06b8243..b9abdc824046 100644
--- a/google-cloud-storage/samples/storage_restore_bucket.rb
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -11,20 +11,20 @@
 # 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.
+require 'pry'
 
 # [START storage_delete_bucket]
 def delete_bucket bucket_name:
   # The ID of your GCS bucket
   # bucket_name = "your-unique-bucket-name"
 
-  #{}require "google/cloud/storage"
+  # require "google/cloud/storage"
   require_relative '../lib/google/cloud/storage'
   require_relative '../lib/google/cloud/storage/project'
   require_relative '../lib/google/cloud/storage/bucket'
   # require_relative '../lib/google/cloud/storage/bucket/list'
   require_relative '../lib/google/cloud/storage/service'
 
-  require 'pry'
 
   storage = Google::Cloud::Storage.new
   deleted_bucket  = storage.create_bucket bucket_name
@@ -34,21 +34,36 @@ def delete_bucket bucket_name:
   # fetching generation
   generation = deleted_bucket.generation
 
-  # fetching soft deleted buckets
+    # fetching soft deleted bucket with soft_delete_time and hard_delete_time
+  deleted_bucket_fetch= storage.bucket deleted_bucket.name,generation: generation, soft_deleted: true
+  soft_delete_time= deleted_bucket_fetch.gapi.soft_delete_time
+  hard_delete_time= deleted_bucket_fetch.gapi.hard_delete_time
+  
+  puts "soft_delete_time - #{soft_delete_time}"
+  puts "hard_delete_time - #{hard_delete_time}"
+  bucket_restored = storage.restore_bucket deleted_bucket.name, generation, soft_deleted: true
+  # fetching soft deleted bucket list
   deleted_buckets = storage.buckets soft_deleted: true
 
-  #{}storage.bucket deleted_bucket.name, generation: generation, soft_deleted: true
-
-  puts "Deleted bucket: #{deleted_bucket.name}"
-  puts deleted_bucket
+  puts "Deleted bucket: #{deleted_bucket.name} details"
   puts "bucket generation #{generation}"
   puts "count of soft deleted buckets #{deleted_buckets.count}"
+  if JSON.parse(bucket_restored.gapi)["name"] == deleted_bucket.name
+    puts "#{deleted_bucket.name} Bucket restored"
+   
+  else
+    puts "#{deleted_bucket.name} Bucket not restored" 
+  end
+
+  deleted_bucket.delete
+  puts "clean up done"
+ 
   #{}puts Gem.loaded_specs["google-cloud-storage"].full_gem_path
 
 end
 # [END storage_delete_bucket]
 
-bucket_name = "ruby_try_2"
+bucket_name = "ruby_try_1"
 delete_bucket bucket_name: bucket_name
 
 #{}compose_file bucket_name: ARGV.shift if $PROGRAM_NAME == __FILE__

From 703a74f315870ce103c9d1d3722c033334edae39 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 28 Nov 2024 12:46:45 +0000
Subject: [PATCH 003/100] refactor

---
 .../lib/google/cloud/storage/bucket.rb        |  2 +-
 .../lib/google/cloud/storage/bucket/list.rb   | 21 +++++++++----------
 .../lib/google/cloud/storage/project.rb       |  4 ++--
 .../samples/storage_restore_bucket.rb         |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 8174f38049bb..2731988b684d 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -3152,7 +3152,7 @@ def lazy?
 
         ##
         # @private New Bucket from a Google API Client object.
-        def self.from_gapi gapi, service, user_project: nil,generation: nil, soft_deleted: nil
+        def self.from_gapi gapi, service, user_project: nil, generation: nil, soft_deleted: nil
           new.tap do |b|
             b.gapi = gapi
             b.service = service
diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
index b6a6492e3b27..e596fb4fda8a 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
@@ -14,7 +14,6 @@
 
 
 require "delegate"
-require "pry"
 
 module Google
   module Cloud
@@ -147,16 +146,16 @@ def all request_limit: nil, &block
           # @private New Bucket::List from a Google API Client
           # Google::Apis::StorageV1::Buckets object.
           def self.from_gapi gapi_list, service, prefix = nil, max = nil,
-                             user_project: nil, soft_deleted: nil
-              buckets = new(Array(gapi_list.items).map do |gapi_object|
-                Bucket.from_gapi gapi_object, service, user_project: user_project, soft_deleted: soft_deleted
-              end)
-              buckets.instance_variable_set :@token, gapi_list.next_page_token
-              buckets.instance_variable_set :@service, service
-              buckets.instance_variable_set :@prefix, prefix
-              buckets.instance_variable_set :@max, max
-              buckets.instance_variable_set :@user_project, user_project
-              buckets
+                             user_project: nil
+            buckets = new(Array(gapi_list.items).map do |gapi_object|
+              Bucket.from_gapi gapi_object, service, user_project: user_project
+            end)
+            buckets.instance_variable_set :@token, gapi_list.next_page_token
+            buckets.instance_variable_set :@service, service
+            buckets.instance_variable_set :@prefix, prefix
+            buckets.instance_variable_set :@max, max
+            buckets.instance_variable_set :@user_project, user_project
+            buckets
           end
 
           protected
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index ff18095fd2ba..7f246d12c494 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -193,9 +193,9 @@ def add_custom_header header_name, header_value
         #     puts bucket.name
         #   end
         #
-        def buckets prefix: nil, token: nil, max: nil, user_project: nil , soft_deleted: nil
+        def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted: nil
           gapi = service.list_buckets \
-            prefix: prefix, token: token, max: max, user_project: user_project,options: {soft_deleted: soft_deleted}
+            prefix: prefix, token: token, max: max, user_project: user_project, options: { soft_deleted: soft_deleted }
           Bucket::List.from_gapi \
             gapi, service, prefix, max, user_project: user_project, soft_deleted: soft_deleted
         end
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
index b9abdc824046..8aa717960491 100644
--- a/google-cloud-storage/samples/storage_restore_bucket.rb
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -63,7 +63,7 @@ def delete_bucket bucket_name:
 end
 # [END storage_delete_bucket]
 
-bucket_name = "ruby_try_1"
+bucket_name = "ruby_try_6"
 delete_bucket bucket_name: bucket_name
 
 #{}compose_file bucket_name: ARGV.shift if $PROGRAM_NAME == __FILE__

From 113e074c8d08c07a69d9a85ca162ac4fda37c194 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 11 Dec 2024 12:43:52 +0000
Subject: [PATCH 004/100] adding unit tests

---
 .../lib/google/cloud/storage/bucket/list.rb   |   4 +-
 .../lib/google/cloud/storage/project.rb       |  71 +++--
 .../lib/google/cloud/storage/service.rb       |  25 +-
 .../test/google/cloud/storage/project_test.rb | 292 +++++++++++++-----
 google-cloud-storage/test/helper.rb           | 150 ++++++---
 5 files changed, 388 insertions(+), 154 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
index e596fb4fda8a..f3a0c1ef26de 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
@@ -146,9 +146,9 @@ def all request_limit: nil, &block
           # @private New Bucket::List from a Google API Client
           # Google::Apis::StorageV1::Buckets object.
           def self.from_gapi gapi_list, service, prefix = nil, max = nil,
-                             user_project: nil
+                             user_project: nil, soft_deleted: nil
             buckets = new(Array(gapi_list.items).map do |gapi_object|
-              Bucket.from_gapi gapi_object, service, user_project: user_project
+              Bucket.from_gapi gapi_object, service, user_project: user_project, soft_deleted: soft_deleted
             end)
             buckets.instance_variable_set :@token, gapi_list.next_page_token
             buckets.instance_variable_set :@service, service
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 7f246d12c494..24e17a8cb9b9 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -193,9 +193,18 @@ def add_custom_header header_name, header_value
         #     puts bucket.name
         #   end
         #
+        # @example Retrieve soft deleted
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #
+        #   user_buckets = storage.buckets soft_deleted: true
+        #   user_buckets.each do |bucket|
+        #     puts bucket.name
+        #   end
         def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted: nil
           gapi = service.list_buckets \
-            prefix: prefix, token: token, max: max, user_project: user_project, options: { soft_deleted: soft_deleted }
+            prefix: prefix, token: token, max: max, user_project: user_project, soft_deleted: soft_deleted, options: {}
           Bucket::List.from_gapi \
             gapi, service, prefix, max, user_project: user_project, soft_deleted: soft_deleted
         end
@@ -275,7 +284,7 @@ def bucket bucket_name,
                                     soft_deleted: soft_deleted,
                                     generation: generation
 
-          Bucket.from_gapi gapi, service, user_project: user_project,soft_deleted: soft_deleted,generation: generation
+          Bucket.from_gapi gapi, service, user_project: user_project, soft_deleted: soft_deleted, generation: generation
         rescue Google::Cloud::NotFoundError
           nil
         end
@@ -559,23 +568,49 @@ def hmac_keys service_account_email: nil, project_id: nil,
             max: max, user_project: user_project
         end
 
+        ##
+        # Restores a soft deleted bucket with bucket name and generation no.
+        #
+        # @param [String] bucket_name Name of a bucket.
+        # @param [Fixnum] generation generation of a bucket.
+        # @param [Boolean] skip_lookup Optionally create a Bucket object
+        #   without verifying the bucket resource exists on the Storage service.
+        #   Calls made on this object will raise errors if the bucket resource
+        #   does not exist. Default is `false`.
+        # @param [Integer] if_metageneration_match Makes the operation conditional
+        #   on whether the bucket's current metageneration matches the given value.
+        # @param [Boolean] soft_deleted If this parameter is set to
+        #   `true` projects looks in the list of soft deleted buckets
+        #
+        #
+        # @return [Google::Cloud::Storage::Bucket, nil] Returns nil if bucket
+        #   does not exist
+        #
+        # @example
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #   generation= 123
+        #
+        #   bucket = storage.bucket "my-bucket", generation, soft_deleted: true
+        #   puts bucket.name
+        #
         def restore_bucket bucket_name,
-                            generation,
-                            soft_deleted: nil,
-                            timeout: nil,
-                            if_generation_match: nil,
-                            if_generation_not_match: nil,
-                            projection: nil,
-                            user_project: nil,
-                            options: {soft_deleted: nil}
-
-            gapi = service.restore_bucket \
-                      bucket_name, generation,
-                      if_generation_match: if_generation_match,
-                      if_generation_not_match: if_generation_not_match,
-                      user_project: user_project,
-                      options: options
-            Bucket.from_gapi gapi, service, user_project: user_project, generation: generation
+                           generation,
+                           soft_deleted: nil,
+                           timeout: nil,
+                           if_generation_match: nil,
+                           if_generation_not_match: nil,
+                           projection: nil,
+                           user_project: nil,
+                           options: {}
+          gapi = service.restore_bucket bucket_name, generation,
+                                        if_generation_match: if_generation_match,
+                                        if_generation_not_match: if_generation_not_match,
+                                        user_project: user_project,
+                                        soft_deleted: soft_deleted,
+                                        options: options
+          Bucket.from_gapi gapi, service, user_project: user_project, generation: generation
         end
 
         ##
diff --git a/google-cloud-storage/lib/google/cloud/storage/service.rb b/google-cloud-storage/lib/google/cloud/storage/service.rb
index 3069f0c21242..1d652c3b7d36 100644
--- a/google-cloud-storage/lib/google/cloud/storage/service.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/service.rb
@@ -97,11 +97,12 @@ def project_service_account
 
         ##
         # Retrieves a list of buckets for the given project.
-        def list_buckets prefix: nil, token: nil, max: nil, user_project: nil, options: {}
+        def list_buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted: nil, options: {}
           execute do
             service.list_buckets \
               @project, prefix: prefix, page_token: token, max_results: max,
-                        user_project: user_project(user_project), options: options
+                        user_project: user_project(user_project),
+                        soft_deleted: soft_deleted, options: options
           end
         end
 
@@ -663,20 +664,22 @@ def delete_file bucket_name,
         def restore_bucket bucket_name,
                            generation,
                            timeout: nil,
+                           soft_deleted: nil,
                            if_generation_match: nil,
                            if_generation_not_match: nil,
                            projection: nil,
                            user_project: nil,
-                           options: {soft_deleted: nil}
-            if options[:retries].nil?
-              is_idempotent = retry? generation: generation, if_generation_match: if_generation_match
-              options = is_idempotent ? {} : { retries: 0 }
-            end
+                           options: {}
+          if options[:retries].nil?
+            is_idempotent = retry? generation: generation, if_generation_match: if_generation_match
+            options = is_idempotent ? {} : { retries: 0 }
+          end
 
-            execute do
-              service.restore_bucket bucket_name, generation,
-                                     options: options
-            end
+          execute do
+            service.restore_bucket bucket_name, generation,
+                                   soft_deleted: soft_deleted,
+                                   options: options
+          end
         end
 
         ##
diff --git a/google-cloud-storage/test/google/cloud/storage/project_test.rb b/google-cloud-storage/test/google/cloud/storage/project_test.rb
index 5e1b88ad99da..f86cfac0f033 100644
--- a/google-cloud-storage/test/google/cloud/storage/project_test.rb
+++ b/google-cloud-storage/test/google/cloud/storage/project_test.rb
@@ -31,22 +31,24 @@
   let(:bucket_autoclass_enabled) { true }
   let(:bucket_requester_pays) { true }
   let(:bucket_enable_object_retention) { true }
-  let(:bucket_cors) { [{ max_age_seconds: 300,
+  let :bucket_cors do
+    [{ max_age_seconds: 300,
                          origin: ["http://example.org", "https://example.org"],
                          http_method: ["*"],
-                         response_header: ["X-My-Custom-Header"] }] }
-  let(:bucket_cors_gapi) { bucket_cors.map { |c| Google::Apis::StorageV1::Bucket::CorsConfiguration.new **c } }
+                         response_header: ["X-My-Custom-Header"] }]
+  end
+  let(:bucket_cors_gapi) { bucket_cors.map { |c| Google::Apis::StorageV1::Bucket::CorsConfiguration.new(**c) } }
   let(:kms_key) { "path/to/encryption_key_name" }
-  let(:bucket_retention_period) { 86400 }
+  let(:bucket_retention_period) { 86_400 }
   let(:metageneration) { 6 }
-  let(:default_credentials) do
+  let :default_credentials do
     creds = OpenStruct.new empty: true
     def creds.is_a? target
       target == Google::Auth::Credentials
     end
     creds
   end
-  let(:default_universe_credentials) do
+  let :default_universe_credentials do
     client = OpenStruct.new universe_domain: "googleapis.com"
     creds = OpenStruct.new empty: true, client: client
     def creds.is_a? target
@@ -130,8 +132,8 @@ def creds.is_a? target
       "x-goog-2" => ["x-goog-", 2]
     }
 
-    storage.add_custom_header "x-goog-3" , "x-goog-3, x-goog-3"
-    storage.add_custom_header "x-goog-4" , ["x-goog-4", "x-goog-4"]
+    storage.add_custom_header "x-goog-3", "x-goog-3, x-goog-3"
+    storage.add_custom_header "x-goog-4", ["x-goog-4", "x-goog-4"]
     storage.add_custom_headers headers
 
     headers["x-goog-3"] = "x-goog-3, x-goog-3"
@@ -156,7 +158,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name
@@ -172,7 +175,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, location: bucket_location
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, location: bucket_location
@@ -189,7 +193,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, autoclass_enabled: bucket_autoclass_enabled
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, autoclass_enabled: bucket_autoclass_enabled
@@ -205,7 +210,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, storage_class: bucket_storage_class
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, storage_class: bucket_storage_class
@@ -219,9 +225,11 @@ def creds.is_a? target
 
   it "creates a bucket with versioning" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name, versioning: Google::Apis::StorageV1::Bucket::Versioning.new(enabled: true)
+    created_bucket = create_bucket_gapi bucket_name,
+                                        versioning: Google::Apis::StorageV1::Bucket::Versioning.new(enabled: true)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, versioning: true
@@ -235,12 +243,16 @@ def creds.is_a? target
 
   it "creates a bucket with logging bucket and prefix" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name, logging: Google::Apis::StorageV1::Bucket::Logging.new(log_bucket: bucket_logging_bucket, log_object_prefix: bucket_logging_prefix)
+    created_bucket = create_bucket_gapi bucket_name,
+                                        logging: Google::Apis::StorageV1::Bucket::Logging.new(log_bucket: bucket_logging_bucket,
+                                                                                              log_object_prefix: bucket_logging_prefix)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
-    bucket = storage.create_bucket bucket_name, logging_bucket: bucket_logging_bucket, logging_prefix: bucket_logging_prefix
+    bucket = storage.create_bucket bucket_name, logging_bucket: bucket_logging_bucket,
+logging_prefix: bucket_logging_prefix
 
     mock.verify
 
@@ -252,9 +264,12 @@ def creds.is_a? target
 
   it "creates a bucket with website main and 404" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name, website: Google::Apis::StorageV1::Bucket::Website.new(main_page_suffix: bucket_website_main, not_found_page: bucket_website_404)
+    created_bucket = create_bucket_gapi bucket_name,
+                                        website: Google::Apis::StorageV1::Bucket::Website.new(main_page_suffix: bucket_website_main,
+                                                                                              not_found_page: bucket_website_404)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, website_main: bucket_website_main, website_404: bucket_website_404
@@ -269,9 +284,11 @@ def creds.is_a? target
 
   it "creates a bucket with requester pays" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name, billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
+    created_bucket = create_bucket_gapi bucket_name,
+                                        billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
@@ -287,9 +304,11 @@ def creds.is_a? target
 
   it "creates a bucket with requester pays and user_project set to true" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name, billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
+    created_bucket = create_bucket_gapi bucket_name,
+                                        billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: "test", enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: "test", enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, user_project: true do |b|
@@ -306,9 +325,11 @@ def creds.is_a? target
 
   it "creates a bucket with requester pays and user_project set to another project ID" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name, billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
+    created_bucket = create_bucket_gapi bucket_name,
+                                        billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: "my-other-project", enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: "my-other-project", enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, user_project: "my-other-project" do |b|
@@ -327,15 +348,16 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, cors: bucket_cors_gapi
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
       b.cors.add_rule ["http://example.org", "https://example.org"],
-                       "*",
-                       headers: "X-My-Custom-Header",
-                       max_age: 300
+                      "*",
+                      headers: "X-My-Custom-Header",
+                      max_age: 300
     end
 
     mock.verify
@@ -347,9 +369,12 @@ def creds.is_a? target
 
   it "creates a bucket with block lifecycle (Object Lifecycle Management)" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name, lifecycle: lifecycle_gapi(lifecycle_rule_gapi("SetStorageClass", storage_class: "NEARLINE", age: 32))
+    created_bucket = create_bucket_gapi bucket_name,
+                                        lifecycle: lifecycle_gapi(lifecycle_rule_gapi("SetStorageClass",
+                                                                                      storage_class: "NEARLINE", age: 32))
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -369,12 +394,13 @@ def creds.is_a? target
     created_bucket = create_bucket_gapi bucket_name
     created_bucket.labels = { "env" => "production", "foo" => "bar" }
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
-      _(b.labels).must_equal Hash.new
+      _(b.labels).must_equal({})
       b.labels = { "env" => "production" }
       b.labels["foo"] = "bar"
     end
@@ -389,9 +415,10 @@ def creds.is_a? target
   it "creates a bucket with block encryption" do
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
-    created_bucket.encryption = encryption_gapi(kms_key)
+    created_bucket.encryption = encryption_gapi kms_key
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -411,7 +438,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "private", predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "private",
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, acl: "private"
@@ -426,7 +454,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "publicRead", predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "publicRead",
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, acl: :public
@@ -441,7 +470,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: "private", user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: "private", user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, default_acl: :private
@@ -456,7 +486,8 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: "publicRead", user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: "publicRead", user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, default_acl: "public"
@@ -477,10 +508,11 @@ def creds.is_a? target
     resp_bucket = bucket_with_location created_bucket
     bucket_retention_effective_at = Time.now
     resp_bucket.retention_policy = Google::Apis::StorageV1::Bucket::RetentionPolicy.new(
-        retention_period: bucket_retention_period,
-        effective_time: bucket_retention_effective_at
+      retention_period: bucket_retention_period,
+      effective_time: bucket_retention_effective_at
     )
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -523,7 +555,8 @@ def creds.is_a? target
     created_bucket = create_bucket_gapi bucket_name
     created_bucket.default_event_based_hold = true
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -545,11 +578,12 @@ def creds.is_a? target
     created_bucket.rpo = "ASYNC_TURBO"
     resp_bucket = bucket_with_location created_bucket, location_type: "dual-region"
 
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
-      b.rpo= :ASYNC_TURBO
+      b.rpo = :ASYNC_TURBO
     end
 
     mock.verify
@@ -566,7 +600,8 @@ def creds.is_a? target
     created_bucket.hierarchical_namespace = hierarchical_namespace_object
     resp_bucket = bucket_with_location created_bucket
 
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
@@ -586,7 +621,8 @@ def creds.is_a? target
     created_bucket.hierarchical_namespace = { enabled: false }
     resp_bucket = bucket_with_location created_bucket
 
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
+predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, hierarchical_namespace: { enabled: false }
@@ -601,7 +637,7 @@ def creds.is_a? target
     bucket_name = ""
 
     stub = Object.new
-    def stub.insert_bucket *args
+    def stub.insert_bucket *_args
       raise Google::Apis::ClientError.new("invalid argument", status_code: 400)
     end
     storage.service.mocked_service = stub
@@ -615,7 +651,8 @@ def stub.insert_bucket *args
     num_buckets = 3
 
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -633,7 +670,8 @@ def stub.insert_bucket *args
     num_buckets = 3
 
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -644,10 +682,32 @@ def stub.insert_bucket *args
     _(buckets.size).must_equal num_buckets
   end
 
+  it "lists deleted buckets" do
+    num_buckets = 3
+
+    mock = Minitest::Mock.new
+    mock.expect :list_buckets, list_deleted_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: true, options: {}
+
+    storage.service.mocked_service = mock
+    buckets = storage.buckets soft_deleted: true
+
+    mock.verify
+
+    _(buckets.size).must_equal num_buckets
+    bucket = buckets.first
+    _(bucket).must_be_kind_of Google::Cloud::Storage::Bucket
+    _(bucket.gapi.soft_delete_time).wont_be_nil
+    # refute_nil _(bucket).soft_delete_tme , "softDeleteTime should not be nil"
+    # _(bucket.soft_delete_tme).must_equal "multi-region"
+  end
+
   it "paginates buckets" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -666,13 +726,15 @@ def stub.insert_bucket *args
 
   it "paginates buckets with max set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: 3, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: 3, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
+max_results: 3, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
     first_buckets = storage.buckets max: 3
-    second_buckets = storage.buckets token: first_buckets.token,  max: 3
+    second_buckets = storage.buckets token: first_buckets.token, max: 3
 
     mock.verify
 
@@ -688,7 +750,8 @@ def stub.insert_bucket *args
     num_buckets = 3
 
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -705,8 +768,10 @@ def stub.insert_bucket *args
 
   it "paginates buckets with next? and next" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -724,8 +789,10 @@ def stub.insert_bucket *args
 
   it "paginates buckets with next? and next and max set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: 3, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: 3, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
+max_results: 3, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -743,8 +810,10 @@ def stub.insert_bucket *args
 
   it "paginates buckets with all" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -757,8 +826,10 @@ def stub.insert_bucket *args
 
   it "paginates buckets with all and max set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: 3, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: 3, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
+max_results: 3, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -771,12 +842,14 @@ def stub.insert_bucket *args
 
   it "iterates buckets with all using Enumerator" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
+page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
-    buckets = storage.buckets.all.take(5)
+    buckets = storage.buckets.all.take 5
 
     mock.verify
 
@@ -785,8 +858,10 @@ def stub.insert_bucket *args
 
   it "iterates buckets with all and request_limit set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
+page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -799,8 +874,10 @@ def stub.insert_bucket *args
 
   it "iterates buckets with all and user_project set to true" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: "test", options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: "test", options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: "test", soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
+page_token: "next_page_token", max_results: nil, user_project: "test", soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -814,8 +891,10 @@ def stub.insert_bucket *args
 
   it "iterates buckets with all and user_project set to another project ID" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: "my-other-project", options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: "my-other-project", options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
+max_results: nil, user_project: "my-other-project", soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
+page_token: "next_page_token", max_results: nil, user_project: "my-other-project", soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -840,9 +919,48 @@ def stub.insert_bucket *args
     mock.verify
 
     _(bucket.name).must_equal bucket_name
+    _(bucket.generation).wont_be_nil
     _(bucket).wont_be :lazy?
   end
 
+  it "finds a deleted bucket" do
+    bucket_name = "found-bucket"
+    generation = 1_733_393_981_548_601_746
+
+    mock = Minitest::Mock.new
+    mock.expect :get_bucket, find_deleted_bucket_gapi(bucket_name),
+                [bucket_name], **get_bucket_args(soft_deleted: true, generation: generation)
+
+    storage.service.mocked_service = mock
+    bucket = storage.bucket bucket_name, soft_deleted: true, generation: generation
+
+    mock.verify
+
+    _(bucket.name).must_equal bucket_name
+    _(bucket.generation).must_equal generation
+    _(bucket.gapi.hard_delete_time).wont_be_nil
+    _(bucket.gapi.hard_delete_time).wont_be_nil
+
+    _(bucket).wont_be :lazy?
+  end
+
+  it "restores a deleted bucket" do
+    bucket_name = "found-bucket"
+    generation = 1_733_393_981_548_601_746
+
+    mock = Minitest::Mock.new
+    mock.expect :restore_bucket, restored_bucket_gapi(bucket_name, generation),
+                [bucket_name, generation], soft_deleted: true, options: {}
+
+    storage.service.mocked_service = mock
+    bucket = storage.restore_bucket bucket_name, generation, soft_deleted: true
+
+    mock.verify
+
+    _(bucket.name).must_equal bucket_name
+    _(bucket.generation).must_equal generation
+  end
+
   it "finds a bucket with find_bucket alias" do
     bucket_name = "found-bucket"
 
@@ -863,7 +981,8 @@ def stub.insert_bucket *args
     bucket_name = "found-bucket"
 
     mock = Minitest::Mock.new
-    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name], **get_bucket_args(if_metageneration_match: metageneration)
+    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name],
+                **get_bucket_args(if_metageneration_match: metageneration)
 
     storage.service.mocked_service = mock
 
@@ -879,7 +998,8 @@ def stub.insert_bucket *args
     bucket_name = "found-bucket"
 
     mock = Minitest::Mock.new
-    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name], **get_bucket_args(if_metageneration_not_match: metageneration)
+    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name],
+                **get_bucket_args(if_metageneration_not_match: metageneration)
 
     storage.service.mocked_service = mock
 
@@ -911,7 +1031,8 @@ def stub.insert_bucket *args
     bucket_name = "found-bucket"
 
     mock = Minitest::Mock.new
-    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name], **get_bucket_args(user_project: "my-other-project")
+    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name],
+                **get_bucket_args(user_project: "my-other-project")
 
     storage.service.mocked_service = mock
 
@@ -1005,16 +1126,20 @@ def create_bucket_gapi name = nil,
       name: name, location: location, storage_class: storage_class,
       versioning: versioning, logging: logging, website: website,
       cors_configurations: cors, billing: billing, lifecycle: lifecycle,
-      autoclass: Google::Apis::StorageV1::Bucket::Autoclass.new( enabled: autoclass_enabled ),
+      autoclass: Google::Apis::StorageV1::Bucket::Autoclass.new(enabled: autoclass_enabled),
       object_retention: object_retention_param(enable_object_retention)
     }.delete_if { |_, v| v.nil? }
-    Google::Apis::StorageV1::Bucket.new **options
+    Google::Apis::StorageV1::Bucket.new(**options)
   end
 
   def find_bucket_gapi name = nil
     Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name).to_json
   end
 
+  def find_deleted_bucket_gapi name = nil
+    Google::Apis::StorageV1::Bucket.from_json random_deleted_bucket_hash(name: name).to_json
+  end
+
   def list_buckets_gapi count = 2, token = nil
     buckets = count.times.map { Google::Apis::StorageV1::Bucket.from_json random_bucket_hash.to_json }
     Google::Apis::StorageV1::Buckets.new(
@@ -1022,6 +1147,17 @@ def list_buckets_gapi count = 2, token = nil
     )
   end
 
+  def list_deleted_buckets_gapi count = 2, token = nil
+    buckets = count.times.map { Google::Apis::StorageV1::Bucket.from_json random_deleted_bucket_hash.to_json }
+    Google::Apis::StorageV1::Buckets.new(
+      kind: "storage#buckets", items: buckets, next_page_token: token
+    )
+  end
+
+  def restored_bucket_gapi name, _generation
+    Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name).to_json
+  end
+
   def object_retention_param enable_object_retention
     enable_object_retention ? Google::Apis::StorageV1::Bucket::ObjectRetention.new(mode: "Enabled") : nil
   end
diff --git a/google-cloud-storage/test/helper.rb b/google-cloud-storage/test/helper.rb
index 50455d7c7e16..b94d33e923eb 100644
--- a/google-cloud-storage/test/helper.rb
+++ b/google-cloud-storage/test/helper.rb
@@ -26,29 +26,38 @@
 
 ##
 # Monkey-Patch Google API Client to support Mocks
-module Google::Apis::Core::Hashable
-  ##
-  # Minitest Mock depends on === to match same-value objects.
-  # By default, the Google API Client objects do not match with ===.
-  # Therefore, we must add this capability.
-  # This module seems like as good a place as any...
-  def === other
-    return(to_h === other.to_h) if other.respond_to? :to_h
-    super
+module Google
+  module Apis
+    module Core
+      module Hashable
+        ##
+        # Minitest Mock depends on === to match same-value objects.
+        # By default, the Google API Client objects do not match with ===.
+        # Therefore, we must add this capability.
+        # This module seems like as good a place as any...
+        def === other
+          return(to_h === other.to_h) if other.respond_to? :to_h
+          super
+        end
+      end
+    end
   end
 end
 
 class MockStorage < Minitest::Spec
   let(:project) { "test" }
-  let(:credentials) { OpenStruct.new(client: OpenStruct.new(updater_proc: Proc.new {})) }
-  let(:storage) { Google::Cloud::Storage::Project.new(Google::Cloud::Storage::Service.new(project, credentials, upload_chunk_size: 5 * 1024 * 1024 )) }
+  let(:credentials) { OpenStruct.new(client: OpenStruct.new(updater_proc: proc {})) }
+  let :storage do
+    Google::Cloud::Storage::Project.new Google::Cloud::Storage::Service.new(project, credentials,
+                                                                            upload_chunk_size: 5 * 1024 * 1024)
+  end
   let(:pubsub_topic_name) { "my-topic-name" }
-  let(:file_obj) { StringIO.new("My test file") }
+  let(:file_obj) { StringIO.new "My test file" }
   let(:file_name) { "my_test_file.txt" }
   let(:acl) { "authenticated_read" }
 
   # Register this spec type for when :mock_storage is used.
-  register_spec_type(self) do |desc, *addl|
+  register_spec_type self do |_desc, *addl|
     addl.include? :mock_storage
   end
 
@@ -70,7 +79,7 @@ def random_bucket_hash name: random_bucket_name,
                          autoclass_terminal_storage_class: nil,
                          enable_object_retention: nil,
                          effective_time: DateTime.now,
-                         retention_duration_seconds: 604800, # 7 days
+                         retention_duration_seconds: 604_800, # 7 days
                          hierarchical_namespace: nil
     versioning_config = { "enabled" => versioning } if versioning
     { "kind" => "storage#bucket",
@@ -79,6 +88,7 @@ def random_bucket_hash name: random_bucket_name,
       "projectNumber" => "1234567890",
       "name" => name,
       "timeCreated" => Time.now,
+      "generation" => "1733393981548601746",
       "metageneration" => "1",
       "owner" => { "entity" => "project-owners-1234567890" },
       "location" => location,
@@ -95,11 +105,60 @@ def random_bucket_hash name: random_bucket_name,
       "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
       "enableObjectRetention" => enable_object_retention,
       "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
-      "hierarchicalNamespace" => hierarchical_namespace
-    }.delete_if { |_, v| v.nil? }
-  end
-
-  def soft_delete_policy_object retention_duration_seconds: 604800 # 7 days
+      "hierarchicalNamespace" => hierarchical_namespace }.delete_if { |_, v| v.nil? }
+  end
+
+  def random_deleted_bucket_hash name: random_bucket_name,
+                                 url_root: "https://www.googleapis.com/storage/v1",
+                                 location: "US",
+                                 storage_class: "STANDARD",
+                                 versioning: nil,
+                                 logging_bucket: nil,
+                                 logging_prefix: nil,
+                                 website_main: nil,
+                                 website_404: nil,
+                                 cors: [],
+                                 requester_pays: nil,
+                                 lifecycle: nil,
+                                 location_type: "multi-region",
+                                 rpo: "DEFAULT",
+                                 autoclass_enabled: nil,
+                                 autoclass_terminal_storage_class: nil,
+                                 enable_object_retention: nil,
+                                 effective_time: DateTime.now,
+                                 retention_duration_seconds: 604_800, # 7 days
+                                 hierarchical_namespace: nil
+    versioning_config = { "enabled" => versioning } if versioning
+    { "kind" => "storage#bucket",
+    "id" => name,
+    "selfLink" => "#{url_root}/b/#{name}",
+    "projectNumber" => "1234567890",
+    "name" => name,
+    "timeCreated" => Time.now,
+    "generation" => "1733393981548601746",
+    "metageneration" => "1",
+    "owner" => { "entity" => "project-owners-1234567890" },
+    "location" => location,
+    "locationType" => location_type,
+    "rpo" => rpo,
+    "cors" => cors,
+    "lifecycle" => lifecycle,
+    "logging" => logging_hash(logging_bucket, logging_prefix),
+    "storageClass" => storage_class,
+    "versioning" => versioning_config,
+    "website" => website_hash(website_main, website_404),
+    "billing" => billing_hash(requester_pays),
+    "etag" => "CAE=",
+    "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
+    "enableObjectRetention" => enable_object_retention,
+    "softDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time,
+    "hardDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time,
+    "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
+    "hierarchicalNamespace" => hierarchical_namespace }.delete_if { |_, v| v.nil? }
+  end
+
+  # 7 days
+  def soft_delete_policy_object retention_duration_seconds: 604_800
     Google::Apis::StorageV1::Bucket::SoftDeletePolicy.new(
       effective_time: DateTime.now,
       retention_duration_seconds: retention_duration_seconds
@@ -112,38 +171,34 @@ def hierarchical_namespace_object enabled: true
     )
   end
 
-  def autoclass_config_hash(enabled, terminal_storage_class)
+  def autoclass_config_hash enabled, terminal_storage_class
     { "enabled"               => enabled,
-      "terminalStorageClass"  => terminal_storage_class
-    }.delete_if { |_, v| v.nil? } if !enabled.nil? || terminal_storage_class
+      "terminalStorageClass"  => terminal_storage_class }.delete_if { |_, v| v.nil? } if !enabled.nil? || terminal_storage_class
   end
 
-  def logging_hash(bucket, prefix)
+  def logging_hash bucket, prefix
     { "logBucket"       => bucket,
-      "logObjectPrefix" => prefix,
-    }.delete_if { |_, v| v.nil? } if bucket || prefix
+      "logObjectPrefix" => prefix }.delete_if { |_, v| v.nil? } if bucket || prefix
   end
 
-  def website_hash(website_main, website_404)
+  def website_hash website_main, website_404
     { "mainPageSuffix" => website_main,
-      "notFoundPage"   => website_404,
-    }.delete_if { |_, v| v.nil? } if website_main || website_404
+      "notFoundPage"   => website_404 }.delete_if { |_, v| v.nil? } if website_main || website_404
   end
 
-  def billing_hash(requester_pays)
-    { "requesterPays" => requester_pays} unless requester_pays.nil?
+  def billing_hash requester_pays
+    { "requesterPays" => requester_pays } unless requester_pays.nil?
   end
 
-  def file_retention_hash(retention_params)
-    { "mode"               => retention_params[:mode],
-      "retainUntilTime"  => retention_params[:retain_until_time]
-    }.delete_if { |_, v| v.nil? } if !retention_params.nil? && !retention_params.empty?
+  def file_retention_hash retention_params
+    { "mode" => retention_params[:mode],
+      "retainUntilTime" => retention_params[:retain_until_time] }.delete_if { |_, v| v.nil? } if !retention_params.nil? && !retention_params.empty?
   end
 
-  def random_file_hash bucket=random_bucket_name,
-                       name=random_file_path,
-                       generation="1234567890",
-                       kms_key_name="path/to/encryption_key_name",
+  def random_file_hash bucket = random_bucket_name,
+                       name = random_file_path,
+                       generation = "1234567890",
+                       kms_key_name = "path/to/encryption_key_name",
                        custom_time: nil,
                        retention_params: nil,
                        override_unlocked_retention: nil,
@@ -152,9 +207,9 @@ def random_file_hash bucket=random_bucket_name,
     { "kind" => "storage#object",
       "id" => "#{bucket}/#{name}/1234567890",
       "selfLink" => "https://www.googleapis.com/storage/v1/b/#{bucket}/o/#{name}",
-      "name" => "#{name}",
+      "name" => name.to_s,
       "timeCreated" => Time.now,
-      "bucket" => "#{bucket}",
+      "bucket" => bucket.to_s,
       "generation" => generation,
       "metageneration" => "1",
       "cacheControl" => "public, max-age=3600",
@@ -216,7 +271,7 @@ def random_notification_gapi id: "1", topic: "//pubsub.googleapis.com/projects/t
   def download_http_resp gzip: nil
     headers = {}
     headers["Content-Encoding"] = ["gzip"] if gzip
-    OpenStruct.new(header: headers)
+    OpenStruct.new header: headers
   end
 
   def encryption_gapi key_name
@@ -282,11 +337,15 @@ def policy_gapi etag: "CAE=", version: 1, bindings: []
   def get_bucket_args if_metageneration_match: nil,
                       if_metageneration_not_match: nil,
                       user_project: nil,
+                      generation: nil,
+                      soft_deleted: nil,
                       options: {}
     {
       if_metageneration_match: if_metageneration_match,
       if_metageneration_not_match: if_metageneration_not_match,
       user_project: user_project,
+      generation: generation,
+      soft_deleted: soft_deleted,
       options: options
     }
   end
@@ -416,7 +475,7 @@ def patch_object_args generation: nil,
                         user_project: nil,
                         override_unlocked_retention: nil,
                         options: {}
-    opts = {
+    {
       generation: generation,
       if_generation_match: if_generation_match,
       if_generation_not_match: if_generation_not_match,
@@ -515,7 +574,6 @@ def restore_object_args copy_source_acl: nil,
     }
   end
 
-
   def compose_request source_files, destination_gapi = nil, if_source_generation_match: nil
     source_objects = source_files.map do |file|
       if file.is_a? String
@@ -547,10 +605,12 @@ def compose_request source_files, destination_gapi = nil, if_source_generation_m
 
   def list_files_gapi count = 2, token = nil, prefixes = nil
     files = count.times.map { Google::Apis::StorageV1::Object.from_json random_file_hash.to_json }
-    Google::Apis::StorageV1::Objects.new kind: "storage#objects", items: files, next_page_token: token, prefixes: prefixes
+    Google::Apis::StorageV1::Objects.new kind: "storage#objects", items: files,
+                                         next_page_token: token,
+                                         prefixes: prefixes
   end
 
-  def restore_file_gapi bucket, file_name, generation=nil
+  def restore_file_gapi bucket, file_name, generation
     file_hash = random_file_hash(bucket, file_name, generation).to_json
     Google::Apis::StorageV1::Object.from_json file_hash
   end

From d8389ee2d1a4ac125da14ef2db88b42026481f00 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 12 Dec 2024 05:06:44 +0000
Subject: [PATCH 005/100] refactor

---
 .../lib/google/cloud/storage/bucket.rb        | 11 ++-
 .../samples/storage_restore_bucket.rb         | 69 -------------------
 .../test/google/cloud/storage/project_test.rb |  4 +-
 google-cloud-storage/test/helper.rb           |  2 +-
 4 files changed, 12 insertions(+), 74 deletions(-)
 delete mode 100644 google-cloud-storage/samples/storage_restore_bucket.rb

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 2731988b684d..33b97939e527 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -23,7 +23,6 @@
 require "google/cloud/storage/policy"
 require "google/cloud/storage/post_object"
 require "pathname"
-require "pry"
 
 
 module Google
@@ -85,6 +84,8 @@ class Bucket
         attr_accessor :user_project
         attr_accessor :soft_deleted
         attr_accessor :generation
+        attr_accessor :soft_delete_time
+        attr_accessor :hard_delete_time
 
         ##
         # @private Create an empty Bucket object.
@@ -1224,6 +1225,14 @@ def soft_delete_policy
           @gapi.soft_delete_policy
         end
 
+        def soft_delete_time
+          @gapi.soft_delete_time
+        end
+
+        def hard_delete_time
+          @gapi.soft_delete_time
+        end
+
         ##
         # Sets the value for Soft Delete Policy in the bucket. This value can
         # be queried by calling {#soft_delete_policy}.
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
deleted file mode 100644
index 8aa717960491..000000000000
--- a/google-cloud-storage/samples/storage_restore_bucket.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2024 Google LLC
-#
-# 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.
-require 'pry'
-
-# [START storage_delete_bucket]
-def delete_bucket bucket_name:
-  # The ID of your GCS bucket
-  # bucket_name = "your-unique-bucket-name"
-
-  # require "google/cloud/storage"
-  require_relative '../lib/google/cloud/storage'
-  require_relative '../lib/google/cloud/storage/project'
-  require_relative '../lib/google/cloud/storage/bucket'
-  # require_relative '../lib/google/cloud/storage/bucket/list'
-  require_relative '../lib/google/cloud/storage/service'
-
-
-  storage = Google::Cloud::Storage.new
-  deleted_bucket  = storage.create_bucket bucket_name
-
-  deleted_bucket.delete
- 
-  # fetching generation
-  generation = deleted_bucket.generation
-
-    # fetching soft deleted bucket with soft_delete_time and hard_delete_time
-  deleted_bucket_fetch= storage.bucket deleted_bucket.name,generation: generation, soft_deleted: true
-  soft_delete_time= deleted_bucket_fetch.gapi.soft_delete_time
-  hard_delete_time= deleted_bucket_fetch.gapi.hard_delete_time
-  
-  puts "soft_delete_time - #{soft_delete_time}"
-  puts "hard_delete_time - #{hard_delete_time}"
-  bucket_restored = storage.restore_bucket deleted_bucket.name, generation, soft_deleted: true
-  # fetching soft deleted bucket list
-  deleted_buckets = storage.buckets soft_deleted: true
-
-  puts "Deleted bucket: #{deleted_bucket.name} details"
-  puts "bucket generation #{generation}"
-  puts "count of soft deleted buckets #{deleted_buckets.count}"
-  if JSON.parse(bucket_restored.gapi)["name"] == deleted_bucket.name
-    puts "#{deleted_bucket.name} Bucket restored"
-   
-  else
-    puts "#{deleted_bucket.name} Bucket not restored" 
-  end
-
-  deleted_bucket.delete
-  puts "clean up done"
- 
-  #{}puts Gem.loaded_specs["google-cloud-storage"].full_gem_path
-
-end
-# [END storage_delete_bucket]
-
-bucket_name = "ruby_try_6"
-delete_bucket bucket_name: bucket_name
-
-#{}compose_file bucket_name: ARGV.shift if $PROGRAM_NAME == __FILE__
diff --git a/google-cloud-storage/test/google/cloud/storage/project_test.rb b/google-cloud-storage/test/google/cloud/storage/project_test.rb
index f86cfac0f033..7bb0936c6b79 100644
--- a/google-cloud-storage/test/google/cloud/storage/project_test.rb
+++ b/google-cloud-storage/test/google/cloud/storage/project_test.rb
@@ -697,9 +697,7 @@ def stub.insert_bucket *_args
     _(buckets.size).must_equal num_buckets
     bucket = buckets.first
     _(bucket).must_be_kind_of Google::Cloud::Storage::Bucket
-    _(bucket.gapi.soft_delete_time).wont_be_nil
-    # refute_nil _(bucket).soft_delete_tme , "softDeleteTime should not be nil"
-    # _(bucket.soft_delete_tme).must_equal "multi-region"
+    _(bucket.soft_delete_time).wont_be_nil
   end
 
   it "paginates buckets" do
diff --git a/google-cloud-storage/test/helper.rb b/google-cloud-storage/test/helper.rb
index b94d33e923eb..6af72907c8a4 100644
--- a/google-cloud-storage/test/helper.rb
+++ b/google-cloud-storage/test/helper.rb
@@ -610,7 +610,7 @@ def list_files_gapi count = 2, token = nil, prefixes = nil
                                          prefixes: prefixes
   end
 
-  def restore_file_gapi bucket, file_name, generation
+  def restore_file_gapi bucket, file_name, generation = nil
     file_hash = random_file_hash(bucket, file_name, generation).to_json
     Google::Apis::StorageV1::Object.from_json file_hash
   end

From 4805dcf8ce6bc9923cba372dccd870f6836885f0 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 12 Dec 2024 07:36:13 +0000
Subject: [PATCH 006/100] update

---
 google-cloud-storage/lib/google/cloud/storage/project.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 24e17a8cb9b9..4524b22659ac 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -592,7 +592,7 @@ def hmac_keys service_account_email: nil, project_id: nil,
         #   storage = Google::Cloud::Storage.new
         #   generation= 123
         #
-        #   bucket = storage.bucket "my-bucket", generation, soft_deleted: true
+        #   bucket = storage.restore_bucket "my-bucket", generation, soft_deleted: true
         #   puts bucket.name
         #
         def restore_bucket bucket_name,

From 4628b57877a06c7f592b8a1e8978f28d372665fe Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 13 Dec 2024 10:50:06 +0000
Subject: [PATCH 007/100] fixing lint issues

---
 .../lib/google/cloud/storage/bucket.rb        | 28 ++++++++-----------
 .../lib/google/cloud/storage/project.rb       | 10 +------
 .../lib/google/cloud/storage/service.rb       | 10 -------
 .../test/google/cloud/storage/project_test.rb |  2 ++
 google-cloud-storage/test/helper.rb           | 11 +++++---
 5 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 33b97939e527..3b229e5882dd 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -83,9 +83,6 @@ class Bucket
         #
         attr_accessor :user_project
         attr_accessor :soft_deleted
-        attr_accessor :generation
-        attr_accessor :soft_delete_time
-        attr_accessor :hard_delete_time
 
         ##
         # @private Create an empty Bucket object.
@@ -227,9 +224,6 @@ def cors
           cors_builder.freeze # always return frozen objects
         end
 
-        def generation
-          @gapi.generation
-        end
 
         ##
         # Returns the current Object Lifecycle Management rules configuration
@@ -1225,14 +1219,6 @@ def soft_delete_policy
           @gapi.soft_delete_policy
         end
 
-        def soft_delete_time
-          @gapi.soft_delete_time
-        end
-
-        def hard_delete_time
-          @gapi.soft_delete_time
-        end
-
         ##
         # Sets the value for Soft Delete Policy in the bucket. This value can
         # be queried by calling {#soft_delete_policy}.
@@ -2057,6 +2043,18 @@ def compose sources,
         alias compose_file compose
         alias combine compose
 
+        def generation
+          @generation = @gapi.generation
+        end
+
+        def soft_delete_time
+          @soft_delete_time = @gapi.soft_delete_time
+        end
+
+        def hard_delete_time
+          @hard_delete_time = @gapi.hard_delete_time
+        end
+
         ##
         # Generates a signed URL. See [Signed
         # URLs](https://cloud.google.com/storage/docs/access-control/signed-urls)
@@ -3166,8 +3164,6 @@ def self.from_gapi gapi, service, user_project: nil, generation: nil, soft_delet
             b.gapi = gapi
             b.service = service
             b.user_project = user_project
-            b.generation = generation
-            b.soft_deleted = soft_deleted
           end
         end
 
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 4524b22659ac..1f6d96eedf57 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -598,19 +598,11 @@ def hmac_keys service_account_email: nil, project_id: nil,
         def restore_bucket bucket_name,
                            generation,
                            soft_deleted: nil,
-                           timeout: nil,
-                           if_generation_match: nil,
-                           if_generation_not_match: nil,
-                           projection: nil,
-                           user_project: nil,
                            options: {}
           gapi = service.restore_bucket bucket_name, generation,
-                                        if_generation_match: if_generation_match,
-                                        if_generation_not_match: if_generation_not_match,
-                                        user_project: user_project,
                                         soft_deleted: soft_deleted,
                                         options: options
-          Bucket.from_gapi gapi, service, user_project: user_project, generation: generation
+          Bucket.from_gapi gapi, service, generation: generation
         end
 
         ##
diff --git a/google-cloud-storage/lib/google/cloud/storage/service.rb b/google-cloud-storage/lib/google/cloud/storage/service.rb
index 1d652c3b7d36..ce40abe94771 100644
--- a/google-cloud-storage/lib/google/cloud/storage/service.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/service.rb
@@ -663,18 +663,8 @@ def delete_file bucket_name,
         # Restore soft deleted bucket
         def restore_bucket bucket_name,
                            generation,
-                           timeout: nil,
                            soft_deleted: nil,
-                           if_generation_match: nil,
-                           if_generation_not_match: nil,
-                           projection: nil,
-                           user_project: nil,
                            options: {}
-          if options[:retries].nil?
-            is_idempotent = retry? generation: generation, if_generation_match: if_generation_match
-            options = is_idempotent ? {} : { retries: 0 }
-          end
-
           execute do
             service.restore_bucket bucket_name, generation,
                                    soft_deleted: soft_deleted,
diff --git a/google-cloud-storage/test/google/cloud/storage/project_test.rb b/google-cloud-storage/test/google/cloud/storage/project_test.rb
index 7bb0936c6b79..e34d9df4ce0d 100644
--- a/google-cloud-storage/test/google/cloud/storage/project_test.rb
+++ b/google-cloud-storage/test/google/cloud/storage/project_test.rb
@@ -697,6 +697,8 @@ def stub.insert_bucket *_args
     _(buckets.size).must_equal num_buckets
     bucket = buckets.first
     _(bucket).must_be_kind_of Google::Cloud::Storage::Bucket
+    _(bucket.generation).wont_be_nil
+    _(bucket.hard_delete_time).wont_be_nil
     _(bucket.soft_delete_time).wont_be_nil
   end
 
diff --git a/google-cloud-storage/test/helper.rb b/google-cloud-storage/test/helper.rb
index 6af72907c8a4..5e91c3fc9dfc 100644
--- a/google-cloud-storage/test/helper.rb
+++ b/google-cloud-storage/test/helper.rb
@@ -80,7 +80,8 @@ def random_bucket_hash name: random_bucket_name,
                          enable_object_retention: nil,
                          effective_time: DateTime.now,
                          retention_duration_seconds: 604_800, # 7 days
-                         hierarchical_namespace: nil
+                         hierarchical_namespace: nil,
+                         generation: "1733393981548601746"
     versioning_config = { "enabled" => versioning } if versioning
     { "kind" => "storage#bucket",
       "id" => name,
@@ -88,7 +89,7 @@ def random_bucket_hash name: random_bucket_name,
       "projectNumber" => "1234567890",
       "name" => name,
       "timeCreated" => Time.now,
-      "generation" => "1733393981548601746",
+      "generation" => generation,
       "metageneration" => "1",
       "owner" => { "entity" => "project-owners-1234567890" },
       "location" => location,
@@ -126,6 +127,7 @@ def random_deleted_bucket_hash name: random_bucket_name,
                                  autoclass_terminal_storage_class: nil,
                                  enable_object_retention: nil,
                                  effective_time: DateTime.now,
+                                 generation: "1733393981548601746",
                                  retention_duration_seconds: 604_800, # 7 days
                                  hierarchical_namespace: nil
     versioning_config = { "enabled" => versioning } if versioning
@@ -135,7 +137,7 @@ def random_deleted_bucket_hash name: random_bucket_name,
     "projectNumber" => "1234567890",
     "name" => name,
     "timeCreated" => Time.now,
-    "generation" => "1733393981548601746",
+    "generation" => generation,
     "metageneration" => "1",
     "owner" => { "entity" => "project-owners-1234567890" },
     "location" => location,
@@ -152,7 +154,8 @@ def random_deleted_bucket_hash name: random_bucket_name,
     "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
     "enableObjectRetention" => enable_object_retention,
     "softDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time,
-    "hardDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time,
+    "hardDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time
+                                                                                                         .to_time + retention_duration_seconds,
     "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
     "hierarchicalNamespace" => hierarchical_namespace }.delete_if { |_, v| v.nil? }
   end

From 331713a0f44a53e5086dcb6085394b12ae2ce590 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 13 Dec 2024 11:18:22 +0000
Subject: [PATCH 008/100] refactor

---
 google-cloud-storage/lib/google/cloud/storage/bucket.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 3b229e5882dd..b6b79e8bca3a 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -224,7 +224,6 @@ def cors
           cors_builder.freeze # always return frozen objects
         end
 
-
         ##
         # Returns the current Object Lifecycle Management rules configuration
         # for the bucket.

From 7bb513ceff6d6c392feccca6e9b062e1d54d92f0 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 16 Dec 2024 19:09:46 +0000
Subject: [PATCH 009/100] removing unwanted changes

---
 .../lib/google/cloud/storage/bucket.rb        |  21 +-
 .../lib/google/cloud/storage/project.rb       |  14 +-
 .../lib/google/cloud/storage/service.rb       |   2 -
 .../samples/storage_restore_bucket.rb         |  66 +++++
 .../test/google/cloud/storage/project_test.rb | 248 +++++++-----------
 google-cloud-storage/test/helper.rb           | 192 +++++++-------
 6 files changed, 267 insertions(+), 276 deletions(-)
 create mode 100644 google-cloud-storage/samples/storage_restore_bucket.rb

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index b6b79e8bca3a..ad33d3aeee99 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -82,8 +82,7 @@ class Bucket
         #   files = bucket.files # Billed to "my-other-project"
         #
         attr_accessor :user_project
-        attr_accessor :soft_deleted
-
+        
         ##
         # @private Create an empty Bucket object.
         def initialize
@@ -2042,17 +2041,17 @@ def compose sources,
         alias compose_file compose
         alias combine compose
 
-        def generation
-          @generation = @gapi.generation
-        end
+        # def generation
+        #   @generation = @gapi.generation
+        # end
 
-        def soft_delete_time
-          @soft_delete_time = @gapi.soft_delete_time
-        end
+        # def soft_delete_time
+        #   @soft_delete_time = @gapi.soft_delete_time
+        # end
 
-        def hard_delete_time
-          @hard_delete_time = @gapi.hard_delete_time
-        end
+        # def hard_delete_time
+        #   @hard_delete_time = @gapi.hard_delete_time
+        # end
 
         ##
         # Generates a signed URL. See [Signed
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 1f6d96eedf57..fc4f7cbaf7ea 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -193,18 +193,18 @@ def add_custom_header header_name, header_value
         #     puts bucket.name
         #   end
         #
-        # @example Retrieve soft deleted
+        # @example Retrieve soft deleted buckets
         #   require "google/cloud/storage"
         #
         #   storage = Google::Cloud::Storage.new
         #
-        #   user_buckets = storage.buckets soft_deleted: true
-        #   user_buckets.each do |bucket|
+        #   soft_deleted_buckets = storage.buckets soft_deleted: true
+        #   soft_deleted_buckets.each do |bucket|
         #     puts bucket.name
         #   end
         def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted: nil
           gapi = service.list_buckets \
-            prefix: prefix, token: token, max: max, user_project: user_project, soft_deleted: soft_deleted, options: {}
+            prefix: prefix, token: token, max: max, user_project: user_project, soft_deleted: soft_deleted
           Bucket::List.from_gapi \
             gapi, service, prefix, max, user_project: user_project, soft_deleted: soft_deleted
         end
@@ -569,7 +569,7 @@ def hmac_keys service_account_email: nil, project_id: nil,
         end
 
         ##
-        # Restores a soft deleted bucket with bucket name and generation no.
+        # Restores a soft deleted bucket with bucket name and generation.
         #
         # @param [String] bucket_name Name of a bucket.
         # @param [Fixnum] generation generation of a bucket.
@@ -580,7 +580,7 @@ def hmac_keys service_account_email: nil, project_id: nil,
         # @param [Integer] if_metageneration_match Makes the operation conditional
         #   on whether the bucket's current metageneration matches the given value.
         # @param [Boolean] soft_deleted If this parameter is set to
-        #   `true` projects looks in the list of soft deleted buckets
+        #   `true` project looks in the list of soft deleted buckets
         #
         #
         # @return [Google::Cloud::Storage::Bucket, nil] Returns nil if bucket
@@ -597,10 +597,8 @@ def hmac_keys service_account_email: nil, project_id: nil,
         #
         def restore_bucket bucket_name,
                            generation,
-                           soft_deleted: nil,
                            options: {}
           gapi = service.restore_bucket bucket_name, generation,
-                                        soft_deleted: soft_deleted,
                                         options: options
           Bucket.from_gapi gapi, service, generation: generation
         end
diff --git a/google-cloud-storage/lib/google/cloud/storage/service.rb b/google-cloud-storage/lib/google/cloud/storage/service.rb
index ce40abe94771..838445227ebd 100644
--- a/google-cloud-storage/lib/google/cloud/storage/service.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/service.rb
@@ -663,11 +663,9 @@ def delete_file bucket_name,
         # Restore soft deleted bucket
         def restore_bucket bucket_name,
                            generation,
-                           soft_deleted: nil,
                            options: {}
           execute do
             service.restore_bucket bucket_name, generation,
-                                   soft_deleted: soft_deleted,
                                    options: options
           end
         end
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
new file mode 100644
index 000000000000..34a27c2093d1
--- /dev/null
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -0,0 +1,66 @@
+# Copyright 2024 Google LLC
+#
+# 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.
+require 'pry'
+
+# [START storage_delete_bucket]
+def delete_bucket bucket_name:
+  # The ID of your GCS bucket
+  # bucket_name = "your-unique-bucket-name"
+
+  # require "google/cloud/storage"
+  require_relative '../lib/google/cloud/storage'
+  require_relative '../lib/google/cloud/storage/project'
+  require_relative '../lib/google/cloud/storage/bucket'
+  # require_relative '../lib/google/cloud/storage/bucket/list'
+  require_relative '../lib/google/cloud/storage/service'
+
+
+  storage = Google::Cloud::Storage.new
+  deleted_bucket = storage.create_bucket bucket_name
+
+  deleted_bucket.delete
+ 
+  # fetching generation
+  generation = deleted_bucket.gapi.generation
+
+    # fetching soft deleted bucket with soft_delete_time and hard_delete_time
+  deleted_bucket_fetch = storage.bucket deleted_bucket.name, generation: generation, soft_deleted: true
+
+  soft_delete_time= deleted_bucket_fetch.gapi.soft_delete_time
+  hard_delete_time= deleted_bucket_fetch.gapi.hard_delete_time
+  
+  puts "soft_delete_time - #{soft_delete_time}"
+  puts "hard_delete_time - #{hard_delete_time}"
+  binding.pry
+
+  bucket_restored = storage.restore_bucket deleted_bucket.name, generation
+  # fetching soft deleted bucket list
+  deleted_buckets = storage.buckets soft_deleted: true
+
+  puts "Deleted bucket: #{deleted_bucket.name} details"
+  puts "bucket generation #{generation}"
+  puts "count of soft deleted buckets #{deleted_buckets.count}"
+
+  deleted_bucket.delete
+  puts "clean up done"
+ 
+  #{}puts Gem.loaded_specs["google-cloud-storage"].full_gem_path
+
+end
+# [END storage_delete_bucket]
+
+bucket_name = "ruby_try_8"
+delete_bucket bucket_name: bucket_name
+
+#{}compose_file bucket_name: ARGV.shift if $PROGRAM_NAME == __FILE__
\ No newline at end of file
diff --git a/google-cloud-storage/test/google/cloud/storage/project_test.rb b/google-cloud-storage/test/google/cloud/storage/project_test.rb
index e34d9df4ce0d..c5cfb172742f 100644
--- a/google-cloud-storage/test/google/cloud/storage/project_test.rb
+++ b/google-cloud-storage/test/google/cloud/storage/project_test.rb
@@ -31,24 +31,22 @@
   let(:bucket_autoclass_enabled) { true }
   let(:bucket_requester_pays) { true }
   let(:bucket_enable_object_retention) { true }
-  let :bucket_cors do
-    [{ max_age_seconds: 300,
+  let(:bucket_cors) { [{ max_age_seconds: 300,
                          origin: ["http://example.org", "https://example.org"],
                          http_method: ["*"],
-                         response_header: ["X-My-Custom-Header"] }]
-  end
-  let(:bucket_cors_gapi) { bucket_cors.map { |c| Google::Apis::StorageV1::Bucket::CorsConfiguration.new(**c) } }
+                         response_header: ["X-My-Custom-Header"] }] }
+  let(:bucket_cors_gapi) { bucket_cors.map { |c| Google::Apis::StorageV1::Bucket::CorsConfiguration.new **c } }
   let(:kms_key) { "path/to/encryption_key_name" }
-  let(:bucket_retention_period) { 86_400 }
+  let(:bucket_retention_period) { 86400 }
   let(:metageneration) { 6 }
-  let :default_credentials do
+  let(:default_credentials) do
     creds = OpenStruct.new empty: true
     def creds.is_a? target
       target == Google::Auth::Credentials
     end
     creds
   end
-  let :default_universe_credentials do
+  let(:default_universe_credentials) do
     client = OpenStruct.new universe_domain: "googleapis.com"
     creds = OpenStruct.new empty: true, client: client
     def creds.is_a? target
@@ -132,8 +130,8 @@ def creds.is_a? target
       "x-goog-2" => ["x-goog-", 2]
     }
 
-    storage.add_custom_header "x-goog-3", "x-goog-3, x-goog-3"
-    storage.add_custom_header "x-goog-4", ["x-goog-4", "x-goog-4"]
+    storage.add_custom_header "x-goog-3" , "x-goog-3, x-goog-3"
+    storage.add_custom_header "x-goog-4" , ["x-goog-4", "x-goog-4"]
     storage.add_custom_headers headers
 
     headers["x-goog-3"] = "x-goog-3, x-goog-3"
@@ -158,8 +156,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name
@@ -175,8 +172,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, location: bucket_location
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, location: bucket_location
@@ -193,8 +189,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, autoclass_enabled: bucket_autoclass_enabled
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, autoclass_enabled: bucket_autoclass_enabled
@@ -210,8 +205,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, storage_class: bucket_storage_class
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, storage_class: bucket_storage_class
@@ -225,11 +219,9 @@ def creds.is_a? target
 
   it "creates a bucket with versioning" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name,
-                                        versioning: Google::Apis::StorageV1::Bucket::Versioning.new(enabled: true)
+    created_bucket = create_bucket_gapi bucket_name, versioning: Google::Apis::StorageV1::Bucket::Versioning.new(enabled: true)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, versioning: true
@@ -243,16 +235,12 @@ def creds.is_a? target
 
   it "creates a bucket with logging bucket and prefix" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name,
-                                        logging: Google::Apis::StorageV1::Bucket::Logging.new(log_bucket: bucket_logging_bucket,
-                                                                                              log_object_prefix: bucket_logging_prefix)
+    created_bucket = create_bucket_gapi bucket_name, logging: Google::Apis::StorageV1::Bucket::Logging.new(log_bucket: bucket_logging_bucket, log_object_prefix: bucket_logging_prefix)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
-    bucket = storage.create_bucket bucket_name, logging_bucket: bucket_logging_bucket,
-logging_prefix: bucket_logging_prefix
+    bucket = storage.create_bucket bucket_name, logging_bucket: bucket_logging_bucket, logging_prefix: bucket_logging_prefix
 
     mock.verify
 
@@ -264,12 +252,9 @@ def creds.is_a? target
 
   it "creates a bucket with website main and 404" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name,
-                                        website: Google::Apis::StorageV1::Bucket::Website.new(main_page_suffix: bucket_website_main,
-                                                                                              not_found_page: bucket_website_404)
+    created_bucket = create_bucket_gapi bucket_name, website: Google::Apis::StorageV1::Bucket::Website.new(main_page_suffix: bucket_website_main, not_found_page: bucket_website_404)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, website_main: bucket_website_main, website_404: bucket_website_404
@@ -284,11 +269,9 @@ def creds.is_a? target
 
   it "creates a bucket with requester pays" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name,
-                                        billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
+    created_bucket = create_bucket_gapi bucket_name, billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
@@ -304,11 +287,9 @@ def creds.is_a? target
 
   it "creates a bucket with requester pays and user_project set to true" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name,
-                                        billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
+    created_bucket = create_bucket_gapi bucket_name, billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: "test", enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: "test", enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, user_project: true do |b|
@@ -325,11 +306,9 @@ def creds.is_a? target
 
   it "creates a bucket with requester pays and user_project set to another project ID" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name,
-                                        billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
+    created_bucket = create_bucket_gapi bucket_name, billing: Google::Apis::StorageV1::Bucket::Billing.new(requester_pays: bucket_requester_pays)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: "my-other-project", enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: "my-other-project", enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, user_project: "my-other-project" do |b|
@@ -348,16 +327,15 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name, cors: bucket_cors_gapi
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
       b.cors.add_rule ["http://example.org", "https://example.org"],
-                      "*",
-                      headers: "X-My-Custom-Header",
-                      max_age: 300
+                       "*",
+                       headers: "X-My-Custom-Header",
+                       max_age: 300
     end
 
     mock.verify
@@ -369,12 +347,9 @@ def creds.is_a? target
 
   it "creates a bucket with block lifecycle (Object Lifecycle Management)" do
     mock = Minitest::Mock.new
-    created_bucket = create_bucket_gapi bucket_name,
-                                        lifecycle: lifecycle_gapi(lifecycle_rule_gapi("SetStorageClass",
-                                                                                      storage_class: "NEARLINE", age: 32))
+    created_bucket = create_bucket_gapi bucket_name, lifecycle: lifecycle_gapi(lifecycle_rule_gapi("SetStorageClass", storage_class: "NEARLINE", age: 32))
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -394,13 +369,12 @@ def creds.is_a? target
     created_bucket = create_bucket_gapi bucket_name
     created_bucket.labels = { "env" => "production", "foo" => "bar" }
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
-      _(b.labels).must_equal({})
+      _(b.labels).must_equal Hash.new
       b.labels = { "env" => "production" }
       b.labels["foo"] = "bar"
     end
@@ -415,10 +389,9 @@ def creds.is_a? target
   it "creates a bucket with block encryption" do
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
-    created_bucket.encryption = encryption_gapi kms_key
+    created_bucket.encryption = encryption_gapi(kms_key)
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -438,8 +411,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "private",
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "private", predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, acl: "private"
@@ -454,8 +426,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "publicRead",
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: "publicRead", predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, acl: :public
@@ -470,8 +441,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: "private", user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: "private", user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, default_acl: :private
@@ -486,8 +456,7 @@ def creds.is_a? target
     mock = Minitest::Mock.new
     created_bucket = create_bucket_gapi bucket_name
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: "publicRead", user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: "publicRead", user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, default_acl: "public"
@@ -508,11 +477,10 @@ def creds.is_a? target
     resp_bucket = bucket_with_location created_bucket
     bucket_retention_effective_at = Time.now
     resp_bucket.retention_policy = Google::Apis::StorageV1::Bucket::RetentionPolicy.new(
-      retention_period: bucket_retention_period,
-      effective_time: bucket_retention_effective_at
+        retention_period: bucket_retention_period,
+        effective_time: bucket_retention_effective_at
     )
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -555,8 +523,7 @@ def creds.is_a? target
     created_bucket = create_bucket_gapi bucket_name
     created_bucket.default_event_based_hold = true
     resp_bucket = bucket_with_location created_bucket
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -578,12 +545,11 @@ def creds.is_a? target
     created_bucket.rpo = "ASYNC_TURBO"
     resp_bucket = bucket_with_location created_bucket, location_type: "dual-region"
 
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
-      b.rpo = :ASYNC_TURBO
+      b.rpo= :ASYNC_TURBO
     end
 
     mock.verify
@@ -600,8 +566,7 @@ def creds.is_a? target
     created_bucket.hierarchical_namespace = hierarchical_namespace_object
     resp_bucket = bucket_with_location created_bucket
 
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name do |b|
@@ -621,8 +586,7 @@ def creds.is_a? target
     created_bucket.hierarchical_namespace = { enabled: false }
     resp_bucket = bucket_with_location created_bucket
 
-    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil,
-predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
+    mock.expect :insert_bucket, resp_bucket, [project, created_bucket], predefined_acl: nil, predefined_default_object_acl: nil, user_project: nil, enable_object_retention: nil, options: {}
     storage.service.mocked_service = mock
 
     bucket = storage.create_bucket bucket_name, hierarchical_namespace: { enabled: false }
@@ -637,7 +601,7 @@ def creds.is_a? target
     bucket_name = ""
 
     stub = Object.new
-    def stub.insert_bucket *_args
+    def stub.insert_bucket *args
       raise Google::Apis::ClientError.new("invalid argument", status_code: 400)
     end
     storage.service.mocked_service = stub
@@ -651,8 +615,7 @@ def stub.insert_bucket *_args
     num_buckets = 3
 
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -670,8 +633,7 @@ def stub.insert_bucket *_args
     num_buckets = 3
 
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -697,17 +659,15 @@ def stub.insert_bucket *_args
     _(buckets.size).must_equal num_buckets
     bucket = buckets.first
     _(bucket).must_be_kind_of Google::Cloud::Storage::Bucket
-    _(bucket.generation).wont_be_nil
-    _(bucket.hard_delete_time).wont_be_nil
-    _(bucket.soft_delete_time).wont_be_nil
+    _(bucket.gapi.generation).wont_be_nil
+    _(bucket.gapi.hard_delete_time).wont_be_nil
+    _(bucket.gapi.soft_delete_time).wont_be_nil
   end
 
   it "paginates buckets" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -726,15 +686,13 @@ def stub.insert_bucket *_args
 
   it "paginates buckets with max set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: 3, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
-max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: 3, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
     first_buckets = storage.buckets max: 3
-    second_buckets = storage.buckets token: first_buckets.token, max: 3
+    second_buckets = storage.buckets token: first_buckets.token,  max: 3
 
     mock.verify
 
@@ -750,8 +708,7 @@ def stub.insert_bucket *_args
     num_buckets = 3
 
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -768,10 +725,8 @@ def stub.insert_bucket *_args
 
   it "paginates buckets with next? and next" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -789,10 +744,8 @@ def stub.insert_bucket *_args
 
   it "paginates buckets with next? and next and max set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: 3, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
-max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: 3, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -810,10 +763,8 @@ def stub.insert_bucket *_args
 
   it "paginates buckets with all" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -826,10 +777,8 @@ def stub.insert_bucket *_args
 
   it "paginates buckets with all and max set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: 3, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token",
-max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: 3, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(2), [project], prefix: nil, page_token: "next_page_token", max_results: 3, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -842,14 +791,12 @@ def stub.insert_bucket *_args
 
   it "iterates buckets with all using Enumerator" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
-page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
-    buckets = storage.buckets.all.take 5
+    buckets = storage.buckets.all.take(5)
 
     mock.verify
 
@@ -858,10 +805,8 @@ def stub.insert_bucket *_args
 
   it "iterates buckets with all and request_limit set" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: nil, soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
-page_token: "next_page_token", max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: nil, soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: nil,soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -874,10 +819,8 @@ def stub.insert_bucket *_args
 
   it "iterates buckets with all and user_project set to true" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: "test", soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
-page_token: "next_page_token", max_results: nil, user_project: "test", soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: "test", soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: "test", soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -891,10 +834,8 @@ def stub.insert_bucket *_args
 
   it "iterates buckets with all and user_project set to another project ID" do
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil,
-max_results: nil, user_project: "my-other-project", soft_deleted: nil, options: {}
-    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil,
-page_token: "next_page_token", max_results: nil, user_project: "my-other-project", soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "next_page_token"), [project], prefix: nil, page_token: nil, max_results: nil, user_project: "my-other-project", soft_deleted: nil, options: {}
+    mock.expect :list_buckets, list_buckets_gapi(3, "second_page_token"), [project], prefix: nil, page_token: "next_page_token", max_results: nil, user_project: "my-other-project", soft_deleted: nil, options: {}
 
     storage.service.mocked_service = mock
 
@@ -919,11 +860,10 @@ def stub.insert_bucket *_args
     mock.verify
 
     _(bucket.name).must_equal bucket_name
-    _(bucket.generation).wont_be_nil
     _(bucket).wont_be :lazy?
   end
 
-  it "finds a deleted bucket" do
+    it "finds a deleted bucket" do
     bucket_name = "found-bucket"
     generation = 1_733_393_981_548_601_746
 
@@ -937,7 +877,7 @@ def stub.insert_bucket *_args
     mock.verify
 
     _(bucket.name).must_equal bucket_name
-    _(bucket.generation).must_equal generation
+    _(bucket.gapi.generation).must_equal generation
     _(bucket.gapi.hard_delete_time).wont_be_nil
     _(bucket.gapi.hard_delete_time).wont_be_nil
 
@@ -950,15 +890,13 @@ def stub.insert_bucket *_args
 
     mock = Minitest::Mock.new
     mock.expect :restore_bucket, restored_bucket_gapi(bucket_name, generation),
-                [bucket_name, generation], soft_deleted: true, options: {}
+                [bucket_name, generation], options: {}
 
     storage.service.mocked_service = mock
-    bucket = storage.restore_bucket bucket_name, generation, soft_deleted: true
-
+    bucket = storage.restore_bucket bucket_name, generation
     mock.verify
-
     _(bucket.name).must_equal bucket_name
-    _(bucket.generation).must_equal generation
+    _(bucket.gapi.generation).must_equal generation
   end
 
   it "finds a bucket with find_bucket alias" do
@@ -981,8 +919,7 @@ def stub.insert_bucket *_args
     bucket_name = "found-bucket"
 
     mock = Minitest::Mock.new
-    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name],
-                **get_bucket_args(if_metageneration_match: metageneration)
+    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name], **get_bucket_args(if_metageneration_match: metageneration)
 
     storage.service.mocked_service = mock
 
@@ -998,8 +935,7 @@ def stub.insert_bucket *_args
     bucket_name = "found-bucket"
 
     mock = Minitest::Mock.new
-    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name],
-                **get_bucket_args(if_metageneration_not_match: metageneration)
+    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name], **get_bucket_args(if_metageneration_not_match: metageneration)
 
     storage.service.mocked_service = mock
 
@@ -1031,8 +967,7 @@ def stub.insert_bucket *_args
     bucket_name = "found-bucket"
 
     mock = Minitest::Mock.new
-    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name],
-                **get_bucket_args(user_project: "my-other-project")
+    mock.expect :get_bucket, find_bucket_gapi(bucket_name), [bucket_name], **get_bucket_args(user_project: "my-other-project")
 
     storage.service.mocked_service = mock
 
@@ -1126,20 +1061,20 @@ def create_bucket_gapi name = nil,
       name: name, location: location, storage_class: storage_class,
       versioning: versioning, logging: logging, website: website,
       cors_configurations: cors, billing: billing, lifecycle: lifecycle,
-      autoclass: Google::Apis::StorageV1::Bucket::Autoclass.new(enabled: autoclass_enabled),
+      autoclass: Google::Apis::StorageV1::Bucket::Autoclass.new( enabled: autoclass_enabled ),
       object_retention: object_retention_param(enable_object_retention)
     }.delete_if { |_, v| v.nil? }
-    Google::Apis::StorageV1::Bucket.new(**options)
-  end
-
-  def find_bucket_gapi name = nil
-    Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name).to_json
+    Google::Apis::StorageV1::Bucket.new **options
   end
 
   def find_deleted_bucket_gapi name = nil
     Google::Apis::StorageV1::Bucket.from_json random_deleted_bucket_hash(name: name).to_json
   end
 
+  def find_bucket_gapi name = nil
+    Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name).to_json
+  end
+
   def list_buckets_gapi count = 2, token = nil
     buckets = count.times.map { Google::Apis::StorageV1::Bucket.from_json random_bucket_hash.to_json }
     Google::Apis::StorageV1::Buckets.new(
@@ -1158,7 +1093,8 @@ def restored_bucket_gapi name, _generation
     Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name).to_json
   end
 
+
   def object_retention_param enable_object_retention
     enable_object_retention ? Google::Apis::StorageV1::Bucket::ObjectRetention.new(mode: "Enabled") : nil
   end
-end
+end
\ No newline at end of file
diff --git a/google-cloud-storage/test/helper.rb b/google-cloud-storage/test/helper.rb
index 5e91c3fc9dfc..bfeb842e1692 100644
--- a/google-cloud-storage/test/helper.rb
+++ b/google-cloud-storage/test/helper.rb
@@ -26,38 +26,29 @@
 
 ##
 # Monkey-Patch Google API Client to support Mocks
-module Google
-  module Apis
-    module Core
-      module Hashable
-        ##
-        # Minitest Mock depends on === to match same-value objects.
-        # By default, the Google API Client objects do not match with ===.
-        # Therefore, we must add this capability.
-        # This module seems like as good a place as any...
-        def === other
-          return(to_h === other.to_h) if other.respond_to? :to_h
-          super
-        end
-      end
-    end
+module Google::Apis::Core::Hashable
+  ##
+  # Minitest Mock depends on === to match same-value objects.
+  # By default, the Google API Client objects do not match with ===.
+  # Therefore, we must add this capability.
+  # This module seems like as good a place as any...
+  def === other
+    return(to_h === other.to_h) if other.respond_to? :to_h
+    super
   end
 end
 
 class MockStorage < Minitest::Spec
   let(:project) { "test" }
-  let(:credentials) { OpenStruct.new(client: OpenStruct.new(updater_proc: proc {})) }
-  let :storage do
-    Google::Cloud::Storage::Project.new Google::Cloud::Storage::Service.new(project, credentials,
-                                                                            upload_chunk_size: 5 * 1024 * 1024)
-  end
+  let(:credentials) { OpenStruct.new(client: OpenStruct.new(updater_proc: Proc.new {})) }
+  let(:storage) { Google::Cloud::Storage::Project.new(Google::Cloud::Storage::Service.new(project, credentials, upload_chunk_size: 5 * 1024 * 1024 )) }
   let(:pubsub_topic_name) { "my-topic-name" }
-  let(:file_obj) { StringIO.new "My test file" }
+  let(:file_obj) { StringIO.new("My test file") }
   let(:file_name) { "my_test_file.txt" }
   let(:acl) { "authenticated_read" }
 
   # Register this spec type for when :mock_storage is used.
-  register_spec_type self do |_desc, *addl|
+  register_spec_type(self) do |desc, *addl|
     addl.include? :mock_storage
   end
 
@@ -79,7 +70,7 @@ def random_bucket_hash name: random_bucket_name,
                          autoclass_terminal_storage_class: nil,
                          enable_object_retention: nil,
                          effective_time: DateTime.now,
-                         retention_duration_seconds: 604_800, # 7 days
+                         retention_duration_seconds: 604800, # 7 days
                          hierarchical_namespace: nil,
                          generation: "1733393981548601746"
     versioning_config = { "enabled" => versioning } if versioning
@@ -106,62 +97,62 @@ def random_bucket_hash name: random_bucket_name,
       "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
       "enableObjectRetention" => enable_object_retention,
       "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
-      "hierarchicalNamespace" => hierarchical_namespace }.delete_if { |_, v| v.nil? }
+      "hierarchicalNamespace" => hierarchical_namespace
+    }.delete_if { |_, v| v.nil? }
   end
-
   def random_deleted_bucket_hash name: random_bucket_name,
-                                 url_root: "https://www.googleapis.com/storage/v1",
-                                 location: "US",
-                                 storage_class: "STANDARD",
-                                 versioning: nil,
-                                 logging_bucket: nil,
-                                 logging_prefix: nil,
-                                 website_main: nil,
-                                 website_404: nil,
-                                 cors: [],
-                                 requester_pays: nil,
-                                 lifecycle: nil,
-                                 location_type: "multi-region",
-                                 rpo: "DEFAULT",
-                                 autoclass_enabled: nil,
-                                 autoclass_terminal_storage_class: nil,
-                                 enable_object_retention: nil,
-                                 effective_time: DateTime.now,
-                                 generation: "1733393981548601746",
-                                 retention_duration_seconds: 604_800, # 7 days
-                                 hierarchical_namespace: nil
+                         url_root: "https://www.googleapis.com/storage/v1",
+                         location: "US",
+                         storage_class: "STANDARD",
+                         versioning: nil,
+                         logging_bucket: nil,
+                         logging_prefix: nil,
+                         website_main: nil,
+                         website_404: nil,
+                         cors: [],
+                         requester_pays: nil,
+                         lifecycle: nil,
+                         location_type: "multi-region",
+                         rpo: "DEFAULT",
+                         autoclass_enabled: nil,
+                         autoclass_terminal_storage_class: nil,
+                         enable_object_retention: nil,
+                         effective_time: DateTime.now,
+                         retention_duration_seconds: 604800, # 7 days
+                         hierarchical_namespace: nil,
+                         generation: "1733393981548601746"
     versioning_config = { "enabled" => versioning } if versioning
     { "kind" => "storage#bucket",
-    "id" => name,
-    "selfLink" => "#{url_root}/b/#{name}",
-    "projectNumber" => "1234567890",
-    "name" => name,
-    "timeCreated" => Time.now,
-    "generation" => generation,
-    "metageneration" => "1",
-    "owner" => { "entity" => "project-owners-1234567890" },
-    "location" => location,
-    "locationType" => location_type,
-    "rpo" => rpo,
-    "cors" => cors,
-    "lifecycle" => lifecycle,
-    "logging" => logging_hash(logging_bucket, logging_prefix),
-    "storageClass" => storage_class,
-    "versioning" => versioning_config,
-    "website" => website_hash(website_main, website_404),
-    "billing" => billing_hash(requester_pays),
-    "etag" => "CAE=",
-    "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
-    "enableObjectRetention" => enable_object_retention,
-    "softDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time,
-    "hardDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time
-                                                                                                         .to_time + retention_duration_seconds,
-    "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
-    "hierarchicalNamespace" => hierarchical_namespace }.delete_if { |_, v| v.nil? }
-  end
-
-  # 7 days
-  def soft_delete_policy_object retention_duration_seconds: 604_800
+      "id" => name,
+      "selfLink" => "#{url_root}/b/#{name}",
+      "projectNumber" => "1234567890",
+      "name" => name,
+      "timeCreated" => Time.now,
+      "generation" => generation,
+      "metageneration" => "1",
+      "owner" => { "entity" => "project-owners-1234567890" },
+      "location" => location,
+      "locationType" => location_type,
+      "rpo" => rpo,
+      "cors" => cors,
+      "lifecycle" => lifecycle,
+      "logging" => logging_hash(logging_bucket, logging_prefix),
+      "storageClass" => storage_class,
+      "versioning" => versioning_config,
+      "website" => website_hash(website_main, website_404),
+      "billing" => billing_hash(requester_pays),
+      "etag" => "CAE=",
+      "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
+      "enableObjectRetention" => enable_object_retention,
+      "softDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time,
+      "hardDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time
+                                                                                                           .to_time + retention_duration_seconds,  
+      "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
+      "hierarchicalNamespace" => hierarchical_namespace
+    }.delete_if { |_, v| v.nil? }
+  end
+
+  def soft_delete_policy_object retention_duration_seconds: 604800 # 7 days
     Google::Apis::StorageV1::Bucket::SoftDeletePolicy.new(
       effective_time: DateTime.now,
       retention_duration_seconds: retention_duration_seconds
@@ -174,34 +165,38 @@ def hierarchical_namespace_object enabled: true
     )
   end
 
-  def autoclass_config_hash enabled, terminal_storage_class
+  def autoclass_config_hash(enabled, terminal_storage_class)
     { "enabled"               => enabled,
-      "terminalStorageClass"  => terminal_storage_class }.delete_if { |_, v| v.nil? } if !enabled.nil? || terminal_storage_class
+      "terminalStorageClass"  => terminal_storage_class
+    }.delete_if { |_, v| v.nil? } if !enabled.nil? || terminal_storage_class
   end
 
-  def logging_hash bucket, prefix
+  def logging_hash(bucket, prefix)
     { "logBucket"       => bucket,
-      "logObjectPrefix" => prefix }.delete_if { |_, v| v.nil? } if bucket || prefix
+      "logObjectPrefix" => prefix,
+    }.delete_if { |_, v| v.nil? } if bucket || prefix
   end
 
-  def website_hash website_main, website_404
+  def website_hash(website_main, website_404)
     { "mainPageSuffix" => website_main,
-      "notFoundPage"   => website_404 }.delete_if { |_, v| v.nil? } if website_main || website_404
+      "notFoundPage"   => website_404,
+    }.delete_if { |_, v| v.nil? } if website_main || website_404
   end
 
-  def billing_hash requester_pays
-    { "requesterPays" => requester_pays } unless requester_pays.nil?
+  def billing_hash(requester_pays)
+    { "requesterPays" => requester_pays} unless requester_pays.nil?
   end
 
-  def file_retention_hash retention_params
-    { "mode" => retention_params[:mode],
-      "retainUntilTime" => retention_params[:retain_until_time] }.delete_if { |_, v| v.nil? } if !retention_params.nil? && !retention_params.empty?
+  def file_retention_hash(retention_params)
+    { "mode"               => retention_params[:mode],
+      "retainUntilTime"  => retention_params[:retain_until_time]
+    }.delete_if { |_, v| v.nil? } if !retention_params.nil? && !retention_params.empty?
   end
 
-  def random_file_hash bucket = random_bucket_name,
-                       name = random_file_path,
-                       generation = "1234567890",
-                       kms_key_name = "path/to/encryption_key_name",
+  def random_file_hash bucket=random_bucket_name,
+                       name=random_file_path,
+                       generation="1234567890",
+                       kms_key_name="path/to/encryption_key_name",
                        custom_time: nil,
                        retention_params: nil,
                        override_unlocked_retention: nil,
@@ -210,9 +205,9 @@ def random_file_hash bucket = random_bucket_name,
     { "kind" => "storage#object",
       "id" => "#{bucket}/#{name}/1234567890",
       "selfLink" => "https://www.googleapis.com/storage/v1/b/#{bucket}/o/#{name}",
-      "name" => name.to_s,
+      "name" => "#{name}",
       "timeCreated" => Time.now,
-      "bucket" => bucket.to_s,
+      "bucket" => "#{bucket}",
       "generation" => generation,
       "metageneration" => "1",
       "cacheControl" => "public, max-age=3600",
@@ -274,7 +269,7 @@ def random_notification_gapi id: "1", topic: "//pubsub.googleapis.com/projects/t
   def download_http_resp gzip: nil
     headers = {}
     headers["Content-Encoding"] = ["gzip"] if gzip
-    OpenStruct.new header: headers
+    OpenStruct.new(header: headers)
   end
 
   def encryption_gapi key_name
@@ -478,7 +473,7 @@ def patch_object_args generation: nil,
                         user_project: nil,
                         override_unlocked_retention: nil,
                         options: {}
-    {
+    opts = {
       generation: generation,
       if_generation_match: if_generation_match,
       if_generation_not_match: if_generation_not_match,
@@ -577,6 +572,7 @@ def restore_object_args copy_source_acl: nil,
     }
   end
 
+
   def compose_request source_files, destination_gapi = nil, if_source_generation_match: nil
     source_objects = source_files.map do |file|
       if file.is_a? String
@@ -608,13 +604,11 @@ def compose_request source_files, destination_gapi = nil, if_source_generation_m
 
   def list_files_gapi count = 2, token = nil, prefixes = nil
     files = count.times.map { Google::Apis::StorageV1::Object.from_json random_file_hash.to_json }
-    Google::Apis::StorageV1::Objects.new kind: "storage#objects", items: files,
-                                         next_page_token: token,
-                                         prefixes: prefixes
+    Google::Apis::StorageV1::Objects.new kind: "storage#objects", items: files, next_page_token: token, prefixes: prefixes
   end
 
-  def restore_file_gapi bucket, file_name, generation = nil
+  def restore_file_gapi bucket, file_name, generation=nil
     file_hash = random_file_hash(bucket, file_name, generation).to_json
     Google::Apis::StorageV1::Object.from_json file_hash
   end
-end
+end
\ No newline at end of file

From fd595edde3763c485c2dcb3cc61c74861657d1f8 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 16 Dec 2024 19:10:53 +0000
Subject: [PATCH 010/100] removing commented code

---
 .../lib/google/cloud/storage/bucket.rb             | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index ad33d3aeee99..814a423f0978 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -82,7 +82,7 @@ class Bucket
         #   files = bucket.files # Billed to "my-other-project"
         #
         attr_accessor :user_project
-        
+
         ##
         # @private Create an empty Bucket object.
         def initialize
@@ -2041,18 +2041,6 @@ def compose sources,
         alias compose_file compose
         alias combine compose
 
-        # def generation
-        #   @generation = @gapi.generation
-        # end
-
-        # def soft_delete_time
-        #   @soft_delete_time = @gapi.soft_delete_time
-        # end
-
-        # def hard_delete_time
-        #   @hard_delete_time = @gapi.hard_delete_time
-        # end
-
         ##
         # Generates a signed URL. See [Signed
         # URLs](https://cloud.google.com/storage/docs/access-control/signed-urls)

From 5876b2179abaadb3142214e21dc97eb940e02cd4 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 16 Dec 2024 19:16:04 +0000
Subject: [PATCH 011/100] removing unwanted file change

---
 .../samples/storage_restore_bucket.rb         | 66 -------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 google-cloud-storage/samples/storage_restore_bucket.rb

diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
deleted file mode 100644
index 34a27c2093d1..000000000000
--- a/google-cloud-storage/samples/storage_restore_bucket.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2024 Google LLC
-#
-# 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.
-require 'pry'
-
-# [START storage_delete_bucket]
-def delete_bucket bucket_name:
-  # The ID of your GCS bucket
-  # bucket_name = "your-unique-bucket-name"
-
-  # require "google/cloud/storage"
-  require_relative '../lib/google/cloud/storage'
-  require_relative '../lib/google/cloud/storage/project'
-  require_relative '../lib/google/cloud/storage/bucket'
-  # require_relative '../lib/google/cloud/storage/bucket/list'
-  require_relative '../lib/google/cloud/storage/service'
-
-
-  storage = Google::Cloud::Storage.new
-  deleted_bucket = storage.create_bucket bucket_name
-
-  deleted_bucket.delete
- 
-  # fetching generation
-  generation = deleted_bucket.gapi.generation
-
-    # fetching soft deleted bucket with soft_delete_time and hard_delete_time
-  deleted_bucket_fetch = storage.bucket deleted_bucket.name, generation: generation, soft_deleted: true
-
-  soft_delete_time= deleted_bucket_fetch.gapi.soft_delete_time
-  hard_delete_time= deleted_bucket_fetch.gapi.hard_delete_time
-  
-  puts "soft_delete_time - #{soft_delete_time}"
-  puts "hard_delete_time - #{hard_delete_time}"
-  binding.pry
-
-  bucket_restored = storage.restore_bucket deleted_bucket.name, generation
-  # fetching soft deleted bucket list
-  deleted_buckets = storage.buckets soft_deleted: true
-
-  puts "Deleted bucket: #{deleted_bucket.name} details"
-  puts "bucket generation #{generation}"
-  puts "count of soft deleted buckets #{deleted_buckets.count}"
-
-  deleted_bucket.delete
-  puts "clean up done"
- 
-  #{}puts Gem.loaded_specs["google-cloud-storage"].full_gem_path
-
-end
-# [END storage_delete_bucket]
-
-bucket_name = "ruby_try_8"
-delete_bucket bucket_name: bucket_name
-
-#{}compose_file bucket_name: ARGV.shift if $PROGRAM_NAME == __FILE__
\ No newline at end of file

From 8bb3590a1fc006d89c8bd5f1d590531be955046a Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 16 Dec 2024 19:32:29 +0000
Subject: [PATCH 012/100] refactor

---
 google-cloud-storage/lib/google/cloud/storage/bucket.rb      | 2 +-
 google-cloud-storage/lib/google/cloud/storage/bucket/list.rb | 2 +-
 google-cloud-storage/lib/google/cloud/storage/project.rb     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 814a423f0978..e514ad651048 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -3145,7 +3145,7 @@ def lazy?
 
         ##
         # @private New Bucket from a Google API Client object.
-        def self.from_gapi gapi, service, user_project: nil, generation: nil, soft_deleted: nil
+        def self.from_gapi gapi, service, user_project: nil
           new.tap do |b|
             b.gapi = gapi
             b.service = service
diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
index f3a0c1ef26de..3ccc34c1d041 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
@@ -148,7 +148,7 @@ def all request_limit: nil, &block
           def self.from_gapi gapi_list, service, prefix = nil, max = nil,
                              user_project: nil, soft_deleted: nil
             buckets = new(Array(gapi_list.items).map do |gapi_object|
-              Bucket.from_gapi gapi_object, service, user_project: user_project, soft_deleted: soft_deleted
+              Bucket.from_gapi gapi_object, service, user_project: user_project
             end)
             buckets.instance_variable_set :@token, gapi_list.next_page_token
             buckets.instance_variable_set :@service, service
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index fc4f7cbaf7ea..cfce50472365 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -284,7 +284,7 @@ def bucket bucket_name,
                                     soft_deleted: soft_deleted,
                                     generation: generation
 
-          Bucket.from_gapi gapi, service, user_project: user_project, soft_deleted: soft_deleted, generation: generation
+          Bucket.from_gapi gapi, service, user_project: user_project
         rescue Google::Cloud::NotFoundError
           nil
         end
@@ -600,7 +600,7 @@ def restore_bucket bucket_name,
                            options: {}
           gapi = service.restore_bucket bucket_name, generation,
                                         options: options
-          Bucket.from_gapi gapi, service, generation: generation
+          Bucket.from_gapi gapi, service
         end
 
         ##

From 0c7316a5323f3d72f1fb62efd62ff635c27b90b6 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 18 Dec 2024 10:15:11 +0000
Subject: [PATCH 013/100] refactor

---
 .../lib/google/cloud/storage/bucket.rb        | 25 +++++++++++++++++++
 .../test/google/cloud/storage/project_test.rb | 20 +++++++--------
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index e514ad651048..17624c8fc086 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -2281,6 +2281,31 @@ def signed_url path = nil,
           end
         end
 
+        # Fetches generation no. of bucket
+        # @example
+        # require "google/cloud/storage"
+        # storage = Google::Cloud::Storage.new
+        # bucket = storage.bucket "my-bucket"
+        # generation= bucket.generation
+        def generation
+          @generation = @gapi.generation
+        end
+
+        # Fetches soft_delete_time of a soft deleted bucket
+        # @example
+        # bucket.delete
+        # bucket.soft_delete_time
+        def soft_delete_time
+          @soft_delete_time = @gapi.soft_delete_time
+        end
+
+        # Fetches hard_delete_time of a soft deleted bucket
+        # @example
+        # bucket.hard_delete_time
+        def hard_delete_time
+          @hard_delete_time = @gapi.hard_delete_time
+        end
+
         ##
         # Generate a PostObject that includes the fields and URL to
         # upload objects via HTML forms.
diff --git a/google-cloud-storage/test/google/cloud/storage/project_test.rb b/google-cloud-storage/test/google/cloud/storage/project_test.rb
index c5cfb172742f..0019d1e7ff29 100644
--- a/google-cloud-storage/test/google/cloud/storage/project_test.rb
+++ b/google-cloud-storage/test/google/cloud/storage/project_test.rb
@@ -659,9 +659,9 @@ def stub.insert_bucket *args
     _(buckets.size).must_equal num_buckets
     bucket = buckets.first
     _(bucket).must_be_kind_of Google::Cloud::Storage::Bucket
-    _(bucket.gapi.generation).wont_be_nil
-    _(bucket.gapi.hard_delete_time).wont_be_nil
-    _(bucket.gapi.soft_delete_time).wont_be_nil
+    _(bucket.generation).wont_be_nil
+    _(bucket.hard_delete_time).wont_be_nil
+    _(bucket.soft_delete_time).wont_be_nil
   end
 
   it "paginates buckets" do
@@ -863,7 +863,7 @@ def stub.insert_bucket *args
     _(bucket).wont_be :lazy?
   end
 
-    it "finds a deleted bucket" do
+  it "finds a deleted bucket" do
     bucket_name = "found-bucket"
     generation = 1_733_393_981_548_601_746
 
@@ -877,9 +877,9 @@ def stub.insert_bucket *args
     mock.verify
 
     _(bucket.name).must_equal bucket_name
-    _(bucket.gapi.generation).must_equal generation
-    _(bucket.gapi.hard_delete_time).wont_be_nil
-    _(bucket.gapi.hard_delete_time).wont_be_nil
+    _(bucket.generation).must_equal generation
+    _(bucket.soft_delete_time).wont_be_nil
+    _(bucket.hard_delete_time).wont_be_nil
 
     _(bucket).wont_be :lazy?
   end
@@ -889,14 +889,14 @@ def stub.insert_bucket *args
     generation = 1_733_393_981_548_601_746
 
     mock = Minitest::Mock.new
-    mock.expect :restore_bucket, restored_bucket_gapi(bucket_name, generation),
+    mock.expect :restore_bucket, restored_bucket_gapi(bucket_name),
                 [bucket_name, generation], options: {}
 
     storage.service.mocked_service = mock
     bucket = storage.restore_bucket bucket_name, generation
     mock.verify
     _(bucket.name).must_equal bucket_name
-    _(bucket.gapi.generation).must_equal generation
+    _(bucket.generation).must_equal generation
   end
 
   it "finds a bucket with find_bucket alias" do
@@ -1089,7 +1089,7 @@ def list_deleted_buckets_gapi count = 2, token = nil
     )
   end
 
-  def restored_bucket_gapi name, _generation
+  def restored_bucket_gapi name
     Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name).to_json
   end
 

From dc22c714103f588b09fde027c47a4ae513f53e5e Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 12 Dec 2024 07:31:50 +0000
Subject: [PATCH 014/100] WIP-samples

---
 .../samples/acceptance/buckets_test.rb        | 37 +++++++++++++++
 .../storage_get_soft_deleted_bucket.rb        | 44 ++++++++++++++++++
 .../storage_list_soft_deleted_buckets.rb      | 38 +++++++++++++++
 .../samples/storage_restore_bucket.rb         | 46 +++++++++++++++++++
 4 files changed, 165 insertions(+)
 create mode 100644 google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
 create mode 100644 google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
 create mode 100644 google-cloud-storage/samples/storage_restore_bucket.rb

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index f4f416744fd1..03ff7c29e932 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -40,8 +40,10 @@
 require_relative "../storage_get_public_access_prevention"
 require_relative "../storage_get_requester_pays_status"
 require_relative "../storage_get_retention_policy"
+require_relative "../storage_get_soft_deleted_bucket"
 require_relative "../storage_get_uniform_bucket_level_access"
 require_relative "../storage_list_buckets"
+require_relative "../storage_list_soft_deleted_buckets"
 require_relative "../storage_lock_retention_policy"
 require_relative "../storage_remove_bucket_label"
 require_relative "../storage_remove_cors_configuration"
@@ -53,6 +55,7 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
+require "pry"
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
@@ -119,6 +122,40 @@
     end
   end
 
+  describe "storage_soft_deleted_bucket" do
+    let(:generation) {bucket.generation}
+
+    # it "get soft deleted bucket generation" do
+    #   out, _err = capture_io do
+    #     bucket.generation
+    #   end
+    #   assert generation, "Bucket generation should be present"
+    # # end
+
+
+    it "get soft deleted bucket soft_delete_time and hard_delete_time" do
+      # @bucket.delete
+      binding.pry
+      bucket.delete
+      out, _err = capture_io do
+        get_soft_deleted_bucket bucket_name: bucket.name, generation:generation
+      end
+      assert "soft_delete_time", "Bucket soft_delete_time should be present"
+      assert "hard_delete_time", "Bucket hard_delete_time should be present"
+    end
+
+     it "lists soft deleted buckets" do
+      # delete_bucket bucket_name: bucket_name
+      # list_soft_deleted_buckets
+      list_deleted_bucket, _err = capture_io do
+        list_soft_deleted_buckets
+      end
+      assert_includes list_deleted_bucket, bucket.name
+    end
+
+  end
+
+
   describe "storage_create_bucket_dual_region" do
     it "creates dual region bucket" do
       location = "US"
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
new file mode 100644
index 000000000000..e6be702df16e
--- /dev/null
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -0,0 +1,44 @@
+# Copyright 2024 Google LLC
+#
+# 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.
+
+# [START storage_get_soft_deleted_bucket]
+def get_soft_deleted_bucket bucket_name:, generation:
+  # The ID of your GCS bucket
+  # bucket_name = "your-unique-bucket-name"
+
+  require "google/cloud/storage"
+  # require_relative '../lib/google/cloud/storage'
+  # require_relative '../lib/google/cloud/storage/project'
+  # require_relative '../lib/google/cloud/storage/bucket'
+  # # require_relative '../lib/google/cloud/storage/bucket/list'
+  # require_relative '../lib/google/cloud/storage/service'
+  # require "pry"
+
+  storage = Google::Cloud::Storage.new
+  bucket_name= bucket_name.gsub(/[^a-zA-Z0-9\- ]/, "")
+
+
+  # fetching soft deleted bucket with soft_delete_time and hard_delete_time
+  deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
+
+  soft_delete_time = deleted_bucket_fetch.soft_delete_time
+  hard_delete_time = deleted_bucket_fetch.hard_delete_time
+
+  puts "soft_delete_time - #{soft_delete_time}"
+  puts "hard_delete_time - #{hard_delete_time}"
+end
+# [END storage_delete_bucket]
+
+
+get_soft_deleted_bucket bucket_name: ARGV.shift, generation: ARGV.shift if $PROGRAM_NAME == __FILE__
diff --git a/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
new file mode 100644
index 000000000000..ec81eac9b7da
--- /dev/null
+++ b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
@@ -0,0 +1,38 @@
+# Copyright 2024 Google LLC
+#
+# 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.
+
+# [START storage_list_soft_deleted_buckets]
+def list_soft_deleted_buckets
+  # The ID of your GCS bucket
+  # bucket_name = "your-unique-bucket-name"
+
+  # {}require "google/cloud/storage"
+  require_relative "../lib/google/cloud/storage"
+  require_relative "../lib/google/cloud/storage/project"
+  require_relative "../lib/google/cloud/storage/bucket"
+  # require_relative '../lib/google/cloud/storage/bucket/list'
+  require_relative "../lib/google/cloud/storage/service"
+
+  storage = Google::Cloud::Storage.new
+
+  # fetching soft deleted bucket list
+  deleted_buckets = storage.buckets soft_deleted: true
+
+  deleted_buckets.each do |bucket|
+    puts bucket.name
+  end
+end
+# [END storage_list_soft_deleted_buckets]
+
+list_soft_deleted_buckets if $PROGRAM_NAME == __FILE__
\ No newline at end of file
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
new file mode 100644
index 000000000000..a338570983df
--- /dev/null
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -0,0 +1,46 @@
+# Copyright 2024 Google LLC
+#
+# 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.
+require 'pry'
+
+# [START storage_delete_bucket]
+def restore_bucket bucket_name:, generation:
+  # The ID of your GCS bucket
+  # bucket_name = "your-unique-bucket-name"
+
+   #{}require "google/cloud/storage"
+  require_relative '../lib/google/cloud/storage'
+  require_relative '../lib/google/cloud/storage/project'
+  require_relative '../lib/google/cloud/storage/bucket'
+  # require_relative '../lib/google/cloud/storage/bucket/list'
+  require_relative '../lib/google/cloud/storage/service'
+  require "pry"
+
+
+  storage = Google::Cloud::Storage.new
+
+  bucket_restored = storage.restore_bucket bucket_name, generation, soft_deleted: true
+  # fetching soft deleted bucket list
+#   deleted_buckets = storage.buckets soft_deleted: true
+  binding.pry
+
+  if JSON.parse(bucket_restored.gapi)["name"] == deleted_bucket.name
+    puts "#{deleted_bucket.name} Bucket restored"
+  else
+    puts "#{deleted_bucket.name} Bucket not restored" 
+  end
+
+end
+# [END storage_delete_bucket]
+
+restore_bucket bucket_name: ARGV.shift, generation: ARGV.shift if $PROGRAM_NAME == __FILE__

From 45c0bc7461256cecd54a57130891de43a9719eef Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 17 Dec 2024 10:36:32 +0000
Subject: [PATCH 015/100] adding samples and tests

---
 .../samples/acceptance/buckets_test.rb        | 19 ++++++++-----------
 .../samples/acceptance/project_test.rb        | 16 ++++++++++++++++
 .../storage_get_soft_deleted_bucket.rb        | 18 +++++++++---------
 .../storage_list_soft_deleted_buckets.rb      |  2 +-
 .../samples/storage_restore_bucket.rb         | 10 +++++-----
 5 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 03ff7c29e932..e2b0c22df76d 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -123,19 +123,17 @@
   end
 
   describe "storage_soft_deleted_bucket" do
-    let(:generation) {bucket.generation}
+    let(:generation) {bucket.gapi.generation}
 
-    # it "get soft deleted bucket generation" do
-    #   out, _err = capture_io do
-    #     bucket.generation
-    #   end
-    #   assert generation, "Bucket generation should be present"
-    # # end
+    it "get soft deleted bucket generation" do
+      out, _err = capture_io do
+        bucket.gapi.generation
+      end
+      assert generation, "Bucket generation should be present"
+     end
 
 
     it "get soft deleted bucket soft_delete_time and hard_delete_time" do
-      # @bucket.delete
-      binding.pry
       bucket.delete
       out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: bucket.name, generation:generation
@@ -145,8 +143,7 @@
     end
 
      it "lists soft deleted buckets" do
-      # delete_bucket bucket_name: bucket_name
-      # list_soft_deleted_buckets
+    
       list_deleted_bucket, _err = capture_io do
         list_soft_deleted_buckets
       end
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 2de54569a0ba..babe7bf01985 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -14,6 +14,7 @@
 
 require_relative "helper"
 require_relative "../storage_get_service_account"
+require_relative "../storage_restore_bucket"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -28,3 +29,18 @@
     assert_includes out, "@gs-project-accounts.iam.gserviceaccount.com"
   end
 end
+
+describe "storage_soft_deleted_bucket" do
+  let(:storage_client)   { Google::Cloud::Storage.new }
+  let(:bucket) { fixture_bucket }
+  let(:generation) {bucket.gapi.generation}
+
+  it "restores a soft deleted bucket" do
+    bucket.delete
+    out, _err = capture_io do
+      restore_bucket bucket_name: bucket.name, generation:generation
+    end
+    assert "soft_delete_time", "#{bucket.name} Bucket restored"
+  end
+
+end
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index e6be702df16e..cef00059fec6 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -17,13 +17,13 @@ def get_soft_deleted_bucket bucket_name:, generation:
   # The ID of your GCS bucket
   # bucket_name = "your-unique-bucket-name"
 
-  require "google/cloud/storage"
-  # require_relative '../lib/google/cloud/storage'
-  # require_relative '../lib/google/cloud/storage/project'
-  # require_relative '../lib/google/cloud/storage/bucket'
-  # # require_relative '../lib/google/cloud/storage/bucket/list'
-  # require_relative '../lib/google/cloud/storage/service'
-  # require "pry"
+  # require "google/cloud/storage"
+  require_relative '../lib/google/cloud/storage'
+  require_relative '../lib/google/cloud/storage/project'
+  require_relative '../lib/google/cloud/storage/bucket'
+  # require_relative '../lib/google/cloud/storage/bucket/list'
+  require_relative '../lib/google/cloud/storage/service'
+  require "pry"
 
   storage = Google::Cloud::Storage.new
   bucket_name= bucket_name.gsub(/[^a-zA-Z0-9\- ]/, "")
@@ -32,8 +32,8 @@ def get_soft_deleted_bucket bucket_name:, generation:
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
-  soft_delete_time = deleted_bucket_fetch.soft_delete_time
-  hard_delete_time = deleted_bucket_fetch.hard_delete_time
+  soft_delete_time = deleted_bucket_fetch.gapi.soft_delete_time
+  hard_delete_time = deleted_bucket_fetch.gapi.hard_delete_time
 
   puts "soft_delete_time - #{soft_delete_time}"
   puts "hard_delete_time - #{hard_delete_time}"
diff --git a/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
index ec81eac9b7da..1859e4b378aa 100644
--- a/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
+++ b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
@@ -17,7 +17,7 @@ def list_soft_deleted_buckets
   # The ID of your GCS bucket
   # bucket_name = "your-unique-bucket-name"
 
-  # {}require "google/cloud/storage"
+  # require "google/cloud/storage"
   require_relative "../lib/google/cloud/storage"
   require_relative "../lib/google/cloud/storage/project"
   require_relative "../lib/google/cloud/storage/bucket"
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
index a338570983df..a14189ebc0bb 100644
--- a/google-cloud-storage/samples/storage_restore_bucket.rb
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -18,7 +18,7 @@ def restore_bucket bucket_name:, generation:
   # The ID of your GCS bucket
   # bucket_name = "your-unique-bucket-name"
 
-   #{}require "google/cloud/storage"
+  # require "google/cloud/storage"
   require_relative '../lib/google/cloud/storage'
   require_relative '../lib/google/cloud/storage/project'
   require_relative '../lib/google/cloud/storage/bucket'
@@ -29,15 +29,15 @@ def restore_bucket bucket_name:, generation:
 
   storage = Google::Cloud::Storage.new
 
-  bucket_restored = storage.restore_bucket bucket_name, generation, soft_deleted: true
+  bucket_restored = storage.restore_bucket bucket_name, generation
   # fetching soft deleted bucket list
 #   deleted_buckets = storage.buckets soft_deleted: true
   binding.pry
 
-  if JSON.parse(bucket_restored.gapi)["name"] == deleted_bucket.name
-    puts "#{deleted_bucket.name} Bucket restored"
+  if bucket_restored.name == bucket_name
+    puts "#{bucket_name} Bucket restored"
   else
-    puts "#{deleted_bucket.name} Bucket not restored" 
+    puts "#{bucket_name} Bucket not restored" 
   end
 
 end

From 2e96036db9d0db72ab10cb0257c93d01a82cba83 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 18 Dec 2024 13:20:19 +0000
Subject: [PATCH 016/100] refactor

---
 .../samples/acceptance/buckets_test.rb          |  9 ++++-----
 .../samples/storage_get_soft_deleted_bucket.rb  | 17 ++++++++++-------
 .../samples/storage_restore_bucket.rb           |  9 +--------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index e2b0c22df76d..17d20a1063b5 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,7 +55,6 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
-require "pry"
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
@@ -127,7 +126,7 @@
 
     it "get soft deleted bucket generation" do
       out, _err = capture_io do
-        bucket.gapi.generation
+        bucket.generation
       end
       assert generation, "Bucket generation should be present"
      end
@@ -138,12 +137,12 @@
       out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: bucket.name, generation:generation
       end
-      assert "soft_delete_time", "Bucket soft_delete_time should be present"
-      assert "hard_delete_time", "Bucket hard_delete_time should be present"
+      assert "soft_delete_time - #{bucket.soft_delete_time}", "Bucket soft_delete_time should be present"
+      assert "hard_delete_time - #{bucket.hard_delete_time}", "Bucket hard_delete_time should be present"
     end
 
      it "lists soft deleted buckets" do
-    
+      bucket.delete
       list_deleted_bucket, _err = capture_io do
         list_soft_deleted_buckets
       end
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index cef00059fec6..9850442c9b33 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -23,7 +23,6 @@ def get_soft_deleted_bucket bucket_name:, generation:
   require_relative '../lib/google/cloud/storage/bucket'
   # require_relative '../lib/google/cloud/storage/bucket/list'
   require_relative '../lib/google/cloud/storage/service'
-  require "pry"
 
   storage = Google::Cloud::Storage.new
   bucket_name= bucket_name.gsub(/[^a-zA-Z0-9\- ]/, "")
@@ -32,13 +31,17 @@ def get_soft_deleted_bucket bucket_name:, generation:
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
-  soft_delete_time = deleted_bucket_fetch.gapi.soft_delete_time
-  hard_delete_time = deleted_bucket_fetch.gapi.hard_delete_time
-
-  puts "soft_delete_time - #{soft_delete_time}"
-  puts "hard_delete_time - #{hard_delete_time}"
+  soft_delete_time = deleted_bucket_fetch.soft_delete_time
+  hard_delete_time = deleted_bucket_fetch.hard_delete_time
+  
+  if (soft_delete_time && hard_delete_time).nil?
+    puts "Not Found"
+  else
+    puts "soft_delete_time - #{soft_delete_time}"
+    puts "hard_delete_time - #{hard_delete_time}"
+  end
 end
-# [END storage_delete_bucket]
+# [END storage_get_soft_deleted_bucket]
 
 
 get_soft_deleted_bucket bucket_name: ARGV.shift, generation: ARGV.shift if $PROGRAM_NAME == __FILE__
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
index a14189ebc0bb..f8ea80a92ead 100644
--- a/google-cloud-storage/samples/storage_restore_bucket.rb
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -11,7 +11,6 @@
 # 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.
-require 'pry'
 
 # [START storage_delete_bucket]
 def restore_bucket bucket_name:, generation:
@@ -24,22 +23,16 @@ def restore_bucket bucket_name:, generation:
   require_relative '../lib/google/cloud/storage/bucket'
   # require_relative '../lib/google/cloud/storage/bucket/list'
   require_relative '../lib/google/cloud/storage/service'
-  require "pry"
-
 
   storage = Google::Cloud::Storage.new
 
   bucket_restored = storage.restore_bucket bucket_name, generation
-  # fetching soft deleted bucket list
-#   deleted_buckets = storage.buckets soft_deleted: true
-  binding.pry
 
   if bucket_restored.name == bucket_name
     puts "#{bucket_name} Bucket restored"
   else
-    puts "#{bucket_name} Bucket not restored" 
+    puts "#{bucket_name} Bucket not restored"
   end
-
 end
 # [END storage_delete_bucket]
 

From 3728dcfd06f41e76c676bc1e807d625c3f8ad04d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 19 Dec 2024 10:53:46 +0000
Subject: [PATCH 017/100] refactor

---
 google-cloud-storage/samples/Gemfile                |  6 ++----
 .../samples/storage_get_soft_deleted_bucket.rb      | 10 +++-------
 .../samples/storage_list_soft_deleted_buckets.rb    |  9 +--------
 .../samples/storage_restore_bucket.rb               | 13 +++++--------
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/google-cloud-storage/samples/Gemfile b/google-cloud-storage/samples/Gemfile
index 3b36d79c3373..df5ef4bf5767 100644
--- a/google-cloud-storage/samples/Gemfile
+++ b/google-cloud-storage/samples/Gemfile
@@ -20,14 +20,12 @@ source "https://rubygems.org"
 if ENV["GOOGLE_CLOUD_SAMPLES_TEST"] == "master"
   gem "google-cloud-kms", group: :test, path: "../../google-cloud-kms"
   gem "google-cloud-pubsub", group: :test, path: "../../google-cloud-pubsub"
-  gem "google-cloud-storage", path: "../../google-cloud-storage"
 else
   gem "google-cloud-kms"
   gem "google-cloud-pubsub"
-  # [START storage_dependencies]
-  gem "google-cloud-storage"
-  # [END storage_dependencies]
 end
+gem "google-cloud-storage", path: "../../google-cloud-storage"
+
 
 group :test do
   gem "google-style", "~> 1.30.0"
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 9850442c9b33..060ab5404124 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -16,18 +16,14 @@
 def get_soft_deleted_bucket bucket_name:, generation:
   # The ID of your GCS bucket
   # bucket_name = "your-unique-bucket-name"
+  # The generation no of your GCS bucket
+  # generation = "1234567896987"
 
-  # require "google/cloud/storage"
-  require_relative '../lib/google/cloud/storage'
-  require_relative '../lib/google/cloud/storage/project'
-  require_relative '../lib/google/cloud/storage/bucket'
-  # require_relative '../lib/google/cloud/storage/bucket/list'
-  require_relative '../lib/google/cloud/storage/service'
+  require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
   bucket_name= bucket_name.gsub(/[^a-zA-Z0-9\- ]/, "")
 
-
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
diff --git a/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
index 1859e4b378aa..1f980fa4e098 100644
--- a/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
+++ b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
@@ -14,15 +14,8 @@
 
 # [START storage_list_soft_deleted_buckets]
 def list_soft_deleted_buckets
-  # The ID of your GCS bucket
-  # bucket_name = "your-unique-bucket-name"
 
-  # require "google/cloud/storage"
-  require_relative "../lib/google/cloud/storage"
-  require_relative "../lib/google/cloud/storage/project"
-  require_relative "../lib/google/cloud/storage/bucket"
-  # require_relative '../lib/google/cloud/storage/bucket/list'
-  require_relative "../lib/google/cloud/storage/service"
+  require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
 
diff --git a/google-cloud-storage/samples/storage_restore_bucket.rb b/google-cloud-storage/samples/storage_restore_bucket.rb
index f8ea80a92ead..c2cee7944174 100644
--- a/google-cloud-storage/samples/storage_restore_bucket.rb
+++ b/google-cloud-storage/samples/storage_restore_bucket.rb
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# [START storage_delete_bucket]
+# [START storage_restore_bucket]
 def restore_bucket bucket_name:, generation:
   # The ID of your GCS bucket
   # bucket_name = "your-unique-bucket-name"
+  # The generation no of your GCS bucket
+  # generation = "1234567896987"
 
-  # require "google/cloud/storage"
-  require_relative '../lib/google/cloud/storage'
-  require_relative '../lib/google/cloud/storage/project'
-  require_relative '../lib/google/cloud/storage/bucket'
-  # require_relative '../lib/google/cloud/storage/bucket/list'
-  require_relative '../lib/google/cloud/storage/service'
+  require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
 
@@ -34,6 +31,6 @@ def restore_bucket bucket_name:, generation:
     puts "#{bucket_name} Bucket not restored"
   end
 end
-# [END storage_delete_bucket]
+# [END storage_restore_bucket]
 
 restore_bucket bucket_name: ARGV.shift, generation: ARGV.shift if $PROGRAM_NAME == __FILE__

From 4265f54d60dfc4e92108966a7cdaf5c0d9b2cb1d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 19 Dec 2024 11:11:46 +0000
Subject: [PATCH 018/100] updating comments

---
 .../lib/google/cloud/storage/bucket.rb        |  1 -
 .../lib/google/cloud/storage/project.rb       | 24 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 17624c8fc086..4f30c6878444 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -24,7 +24,6 @@
 require "google/cloud/storage/post_object"
 require "pathname"
 
-
 module Google
   module Cloud
     module Storage
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index cfce50472365..ea8923a4a87a 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -232,6 +232,10 @@ def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted:
         #   account, transit costs will be billed to the given project. This
         #   parameter is required with requester pays-enabled buckets. The
         #   default is `nil`.
+        # @param [fixedInt] generation generation no of bucket
+        #   on whether the bucket's current metageneration matches the given value.
+        # @param [Boolean] soft_deleted If true, returns the soft-deleted bucket. 
+        #   This parameter is required if generation is specified.
         #
         #   The value provided will be applied to all operations on the returned
         #   bucket instance and its files.
@@ -265,7 +269,16 @@ def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted:
         #   bucket = storage.bucket "other-project-bucket",
         #                           user_project: "my-other-project"
         #   files = bucket.files # Billed to "my-other-project"
+        # @example With `soft_deleted` set to a true and generation specified:
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
         #
+        #   bucket = storage.bucket "my-bucket",
+        #                           soft_deleted: true,
+        #                           generation: 1234567889
+        #   puts bucket.name
+        # 
         def bucket bucket_name,
                    skip_lookup: false,
                    generation: nil,
@@ -573,15 +586,6 @@ def hmac_keys service_account_email: nil, project_id: nil,
         #
         # @param [String] bucket_name Name of a bucket.
         # @param [Fixnum] generation generation of a bucket.
-        # @param [Boolean] skip_lookup Optionally create a Bucket object
-        #   without verifying the bucket resource exists on the Storage service.
-        #   Calls made on this object will raise errors if the bucket resource
-        #   does not exist. Default is `false`.
-        # @param [Integer] if_metageneration_match Makes the operation conditional
-        #   on whether the bucket's current metageneration matches the given value.
-        # @param [Boolean] soft_deleted If this parameter is set to
-        #   `true` project looks in the list of soft deleted buckets
-        #
         #
         # @return [Google::Cloud::Storage::Bucket, nil] Returns nil if bucket
         #   does not exist
@@ -592,7 +596,7 @@ def hmac_keys service_account_email: nil, project_id: nil,
         #   storage = Google::Cloud::Storage.new
         #   generation= 123
         #
-        #   bucket = storage.restore_bucket "my-bucket", generation, soft_deleted: true
+        #   bucket = storage.restore_bucket "my-bucket", generation
         #   puts bucket.name
         #
         def restore_bucket bucket_name,

From 3c89fefefd90ce1c04d65b61bf2acaa3a35acdd6 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 20 Dec 2024 05:13:14 +0000
Subject: [PATCH 019/100] fix lint issues

---
 .../lib/google/cloud/storage/project.rb             |  2 +-
 .../samples/acceptance/buckets_test.rb              | 13 ++++++-------
 .../samples/acceptance/project_test.rb              |  9 ++++-----
 .../samples/storage_get_soft_deleted_bucket.rb      |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index ea8923a4a87a..43886c6c08b1 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -234,7 +234,7 @@ def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted:
         #   default is `nil`.
         # @param [fixedInt] generation generation no of bucket
         #   on whether the bucket's current metageneration matches the given value.
-        # @param [Boolean] soft_deleted If true, returns the soft-deleted bucket. 
+        # @param [Boolean] soft_deleted If true, returns the soft-deleted bucket.
         #   This parameter is required if generation is specified.
         #
         #   The value provided will be applied to all operations on the returned
diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 17d20a1063b5..68b5a6d30e0d 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -122,33 +122,32 @@
   end
 
   describe "storage_soft_deleted_bucket" do
-    let(:generation) {bucket.gapi.generation}
+    let(:generation) { bucket.gapi.generation }
 
     it "get soft deleted bucket generation" do
-      out, _err = capture_io do
+      _out, _err = capture_io do
         bucket.generation
       end
       assert generation, "Bucket generation should be present"
-     end
+    end
 
 
     it "get soft deleted bucket soft_delete_time and hard_delete_time" do
       bucket.delete
-      out, _err = capture_io do
-        get_soft_deleted_bucket bucket_name: bucket.name, generation:generation
+      _out, _err = capture_io do
+        get_soft_deleted_bucket bucket_name: bucket.name, generation: generation
       end
       assert "soft_delete_time - #{bucket.soft_delete_time}", "Bucket soft_delete_time should be present"
       assert "hard_delete_time - #{bucket.hard_delete_time}", "Bucket hard_delete_time should be present"
     end
 
-     it "lists soft deleted buckets" do
+    it "lists soft deleted buckets" do
       bucket.delete
       list_deleted_bucket, _err = capture_io do
         list_soft_deleted_buckets
       end
       assert_includes list_deleted_bucket, bucket.name
     end
-
   end
 
 
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index babe7bf01985..ab4c32fd2026 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -31,16 +31,15 @@
 end
 
 describe "storage_soft_deleted_bucket" do
-  let(:storage_client)   { Google::Cloud::Storage.new }
+  let(:storage_client)  { Google::Cloud::Storage.new }
   let(:bucket) { fixture_bucket }
-  let(:generation) {bucket.gapi.generation}
+  let(:generation) { bucket.gapi.generation }
 
   it "restores a soft deleted bucket" do
     bucket.delete
-    out, _err = capture_io do
-      restore_bucket bucket_name: bucket.name, generation:generation
+    _out, _err = capture_io do
+      restore_bucket bucket_name: bucket.name, generation: generation
     end
     assert "soft_delete_time", "#{bucket.name} Bucket restored"
   end
-
 end
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 060ab5404124..22d59149b9bc 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -22,14 +22,14 @@ def get_soft_deleted_bucket bucket_name:, generation:
   require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
-  bucket_name= bucket_name.gsub(/[^a-zA-Z0-9\- ]/, "")
+  bucket_name = bucket_name.gsub(/[^a-zA-Z0-9\- ]/, "")
 
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
   soft_delete_time = deleted_bucket_fetch.soft_delete_time
   hard_delete_time = deleted_bucket_fetch.hard_delete_time
-  
+
   if (soft_delete_time && hard_delete_time).nil?
     puts "Not Found"
   else

From d3e3db6b87f18cb9468c37c6b77272e71cc2e11e Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 20 Dec 2024 05:25:34 +0000
Subject: [PATCH 020/100] fix lint issues

---
 google-cloud-storage/lib/google/cloud/storage/bucket/list.rb   | 1 +
 google-cloud-storage/lib/google/cloud/storage/project.rb       | 2 +-
 google-cloud-storage/samples/acceptance/project_test.rb        | 2 +-
 .../samples/storage_list_soft_deleted_buckets.rb               | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
index 3ccc34c1d041..428300c40df0 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
@@ -155,6 +155,7 @@ def self.from_gapi gapi_list, service, prefix = nil, max = nil,
             buckets.instance_variable_set :@prefix, prefix
             buckets.instance_variable_set :@max, max
             buckets.instance_variable_set :@user_project, user_project
+            buckets.instance_variable_set :@soft_deleted, soft_deleted
             buckets
           end
 
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 43886c6c08b1..f93ec320b1c3 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -278,7 +278,7 @@ def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted:
         #                           soft_deleted: true,
         #                           generation: 1234567889
         #   puts bucket.name
-        # 
+        #
         def bucket bucket_name,
                    skip_lookup: false,
                    generation: nil,
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index ab4c32fd2026..2f2254b11942 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -31,7 +31,7 @@
 end
 
 describe "storage_soft_deleted_bucket" do
-  let(:storage_client)  { Google::Cloud::Storage.new }
+  let(:storage_client) { Google::Cloud::Storage.new }
   let(:bucket) { fixture_bucket }
   let(:generation) { bucket.gapi.generation }
 
diff --git a/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
index 1f980fa4e098..4869fb70d7fc 100644
--- a/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
+++ b/google-cloud-storage/samples/storage_list_soft_deleted_buckets.rb
@@ -14,7 +14,6 @@
 
 # [START storage_list_soft_deleted_buckets]
 def list_soft_deleted_buckets
-
   require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
@@ -28,4 +27,4 @@ def list_soft_deleted_buckets
 end
 # [END storage_list_soft_deleted_buckets]
 
-list_soft_deleted_buckets if $PROGRAM_NAME == __FILE__
\ No newline at end of file
+list_soft_deleted_buckets if $PROGRAM_NAME == __FILE__

From 36fbf021893260104edf5b6fb8dc1c10b1e94052 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Sat, 21 Dec 2024 04:53:24 +0000
Subject: [PATCH 021/100] fix review comments

---
 .../lib/google/cloud/storage/bucket.rb        |  6 +-
 .../lib/google/cloud/storage/project.rb       |  2 +-
 google-cloud-storage/samples/Gemfile          |  6 +-
 .../samples/acceptance/buckets_test.rb        | 16 ++---
 .../samples/acceptance/project_test.rb        |  2 +-
 .../test/google/cloud/storage/project_test.rb | 30 +++-----
 google-cloud-storage/test/helper.rb           | 69 ++++---------------
 7 files changed, 38 insertions(+), 93 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 4f30c6878444..3b5ea98a4c70 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -2287,7 +2287,7 @@ def signed_url path = nil,
         # bucket = storage.bucket "my-bucket"
         # generation= bucket.generation
         def generation
-          @generation = @gapi.generation
+          @gapi.generation
         end
 
         # Fetches soft_delete_time of a soft deleted bucket
@@ -2295,14 +2295,14 @@ def generation
         # bucket.delete
         # bucket.soft_delete_time
         def soft_delete_time
-          @soft_delete_time = @gapi.soft_delete_time
+          @gapi.soft_delete_time
         end
 
         # Fetches hard_delete_time of a soft deleted bucket
         # @example
         # bucket.hard_delete_time
         def hard_delete_time
-          @hard_delete_time = @gapi.hard_delete_time
+          @gapi.hard_delete_time
         end
 
         ##
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index f93ec320b1c3..3bb979a9ece6 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -232,7 +232,7 @@ def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted:
         #   account, transit costs will be billed to the given project. This
         #   parameter is required with requester pays-enabled buckets. The
         #   default is `nil`.
-        # @param [fixedInt] generation generation no of bucket
+        # @param [Integer] generation generation no of bucket
         #   on whether the bucket's current metageneration matches the given value.
         # @param [Boolean] soft_deleted If true, returns the soft-deleted bucket.
         #   This parameter is required if generation is specified.
diff --git a/google-cloud-storage/samples/Gemfile b/google-cloud-storage/samples/Gemfile
index df5ef4bf5767..3b36d79c3373 100644
--- a/google-cloud-storage/samples/Gemfile
+++ b/google-cloud-storage/samples/Gemfile
@@ -20,12 +20,14 @@ source "https://rubygems.org"
 if ENV["GOOGLE_CLOUD_SAMPLES_TEST"] == "master"
   gem "google-cloud-kms", group: :test, path: "../../google-cloud-kms"
   gem "google-cloud-pubsub", group: :test, path: "../../google-cloud-pubsub"
+  gem "google-cloud-storage", path: "../../google-cloud-storage"
 else
   gem "google-cloud-kms"
   gem "google-cloud-pubsub"
+  # [START storage_dependencies]
+  gem "google-cloud-storage"
+  # [END storage_dependencies]
 end
-gem "google-cloud-storage", path: "../../google-cloud-storage"
-
 
 group :test do
   gem "google-style", "~> 1.30.0"
diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 68b5a6d30e0d..b40eb4de25e6 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -122,18 +122,11 @@
   end
 
   describe "storage_soft_deleted_bucket" do
-    let(:generation) { bucket.gapi.generation }
-
-    it "get soft deleted bucket generation" do
-      _out, _err = capture_io do
-        bucket.generation
-      end
-      assert generation, "Bucket generation should be present"
-    end
+    let(:generation) { bucket.generation }
 
+    it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
 
-    it "get soft deleted bucket soft_delete_time and hard_delete_time" do
-      bucket.delete
+      delete_bucket_helper bucket.name
       _out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: bucket.name, generation: generation
       end
@@ -142,11 +135,10 @@
     end
 
     it "lists soft deleted buckets" do
-      bucket.delete
       list_deleted_bucket, _err = capture_io do
         list_soft_deleted_buckets
       end
-      assert_includes list_deleted_bucket, bucket.name
+      assert list_deleted_bucket, "List of soft deleted bucket should not be blank"
     end
   end
 
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 2f2254b11942..6e3b944109d3 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -36,7 +36,7 @@
   let(:generation) { bucket.gapi.generation }
 
   it "restores a soft deleted bucket" do
-    bucket.delete
+    delete_bucket_helper bucket.name
     _out, _err = capture_io do
       restore_bucket bucket_name: bucket.name, generation: generation
     end
diff --git a/google-cloud-storage/test/google/cloud/storage/project_test.rb b/google-cloud-storage/test/google/cloud/storage/project_test.rb
index 0019d1e7ff29..942c6177732f 100644
--- a/google-cloud-storage/test/google/cloud/storage/project_test.rb
+++ b/google-cloud-storage/test/google/cloud/storage/project_test.rb
@@ -646,9 +646,10 @@ def stub.insert_bucket *args
 
   it "lists deleted buckets" do
     num_buckets = 3
+    soft_deleted= true
 
     mock = Minitest::Mock.new
-    mock.expect :list_buckets, list_deleted_buckets_gapi(num_buckets), [project], prefix: nil, page_token: nil,
+    mock.expect :list_buckets, list_buckets_gapi(num_buckets,nil,soft_deleted), [project], prefix: nil, page_token: nil,
 max_results: nil, user_project: nil, soft_deleted: true, options: {}
 
     storage.service.mocked_service = mock
@@ -866,13 +867,14 @@ def stub.insert_bucket *args
   it "finds a deleted bucket" do
     bucket_name = "found-bucket"
     generation = 1_733_393_981_548_601_746
+    soft_deleted= true
 
     mock = Minitest::Mock.new
-    mock.expect :get_bucket, find_deleted_bucket_gapi(bucket_name),
-                [bucket_name], **get_bucket_args(soft_deleted: true, generation: generation)
+    mock.expect :get_bucket, find_bucket_gapi(bucket_name, soft_deleted),
+                [bucket_name], **get_bucket_args(soft_deleted: soft_deleted, generation: generation)
 
     storage.service.mocked_service = mock
-    bucket = storage.bucket bucket_name, soft_deleted: true, generation: generation
+    bucket = storage.bucket bucket_name, soft_deleted: soft_deleted, generation: generation
 
     mock.verify
 
@@ -1067,23 +1069,13 @@ def create_bucket_gapi name = nil,
     Google::Apis::StorageV1::Bucket.new **options
   end
 
-  def find_deleted_bucket_gapi name = nil
-    Google::Apis::StorageV1::Bucket.from_json random_deleted_bucket_hash(name: name).to_json
-  end
-
-  def find_bucket_gapi name = nil
-    Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name).to_json
-  end
 
-  def list_buckets_gapi count = 2, token = nil
-    buckets = count.times.map { Google::Apis::StorageV1::Bucket.from_json random_bucket_hash.to_json }
-    Google::Apis::StorageV1::Buckets.new(
-      kind: "storage#buckets", items: buckets, next_page_token: token
-    )
+  def find_bucket_gapi name = nil, soft_deleted= nil
+    Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(name: name, soft_deleted: soft_deleted).to_json
   end
 
-  def list_deleted_buckets_gapi count = 2, token = nil
-    buckets = count.times.map { Google::Apis::StorageV1::Bucket.from_json random_deleted_bucket_hash.to_json }
+  def list_buckets_gapi count = 2, token = nil,  soft_deleted = nil
+    buckets = count.times.map { Google::Apis::StorageV1::Bucket.from_json random_bucket_hash(soft_deleted: soft_deleted).to_json }
     Google::Apis::StorageV1::Buckets.new(
       kind: "storage#buckets", items: buckets, next_page_token: token
     )
@@ -1097,4 +1089,4 @@ def restored_bucket_gapi name
   def object_retention_param enable_object_retention
     enable_object_retention ? Google::Apis::StorageV1::Bucket::ObjectRetention.new(mode: "Enabled") : nil
   end
-end
\ No newline at end of file
+end
diff --git a/google-cloud-storage/test/helper.rb b/google-cloud-storage/test/helper.rb
index bfeb842e1692..f53a2aa48734 100644
--- a/google-cloud-storage/test/helper.rb
+++ b/google-cloud-storage/test/helper.rb
@@ -23,6 +23,7 @@
 require "base64"
 require "uri"
 require "google/cloud/storage"
+require "pry"
 
 ##
 # Monkey-Patch Google API Client to support Mocks
@@ -70,59 +71,14 @@ def random_bucket_hash name: random_bucket_name,
                          autoclass_terminal_storage_class: nil,
                          enable_object_retention: nil,
                          effective_time: DateTime.now,
-                         retention_duration_seconds: 604800, # 7 days
+                         retention_duration_seconds: 604_800, # 7 days
+                         soft_deleted: nil,
                          hierarchical_namespace: nil,
                          generation: "1733393981548601746"
     versioning_config = { "enabled" => versioning } if versioning
-    { "kind" => "storage#bucket",
-      "id" => name,
-      "selfLink" => "#{url_root}/b/#{name}",
-      "projectNumber" => "1234567890",
-      "name" => name,
-      "timeCreated" => Time.now,
-      "generation" => generation,
-      "metageneration" => "1",
-      "owner" => { "entity" => "project-owners-1234567890" },
-      "location" => location,
-      "locationType" => location_type,
-      "rpo" => rpo,
-      "cors" => cors,
-      "lifecycle" => lifecycle,
-      "logging" => logging_hash(logging_bucket, logging_prefix),
-      "storageClass" => storage_class,
-      "versioning" => versioning_config,
-      "website" => website_hash(website_main, website_404),
-      "billing" => billing_hash(requester_pays),
-      "etag" => "CAE=",
-      "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
-      "enableObjectRetention" => enable_object_retention,
-      "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
-      "hierarchicalNamespace" => hierarchical_namespace
-    }.delete_if { |_, v| v.nil? }
-  end
-  def random_deleted_bucket_hash name: random_bucket_name,
-                         url_root: "https://www.googleapis.com/storage/v1",
-                         location: "US",
-                         storage_class: "STANDARD",
-                         versioning: nil,
-                         logging_bucket: nil,
-                         logging_prefix: nil,
-                         website_main: nil,
-                         website_404: nil,
-                         cors: [],
-                         requester_pays: nil,
-                         lifecycle: nil,
-                         location_type: "multi-region",
-                         rpo: "DEFAULT",
-                         autoclass_enabled: nil,
-                         autoclass_terminal_storage_class: nil,
-                         enable_object_retention: nil,
-                         effective_time: DateTime.now,
-                         retention_duration_seconds: 604800, # 7 days
-                         hierarchical_namespace: nil,
-                         generation: "1733393981548601746"
-    versioning_config = { "enabled" => versioning } if versioning
-    { "kind" => "storage#bucket",
+
+    data = {
+      "kind" => "storage#bucket",
       "id" => name,
       "selfLink" => "#{url_root}/b/#{name}",
       "projectNumber" => "1234567890",
@@ -144,15 +100,18 @@ def random_deleted_bucket_hash name: random_bucket_name,
       "etag" => "CAE=",
       "autoclass" => autoclass_config_hash(autoclass_enabled, autoclass_terminal_storage_class),
       "enableObjectRetention" => enable_object_retention,
-      "softDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time,
-      "hardDeleteTime" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds).effective_time
-                                                                                                           .to_time + retention_duration_seconds,  
       "softDeletePolicy" => soft_delete_policy_object(retention_duration_seconds: retention_duration_seconds),
       "hierarchicalNamespace" => hierarchical_namespace
-    }.delete_if { |_, v| v.nil? }
+    }
+    if soft_deleted
+      soft_delete_policy = soft_delete_policy_object retention_duration_seconds: retention_duration_seconds
+      data["softDeleteTime"] = soft_delete_policy.effective_time
+      data["hardDeleteTime"] = soft_delete_policy.effective_time.to_time + retention_duration_seconds
+    end
+    data.delete_if { |_, v| v.nil? }
   end
 
-  def soft_delete_policy_object retention_duration_seconds: 604800 # 7 days
+  def soft_delete_policy_object retention_duration_seconds: 604_800 # 7 days
     Google::Apis::StorageV1::Bucket::SoftDeletePolicy.new(
       effective_time: DateTime.now,
       retention_duration_seconds: retention_duration_seconds

From 69a242b4117c9be0e05fba648539c7bed3d0dba4 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Sat, 21 Dec 2024 04:55:50 +0000
Subject: [PATCH 022/100] removing pry

---
 google-cloud-storage/test/helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-storage/test/helper.rb b/google-cloud-storage/test/helper.rb
index f53a2aa48734..60ed111f0897 100644
--- a/google-cloud-storage/test/helper.rb
+++ b/google-cloud-storage/test/helper.rb
@@ -23,7 +23,6 @@
 require "base64"
 require "uri"
 require "google/cloud/storage"
-require "pry"
 
 ##
 # Monkey-Patch Google API Client to support Mocks

From 46b987e1d1fa31a1a4927f5a2a2e4cc565a77133 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Sat, 21 Dec 2024 05:34:00 +0000
Subject: [PATCH 023/100] fix lint

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index b40eb4de25e6..10f672ce1a7d 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -125,7 +125,6 @@
     let(:generation) { bucket.generation }
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-
       delete_bucket_helper bucket.name
       _out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: bucket.name, generation: generation

From 0d902d59d7d794034b05124ac4527d2fb7da8f19 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 23 Dec 2024 12:38:46 +0000
Subject: [PATCH 024/100] try cli issue fix

---
 .../lib/google/cloud/storage/project.rb            |  4 ++--
 .../samples/acceptance/buckets_test.rb             | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 3bb979a9ece6..1b340763aac9 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -584,8 +584,8 @@ def hmac_keys service_account_email: nil, project_id: nil,
         ##
         # Restores a soft deleted bucket with bucket name and generation.
         #
-        # @param [String] bucket_name Name of a bucket.
-        # @param [Fixnum] generation generation of a bucket.
+        # @param [String] bucket_name Name of the bucket.
+        # @param [Fixnum] generation generation of the bucket.
         #
         # @return [Google::Cloud::Storage::Bucket, nil] Returns nil if bucket
         #   does not exist
diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 10f672ce1a7d..90b226e7811d 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -122,15 +122,19 @@
   end
 
   describe "storage_soft_deleted_bucket" do
-    let(:generation) { bucket.generation }
+    let(:new_bucket_name) {random_bucket_name}
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-      delete_bucket_helper bucket.name
+
+      new_bucket = storage_client.create_bucket new_bucket_name
+      new_generation = new_bucket.generation 
+
+      delete_bucket_helper new_bucket_name
       _out, _err = capture_io do
-        get_soft_deleted_bucket bucket_name: bucket.name, generation: generation
+        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       end
-      assert "soft_delete_time - #{bucket.soft_delete_time}", "Bucket soft_delete_time should be present"
-      assert "hard_delete_time - #{bucket.hard_delete_time}", "Bucket hard_delete_time should be present"
+      assert "soft_delete_time ", "Bucket soft_delete_time should be present"
+      assert "hard_delete_time ", "Bucket hard_delete_time should be present"
     end
 
     it "lists soft deleted buckets" do

From b187c21d23ae082f2465012586a452036d23a516 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 23 Dec 2024 12:42:08 +0000
Subject: [PATCH 025/100] fix lint

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 90b226e7811d..95dbebdcc8b2 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -122,12 +122,11 @@
   end
 
   describe "storage_soft_deleted_bucket" do
-    let(:new_bucket_name) {random_bucket_name}
+    let(:new_bucket_name) { random_bucket_name }
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-
       new_bucket = storage_client.create_bucket new_bucket_name
-      new_generation = new_bucket.generation 
+      new_generation = new_bucket.generation
 
       delete_bucket_helper new_bucket_name
       _out, _err = capture_io do

From b6088252bd2ca618e94c9305d08b1f732cb0cfa5 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 06:38:57 +0000
Subject: [PATCH 026/100] removing unwanted code

---
 google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 22d59149b9bc..8e75c0d9a53e 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -22,8 +22,6 @@ def get_soft_deleted_bucket bucket_name:, generation:
   require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
-  bucket_name = bucket_name.gsub(/[^a-zA-Z0-9\- ]/, "")
-
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 

From cc5dd1eb0b20ae087105457d7f56b82214bcc36a Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 08:37:44 +0000
Subject: [PATCH 027/100] adding check to see if bucket is deleted or not

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 95dbebdcc8b2..cc0a1f2173ed 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,7 +55,6 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
-
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
   let(:kms_key)          { get_kms_key storage_client.project }
@@ -129,6 +128,9 @@
       new_generation = new_bucket.generation
 
       delete_bucket_helper new_bucket_name
+
+      # Check if the bucket does not exist
+      refute(bucket.exists?, "Bucket #{new_bucket_name} should not exist") 
       _out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       end

From 6700876ccad1322fd5d93b0b18bdd8babb5ff9bf Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 08:40:08 +0000
Subject: [PATCH 028/100] debugging

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index cc0a1f2173ed..5dbee367d925 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -130,7 +130,8 @@
       delete_bucket_helper new_bucket_name
 
       # Check if the bucket does not exist
-      refute(bucket.exists?, "Bucket #{new_bucket_name} should not exist") 
+      deleted_bucket =storage_client.bucket new_bucket_name
+      refute(deleted_bucket.exists?, "Bucket #{new_bucket_name} should not exist") 
       _out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       end

From 9538c91f9b89862f4a63223c9b2d7d32cde16328 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 09:19:09 +0000
Subject: [PATCH 029/100] debugging

---
 google-cloud-storage/samples/acceptance/buckets_test.rb       | 4 +++-
 .../samples/storage_get_soft_deleted_bucket.rb                | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 5dbee367d925..0ba3f944015a 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -127,11 +127,13 @@
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
 
+      # Check if the bucket exist
+      assert(deleted_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
       delete_bucket_helper new_bucket_name
 
       # Check if the bucket does not exist
       deleted_bucket =storage_client.bucket new_bucket_name
-      refute(deleted_bucket.exists?, "Bucket #{new_bucket_name} should not exist") 
+      refute(deleted_bucket, "Bucket #{new_bucket_name} should not exist") 
       _out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       end
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 8e75c0d9a53e..95a312e39e36 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -23,6 +23,9 @@ def get_soft_deleted_bucket bucket_name:, generation:
 
   storage = Google::Cloud::Storage.new
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
+  puts "***********"
+  puts bucket_name
+  puts "***********"
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
   soft_delete_time = deleted_bucket_fetch.soft_delete_time

From ae9e2af455cea099bb04bff95588369734f0ab0e Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 09:27:57 +0000
Subject: [PATCH 030/100] debugging

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 0ba3f944015a..11a43772e088 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -128,7 +128,7 @@
       new_generation = new_bucket.generation
 
       # Check if the bucket exist
-      assert(deleted_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
+      assert(new_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
       delete_bucket_helper new_bucket_name
 
       # Check if the bucket does not exist

From dbdbe580c468ea9dc5294271aa525f17fe9f8fa7 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 10:00:29 +0000
Subject: [PATCH 031/100] debugging

---
 .../samples/acceptance/buckets_test.rb             | 14 +++++++++-----
 .../samples/storage_get_soft_deleted_bucket.rb     |  3 ---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 11a43772e088..6c61adf5e840 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,6 +55,7 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
+
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
   let(:kms_key)          { get_kms_key storage_client.project }
@@ -134,11 +135,14 @@
       # Check if the bucket does not exist
       deleted_bucket =storage_client.bucket new_bucket_name
       refute(deleted_bucket, "Bucket #{new_bucket_name} should not exist") 
-      _out, _err = capture_io do
-        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      end
-      assert "soft_delete_time ", "Bucket soft_delete_time should be present"
-      assert "hard_delete_time ", "Bucket hard_delete_time should be present"
+
+      deleted_bucket= storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
+
+      # _out, _err = capture_io do
+      #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+      # end
+      assert deleted_bucket.soft_delete_time , "Bucket soft_delete_time should be present"
+      assert deleted_bucket.hard_delete_time , "Bucket hard_delete_time should be present"
     end
 
     it "lists soft deleted buckets" do
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 95a312e39e36..8e75c0d9a53e 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -23,9 +23,6 @@ def get_soft_deleted_bucket bucket_name:, generation:
 
   storage = Google::Cloud::Storage.new
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
-  puts "***********"
-  puts bucket_name
-  puts "***********"
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
   soft_delete_time = deleted_bucket_fetch.soft_delete_time

From d67ebf437e197005352b55743420cc339572d359 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 13:20:53 +0000
Subject: [PATCH 032/100] debugging

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 6c61adf5e840..15404e967ae3 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,6 +55,7 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
+require "pry"
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
@@ -127,6 +128,8 @@
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
+      policy = bucket.policy
+      policy.add_binding(role: 'roles/storage.objectViewer', members: ["user:542339357638-cr0dserr2evg7sv1meghqeu703274f3h@developer.gserviceaccount.com"]) 
 
       # Check if the bucket exist
       assert(new_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
@@ -135,7 +138,6 @@
       # Check if the bucket does not exist
       deleted_bucket =storage_client.bucket new_bucket_name
       refute(deleted_bucket, "Bucket #{new_bucket_name} should not exist") 
-
       deleted_bucket= storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
 
       # _out, _err = capture_io do

From f30c889b2568786da213b82c45ba846912f1e18d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 13:26:36 +0000
Subject: [PATCH 033/100] debugging

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 15404e967ae3..752763d43708 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,7 +55,6 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
-require "pry"
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }

From 8040fab3373799b79aba7dcac67a8072464ad3f8 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 15 Jan 2025 14:04:09 +0000
Subject: [PATCH 034/100] debugging

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 752763d43708..20b7d005ad97 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,6 +55,7 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
+require "pry"
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
@@ -127,9 +128,6 @@
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
-      policy = bucket.policy
-      policy.add_binding(role: 'roles/storage.objectViewer', members: ["user:542339357638-cr0dserr2evg7sv1meghqeu703274f3h@developer.gserviceaccount.com"]) 
-
       # Check if the bucket exist
       assert(new_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
       delete_bucket_helper new_bucket_name

From 88438a377b7b4560c221b287a66629f7faa5e138 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 16 Jan 2025 11:58:00 +0000
Subject: [PATCH 035/100] updating gemspec

---
 google-cloud-storage/google-cloud-storage.gemspec       | 2 +-
 google-cloud-storage/samples/acceptance/buckets_test.rb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/google-cloud-storage/google-cloud-storage.gemspec b/google-cloud-storage/google-cloud-storage.gemspec
index 31256edff256..cf89353a9fa1 100644
--- a/google-cloud-storage/google-cloud-storage.gemspec
+++ b/google-cloud-storage/google-cloud-storage.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "google-cloud-core", "~> 1.6"
   gem.add_dependency "google-apis-core", "~> 0.13"
   gem.add_dependency "google-apis-iamcredentials_v1", "~> 0.18"
-  gem.add_dependency "google-apis-storage_v1", "~> 0.38"
+  gem.add_dependency "google-apis-storage_v1", "~> 0.40"
   gem.add_dependency "googleauth", "~> 1.9"
   gem.add_dependency "digest-crc", "~> 0.4"
   gem.add_dependency "addressable", "~> 2.8"
diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 20b7d005ad97..884aa7bab7e4 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,7 +55,6 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
-require "pry"
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }

From 70236f7aab8a1393c84c5c4f300979470191144e Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 17 Jan 2025 11:47:41 +0000
Subject: [PATCH 036/100] debugging

---
 .../samples/acceptance/buckets_test.rb          |  2 +-
 .../samples/acceptance/helper.rb                | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 884aa7bab7e4..39eb77545bdc 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -127,10 +127,10 @@
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
+      grant_storage_permission new_bucket_name
       # Check if the bucket exist
       assert(new_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
       delete_bucket_helper new_bucket_name
-
       # Check if the bucket does not exist
       deleted_bucket =storage_client.bucket new_bucket_name
       refute(deleted_bucket, "Bucket #{new_bucket_name} should not exist") 
diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 0c2682474ea8..05076deb604a 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -37,6 +37,23 @@ def create_bucket_helper bucket_name
   end
 end
 
+def grant_storage_permission bucket_name
+
+  storage_client = Google::Cloud::Storage.new
+  bucket= storage_client.bucket bucket_name
+
+  object_viewer = "roles/storage.objectViewer"
+  member = ""
+  bucket.policy requested_policy_version: 3 do |policy|
+    policy.version = 3
+    policy.bindings.insert(
+      role:      object_viewer,
+      members:   member
+    )
+  end
+
+end
+
 def delete_bucket_helper bucket_name
   storage_client = Google::Cloud::Storage.new
   retry_resource_exhaustion do

From b2f67adb1d640cfa7318bd192b67cfbf1ddf6f81 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 17 Jan 2025 12:53:53 +0000
Subject: [PATCH 037/100] debugging

---
 google-cloud-storage/samples/acceptance/helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 05076deb604a..0675094fd8c0 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -43,7 +43,7 @@ def grant_storage_permission bucket_name
   bucket= storage_client.bucket bucket_name
 
   object_viewer = "roles/storage.objectViewer"
-  member = ""
+  member = "serviceAccount:542339357638-cr0dserr2evg7sv1meghqeu703274f3h@developer.gserviceaccount.com"
   bucket.policy requested_policy_version: 3 do |policy|
     policy.version = 3
     policy.bindings.insert(

From 6108636c17ef115aef1e9e868ad1568ae2fc9793 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 17 Jan 2025 13:12:19 +0000
Subject: [PATCH 038/100] undo adding static email

---
 .../samples/acceptance/buckets_test.rb          |  9 +++------
 .../samples/acceptance/helper.rb                | 17 -----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 39eb77545bdc..8c97326cb868 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -127,18 +127,15 @@
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
-      grant_storage_permission new_bucket_name
       # Check if the bucket exist
       assert(new_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
       delete_bucket_helper new_bucket_name
       # Check if the bucket does not exist
       deleted_bucket =storage_client.bucket new_bucket_name
       refute(deleted_bucket, "Bucket #{new_bucket_name} should not exist") 
-      deleted_bucket= storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
-
-      # _out, _err = capture_io do
-      #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      # end
+      _out, _err = capture_io do
+        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+      end
       assert deleted_bucket.soft_delete_time , "Bucket soft_delete_time should be present"
       assert deleted_bucket.hard_delete_time , "Bucket hard_delete_time should be present"
     end
diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 0675094fd8c0..0c2682474ea8 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -37,23 +37,6 @@ def create_bucket_helper bucket_name
   end
 end
 
-def grant_storage_permission bucket_name
-
-  storage_client = Google::Cloud::Storage.new
-  bucket= storage_client.bucket bucket_name
-
-  object_viewer = "roles/storage.objectViewer"
-  member = "serviceAccount:542339357638-cr0dserr2evg7sv1meghqeu703274f3h@developer.gserviceaccount.com"
-  bucket.policy requested_policy_version: 3 do |policy|
-    policy.version = 3
-    policy.bindings.insert(
-      role:      object_viewer,
-      members:   member
-    )
-  end
-
-end
-
 def delete_bucket_helper bucket_name
   storage_client = Google::Cloud::Storage.new
   retry_resource_exhaustion do

From 04a56f1385aa5b3b643eeee22ccfa81cd4706a20 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 17 Jan 2025 13:25:51 +0000
Subject: [PATCH 039/100] updating gemspec -- debugging

---
 google-cloud-storage/google-cloud-storage.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/google-cloud-storage.gemspec b/google-cloud-storage/google-cloud-storage.gemspec
index cf89353a9fa1..e3c65cf9fbcb 100644
--- a/google-cloud-storage/google-cloud-storage.gemspec
+++ b/google-cloud-storage/google-cloud-storage.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "google-cloud-core", "~> 1.6"
   gem.add_dependency "google-apis-core", "~> 0.13"
   gem.add_dependency "google-apis-iamcredentials_v1", "~> 0.18"
-  gem.add_dependency "google-apis-storage_v1", "~> 0.40"
+  gem.add_dependency "google-apis-storage_v1", "0.46"
   gem.add_dependency "googleauth", "~> 1.9"
   gem.add_dependency "digest-crc", "~> 0.4"
   gem.add_dependency "addressable", "~> 2.8"

From dcb47e76c6901033e688bdcd8e95b791eee36b3e Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 17 Jan 2025 13:44:48 +0000
Subject: [PATCH 040/100] updating gem spec -- debugging

---
 google-cloud-storage/google-cloud-storage.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/google-cloud-storage.gemspec b/google-cloud-storage/google-cloud-storage.gemspec
index e3c65cf9fbcb..31256edff256 100644
--- a/google-cloud-storage/google-cloud-storage.gemspec
+++ b/google-cloud-storage/google-cloud-storage.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "google-cloud-core", "~> 1.6"
   gem.add_dependency "google-apis-core", "~> 0.13"
   gem.add_dependency "google-apis-iamcredentials_v1", "~> 0.18"
-  gem.add_dependency "google-apis-storage_v1", "0.46"
+  gem.add_dependency "google-apis-storage_v1", "~> 0.38"
   gem.add_dependency "googleauth", "~> 1.9"
   gem.add_dependency "digest-crc", "~> 0.4"
   gem.add_dependency "addressable", "~> 2.8"

From 360f07a99707329de32a3bb7802dfaef7381f7f6 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 17 Jan 2025 14:03:25 +0000
Subject: [PATCH 041/100] debugging

---
 google-cloud-storage/google-cloud-storage.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/google-cloud-storage.gemspec b/google-cloud-storage/google-cloud-storage.gemspec
index 31256edff256..58e510bdaf63 100644
--- a/google-cloud-storage/google-cloud-storage.gemspec
+++ b/google-cloud-storage/google-cloud-storage.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "google-cloud-core", "~> 1.6"
   gem.add_dependency "google-apis-core", "~> 0.13"
   gem.add_dependency "google-apis-iamcredentials_v1", "~> 0.18"
-  gem.add_dependency "google-apis-storage_v1", "~> 0.38"
+  gem.add_dependency "google-apis-storage_v1", ">= 0.42"
   gem.add_dependency "googleauth", "~> 1.9"
   gem.add_dependency "digest-crc", "~> 0.4"
   gem.add_dependency "addressable", "~> 2.8"

From f42e11d3f42101cc32e2c3bbd95638e4cf3ebe93 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 20 Jan 2025 10:44:49 +0000
Subject: [PATCH 042/100] debugging

---
 .../samples/acceptance/buckets_test.rb        | 1015 ++++++++---------
 .../storage_get_soft_deleted_bucket.rb        |    4 +-
 2 files changed, 509 insertions(+), 510 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 8c97326cb868..8df0dd27ad2f 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -62,64 +62,64 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  describe "bucket lifecycle" do
-    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-      # create_bucket
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      retry_resource_exhaustion do
-        assert_output "Created bucket: #{bucket_name}\n" do
-          create_bucket bucket_name: bucket_name
-        end
-      end
+  # describe "bucket lifecycle" do
+  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+  #     # create_bucket
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
 
-      refute_nil storage_client.bucket bucket_name
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket: #{bucket_name}\n" do
+  #         create_bucket bucket_name: bucket_name
+  #       end
+  #     end
 
-      # create_bucket_class_location
+  #     refute_nil storage_client.bucket bucket_name
 
-      secondary_bucket_name = random_bucket_name
-      location = "ASIA"
-      storage_class = "COLDLINE"
-      refute storage_client.bucket secondary_bucket_name
+  #     # create_bucket_class_location
 
-      retry_resource_exhaustion do
-        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-          create_bucket_class_location bucket_name: secondary_bucket_name
-        end
-      end
+  #     secondary_bucket_name = random_bucket_name
+  #     location = "ASIA"
+  #     storage_class = "COLDLINE"
+  #     refute storage_client.bucket secondary_bucket_name
 
-      secondary_bucket = storage_client.bucket secondary_bucket_name
-      refute_nil secondary_bucket
-      assert_equal location, secondary_bucket.location
-      assert_equal storage_class, secondary_bucket.storage_class
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+  #         create_bucket_class_location bucket_name: secondary_bucket_name
+  #       end
+  #     end
 
-      # list_buckets
-      out, _err = capture_io do
-        list_buckets
-      end
+  #     secondary_bucket = storage_client.bucket secondary_bucket_name
+  #     refute_nil secondary_bucket
+  #     assert_equal location, secondary_bucket.location
+  #     assert_equal storage_class, secondary_bucket.storage_class
 
-      assert_includes out, "ruby-storage-samples-"
+  #     # list_buckets
+  #     out, _err = capture_io do
+  #       list_buckets
+  #     end
 
-      # get_bucket_metadata
-      out, _err = capture_io do
-        get_bucket_metadata bucket_name: bucket_name
-      end
+  #     assert_includes out, "ruby-storage-samples-"
 
-      assert_includes out, bucket_name
+  #     # get_bucket_metadata
+  #     out, _err = capture_io do
+  #       get_bucket_metadata bucket_name: bucket_name
+  #     end
 
-      # delete_bucket
-      assert_output "Deleted bucket: #{bucket_name}\n" do
-        delete_bucket bucket_name: bucket_name
-      end
+  #     assert_includes out, bucket_name
 
+  #     # delete_bucket
+  #     assert_output "Deleted bucket: #{bucket_name}\n" do
+  #       delete_bucket bucket_name: bucket_name
+  #     end
 
-      refute storage_client.bucket bucket_name
 
-      delete_bucket_helper bucket_name
-      delete_bucket_helper secondary_bucket_name
-    end
-  end
+  #     refute storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #     delete_bucket_helper secondary_bucket_name
+  #   end
+  # end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
@@ -136,8 +136,7 @@
       _out, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       end
-      assert deleted_bucket.soft_delete_time , "Bucket soft_delete_time should be present"
-      assert deleted_bucket.hard_delete_time , "Bucket hard_delete_time should be present"
+      assert_includes _out , new_bucket_name
     end
 
     it "lists soft deleted buckets" do
@@ -149,466 +148,466 @@
   end
 
 
-  describe "storage_create_bucket_dual_region" do
-    it "creates dual region bucket" do
-      location = "US"
-      region_1 = "US-EAST1"
-      region_2 = "US-WEST1"
-      location_type = "dual-region"
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Bucket #{bucket_name} created:\n"
-      expected += "- location: #{location}\n"
-      expected += "- location_type: #{location_type}\n"
-      expected += "- custom_placement_config:\n"
-      expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-                                                                              region_1: region_1,
-                                                                              region_2: region_2
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_hierarchical_namespace" do
-    it "creates hierarchical namespace enabled bucket" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_hierarchical_namespace bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_with_object_retention" do
-    it "creates a bucket with object retention enabled." do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_with_object_retention bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      file_name = "test_object_retention"
-
-      bucket = storage_client.bucket bucket_name
-
-      out, _err = capture_io do
-        set_object_retention_policy bucket_name: bucket.name,
-                                    content: "hello world",
-                                    destination_file_name: file_name
-      end
-
-      assert_includes out, "Retention policy for file #{file_name}"
-
-      file = bucket.file file_name
-      file.retention = {
-        mode: nil,
-        retain_until_time: nil,
-        override_unlocked_retention: true
-      }
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "autoclass" do
-    it "get_autoclass, set_autoclass" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-      assert_output(/autoclass config set to true./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to NEARLINE./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-      end
-
-      assert_output(/autoclass config set to false./) do
-        set_autoclass bucket_name: bucket_name, toggle: false
-      end
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "cors" do
-    it "cors_configuration, remove_cors_configuration" do
-      bucket.cors { |c| c.clear }
-      assert bucket.cors.empty?
-
-      # cors_configuration
-      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-        cors_configuration bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal 1, bucket.cors.count
-      rule = bucket.cors.first
-      assert_equal ["*"], rule.origin
-      assert_equal ["PUT", "POST"], rule.methods
-      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-      assert_equal 3600, rule.max_age
-
-      # remove_cors_configuration
-      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-        remove_cors_configuration bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.cors.empty?
-    end
-  end
-
-  describe "requester_pays" do
-    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-      # enable_requester_pays
-      bucket.requester_pays = false
-
-      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-        enable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      assert bucket.requester_pays?
-
-      # disable_requester_pays
-      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-        disable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      refute bucket.requester_pays?
-    end
-  end
+  # describe "storage_create_bucket_dual_region" do
+  #   it "creates dual region bucket" do
+  #     location = "US"
+  #     region_1 = "US-EAST1"
+  #     region_2 = "US-WEST1"
+  #     location_type = "dual-region"
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
 
-  describe "uniform_bucket_level_access" do
-    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-      # enable_uniform_bucket_level_access
-      bucket.uniform_bucket_level_access = false
-
-      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-        enable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      assert bucket.uniform_bucket_level_access?
-
-      # disable_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-        disable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      refute bucket.uniform_bucket_level_access?
-
-      bucket.uniform_bucket_level_access = false
-    end
-  end
-
-  describe "default Cloud KMS encryption key" do
-    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-      refute bucket.default_kms_key
-
-      # set_bucket_default_kms_key
-      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-        set_bucket_default_kms_key bucket_name:     bucket.name,
-                                   default_kms_key: kms_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.default_kms_key, kms_key
-
-      # bucket_delete_default_kms_key
-      assert_output "Default KMS key was removed from #{bucket.name}\n" do
-        bucket_delete_default_kms_key bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_kms_key
-    end
-  end
-
-  describe "get bucket class and location data" do
-    bucket_name = random_bucket_name
-    location = "US"
-    storage_class = "COLDLINE"
-
-    it "get_bucket_class_and_location" do
-      storage_client.create_bucket bucket_name,
-                                   location: location,
-                                   storage_class: storage_class
-      expected_output = "Bucket #{bucket_name} storage class is " \
-                        "#{storage_class}, and the location is #{location}\n"
-      assert_output expected_output do
-        get_bucket_class_and_location bucket_name: bucket_name
-      end
-    end
-  end
-
-  describe "labels" do
-    it "add_bucket_label, remove_bucket_label" do
-      # add_bucket_label
-      label_key = "label_key"
-      label_value = "label_value"
-
-      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-        add_bucket_label bucket_name: bucket.name,
-                         label_value: label_value,
-                         label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.labels[label_key], label_value
-
-      # remove_bucket_label
-      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-        remove_bucket_label bucket_name: bucket.name,
-                            label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert bucket.labels[label_key].empty?
-    end
-  end
-
-  describe "lifecycle management" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-      # enable_bucket_lifecycle_management
-      out, _err = capture_io do
-        enable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is enabled"
-
-      # disable_bucket_lifecycle_management
-      out, _err = capture_io do
-        disable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is disabled"
-    end
-  end
-
-  describe "retention policy" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-      # set_retention_policy
-      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-        set_retention_policy bucket_name:      bucket.name,
-                             retention_period: retention_period
-      end
-
-      bucket.refresh!
-      assert_equal bucket.retention_period, retention_period
-
-      # get_retention_policy
-      out, _err = capture_io do
-        get_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "period: #{retention_period}\n"
-
-      # remove_retention_policy
-      assert_equal bucket.retention_period, retention_period
-      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.retention_period
-
-      # lock_retention_policy
-      bucket.retention_period = retention_period
-      out, _err = capture_io do
-        lock_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "Retention policy for #{bucket.name} is now locked."
-      bucket.refresh!
-      assert bucket.retention_policy_locked?
-
-      # remove_retention_policy
-      assert_output "Policy is locked and retention policy can't be removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "default_event_based_hold" do
-    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-      # enable_default_event_based_hold
-      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-        enable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-
-      # disable_default_event_based_hold
-      bucket.update do |b|
-        b.default_event_based_hold = true
-      end
-
-      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-        disable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "storage_class" do
-    it "change_default_storage_class" do
-      assert_equal "STANDARD", bucket.storage_class
-
-      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-        change_default_storage_class bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal "COLDLINE", bucket.storage_class
-      # teardown
-      bucket.storage_class = "STANDARD"
-    end
-  end
-
-  describe "versioning" do
-    it "enable_versioning, disable_versioning" do
-      # enable_versioning
-      bucket.versioning = false
-
-      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-        enable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.versioning?
-
-      # disable_versioning
-      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-        disable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.versioning?
-    end
-  end
-
-  describe "website_configuration" do
-    let(:main_page_suffix) { "index.html" }
-    let(:not_found_page) { "404.html" }
-
-    it "define_bucket_website_configuration" do
-      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-                     "and #{not_found_page} as the 404 page\n"
-
-      assert_output expected_out do
-        define_bucket_website_configuration bucket_name:      bucket.name,
-                                            main_page_suffix: main_page_suffix,
-                                            not_found_page:   not_found_page
-      end
-
-      bucket.refresh!
-      assert_equal main_page_suffix, bucket.website_main
-      assert_equal not_found_page, bucket.website_404
-    end
-  end
-
-  describe "public_access_prevention" do
-    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-       "set_public_access_prevention_inherited" do
-      bucket.public_access_prevention = :inherited
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-
-      # set_public_access_prevention_enforced
-      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-        set_public_access_prevention_enforced bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # get_public_access_prevention
-      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-        get_public_access_prevention bucket_name: bucket.name
-      end
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # set_public_access_prevention_inherited
-      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-        set_public_access_prevention_inherited bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-      bucket.public_access_prevention = :inherited
-    end
-  end
+  #     expected = "Bucket #{bucket_name} created:\n"
+  #     expected += "- location: #{location}\n"
+  #     expected += "- location_type: #{location_type}\n"
+  #     expected += "- custom_placement_config:\n"
+  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+  #                                                                             region_1: region_1,
+  #                                                                             region_2: region_2
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_hierarchical_namespace" do
+  #   it "creates hierarchical namespace enabled bucket" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_with_object_retention" do
+  #   it "creates a bucket with object retention enabled." do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_with_object_retention bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     file_name = "test_object_retention"
+
+  #     bucket = storage_client.bucket bucket_name
+
+  #     out, _err = capture_io do
+  #       set_object_retention_policy bucket_name: bucket.name,
+  #                                   content: "hello world",
+  #                                   destination_file_name: file_name
+  #     end
+
+  #     assert_includes out, "Retention policy for file #{file_name}"
+
+  #     file = bucket.file file_name
+  #     file.retention = {
+  #       mode: nil,
+  #       retain_until_time: nil,
+  #       override_unlocked_retention: true
+  #     }
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "autoclass" do
+  #   it "get_autoclass, set_autoclass" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+  #     assert_output(/autoclass config set to true./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+  #     end
+
+  #     assert_output(/autoclass config set to false./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: false
+  #     end
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "cors" do
+  #   it "cors_configuration, remove_cors_configuration" do
+  #     bucket.cors { |c| c.clear }
+  #     assert bucket.cors.empty?
+
+  #     # cors_configuration
+  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+  #       cors_configuration bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal 1, bucket.cors.count
+  #     rule = bucket.cors.first
+  #     assert_equal ["*"], rule.origin
+  #     assert_equal ["PUT", "POST"], rule.methods
+  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+  #     assert_equal 3600, rule.max_age
+
+  #     # remove_cors_configuration
+  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+  #       remove_cors_configuration bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.cors.empty?
+  #   end
+  # end
+
+  # describe "requester_pays" do
+  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+  #     # enable_requester_pays
+  #     bucket.requester_pays = false
+
+  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+  #       enable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     assert bucket.requester_pays?
+
+  #     # disable_requester_pays
+  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+  #       disable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     refute bucket.requester_pays?
+  #   end
+  # end
+
+  # describe "uniform_bucket_level_access" do
+  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+  #     # enable_uniform_bucket_level_access
+  #     bucket.uniform_bucket_level_access = false
+
+  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+  #       enable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # disable_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+  #       disable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     bucket.uniform_bucket_level_access = false
+  #   end
+  # end
+
+  # describe "default Cloud KMS encryption key" do
+  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+  #     refute bucket.default_kms_key
+
+  #     # set_bucket_default_kms_key
+  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+  #       set_bucket_default_kms_key bucket_name:     bucket.name,
+  #                                  default_kms_key: kms_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.default_kms_key, kms_key
+
+  #     # bucket_delete_default_kms_key
+  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
+  #       bucket_delete_default_kms_key bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_kms_key
+  #   end
+  # end
+
+  # describe "get bucket class and location data" do
+  #   bucket_name = random_bucket_name
+  #   location = "US"
+  #   storage_class = "COLDLINE"
+
+  #   it "get_bucket_class_and_location" do
+  #     storage_client.create_bucket bucket_name,
+  #                                  location: location,
+  #                                  storage_class: storage_class
+  #     expected_output = "Bucket #{bucket_name} storage class is " \
+  #                       "#{storage_class}, and the location is #{location}\n"
+  #     assert_output expected_output do
+  #       get_bucket_class_and_location bucket_name: bucket_name
+  #     end
+  #   end
+  # end
+
+  # describe "labels" do
+  #   it "add_bucket_label, remove_bucket_label" do
+  #     # add_bucket_label
+  #     label_key = "label_key"
+  #     label_value = "label_value"
+
+  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+  #       add_bucket_label bucket_name: bucket.name,
+  #                        label_value: label_value,
+  #                        label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.labels[label_key], label_value
+
+  #     # remove_bucket_label
+  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+  #       remove_bucket_label bucket_name: bucket.name,
+  #                           label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.labels[label_key].empty?
+  #   end
+  # end
+
+  # describe "lifecycle management" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+  #     # enable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       enable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is enabled"
+
+  #     # disable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       disable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is disabled"
+  #   end
+  # end
+
+  # describe "retention policy" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+  #     # set_retention_policy
+  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+  #       set_retention_policy bucket_name:      bucket.name,
+  #                            retention_period: retention_period
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.retention_period, retention_period
+
+  #     # get_retention_policy
+  #     out, _err = capture_io do
+  #       get_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "period: #{retention_period}\n"
+
+  #     # remove_retention_policy
+  #     assert_equal bucket.retention_period, retention_period
+  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.retention_period
+
+  #     # lock_retention_policy
+  #     bucket.retention_period = retention_period
+  #     out, _err = capture_io do
+  #       lock_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
+  #     bucket.refresh!
+  #     assert bucket.retention_policy_locked?
+
+  #     # remove_retention_policy
+  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "default_event_based_hold" do
+  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+  #     # enable_default_event_based_hold
+  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+  #       enable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     # disable_default_event_based_hold
+  #     bucket.update do |b|
+  #       b.default_event_based_hold = true
+  #     end
+
+  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+  #       disable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "storage_class" do
+  #   it "change_default_storage_class" do
+  #     assert_equal "STANDARD", bucket.storage_class
+
+  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+  #       change_default_storage_class bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal "COLDLINE", bucket.storage_class
+  #     # teardown
+  #     bucket.storage_class = "STANDARD"
+  #   end
+  # end
+
+  # describe "versioning" do
+  #   it "enable_versioning, disable_versioning" do
+  #     # enable_versioning
+  #     bucket.versioning = false
+
+  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+  #       enable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.versioning?
+
+  #     # disable_versioning
+  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+  #       disable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.versioning?
+  #   end
+  # end
+
+  # describe "website_configuration" do
+  #   let(:main_page_suffix) { "index.html" }
+  #   let(:not_found_page) { "404.html" }
+
+  #   it "define_bucket_website_configuration" do
+  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+  #                    "and #{not_found_page} as the 404 page\n"
+
+  #     assert_output expected_out do
+  #       define_bucket_website_configuration bucket_name:      bucket.name,
+  #                                           main_page_suffix: main_page_suffix,
+  #                                           not_found_page:   not_found_page
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal main_page_suffix, bucket.website_main
+  #     assert_equal not_found_page, bucket.website_404
+  #   end
+  # end
+
+  # describe "public_access_prevention" do
+  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+  #      "set_public_access_prevention_inherited" do
+  #     bucket.public_access_prevention = :inherited
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+
+  #     # set_public_access_prevention_enforced
+  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+  #       set_public_access_prevention_enforced bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # get_public_access_prevention
+  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+  #       get_public_access_prevention bucket_name: bucket.name
+  #     end
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # set_public_access_prevention_inherited
+  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+  #       set_public_access_prevention_inherited bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+  #     bucket.public_access_prevention = :inherited
+  #   end
+  # end
 end
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 8e75c0d9a53e..b5ed6c743e19 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -31,8 +31,8 @@ def get_soft_deleted_bucket bucket_name:, generation:
   if (soft_delete_time && hard_delete_time).nil?
     puts "Not Found"
   else
-    puts "soft_delete_time - #{soft_delete_time}"
-    puts "hard_delete_time - #{hard_delete_time}"
+    puts "soft_delete_time for #{deleted_bucket_fetch.name} is - #{soft_delete_time}"
+    puts "hard_delete_time for #{deleted_bucket_fetch.name} is - #{hard_delete_time}"
   end
 end
 # [END storage_get_soft_deleted_bucket]

From 49834d44f7c52b6d91a193eb91d64bd47f301b82 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 20 Jan 2025 11:58:01 +0000
Subject: [PATCH 043/100] debugging

---
 .../samples/acceptance/buckets_test.rb        | 1026 ++++++++---------
 .../samples/acceptance/project_test.rb        |   20 +-
 2 files changed, 524 insertions(+), 522 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 8df0dd27ad2f..9657c33c9e74 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -62,83 +62,68 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  # describe "bucket lifecycle" do
-  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-  #     # create_bucket
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket: #{bucket_name}\n" do
-  #         create_bucket bucket_name: bucket_name
-  #       end
-  #     end
+  describe "bucket lifecycle" do
+    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+      # create_bucket
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      retry_resource_exhaustion do
+        assert_output "Created bucket: #{bucket_name}\n" do
+          create_bucket bucket_name: bucket_name
+        end
+      end
 
-  #     refute_nil storage_client.bucket bucket_name
+      refute_nil storage_client.bucket bucket_name
 
-  #     # create_bucket_class_location
+      # create_bucket_class_location
 
-  #     secondary_bucket_name = random_bucket_name
-  #     location = "ASIA"
-  #     storage_class = "COLDLINE"
-  #     refute storage_client.bucket secondary_bucket_name
+      secondary_bucket_name = random_bucket_name
+      location = "ASIA"
+      storage_class = "COLDLINE"
+      refute storage_client.bucket secondary_bucket_name
 
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-  #         create_bucket_class_location bucket_name: secondary_bucket_name
-  #       end
-  #     end
+      retry_resource_exhaustion do
+        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+          create_bucket_class_location bucket_name: secondary_bucket_name
+        end
+      end
 
-  #     secondary_bucket = storage_client.bucket secondary_bucket_name
-  #     refute_nil secondary_bucket
-  #     assert_equal location, secondary_bucket.location
-  #     assert_equal storage_class, secondary_bucket.storage_class
+      secondary_bucket = storage_client.bucket secondary_bucket_name
+      refute_nil secondary_bucket
+      assert_equal location, secondary_bucket.location
+      assert_equal storage_class, secondary_bucket.storage_class
 
-  #     # list_buckets
-  #     out, _err = capture_io do
-  #       list_buckets
-  #     end
+      # list_buckets
+      out, _err = capture_io do
+        list_buckets
+      end
 
-  #     assert_includes out, "ruby-storage-samples-"
+      assert_includes out, "ruby-storage-samples-"
 
-  #     # get_bucket_metadata
-  #     out, _err = capture_io do
-  #       get_bucket_metadata bucket_name: bucket_name
-  #     end
+      # get_bucket_metadata
+      out, _err = capture_io do
+        get_bucket_metadata bucket_name: bucket_name
+      end
 
-  #     assert_includes out, bucket_name
+      assert_includes out, bucket_name
 
-  #     # delete_bucket
-  #     assert_output "Deleted bucket: #{bucket_name}\n" do
-  #       delete_bucket bucket_name: bucket_name
-  #     end
+      # delete_bucket
+      assert_output "Deleted bucket: #{bucket_name}\n" do
+        delete_bucket bucket_name: bucket_name
+      end
 
 
-  #     refute storage_client.bucket bucket_name
+      refute storage_client.bucket bucket_name
 
-  #     delete_bucket_helper bucket_name
-  #     delete_bucket_helper secondary_bucket_name
-  #   end
-  # end
+      delete_bucket_helper bucket_name
+      delete_bucket_helper secondary_bucket_name
+    end
+  end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
 
-    it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-      new_bucket = storage_client.create_bucket new_bucket_name
-      new_generation = new_bucket.generation
-      # Check if the bucket exist
-      assert(new_bucket.exists?, "Bucket #{new_bucket_name} should exist") 
-      delete_bucket_helper new_bucket_name
-      # Check if the bucket does not exist
-      deleted_bucket =storage_client.bucket new_bucket_name
-      refute(deleted_bucket, "Bucket #{new_bucket_name} should not exist") 
-      _out, _err = capture_io do
-        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      end
-      assert_includes _out , new_bucket_name
-    end
-
     it "lists soft deleted buckets" do
       list_deleted_bucket, _err = capture_io do
         list_soft_deleted_buckets
@@ -147,467 +132,466 @@
     end
   end
 
+  describe "storage_create_bucket_dual_region" do
+    it "creates dual region bucket" do
+      location = "US"
+      region_1 = "US-EAST1"
+      region_2 = "US-WEST1"
+      location_type = "dual-region"
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Bucket #{bucket_name} created:\n"
+      expected += "- location: #{location}\n"
+      expected += "- location_type: #{location_type}\n"
+      expected += "- custom_placement_config:\n"
+      expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+                                                                              region_1: region_1,
+                                                                              region_2: region_2
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "storage_create_bucket_hierarchical_namespace" do
+    it "creates hierarchical namespace enabled bucket" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_hierarchical_namespace bucket_name: bucket_name
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "storage_create_bucket_with_object_retention" do
+    it "creates a bucket with object retention enabled." do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_with_object_retention bucket_name: bucket_name
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      file_name = "test_object_retention"
+
+      bucket = storage_client.bucket bucket_name
+
+      out, _err = capture_io do
+        set_object_retention_policy bucket_name: bucket.name,
+                                    content: "hello world",
+                                    destination_file_name: file_name
+      end
+
+      assert_includes out, "Retention policy for file #{file_name}"
+
+      file = bucket.file file_name
+      file.retention = {
+        mode: nil,
+        retain_until_time: nil,
+        override_unlocked_retention: true
+      }
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "autoclass" do
+    it "get_autoclass, set_autoclass" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+      assert_output(/autoclass config set to true./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to NEARLINE./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+      end
+
+      assert_output(/autoclass config set to false./) do
+        set_autoclass bucket_name: bucket_name, toggle: false
+      end
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "cors" do
+    it "cors_configuration, remove_cors_configuration" do
+      bucket.cors { |c| c.clear }
+      assert bucket.cors.empty?
+
+      # cors_configuration
+      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+        cors_configuration bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert_equal 1, bucket.cors.count
+      rule = bucket.cors.first
+      assert_equal ["*"], rule.origin
+      assert_equal ["PUT", "POST"], rule.methods
+      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+      assert_equal 3600, rule.max_age
+
+      # remove_cors_configuration
+      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+        remove_cors_configuration bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.cors.empty?
+    end
+  end
+
+  describe "requester_pays" do
+    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+      # enable_requester_pays
+      bucket.requester_pays = false
+
+      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+        enable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      assert bucket.requester_pays?
+
+      # disable_requester_pays
+      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+        disable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      refute bucket.requester_pays?
+    end
+  end
+
+  describe "uniform_bucket_level_access" do
+    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+      # enable_uniform_bucket_level_access
+      bucket.uniform_bucket_level_access = false
+
+      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+        enable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      assert bucket.uniform_bucket_level_access?
+
+      # disable_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+        disable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      refute bucket.uniform_bucket_level_access?
+
+      bucket.uniform_bucket_level_access = false
+    end
+  end
+
+  describe "default Cloud KMS encryption key" do
+    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+      refute bucket.default_kms_key
+
+      # set_bucket_default_kms_key
+      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+        set_bucket_default_kms_key bucket_name:     bucket.name,
+                                   default_kms_key: kms_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.default_kms_key, kms_key
+
+      # bucket_delete_default_kms_key
+      assert_output "Default KMS key was removed from #{bucket.name}\n" do
+        bucket_delete_default_kms_key bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_kms_key
+    end
+  end
+
+  describe "get bucket class and location data" do
+    bucket_name = random_bucket_name
+    location = "US"
+    storage_class = "COLDLINE"
+
+    it "get_bucket_class_and_location" do
+      storage_client.create_bucket bucket_name,
+                                   location: location,
+                                   storage_class: storage_class
+      expected_output = "Bucket #{bucket_name} storage class is " \
+                        "#{storage_class}, and the location is #{location}\n"
+      assert_output expected_output do
+        get_bucket_class_and_location bucket_name: bucket_name
+      end
+    end
+  end
+
+  describe "labels" do
+    it "add_bucket_label, remove_bucket_label" do
+      # add_bucket_label
+      label_key = "label_key"
+      label_value = "label_value"
+
+      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+        add_bucket_label bucket_name: bucket.name,
+                         label_value: label_value,
+                         label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.labels[label_key], label_value
+
+      # remove_bucket_label
+      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+        remove_bucket_label bucket_name: bucket.name,
+                            label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert bucket.labels[label_key].empty?
+    end
+  end
+
+  describe "lifecycle management" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+      # enable_bucket_lifecycle_management
+      out, _err = capture_io do
+        enable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is enabled"
+
+      # disable_bucket_lifecycle_management
+      out, _err = capture_io do
+        disable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is disabled"
+    end
+  end
+
+  describe "retention policy" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+      # set_retention_policy
+      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+        set_retention_policy bucket_name:      bucket.name,
+                             retention_period: retention_period
+      end
+
+      bucket.refresh!
+      assert_equal bucket.retention_period, retention_period
+
+      # get_retention_policy
+      out, _err = capture_io do
+        get_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "period: #{retention_period}\n"
+
+      # remove_retention_policy
+      assert_equal bucket.retention_period, retention_period
+      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.retention_period
+
+      # lock_retention_policy
+      bucket.retention_period = retention_period
+      out, _err = capture_io do
+        lock_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "Retention policy for #{bucket.name} is now locked."
+      bucket.refresh!
+      assert bucket.retention_policy_locked?
+
+      # remove_retention_policy
+      assert_output "Policy is locked and retention policy can't be removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "default_event_based_hold" do
+    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+      # enable_default_event_based_hold
+      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+        enable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+
+      # disable_default_event_based_hold
+      bucket.update do |b|
+        b.default_event_based_hold = true
+      end
+
+      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+        disable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "storage_class" do
+    it "change_default_storage_class" do
+      assert_equal "STANDARD", bucket.storage_class
+
+      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+        change_default_storage_class bucket_name: bucket.name
+      end
 
-  # describe "storage_create_bucket_dual_region" do
-  #   it "creates dual region bucket" do
-  #     location = "US"
-  #     region_1 = "US-EAST1"
-  #     region_2 = "US-WEST1"
-  #     location_type = "dual-region"
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
+      bucket.refresh!
+      assert_equal "COLDLINE", bucket.storage_class
+      # teardown
+      bucket.storage_class = "STANDARD"
+    end
+  end
+
+  describe "versioning" do
+    it "enable_versioning, disable_versioning" do
+      # enable_versioning
+      bucket.versioning = false
+
+      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+        enable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.versioning?
 
-  #     expected = "Bucket #{bucket_name} created:\n"
-  #     expected += "- location: #{location}\n"
-  #     expected += "- location_type: #{location_type}\n"
-  #     expected += "- custom_placement_config:\n"
-  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-  #                                                                             region_1: region_1,
-  #                                                                             region_2: region_2
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_hierarchical_namespace" do
-  #   it "creates hierarchical namespace enabled bucket" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_with_object_retention" do
-  #   it "creates a bucket with object retention enabled." do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_with_object_retention bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     file_name = "test_object_retention"
-
-  #     bucket = storage_client.bucket bucket_name
-
-  #     out, _err = capture_io do
-  #       set_object_retention_policy bucket_name: bucket.name,
-  #                                   content: "hello world",
-  #                                   destination_file_name: file_name
-  #     end
-
-  #     assert_includes out, "Retention policy for file #{file_name}"
-
-  #     file = bucket.file file_name
-  #     file.retention = {
-  #       mode: nil,
-  #       retain_until_time: nil,
-  #       override_unlocked_retention: true
-  #     }
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "autoclass" do
-  #   it "get_autoclass, set_autoclass" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-  #     assert_output(/autoclass config set to true./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-  #     end
-
-  #     assert_output(/autoclass config set to false./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: false
-  #     end
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "cors" do
-  #   it "cors_configuration, remove_cors_configuration" do
-  #     bucket.cors { |c| c.clear }
-  #     assert bucket.cors.empty?
-
-  #     # cors_configuration
-  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-  #       cors_configuration bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal 1, bucket.cors.count
-  #     rule = bucket.cors.first
-  #     assert_equal ["*"], rule.origin
-  #     assert_equal ["PUT", "POST"], rule.methods
-  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-  #     assert_equal 3600, rule.max_age
-
-  #     # remove_cors_configuration
-  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-  #       remove_cors_configuration bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.cors.empty?
-  #   end
-  # end
-
-  # describe "requester_pays" do
-  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-  #     # enable_requester_pays
-  #     bucket.requester_pays = false
-
-  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-  #       enable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     assert bucket.requester_pays?
-
-  #     # disable_requester_pays
-  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-  #       disable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     refute bucket.requester_pays?
-  #   end
-  # end
-
-  # describe "uniform_bucket_level_access" do
-  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-  #     # enable_uniform_bucket_level_access
-  #     bucket.uniform_bucket_level_access = false
-
-  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-  #       enable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # disable_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-  #       disable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     bucket.uniform_bucket_level_access = false
-  #   end
-  # end
-
-  # describe "default Cloud KMS encryption key" do
-  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-  #     refute bucket.default_kms_key
-
-  #     # set_bucket_default_kms_key
-  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-  #       set_bucket_default_kms_key bucket_name:     bucket.name,
-  #                                  default_kms_key: kms_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.default_kms_key, kms_key
-
-  #     # bucket_delete_default_kms_key
-  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
-  #       bucket_delete_default_kms_key bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_kms_key
-  #   end
-  # end
-
-  # describe "get bucket class and location data" do
-  #   bucket_name = random_bucket_name
-  #   location = "US"
-  #   storage_class = "COLDLINE"
-
-  #   it "get_bucket_class_and_location" do
-  #     storage_client.create_bucket bucket_name,
-  #                                  location: location,
-  #                                  storage_class: storage_class
-  #     expected_output = "Bucket #{bucket_name} storage class is " \
-  #                       "#{storage_class}, and the location is #{location}\n"
-  #     assert_output expected_output do
-  #       get_bucket_class_and_location bucket_name: bucket_name
-  #     end
-  #   end
-  # end
-
-  # describe "labels" do
-  #   it "add_bucket_label, remove_bucket_label" do
-  #     # add_bucket_label
-  #     label_key = "label_key"
-  #     label_value = "label_value"
-
-  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-  #       add_bucket_label bucket_name: bucket.name,
-  #                        label_value: label_value,
-  #                        label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.labels[label_key], label_value
-
-  #     # remove_bucket_label
-  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-  #       remove_bucket_label bucket_name: bucket.name,
-  #                           label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.labels[label_key].empty?
-  #   end
-  # end
-
-  # describe "lifecycle management" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-  #     # enable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       enable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is enabled"
-
-  #     # disable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       disable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is disabled"
-  #   end
-  # end
-
-  # describe "retention policy" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-  #     # set_retention_policy
-  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-  #       set_retention_policy bucket_name:      bucket.name,
-  #                            retention_period: retention_period
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.retention_period, retention_period
-
-  #     # get_retention_policy
-  #     out, _err = capture_io do
-  #       get_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "period: #{retention_period}\n"
-
-  #     # remove_retention_policy
-  #     assert_equal bucket.retention_period, retention_period
-  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.retention_period
-
-  #     # lock_retention_policy
-  #     bucket.retention_period = retention_period
-  #     out, _err = capture_io do
-  #       lock_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
-  #     bucket.refresh!
-  #     assert bucket.retention_policy_locked?
-
-  #     # remove_retention_policy
-  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "default_event_based_hold" do
-  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-  #     # enable_default_event_based_hold
-  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-  #       enable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     # disable_default_event_based_hold
-  #     bucket.update do |b|
-  #       b.default_event_based_hold = true
-  #     end
-
-  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-  #       disable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "storage_class" do
-  #   it "change_default_storage_class" do
-  #     assert_equal "STANDARD", bucket.storage_class
-
-  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-  #       change_default_storage_class bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal "COLDLINE", bucket.storage_class
-  #     # teardown
-  #     bucket.storage_class = "STANDARD"
-  #   end
-  # end
-
-  # describe "versioning" do
-  #   it "enable_versioning, disable_versioning" do
-  #     # enable_versioning
-  #     bucket.versioning = false
-
-  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-  #       enable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.versioning?
-
-  #     # disable_versioning
-  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-  #       disable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.versioning?
-  #   end
-  # end
-
-  # describe "website_configuration" do
-  #   let(:main_page_suffix) { "index.html" }
-  #   let(:not_found_page) { "404.html" }
-
-  #   it "define_bucket_website_configuration" do
-  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-  #                    "and #{not_found_page} as the 404 page\n"
-
-  #     assert_output expected_out do
-  #       define_bucket_website_configuration bucket_name:      bucket.name,
-  #                                           main_page_suffix: main_page_suffix,
-  #                                           not_found_page:   not_found_page
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal main_page_suffix, bucket.website_main
-  #     assert_equal not_found_page, bucket.website_404
-  #   end
-  # end
-
-  # describe "public_access_prevention" do
-  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-  #      "set_public_access_prevention_inherited" do
-  #     bucket.public_access_prevention = :inherited
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-
-  #     # set_public_access_prevention_enforced
-  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-  #       set_public_access_prevention_enforced bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # get_public_access_prevention
-  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-  #       get_public_access_prevention bucket_name: bucket.name
-  #     end
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # set_public_access_prevention_inherited
-  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-  #       set_public_access_prevention_inherited bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-  #     bucket.public_access_prevention = :inherited
-  #   end
-  # end
+      # disable_versioning
+      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+        disable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.versioning?
+    end
+  end
+
+  describe "website_configuration" do
+    let(:main_page_suffix) { "index.html" }
+    let(:not_found_page) { "404.html" }
+
+    it "define_bucket_website_configuration" do
+      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+                     "and #{not_found_page} as the 404 page\n"
+
+      assert_output expected_out do
+        define_bucket_website_configuration bucket_name:      bucket.name,
+                                            main_page_suffix: main_page_suffix,
+                                            not_found_page:   not_found_page
+      end
+
+      bucket.refresh!
+      assert_equal main_page_suffix, bucket.website_main
+      assert_equal not_found_page, bucket.website_404
+    end
+  end
+
+  describe "public_access_prevention" do
+    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+       "set_public_access_prevention_inherited" do
+      bucket.public_access_prevention = :inherited
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+
+      # set_public_access_prevention_enforced
+      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+        set_public_access_prevention_enforced bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # get_public_access_prevention
+      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+        get_public_access_prevention bucket_name: bucket.name
+      end
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # set_public_access_prevention_inherited
+      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+        set_public_access_prevention_inherited bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+      bucket.public_access_prevention = :inherited
+    end
+  end
 end
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 6e3b944109d3..f30afae6e8e8 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -15,6 +15,7 @@
 require_relative "helper"
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
+require_relative "../storage_get_soft_deleted_bucket"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -33,7 +34,24 @@
 describe "storage_soft_deleted_bucket" do
   let(:storage_client) { Google::Cloud::Storage.new }
   let(:bucket) { fixture_bucket }
-  let(:generation) { bucket.gapi.generation }
+  let(:generation) { bucket.generation }
+  let(:new_bucket_name) { random_bucket_name }
+
+
+  it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
+    new_bucket = storage_client.create_bucket new_bucket_name
+    new_generation = new_bucket.generation
+    # Check if the bucket exist
+    assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
+    delete_bucket_helper new_bucket_name
+    # Check if the bucket does not exist
+    deleted_bucket = storage_client.bucket new_bucket_name
+    refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+    _out, _err = capture_io do
+      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+    end
+    assert_includes _out, "soft_delete_time for #{new_bucket_name} is"
+  end
 
   it "restores a soft deleted bucket" do
     delete_bucket_helper bucket.name

From 9b023d0b08ff51aad508c56e0fd0848a02dd9d7c Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 22 Jan 2025 09:24:13 +0000
Subject: [PATCH 044/100] addressing nit comments

---
 google-cloud-storage/lib/google/cloud/storage/bucket.rb  | 2 +-
 google-cloud-storage/lib/google/cloud/storage/project.rb | 4 ++--
 google-cloud-storage/test/helper.rb                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket.rb b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
index 3b5ea98a4c70..7af92973eb0d 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket.rb
@@ -2280,7 +2280,7 @@ def signed_url path = nil,
           end
         end
 
-        # Fetches generation no. of bucket
+        # Fetches generation of the bucket
         # @example
         # require "google/cloud/storage"
         # storage = Google::Cloud::Storage.new
diff --git a/google-cloud-storage/lib/google/cloud/storage/project.rb b/google-cloud-storage/lib/google/cloud/storage/project.rb
index 1b340763aac9..500bc6556cf4 100644
--- a/google-cloud-storage/lib/google/cloud/storage/project.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/project.rb
@@ -269,7 +269,7 @@ def buckets prefix: nil, token: nil, max: nil, user_project: nil, soft_deleted:
         #   bucket = storage.bucket "other-project-bucket",
         #                           user_project: "my-other-project"
         #   files = bucket.files # Billed to "my-other-project"
-        # @example With `soft_deleted` set to a true and generation specified:
+        # @example With `soft_deleted` set to true and generation specified:
         #   require "google/cloud/storage"
         #
         #   storage = Google::Cloud::Storage.new
@@ -585,7 +585,7 @@ def hmac_keys service_account_email: nil, project_id: nil,
         # Restores a soft deleted bucket with bucket name and generation.
         #
         # @param [String] bucket_name Name of the bucket.
-        # @param [Fixnum] generation generation of the bucket.
+        # @param [Fixnum] generation Generation of the bucket.
         #
         # @return [Google::Cloud::Storage::Bucket, nil] Returns nil if bucket
         #   does not exist
diff --git a/google-cloud-storage/test/helper.rb b/google-cloud-storage/test/helper.rb
index 60ed111f0897..427806347434 100644
--- a/google-cloud-storage/test/helper.rb
+++ b/google-cloud-storage/test/helper.rb
@@ -569,4 +569,4 @@ def restore_file_gapi bucket, file_name, generation=nil
     file_hash = random_file_hash(bucket, file_name, generation).to_json
     Google::Apis::StorageV1::Object.from_json file_hash
   end
-end
\ No newline at end of file
+end

From 2a7f238b3d7723f55fcae7a4612f720b807e9922 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 22 Jan 2025 09:59:12 +0000
Subject: [PATCH 045/100] debugging

---
 .../samples/acceptance/project_test.rb        | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index f30afae6e8e8..97e739957586 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -19,6 +19,9 @@
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
+  let(:bucket) { fixture_bucket }
+  let(:generation) { bucket.generation }
+  let(:new_bucket_name) { random_bucket_name }
 
   it "get_service_account" do
     email = nil
@@ -28,29 +31,43 @@
     assert_includes out,
                     "The GCS service account for project #{project.project_id} is: #{project.service_account_email}"
     assert_includes out, "@gs-project-accounts.iam.gserviceaccount.com"
+
+    new_bucket = project.create_bucket new_bucket_name
+    new_generation = new_bucket.generation
+    # Check if the bucket exist
+    assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
+    delete_bucket_helper new_bucket_name
+    # Check if the bucket does not exist
+    deleted_bucket = project.bucket new_bucket_name
+    refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+    output, _err = capture_io do
+      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+    end
+    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
   end
 end
 
 describe "storage_soft_deleted_bucket" do
-  let(:storage_client) { Google::Cloud::Storage.new }
+  let(:project) { Google::Cloud::Storage.new }
   let(:bucket) { fixture_bucket }
   let(:generation) { bucket.generation }
   let(:new_bucket_name) { random_bucket_name }
 
 
   it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-    new_bucket = storage_client.create_bucket new_bucket_name
+    new_bucket = project.create_bucket new_bucket_name
     new_generation = new_bucket.generation
     # Check if the bucket exist
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     delete_bucket_helper new_bucket_name
     # Check if the bucket does not exist
-    deleted_bucket = storage_client.bucket new_bucket_name
+    deleted_bucket = project.bucket new_bucket_name
     refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
-    _out, _err = capture_io do
+    output, _err = capture_io do
       get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
     end
-    assert_includes _out, "soft_delete_time for #{new_bucket_name} is"
+    binding.pry
+    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
   end
 
   it "restores a soft deleted bucket" do

From 63c41067b1ea938beffdd8eaaa7965f758dc19a4 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Wed, 22 Jan 2025 17:21:56 +0000
Subject: [PATCH 046/100] debugging

---
 .../samples/acceptance/project_test.rb        | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 97e739957586..a30ead733148 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -31,42 +31,28 @@
     assert_includes out,
                     "The GCS service account for project #{project.project_id} is: #{project.service_account_email}"
     assert_includes out, "@gs-project-accounts.iam.gserviceaccount.com"
-
-    new_bucket = project.create_bucket new_bucket_name
-    new_generation = new_bucket.generation
-    # Check if the bucket exist
-    assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
-    delete_bucket_helper new_bucket_name
-    # Check if the bucket does not exist
-    deleted_bucket = project.bucket new_bucket_name
-    refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
-    output, _err = capture_io do
-      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-    end
-    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
   end
 end
 
 describe "storage_soft_deleted_bucket" do
-  let(:project) { Google::Cloud::Storage.new }
+  let(:storage_client) { Google::Cloud::Storage.new }
   let(:bucket) { fixture_bucket }
   let(:generation) { bucket.generation }
   let(:new_bucket_name) { random_bucket_name }
 
 
   it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-    new_bucket = project.create_bucket new_bucket_name
+    new_bucket = storage_client.create_bucket new_bucket_name
     new_generation = new_bucket.generation
     # Check if the bucket exist
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     delete_bucket_helper new_bucket_name
     # Check if the bucket does not exist
-    deleted_bucket = project.bucket new_bucket_name
+    deleted_bucket = storage_client.bucket new_bucket_name
     refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
     output, _err = capture_io do
       get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
     end
-    binding.pry
     assert_includes output, "soft_delete_time for #{new_bucket_name} is"
   end
 

From c7a2e7682cc84fab6b5a217e919a49014f191209 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 06:36:17 +0000
Subject: [PATCH 047/100] debugging

---
 .../samples/acceptance/helper.rb                | 17 +++++++++++++++++
 .../samples/acceptance/project_test.rb          |  1 +
 2 files changed, 18 insertions(+)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 0c2682474ea8..20f166074ce5 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -88,6 +88,23 @@ def get_kms_key project_id
   end
 end
 
+def grant_storage_permission bucket_name
+
+  storage_client = Google::Cloud::Storage.new
+  bucket= storage_client.bucket bucket_name
+
+  object_viewer = "roles/storage.admin"
+  member = "serviceAccount:#{storage_client.service_account_email}"
+  bucket.policy requested_policy_version: 3 do |policy|
+    policy.version = 3
+    policy.bindings.insert(
+      role:      object_viewer,
+      members:   member
+    )
+  end
+
+end
+
 def delete_hmac_key_helper hmac_key
   hmac_key.refresh!
   return if hmac_key.deleted?
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index a30ead733148..7ef4f81740f6 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -44,6 +44,7 @@
   it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
     new_bucket = storage_client.create_bucket new_bucket_name
     new_generation = new_bucket.generation
+    grant_storage_permission new_bucket_name
     # Check if the bucket exist
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     delete_bucket_helper new_bucket_name

From 9191faf739d06b88bd36c2c3b0aa49b321926f02 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 08:41:35 +0000
Subject: [PATCH 048/100] debugging

---
 google-cloud-storage/samples/acceptance/helper.rb       | 6 +++---
 google-cloud-storage/samples/acceptance/project_test.rb | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 20f166074ce5..a0daa30ccdd6 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -91,14 +91,14 @@ def get_kms_key project_id
 def grant_storage_permission bucket_name
 
   storage_client = Google::Cloud::Storage.new
-  bucket= storage_client.bucket bucket_name
+  bucket = storage_client.bucket bucket_name
 
-  object_viewer = "roles/storage.admin"
+  storage_admin = "roles/storage.admin"
   member = "serviceAccount:#{storage_client.service_account_email}"
   bucket.policy requested_policy_version: 3 do |policy|
     policy.version = 3
     policy.bindings.insert(
-      role:      object_viewer,
+      role:      storage_admin,
       members:   member
     )
   end
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 7ef4f81740f6..bca7f4807dac 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -45,6 +45,7 @@
     new_bucket = storage_client.create_bucket new_bucket_name
     new_generation = new_bucket.generation
     grant_storage_permission new_bucket_name
+    puts new_bucket.policy
     # Check if the bucket exist
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     delete_bucket_helper new_bucket_name

From 6395dc5505e201eea93b2c420f5524f948f09db4 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 08:54:13 +0000
Subject: [PATCH 049/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index bca7f4807dac..6a3afe60a21b 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -45,7 +45,7 @@
     new_bucket = storage_client.create_bucket new_bucket_name
     new_generation = new_bucket.generation
     grant_storage_permission new_bucket_name
-    puts new_bucket.policy
+    puts new_bucket.policy.roles
     # Check if the bucket exist
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     delete_bucket_helper new_bucket_name

From 4feec6c2228e5006c24023ef54b1acc516b7efe8 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 10:50:33 +0000
Subject: [PATCH 050/100] debugging

---
 .../samples/acceptance/helper.rb                 | 16 ----------------
 .../samples/acceptance/project_test.rb           |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index a0daa30ccdd6..003dfa78affd 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -88,22 +88,6 @@ def get_kms_key project_id
   end
 end
 
-def grant_storage_permission bucket_name
-
-  storage_client = Google::Cloud::Storage.new
-  bucket = storage_client.bucket bucket_name
-
-  storage_admin = "roles/storage.admin"
-  member = "serviceAccount:#{storage_client.service_account_email}"
-  bucket.policy requested_policy_version: 3 do |policy|
-    policy.version = 3
-    policy.bindings.insert(
-      role:      storage_admin,
-      members:   member
-    )
-  end
-
-end
 
 def delete_hmac_key_helper hmac_key
   hmac_key.refresh!
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 6a3afe60a21b..30dfa6609865 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -16,6 +16,7 @@
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
 require_relative "../storage_get_soft_deleted_bucket"
+require "pry"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -44,9 +45,8 @@
   it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
     new_bucket = storage_client.create_bucket new_bucket_name
     new_generation = new_bucket.generation
-    grant_storage_permission new_bucket_name
-    puts new_bucket.policy.roles
     # Check if the bucket exist
+    puts new_bucket.policy.roles
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     delete_bucket_helper new_bucket_name
     # Check if the bucket does not exist

From 39edb7046e78d87411e526cb00bc1ca02316da3d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 10:55:30 +0000
Subject: [PATCH 051/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 30dfa6609865..e26db11e1676 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -16,7 +16,6 @@
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
 require_relative "../storage_get_soft_deleted_bucket"
-require "pry"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }

From 25119ab78811c7619395d746e479d0a78dad56a7 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 11:35:47 +0000
Subject: [PATCH 052/100] debugging

---
 .../samples/acceptance/project_test.rb        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index e26db11e1676..7bf27dc6ed4e 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -16,6 +16,7 @@
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
 require_relative "../storage_get_soft_deleted_bucket"
+require "pry"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -46,15 +47,18 @@
     new_generation = new_bucket.generation
     # Check if the bucket exist
     puts new_bucket.policy.roles
+
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
-    delete_bucket_helper new_bucket_name
-    # Check if the bucket does not exist
-    deleted_bucket = storage_client.bucket new_bucket_name
-    refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
-    output, _err = capture_io do
-      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-    end
-    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+    check_bucket = storage_client.bucket new_bucket_name
+    puts check_bucket.name
+    # delete_bucket_helper new_bucket_name
+    # # Check if the bucket does not exist
+    # deleted_bucket = storage_client.bucket new_bucket_name
+    # refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+    # output, _err = capture_io do
+    #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+    # end
+    # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
   end
 
   it "restores a soft deleted bucket" do

From 6af39e72974cb61a46ee9958ad4a130c24c8aeeb Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 11:40:52 +0000
Subject: [PATCH 053/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 7bf27dc6ed4e..3204a0460be0 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -16,7 +16,6 @@
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
 require_relative "../storage_get_soft_deleted_bucket"
-require "pry"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }

From 63b8485347bf537c142f880a48aa35e61a893033 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 11:54:25 +0000
Subject: [PATCH 054/100] debugging

---
 .../samples/acceptance/project_test.rb            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 3204a0460be0..282b7ed03a08 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -46,14 +46,19 @@
     new_generation = new_bucket.generation
     # Check if the bucket exist
     puts new_bucket.policy.roles
+        puts "new bucket name-- #{check_bucket.name}"
+
 
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     check_bucket = storage_client.bucket new_bucket_name
-    puts check_bucket.name
-    # delete_bucket_helper new_bucket_name
-    # # Check if the bucket does not exist
-    # deleted_bucket = storage_client.bucket new_bucket_name
-    # refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+    delete_bucket_helper new_bucket_name
+    # Check if the bucket does not exist
+     deleted_bucket = storage_client.bucket new_bucket_name
+     puts "deleted bucket name-- #{deleted_bucket.name}"  if deleted_bucket.present?
+
+     #{}refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+    assert deleted_bucket.exists?, "Bucket #{new_bucket_name} should exist"
+ 
     # output, _err = capture_io do
     #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
     # end

From 0bc844f524b3705bb2e6a450c607baf6b350fda2 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 12:04:40 +0000
Subject: [PATCH 055/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 282b7ed03a08..a173a52b3e08 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -46,7 +46,7 @@
     new_generation = new_bucket.generation
     # Check if the bucket exist
     puts new_bucket.policy.roles
-        puts "new bucket name-- #{check_bucket.name}"
+        puts "new bucket name-- #{new_bucket.name}"
 
 
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"

From a442451ebfd8740862ff11d8f1a01e1a36ee3833 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 12:20:13 +0000
Subject: [PATCH 056/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index a173a52b3e08..5a14a05d140d 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -47,18 +47,14 @@
     # Check if the bucket exist
     puts new_bucket.policy.roles
         puts "new bucket name-- #{new_bucket.name}"
-
-
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     check_bucket = storage_client.bucket new_bucket_name
     delete_bucket_helper new_bucket_name
     # Check if the bucket does not exist
      deleted_bucket = storage_client.bucket new_bucket_name
-     puts "deleted bucket name-- #{deleted_bucket.name}"  if deleted_bucket.present?
+     refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
 
-     #{}refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
-    assert deleted_bucket.exists?, "Bucket #{new_bucket_name} should exist"
- 
+     deleted_bucket_fetch = storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
     # output, _err = capture_io do
     #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
     # end

From 44b3aae89d2693b86ab32ab5c6f6a905c4e179cf Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 12:35:21 +0000
Subject: [PATCH 057/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 5a14a05d140d..4aa62d941373 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -16,6 +16,7 @@
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
 require_relative "../storage_get_soft_deleted_bucket"
+require_relative "../storage_get_bucket_class_and_location"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -49,6 +50,12 @@
         puts "new bucket name-- #{new_bucket.name}"
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     check_bucket = storage_client.bucket new_bucket_name
+
+      expected_output = "Bucket #{new_bucket_name} storage class is " \
+                        "#{check_bucket.storage_class}, and the location is #{check_bucket.location}\n"
+      assert_output expected_output do
+        get_bucket_class_and_location bucket_name: new_bucket_name
+      end
     delete_bucket_helper new_bucket_name
     # Check if the bucket does not exist
      deleted_bucket = storage_client.bucket new_bucket_name

From 5ba2762b719238256daa4537401c8968ff89ab79 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 12:58:05 +0000
Subject: [PATCH 058/100] debugging

---
 .../samples/acceptance/project_test.rb         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 4aa62d941373..ebfd6225019f 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -47,25 +47,25 @@
     new_generation = new_bucket.generation
     # Check if the bucket exist
     puts new_bucket.policy.roles
-        puts "new bucket name-- #{new_bucket.name}"
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     check_bucket = storage_client.bucket new_bucket_name
+    puts "new bucket name-- #{check_bucket.name}"
 
-      expected_output = "Bucket #{new_bucket_name} storage class is " \
-                        "#{check_bucket.storage_class}, and the location is #{check_bucket.location}\n"
-      assert_output expected_output do
-        get_bucket_class_and_location bucket_name: new_bucket_name
-      end
     delete_bucket_helper new_bucket_name
     # Check if the bucket does not exist
-     deleted_bucket = storage_client.bucket new_bucket_name
-     refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+    deleted_bucket = storage_client.bucket new_bucket_name
+    refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
 
-     deleted_bucket_fetch = storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
+    # deleted_bucket_fetch = storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
     # output, _err = capture_io do
     #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
     # end
     # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+
+    _out, _err = capture_io do
+      restore_bucket bucket_name: bucket.name, generation: generation
+    end
+    assert "soft_delete_time", "#{bucket.name} Bucket restored"
   end
 
   it "restores a soft deleted bucket" do

From e7dcbce6556ad3c6b5da90d9672b834aeb639485 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 13:10:34 +0000
Subject: [PATCH 059/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index ebfd6225019f..9d9ccfeb46d9 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -50,6 +50,7 @@
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
     check_bucket = storage_client.bucket new_bucket_name
     puts "new bucket name-- #{check_bucket.name}"
+    puts "new bucket generation-- #{check_bucket.generation}"
 
     delete_bucket_helper new_bucket_name
     # Check if the bucket does not exist
@@ -63,9 +64,12 @@
     # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
 
     _out, _err = capture_io do
-      restore_bucket bucket_name: bucket.name, generation: generation
+      restore_bucket bucket_name: new_bucket_name, generation: new_generation
     end
-    assert "soft_delete_time", "#{bucket.name} Bucket restored"
+
+    restored_bucket = storage_client.create_bucket new_bucket_name
+    assert restored_bucket.exists?, "Bucket #{new_bucket_name} should exist"
+
   end
 
   it "restores a soft deleted bucket" do

From 4838eb53847940de765c602b965bcb432da2484d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 13:12:43 +0000
Subject: [PATCH 060/100] debugging

---
 .../samples/acceptance/project_test.rb             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 9d9ccfeb46d9..4beb3b8a406e 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -72,11 +72,11 @@
 
   end
 
-  it "restores a soft deleted bucket" do
-    delete_bucket_helper bucket.name
-    _out, _err = capture_io do
-      restore_bucket bucket_name: bucket.name, generation: generation
-    end
-    assert "soft_delete_time", "#{bucket.name} Bucket restored"
-  end
+  # it "restores a soft deleted bucket" do
+  #   delete_bucket_helper bucket.name
+  #   _out, _err = capture_io do
+  #     restore_bucket bucket_name: bucket.name, generation: generation
+  #   end
+  #   assert "soft_delete_time", "#{bucket.name} Bucket restored"
+  # end
 end

From 2edc3118d23e55225c20631ff2608187561ce6a6 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 13:40:44 +0000
Subject: [PATCH 061/100] debugging

---
 .../samples/acceptance/project_test.rb        | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 4beb3b8a406e..9f1d2caf3b8e 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -17,6 +17,7 @@
 require_relative "../storage_restore_bucket"
 require_relative "../storage_get_soft_deleted_bucket"
 require_relative "../storage_get_bucket_class_and_location"
+require "pry"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -47,36 +48,41 @@
     new_generation = new_bucket.generation
     # Check if the bucket exist
     puts new_bucket.policy.roles
+
+    # ensuring bucket is created
     assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
+
+    # fetching bucket
     check_bucket = storage_client.bucket new_bucket_name
     puts "new bucket name-- #{check_bucket.name}"
     puts "new bucket generation-- #{check_bucket.generation}"
 
     delete_bucket_helper new_bucket_name
-    # Check if the bucket does not exist
+    # Check if the bucket is deleted
     deleted_bucket = storage_client.bucket new_bucket_name
     refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
 
+    # fetching a soft deleted bucket
+
     # deleted_bucket_fetch = storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
     # output, _err = capture_io do
     #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
     # end
     # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+    
+    # restoring a soft deleted bucket
+    restore_bucket bucket_name: new_bucket_name, generation: new_generation
 
-    _out, _err = capture_io do
-      restore_bucket bucket_name: new_bucket_name, generation: new_generation
-    end
-
-    restored_bucket = storage_client.create_bucket new_bucket_name
+    restored_bucket = storage_client.bucket new_bucket_name
     assert restored_bucket.exists?, "Bucket #{new_bucket_name} should exist"
 
   end
 
-  # it "restores a soft deleted bucket" do
-  #   delete_bucket_helper bucket.name
-  #   _out, _err = capture_io do
-  #     restore_bucket bucket_name: bucket.name, generation: generation
-  #   end
-  #   assert "soft_delete_time", "#{bucket.name} Bucket restored"
-  # end
+  it "restores a soft deleted bucket" do
+    delete_bucket_helper bucket.name
+    _out, _err = capture_io do
+      restore_bucket bucket_name: bucket.name, generation: generation
+    end
+    assert  "#{bucket.name} Bucket restored"
+  end
 end

From 7a6f7195413c745085ad4c7490a82fae23df0341 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Thu, 23 Jan 2025 13:46:01 +0000
Subject: [PATCH 062/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 9f1d2caf3b8e..a9e2d8663d63 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -17,7 +17,6 @@
 require_relative "../storage_restore_bucket"
 require_relative "../storage_get_soft_deleted_bucket"
 require_relative "../storage_get_bucket_class_and_location"
-require "pry"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }

From 199acc56e68cf6a357472ffeff3a48889f9a86e8 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 24 Jan 2025 04:57:57 +0000
Subject: [PATCH 063/100] debugging

---
 google-cloud-storage/samples/acceptance/project_test.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index a9e2d8663d63..ccd8edf132db 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -63,11 +63,10 @@
 
     # fetching a soft deleted bucket
 
-    # deleted_bucket_fetch = storage_client.bucket new_bucket_name, generation: new_generation, soft_deleted: true
-    # output, _err = capture_io do
-    #   get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-    # end
-    # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+    output, _err = capture_io do
+      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+    end
+    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
     
     # restoring a soft deleted bucket
     restore_bucket bucket_name: new_bucket_name, generation: new_generation

From 120d90cfcc14124b12a7c39151dd8f2ccab402be Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 27 Jan 2025 10:18:03 +0000
Subject: [PATCH 064/100] debugging

---
 .../lib/google/cloud/storage/bucket/list.rb   |  3 +-
 .../lib/google/cloud/storage/service.rb       |  2 +-
 .../samples/acceptance/buckets_test.rb        | 27 ++++++++++++
 .../samples/acceptance/project_test.rb        | 43 +------------------
 4 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
index 428300c40df0..5ed6cf39271b 100644
--- a/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/bucket/list.rb
@@ -72,7 +72,8 @@ def next
             return nil unless next?
             ensure_service!
             gapi = @service.list_buckets prefix: @prefix, token: @token,
-                                         max: @max, user_project: @user_project
+                                         max: @max, user_project: @user_project,
+                                         soft_deleted: @soft_deleted
             Bucket::List.from_gapi gapi, @service, @prefix, @max,
                                    user_project: @user_project
           end
diff --git a/google-cloud-storage/lib/google/cloud/storage/service.rb b/google-cloud-storage/lib/google/cloud/storage/service.rb
index 838445227ebd..927e45f0247e 100644
--- a/google-cloud-storage/lib/google/cloud/storage/service.rb
+++ b/google-cloud-storage/lib/google/cloud/storage/service.rb
@@ -911,7 +911,7 @@ def encryption_key_headers options, key, copy_source: false
           headers = (options[:header] ||= {})
           headers["x-goog-#{source}encryption-algorithm"] = "AES256"
           headers["x-goog-#{source}encryption-key"] = Base64.strict_encode64 key
-          headers["x-goog-#{source}encryption-key-sha256"] = \
+          headers["x-goog-#{source}encryption-key-sha256"] =
             Base64.strict_encode64 key_sha256
           options
         end
diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 9657c33c9e74..9d50f30b89b0 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -124,6 +124,33 @@
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
 
+    it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
+      new_bucket = storage_client.create_bucket new_bucket_name
+      new_generation = new_bucket.generation
+      puts  storage_client.service_account_email
+      puts new_bucket.policy.roles
+
+      # ensuring bucket is created
+      assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
+
+      # fetching bucket
+      check_bucket = storage_client.bucket new_bucket_name
+      puts "new bucket name-- #{check_bucket.name}"
+      puts "new bucket generation-- #{check_bucket.generation}"
+
+      delete_bucket_helper new_bucket_name
+      # Check if the bucket is deleted
+      deleted_bucket = storage_client.bucket new_bucket_name
+      refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+
+      # fetching a soft deleted bucket
+      output, _err = capture_io do
+        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+      end
+      assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+
+    end
+
     it "lists soft deleted buckets" do
       list_deleted_bucket, _err = capture_io do
         list_soft_deleted_buckets
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index ccd8edf132db..c297418674b0 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -15,8 +15,6 @@
 require_relative "helper"
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
-require_relative "../storage_get_soft_deleted_bucket"
-require_relative "../storage_get_bucket_class_and_location"
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -36,51 +34,14 @@
 end
 
 describe "storage_soft_deleted_bucket" do
-  let(:storage_client) { Google::Cloud::Storage.new }
-  let(:bucket) { fixture_bucket }
   let(:generation) { bucket.generation }
-  let(:new_bucket_name) { random_bucket_name }
-
-
-  it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-    new_bucket = storage_client.create_bucket new_bucket_name
-    new_generation = new_bucket.generation
-    # Check if the bucket exist
-    puts new_bucket.policy.roles
-
-    # ensuring bucket is created
-    assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
-
-    # fetching bucket
-    check_bucket = storage_client.bucket new_bucket_name
-    puts "new bucket name-- #{check_bucket.name}"
-    puts "new bucket generation-- #{check_bucket.generation}"
-
-    delete_bucket_helper new_bucket_name
-    # Check if the bucket is deleted
-    deleted_bucket = storage_client.bucket new_bucket_name
-    refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
-
-    # fetching a soft deleted bucket
-
-    output, _err = capture_io do
-      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-    end
-    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
-    
-    # restoring a soft deleted bucket
-    restore_bucket bucket_name: new_bucket_name, generation: new_generation
-
-    restored_bucket = storage_client.bucket new_bucket_name
-    assert restored_bucket.exists?, "Bucket #{new_bucket_name} should exist"
-
-  end
+  let(:bucket) { fixture_bucket }
 
   it "restores a soft deleted bucket" do
     delete_bucket_helper bucket.name
     _out, _err = capture_io do
       restore_bucket bucket_name: bucket.name, generation: generation
     end
-    assert  "#{bucket.name} Bucket restored"
+    assert "#{bucket.name} Bucket restored"
   end
 end

From 2a48db36a399bbb3def33c7c074cda9834d3e127 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 27 Jan 2025 11:06:00 +0000
Subject: [PATCH 065/100] resolving lint issues

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 3 +--
 google-cloud-storage/samples/acceptance/helper.rb       | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 9d50f30b89b0..a5cac43593c6 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -127,7 +127,7 @@
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
-      puts  storage_client.service_account_email
+      puts storage_client.service_account_email
       puts new_bucket.policy.roles
 
       # ensuring bucket is created
@@ -148,7 +148,6 @@
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       end
       assert_includes output, "soft_delete_time for #{new_bucket_name} is"
-
     end
 
     it "lists soft deleted buckets" do
diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 003dfa78affd..0c2682474ea8 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -88,7 +88,6 @@ def get_kms_key project_id
   end
 end
 
-
 def delete_hmac_key_helper hmac_key
   hmac_key.refresh!
   return if hmac_key.deleted?

From a559a061178dbcc51f0a2cf3b1d4851c74245319 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 27 Jan 2025 11:36:47 +0000
Subject: [PATCH 066/100] resolving lint issue

---
 google-cloud-storage/samples/acceptance/project_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index c297418674b0..d6b3491af085 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -44,4 +44,4 @@
     end
     assert "#{bucket.name} Bucket restored"
   end
-end
+end
\ No newline at end of file

From 4bdeb8b08fa5582de4443d87317493016181f4b7 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 27 Jan 2025 11:44:56 +0000
Subject: [PATCH 067/100] lint issue

---
 google-cloud-storage/samples/acceptance/project_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index d6b3491af085..c297418674b0 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -44,4 +44,4 @@
     end
     assert "#{bucket.name} Bucket restored"
   end
-end
\ No newline at end of file
+end

From 4172e24466c0d1b1b6186ae3bcc31c27a9bc7b5c Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Fri, 14 Feb 2025 12:21:27 +0000
Subject: [PATCH 068/100] adding retention_period to sample bucket

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index a5cac43593c6..95e44b9b8110 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -126,6 +126,7 @@
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
+      new_bucket.retention_period = retention_period
       new_generation = new_bucket.generation
       puts storage_client.service_account_email
       puts new_bucket.policy.roles
@@ -137,6 +138,7 @@
       check_bucket = storage_client.bucket new_bucket_name
       puts "new bucket name-- #{check_bucket.name}"
       puts "new bucket generation-- #{check_bucket.generation}"
+      puts "new bucket retention period-- #{check_bucket.retention_period}"
 
       delete_bucket_helper new_bucket_name
       # Check if the bucket is deleted

From 042c263a18743cf6ff662f2d1a10088395954c30 Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Mon, 24 Feb 2025 19:06:56 +0000
Subject: [PATCH 069/100] adding soft delete policy explicitly

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 95e44b9b8110..83e25e2b0616 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -123,13 +123,14 @@
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
+    let(:soft_delete_policy) { { retention_duration_seconds: 10*24*60*60 } }
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
-      new_bucket.retention_period = retention_period
       new_generation = new_bucket.generation
+      new_bucket.soft_delete_policy = soft_delete_policy
+      _(new_bucket.soft_delete_policy.retention_duration_seconds).must_equal 10*24*60*60
       puts storage_client.service_account_email
-      puts new_bucket.policy.roles
 
       # ensuring bucket is created
       assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
@@ -137,9 +138,7 @@
       # fetching bucket
       check_bucket = storage_client.bucket new_bucket_name
       puts "new bucket name-- #{check_bucket.name}"
-      puts "new bucket generation-- #{check_bucket.generation}"
-      puts "new bucket retention period-- #{check_bucket.retention_period}"
-
+      puts "new bucket soft_delete_policy-- #{check_bucket.soft_delete_policy}"
       delete_bucket_helper new_bucket_name
       # Check if the bucket is deleted
       deleted_bucket = storage_client.bucket new_bucket_name

From e84219ce9574203b887e4504018fe365a3b0c6b8 Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Tue, 25 Feb 2025 20:45:15 +0000
Subject: [PATCH 070/100] adding soft delete policy explicitly

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 83e25e2b0616..daa8fe6551f5 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -123,13 +123,13 @@
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
-    let(:soft_delete_policy) { { retention_duration_seconds: 10*24*60*60 } }
+    let(:soft_delete_policy) { { retention_duration_seconds: 864_000 } }
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
       new_bucket.soft_delete_policy = soft_delete_policy
-      _(new_bucket.soft_delete_policy.retention_duration_seconds).must_equal 10*24*60*60
+      _(new_bucket.soft_delete_policy.retention_duration_seconds).must_equal 864_000
       puts storage_client.service_account_email
 
       # ensuring bucket is created

From 317c79a4dd5ba3edd41791436e433eda8035b587 Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Wed, 26 Feb 2025 19:01:37 +0000
Subject: [PATCH 071/100] recheking soft delete policy

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index daa8fe6551f5..af784808c6bf 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -129,7 +129,6 @@
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
       new_bucket.soft_delete_policy = soft_delete_policy
-      _(new_bucket.soft_delete_policy.retention_duration_seconds).must_equal 864_000
       puts storage_client.service_account_email
 
       # ensuring bucket is created
@@ -137,8 +136,9 @@
 
       # fetching bucket
       check_bucket = storage_client.bucket new_bucket_name
+      _(check_bucket.soft_delete_policy.retention_duration_seconds).must_equal 864_000
       puts "new bucket name-- #{check_bucket.name}"
-      puts "new bucket soft_delete_policy-- #{check_bucket.soft_delete_policy}"
+      puts "new bucket soft_delete_policy-- #{check_bucket}"
       delete_bucket_helper new_bucket_name
       # Check if the bucket is deleted
       deleted_bucket = storage_client.bucket new_bucket_name

From b099a9155966c305a219572c045d09030717549c Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Sun, 2 Mar 2025 19:52:29 +0000
Subject: [PATCH 072/100] recheking soft delete policy

---
 google-cloud-storage/samples/acceptance/buckets_test.rb        | 3 ++-
 .../samples/storage_get_soft_deleted_bucket.rb                 | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index af784808c6bf..2da9635f5129 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -123,11 +123,12 @@
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
-    let(:soft_delete_policy) { { retention_duration_seconds: 864_000 } }
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
+      soft_delete_policy = Google::Apis::StorageV1::Bucket::SoftDeletePolicy.new
+      soft_delete_policy.retention_duration_seconds = 864_000
       new_bucket.soft_delete_policy = soft_delete_policy
       puts storage_client.service_account_email
 
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index b5ed6c743e19..5bf24dee2f60 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -27,6 +27,7 @@ def get_soft_deleted_bucket bucket_name:, generation:
 
   soft_delete_time = deleted_bucket_fetch.soft_delete_time
   hard_delete_time = deleted_bucket_fetch.hard_delete_time
+  Google::Apis.logger.level = Logger::DEBUG
 
   if (soft_delete_time && hard_delete_time).nil?
     puts "Not Found"

From f34fbf87a7149689b375d7d7e68cfdbf61deda27 Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Wed, 19 Mar 2025 09:19:20 +0000
Subject: [PATCH 073/100] debug...

---
 .../samples/acceptance/buckets_test.rb        | 1034 +++++++++--------
 1 file changed, 520 insertions(+), 514 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 2da9635f5129..bfd1768fcc72 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -55,6 +55,8 @@
 require_relative "../storage_set_retention_policy"
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
+Google::Apis.logger.level = Logger::DEBUG
+
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
@@ -62,69 +64,70 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  describe "bucket lifecycle" do
-    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-      # create_bucket
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
+  # describe "bucket lifecycle" do
+  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+  #     # create_bucket
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
 
-      retry_resource_exhaustion do
-        assert_output "Created bucket: #{bucket_name}\n" do
-          create_bucket bucket_name: bucket_name
-        end
-      end
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket: #{bucket_name}\n" do
+  #         create_bucket bucket_name: bucket_name
+  #       end
+  #     end
 
-      refute_nil storage_client.bucket bucket_name
+  #     refute_nil storage_client.bucket bucket_name
 
-      # create_bucket_class_location
+  #     # create_bucket_class_location
 
-      secondary_bucket_name = random_bucket_name
-      location = "ASIA"
-      storage_class = "COLDLINE"
-      refute storage_client.bucket secondary_bucket_name
+  #     secondary_bucket_name = random_bucket_name
+  #     location = "ASIA"
+  #     storage_class = "COLDLINE"
+  #     refute storage_client.bucket secondary_bucket_name
 
-      retry_resource_exhaustion do
-        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-          create_bucket_class_location bucket_name: secondary_bucket_name
-        end
-      end
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+  #         create_bucket_class_location bucket_name: secondary_bucket_name
+  #       end
+  #     end
 
-      secondary_bucket = storage_client.bucket secondary_bucket_name
-      refute_nil secondary_bucket
-      assert_equal location, secondary_bucket.location
-      assert_equal storage_class, secondary_bucket.storage_class
+  #     secondary_bucket = storage_client.bucket secondary_bucket_name
+  #     refute_nil secondary_bucket
+  #     assert_equal location, secondary_bucket.location
+  #     assert_equal storage_class, secondary_bucket.storage_class
 
-      # list_buckets
-      out, _err = capture_io do
-        list_buckets
-      end
+  #     # list_buckets
+  #     out, _err = capture_io do
+  #       list_buckets
+  #     end
 
-      assert_includes out, "ruby-storage-samples-"
+  #     assert_includes out, "ruby-storage-samples-"
 
-      # get_bucket_metadata
-      out, _err = capture_io do
-        get_bucket_metadata bucket_name: bucket_name
-      end
+  #     # get_bucket_metadata
+  #     out, _err = capture_io do
+  #       get_bucket_metadata bucket_name: bucket_name
+  #     end
 
-      assert_includes out, bucket_name
+  #     assert_includes out, bucket_name
 
-      # delete_bucket
-      assert_output "Deleted bucket: #{bucket_name}\n" do
-        delete_bucket bucket_name: bucket_name
-      end
+  #     # delete_bucket
+  #     assert_output "Deleted bucket: #{bucket_name}\n" do
+  #       delete_bucket bucket_name: bucket_name
+  #     end
 
 
-      refute storage_client.bucket bucket_name
+  #     refute storage_client.bucket bucket_name
 
-      delete_bucket_helper bucket_name
-      delete_bucket_helper secondary_bucket_name
-    end
-  end
+  #     delete_bucket_helper bucket_name
+  #     delete_bucket_helper secondary_bucket_name
+  #   end
+  # end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
+
       new_bucket = storage_client.create_bucket new_bucket_name
       new_generation = new_bucket.generation
       soft_delete_policy = Google::Apis::StorageV1::Bucket::SoftDeletePolicy.new
@@ -137,10 +140,13 @@
 
       # fetching bucket
       check_bucket = storage_client.bucket new_bucket_name
-      _(check_bucket.soft_delete_policy.retention_duration_seconds).must_equal 864_000
-      puts "new bucket name-- #{check_bucket.name}"
       puts "new bucket soft_delete_policy-- #{check_bucket}"
+      puts "new bucket soft_delete_policy-- #{check_bucket.soft_delete_policy}"
+      _(check_bucket.soft_delete_policy.retention_duration_seconds).must_equal 864_000
+  
+
       delete_bucket_helper new_bucket_name
+
       # Check if the bucket is deleted
       deleted_bucket = storage_client.bucket new_bucket_name
       refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
@@ -152,474 +158,474 @@
       assert_includes output, "soft_delete_time for #{new_bucket_name} is"
     end
 
-    it "lists soft deleted buckets" do
-      list_deleted_bucket, _err = capture_io do
-        list_soft_deleted_buckets
-      end
-      assert list_deleted_bucket, "List of soft deleted bucket should not be blank"
-    end
-  end
-
-  describe "storage_create_bucket_dual_region" do
-    it "creates dual region bucket" do
-      location = "US"
-      region_1 = "US-EAST1"
-      region_2 = "US-WEST1"
-      location_type = "dual-region"
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Bucket #{bucket_name} created:\n"
-      expected += "- location: #{location}\n"
-      expected += "- location_type: #{location_type}\n"
-      expected += "- custom_placement_config:\n"
-      expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-                                                                              region_1: region_1,
-                                                                              region_2: region_2
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_hierarchical_namespace" do
-    it "creates hierarchical namespace enabled bucket" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_hierarchical_namespace bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_with_object_retention" do
-    it "creates a bucket with object retention enabled." do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_with_object_retention bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      file_name = "test_object_retention"
-
-      bucket = storage_client.bucket bucket_name
-
-      out, _err = capture_io do
-        set_object_retention_policy bucket_name: bucket.name,
-                                    content: "hello world",
-                                    destination_file_name: file_name
-      end
-
-      assert_includes out, "Retention policy for file #{file_name}"
-
-      file = bucket.file file_name
-      file.retention = {
-        mode: nil,
-        retain_until_time: nil,
-        override_unlocked_retention: true
-      }
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "autoclass" do
-    it "get_autoclass, set_autoclass" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-      assert_output(/autoclass config set to true./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to NEARLINE./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-      end
-
-      assert_output(/autoclass config set to false./) do
-        set_autoclass bucket_name: bucket_name, toggle: false
-      end
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "cors" do
-    it "cors_configuration, remove_cors_configuration" do
-      bucket.cors { |c| c.clear }
-      assert bucket.cors.empty?
-
-      # cors_configuration
-      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-        cors_configuration bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal 1, bucket.cors.count
-      rule = bucket.cors.first
-      assert_equal ["*"], rule.origin
-      assert_equal ["PUT", "POST"], rule.methods
-      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-      assert_equal 3600, rule.max_age
-
-      # remove_cors_configuration
-      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-        remove_cors_configuration bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.cors.empty?
-    end
+    # it "lists soft deleted buckets" do
+    #   list_deleted_bucket, _err = capture_io do
+    #     list_soft_deleted_buckets
+    #   end
+    #   assert list_deleted_bucket, "List of soft deleted bucket should not be blank"
+    # end
   end
 
-  describe "requester_pays" do
-    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-      # enable_requester_pays
-      bucket.requester_pays = false
-
-      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-        enable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      assert bucket.requester_pays?
-
-      # disable_requester_pays
-      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-        disable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      refute bucket.requester_pays?
-    end
-  end
-
-  describe "uniform_bucket_level_access" do
-    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-      # enable_uniform_bucket_level_access
-      bucket.uniform_bucket_level_access = false
-
-      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-        enable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      assert bucket.uniform_bucket_level_access?
-
-      # disable_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-        disable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      refute bucket.uniform_bucket_level_access?
-
-      bucket.uniform_bucket_level_access = false
-    end
-  end
-
-  describe "default Cloud KMS encryption key" do
-    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-      refute bucket.default_kms_key
-
-      # set_bucket_default_kms_key
-      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-        set_bucket_default_kms_key bucket_name:     bucket.name,
-                                   default_kms_key: kms_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.default_kms_key, kms_key
-
-      # bucket_delete_default_kms_key
-      assert_output "Default KMS key was removed from #{bucket.name}\n" do
-        bucket_delete_default_kms_key bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_kms_key
-    end
-  end
-
-  describe "get bucket class and location data" do
-    bucket_name = random_bucket_name
-    location = "US"
-    storage_class = "COLDLINE"
-
-    it "get_bucket_class_and_location" do
-      storage_client.create_bucket bucket_name,
-                                   location: location,
-                                   storage_class: storage_class
-      expected_output = "Bucket #{bucket_name} storage class is " \
-                        "#{storage_class}, and the location is #{location}\n"
-      assert_output expected_output do
-        get_bucket_class_and_location bucket_name: bucket_name
-      end
-    end
-  end
-
-  describe "labels" do
-    it "add_bucket_label, remove_bucket_label" do
-      # add_bucket_label
-      label_key = "label_key"
-      label_value = "label_value"
-
-      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-        add_bucket_label bucket_name: bucket.name,
-                         label_value: label_value,
-                         label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.labels[label_key], label_value
-
-      # remove_bucket_label
-      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-        remove_bucket_label bucket_name: bucket.name,
-                            label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert bucket.labels[label_key].empty?
-    end
-  end
-
-  describe "lifecycle management" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-      # enable_bucket_lifecycle_management
-      out, _err = capture_io do
-        enable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is enabled"
-
-      # disable_bucket_lifecycle_management
-      out, _err = capture_io do
-        disable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is disabled"
-    end
-  end
-
-  describe "retention policy" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-      # set_retention_policy
-      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-        set_retention_policy bucket_name:      bucket.name,
-                             retention_period: retention_period
-      end
-
-      bucket.refresh!
-      assert_equal bucket.retention_period, retention_period
-
-      # get_retention_policy
-      out, _err = capture_io do
-        get_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "period: #{retention_period}\n"
-
-      # remove_retention_policy
-      assert_equal bucket.retention_period, retention_period
-      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.retention_period
-
-      # lock_retention_policy
-      bucket.retention_period = retention_period
-      out, _err = capture_io do
-        lock_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "Retention policy for #{bucket.name} is now locked."
-      bucket.refresh!
-      assert bucket.retention_policy_locked?
-
-      # remove_retention_policy
-      assert_output "Policy is locked and retention policy can't be removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "default_event_based_hold" do
-    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-      # enable_default_event_based_hold
-      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-        enable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-
-      # disable_default_event_based_hold
-      bucket.update do |b|
-        b.default_event_based_hold = true
-      end
-
-      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-        disable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "storage_class" do
-    it "change_default_storage_class" do
-      assert_equal "STANDARD", bucket.storage_class
-
-      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-        change_default_storage_class bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal "COLDLINE", bucket.storage_class
-      # teardown
-      bucket.storage_class = "STANDARD"
-    end
-  end
-
-  describe "versioning" do
-    it "enable_versioning, disable_versioning" do
-      # enable_versioning
-      bucket.versioning = false
-
-      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-        enable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.versioning?
-
-      # disable_versioning
-      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-        disable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.versioning?
-    end
-  end
-
-  describe "website_configuration" do
-    let(:main_page_suffix) { "index.html" }
-    let(:not_found_page) { "404.html" }
-
-    it "define_bucket_website_configuration" do
-      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-                     "and #{not_found_page} as the 404 page\n"
-
-      assert_output expected_out do
-        define_bucket_website_configuration bucket_name:      bucket.name,
-                                            main_page_suffix: main_page_suffix,
-                                            not_found_page:   not_found_page
-      end
-
-      bucket.refresh!
-      assert_equal main_page_suffix, bucket.website_main
-      assert_equal not_found_page, bucket.website_404
-    end
-  end
-
-  describe "public_access_prevention" do
-    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-       "set_public_access_prevention_inherited" do
-      bucket.public_access_prevention = :inherited
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-
-      # set_public_access_prevention_enforced
-      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-        set_public_access_prevention_enforced bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # get_public_access_prevention
-      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-        get_public_access_prevention bucket_name: bucket.name
-      end
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # set_public_access_prevention_inherited
-      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-        set_public_access_prevention_inherited bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-      bucket.public_access_prevention = :inherited
-    end
-  end
+  # describe "storage_create_bucket_dual_region" do
+  #   it "creates dual region bucket" do
+  #     location = "US"
+  #     region_1 = "US-EAST1"
+  #     region_2 = "US-WEST1"
+  #     location_type = "dual-region"
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Bucket #{bucket_name} created:\n"
+  #     expected += "- location: #{location}\n"
+  #     expected += "- location_type: #{location_type}\n"
+  #     expected += "- custom_placement_config:\n"
+  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+  #                                                                             region_1: region_1,
+  #                                                                             region_2: region_2
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_hierarchical_namespace" do
+  #   it "creates hierarchical namespace enabled bucket" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_with_object_retention" do
+  #   it "creates a bucket with object retention enabled." do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_with_object_retention bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     file_name = "test_object_retention"
+
+  #     bucket = storage_client.bucket bucket_name
+
+  #     out, _err = capture_io do
+  #       set_object_retention_policy bucket_name: bucket.name,
+  #                                   content: "hello world",
+  #                                   destination_file_name: file_name
+  #     end
+
+  #     assert_includes out, "Retention policy for file #{file_name}"
+
+  #     file = bucket.file file_name
+  #     file.retention = {
+  #       mode: nil,
+  #       retain_until_time: nil,
+  #       override_unlocked_retention: true
+  #     }
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "autoclass" do
+  #   it "get_autoclass, set_autoclass" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+  #     assert_output(/autoclass config set to true./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+  #     end
+
+  #     assert_output(/autoclass config set to false./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: false
+  #     end
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "cors" do
+  #   it "cors_configuration, remove_cors_configuration" do
+  #     bucket.cors { |c| c.clear }
+  #     assert bucket.cors.empty?
+
+  #     # cors_configuration
+  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+  #       cors_configuration bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal 1, bucket.cors.count
+  #     rule = bucket.cors.first
+  #     assert_equal ["*"], rule.origin
+  #     assert_equal ["PUT", "POST"], rule.methods
+  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+  #     assert_equal 3600, rule.max_age
+
+  #     # remove_cors_configuration
+  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+  #       remove_cors_configuration bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.cors.empty?
+  #   end
+  # end
+
+  # describe "requester_pays" do
+  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+  #     # enable_requester_pays
+  #     bucket.requester_pays = false
+
+  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+  #       enable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     assert bucket.requester_pays?
+
+  #     # disable_requester_pays
+  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+  #       disable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     refute bucket.requester_pays?
+  #   end
+  # end
+
+  # describe "uniform_bucket_level_access" do
+  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+  #     # enable_uniform_bucket_level_access
+  #     bucket.uniform_bucket_level_access = false
+
+  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+  #       enable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # disable_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+  #       disable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     bucket.uniform_bucket_level_access = false
+  #   end
+  # end
+
+  # describe "default Cloud KMS encryption key" do
+  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+  #     refute bucket.default_kms_key
+
+  #     # set_bucket_default_kms_key
+  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+  #       set_bucket_default_kms_key bucket_name:     bucket.name,
+  #                                  default_kms_key: kms_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.default_kms_key, kms_key
+
+  #     # bucket_delete_default_kms_key
+  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
+  #       bucket_delete_default_kms_key bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_kms_key
+  #   end
+  # end
+
+  # describe "get bucket class and location data" do
+  #   bucket_name = random_bucket_name
+  #   location = "US"
+  #   storage_class = "COLDLINE"
+
+  #   it "get_bucket_class_and_location" do
+  #     storage_client.create_bucket bucket_name,
+  #                                  location: location,
+  #                                  storage_class: storage_class
+  #     expected_output = "Bucket #{bucket_name} storage class is " \
+  #                       "#{storage_class}, and the location is #{location}\n"
+  #     assert_output expected_output do
+  #       get_bucket_class_and_location bucket_name: bucket_name
+  #     end
+  #   end
+  # end
+
+  # describe "labels" do
+  #   it "add_bucket_label, remove_bucket_label" do
+  #     # add_bucket_label
+  #     label_key = "label_key"
+  #     label_value = "label_value"
+
+  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+  #       add_bucket_label bucket_name: bucket.name,
+  #                        label_value: label_value,
+  #                        label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.labels[label_key], label_value
+
+  #     # remove_bucket_label
+  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+  #       remove_bucket_label bucket_name: bucket.name,
+  #                           label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.labels[label_key].empty?
+  #   end
+  # end
+
+  # describe "lifecycle management" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+  #     # enable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       enable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is enabled"
+
+  #     # disable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       disable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is disabled"
+  #   end
+  # end
+
+  # describe "retention policy" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+  #     # set_retention_policy
+  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+  #       set_retention_policy bucket_name:      bucket.name,
+  #                            retention_period: retention_period
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.retention_period, retention_period
+
+  #     # get_retention_policy
+  #     out, _err = capture_io do
+  #       get_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "period: #{retention_period}\n"
+
+  #     # remove_retention_policy
+  #     assert_equal bucket.retention_period, retention_period
+  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.retention_period
+
+  #     # lock_retention_policy
+  #     bucket.retention_period = retention_period
+  #     out, _err = capture_io do
+  #       lock_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
+  #     bucket.refresh!
+  #     assert bucket.retention_policy_locked?
+
+  #     # remove_retention_policy
+  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "default_event_based_hold" do
+  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+  #     # enable_default_event_based_hold
+  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+  #       enable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     # disable_default_event_based_hold
+  #     bucket.update do |b|
+  #       b.default_event_based_hold = true
+  #     end
+
+  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+  #       disable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "storage_class" do
+  #   it "change_default_storage_class" do
+  #     assert_equal "STANDARD", bucket.storage_class
+
+  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+  #       change_default_storage_class bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal "COLDLINE", bucket.storage_class
+  #     # teardown
+  #     bucket.storage_class = "STANDARD"
+  #   end
+  # end
+
+  # describe "versioning" do
+  #   it "enable_versioning, disable_versioning" do
+  #     # enable_versioning
+  #     bucket.versioning = false
+
+  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+  #       enable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.versioning?
+
+  #     # disable_versioning
+  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+  #       disable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.versioning?
+  #   end
+  # end
+
+  # describe "website_configuration" do
+  #   let(:main_page_suffix) { "index.html" }
+  #   let(:not_found_page) { "404.html" }
+
+  #   it "define_bucket_website_configuration" do
+  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+  #                    "and #{not_found_page} as the 404 page\n"
+
+  #     assert_output expected_out do
+  #       define_bucket_website_configuration bucket_name:      bucket.name,
+  #                                           main_page_suffix: main_page_suffix,
+  #                                           not_found_page:   not_found_page
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal main_page_suffix, bucket.website_main
+  #     assert_equal not_found_page, bucket.website_404
+  #   end
+  # end
+
+  # describe "public_access_prevention" do
+  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+  #      "set_public_access_prevention_inherited" do
+  #     bucket.public_access_prevention = :inherited
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+
+  #     # set_public_access_prevention_enforced
+  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+  #       set_public_access_prevention_enforced bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # get_public_access_prevention
+  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+  #       get_public_access_prevention bucket_name: bucket.name
+  #     end
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # set_public_access_prevention_inherited
+  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+  #       set_public_access_prevention_inherited bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+  #     bucket.public_access_prevention = :inherited
+  #   end
+  # end
 end

From e8df7fd0f18f48b3e0361eabc98f3cee5b44a74a Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Wed, 19 Mar 2025 10:14:46 +0000
Subject: [PATCH 074/100] debug...

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index bfd1768fcc72..44f284d5eb6a 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -143,9 +143,7 @@
       puts "new bucket soft_delete_policy-- #{check_bucket}"
       puts "new bucket soft_delete_policy-- #{check_bucket.soft_delete_policy}"
       _(check_bucket.soft_delete_policy.retention_duration_seconds).must_equal 864_000
-  
-
-      delete_bucket_helper new_bucket_name
+       new_bucket.delete
 
       # Check if the bucket is deleted
       deleted_bucket = storage_client.bucket new_bucket_name

From 22a749f0665cc56dc1168d93f53ef70cef64508b Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Wed, 21 May 2025 05:52:10 +0000
Subject: [PATCH 075/100] removing unwanted code

---
 .../samples/acceptance/buckets_test.rb        | 1121 ++++++++---------
 .../samples/acceptance/project_test.rb        |    1 +
 .../storage_get_soft_deleted_bucket.rb        |    1 -
 3 files changed, 554 insertions(+), 569 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 7db9c7e4e74c..587ee228618c 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -63,600 +63,585 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  # describe "bucket lifecycle" do
-  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-  #     # create_bucket
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket: #{bucket_name}\n" do
-  #         create_bucket bucket_name: bucket_name
-  #       end
-  #     end
+  describe "bucket lifecycle" do
+    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+      # create_bucket
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      retry_resource_exhaustion do
+        assert_output "Created bucket: #{bucket_name}\n" do
+          create_bucket bucket_name: bucket_name
+        end
+      end
 
-  #     refute_nil storage_client.bucket bucket_name
+      refute_nil storage_client.bucket bucket_name
 
-  #     # create_bucket_class_location
+      # create_bucket_class_location
 
-  #     secondary_bucket_name = random_bucket_name
-  #     location = "ASIA"
-  #     storage_class = "COLDLINE"
-  #     refute storage_client.bucket secondary_bucket_name
+      secondary_bucket_name = random_bucket_name
+      location = "ASIA"
+      storage_class = "COLDLINE"
+      refute storage_client.bucket secondary_bucket_name
 
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-  #         create_bucket_class_location bucket_name: secondary_bucket_name
-  #       end
-  #     end
+      retry_resource_exhaustion do
+        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+          create_bucket_class_location bucket_name: secondary_bucket_name
+        end
+      end
 
-  #     secondary_bucket = storage_client.bucket secondary_bucket_name
-  #     refute_nil secondary_bucket
-  #     assert_equal location, secondary_bucket.location
-  #     assert_equal storage_class, secondary_bucket.storage_class
+      secondary_bucket = storage_client.bucket secondary_bucket_name
+      refute_nil secondary_bucket
+      assert_equal location, secondary_bucket.location
+      assert_equal storage_class, secondary_bucket.storage_class
 
-  #     # list_buckets
-  #     out, _err = capture_io do
-  #       list_buckets
-  #     end
+      # list_buckets
+      out, _err = capture_io do
+        list_buckets
+      end
 
-  #     assert_includes out, "ruby-storage-samples-"
+      assert_includes out, "ruby-storage-samples-"
 
-  #     # get_bucket_metadata
-  #     out, _err = capture_io do
-  #       get_bucket_metadata bucket_name: bucket_name
-  #     end
+      # get_bucket_metadata
+      out, _err = capture_io do
+        get_bucket_metadata bucket_name: bucket_name
+      end
 
-  #     assert_includes out, bucket_name
+      assert_includes out, bucket_name
 
-  #     # delete_bucket
-  #     assert_output "Deleted bucket: #{bucket_name}\n" do
-  #       delete_bucket bucket_name: bucket_name
-  #     end
+      # delete_bucket
+      assert_output "Deleted bucket: #{bucket_name}\n" do
+        delete_bucket bucket_name: bucket_name
+      end
 
 
-  #     refute storage_client.bucket bucket_name
+      refute storage_client.bucket bucket_name
 
-  #     delete_bucket_helper bucket_name
-  #     delete_bucket_helper secondary_bucket_name
-  #   end
-  # end
+      delete_bucket_helper bucket_name
+      delete_bucket_helper secondary_bucket_name
+    end
+  end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
+    let(:new_bucket) { storage_client.create_bucket new_bucket_name}
+    let(:new_generation) {new_bucket.generation}
+    before do
+      delete_bucket_helper new_bucket.name
+    end
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
+      # fetching a soft deleted bucket
+      output, _err = capture_io do
+        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+      end
+      assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+    end
 
-      new_bucket = storage_client.create_bucket new_bucket_name
-      new_generation = new_bucket.generation
-      soft_delete_policy = Google::Apis::StorageV1::Bucket::SoftDeletePolicy.new
-      soft_delete_policy.retention_duration_seconds = 864_000
-      new_bucket.soft_delete_policy = soft_delete_policy
-      puts storage_client.service_account_email
+    it "lists soft deleted buckets" do
+      # fetching list of soft deleted buckets
+      list_deleted_bucket, _err = capture_io do
+        list_soft_deleted_buckets
+      end
+      assert_includes list_deleted_bucket, new_bucket_name
+    end
 
-      # ensuring bucket is created
-      assert new_bucket.exists?, "Bucket #{new_bucket_name} should exist"
+  end
 
-      # fetching bucket
-      check_bucket = storage_client.bucket new_bucket_name
-      puts "new bucket soft_delete_policy-- #{check_bucket}"
-      puts "new bucket soft_delete_policy-- #{check_bucket.soft_delete_policy}"
-      _(check_bucket.soft_delete_policy.retention_duration_seconds).must_equal 864_000
-       new_bucket.delete
+  describe "storage_create_bucket_dual_region" do
+    it "creates dual region bucket" do
+      location = "US"
+      region_1 = "US-EAST1"
+      region_2 = "US-WEST1"
+      location_type = "dual-region"
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Bucket #{bucket_name} created:\n"
+      expected += "- location: #{location}\n"
+      expected += "- location_type: #{location_type}\n"
+      expected += "- custom_placement_config:\n"
+      expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+                                                                              region_1: region_1,
+                                                                              region_2: region_2
+        end
+      end
 
-      # Check if the bucket is deleted
-      deleted_bucket = storage_client.bucket new_bucket_name
-      refute deleted_bucket, "Bucket #{new_bucket_name} should not exist"
+      refute_nil storage_client.bucket bucket_name
 
-      # fetching a soft deleted bucket
-      output, _err = capture_io do
-        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "storage_create_bucket_hierarchical_namespace" do
+    it "creates hierarchical namespace enabled bucket" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_hierarchical_namespace bucket_name: bucket_name
+        end
       end
-      assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+
+      refute_nil storage_client.bucket bucket_name
+
+      delete_bucket_helper bucket_name
     end
+  end
+
+  describe "storage_create_bucket_with_object_retention" do
+    it "creates a bucket with object retention enabled." do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_with_object_retention bucket_name: bucket_name
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
 
-    # it "lists soft deleted buckets" do
-    #   list_deleted_bucket, _err = capture_io do
-    #     list_soft_deleted_buckets
-    #   end
-    #   assert list_deleted_bucket, "List of soft deleted bucket should not be blank"
-    # end
+      file_name = "test_object_retention"
+
+      bucket = storage_client.bucket bucket_name
+
+      out, _err = capture_io do
+        set_object_retention_policy bucket_name: bucket.name,
+                                    content: "hello world",
+                                    destination_file_name: file_name
+      end
+
+      assert_includes out, "Retention policy for file #{file_name}"
+
+      file = bucket.file file_name
+      file.retention = {
+        mode: nil,
+        retain_until_time: nil,
+        override_unlocked_retention: true
+      }
+      delete_bucket_helper bucket_name
+    end
   end
 
-  # describe "storage_create_bucket_dual_region" do
-  #   it "creates dual region bucket" do
-  #     location = "US"
-  #     region_1 = "US-EAST1"
-  #     region_2 = "US-WEST1"
-  #     location_type = "dual-region"
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Bucket #{bucket_name} created:\n"
-  #     expected += "- location: #{location}\n"
-  #     expected += "- location_type: #{location_type}\n"
-  #     expected += "- custom_placement_config:\n"
-  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-  #                                                                             region_1: region_1,
-  #                                                                             region_2: region_2
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_hierarchical_namespace" do
-  #   it "creates hierarchical namespace enabled bucket" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_with_object_retention" do
-  #   it "creates a bucket with object retention enabled." do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_with_object_retention bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     file_name = "test_object_retention"
-
-  #     bucket = storage_client.bucket bucket_name
-
-  #     out, _err = capture_io do
-  #       set_object_retention_policy bucket_name: bucket.name,
-  #                                   content: "hello world",
-  #                                   destination_file_name: file_name
-  #     end
-
-  #     assert_includes out, "Retention policy for file #{file_name}"
-
-  #     file = bucket.file file_name
-  #     file.retention = {
-  #       mode: nil,
-  #       retain_until_time: nil,
-  #       override_unlocked_retention: true
-  #     }
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "autoclass" do
-  #   it "get_autoclass, set_autoclass" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-  #     assert_output(/autoclass config set to true./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-  #     end
-
-  #     assert_output(/autoclass config set to false./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: false
-  #     end
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "cors" do
-  #   it "cors_configuration, remove_cors_configuration" do
-  #     bucket.cors { |c| c.clear }
-  #     assert bucket.cors.empty?
-
-  #     # cors_configuration
-  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-  #       cors_configuration bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal 1, bucket.cors.count
-  #     rule = bucket.cors.first
-  #     assert_equal ["*"], rule.origin
-  #     assert_equal ["PUT", "POST"], rule.methods
-  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-  #     assert_equal 3600, rule.max_age
-
-  #     # remove_cors_configuration
-  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-  #       remove_cors_configuration bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.cors.empty?
-  #   end
-  # end
-
-  # describe "requester_pays" do
-  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-  #     # enable_requester_pays
-  #     bucket.requester_pays = false
-
-  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-  #       enable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     assert bucket.requester_pays?
-
-  #     # disable_requester_pays
-  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-  #       disable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     refute bucket.requester_pays?
-  #   end
-  # end
-
-  # describe "uniform_bucket_level_access" do
-  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-  #     # enable_uniform_bucket_level_access
-  #     bucket.uniform_bucket_level_access = false
-
-  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-  #       enable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # disable_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-  #       disable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     bucket.uniform_bucket_level_access = false
-  #   end
-  # end
-
-  # describe "default Cloud KMS encryption key" do
-  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-  #     refute bucket.default_kms_key
-
-  #     # set_bucket_default_kms_key
-  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-  #       set_bucket_default_kms_key bucket_name:     bucket.name,
-  #                                  default_kms_key: kms_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.default_kms_key, kms_key
-
-  #     # bucket_delete_default_kms_key
-  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
-  #       bucket_delete_default_kms_key bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_kms_key
-  #   end
-  # end
-
-  # describe "get bucket class and location data" do
-  #   bucket_name = random_bucket_name
-  #   location = "US"
-  #   storage_class = "COLDLINE"
-
-  #   it "get_bucket_class_and_location" do
-  #     storage_client.create_bucket bucket_name,
-  #                                  location: location,
-  #                                  storage_class: storage_class
-  #     expected_output = "Bucket #{bucket_name} storage class is " \
-  #                       "#{storage_class}, and the location is #{location}\n"
-  #     assert_output expected_output do
-  #       get_bucket_class_and_location bucket_name: bucket_name
-  #     end
-  #   end
-  # end
-
-  # describe "labels" do
-  #   it "add_bucket_label, remove_bucket_label" do
-  #     # add_bucket_label
-  #     label_key = "label_key"
-  #     label_value = "label_value"
-
-  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-  #       add_bucket_label bucket_name: bucket.name,
-  #                        label_value: label_value,
-  #                        label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.labels[label_key], label_value
-
-  #     # remove_bucket_label
-  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-  #       remove_bucket_label bucket_name: bucket.name,
-  #                           label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.labels[label_key].empty?
-  #   end
-  # end
-
-  # describe "lifecycle management" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-  #     # enable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       enable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is enabled"
-
-  #     # disable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       disable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is disabled"
-  #   end
-  # end
-
-  # describe "retention policy" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-  #     # set_retention_policy
-  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-  #       set_retention_policy bucket_name:      bucket.name,
-  #                            retention_period: retention_period
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.retention_period, retention_period
-
-  #     # get_retention_policy
-  #     out, _err = capture_io do
-  #       get_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "period: #{retention_period}\n"
-
-  #     # remove_retention_policy
-  #     assert_equal bucket.retention_period, retention_period
-  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.retention_period
-
-  #     # lock_retention_policy
-  #     bucket.retention_period = retention_period
-  #     out, _err = capture_io do
-  #       lock_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
-  #     bucket.refresh!
-  #     assert bucket.retention_policy_locked?
-
-  #     # remove_retention_policy
-  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "default_event_based_hold" do
-  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-  #     # enable_default_event_based_hold
-  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-  #       enable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     # disable_default_event_based_hold
-  #     bucket.update do |b|
-  #       b.default_event_based_hold = true
-  #     end
-
-  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-  #       disable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "storage_class" do
-  #   it "change_default_storage_class" do
-  #     assert_equal "STANDARD", bucket.storage_class
-
-  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-  #       change_default_storage_class bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal "COLDLINE", bucket.storage_class
-  #     # teardown
-  #     bucket.storage_class = "STANDARD"
-  #   end
-  # end
-
-  # describe "versioning" do
-  #   it "enable_versioning, disable_versioning" do
-  #     # enable_versioning
-  #     bucket.versioning = false
-
-  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-  #       enable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.versioning?
-
-  #     # disable_versioning
-  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-  #       disable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.versioning?
-  #   end
-  # end
-
-  # describe "website_configuration" do
-  #   let(:main_page_suffix) { "index.html" }
-  #   let(:not_found_page) { "404.html" }
-
-  #   it "define_bucket_website_configuration" do
-  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-  #                    "and #{not_found_page} as the 404 page\n"
-
-  #     assert_output expected_out do
-  #       define_bucket_website_configuration bucket_name:      bucket.name,
-  #                                           main_page_suffix: main_page_suffix,
-  #                                           not_found_page:   not_found_page
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal main_page_suffix, bucket.website_main
-  #     assert_equal not_found_page, bucket.website_404
-  #   end
-  # end
-
-  # describe "public_access_prevention" do
-  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-  #      "set_public_access_prevention_inherited" do
-  #     bucket.public_access_prevention = :inherited
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-
-  #     # set_public_access_prevention_enforced
-  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-  #       set_public_access_prevention_enforced bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # get_public_access_prevention
-  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-  #       get_public_access_prevention bucket_name: bucket.name
-  #     end
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # set_public_access_prevention_inherited
-  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-  #       set_public_access_prevention_inherited bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-  #     bucket.public_access_prevention = :inherited
-  #   end
-  # end
-
-  # describe "storage move file" do
-  #   let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
-  #   let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
-  #   let :hns_bucket do
-  #     hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
-  #     storage_client.create_bucket random_bucket_name do |b|
-  #       b.uniform_bucket_level_access = true
-  #       b.hierarchical_namespace = hierarchical_namespace
-  #     end
-  #   end
-  #   let :create_source_file do
-  #     file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
-  #     file = StringIO.new file_content
-  #     hns_bucket.create_file file, source_file
-  #   end
-  #   it "file is moved and old file is deleted" do
-  #     create_source_file
-  #     out, _err = capture_io do
-  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
-  #     end
-  #     assert_includes out, "New File #{destination_file} created\n"
-  #     refute_nil(hns_bucket.file(destination_file))
-  #     assert_nil(hns_bucket.file(source_file))
-  #   end
-
-  #   it "raises error if source and destination are having same filename" do
-  #     create_source_file
-  #     exception = assert_raises Google::Cloud::InvalidArgumentError do
-  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
-  #     end
-  #     assert_equal "invalid: Source and destination object names must be different.", exception.message
-  #   end
-  # end
+  describe "autoclass" do
+    it "get_autoclass, set_autoclass" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+      assert_output(/autoclass config set to true./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to NEARLINE./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+      end
+
+      assert_output(/autoclass config set to false./) do
+        set_autoclass bucket_name: bucket_name, toggle: false
+      end
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "cors" do
+    it "cors_configuration, remove_cors_configuration" do
+      bucket.cors { |c| c.clear }
+      assert bucket.cors.empty?
+
+      # cors_configuration
+      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+        cors_configuration bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert_equal 1, bucket.cors.count
+      rule = bucket.cors.first
+      assert_equal ["*"], rule.origin
+      assert_equal ["PUT", "POST"], rule.methods
+      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+      assert_equal 3600, rule.max_age
+
+      # remove_cors_configuration
+      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+        remove_cors_configuration bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.cors.empty?
+    end
+  end
+
+  describe "requester_pays" do
+    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+      # enable_requester_pays
+      bucket.requester_pays = false
+
+      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+        enable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      assert bucket.requester_pays?
+
+      # disable_requester_pays
+      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+        disable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      refute bucket.requester_pays?
+    end
+  end
+
+  describe "uniform_bucket_level_access" do
+    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+      # enable_uniform_bucket_level_access
+      bucket.uniform_bucket_level_access = false
+
+      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+        enable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      assert bucket.uniform_bucket_level_access?
+
+      # disable_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+        disable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      refute bucket.uniform_bucket_level_access?
+
+      bucket.uniform_bucket_level_access = false
+    end
+  end
+
+  describe "default Cloud KMS encryption key" do
+    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+      refute bucket.default_kms_key
+
+      # set_bucket_default_kms_key
+      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+        set_bucket_default_kms_key bucket_name:     bucket.name,
+                                   default_kms_key: kms_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.default_kms_key, kms_key
+
+      # bucket_delete_default_kms_key
+      assert_output "Default KMS key was removed from #{bucket.name}\n" do
+        bucket_delete_default_kms_key bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_kms_key
+    end
+  end
+
+  describe "get bucket class and location data" do
+    bucket_name = random_bucket_name
+    location = "US"
+    storage_class = "COLDLINE"
+
+    it "get_bucket_class_and_location" do
+      storage_client.create_bucket bucket_name,
+                                   location: location,
+                                   storage_class: storage_class
+      expected_output = "Bucket #{bucket_name} storage class is " \
+                        "#{storage_class}, and the location is #{location}\n"
+      assert_output expected_output do
+        get_bucket_class_and_location bucket_name: bucket_name
+      end
+    end
+  end
+
+  describe "labels" do
+    it "add_bucket_label, remove_bucket_label" do
+      # add_bucket_label
+      label_key = "label_key"
+      label_value = "label_value"
+
+      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+        add_bucket_label bucket_name: bucket.name,
+                         label_value: label_value,
+                         label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.labels[label_key], label_value
+
+      # remove_bucket_label
+      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+        remove_bucket_label bucket_name: bucket.name,
+                            label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert bucket.labels[label_key].empty?
+    end
+  end
+
+  describe "lifecycle management" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+      # enable_bucket_lifecycle_management
+      out, _err = capture_io do
+        enable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is enabled"
+
+      # disable_bucket_lifecycle_management
+      out, _err = capture_io do
+        disable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is disabled"
+    end
+  end
+
+  describe "retention policy" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+      # set_retention_policy
+      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+        set_retention_policy bucket_name:      bucket.name,
+                             retention_period: retention_period
+      end
+
+      bucket.refresh!
+      assert_equal bucket.retention_period, retention_period
+
+      # get_retention_policy
+      out, _err = capture_io do
+        get_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "period: #{retention_period}\n"
+
+      # remove_retention_policy
+      assert_equal bucket.retention_period, retention_period
+      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.retention_period
+
+      # lock_retention_policy
+      bucket.retention_period = retention_period
+      out, _err = capture_io do
+        lock_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "Retention policy for #{bucket.name} is now locked."
+      bucket.refresh!
+      assert bucket.retention_policy_locked?
+
+      # remove_retention_policy
+      assert_output "Policy is locked and retention policy can't be removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "default_event_based_hold" do
+    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+      # enable_default_event_based_hold
+      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+        enable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+
+      # disable_default_event_based_hold
+      bucket.update do |b|
+        b.default_event_based_hold = true
+      end
+
+      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+        disable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "storage_class" do
+    it "change_default_storage_class" do
+      assert_equal "STANDARD", bucket.storage_class
+
+      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+        change_default_storage_class bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert_equal "COLDLINE", bucket.storage_class
+      # teardown
+      bucket.storage_class = "STANDARD"
+    end
+  end
+
+  describe "versioning" do
+    it "enable_versioning, disable_versioning" do
+      # enable_versioning
+      bucket.versioning = false
+
+      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+        enable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.versioning?
+
+      # disable_versioning
+      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+        disable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.versioning?
+    end
+  end
+
+  describe "website_configuration" do
+    let(:main_page_suffix) { "index.html" }
+    let(:not_found_page) { "404.html" }
+
+    it "define_bucket_website_configuration" do
+      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+                     "and #{not_found_page} as the 404 page\n"
+
+      assert_output expected_out do
+        define_bucket_website_configuration bucket_name:      bucket.name,
+                                            main_page_suffix: main_page_suffix,
+                                            not_found_page:   not_found_page
+      end
+
+      bucket.refresh!
+      assert_equal main_page_suffix, bucket.website_main
+      assert_equal not_found_page, bucket.website_404
+    end
+  end
+
+  describe "public_access_prevention" do
+    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+       "set_public_access_prevention_inherited" do
+      bucket.public_access_prevention = :inherited
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+
+      # set_public_access_prevention_enforced
+      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+        set_public_access_prevention_enforced bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # get_public_access_prevention
+      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+        get_public_access_prevention bucket_name: bucket.name
+      end
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # set_public_access_prevention_inherited
+      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+        set_public_access_prevention_inherited bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+      bucket.public_access_prevention = :inherited
+    end
+  end
+
+  describe "storage move file" do
+    let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
+    let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
+    let :hns_bucket do
+      hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
+      storage_client.create_bucket random_bucket_name do |b|
+        b.uniform_bucket_level_access = true
+        b.hierarchical_namespace = hierarchical_namespace
+      end
+    end
+    let :create_source_file do
+      file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
+      file = StringIO.new file_content
+      hns_bucket.create_file file, source_file
+    end
+    it "file is moved and old file is deleted" do
+      create_source_file
+      out, _err = capture_io do
+        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
+      end
+      assert_includes out, "New File #{destination_file} created\n"
+      refute_nil(hns_bucket.file(destination_file))
+      assert_nil(hns_bucket.file(source_file))
+    end
+
+    it "raises error if source and destination are having same filename" do
+      create_source_file
+      exception = assert_raises Google::Cloud::InvalidArgumentError do
+        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
+      end
+      assert_equal "invalid: Source and destination object names must be different.", exception.message
+    end
+  end
 end
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index c297418674b0..fa89df04df5e 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -39,6 +39,7 @@
 
   it "restores a soft deleted bucket" do
     delete_bucket_helper bucket.name
+    # restoring deleted bucket
     _out, _err = capture_io do
       restore_bucket bucket_name: bucket.name, generation: generation
     end
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 5bf24dee2f60..b5ed6c743e19 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -27,7 +27,6 @@ def get_soft_deleted_bucket bucket_name:, generation:
 
   soft_delete_time = deleted_bucket_fetch.soft_delete_time
   hard_delete_time = deleted_bucket_fetch.hard_delete_time
-  Google::Apis.logger.level = Logger::DEBUG
 
   if (soft_delete_time && hard_delete_time).nil?
     puts "Not Found"

From 1b45f8198f5f66deb96d1b3ef93184abdaf175f6 Mon Sep 17 00:00:00 2001
From: Shubhangi singh <shubhangisin@google.com>
Date: Wed, 21 May 2025 05:59:10 +0000
Subject: [PATCH 076/100] fix linnt issue

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 587ee228618c..5f5089740501 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -124,8 +124,8 @@
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
-    let(:new_bucket) { storage_client.create_bucket new_bucket_name}
-    let(:new_generation) {new_bucket.generation}
+    let(:new_bucket) { storage_client.create_bucket new_bucket_name }
+    let(:new_generation) { new_bucket.generation }
     before do
       delete_bucket_helper new_bucket.name
     end
@@ -145,7 +145,6 @@
       end
       assert_includes list_deleted_bucket, new_bucket_name
     end
-
   end
 
   describe "storage_create_bucket_dual_region" do

From 1c501a541cef5228e416390c3671346c73a0aec7 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 14 Jul 2025 12:13:21 +0000
Subject: [PATCH 077/100] wip

---
 .../samples/acceptance/buckets_test.rb        | 1090 +++++++++--------
 .../storage_get_soft_deleted_bucket.rb        |    2 +
 2 files changed, 548 insertions(+), 544 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 5f5089740501..aef2cf71ab65 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -63,64 +63,64 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  describe "bucket lifecycle" do
-    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-      # create_bucket
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      retry_resource_exhaustion do
-        assert_output "Created bucket: #{bucket_name}\n" do
-          create_bucket bucket_name: bucket_name
-        end
-      end
+  # describe "bucket lifecycle" do
+  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+  #     # create_bucket
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
 
-      refute_nil storage_client.bucket bucket_name
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket: #{bucket_name}\n" do
+  #         create_bucket bucket_name: bucket_name
+  #       end
+  #     end
 
-      # create_bucket_class_location
+  #     refute_nil storage_client.bucket bucket_name
 
-      secondary_bucket_name = random_bucket_name
-      location = "ASIA"
-      storage_class = "COLDLINE"
-      refute storage_client.bucket secondary_bucket_name
+  #     # create_bucket_class_location
 
-      retry_resource_exhaustion do
-        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-          create_bucket_class_location bucket_name: secondary_bucket_name
-        end
-      end
+  #     secondary_bucket_name = random_bucket_name
+  #     location = "ASIA"
+  #     storage_class = "COLDLINE"
+  #     refute storage_client.bucket secondary_bucket_name
 
-      secondary_bucket = storage_client.bucket secondary_bucket_name
-      refute_nil secondary_bucket
-      assert_equal location, secondary_bucket.location
-      assert_equal storage_class, secondary_bucket.storage_class
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+  #         create_bucket_class_location bucket_name: secondary_bucket_name
+  #       end
+  #     end
 
-      # list_buckets
-      out, _err = capture_io do
-        list_buckets
-      end
+  #     secondary_bucket = storage_client.bucket secondary_bucket_name
+  #     refute_nil secondary_bucket
+  #     assert_equal location, secondary_bucket.location
+  #     assert_equal storage_class, secondary_bucket.storage_class
 
-      assert_includes out, "ruby-storage-samples-"
+  #     # list_buckets
+  #     out, _err = capture_io do
+  #       list_buckets
+  #     end
 
-      # get_bucket_metadata
-      out, _err = capture_io do
-        get_bucket_metadata bucket_name: bucket_name
-      end
+  #     assert_includes out, "ruby-storage-samples-"
 
-      assert_includes out, bucket_name
+  #     # get_bucket_metadata
+  #     out, _err = capture_io do
+  #       get_bucket_metadata bucket_name: bucket_name
+  #     end
 
-      # delete_bucket
-      assert_output "Deleted bucket: #{bucket_name}\n" do
-        delete_bucket bucket_name: bucket_name
-      end
+  #     assert_includes out, bucket_name
 
+  #     # delete_bucket
+  #     assert_output "Deleted bucket: #{bucket_name}\n" do
+  #       delete_bucket bucket_name: bucket_name
+  #     end
 
-      refute storage_client.bucket bucket_name
 
-      delete_bucket_helper bucket_name
-      delete_bucket_helper secondary_bucket_name
-    end
-  end
+  #     refute storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #     delete_bucket_helper secondary_bucket_name
+  #   end
+  # end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
@@ -132,10 +132,12 @@
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       # fetching a soft deleted bucket
-      output, _err = capture_io do
+      # output, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      end
-      assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+      # end
+      puts "project_name while bucket creation"
+      puts new_bucket.service.project
+      # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
     end
 
     it "lists soft deleted buckets" do
@@ -147,500 +149,500 @@
     end
   end
 
-  describe "storage_create_bucket_dual_region" do
-    it "creates dual region bucket" do
-      location = "US"
-      region_1 = "US-EAST1"
-      region_2 = "US-WEST1"
-      location_type = "dual-region"
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Bucket #{bucket_name} created:\n"
-      expected += "- location: #{location}\n"
-      expected += "- location_type: #{location_type}\n"
-      expected += "- custom_placement_config:\n"
-      expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-                                                                              region_1: region_1,
-                                                                              region_2: region_2
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_hierarchical_namespace" do
-    it "creates hierarchical namespace enabled bucket" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_hierarchical_namespace bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_with_object_retention" do
-    it "creates a bucket with object retention enabled." do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_with_object_retention bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      file_name = "test_object_retention"
-
-      bucket = storage_client.bucket bucket_name
-
-      out, _err = capture_io do
-        set_object_retention_policy bucket_name: bucket.name,
-                                    content: "hello world",
-                                    destination_file_name: file_name
-      end
-
-      assert_includes out, "Retention policy for file #{file_name}"
-
-      file = bucket.file file_name
-      file.retention = {
-        mode: nil,
-        retain_until_time: nil,
-        override_unlocked_retention: true
-      }
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "autoclass" do
-    it "get_autoclass, set_autoclass" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-      assert_output(/autoclass config set to true./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to NEARLINE./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-      end
-
-      assert_output(/autoclass config set to false./) do
-        set_autoclass bucket_name: bucket_name, toggle: false
-      end
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "cors" do
-    it "cors_configuration, remove_cors_configuration" do
-      bucket.cors { |c| c.clear }
-      assert bucket.cors.empty?
-
-      # cors_configuration
-      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-        cors_configuration bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal 1, bucket.cors.count
-      rule = bucket.cors.first
-      assert_equal ["*"], rule.origin
-      assert_equal ["PUT", "POST"], rule.methods
-      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-      assert_equal 3600, rule.max_age
-
-      # remove_cors_configuration
-      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-        remove_cors_configuration bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.cors.empty?
-    end
-  end
-
-  describe "requester_pays" do
-    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-      # enable_requester_pays
-      bucket.requester_pays = false
-
-      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-        enable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      assert bucket.requester_pays?
-
-      # disable_requester_pays
-      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-        disable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      refute bucket.requester_pays?
-    end
-  end
-
-  describe "uniform_bucket_level_access" do
-    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-      # enable_uniform_bucket_level_access
-      bucket.uniform_bucket_level_access = false
-
-      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-        enable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      assert bucket.uniform_bucket_level_access?
-
-      # disable_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-        disable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      refute bucket.uniform_bucket_level_access?
-
-      bucket.uniform_bucket_level_access = false
-    end
-  end
-
-  describe "default Cloud KMS encryption key" do
-    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-      refute bucket.default_kms_key
-
-      # set_bucket_default_kms_key
-      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-        set_bucket_default_kms_key bucket_name:     bucket.name,
-                                   default_kms_key: kms_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.default_kms_key, kms_key
-
-      # bucket_delete_default_kms_key
-      assert_output "Default KMS key was removed from #{bucket.name}\n" do
-        bucket_delete_default_kms_key bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_kms_key
-    end
-  end
-
-  describe "get bucket class and location data" do
-    bucket_name = random_bucket_name
-    location = "US"
-    storage_class = "COLDLINE"
-
-    it "get_bucket_class_and_location" do
-      storage_client.create_bucket bucket_name,
-                                   location: location,
-                                   storage_class: storage_class
-      expected_output = "Bucket #{bucket_name} storage class is " \
-                        "#{storage_class}, and the location is #{location}\n"
-      assert_output expected_output do
-        get_bucket_class_and_location bucket_name: bucket_name
-      end
-    end
-  end
-
-  describe "labels" do
-    it "add_bucket_label, remove_bucket_label" do
-      # add_bucket_label
-      label_key = "label_key"
-      label_value = "label_value"
-
-      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-        add_bucket_label bucket_name: bucket.name,
-                         label_value: label_value,
-                         label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.labels[label_key], label_value
-
-      # remove_bucket_label
-      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-        remove_bucket_label bucket_name: bucket.name,
-                            label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert bucket.labels[label_key].empty?
-    end
-  end
-
-  describe "lifecycle management" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-      # enable_bucket_lifecycle_management
-      out, _err = capture_io do
-        enable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is enabled"
-
-      # disable_bucket_lifecycle_management
-      out, _err = capture_io do
-        disable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is disabled"
-    end
-  end
-
-  describe "retention policy" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-      # set_retention_policy
-      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-        set_retention_policy bucket_name:      bucket.name,
-                             retention_period: retention_period
-      end
-
-      bucket.refresh!
-      assert_equal bucket.retention_period, retention_period
-
-      # get_retention_policy
-      out, _err = capture_io do
-        get_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "period: #{retention_period}\n"
-
-      # remove_retention_policy
-      assert_equal bucket.retention_period, retention_period
-      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.retention_period
-
-      # lock_retention_policy
-      bucket.retention_period = retention_period
-      out, _err = capture_io do
-        lock_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "Retention policy for #{bucket.name} is now locked."
-      bucket.refresh!
-      assert bucket.retention_policy_locked?
-
-      # remove_retention_policy
-      assert_output "Policy is locked and retention policy can't be removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "default_event_based_hold" do
-    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-      # enable_default_event_based_hold
-      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-        enable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-
-      # disable_default_event_based_hold
-      bucket.update do |b|
-        b.default_event_based_hold = true
-      end
-
-      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-        disable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "storage_class" do
-    it "change_default_storage_class" do
-      assert_equal "STANDARD", bucket.storage_class
-
-      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-        change_default_storage_class bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal "COLDLINE", bucket.storage_class
-      # teardown
-      bucket.storage_class = "STANDARD"
-    end
-  end
-
-  describe "versioning" do
-    it "enable_versioning, disable_versioning" do
-      # enable_versioning
-      bucket.versioning = false
-
-      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-        enable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.versioning?
-
-      # disable_versioning
-      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-        disable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.versioning?
-    end
-  end
-
-  describe "website_configuration" do
-    let(:main_page_suffix) { "index.html" }
-    let(:not_found_page) { "404.html" }
-
-    it "define_bucket_website_configuration" do
-      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-                     "and #{not_found_page} as the 404 page\n"
-
-      assert_output expected_out do
-        define_bucket_website_configuration bucket_name:      bucket.name,
-                                            main_page_suffix: main_page_suffix,
-                                            not_found_page:   not_found_page
-      end
-
-      bucket.refresh!
-      assert_equal main_page_suffix, bucket.website_main
-      assert_equal not_found_page, bucket.website_404
-    end
-  end
-
-  describe "public_access_prevention" do
-    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-       "set_public_access_prevention_inherited" do
-      bucket.public_access_prevention = :inherited
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-
-      # set_public_access_prevention_enforced
-      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-        set_public_access_prevention_enforced bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # get_public_access_prevention
-      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-        get_public_access_prevention bucket_name: bucket.name
-      end
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # set_public_access_prevention_inherited
-      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-        set_public_access_prevention_inherited bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-      bucket.public_access_prevention = :inherited
-    end
-  end
-
-  describe "storage move file" do
-    let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
-    let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
-    let :hns_bucket do
-      hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
-      storage_client.create_bucket random_bucket_name do |b|
-        b.uniform_bucket_level_access = true
-        b.hierarchical_namespace = hierarchical_namespace
-      end
-    end
-    let :create_source_file do
-      file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
-      file = StringIO.new file_content
-      hns_bucket.create_file file, source_file
-    end
-    it "file is moved and old file is deleted" do
-      create_source_file
-      out, _err = capture_io do
-        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
-      end
-      assert_includes out, "New File #{destination_file} created\n"
-      refute_nil(hns_bucket.file(destination_file))
-      assert_nil(hns_bucket.file(source_file))
-    end
-
-    it "raises error if source and destination are having same filename" do
-      create_source_file
-      exception = assert_raises Google::Cloud::InvalidArgumentError do
-        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
-      end
-      assert_equal "invalid: Source and destination object names must be different.", exception.message
-    end
-  end
+  # describe "storage_create_bucket_dual_region" do
+  #   it "creates dual region bucket" do
+  #     location = "US"
+  #     region_1 = "US-EAST1"
+  #     region_2 = "US-WEST1"
+  #     location_type = "dual-region"
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Bucket #{bucket_name} created:\n"
+  #     expected += "- location: #{location}\n"
+  #     expected += "- location_type: #{location_type}\n"
+  #     expected += "- custom_placement_config:\n"
+  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+  #                                                                             region_1: region_1,
+  #                                                                             region_2: region_2
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_hierarchical_namespace" do
+  #   it "creates hierarchical namespace enabled bucket" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_with_object_retention" do
+  #   it "creates a bucket with object retention enabled." do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_with_object_retention bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     file_name = "test_object_retention"
+
+  #     bucket = storage_client.bucket bucket_name
+
+  #     out, _err = capture_io do
+  #       set_object_retention_policy bucket_name: bucket.name,
+  #                                   content: "hello world",
+  #                                   destination_file_name: file_name
+  #     end
+
+  #     assert_includes out, "Retention policy for file #{file_name}"
+
+  #     file = bucket.file file_name
+  #     file.retention = {
+  #       mode: nil,
+  #       retain_until_time: nil,
+  #       override_unlocked_retention: true
+  #     }
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "autoclass" do
+  #   it "get_autoclass, set_autoclass" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+  #     assert_output(/autoclass config set to true./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+  #     end
+
+  #     assert_output(/autoclass config set to false./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: false
+  #     end
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "cors" do
+  #   it "cors_configuration, remove_cors_configuration" do
+  #     bucket.cors { |c| c.clear }
+  #     assert bucket.cors.empty?
+
+  #     # cors_configuration
+  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+  #       cors_configuration bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal 1, bucket.cors.count
+  #     rule = bucket.cors.first
+  #     assert_equal ["*"], rule.origin
+  #     assert_equal ["PUT", "POST"], rule.methods
+  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+  #     assert_equal 3600, rule.max_age
+
+  #     # remove_cors_configuration
+  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+  #       remove_cors_configuration bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.cors.empty?
+  #   end
+  # end
+
+  # describe "requester_pays" do
+  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+  #     # enable_requester_pays
+  #     bucket.requester_pays = false
+
+  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+  #       enable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     assert bucket.requester_pays?
+
+  #     # disable_requester_pays
+  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+  #       disable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     refute bucket.requester_pays?
+  #   end
+  # end
+
+  # describe "uniform_bucket_level_access" do
+  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+  #     # enable_uniform_bucket_level_access
+  #     bucket.uniform_bucket_level_access = false
+
+  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+  #       enable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # disable_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+  #       disable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     bucket.uniform_bucket_level_access = false
+  #   end
+  # end
+
+  # describe "default Cloud KMS encryption key" do
+  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+  #     refute bucket.default_kms_key
+
+  #     # set_bucket_default_kms_key
+  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+  #       set_bucket_default_kms_key bucket_name:     bucket.name,
+  #                                  default_kms_key: kms_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.default_kms_key, kms_key
+
+  #     # bucket_delete_default_kms_key
+  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
+  #       bucket_delete_default_kms_key bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_kms_key
+  #   end
+  # end
+
+  # describe "get bucket class and location data" do
+  #   bucket_name = random_bucket_name
+  #   location = "US"
+  #   storage_class = "COLDLINE"
+
+  #   it "get_bucket_class_and_location" do
+  #     storage_client.create_bucket bucket_name,
+  #                                  location: location,
+  #                                  storage_class: storage_class
+  #     expected_output = "Bucket #{bucket_name} storage class is " \
+  #                       "#{storage_class}, and the location is #{location}\n"
+  #     assert_output expected_output do
+  #       get_bucket_class_and_location bucket_name: bucket_name
+  #     end
+  #   end
+  # end
+
+  # describe "labels" do
+  #   it "add_bucket_label, remove_bucket_label" do
+  #     # add_bucket_label
+  #     label_key = "label_key"
+  #     label_value = "label_value"
+
+  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+  #       add_bucket_label bucket_name: bucket.name,
+  #                        label_value: label_value,
+  #                        label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.labels[label_key], label_value
+
+  #     # remove_bucket_label
+  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+  #       remove_bucket_label bucket_name: bucket.name,
+  #                           label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.labels[label_key].empty?
+  #   end
+  # end
+
+  # describe "lifecycle management" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+  #     # enable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       enable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is enabled"
+
+  #     # disable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       disable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is disabled"
+  #   end
+  # end
+
+  # describe "retention policy" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+  #     # set_retention_policy
+  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+  #       set_retention_policy bucket_name:      bucket.name,
+  #                            retention_period: retention_period
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.retention_period, retention_period
+
+  #     # get_retention_policy
+  #     out, _err = capture_io do
+  #       get_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "period: #{retention_period}\n"
+
+  #     # remove_retention_policy
+  #     assert_equal bucket.retention_period, retention_period
+  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.retention_period
+
+  #     # lock_retention_policy
+  #     bucket.retention_period = retention_period
+  #     out, _err = capture_io do
+  #       lock_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
+  #     bucket.refresh!
+  #     assert bucket.retention_policy_locked?
+
+  #     # remove_retention_policy
+  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "default_event_based_hold" do
+  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+  #     # enable_default_event_based_hold
+  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+  #       enable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     # disable_default_event_based_hold
+  #     bucket.update do |b|
+  #       b.default_event_based_hold = true
+  #     end
+
+  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+  #       disable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "storage_class" do
+  #   it "change_default_storage_class" do
+  #     assert_equal "STANDARD", bucket.storage_class
+
+  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+  #       change_default_storage_class bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal "COLDLINE", bucket.storage_class
+  #     # teardown
+  #     bucket.storage_class = "STANDARD"
+  #   end
+  # end
+
+  # describe "versioning" do
+  #   it "enable_versioning, disable_versioning" do
+  #     # enable_versioning
+  #     bucket.versioning = false
+
+  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+  #       enable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.versioning?
+
+  #     # disable_versioning
+  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+  #       disable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.versioning?
+  #   end
+  # end
+
+  # describe "website_configuration" do
+  #   let(:main_page_suffix) { "index.html" }
+  #   let(:not_found_page) { "404.html" }
+
+  #   it "define_bucket_website_configuration" do
+  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+  #                    "and #{not_found_page} as the 404 page\n"
+
+  #     assert_output expected_out do
+  #       define_bucket_website_configuration bucket_name:      bucket.name,
+  #                                           main_page_suffix: main_page_suffix,
+  #                                           not_found_page:   not_found_page
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal main_page_suffix, bucket.website_main
+  #     assert_equal not_found_page, bucket.website_404
+  #   end
+  # end
+
+  # describe "public_access_prevention" do
+  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+  #      "set_public_access_prevention_inherited" do
+  #     bucket.public_access_prevention = :inherited
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+
+  #     # set_public_access_prevention_enforced
+  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+  #       set_public_access_prevention_enforced bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # get_public_access_prevention
+  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+  #       get_public_access_prevention bucket_name: bucket.name
+  #     end
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # set_public_access_prevention_inherited
+  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+  #       set_public_access_prevention_inherited bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+  #     bucket.public_access_prevention = :inherited
+  #   end
+  # end
+
+  # describe "storage move file" do
+  #   let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
+  #   let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
+  #   let :hns_bucket do
+  #     hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
+  #     storage_client.create_bucket random_bucket_name do |b|
+  #       b.uniform_bucket_level_access = true
+  #       b.hierarchical_namespace = hierarchical_namespace
+  #     end
+  #   end
+  #   let :create_source_file do
+  #     file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
+  #     file = StringIO.new file_content
+  #     hns_bucket.create_file file, source_file
+  #   end
+  #   it "file is moved and old file is deleted" do
+  #     create_source_file
+  #     out, _err = capture_io do
+  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
+  #     end
+  #     assert_includes out, "New File #{destination_file} created\n"
+  #     refute_nil(hns_bucket.file(destination_file))
+  #     assert_nil(hns_bucket.file(source_file))
+  #   end
+
+  #   it "raises error if source and destination are having same filename" do
+  #     create_source_file
+  #     exception = assert_raises Google::Cloud::InvalidArgumentError do
+  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
+  #     end
+  #     assert_equal "invalid: Source and destination object names must be different.", exception.message
+  #   end
+  # end
 end
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index b5ed6c743e19..635dadd3655c 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -25,6 +25,8 @@ def get_soft_deleted_bucket bucket_name:, generation:
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
+  puts "project_name while bucket deletion"
+  puts deleted_bucket_fetch.service.project
   soft_delete_time = deleted_bucket_fetch.soft_delete_time
   hard_delete_time = deleted_bucket_fetch.hard_delete_time
 

From ba8ca786dfc499c68cf68e5e7765a7651bb18cf3 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 14 Jul 2025 17:56:47 +0530
Subject: [PATCH 078/100] Update storage_get_soft_deleted_bucket.rb

---
 google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 635dadd3655c..d82e0abbdf00 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -22,6 +22,7 @@ def get_soft_deleted_bucket bucket_name:, generation:
   require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
+   Google::Apis.logger.level = Logger::DEBUG
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 

From 707d2c0e71b81d06c39e2f80dd33624e16e551ed Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 14 Jul 2025 12:42:19 +0000
Subject: [PATCH 079/100] wip

---
 google-cloud-storage/samples/acceptance/buckets_test.rb         | 1 +
 google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index aef2cf71ab65..420c8bbc586b 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -56,6 +56,7 @@
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
 require_relative "../storage_move_object"
+Google::Apis.logger.level = Logger::DEBUG
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index d82e0abbdf00..635dadd3655c 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -22,7 +22,6 @@ def get_soft_deleted_bucket bucket_name:, generation:
   require "google/cloud/storage"
 
   storage = Google::Cloud::Storage.new
-   Google::Apis.logger.level = Logger::DEBUG
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 

From 10fbe1d67902788fb225f99e2763f888842f3ea1 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Mon, 14 Jul 2025 13:01:21 +0000
Subject: [PATCH 080/100] wip

---
 google-cloud-storage/samples/acceptance/buckets_test.rb      | 5 +++--
 .../samples/storage_get_soft_deleted_bucket.rb               | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 420c8bbc586b..e4a07dab8c7a 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -133,11 +133,12 @@
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       # fetching a soft deleted bucket
+            puts "project_name while bucket creation"
+      puts new_bucket.service.project
       # output, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       # end
-      puts "project_name while bucket creation"
-      puts new_bucket.service.project
+
       # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
     end
 
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 635dadd3655c..82abac6bba9b 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -23,10 +23,11 @@ def get_soft_deleted_bucket bucket_name:, generation:
 
   storage = Google::Cloud::Storage.new
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
+    puts "project_name while bucket deletion"
+  puts storage.project
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 
-  puts "project_name while bucket deletion"
-  puts deleted_bucket_fetch.service.project
+
   soft_delete_time = deleted_bucket_fetch.soft_delete_time
   hard_delete_time = deleted_bucket_fetch.hard_delete_time
 

From 04f233adf7a8827a405c4d703e68b7f412abe174 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 15 Jul 2025 06:50:54 +0000
Subject: [PATCH 081/100] wip

---
 google-cloud-storage/samples/acceptance/helper.rb               | 2 ++
 google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 61a8f288c315..898d5f599026 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -40,6 +40,8 @@ def create_bucket_helper bucket_name
 
 def delete_bucket_helper bucket_name
   storage_client = Google::Cloud::Storage.new
+  puts "project_name while deleting the bucket"
+  puts storage_client.project
   retry_resource_exhaustion do
     bucket = storage_client.bucket bucket_name
     return unless bucket
diff --git a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
index 82abac6bba9b..4e4aba44476c 100644
--- a/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
+++ b/google-cloud-storage/samples/storage_get_soft_deleted_bucket.rb
@@ -23,7 +23,7 @@ def get_soft_deleted_bucket bucket_name:, generation:
 
   storage = Google::Cloud::Storage.new
   # fetching soft deleted bucket with soft_delete_time and hard_delete_time
-    puts "project_name while bucket deletion"
+  puts "project_name while fetching the deleted bucket"
   puts storage.project
   deleted_bucket_fetch = storage.bucket bucket_name, generation: generation, soft_deleted: true
 

From 78e95796c806144cdce4a7b8b93d0eef8bbd8815 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 15 Jul 2025 12:57:55 +0530
Subject: [PATCH 082/100] Update project_test.rb

---
 google-cloud-storage/samples/acceptance/project_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index fa89df04df5e..ef164975773f 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -33,6 +33,7 @@
   end
 end
 
+
 describe "storage_soft_deleted_bucket" do
   let(:generation) { bucket.generation }
   let(:bucket) { fixture_bucket }

From 8347f2f1355697005793d337a59e27578d6f0919 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 11:55:20 +0000
Subject: [PATCH 083/100] update

---
 .../samples/acceptance/buckets_test.rb        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index e4a07dab8c7a..90502c7a6674 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -56,6 +56,7 @@
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
 require_relative "../storage_move_object"
+# require 'pry'
 Google::Apis.logger.level = Logger::DEBUG
 
 describe "Buckets Snippets" do
@@ -131,16 +132,16 @@
       delete_bucket_helper new_bucket.name
     end
 
-    it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-      # fetching a soft deleted bucket
-            puts "project_name while bucket creation"
-      puts new_bucket.service.project
-      # output, _err = capture_io do
-        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      # end
+    # it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
+    #   # fetching a soft deleted bucket
+    #         puts "project_name while bucket creation"
+    #   puts new_bucket.service.project
+    #   # output, _err = capture_io do
+    #     get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+    #   # end
 
-      # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
-    end
+    #   # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+    # end
 
     it "lists soft deleted buckets" do
       # fetching list of soft deleted buckets

From bbf91e67b0106e8760b7b3fd156e1c46925418ca Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 12:25:03 +0000
Subject: [PATCH 084/100] update

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 90502c7a6674..0a0e878fcbe9 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -57,7 +57,7 @@
 require_relative "../storage_set_autoclass"
 require_relative "../storage_move_object"
 # require 'pry'
-Google::Apis.logger.level = Logger::DEBUG
+# Google::Apis.logger.level = Logger::DEBUG
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }

From 0223fd4afb8144445c4e4721129ce34c8f74c999 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 12:35:42 +0000
Subject: [PATCH 085/100] update

---
 .../samples/acceptance/buckets_test.rb        | 1100 ++++++++---------
 1 file changed, 550 insertions(+), 550 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 0a0e878fcbe9..e093d2675af4 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -65,64 +65,64 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  # describe "bucket lifecycle" do
-  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-  #     # create_bucket
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket: #{bucket_name}\n" do
-  #         create_bucket bucket_name: bucket_name
-  #       end
-  #     end
+  describe "bucket lifecycle" do
+    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+      # create_bucket
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      retry_resource_exhaustion do
+        assert_output "Created bucket: #{bucket_name}\n" do
+          create_bucket bucket_name: bucket_name
+        end
+      end
 
-  #     refute_nil storage_client.bucket bucket_name
+      refute_nil storage_client.bucket bucket_name
 
-  #     # create_bucket_class_location
+      # create_bucket_class_location
 
-  #     secondary_bucket_name = random_bucket_name
-  #     location = "ASIA"
-  #     storage_class = "COLDLINE"
-  #     refute storage_client.bucket secondary_bucket_name
+      secondary_bucket_name = random_bucket_name
+      location = "ASIA"
+      storage_class = "COLDLINE"
+      refute storage_client.bucket secondary_bucket_name
 
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-  #         create_bucket_class_location bucket_name: secondary_bucket_name
-  #       end
-  #     end
+      retry_resource_exhaustion do
+        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+          create_bucket_class_location bucket_name: secondary_bucket_name
+        end
+      end
 
-  #     secondary_bucket = storage_client.bucket secondary_bucket_name
-  #     refute_nil secondary_bucket
-  #     assert_equal location, secondary_bucket.location
-  #     assert_equal storage_class, secondary_bucket.storage_class
+      secondary_bucket = storage_client.bucket secondary_bucket_name
+      refute_nil secondary_bucket
+      assert_equal location, secondary_bucket.location
+      assert_equal storage_class, secondary_bucket.storage_class
 
-  #     # list_buckets
-  #     out, _err = capture_io do
-  #       list_buckets
-  #     end
+      # list_buckets
+      out, _err = capture_io do
+        list_buckets
+      end
 
-  #     assert_includes out, "ruby-storage-samples-"
+      assert_includes out, "ruby-storage-samples-"
 
-  #     # get_bucket_metadata
-  #     out, _err = capture_io do
-  #       get_bucket_metadata bucket_name: bucket_name
-  #     end
+      # get_bucket_metadata
+      out, _err = capture_io do
+        get_bucket_metadata bucket_name: bucket_name
+      end
 
-  #     assert_includes out, bucket_name
+      assert_includes out, bucket_name
 
-  #     # delete_bucket
-  #     assert_output "Deleted bucket: #{bucket_name}\n" do
-  #       delete_bucket bucket_name: bucket_name
-  #     end
+      # delete_bucket
+      assert_output "Deleted bucket: #{bucket_name}\n" do
+        delete_bucket bucket_name: bucket_name
+      end
 
 
-  #     refute storage_client.bucket bucket_name
+      refute storage_client.bucket bucket_name
 
-  #     delete_bucket_helper bucket_name
-  #     delete_bucket_helper secondary_bucket_name
-  #   end
-  # end
+      delete_bucket_helper bucket_name
+      delete_bucket_helper secondary_bucket_name
+    end
+  end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
@@ -132,16 +132,16 @@
       delete_bucket_helper new_bucket.name
     end
 
-    # it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-    #   # fetching a soft deleted bucket
-    #         puts "project_name while bucket creation"
-    #   puts new_bucket.service.project
-    #   # output, _err = capture_io do
-    #     get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-    #   # end
+    it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
+      # fetching a soft deleted bucket
+            puts "project_name while bucket creation"
+      puts new_bucket.service.project
+      # output, _err = capture_io do
+        get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
+      # end
 
-    #   # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
-    # end
+      # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+    end
 
     it "lists soft deleted buckets" do
       # fetching list of soft deleted buckets
@@ -152,500 +152,500 @@
     end
   end
 
-  # describe "storage_create_bucket_dual_region" do
-  #   it "creates dual region bucket" do
-  #     location = "US"
-  #     region_1 = "US-EAST1"
-  #     region_2 = "US-WEST1"
-  #     location_type = "dual-region"
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Bucket #{bucket_name} created:\n"
-  #     expected += "- location: #{location}\n"
-  #     expected += "- location_type: #{location_type}\n"
-  #     expected += "- custom_placement_config:\n"
-  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-  #                                                                             region_1: region_1,
-  #                                                                             region_2: region_2
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_hierarchical_namespace" do
-  #   it "creates hierarchical namespace enabled bucket" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_with_object_retention" do
-  #   it "creates a bucket with object retention enabled." do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_with_object_retention bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     file_name = "test_object_retention"
-
-  #     bucket = storage_client.bucket bucket_name
-
-  #     out, _err = capture_io do
-  #       set_object_retention_policy bucket_name: bucket.name,
-  #                                   content: "hello world",
-  #                                   destination_file_name: file_name
-  #     end
-
-  #     assert_includes out, "Retention policy for file #{file_name}"
-
-  #     file = bucket.file file_name
-  #     file.retention = {
-  #       mode: nil,
-  #       retain_until_time: nil,
-  #       override_unlocked_retention: true
-  #     }
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "autoclass" do
-  #   it "get_autoclass, set_autoclass" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-  #     assert_output(/autoclass config set to true./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-  #     end
-
-  #     assert_output(/autoclass config set to false./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: false
-  #     end
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "cors" do
-  #   it "cors_configuration, remove_cors_configuration" do
-  #     bucket.cors { |c| c.clear }
-  #     assert bucket.cors.empty?
-
-  #     # cors_configuration
-  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-  #       cors_configuration bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal 1, bucket.cors.count
-  #     rule = bucket.cors.first
-  #     assert_equal ["*"], rule.origin
-  #     assert_equal ["PUT", "POST"], rule.methods
-  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-  #     assert_equal 3600, rule.max_age
-
-  #     # remove_cors_configuration
-  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-  #       remove_cors_configuration bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.cors.empty?
-  #   end
-  # end
-
-  # describe "requester_pays" do
-  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-  #     # enable_requester_pays
-  #     bucket.requester_pays = false
-
-  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-  #       enable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     assert bucket.requester_pays?
-
-  #     # disable_requester_pays
-  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-  #       disable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     refute bucket.requester_pays?
-  #   end
-  # end
-
-  # describe "uniform_bucket_level_access" do
-  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-  #     # enable_uniform_bucket_level_access
-  #     bucket.uniform_bucket_level_access = false
-
-  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-  #       enable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # disable_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-  #       disable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     bucket.uniform_bucket_level_access = false
-  #   end
-  # end
-
-  # describe "default Cloud KMS encryption key" do
-  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-  #     refute bucket.default_kms_key
-
-  #     # set_bucket_default_kms_key
-  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-  #       set_bucket_default_kms_key bucket_name:     bucket.name,
-  #                                  default_kms_key: kms_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.default_kms_key, kms_key
-
-  #     # bucket_delete_default_kms_key
-  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
-  #       bucket_delete_default_kms_key bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_kms_key
-  #   end
-  # end
-
-  # describe "get bucket class and location data" do
-  #   bucket_name = random_bucket_name
-  #   location = "US"
-  #   storage_class = "COLDLINE"
-
-  #   it "get_bucket_class_and_location" do
-  #     storage_client.create_bucket bucket_name,
-  #                                  location: location,
-  #                                  storage_class: storage_class
-  #     expected_output = "Bucket #{bucket_name} storage class is " \
-  #                       "#{storage_class}, and the location is #{location}\n"
-  #     assert_output expected_output do
-  #       get_bucket_class_and_location bucket_name: bucket_name
-  #     end
-  #   end
-  # end
-
-  # describe "labels" do
-  #   it "add_bucket_label, remove_bucket_label" do
-  #     # add_bucket_label
-  #     label_key = "label_key"
-  #     label_value = "label_value"
-
-  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-  #       add_bucket_label bucket_name: bucket.name,
-  #                        label_value: label_value,
-  #                        label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.labels[label_key], label_value
-
-  #     # remove_bucket_label
-  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-  #       remove_bucket_label bucket_name: bucket.name,
-  #                           label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.labels[label_key].empty?
-  #   end
-  # end
-
-  # describe "lifecycle management" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-  #     # enable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       enable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is enabled"
-
-  #     # disable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       disable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is disabled"
-  #   end
-  # end
-
-  # describe "retention policy" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-  #     # set_retention_policy
-  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-  #       set_retention_policy bucket_name:      bucket.name,
-  #                            retention_period: retention_period
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.retention_period, retention_period
-
-  #     # get_retention_policy
-  #     out, _err = capture_io do
-  #       get_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "period: #{retention_period}\n"
-
-  #     # remove_retention_policy
-  #     assert_equal bucket.retention_period, retention_period
-  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.retention_period
-
-  #     # lock_retention_policy
-  #     bucket.retention_period = retention_period
-  #     out, _err = capture_io do
-  #       lock_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
-  #     bucket.refresh!
-  #     assert bucket.retention_policy_locked?
-
-  #     # remove_retention_policy
-  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "default_event_based_hold" do
-  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-  #     # enable_default_event_based_hold
-  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-  #       enable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     # disable_default_event_based_hold
-  #     bucket.update do |b|
-  #       b.default_event_based_hold = true
-  #     end
-
-  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-  #       disable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "storage_class" do
-  #   it "change_default_storage_class" do
-  #     assert_equal "STANDARD", bucket.storage_class
-
-  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-  #       change_default_storage_class bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal "COLDLINE", bucket.storage_class
-  #     # teardown
-  #     bucket.storage_class = "STANDARD"
-  #   end
-  # end
-
-  # describe "versioning" do
-  #   it "enable_versioning, disable_versioning" do
-  #     # enable_versioning
-  #     bucket.versioning = false
-
-  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-  #       enable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.versioning?
-
-  #     # disable_versioning
-  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-  #       disable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.versioning?
-  #   end
-  # end
-
-  # describe "website_configuration" do
-  #   let(:main_page_suffix) { "index.html" }
-  #   let(:not_found_page) { "404.html" }
-
-  #   it "define_bucket_website_configuration" do
-  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-  #                    "and #{not_found_page} as the 404 page\n"
-
-  #     assert_output expected_out do
-  #       define_bucket_website_configuration bucket_name:      bucket.name,
-  #                                           main_page_suffix: main_page_suffix,
-  #                                           not_found_page:   not_found_page
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal main_page_suffix, bucket.website_main
-  #     assert_equal not_found_page, bucket.website_404
-  #   end
-  # end
-
-  # describe "public_access_prevention" do
-  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-  #      "set_public_access_prevention_inherited" do
-  #     bucket.public_access_prevention = :inherited
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-
-  #     # set_public_access_prevention_enforced
-  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-  #       set_public_access_prevention_enforced bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # get_public_access_prevention
-  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-  #       get_public_access_prevention bucket_name: bucket.name
-  #     end
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # set_public_access_prevention_inherited
-  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-  #       set_public_access_prevention_inherited bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-  #     bucket.public_access_prevention = :inherited
-  #   end
-  # end
-
-  # describe "storage move file" do
-  #   let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
-  #   let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
-  #   let :hns_bucket do
-  #     hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
-  #     storage_client.create_bucket random_bucket_name do |b|
-  #       b.uniform_bucket_level_access = true
-  #       b.hierarchical_namespace = hierarchical_namespace
-  #     end
-  #   end
-  #   let :create_source_file do
-  #     file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
-  #     file = StringIO.new file_content
-  #     hns_bucket.create_file file, source_file
-  #   end
-  #   it "file is moved and old file is deleted" do
-  #     create_source_file
-  #     out, _err = capture_io do
-  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
-  #     end
-  #     assert_includes out, "New File #{destination_file} created\n"
-  #     refute_nil(hns_bucket.file(destination_file))
-  #     assert_nil(hns_bucket.file(source_file))
-  #   end
-
-  #   it "raises error if source and destination are having same filename" do
-  #     create_source_file
-  #     exception = assert_raises Google::Cloud::InvalidArgumentError do
-  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
-  #     end
-  #     assert_equal "invalid: Source and destination object names must be different.", exception.message
-  #   end
-  # end
+  describe "storage_create_bucket_dual_region" do
+    it "creates dual region bucket" do
+      location = "US"
+      region_1 = "US-EAST1"
+      region_2 = "US-WEST1"
+      location_type = "dual-region"
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Bucket #{bucket_name} created:\n"
+      expected += "- location: #{location}\n"
+      expected += "- location_type: #{location_type}\n"
+      expected += "- custom_placement_config:\n"
+      expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+                                                                              region_1: region_1,
+                                                                              region_2: region_2
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "storage_create_bucket_hierarchical_namespace" do
+    it "creates hierarchical namespace enabled bucket" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_hierarchical_namespace bucket_name: bucket_name
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "storage_create_bucket_with_object_retention" do
+    it "creates a bucket with object retention enabled." do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_with_object_retention bucket_name: bucket_name
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      file_name = "test_object_retention"
+
+      bucket = storage_client.bucket bucket_name
+
+      out, _err = capture_io do
+        set_object_retention_policy bucket_name: bucket.name,
+                                    content: "hello world",
+                                    destination_file_name: file_name
+      end
+
+      assert_includes out, "Retention policy for file #{file_name}"
+
+      file = bucket.file file_name
+      file.retention = {
+        mode: nil,
+        retain_until_time: nil,
+        override_unlocked_retention: true
+      }
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "autoclass" do
+    it "get_autoclass, set_autoclass" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+      assert_output(/autoclass config set to true./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to NEARLINE./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+      end
+
+      assert_output(/autoclass config set to false./) do
+        set_autoclass bucket_name: bucket_name, toggle: false
+      end
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "cors" do
+    it "cors_configuration, remove_cors_configuration" do
+      bucket.cors { |c| c.clear }
+      assert bucket.cors.empty?
+
+      # cors_configuration
+      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+        cors_configuration bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert_equal 1, bucket.cors.count
+      rule = bucket.cors.first
+      assert_equal ["*"], rule.origin
+      assert_equal ["PUT", "POST"], rule.methods
+      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+      assert_equal 3600, rule.max_age
+
+      # remove_cors_configuration
+      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+        remove_cors_configuration bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.cors.empty?
+    end
+  end
+
+  describe "requester_pays" do
+    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+      # enable_requester_pays
+      bucket.requester_pays = false
+
+      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+        enable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      assert bucket.requester_pays?
+
+      # disable_requester_pays
+      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+        disable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      refute bucket.requester_pays?
+    end
+  end
+
+  describe "uniform_bucket_level_access" do
+    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+      # enable_uniform_bucket_level_access
+      bucket.uniform_bucket_level_access = false
+
+      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+        enable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      assert bucket.uniform_bucket_level_access?
+
+      # disable_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+        disable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      refute bucket.uniform_bucket_level_access?
+
+      bucket.uniform_bucket_level_access = false
+    end
+  end
+
+  describe "default Cloud KMS encryption key" do
+    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+      refute bucket.default_kms_key
+
+      # set_bucket_default_kms_key
+      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+        set_bucket_default_kms_key bucket_name:     bucket.name,
+                                   default_kms_key: kms_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.default_kms_key, kms_key
+
+      # bucket_delete_default_kms_key
+      assert_output "Default KMS key was removed from #{bucket.name}\n" do
+        bucket_delete_default_kms_key bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_kms_key
+    end
+  end
+
+  describe "get bucket class and location data" do
+    bucket_name = random_bucket_name
+    location = "US"
+    storage_class = "COLDLINE"
+
+    it "get_bucket_class_and_location" do
+      storage_client.create_bucket bucket_name,
+                                   location: location,
+                                   storage_class: storage_class
+      expected_output = "Bucket #{bucket_name} storage class is " \
+                        "#{storage_class}, and the location is #{location}\n"
+      assert_output expected_output do
+        get_bucket_class_and_location bucket_name: bucket_name
+      end
+    end
+  end
+
+  describe "labels" do
+    it "add_bucket_label, remove_bucket_label" do
+      # add_bucket_label
+      label_key = "label_key"
+      label_value = "label_value"
+
+      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+        add_bucket_label bucket_name: bucket.name,
+                         label_value: label_value,
+                         label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.labels[label_key], label_value
+
+      # remove_bucket_label
+      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+        remove_bucket_label bucket_name: bucket.name,
+                            label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert bucket.labels[label_key].empty?
+    end
+  end
+
+  describe "lifecycle management" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+      # enable_bucket_lifecycle_management
+      out, _err = capture_io do
+        enable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is enabled"
+
+      # disable_bucket_lifecycle_management
+      out, _err = capture_io do
+        disable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is disabled"
+    end
+  end
+
+  describe "retention policy" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+      # set_retention_policy
+      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+        set_retention_policy bucket_name:      bucket.name,
+                             retention_period: retention_period
+      end
+
+      bucket.refresh!
+      assert_equal bucket.retention_period, retention_period
+
+      # get_retention_policy
+      out, _err = capture_io do
+        get_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "period: #{retention_period}\n"
+
+      # remove_retention_policy
+      assert_equal bucket.retention_period, retention_period
+      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.retention_period
+
+      # lock_retention_policy
+      bucket.retention_period = retention_period
+      out, _err = capture_io do
+        lock_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "Retention policy for #{bucket.name} is now locked."
+      bucket.refresh!
+      assert bucket.retention_policy_locked?
+
+      # remove_retention_policy
+      assert_output "Policy is locked and retention policy can't be removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "default_event_based_hold" do
+    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+      # enable_default_event_based_hold
+      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+        enable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+
+      # disable_default_event_based_hold
+      bucket.update do |b|
+        b.default_event_based_hold = true
+      end
+
+      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+        disable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "storage_class" do
+    it "change_default_storage_class" do
+      assert_equal "STANDARD", bucket.storage_class
+
+      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+        change_default_storage_class bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert_equal "COLDLINE", bucket.storage_class
+      # teardown
+      bucket.storage_class = "STANDARD"
+    end
+  end
+
+  describe "versioning" do
+    it "enable_versioning, disable_versioning" do
+      # enable_versioning
+      bucket.versioning = false
+
+      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+        enable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.versioning?
+
+      # disable_versioning
+      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+        disable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.versioning?
+    end
+  end
+
+  describe "website_configuration" do
+    let(:main_page_suffix) { "index.html" }
+    let(:not_found_page) { "404.html" }
+
+    it "define_bucket_website_configuration" do
+      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+                     "and #{not_found_page} as the 404 page\n"
+
+      assert_output expected_out do
+        define_bucket_website_configuration bucket_name:      bucket.name,
+                                            main_page_suffix: main_page_suffix,
+                                            not_found_page:   not_found_page
+      end
+
+      bucket.refresh!
+      assert_equal main_page_suffix, bucket.website_main
+      assert_equal not_found_page, bucket.website_404
+    end
+  end
+
+  describe "public_access_prevention" do
+    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+       "set_public_access_prevention_inherited" do
+      bucket.public_access_prevention = :inherited
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+
+      # set_public_access_prevention_enforced
+      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+        set_public_access_prevention_enforced bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # get_public_access_prevention
+      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+        get_public_access_prevention bucket_name: bucket.name
+      end
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # set_public_access_prevention_inherited
+      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+        set_public_access_prevention_inherited bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+      bucket.public_access_prevention = :inherited
+    end
+  end
+
+  describe "storage move file" do
+    let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
+    let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
+    let :hns_bucket do
+      hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
+      storage_client.create_bucket random_bucket_name do |b|
+        b.uniform_bucket_level_access = true
+        b.hierarchical_namespace = hierarchical_namespace
+      end
+    end
+    let :create_source_file do
+      file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
+      file = StringIO.new file_content
+      hns_bucket.create_file file, source_file
+    end
+    it "file is moved and old file is deleted" do
+      create_source_file
+      out, _err = capture_io do
+        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
+      end
+      assert_includes out, "New File #{destination_file} created\n"
+      refute_nil(hns_bucket.file(destination_file))
+      assert_nil(hns_bucket.file(source_file))
+    end
+
+    it "raises error if source and destination are having same filename" do
+      create_source_file
+      exception = assert_raises Google::Cloud::InvalidArgumentError do
+        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
+      end
+      assert_equal "invalid: Source and destination object names must be different.", exception.message
+    end
+  end
 end

From dbb81d3c313af440f3468b3c1b13b950e0d189b9 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 12:48:38 +0000
Subject: [PATCH 086/100] update

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index e093d2675af4..19b6c7e6eecd 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -134,13 +134,11 @@
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       # fetching a soft deleted bucket
-            puts "project_name while bucket creation"
-      puts new_bucket.service.project
-      # output, _err = capture_io do
+      output, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      # end
+      end
 
-      # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+      assert_includes output, "soft_delete_time for #{new_bucket_name} is"
     end
 
     it "lists soft deleted buckets" do

From 953be23bb7a379ef011e888f382ce2b3b097115f Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 13:03:32 +0000
Subject: [PATCH 087/100] try

---
 .../samples/acceptance/buckets_test.rb        | 1090 +++++++++--------
 1 file changed, 546 insertions(+), 544 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 19b6c7e6eecd..13d7d7ed98c4 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -65,64 +65,64 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  describe "bucket lifecycle" do
-    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-      # create_bucket
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      retry_resource_exhaustion do
-        assert_output "Created bucket: #{bucket_name}\n" do
-          create_bucket bucket_name: bucket_name
-        end
-      end
+  # describe "bucket lifecycle" do
+  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+  #     # create_bucket
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
 
-      refute_nil storage_client.bucket bucket_name
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket: #{bucket_name}\n" do
+  #         create_bucket bucket_name: bucket_name
+  #       end
+  #     end
 
-      # create_bucket_class_location
+  #     refute_nil storage_client.bucket bucket_name
 
-      secondary_bucket_name = random_bucket_name
-      location = "ASIA"
-      storage_class = "COLDLINE"
-      refute storage_client.bucket secondary_bucket_name
+  #     # create_bucket_class_location
 
-      retry_resource_exhaustion do
-        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-          create_bucket_class_location bucket_name: secondary_bucket_name
-        end
-      end
+  #     secondary_bucket_name = random_bucket_name
+  #     location = "ASIA"
+  #     storage_class = "COLDLINE"
+  #     refute storage_client.bucket secondary_bucket_name
 
-      secondary_bucket = storage_client.bucket secondary_bucket_name
-      refute_nil secondary_bucket
-      assert_equal location, secondary_bucket.location
-      assert_equal storage_class, secondary_bucket.storage_class
+  #     retry_resource_exhaustion do
+  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+  #         create_bucket_class_location bucket_name: secondary_bucket_name
+  #       end
+  #     end
 
-      # list_buckets
-      out, _err = capture_io do
-        list_buckets
-      end
+  #     secondary_bucket = storage_client.bucket secondary_bucket_name
+  #     refute_nil secondary_bucket
+  #     assert_equal location, secondary_bucket.location
+  #     assert_equal storage_class, secondary_bucket.storage_class
 
-      assert_includes out, "ruby-storage-samples-"
+  #     # list_buckets
+  #     out, _err = capture_io do
+  #       list_buckets
+  #     end
 
-      # get_bucket_metadata
-      out, _err = capture_io do
-        get_bucket_metadata bucket_name: bucket_name
-      end
+  #     assert_includes out, "ruby-storage-samples-"
 
-      assert_includes out, bucket_name
+  #     # get_bucket_metadata
+  #     out, _err = capture_io do
+  #       get_bucket_metadata bucket_name: bucket_name
+  #     end
 
-      # delete_bucket
-      assert_output "Deleted bucket: #{bucket_name}\n" do
-        delete_bucket bucket_name: bucket_name
-      end
+  #     assert_includes out, bucket_name
 
+  #     # delete_bucket
+  #     assert_output "Deleted bucket: #{bucket_name}\n" do
+  #       delete_bucket bucket_name: bucket_name
+  #     end
 
-      refute storage_client.bucket bucket_name
 
-      delete_bucket_helper bucket_name
-      delete_bucket_helper secondary_bucket_name
-    end
-  end
+  #     refute storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #     delete_bucket_helper secondary_bucket_name
+  #   end
+  # end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
@@ -134,11 +134,13 @@
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       # fetching a soft deleted bucket
-      output, _err = capture_io do
+            puts "project_name while bucket creation"
+      puts new_bucket.service.project
+      # output, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      end
+      # end
 
-      assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+      # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
     end
 
     it "lists soft deleted buckets" do
@@ -150,500 +152,500 @@
     end
   end
 
-  describe "storage_create_bucket_dual_region" do
-    it "creates dual region bucket" do
-      location = "US"
-      region_1 = "US-EAST1"
-      region_2 = "US-WEST1"
-      location_type = "dual-region"
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Bucket #{bucket_name} created:\n"
-      expected += "- location: #{location}\n"
-      expected += "- location_type: #{location_type}\n"
-      expected += "- custom_placement_config:\n"
-      expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-                                                                              region_1: region_1,
-                                                                              region_2: region_2
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_hierarchical_namespace" do
-    it "creates hierarchical namespace enabled bucket" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_hierarchical_namespace bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "storage_create_bucket_with_object_retention" do
-    it "creates a bucket with object retention enabled." do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-      retry_resource_exhaustion do
-        assert_output expected do
-          create_bucket_with_object_retention bucket_name: bucket_name
-        end
-      end
-
-      refute_nil storage_client.bucket bucket_name
-
-      file_name = "test_object_retention"
-
-      bucket = storage_client.bucket bucket_name
-
-      out, _err = capture_io do
-        set_object_retention_policy bucket_name: bucket.name,
-                                    content: "hello world",
-                                    destination_file_name: file_name
-      end
-
-      assert_includes out, "Retention policy for file #{file_name}"
-
-      file = bucket.file file_name
-      file.retention = {
-        mode: nil,
-        retain_until_time: nil,
-        override_unlocked_retention: true
-      }
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "autoclass" do
-    it "get_autoclass, set_autoclass" do
-      bucket_name = random_bucket_name
-      refute storage_client.bucket bucket_name
-
-      storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-      assert_output(/autoclass config set to true./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to NEARLINE./) do
-        get_autoclass bucket_name: bucket_name
-      end
-
-      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-      end
-
-      assert_output(/autoclass config set to false./) do
-        set_autoclass bucket_name: bucket_name, toggle: false
-      end
-
-      delete_bucket_helper bucket_name
-    end
-  end
-
-  describe "cors" do
-    it "cors_configuration, remove_cors_configuration" do
-      bucket.cors { |c| c.clear }
-      assert bucket.cors.empty?
-
-      # cors_configuration
-      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-        cors_configuration bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal 1, bucket.cors.count
-      rule = bucket.cors.first
-      assert_equal ["*"], rule.origin
-      assert_equal ["PUT", "POST"], rule.methods
-      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-      assert_equal 3600, rule.max_age
-
-      # remove_cors_configuration
-      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-        remove_cors_configuration bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.cors.empty?
-    end
-  end
-
-  describe "requester_pays" do
-    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-      # enable_requester_pays
-      bucket.requester_pays = false
-
-      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-        enable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      assert bucket.requester_pays?
-
-      # disable_requester_pays
-      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-        disable_requester_pays bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.requester_pays?
-
-      # get_requester_pays_status
-      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-        get_requester_pays_status bucket_name: bucket.name
-      end
-      refute bucket.requester_pays?
-    end
-  end
-
-  describe "uniform_bucket_level_access" do
-    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-      # enable_uniform_bucket_level_access
-      bucket.uniform_bucket_level_access = false
-
-      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-        enable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      assert bucket.uniform_bucket_level_access?
-
-      # disable_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-        disable_uniform_bucket_level_access bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.uniform_bucket_level_access?
-
-      # get_uniform_bucket_level_access
-      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-        get_uniform_bucket_level_access bucket_name: bucket.name
-      end
-      refute bucket.uniform_bucket_level_access?
-
-      bucket.uniform_bucket_level_access = false
-    end
-  end
-
-  describe "default Cloud KMS encryption key" do
-    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-      refute bucket.default_kms_key
-
-      # set_bucket_default_kms_key
-      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-        set_bucket_default_kms_key bucket_name:     bucket.name,
-                                   default_kms_key: kms_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.default_kms_key, kms_key
-
-      # bucket_delete_default_kms_key
-      assert_output "Default KMS key was removed from #{bucket.name}\n" do
-        bucket_delete_default_kms_key bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_kms_key
-    end
-  end
-
-  describe "get bucket class and location data" do
-    bucket_name = random_bucket_name
-    location = "US"
-    storage_class = "COLDLINE"
-
-    it "get_bucket_class_and_location" do
-      storage_client.create_bucket bucket_name,
-                                   location: location,
-                                   storage_class: storage_class
-      expected_output = "Bucket #{bucket_name} storage class is " \
-                        "#{storage_class}, and the location is #{location}\n"
-      assert_output expected_output do
-        get_bucket_class_and_location bucket_name: bucket_name
-      end
-    end
-  end
-
-  describe "labels" do
-    it "add_bucket_label, remove_bucket_label" do
-      # add_bucket_label
-      label_key = "label_key"
-      label_value = "label_value"
-
-      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-        add_bucket_label bucket_name: bucket.name,
-                         label_value: label_value,
-                         label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert_equal bucket.labels[label_key], label_value
-
-      # remove_bucket_label
-      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-        remove_bucket_label bucket_name: bucket.name,
-                            label_key:   label_key
-      end
-
-      bucket.refresh!
-      assert bucket.labels[label_key].empty?
-    end
-  end
-
-  describe "lifecycle management" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-      # enable_bucket_lifecycle_management
-      out, _err = capture_io do
-        enable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is enabled"
-
-      # disable_bucket_lifecycle_management
-      out, _err = capture_io do
-        disable_bucket_lifecycle_management bucket_name: bucket.name
-      end
-
-      assert_includes out, "Lifecycle management is disabled"
-    end
-  end
-
-  describe "retention policy" do
-    let(:bucket) { create_bucket_helper random_bucket_name }
-    after { delete_bucket_helper bucket.name }
-
-    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-      # set_retention_policy
-      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-        set_retention_policy bucket_name:      bucket.name,
-                             retention_period: retention_period
-      end
-
-      bucket.refresh!
-      assert_equal bucket.retention_period, retention_period
-
-      # get_retention_policy
-      out, _err = capture_io do
-        get_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "period: #{retention_period}\n"
-
-      # remove_retention_policy
-      assert_equal bucket.retention_period, retention_period
-      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.retention_period
-
-      # lock_retention_policy
-      bucket.retention_period = retention_period
-      out, _err = capture_io do
-        lock_retention_policy bucket_name: bucket.name
-      end
-
-      assert_includes out, "Retention policy for #{bucket.name} is now locked."
-      bucket.refresh!
-      assert bucket.retention_policy_locked?
-
-      # remove_retention_policy
-      assert_output "Policy is locked and retention policy can't be removed.\n" do
-        remove_retention_policy bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "default_event_based_hold" do
-    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-      # enable_default_event_based_hold
-      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-        enable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-
-      # disable_default_event_based_hold
-      bucket.update do |b|
-        b.default_event_based_hold = true
-      end
-
-      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-        disable_default_event_based_hold bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      refute bucket.default_event_based_hold?
-
-      # get_default_event_based_hold
-      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-        get_default_event_based_hold bucket_name: bucket.name
-      end
-    end
-  end
-
-  describe "storage_class" do
-    it "change_default_storage_class" do
-      assert_equal "STANDARD", bucket.storage_class
-
-      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-        change_default_storage_class bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      assert_equal "COLDLINE", bucket.storage_class
-      # teardown
-      bucket.storage_class = "STANDARD"
-    end
-  end
-
-  describe "versioning" do
-    it "enable_versioning, disable_versioning" do
-      # enable_versioning
-      bucket.versioning = false
-
-      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-        enable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      assert bucket.versioning?
-
-      # disable_versioning
-      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-        disable_versioning bucket_name: bucket.name
-      end
-      bucket.refresh!
-      refute bucket.versioning?
-    end
-  end
-
-  describe "website_configuration" do
-    let(:main_page_suffix) { "index.html" }
-    let(:not_found_page) { "404.html" }
-
-    it "define_bucket_website_configuration" do
-      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-                     "and #{not_found_page} as the 404 page\n"
-
-      assert_output expected_out do
-        define_bucket_website_configuration bucket_name:      bucket.name,
-                                            main_page_suffix: main_page_suffix,
-                                            not_found_page:   not_found_page
-      end
-
-      bucket.refresh!
-      assert_equal main_page_suffix, bucket.website_main
-      assert_equal not_found_page, bucket.website_404
-    end
-  end
-
-  describe "public_access_prevention" do
-    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-       "set_public_access_prevention_inherited" do
-      bucket.public_access_prevention = :inherited
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-
-      # set_public_access_prevention_enforced
-      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-        set_public_access_prevention_enforced bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # get_public_access_prevention
-      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-        get_public_access_prevention bucket_name: bucket.name
-      end
-      _(bucket.public_access_prevention).must_equal "enforced"
-
-      # set_public_access_prevention_inherited
-      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-        set_public_access_prevention_inherited bucket_name: bucket.name
-      end
-
-      bucket.refresh!
-      _(bucket.public_access_prevention).must_equal "inherited"
-      bucket.public_access_prevention = :inherited
-    end
-  end
-
-  describe "storage move file" do
-    let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
-    let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
-    let :hns_bucket do
-      hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
-      storage_client.create_bucket random_bucket_name do |b|
-        b.uniform_bucket_level_access = true
-        b.hierarchical_namespace = hierarchical_namespace
-      end
-    end
-    let :create_source_file do
-      file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
-      file = StringIO.new file_content
-      hns_bucket.create_file file, source_file
-    end
-    it "file is moved and old file is deleted" do
-      create_source_file
-      out, _err = capture_io do
-        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
-      end
-      assert_includes out, "New File #{destination_file} created\n"
-      refute_nil(hns_bucket.file(destination_file))
-      assert_nil(hns_bucket.file(source_file))
-    end
-
-    it "raises error if source and destination are having same filename" do
-      create_source_file
-      exception = assert_raises Google::Cloud::InvalidArgumentError do
-        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
-      end
-      assert_equal "invalid: Source and destination object names must be different.", exception.message
-    end
-  end
+  # describe "storage_create_bucket_dual_region" do
+  #   it "creates dual region bucket" do
+  #     location = "US"
+  #     region_1 = "US-EAST1"
+  #     region_2 = "US-WEST1"
+  #     location_type = "dual-region"
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Bucket #{bucket_name} created:\n"
+  #     expected += "- location: #{location}\n"
+  #     expected += "- location_type: #{location_type}\n"
+  #     expected += "- custom_placement_config:\n"
+  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+  #                                                                             region_1: region_1,
+  #                                                                             region_2: region_2
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_hierarchical_namespace" do
+  #   it "creates hierarchical namespace enabled bucket" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "storage_create_bucket_with_object_retention" do
+  #   it "creates a bucket with object retention enabled." do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+  #     retry_resource_exhaustion do
+  #       assert_output expected do
+  #         create_bucket_with_object_retention bucket_name: bucket_name
+  #       end
+  #     end
+
+  #     refute_nil storage_client.bucket bucket_name
+
+  #     file_name = "test_object_retention"
+
+  #     bucket = storage_client.bucket bucket_name
+
+  #     out, _err = capture_io do
+  #       set_object_retention_policy bucket_name: bucket.name,
+  #                                   content: "hello world",
+  #                                   destination_file_name: file_name
+  #     end
+
+  #     assert_includes out, "Retention policy for file #{file_name}"
+
+  #     file = bucket.file file_name
+  #     file.retention = {
+  #       mode: nil,
+  #       retain_until_time: nil,
+  #       override_unlocked_retention: true
+  #     }
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "autoclass" do
+  #   it "get_autoclass, set_autoclass" do
+  #     bucket_name = random_bucket_name
+  #     refute storage_client.bucket bucket_name
+
+  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+  #     assert_output(/autoclass config set to true./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
+  #       get_autoclass bucket_name: bucket_name
+  #     end
+
+  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+  #     end
+
+  #     assert_output(/autoclass config set to false./) do
+  #       set_autoclass bucket_name: bucket_name, toggle: false
+  #     end
+
+  #     delete_bucket_helper bucket_name
+  #   end
+  # end
+
+  # describe "cors" do
+  #   it "cors_configuration, remove_cors_configuration" do
+  #     bucket.cors { |c| c.clear }
+  #     assert bucket.cors.empty?
+
+  #     # cors_configuration
+  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+  #       cors_configuration bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal 1, bucket.cors.count
+  #     rule = bucket.cors.first
+  #     assert_equal ["*"], rule.origin
+  #     assert_equal ["PUT", "POST"], rule.methods
+  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+  #     assert_equal 3600, rule.max_age
+
+  #     # remove_cors_configuration
+  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+  #       remove_cors_configuration bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.cors.empty?
+  #   end
+  # end
+
+  # describe "requester_pays" do
+  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+  #     # enable_requester_pays
+  #     bucket.requester_pays = false
+
+  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+  #       enable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     assert bucket.requester_pays?
+
+  #     # disable_requester_pays
+  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+  #       disable_requester_pays bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.requester_pays?
+
+  #     # get_requester_pays_status
+  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+  #       get_requester_pays_status bucket_name: bucket.name
+  #     end
+  #     refute bucket.requester_pays?
+  #   end
+  # end
+
+  # describe "uniform_bucket_level_access" do
+  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+  #     # enable_uniform_bucket_level_access
+  #     bucket.uniform_bucket_level_access = false
+
+  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+  #       enable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     assert bucket.uniform_bucket_level_access?
+
+  #     # disable_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+  #       disable_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     # get_uniform_bucket_level_access
+  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+  #       get_uniform_bucket_level_access bucket_name: bucket.name
+  #     end
+  #     refute bucket.uniform_bucket_level_access?
+
+  #     bucket.uniform_bucket_level_access = false
+  #   end
+  # end
+
+  # describe "default Cloud KMS encryption key" do
+  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+  #     refute bucket.default_kms_key
+
+  #     # set_bucket_default_kms_key
+  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+  #       set_bucket_default_kms_key bucket_name:     bucket.name,
+  #                                  default_kms_key: kms_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.default_kms_key, kms_key
+
+  #     # bucket_delete_default_kms_key
+  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
+  #       bucket_delete_default_kms_key bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_kms_key
+  #   end
+  # end
+
+  # describe "get bucket class and location data" do
+  #   bucket_name = random_bucket_name
+  #   location = "US"
+  #   storage_class = "COLDLINE"
+
+  #   it "get_bucket_class_and_location" do
+  #     storage_client.create_bucket bucket_name,
+  #                                  location: location,
+  #                                  storage_class: storage_class
+  #     expected_output = "Bucket #{bucket_name} storage class is " \
+  #                       "#{storage_class}, and the location is #{location}\n"
+  #     assert_output expected_output do
+  #       get_bucket_class_and_location bucket_name: bucket_name
+  #     end
+  #   end
+  # end
+
+  # describe "labels" do
+  #   it "add_bucket_label, remove_bucket_label" do
+  #     # add_bucket_label
+  #     label_key = "label_key"
+  #     label_value = "label_value"
+
+  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+  #       add_bucket_label bucket_name: bucket.name,
+  #                        label_value: label_value,
+  #                        label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.labels[label_key], label_value
+
+  #     # remove_bucket_label
+  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+  #       remove_bucket_label bucket_name: bucket.name,
+  #                           label_key:   label_key
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.labels[label_key].empty?
+  #   end
+  # end
+
+  # describe "lifecycle management" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+  #     # enable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       enable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is enabled"
+
+  #     # disable_bucket_lifecycle_management
+  #     out, _err = capture_io do
+  #       disable_bucket_lifecycle_management bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Lifecycle management is disabled"
+  #   end
+  # end
+
+  # describe "retention policy" do
+  #   let(:bucket) { create_bucket_helper random_bucket_name }
+  #   after { delete_bucket_helper bucket.name }
+
+  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+  #     # set_retention_policy
+  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+  #       set_retention_policy bucket_name:      bucket.name,
+  #                            retention_period: retention_period
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal bucket.retention_period, retention_period
+
+  #     # get_retention_policy
+  #     out, _err = capture_io do
+  #       get_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "period: #{retention_period}\n"
+
+  #     # remove_retention_policy
+  #     assert_equal bucket.retention_period, retention_period
+  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.retention_period
+
+  #     # lock_retention_policy
+  #     bucket.retention_period = retention_period
+  #     out, _err = capture_io do
+  #       lock_retention_policy bucket_name: bucket.name
+  #     end
+
+  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
+  #     bucket.refresh!
+  #     assert bucket.retention_policy_locked?
+
+  #     # remove_retention_policy
+  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
+  #       remove_retention_policy bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "default_event_based_hold" do
+  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+  #     # enable_default_event_based_hold
+  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+  #       enable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     # disable_default_event_based_hold
+  #     bucket.update do |b|
+  #       b.default_event_based_hold = true
+  #     end
+
+  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+  #       disable_default_event_based_hold bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     refute bucket.default_event_based_hold?
+
+  #     # get_default_event_based_hold
+  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+  #       get_default_event_based_hold bucket_name: bucket.name
+  #     end
+  #   end
+  # end
+
+  # describe "storage_class" do
+  #   it "change_default_storage_class" do
+  #     assert_equal "STANDARD", bucket.storage_class
+
+  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+  #       change_default_storage_class bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal "COLDLINE", bucket.storage_class
+  #     # teardown
+  #     bucket.storage_class = "STANDARD"
+  #   end
+  # end
+
+  # describe "versioning" do
+  #   it "enable_versioning, disable_versioning" do
+  #     # enable_versioning
+  #     bucket.versioning = false
+
+  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+  #       enable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     assert bucket.versioning?
+
+  #     # disable_versioning
+  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+  #       disable_versioning bucket_name: bucket.name
+  #     end
+  #     bucket.refresh!
+  #     refute bucket.versioning?
+  #   end
+  # end
+
+  # describe "website_configuration" do
+  #   let(:main_page_suffix) { "index.html" }
+  #   let(:not_found_page) { "404.html" }
+
+  #   it "define_bucket_website_configuration" do
+  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+  #                    "and #{not_found_page} as the 404 page\n"
+
+  #     assert_output expected_out do
+  #       define_bucket_website_configuration bucket_name:      bucket.name,
+  #                                           main_page_suffix: main_page_suffix,
+  #                                           not_found_page:   not_found_page
+  #     end
+
+  #     bucket.refresh!
+  #     assert_equal main_page_suffix, bucket.website_main
+  #     assert_equal not_found_page, bucket.website_404
+  #   end
+  # end
+
+  # describe "public_access_prevention" do
+  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+  #      "set_public_access_prevention_inherited" do
+  #     bucket.public_access_prevention = :inherited
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+
+  #     # set_public_access_prevention_enforced
+  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+  #       set_public_access_prevention_enforced bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # get_public_access_prevention
+  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+  #       get_public_access_prevention bucket_name: bucket.name
+  #     end
+  #     _(bucket.public_access_prevention).must_equal "enforced"
+
+  #     # set_public_access_prevention_inherited
+  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+  #       set_public_access_prevention_inherited bucket_name: bucket.name
+  #     end
+
+  #     bucket.refresh!
+  #     _(bucket.public_access_prevention).must_equal "inherited"
+  #     bucket.public_access_prevention = :inherited
+  #   end
+  # end
+
+  # describe "storage move file" do
+  #   let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
+  #   let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
+  #   let :hns_bucket do
+  #     hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
+  #     storage_client.create_bucket random_bucket_name do |b|
+  #       b.uniform_bucket_level_access = true
+  #       b.hierarchical_namespace = hierarchical_namespace
+  #     end
+  #   end
+  #   let :create_source_file do
+  #     file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
+  #     file = StringIO.new file_content
+  #     hns_bucket.create_file file, source_file
+  #   end
+  #   it "file is moved and old file is deleted" do
+  #     create_source_file
+  #     out, _err = capture_io do
+  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
+  #     end
+  #     assert_includes out, "New File #{destination_file} created\n"
+  #     refute_nil(hns_bucket.file(destination_file))
+  #     assert_nil(hns_bucket.file(source_file))
+  #   end
+
+  #   it "raises error if source and destination are having same filename" do
+  #     create_source_file
+  #     exception = assert_raises Google::Cloud::InvalidArgumentError do
+  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
+  #     end
+  #     assert_equal "invalid: Source and destination object names must be different.", exception.message
+  #   end
+  # end
 end

From 8b96a00ee9c5cd9b9fba88e66f79f1ddca882ec0 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 13:21:09 +0000
Subject: [PATCH 088/100] try

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 5 ++++-
 google-cloud-storage/samples/acceptance/helper.rb       | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 13d7d7ed98c4..90f783ab609f 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -134,8 +134,11 @@
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       # fetching a soft deleted bucket
-            puts "project_name while bucket creation"
+      puts "project_name while bucket creation"
       puts new_bucket.service.project
+            puts "service account while bucket creation"
+
+      puts storage_client.service_account_email
       # output, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       # end
diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 898d5f599026..85792d975057 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -42,6 +42,9 @@ def delete_bucket_helper bucket_name
   storage_client = Google::Cloud::Storage.new
   puts "project_name while deleting the bucket"
   puts storage_client.project
+              puts "service account while bucket creation"
+
+      puts storage_client.service_account_email
   retry_resource_exhaustion do
     bucket = storage_client.bucket bucket_name
     return unless bucket

From 83336e251f02ef2a7ee751ec8d94a2f35703aed9 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 14:24:58 +0000
Subject: [PATCH 089/100] try

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 90f783ab609f..950532482f47 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -136,9 +136,9 @@
       # fetching a soft deleted bucket
       puts "project_name while bucket creation"
       puts new_bucket.service.project
-            puts "service account while bucket creation"
-
-      puts storage_client.service_account_email
+      puts "service account while bucket creation"
+      puts new_bucket.policy
+      # binding.pry
       # output, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
       # end

From d771df21dbc001b8f3c33fb041161702d6b3f4b9 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 14:53:41 +0000
Subject: [PATCH 090/100] try

---
 .../samples/acceptance/buckets_test.rb          | 16 +++++-----------
 .../samples/acceptance/helper.rb                | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 950532482f47..5695d80de2d6 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -56,7 +56,7 @@
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
 require_relative "../storage_move_object"
-# require 'pry'
+require 'pry'
 # Google::Apis.logger.level = Logger::DEBUG
 
 describe "Buckets Snippets" do
@@ -126,7 +126,7 @@
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
-    let(:new_bucket) { storage_client.create_bucket new_bucket_name }
+    let(:new_bucket) { create_bucket_helper new_bucket_name }
     let(:new_generation) { new_bucket.generation }
     before do
       delete_bucket_helper new_bucket.name
@@ -134,16 +134,10 @@
 
     it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
       # fetching a soft deleted bucket
-      puts "project_name while bucket creation"
-      puts new_bucket.service.project
-      puts "service account while bucket creation"
-      puts new_bucket.policy
-      # binding.pry
-      # output, _err = capture_io do
+      output, _err = capture_io do
         get_soft_deleted_bucket bucket_name: new_bucket_name, generation: new_generation
-      # end
-
-      # assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+      end
+      assert_includes output, "soft_delete_time for #{new_bucket_name} is"
     end
 
     it "lists soft deleted buckets" do
diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 85792d975057..6d67aad421b0 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -25,6 +25,22 @@
 require "ostruct"
 
 
+def grant_storage_permissions bucket_name:
+  storage = Google::Cloud::Storage.new
+  bucket = storage.bucket bucket_name
+
+  object_viewer = "roles/storage.objectViewer"
+  bucket_reader = "roles/storage.legacyBucketReader"
+  bucket_writer = "roles/storage.legacyBucketWriter"
+  member = "serviceAccount:#{storage.service_account_email}"
+
+  bucket.policy do |p|
+    p.add object_viewer,
+          member
+  end
+  bucket
+
+end
 def fixture_bucket
   storage_client = Google::Cloud::Storage.new
   storage_client.bucket($fixture_bucket_name) ||
@@ -36,6 +52,7 @@ def create_bucket_helper bucket_name
   retry_resource_exhaustion do
     storage_client.create_bucket bucket_name
   end
+  # grant_storage_permissions bucket_name: bucket_name
 end
 
 def delete_bucket_helper bucket_name

From 50238bef321817561385a426ce6dd26aa3dd1237 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 15:05:21 +0000
Subject: [PATCH 091/100] try

---
 google-cloud-storage/samples/acceptance/buckets_test.rb | 2 --
 google-cloud-storage/samples/acceptance/helper.rb       | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 5695d80de2d6..1ed31c133a9e 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -56,8 +56,6 @@
 require_relative "../storage_get_autoclass"
 require_relative "../storage_set_autoclass"
 require_relative "../storage_move_object"
-require 'pry'
-# Google::Apis.logger.level = Logger::DEBUG
 
 describe "Buckets Snippets" do
   let(:storage_client)   { Google::Cloud::Storage.new }
diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 6d67aad421b0..284ea5dc054b 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -57,15 +57,9 @@ def create_bucket_helper bucket_name
 
 def delete_bucket_helper bucket_name
   storage_client = Google::Cloud::Storage.new
-  puts "project_name while deleting the bucket"
-  puts storage_client.project
-              puts "service account while bucket creation"
-
-      puts storage_client.service_account_email
   retry_resource_exhaustion do
     bucket = storage_client.bucket bucket_name
     return unless bucket
-
     bucket.files.each(&:delete)
     bucket.delete
   end

From 3da781e90e61de7252268b92b3d64c8431ea1610 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 15:15:45 +0000
Subject: [PATCH 092/100] try

---
 google-cloud-storage/samples/acceptance/helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 284ea5dc054b..b7488fe86c18 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -30,8 +30,8 @@ def grant_storage_permissions bucket_name:
   bucket = storage.bucket bucket_name
 
   object_viewer = "roles/storage.objectViewer"
-  bucket_reader = "roles/storage.legacyBucketReader"
-  bucket_writer = "roles/storage.legacyBucketWriter"
+  # bucket_reader = "roles/storage.legacyBucketReader"
+  # bucket_writer = "roles/storage.legacyBucketWriter"
   member = "serviceAccount:#{storage.service_account_email}"
 
   bucket.policy do |p|
@@ -52,7 +52,7 @@ def create_bucket_helper bucket_name
   retry_resource_exhaustion do
     storage_client.create_bucket bucket_name
   end
-  # grant_storage_permissions bucket_name: bucket_name
+  grant_storage_permissions bucket_name: bucket_name
 end
 
 def delete_bucket_helper bucket_name

From 71a3c69714253228210a00344a7ee3f93c02c72a Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 15:27:14 +0000
Subject: [PATCH 093/100] try

---
 google-cloud-storage/samples/acceptance/helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index b7488fe86c18..a62b0efb9dd6 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -29,13 +29,13 @@ def grant_storage_permissions bucket_name:
   storage = Google::Cloud::Storage.new
   bucket = storage.bucket bucket_name
 
-  object_viewer = "roles/storage.objectViewer"
-  # bucket_reader = "roles/storage.legacyBucketReader"
+  # object_viewer = "roles/storage.objectViewer"
+  bucket_reader = "roles/storage.legacyBucketReader"
   # bucket_writer = "roles/storage.legacyBucketWriter"
   member = "serviceAccount:#{storage.service_account_email}"
 
   bucket.policy do |p|
-    p.add object_viewer,
+    p.add bucket_reader,
           member
   end
   bucket

From f5dd234aa9b5299ea0c952470aea06bfd5081b2d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 15:44:10 +0000
Subject: [PATCH 094/100] try

---
 google-cloud-storage/samples/acceptance/helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index a62b0efb9dd6..834c1593de22 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -30,7 +30,7 @@ def grant_storage_permissions bucket_name:
   bucket = storage.bucket bucket_name
 
   # object_viewer = "roles/storage.objectViewer"
-  bucket_reader = "roles/storage.legacyBucketReader"
+  bucket_reader = "roles/storage.admin"
   # bucket_writer = "roles/storage.legacyBucketWriter"
   member = "serviceAccount:#{storage.service_account_email}"
 

From cc9b66501a3035f7cf8e3af9f345a1f597c0550d Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Fri, 1 Aug 2025 15:44:45 +0000
Subject: [PATCH 095/100] try

---
 google-cloud-storage/samples/acceptance/helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 834c1593de22..9f1eb43b9722 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -38,6 +38,7 @@ def grant_storage_permissions bucket_name:
     p.add bucket_reader,
           member
   end
+  puts bucket.policy
   bucket
 
 end

From a675a90d247c0b24b853e0616afede1ebbdb8893 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 5 Aug 2025 10:38:43 +0000
Subject: [PATCH 096/100] cleanup

---
 .../samples/acceptance/buckets_test.rb        | 1082 ++++++++---------
 .../samples/acceptance/helper.rb              |    8 +-
 2 files changed, 543 insertions(+), 547 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/buckets_test.rb b/google-cloud-storage/samples/acceptance/buckets_test.rb
index 1ed31c133a9e..f52369be664e 100644
--- a/google-cloud-storage/samples/acceptance/buckets_test.rb
+++ b/google-cloud-storage/samples/acceptance/buckets_test.rb
@@ -63,64 +63,64 @@
   let(:retention_period) { rand 1..99 }
   let(:bucket) { fixture_bucket }
 
-  # describe "bucket lifecycle" do
-  #   it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
-  #     # create_bucket
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket: #{bucket_name}\n" do
-  #         create_bucket bucket_name: bucket_name
-  #       end
-  #     end
+  describe "bucket lifecycle" do
+    it "create_bucket, create_bucket_class_location, list_buckets, get_bucket_metadata, delete_bucket" do
+      # create_bucket
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      retry_resource_exhaustion do
+        assert_output "Created bucket: #{bucket_name}\n" do
+          create_bucket bucket_name: bucket_name
+        end
+      end
 
-  #     refute_nil storage_client.bucket bucket_name
+      refute_nil storage_client.bucket bucket_name
 
-  #     # create_bucket_class_location
+      # create_bucket_class_location
 
-  #     secondary_bucket_name = random_bucket_name
-  #     location = "ASIA"
-  #     storage_class = "COLDLINE"
-  #     refute storage_client.bucket secondary_bucket_name
+      secondary_bucket_name = random_bucket_name
+      location = "ASIA"
+      storage_class = "COLDLINE"
+      refute storage_client.bucket secondary_bucket_name
 
-  #     retry_resource_exhaustion do
-  #       assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
-  #         create_bucket_class_location bucket_name: secondary_bucket_name
-  #       end
-  #     end
+      retry_resource_exhaustion do
+        assert_output "Created bucket #{secondary_bucket_name} in #{location} with #{storage_class} class\n" do
+          create_bucket_class_location bucket_name: secondary_bucket_name
+        end
+      end
 
-  #     secondary_bucket = storage_client.bucket secondary_bucket_name
-  #     refute_nil secondary_bucket
-  #     assert_equal location, secondary_bucket.location
-  #     assert_equal storage_class, secondary_bucket.storage_class
+      secondary_bucket = storage_client.bucket secondary_bucket_name
+      refute_nil secondary_bucket
+      assert_equal location, secondary_bucket.location
+      assert_equal storage_class, secondary_bucket.storage_class
 
-  #     # list_buckets
-  #     out, _err = capture_io do
-  #       list_buckets
-  #     end
+      # list_buckets
+      out, _err = capture_io do
+        list_buckets
+      end
 
-  #     assert_includes out, "ruby-storage-samples-"
+      assert_includes out, "ruby-storage-samples-"
 
-  #     # get_bucket_metadata
-  #     out, _err = capture_io do
-  #       get_bucket_metadata bucket_name: bucket_name
-  #     end
+      # get_bucket_metadata
+      out, _err = capture_io do
+        get_bucket_metadata bucket_name: bucket_name
+      end
 
-  #     assert_includes out, bucket_name
+      assert_includes out, bucket_name
 
-  #     # delete_bucket
-  #     assert_output "Deleted bucket: #{bucket_name}\n" do
-  #       delete_bucket bucket_name: bucket_name
-  #     end
+      # delete_bucket
+      assert_output "Deleted bucket: #{bucket_name}\n" do
+        delete_bucket bucket_name: bucket_name
+      end
 
 
-  #     refute storage_client.bucket bucket_name
+      refute storage_client.bucket bucket_name
 
-  #     delete_bucket_helper bucket_name
-  #     delete_bucket_helper secondary_bucket_name
-  #   end
-  # end
+      delete_bucket_helper bucket_name
+      delete_bucket_helper secondary_bucket_name
+    end
+  end
 
   describe "storage_soft_deleted_bucket" do
     let(:new_bucket_name) { random_bucket_name }
@@ -147,500 +147,500 @@
     end
   end
 
-  # describe "storage_create_bucket_dual_region" do
-  #   it "creates dual region bucket" do
-  #     location = "US"
-  #     region_1 = "US-EAST1"
-  #     region_2 = "US-WEST1"
-  #     location_type = "dual-region"
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Bucket #{bucket_name} created:\n"
-  #     expected += "- location: #{location}\n"
-  #     expected += "- location_type: #{location_type}\n"
-  #     expected += "- custom_placement_config:\n"
-  #     expected += "  - data_locations: #{[region_1, region_2]}\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
-  #                                                                             region_1: region_1,
-  #                                                                             region_2: region_2
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_hierarchical_namespace" do
-  #   it "creates hierarchical namespace enabled bucket" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_hierarchical_namespace bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "storage_create_bucket_with_object_retention" do
-  #   it "creates a bucket with object retention enabled." do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
-
-  #     retry_resource_exhaustion do
-  #       assert_output expected do
-  #         create_bucket_with_object_retention bucket_name: bucket_name
-  #       end
-  #     end
-
-  #     refute_nil storage_client.bucket bucket_name
-
-  #     file_name = "test_object_retention"
-
-  #     bucket = storage_client.bucket bucket_name
-
-  #     out, _err = capture_io do
-  #       set_object_retention_policy bucket_name: bucket.name,
-  #                                   content: "hello world",
-  #                                   destination_file_name: file_name
-  #     end
-
-  #     assert_includes out, "Retention policy for file #{file_name}"
-
-  #     file = bucket.file file_name
-  #     file.retention = {
-  #       mode: nil,
-  #       retain_until_time: nil,
-  #       override_unlocked_retention: true
-  #     }
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "autoclass" do
-  #   it "get_autoclass, set_autoclass" do
-  #     bucket_name = random_bucket_name
-  #     refute storage_client.bucket bucket_name
-
-  #     storage_client.create_bucket bucket_name, autoclass_enabled: true
-
-  #     assert_output(/autoclass config set to true./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to NEARLINE./) do
-  #       get_autoclass bucket_name: bucket_name
-  #     end
-
-  #     assert_output(/autoclass terminal storage class set to ARCHIVE./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
-  #     end
-
-  #     assert_output(/autoclass config set to false./) do
-  #       set_autoclass bucket_name: bucket_name, toggle: false
-  #     end
-
-  #     delete_bucket_helper bucket_name
-  #   end
-  # end
-
-  # describe "cors" do
-  #   it "cors_configuration, remove_cors_configuration" do
-  #     bucket.cors { |c| c.clear }
-  #     assert bucket.cors.empty?
-
-  #     # cors_configuration
-  #     assert_output "Set CORS policies for bucket #{bucket.name}\n" do
-  #       cors_configuration bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal 1, bucket.cors.count
-  #     rule = bucket.cors.first
-  #     assert_equal ["*"], rule.origin
-  #     assert_equal ["PUT", "POST"], rule.methods
-  #     assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
-  #     assert_equal 3600, rule.max_age
-
-  #     # remove_cors_configuration
-  #     assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
-  #       remove_cors_configuration bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.cors.empty?
-  #   end
-  # end
-
-  # describe "requester_pays" do
-  #   it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
-  #     # enable_requester_pays
-  #     bucket.requester_pays = false
-
-  #     assert_output "Requester pays has been enabled for #{bucket.name}\n" do
-  #       enable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is enabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     assert bucket.requester_pays?
-
-  #     # disable_requester_pays
-  #     assert_output "Requester pays has been disabled for #{bucket.name}\n" do
-  #       disable_requester_pays bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.requester_pays?
-
-  #     # get_requester_pays_status
-  #     assert_output "Requester pays status is disabled for #{bucket.name}\n" do
-  #       get_requester_pays_status bucket_name: bucket.name
-  #     end
-  #     refute bucket.requester_pays?
-  #   end
-  # end
-
-  # describe "uniform_bucket_level_access" do
-  #   it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
-  #     # enable_uniform_bucket_level_access
-  #     bucket.uniform_bucket_level_access = false
-
-  #     assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
-  #       enable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
-  #                   "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     assert bucket.uniform_bucket_level_access?
-
-  #     # disable_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
-  #       disable_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     # get_uniform_bucket_level_access
-  #     assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
-  #       get_uniform_bucket_level_access bucket_name: bucket.name
-  #     end
-  #     refute bucket.uniform_bucket_level_access?
-
-  #     bucket.uniform_bucket_level_access = false
-  #   end
-  # end
-
-  # describe "default Cloud KMS encryption key" do
-  #   it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
-  #     refute bucket.default_kms_key
-
-  #     # set_bucket_default_kms_key
-  #     assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
-  #       set_bucket_default_kms_key bucket_name:     bucket.name,
-  #                                  default_kms_key: kms_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.default_kms_key, kms_key
-
-  #     # bucket_delete_default_kms_key
-  #     assert_output "Default KMS key was removed from #{bucket.name}\n" do
-  #       bucket_delete_default_kms_key bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_kms_key
-  #   end
-  # end
-
-  # describe "get bucket class and location data" do
-  #   bucket_name = random_bucket_name
-  #   location = "US"
-  #   storage_class = "COLDLINE"
-
-  #   it "get_bucket_class_and_location" do
-  #     storage_client.create_bucket bucket_name,
-  #                                  location: location,
-  #                                  storage_class: storage_class
-  #     expected_output = "Bucket #{bucket_name} storage class is " \
-  #                       "#{storage_class}, and the location is #{location}\n"
-  #     assert_output expected_output do
-  #       get_bucket_class_and_location bucket_name: bucket_name
-  #     end
-  #   end
-  # end
-
-  # describe "labels" do
-  #   it "add_bucket_label, remove_bucket_label" do
-  #     # add_bucket_label
-  #     label_key = "label_key"
-  #     label_value = "label_value"
-
-  #     assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
-  #       add_bucket_label bucket_name: bucket.name,
-  #                        label_value: label_value,
-  #                        label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.labels[label_key], label_value
-
-  #     # remove_bucket_label
-  #     assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
-  #       remove_bucket_label bucket_name: bucket.name,
-  #                           label_key:   label_key
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.labels[label_key].empty?
-  #   end
-  # end
-
-  # describe "lifecycle management" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
-  #     # enable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       enable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is enabled"
-
-  #     # disable_bucket_lifecycle_management
-  #     out, _err = capture_io do
-  #       disable_bucket_lifecycle_management bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Lifecycle management is disabled"
-  #   end
-  # end
-
-  # describe "retention policy" do
-  #   let(:bucket) { create_bucket_helper random_bucket_name }
-  #   after { delete_bucket_helper bucket.name }
-
-  #   it "set_retention_policy, get_retention_policy, remove_retention_policy" do
-  #     # set_retention_policy
-  #     assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
-  #       set_retention_policy bucket_name:      bucket.name,
-  #                            retention_period: retention_period
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal bucket.retention_period, retention_period
-
-  #     # get_retention_policy
-  #     out, _err = capture_io do
-  #       get_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "period: #{retention_period}\n"
-
-  #     # remove_retention_policy
-  #     assert_equal bucket.retention_period, retention_period
-  #     assert_output "Retention policy for #{bucket.name} has been removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.retention_period
-
-  #     # lock_retention_policy
-  #     bucket.retention_period = retention_period
-  #     out, _err = capture_io do
-  #       lock_retention_policy bucket_name: bucket.name
-  #     end
-
-  #     assert_includes out, "Retention policy for #{bucket.name} is now locked."
-  #     bucket.refresh!
-  #     assert bucket.retention_policy_locked?
-
-  #     # remove_retention_policy
-  #     assert_output "Policy is locked and retention policy can't be removed.\n" do
-  #       remove_retention_policy bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "default_event_based_hold" do
-  #   it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
-  #     # enable_default_event_based_hold
-  #     assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
-  #       enable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     # disable_default_event_based_hold
-  #     bucket.update do |b|
-  #       b.default_event_based_hold = true
-  #     end
-
-  #     assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
-  #       disable_default_event_based_hold bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     refute bucket.default_event_based_hold?
-
-  #     # get_default_event_based_hold
-  #     assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
-  #       get_default_event_based_hold bucket_name: bucket.name
-  #     end
-  #   end
-  # end
-
-  # describe "storage_class" do
-  #   it "change_default_storage_class" do
-  #     assert_equal "STANDARD", bucket.storage_class
-
-  #     assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
-  #       change_default_storage_class bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal "COLDLINE", bucket.storage_class
-  #     # teardown
-  #     bucket.storage_class = "STANDARD"
-  #   end
-  # end
-
-  # describe "versioning" do
-  #   it "enable_versioning, disable_versioning" do
-  #     # enable_versioning
-  #     bucket.versioning = false
-
-  #     assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
-  #       enable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     assert bucket.versioning?
-
-  #     # disable_versioning
-  #     assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
-  #       disable_versioning bucket_name: bucket.name
-  #     end
-  #     bucket.refresh!
-  #     refute bucket.versioning?
-  #   end
-  # end
-
-  # describe "website_configuration" do
-  #   let(:main_page_suffix) { "index.html" }
-  #   let(:not_found_page) { "404.html" }
-
-  #   it "define_bucket_website_configuration" do
-  #     expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
-  #                    "and #{not_found_page} as the 404 page\n"
-
-  #     assert_output expected_out do
-  #       define_bucket_website_configuration bucket_name:      bucket.name,
-  #                                           main_page_suffix: main_page_suffix,
-  #                                           not_found_page:   not_found_page
-  #     end
-
-  #     bucket.refresh!
-  #     assert_equal main_page_suffix, bucket.website_main
-  #     assert_equal not_found_page, bucket.website_404
-  #   end
-  # end
-
-  # describe "public_access_prevention" do
-  #   it "set_public_access_prevention_enforced, get_public_access_prevention, " \
-  #      "set_public_access_prevention_inherited" do
-  #     bucket.public_access_prevention = :inherited
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-
-  #     # set_public_access_prevention_enforced
-  #     assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
-  #       set_public_access_prevention_enforced bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # get_public_access_prevention
-  #     assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
-  #       get_public_access_prevention bucket_name: bucket.name
-  #     end
-  #     _(bucket.public_access_prevention).must_equal "enforced"
-
-  #     # set_public_access_prevention_inherited
-  #     assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
-  #       set_public_access_prevention_inherited bucket_name: bucket.name
-  #     end
-
-  #     bucket.refresh!
-  #     _(bucket.public_access_prevention).must_equal "inherited"
-  #     bucket.public_access_prevention = :inherited
-  #   end
-  # end
-
-  # describe "storage move file" do
-  #   let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
-  #   let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
-  #   let :hns_bucket do
-  #     hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
-  #     storage_client.create_bucket random_bucket_name do |b|
-  #       b.uniform_bucket_level_access = true
-  #       b.hierarchical_namespace = hierarchical_namespace
-  #     end
-  #   end
-  #   let :create_source_file do
-  #     file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
-  #     file = StringIO.new file_content
-  #     hns_bucket.create_file file, source_file
-  #   end
-  #   it "file is moved and old file is deleted" do
-  #     create_source_file
-  #     out, _err = capture_io do
-  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
-  #     end
-  #     assert_includes out, "New File #{destination_file} created\n"
-  #     refute_nil(hns_bucket.file(destination_file))
-  #     assert_nil(hns_bucket.file(source_file))
-  #   end
-
-  #   it "raises error if source and destination are having same filename" do
-  #     create_source_file
-  #     exception = assert_raises Google::Cloud::InvalidArgumentError do
-  #       move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
-  #     end
-  #     assert_equal "invalid: Source and destination object names must be different.", exception.message
-  #   end
-  # end
+  describe "storage_create_bucket_dual_region" do
+    it "creates dual region bucket" do
+      location = "US"
+      region_1 = "US-EAST1"
+      region_2 = "US-WEST1"
+      location_type = "dual-region"
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Bucket #{bucket_name} created:\n"
+      expected += "- location: #{location}\n"
+      expected += "- location_type: #{location_type}\n"
+      expected += "- custom_placement_config:\n"
+      expected += "  - data_locations: #{[region_1, region_2]}\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          StorageCreateBucketDualRegion.new.storage_create_bucket_dual_region bucket_name: bucket_name,
+                                                                              region_1: region_1,
+                                                                              region_2: region_2
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "storage_create_bucket_hierarchical_namespace" do
+    it "creates hierarchical namespace enabled bucket" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with Hierarchical Namespace enabled.\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_hierarchical_namespace bucket_name: bucket_name
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "storage_create_bucket_with_object_retention" do
+    it "creates a bucket with object retention enabled." do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      expected = "Created bucket #{bucket_name} with object retention setting: Enabled\n"
+
+      retry_resource_exhaustion do
+        assert_output expected do
+          create_bucket_with_object_retention bucket_name: bucket_name
+        end
+      end
+
+      refute_nil storage_client.bucket bucket_name
+
+      file_name = "test_object_retention"
+
+      bucket = storage_client.bucket bucket_name
+
+      out, _err = capture_io do
+        set_object_retention_policy bucket_name: bucket.name,
+                                    content: "hello world",
+                                    destination_file_name: file_name
+      end
+
+      assert_includes out, "Retention policy for file #{file_name}"
+
+      file = bucket.file file_name
+      file.retention = {
+        mode: nil,
+        retain_until_time: nil,
+        override_unlocked_retention: true
+      }
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "autoclass" do
+    it "get_autoclass, set_autoclass" do
+      bucket_name = random_bucket_name
+      refute storage_client.bucket bucket_name
+
+      storage_client.create_bucket bucket_name, autoclass_enabled: true
+
+      assert_output(/autoclass config set to true./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to NEARLINE./) do
+        get_autoclass bucket_name: bucket_name
+      end
+
+      assert_output(/autoclass terminal storage class set to ARCHIVE./) do
+        set_autoclass bucket_name: bucket_name, toggle: true, terminal_storage_class: "ARCHIVE"
+      end
+
+      assert_output(/autoclass config set to false./) do
+        set_autoclass bucket_name: bucket_name, toggle: false
+      end
+
+      delete_bucket_helper bucket_name
+    end
+  end
+
+  describe "cors" do
+    it "cors_configuration, remove_cors_configuration" do
+      bucket.cors { |c| c.clear }
+      assert bucket.cors.empty?
+
+      # cors_configuration
+      assert_output "Set CORS policies for bucket #{bucket.name}\n" do
+        cors_configuration bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert_equal 1, bucket.cors.count
+      rule = bucket.cors.first
+      assert_equal ["*"], rule.origin
+      assert_equal ["PUT", "POST"], rule.methods
+      assert_equal ["Content-Type", "x-goog-resumable"], rule.headers
+      assert_equal 3600, rule.max_age
+
+      # remove_cors_configuration
+      assert_output "Remove CORS policies for bucket #{bucket.name}\n" do
+        remove_cors_configuration bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.cors.empty?
+    end
+  end
+
+  describe "requester_pays" do
+    it "enable_requester_pays, disable_requester_pays, get_requester_pays_status" do
+      # enable_requester_pays
+      bucket.requester_pays = false
+
+      assert_output "Requester pays has been enabled for #{bucket.name}\n" do
+        enable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is enabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      assert bucket.requester_pays?
+
+      # disable_requester_pays
+      assert_output "Requester pays has been disabled for #{bucket.name}\n" do
+        disable_requester_pays bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.requester_pays?
+
+      # get_requester_pays_status
+      assert_output "Requester pays status is disabled for #{bucket.name}\n" do
+        get_requester_pays_status bucket_name: bucket.name
+      end
+      refute bucket.requester_pays?
+    end
+  end
+
+  describe "uniform_bucket_level_access" do
+    it "enable_uniform_bucket_level_access, get_uniform_bucket_level_access, disable_uniform_bucket_level_access" do
+      # enable_uniform_bucket_level_access
+      bucket.uniform_bucket_level_access = false
+
+      assert_output "Uniform bucket-level access was enabled for #{bucket.name}.\n" do
+        enable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is enabled for #{bucket.name}.\nBucket " \
+                    "will be locked on #{bucket.uniform_bucket_level_access_locked_at}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      assert bucket.uniform_bucket_level_access?
+
+      # disable_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access was disabled for #{bucket.name}.\n" do
+        disable_uniform_bucket_level_access bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.uniform_bucket_level_access?
+
+      # get_uniform_bucket_level_access
+      assert_output "Uniform bucket-level access is disabled for #{bucket.name}.\n" do
+        get_uniform_bucket_level_access bucket_name: bucket.name
+      end
+      refute bucket.uniform_bucket_level_access?
+
+      bucket.uniform_bucket_level_access = false
+    end
+  end
+
+  describe "default Cloud KMS encryption key" do
+    it "set_bucket_default_kms_key, bucket_delete_default_kms_key" do
+      refute bucket.default_kms_key
+
+      # set_bucket_default_kms_key
+      assert_output "Default KMS key for #{bucket.name} was set to #{kms_key}\n" do
+        set_bucket_default_kms_key bucket_name:     bucket.name,
+                                   default_kms_key: kms_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.default_kms_key, kms_key
+
+      # bucket_delete_default_kms_key
+      assert_output "Default KMS key was removed from #{bucket.name}\n" do
+        bucket_delete_default_kms_key bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_kms_key
+    end
+  end
+
+  describe "get bucket class and location data" do
+    bucket_name = random_bucket_name
+    location = "US"
+    storage_class = "COLDLINE"
+
+    it "get_bucket_class_and_location" do
+      storage_client.create_bucket bucket_name,
+                                   location: location,
+                                   storage_class: storage_class
+      expected_output = "Bucket #{bucket_name} storage class is " \
+                        "#{storage_class}, and the location is #{location}\n"
+      assert_output expected_output do
+        get_bucket_class_and_location bucket_name: bucket_name
+      end
+    end
+  end
+
+  describe "labels" do
+    it "add_bucket_label, remove_bucket_label" do
+      # add_bucket_label
+      label_key = "label_key"
+      label_value = "label_value"
+
+      assert_output "Added label #{label_key} with value #{label_value} to #{bucket.name}\n" do
+        add_bucket_label bucket_name: bucket.name,
+                         label_value: label_value,
+                         label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert_equal bucket.labels[label_key], label_value
+
+      # remove_bucket_label
+      assert_output "Deleted label #{label_key} from #{bucket.name}\n" do
+        remove_bucket_label bucket_name: bucket.name,
+                            label_key:   label_key
+      end
+
+      bucket.refresh!
+      assert bucket.labels[label_key].empty?
+    end
+  end
+
+  describe "lifecycle management" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "enable_bucket_lifecycle_management, disable_bucket_lifecycle_management" do
+      # enable_bucket_lifecycle_management
+      out, _err = capture_io do
+        enable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is enabled"
+
+      # disable_bucket_lifecycle_management
+      out, _err = capture_io do
+        disable_bucket_lifecycle_management bucket_name: bucket.name
+      end
+
+      assert_includes out, "Lifecycle management is disabled"
+    end
+  end
+
+  describe "retention policy" do
+    let(:bucket) { create_bucket_helper random_bucket_name }
+    after { delete_bucket_helper bucket.name }
+
+    it "set_retention_policy, get_retention_policy, remove_retention_policy" do
+      # set_retention_policy
+      assert_output "Retention period for #{bucket.name} is now #{retention_period} seconds.\n" do
+        set_retention_policy bucket_name:      bucket.name,
+                             retention_period: retention_period
+      end
+
+      bucket.refresh!
+      assert_equal bucket.retention_period, retention_period
+
+      # get_retention_policy
+      out, _err = capture_io do
+        get_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "period: #{retention_period}\n"
+
+      # remove_retention_policy
+      assert_equal bucket.retention_period, retention_period
+      assert_output "Retention policy for #{bucket.name} has been removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.retention_period
+
+      # lock_retention_policy
+      bucket.retention_period = retention_period
+      out, _err = capture_io do
+        lock_retention_policy bucket_name: bucket.name
+      end
+
+      assert_includes out, "Retention policy for #{bucket.name} is now locked."
+      bucket.refresh!
+      assert bucket.retention_policy_locked?
+
+      # remove_retention_policy
+      assert_output "Policy is locked and retention policy can't be removed.\n" do
+        remove_retention_policy bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "default_event_based_hold" do
+    it "enable_default_event_based_hold, get_default_event_based_hold, disable_default_event_based_hold" do
+      # enable_default_event_based_hold
+      assert_output "Default event-based hold was enabled for #{bucket.name}.\n" do
+        enable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+
+      # disable_default_event_based_hold
+      bucket.update do |b|
+        b.default_event_based_hold = true
+      end
+
+      assert_output "Default event-based hold was disabled for #{bucket.name}.\n" do
+        disable_default_event_based_hold bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      refute bucket.default_event_based_hold?
+
+      # get_default_event_based_hold
+      assert_output "Default event-based hold is not enabled for #{bucket.name}.\n" do
+        get_default_event_based_hold bucket_name: bucket.name
+      end
+    end
+  end
+
+  describe "storage_class" do
+    it "change_default_storage_class" do
+      assert_equal "STANDARD", bucket.storage_class
+
+      assert_output "Default storage class for bucket #{bucket.name} has been set to COLDLINE\n" do
+        change_default_storage_class bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      assert_equal "COLDLINE", bucket.storage_class
+      # teardown
+      bucket.storage_class = "STANDARD"
+    end
+  end
+
+  describe "versioning" do
+    it "enable_versioning, disable_versioning" do
+      # enable_versioning
+      bucket.versioning = false
+
+      assert_output "Versioning was enabled for bucket #{bucket.name}\n" do
+        enable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      assert bucket.versioning?
+
+      # disable_versioning
+      assert_output "Versioning was disabled for bucket #{bucket.name}\n" do
+        disable_versioning bucket_name: bucket.name
+      end
+      bucket.refresh!
+      refute bucket.versioning?
+    end
+  end
+
+  describe "website_configuration" do
+    let(:main_page_suffix) { "index.html" }
+    let(:not_found_page) { "404.html" }
+
+    it "define_bucket_website_configuration" do
+      expected_out = "Static website bucket #{bucket.name} is set up to use #{main_page_suffix} as the index page " \
+                     "and #{not_found_page} as the 404 page\n"
+
+      assert_output expected_out do
+        define_bucket_website_configuration bucket_name:      bucket.name,
+                                            main_page_suffix: main_page_suffix,
+                                            not_found_page:   not_found_page
+      end
+
+      bucket.refresh!
+      assert_equal main_page_suffix, bucket.website_main
+      assert_equal not_found_page, bucket.website_404
+    end
+  end
+
+  describe "public_access_prevention" do
+    it "set_public_access_prevention_enforced, get_public_access_prevention, " \
+       "set_public_access_prevention_inherited" do
+      bucket.public_access_prevention = :inherited
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+
+      # set_public_access_prevention_enforced
+      assert_output "Public access prevention is set to enforced for #{bucket.name}.\n" do
+        set_public_access_prevention_enforced bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # get_public_access_prevention
+      assert_output "Public access prevention is 'enforced' for #{bucket.name}.\n" do
+        get_public_access_prevention bucket_name: bucket.name
+      end
+      _(bucket.public_access_prevention).must_equal "enforced"
+
+      # set_public_access_prevention_inherited
+      assert_output "Public access prevention is 'inherited' for #{bucket.name}.\n" do
+        set_public_access_prevention_inherited bucket_name: bucket.name
+      end
+
+      bucket.refresh!
+      _(bucket.public_access_prevention).must_equal "inherited"
+      bucket.public_access_prevention = :inherited
+    end
+  end
+
+  describe "storage move file" do
+    let(:source_file) { "file_1_name_#{SecureRandom.hex}.txt" }
+    let(:destination_file) { "file_2_name_#{SecureRandom.hex}.txt" }
+    let :hns_bucket do
+      hierarchical_namespace = Google::Apis::StorageV1::Bucket::HierarchicalNamespace.new enabled: true
+      storage_client.create_bucket random_bucket_name do |b|
+        b.uniform_bucket_level_access = true
+        b.hierarchical_namespace = hierarchical_namespace
+      end
+    end
+    let :create_source_file do
+      file_content = "A" * (3 * 1024 * 1024) # 3 MB of 'A' characters
+      file = StringIO.new file_content
+      hns_bucket.create_file file, source_file
+    end
+    it "file is moved and old file is deleted" do
+      create_source_file
+      out, _err = capture_io do
+        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: destination_file
+      end
+      assert_includes out, "New File #{destination_file} created\n"
+      refute_nil(hns_bucket.file(destination_file))
+      assert_nil(hns_bucket.file(source_file))
+    end
+
+    it "raises error if source and destination are having same filename" do
+      create_source_file
+      exception = assert_raises Google::Cloud::InvalidArgumentError do
+        move_object bucket_name: hns_bucket.name, source_file_name: source_file, destination_file_name: source_file
+      end
+      assert_equal "invalid: Source and destination object names must be different.", exception.message
+    end
+  end
 end
diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index 9f1eb43b9722..f68439cc0f67 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -29,18 +29,14 @@ def grant_storage_permissions bucket_name:
   storage = Google::Cloud::Storage.new
   bucket = storage.bucket bucket_name
 
-  # object_viewer = "roles/storage.objectViewer"
-  bucket_reader = "roles/storage.admin"
-  # bucket_writer = "roles/storage.legacyBucketWriter"
+  storage_admin = "roles/storage.admin"
   member = "serviceAccount:#{storage.service_account_email}"
 
   bucket.policy do |p|
-    p.add bucket_reader,
+    p.add storage_admin,
           member
   end
-  puts bucket.policy
   bucket
-
 end
 def fixture_bucket
   storage_client = Google::Cloud::Storage.new

From 7663fa438e12db0ab6930941570f1d735cb2af4b Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 5 Aug 2025 11:01:18 +0000
Subject: [PATCH 097/100] try

---
 .../samples/acceptance/project_test.rb        | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index ef164975773f..cd0fb62f0471 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -15,12 +15,12 @@
 require_relative "helper"
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
+require_relative "../storage_get_soft_deleted_bucket"
+
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
   let(:bucket) { fixture_bucket }
-  let(:generation) { bucket.generation }
-  let(:new_bucket_name) { random_bucket_name }
 
   it "get_service_account" do
     email = nil
@@ -35,15 +35,26 @@
 
 
 describe "storage_soft_deleted_bucket" do
-  let(:generation) { bucket.generation }
-  let(:bucket) { fixture_bucket }
+  let(:new_bucket_name) { random_bucket_name }
+  let(:new_bucket) { create_bucket_helper new_bucket_name }
+  let(:generation) { new_bucket.generation }
 
+  before do
+    delete_bucket_helper new_bucket.name
+  end
+
+  it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
+    # fetching a soft deleted bucket
+    output, _err = capture_io do
+      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: generation
+    end
+    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
+  end
   it "restores a soft deleted bucket" do
-    delete_bucket_helper bucket.name
     # restoring deleted bucket
     _out, _err = capture_io do
-      restore_bucket bucket_name: bucket.name, generation: generation
+      restore_bucket bucket_name: new_bucket.name, generation: generation
     end
-    assert "#{bucket.name} Bucket restored"
+    assert "#{new_bucket.name} Bucket restored"
   end
 end

From 3188d47f8edbc632dc3f114540083a238504708a Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 5 Aug 2025 11:30:03 +0000
Subject: [PATCH 098/100] try

---
 google-cloud-storage/samples/acceptance/helper.rb       | 1 +
 google-cloud-storage/samples/acceptance/project_test.rb | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/google-cloud-storage/samples/acceptance/helper.rb b/google-cloud-storage/samples/acceptance/helper.rb
index f68439cc0f67..ae423b07315c 100644
--- a/google-cloud-storage/samples/acceptance/helper.rb
+++ b/google-cloud-storage/samples/acceptance/helper.rb
@@ -38,6 +38,7 @@ def grant_storage_permissions bucket_name:
   end
   bucket
 end
+
 def fixture_bucket
   storage_client = Google::Cloud::Storage.new
   storage_client.bucket($fixture_bucket_name) ||
diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index cd0fb62f0471..3d0d25e514ea 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -45,6 +45,9 @@
 
   it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
     # fetching a soft deleted bucket
+    new_bucket
+    puts "--------- new bucket create------------"
+    puts "#{new_bucket_name} created"
     output, _err = capture_io do
       get_soft_deleted_bucket bucket_name: new_bucket_name, generation: generation
     end
@@ -55,6 +58,8 @@
     _out, _err = capture_io do
       restore_bucket bucket_name: new_bucket.name, generation: generation
     end
+    puts "--- bucket restored-----"
+    puts "#{new_bucket.name} Bucket restored"
     assert "#{new_bucket.name} Bucket restored"
   end
 end

From f431611af7f8faca342708c915d67c824ea56494 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 5 Aug 2025 11:30:56 +0000
Subject: [PATCH 099/100] try

---
 google-cloud-storage/samples/acceptance/project_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index 3d0d25e514ea..cea4d36a7ab8 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -55,6 +55,10 @@
   end
   it "restores a soft deleted bucket" do
     # restoring deleted bucket
+
+    new_bucket
+    puts "--------- new bucket create------------"
+    puts "#{new_bucket_name} created"
     _out, _err = capture_io do
       restore_bucket bucket_name: new_bucket.name, generation: generation
     end

From e123edcf5216ff4e5494611b975405647216fcf2 Mon Sep 17 00:00:00 2001
From: Shubhangi Singh <shubhangisin@google.com>
Date: Tue, 5 Aug 2025 12:02:46 +0000
Subject: [PATCH 100/100] cleanup

---
 .../samples/acceptance/project_test.rb         | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/google-cloud-storage/samples/acceptance/project_test.rb b/google-cloud-storage/samples/acceptance/project_test.rb
index cea4d36a7ab8..6152c06bd71d 100644
--- a/google-cloud-storage/samples/acceptance/project_test.rb
+++ b/google-cloud-storage/samples/acceptance/project_test.rb
@@ -15,8 +15,6 @@
 require_relative "helper"
 require_relative "../storage_get_service_account"
 require_relative "../storage_restore_bucket"
-require_relative "../storage_get_soft_deleted_bucket"
-
 
 describe "Storage Quickstart" do
   let(:project) { Google::Cloud::Storage.new }
@@ -43,27 +41,11 @@
     delete_bucket_helper new_bucket.name
   end
 
-  it "get soft deleted bucket, its soft_delete_time and hard_delete_time" do
-    # fetching a soft deleted bucket
-    new_bucket
-    puts "--------- new bucket create------------"
-    puts "#{new_bucket_name} created"
-    output, _err = capture_io do
-      get_soft_deleted_bucket bucket_name: new_bucket_name, generation: generation
-    end
-    assert_includes output, "soft_delete_time for #{new_bucket_name} is"
-  end
   it "restores a soft deleted bucket" do
     # restoring deleted bucket
-
-    new_bucket
-    puts "--------- new bucket create------------"
-    puts "#{new_bucket_name} created"
     _out, _err = capture_io do
       restore_bucket bucket_name: new_bucket.name, generation: generation
     end
-    puts "--- bucket restored-----"
-    puts "#{new_bucket.name} Bucket restored"
     assert "#{new_bucket.name} Bucket restored"
   end
 end