diff options
| author | John Williams <john@basecamp.com> | 2017-07-06 14:04:58 -0500 |
|---|---|---|
| committer | John Williams <john@basecamp.com> | 2017-07-06 14:04:58 -0500 |
| commit | 0eeb8f7ccebc7b5b9e0a5918e36158585fb211aa (patch) | |
| tree | 527327faea6a06beda7b22488925577f8cc93a00 /lib | |
| parent | f8539164c046e162531728b15f764fa8248704f1 (diff) | |
| parent | 1a5219ce87ea6b5d534dd70c0d121c8fa8d2c1f0 (diff) | |
| download | rails-0eeb8f7ccebc7b5b9e0a5918e36158585fb211aa.tar.gz rails-0eeb8f7ccebc7b5b9e0a5918e36158585fb211aa.tar.bz2 rails-0eeb8f7ccebc7b5b9e0a5918e36158585fb211aa.zip | |
Merge branch 'master' into s3_integrity
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/active_storage/service/gcs_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb index a558791d89..9ac33d68f3 100644 --- a/lib/active_storage/service/gcs_service.rb +++ b/lib/active_storage/service/gcs_service.rb @@ -10,8 +10,9 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service end def upload(key, io, checksum: nil) - # FIXME: Ensure integrity by sending the checksum for service side verification - bucket.create_file(io, key) + bucket.create_file(io, key, md5: checksum) + rescue Google::Cloud::InvalidArgumentError + raise ActiveStorage::IntegrityError end # FIXME: Add streaming when given a block |