Merge pull request #2525 from yosiat/fog-google-copy-object

GCS: pass acl_header for public read if fog is public
carrierwaveuploader · Jan 18, 2021 · 09f9f27 · 09f9f27
2 parents 3faf749 + 92a69de
commit 09f9f27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/carrierwave/storage/fog.rb b/lib/carrierwave/storage/fog.rb
@@ -497,6 +497,8 @@ def file
         def acl_header
           if fog_provider == 'AWS'
             { 'x-amz-acl' => @uploader.fog_public ? 'public-read' : 'private' }
+          elsif fog_provider == "Google"
+            @uploader.fog_public ? { destination_predefined_acl: "publicRead" } : {}
           else
             {}
           end

diff --git a/spec/storage/fog_helper.rb b/spec/storage/fog_helper.rb
@@ -69,6 +69,9 @@ def check_file
             if @provider == 'AWS'
               expect(@storage.connection).to receive(:copy_object)
                                               .with(anything, anything, anything, anything, { "x-amz-acl"=>"public-read" }).and_call_original
+            elsif @provider == 'Google'
+              expect(@storage.connection).to receive(:copy_object)
+                                              .with(anything, anything, anything, anything, { destination_predefined_acl: "publicRead" }).and_call_original
             else
               expect(@storage.connection).to receive(:copy_object)
                                               .with(anything, anything, anything, anything, {}).and_call_original