FIX: Update S3 stubs for more aws-sdk API changes (#8534)
This commit is contained in:
parent
278d70f3eb
commit
09d9baa6d7
|
@ -11,7 +11,6 @@ def s3_setup
|
||||||
SiteSetting.s3_access_key_id = "s3-access-key-id"
|
SiteSetting.s3_access_key_id = "s3-access-key-id"
|
||||||
SiteSetting.s3_secret_access_key = "s3-secret-access-key"
|
SiteSetting.s3_secret_access_key = "s3-secret-access-key"
|
||||||
SiteSetting.s3_cdn_url = "https://s3.cdn.com"
|
SiteSetting.s3_cdn_url = "https://s3.cdn.com"
|
||||||
SiteSetting.s3_region = "us-east-1"
|
|
||||||
SiteSetting.enable_s3_uploads = true
|
SiteSetting.enable_s3_uploads = true
|
||||||
SiteSetting.authorized_extensions = "png|jpg|gif|mov|ogg|"
|
SiteSetting.authorized_extensions = "png|jpg|gif|mov|ogg|"
|
||||||
end
|
end
|
||||||
|
@ -505,18 +504,16 @@ describe CookedPostProcessor do
|
||||||
|
|
||||||
context "s3_uploads" do
|
context "s3_uploads" do
|
||||||
before do
|
before do
|
||||||
SiteSetting.s3_region = "us-east-1"
|
|
||||||
s3_setup
|
s3_setup
|
||||||
stored_path = Discourse.store.get_path_for_upload(upload)
|
stored_path = Discourse.store.get_path_for_upload(upload)
|
||||||
upload.update_column(:url, "#{SiteSetting.Upload.absolute_base_url}/#{stored_path}")
|
upload.update_column(:url, "#{SiteSetting.Upload.absolute_base_url}/#{stored_path}")
|
||||||
|
|
||||||
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
|
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
|
||||||
stub_request(
|
stub_request(
|
||||||
:put,
|
:put,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/optimized/1X/#{upload.sha1}_2_#{optimized_size}.#{upload.extension}"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/optimized/1X/#{upload.sha1}_2_#{optimized_size}.#{upload.extension}"
|
||||||
)
|
)
|
||||||
|
stub_request(:get, /#{SiteSetting.s3_upload_bucket}\.s3\.amazonaws\.com/)
|
||||||
stub_request(:get, /#{SiteSetting.s3_upload_bucket}\.s3\.#{SiteSetting.s3_region}\.amazonaws\.com/)
|
|
||||||
|
|
||||||
OptimizedImage.expects(:resize).returns(true)
|
OptimizedImage.expects(:resize).returns(true)
|
||||||
FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
|
FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
|
||||||
|
|
|
@ -92,7 +92,7 @@ RSpec.describe FileStore::BaseStore do
|
||||||
SiteSetting.login_required = true
|
SiteSetting.login_required = true
|
||||||
SiteSetting.secure_media = true
|
SiteSetting.secure_media = true
|
||||||
|
|
||||||
stub_request(:head, "https://s3-upload-bucket.s3.#{SiteSetting.s3_region}.amazonaws.com/")
|
stub_request(:head, "https://s3-upload-bucket.s3.amazonaws.com/")
|
||||||
signed_url = Discourse.store.signed_url_for_path(upload_s3.url)
|
signed_url = Discourse.store.signed_url_for_path(upload_s3.url)
|
||||||
stub_request(:get, signed_url).to_return(status: 200, body: "Hello world")
|
stub_request(:get, signed_url).to_return(status: 200, body: "Hello world")
|
||||||
|
|
||||||
|
|
|
@ -1403,11 +1403,11 @@ describe PostCreator do
|
||||||
SiteSetting.s3_region = "us-east-1"
|
SiteSetting.s3_region = "us-east-1"
|
||||||
SiteSetting.secure_media = true
|
SiteSetting.secure_media = true
|
||||||
|
|
||||||
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
|
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
|
||||||
|
|
||||||
stub_request(
|
stub_request(
|
||||||
:put,
|
:put,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -41,10 +41,10 @@ describe "S3Helper" do
|
||||||
stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
|
stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
|
||||||
to_return(status: 404, body: "", headers: {})
|
to_return(status: 404, body: "", headers: {})
|
||||||
|
|
||||||
stub_request(:get, "https://bob.s3.#{SiteSetting.s3_region}.amazonaws.com/?lifecycle").
|
stub_request(:get, "https://bob.s3.amazonaws.com/?lifecycle").
|
||||||
to_return(status: 200, body: @lifecycle, headers: {})
|
to_return(status: 200, body: @lifecycle, headers: {})
|
||||||
|
|
||||||
stub_request(:put, "https://bob.s3.#{SiteSetting.s3_region}.amazonaws.com/?lifecycle").
|
stub_request(:put, "https://bob.s3.amazonaws.com/?lifecycle").
|
||||||
with do |req|
|
with do |req|
|
||||||
|
|
||||||
hash = Hash.from_xml(req.body.to_s)
|
hash = Hash.from_xml(req.body.to_s)
|
||||||
|
|
|
@ -329,12 +329,12 @@ describe OptimizedImage do
|
||||||
|
|
||||||
stub_request(
|
stub_request(
|
||||||
:head,
|
:head,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/"
|
||||||
)
|
)
|
||||||
|
|
||||||
stub_request(
|
stub_request(
|
||||||
:put,
|
:put,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com#{optimized_path}"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{optimized_path}"
|
||||||
).to_return(
|
).to_return(
|
||||||
status: 200,
|
status: 200,
|
||||||
headers: { "ETag" => "someetag" }
|
headers: { "ETag" => "someetag" }
|
||||||
|
|
|
@ -1326,20 +1326,18 @@ describe Post do
|
||||||
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
|
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
|
||||||
SiteSetting.s3_access_key_id = "some key"
|
SiteSetting.s3_access_key_id = "some key"
|
||||||
SiteSetting.s3_secret_access_key = "some secret key"
|
SiteSetting.s3_secret_access_key = "some secret key"
|
||||||
SiteSetting.s3_region = "us-east-1"
|
|
||||||
SiteSetting.secure_media = true
|
SiteSetting.secure_media = true
|
||||||
attachment_upload.update!(original_filename: "hello.csv")
|
attachment_upload.update!(original_filename: "hello.csv")
|
||||||
|
|
||||||
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
|
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
|
||||||
|
|
||||||
stub_request(
|
stub_request(
|
||||||
:put,
|
:put,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{attachment_upload.sha1}.#{attachment_upload.extension}?acl"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{attachment_upload.sha1}.#{attachment_upload.extension}?acl"
|
||||||
)
|
)
|
||||||
|
|
||||||
stub_request(
|
stub_request(
|
||||||
:put,
|
:put,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -112,14 +112,13 @@ describe TopicConverter do
|
||||||
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
|
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
|
||||||
SiteSetting.s3_access_key_id = "some key"
|
SiteSetting.s3_access_key_id = "some key"
|
||||||
SiteSetting.s3_secret_access_key = "some secret key"
|
SiteSetting.s3_secret_access_key = "some secret key"
|
||||||
SiteSetting.s3_region = "us-east-1"
|
|
||||||
SiteSetting.secure_media = true
|
SiteSetting.secure_media = true
|
||||||
|
|
||||||
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
|
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
|
||||||
|
|
||||||
stub_request(
|
stub_request(
|
||||||
:put,
|
:put,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -348,14 +348,13 @@ describe Upload do
|
||||||
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
|
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
|
||||||
SiteSetting.s3_access_key_id = "some key"
|
SiteSetting.s3_access_key_id = "some key"
|
||||||
SiteSetting.s3_secret_access_key = "some secrets3_region key"
|
SiteSetting.s3_secret_access_key = "some secrets3_region key"
|
||||||
SiteSetting.s3_region = "us-east-1"
|
|
||||||
SiteSetting.secure_media = true
|
SiteSetting.secure_media = true
|
||||||
|
|
||||||
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
|
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
|
||||||
|
|
||||||
stub_request(
|
stub_request(
|
||||||
:put,
|
:put,
|
||||||
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl"
|
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl"
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -406,7 +406,7 @@ describe UploadsController do
|
||||||
it "should return signed url for legitimate request" do
|
it "should return signed url for legitimate request" do
|
||||||
secure_url = upload.url.sub(SiteSetting.Upload.absolute_base_url, "/secure-media-uploads")
|
secure_url = upload.url.sub(SiteSetting.Upload.absolute_base_url, "/secure-media-uploads")
|
||||||
sign_in(user)
|
sign_in(user)
|
||||||
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
|
stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
|
||||||
|
|
||||||
get secure_url
|
get secure_url
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue