Merge branch 'master' of github.com:rails/activestorage

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/active_storage/service.rb b/lib/active_storage/service.rb
index 9d370d0a2b..127895406f 100644
--- a/lib/active_storage/service.rb
+++ b/lib/active_storage/service.rb
@@ -78,7 +78,7 @@ class ActiveStorage::Service
     raise NotImplementedError
   end
 
-  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
     raise NotImplementedError
   end
 
diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
index 4530de22f6..4632e5f820 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/lib/active_storage/service/gcs_service.rb
@@ -44,7 +44,7 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
 
   def url(key, expires_in:, disposition:, filename:, content_type:)
     instrument :url, key do |payload|
-      generated_url = file_for(key).signed_url expires: expires_in, query: { 
+      generated_url = file_for(key).signed_url expires: expires_in, query: {
         "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"",
         "response-content-type" => content_type
       }
@@ -55,10 +55,10 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
     end
   end
 
-  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
     instrument :url, key do |payload|
       generated_url = bucket.signed_url key, method: "PUT", expires: expires_in,
-        content_type: content_type
+        content_type: content_type, content_md5: checksum
 
       payload[:url] = generated_url
 
diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index 4c17f9902f..72ff9f3f36 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -59,10 +59,10 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service
     end
   end
 
-  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
     instrument :url, key do |payload|
       generated_url = object_for(key).presigned_url :put, expires_in: expires_in,
-        content_type: content_type, content_length: content_length
+        content_type: content_type, content_length: content_length, content_md5: checksum
 
       payload[:url] = generated_url