5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Merge pull request #124 from 5apps/no_head_for_last-modified

Browse Source 
Do not do an extra HEAD request after a PUT for Last-Modified
This commit is contained in:
Greg Karékinian 2018-07-19 10:22:43 +02:00 committed by GitHub
commit 41e3c0299a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/remote_storage/s3.rb
View File

@ -22,12 +22,10 @@ module RemoteStorage
"PUT", url, md5, content_type "PUT", url, md5, content_type
).merge({ "Content-Type" => content_type, "Content-Md5" => md5 }) ).merge({ "Content-Type" => content_type, "Content-Md5" => md5 })
res = RestClient.put(url, data, authorization_headers) res = RestClient.put(url, data, authorization_headers)
# S3 does not return a Last-Modified response header on PUTs
head_res = do_head_request(url)
return [ return [
res.headers[:etag].delete('"'), res.headers[:etag].delete('"'),
timestamp_for(head_res.headers[:last_modified]) timestamp_for(res.headers[:date]) # S3 does not return a Last-Modified response header on PUTs
] ]
end end
end end

18
spec/s3/app_spec.rb
View File

@ -11,11 +11,11 @@ describe "S3 provider" do
before do before do
stub_request(:put, "#{container_url_for("phil")}/food/aguacate"). stub_request(:put, "#{container_url_for("phil")}/food/aguacate").
to_return(status: 200, headers: { etag: '"0815etag"' }) to_return(status: 200, headers: { etag: '"0815etag"', date: "Fri, 04 Mar 2016 12:20:18 GMT" })
# Write new content with an If-Match header (a new Etag is returned) # Write new content with an If-Match header (a new Etag is returned)
stub_request(:put, "#{container_url_for("phil")}/food/aguacate"). stub_request(:put, "#{container_url_for("phil")}/food/aguacate").
with(body: "aye"). with(body: "aye").
to_return(status: 200, headers: { etag: '"0915etag"' }) to_return(status: 200, headers: { etag: '"0915etag"', date: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:head, "#{container_url_for("phil")}/food/aguacate"). stub_request(:head, "#{container_url_for("phil")}/food/aguacate").
to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:18 GMT" }) to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:get, "#{container_url_for("phil")}/food/aguacate"). stub_request(:get, "#{container_url_for("phil")}/food/aguacate").
@ -26,22 +26,20 @@ describe "S3 provider" do
# Write new content to check the metadata in Redis # Write new content to check the metadata in Redis
stub_request(:put, "#{container_url_for("phil")}/food/banano"). stub_request(:put, "#{container_url_for("phil")}/food/banano").
with(body: "si"). with(body: "si").
to_return(status: 200, headers: { etag: '"0815etag"' }) to_return(status: 200, headers: { etag: '"0815etag"', date: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:put, "#{container_url_for("phil")}/food/banano"). stub_request(:put, "#{container_url_for("phil")}/food/banano").
with(body: "oh, no"). with(body: "oh, no").
to_return(status: 200, headers: { etag: '"0817etag"' }) to_return(status: 200, headers: { etag: '"0817etag"', date: "Fri, 04 Mar 2016 12:20:20 GMT" })
stub_request(:head, "#{container_url_for("phil")}/food/banano").
to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:20 GMT" })
stub_request(:put, "#{container_url_for("phil")}/food/camaron"). stub_request(:put, "#{container_url_for("phil")}/food/camaron").
to_return(status: 200, headers: { etag: '"0816etag"' }) to_return(status: 200, headers: { etag: '"0816etag"', date: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:head, "#{container_url_for("phil")}/food/camaron"). stub_request(:head, "#{container_url_for("phil")}/food/camaron").
to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:18 GMT" }) to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:delete, "#{container_url_for("phil")}/food/camaron"). stub_request(:delete, "#{container_url_for("phil")}/food/camaron").
to_return(status: 200, headers: { etag: '"0816etag"' }) to_return(status: 200, headers: { etag: '"0816etag"' })
stub_request(:put, "#{container_url_for("phil")}/food/desayunos/bolon"). stub_request(:put, "#{container_url_for("phil")}/food/desayunos/bolon").
to_return(status: 200, headers: { etag: '"0817etag"' }) to_return(status: 200, headers: { etag: '"0817etag"', date: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:head, "#{container_url_for("phil")}/food/desayunos/bolon"). stub_request(:head, "#{container_url_for("phil")}/food/desayunos/bolon").
to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:18 GMT" }) to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:delete, "#{container_url_for("phil")}/food/desayunos/bolon"). stub_request(:delete, "#{container_url_for("phil")}/food/desayunos/bolon").
@ -49,9 +47,7 @@ describe "S3 provider" do
# objects in root dir # objects in root dir
stub_request(:put, "#{container_url_for("phil")}/bamboo.txt"). stub_request(:put, "#{container_url_for("phil")}/bamboo.txt").
to_return(status: 200, headers: { etag: '"0818etag"' }) to_return(status: 200, headers: { etag: '"0818etag"', date: "Fri, 04 Mar 2016 12:20:18 GMT" })
stub_request(:head, "#{container_url_for("phil")}/bamboo.txt").
to_return(status: 200, headers: { last_modified: "Fri, 04 Mar 2016 12:20:18 GMT" })
# 404 # 404
stub_request(:head, "#{container_url_for("phil")}/food/steak"). stub_request(:head, "#{container_url_for("phil")}/food/steak").