github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:21:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Bump aws-sdk-sns from 1.13.0 to 1.21.0 (#8490)

Browse Source 
Bumps [aws-sdk-sns](https://github.com/aws/aws-sdk-ruby) from 1.13.0 to 1.21.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-sns/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.13.0...1.21.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
This commit is contained in:
dependabot-preview[bot]
2019-12-11 08:13:17 -06:00
committed by Mark VanLandingham
parent 4abe4454dd
commit b90a592146
10 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Gemfile.lock
View File

@ -45,10 +45,10 @@ GEM
rake (>= 10.4, < 14.0) rake (>= 10.4, < 14.0)
ast (2.4.0) ast (2.4.0)
aws-eventstream (1.0.3) aws-eventstream (1.0.3)
aws-partitions (1.154.0) aws-partitions (1.251.0)
aws-sdk-core (3.48.6) aws-sdk-core (3.84.0)
aws-eventstream (~> 1.0, >= 1.0.2) aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0) aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-kms (1.17.0) aws-sdk-kms (1.17.0)
@ -58,8 +58,8 @@ GEM
aws-sdk-core (~> 3, >= 3.48.2) aws-sdk-core (~> 3, >= 3.48.2)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0) aws-sigv4 (~> 1.0)
aws-sdk-sns (1.13.0) aws-sdk-sns (1.21.0)
aws-sdk-core (~> 3, >= 3.48.2) aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0) aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2) aws-eventstream (~> 1.0, >= 1.0.2)

14
spec/components/cooked_post_processor_spec.rb
View File

@ -11,6 +11,7 @@ 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
@ -504,11 +505,18 @@ 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(:any, /some-bucket-on-s3\.s3\.amazonaws\.com/) stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
stub_request(
:put,
"https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/optimized/1X/#{upload.sha1}_2_#{optimized_size}.#{upload.extension}"
)
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)
@ -519,8 +527,10 @@ describe CookedPostProcessor do
upload.update_column(:secure, true) upload.update_column(:secure, true)
end end
let(:optimized_size) { "600x500" }
let(:post) do let(:post) do
Fabricate(:post, raw: "![large.png|600x500](#{upload.short_url})") Fabricate(:post, raw: "![large.png|#{optimized_size}](#{upload.short_url})")
end end
it "handles secure images with the correct lightbox link href" do it "handles secure images with the correct lightbox link href" do

3
spec/components/file_store/base_store_spec.rb
View File

@ -53,6 +53,7 @@ RSpec.describe FileStore::BaseStore 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"
stub_request(:get, upload_s3.url).to_return(status: 200, body: "Hello world") stub_request(:get, upload_s3.url).to_return(status: 200, body: "Hello world")
end end
@ -91,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.amazonaws.com/") stub_request(:head, "https://s3-upload-bucket.s3.#{SiteSetting.s3_region}.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")

5
spec/components/post_creator_spec.rb
View File

@ -1400,13 +1400,14 @@ describe PostCreator 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.amazonaws.com/") stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
stub_request( stub_request(
:put, :put,
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl" "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
) )
end end

5
spec/components/s3_helper_spec.rb
View File

@ -10,6 +10,7 @@ describe "S3Helper" do
SiteSetting.enable_s3_uploads = true SiteSetting.enable_s3_uploads = true
SiteSetting.s3_access_key_id = "abc" SiteSetting.s3_access_key_id = "abc"
SiteSetting.s3_secret_access_key = "def" SiteSetting.s3_secret_access_key = "def"
SiteSetting.s3_region = "us-east-1"
@lifecycle = <<~XML @lifecycle = <<~XML
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
@ -40,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.amazonaws.com/?lifecycle"). stub_request(:get, "https://bob.s3.#{SiteSetting.s3_region}.amazonaws.com/?lifecycle").
to_return(status: 200, body: @lifecycle, headers: {}) to_return(status: 200, body: @lifecycle, headers: {})
stub_request(:put, "https://bob.s3.amazonaws.com/?lifecycle"). stub_request(:put, "https://bob.s3.#{SiteSetting.s3_region}.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)

5
spec/models/optimized_image_spec.rb
View File

@ -299,6 +299,7 @@ describe OptimizedImage 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"
tempfile = Tempfile.new(["discourse-external", ".png"]) tempfile = Tempfile.new(["discourse-external", ".png"])
@ -328,12 +329,12 @@ describe OptimizedImage do
stub_request( stub_request(
:head, :head,
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/" "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/"
) )
stub_request( stub_request(
:put, :put,
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com#{optimized_path}" "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com#{optimized_path}"
).to_return( ).to_return(
status: 200, status: 200,
headers: { "ETag" => "someetag" } headers: { "ETag" => "someetag" }

7
spec/models/post_spec.rb
View File

@ -1326,19 +1326,20 @@ 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.amazonaws.com/") stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
stub_request( stub_request(
:put, :put,
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{attachment_upload.sha1}.#{attachment_upload.extension}?acl" "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{attachment_upload.sha1}.#{attachment_upload.extension}?acl"
) )
stub_request( stub_request(
:put, :put,
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl" "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
) )
end end

5
spec/models/topic_converter_spec.rb
View File

@ -112,13 +112,14 @@ 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.amazonaws.com/") stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
stub_request( stub_request(
:put, :put,
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl" "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{image_upload.sha1}.#{image_upload.extension}?acl"
) )
end end

7
spec/models/upload_spec.rb
View File

@ -347,14 +347,15 @@ describe Upload do
SiteSetting.enable_s3_uploads = true SiteSetting.enable_s3_uploads = true
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 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.amazonaws.com/") stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
stub_request( stub_request(
:put, :put,
"https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl" "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/original/1X/#{upload.sha1}.#{upload.extension}?acl"
) )
end end

3
spec/requests/uploads_controller_spec.rb
View File

@ -381,6 +381,7 @@ describe UploadsController do
SiteSetting.s3_upload_bucket = "s3-upload-bucket" SiteSetting.s3_upload_bucket = "s3-upload-bucket"
SiteSetting.s3_access_key_id = "fakeid7974664" SiteSetting.s3_access_key_id = "fakeid7974664"
SiteSetting.s3_secret_access_key = "fakesecretid7974664" SiteSetting.s3_secret_access_key = "fakesecretid7974664"
SiteSetting.s3_region = "us-east-1"
SiteSetting.secure_media = true SiteSetting.secure_media = true
end end
@ -393,7 +394,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://s3-upload-bucket.s3.amazonaws.com/") stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.#{SiteSetting.s3_region}.amazonaws.com/")
get secure_url get secure_url