Fix bucket predefined ACL helpers

The file predefined ACL helpers fix applied to bucket and default ACL. [refs googleapis#381]
jeffmendoza · Oct 20, 2015 · 568a9d7 · 568a9d7
1 parent fd63239
commit 568a9d7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/lib/gcloud/storage/bucket/acl.rb b/lib/gcloud/storage/bucket/acl.rb
@@ -477,7 +477,8 @@ def clear!
 
         def update_predefined_acl! acl_role
           resp = @connection.patch_bucket @bucket,
-                                          acl: acl_role
+                                          predefined_acl: acl_role,
+                                          acl: []
 
           return clear! if resp.success?
           fail Gcloud::Storage::ApiError.from_response(resp)
@@ -974,7 +975,8 @@ def clear!
 
         def update_predefined_default_acl! acl_role
           resp = @connection.patch_bucket @bucket,
-                                          default_acl: acl_role
+                                          predefined_default_acl: acl_role,
+                                          default_acl: []
 
           return clear! if resp.success?
           fail Gcloud::Storage::ApiError.from_response(resp)

diff --git a/lib/gcloud/storage/connection.rb b/lib/gcloud/storage/connection.rb
@@ -84,8 +84,8 @@ def insert_bucket bucket_name, options = {}
       # Updates a bucket, including its ACL metadata.
       def patch_bucket bucket_name, options = {}
         params = { bucket: bucket_name,
-                   predefinedAcl: options[:acl],
-                   predefinedDefaultObjectAcl: options[:default_acl]
+                   predefinedAcl: options[:predefined_acl],
+                   predefinedDefaultObjectAcl: options[:predefined_default_acl]
                  }.delete_if { |_, v| v.nil? }
 
         @client.execute(
@@ -324,7 +324,9 @@ def patch_bucket_request options = {}
           "cors" => options[:cors],
           "logging" => logging_config(options),
           "versioning" => versioning_config(options[:versioning]),
-          "website" => website_config(options)
+          "website" => website_config(options),
+          "acl" => options[:acl],
+          "defaultObjectAcl" => options[:default_acl]
         }.delete_if { |_, v| v.nil? }
       end
 

diff --git a/test/gcloud/storage/bucket_acl_test.rb b/test/gcloud/storage/bucket_acl_test.rb
@@ -275,6 +275,7 @@
   def predefined_acl_update acl_role
     mock_connection.patch "/storage/v1/b/#{bucket.name}" do |env|
       env.params["predefinedAcl"].must_equal acl_role
+      JSON.parse(env.body)["acl"].must_equal []
       [200, {"Content-Type"=>"application/json"},
        random_bucket_hash(bucket.name).to_json]
     end

diff --git a/test/gcloud/storage/default_acl_test.rb b/test/gcloud/storage/default_acl_test.rb
@@ -299,6 +299,7 @@
   def predefined_default_acl_update acl_role
     mock_connection.patch "/storage/v1/b/#{bucket.name}" do |env|
       env.params["predefinedDefaultObjectAcl"].must_equal acl_role
+      JSON.parse(env.body)["defaultObjectAcl"].must_equal []
       [200, {"Content-Type"=>"application/json"},
        random_bucket_hash(bucket.name).to_json]
     end