From d9c0dc8687032b52bca917e316a7d6e194e01f58 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 5 Sep 2018 16:11:44 +1000 Subject: [PATCH] correct prev commit s3. did not exists it is s3- --- app/jobs/onceoff/correct_missing_dualstack_urls.rb | 2 +- spec/jobs/correct_missing_dualstack_urls_spec.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/jobs/onceoff/correct_missing_dualstack_urls.rb b/app/jobs/onceoff/correct_missing_dualstack_urls.rb index f60e1c73ab1..5634db3bec2 100644 --- a/app/jobs/onceoff/correct_missing_dualstack_urls.rb +++ b/app/jobs/onceoff/correct_missing_dualstack_urls.rb @@ -7,7 +7,7 @@ module Jobs return if !base_url.match?(/s3\.dualstack/) - old = base_url.sub('.dualstack', '') + old = base_url.sub('s3.dualstack.', 's3-') old_like = %"#{old}%" DB.exec(<<~SQL, from: old, to: base_url, old_like: old_like) diff --git a/spec/jobs/correct_missing_dualstack_urls_spec.rb b/spec/jobs/correct_missing_dualstack_urls_spec.rb index 493aaf6476e..329678c21e0 100644 --- a/spec/jobs/correct_missing_dualstack_urls_spec.rb +++ b/spec/jobs/correct_missing_dualstack_urls_spec.rb @@ -15,21 +15,21 @@ describe Jobs::CorrectMissingDualstackUrls do expect(Discourse.store.absolute_base_url).to eq('//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com') current_upload = Upload.create!( - url: '//s3-upload-bucket.s3.us-east-1.amazonaws.com/somewhere/a.png', + url: '//s3-upload-bucket.s3-us-east-1.amazonaws.com/somewhere/a.png', original_filename: 'a.png', filesize: 100, user_id: -1, ) bad_upload = Upload.create!( - url: '//s3-upload-bucket.s3.us-west-1.amazonaws.com/somewhere/a.png', + url: '//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png', original_filename: 'a.png', filesize: 100, user_id: -1, ) current_optimized = OptimizedImage.create!( - url: '//s3-upload-bucket.s3.us-east-1.amazonaws.com/somewhere/a.png', + url: '//s3-upload-bucket.s3-us-east-1.amazonaws.com/somewhere/a.png', filesize: 100, upload_id: current_upload.id, width: 100, @@ -39,7 +39,7 @@ describe Jobs::CorrectMissingDualstackUrls do ) bad_optimized = OptimizedImage.create!( - url: '//s3-upload-bucket.s3.us-west-1.amazonaws.com/somewhere/a.png', + url: '//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png', filesize: 100, upload_id: current_upload.id, width: 110, @@ -51,13 +51,13 @@ describe Jobs::CorrectMissingDualstackUrls do Jobs::CorrectMissingDualstackUrls.new.execute_onceoff(nil) bad_upload.reload - expect(bad_upload.url).to eq('//s3-upload-bucket.s3.us-west-1.amazonaws.com/somewhere/a.png') + expect(bad_upload.url).to eq('//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png') current_upload.reload expect(current_upload.url).to eq('//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/somewhere/a.png') bad_optimized.reload - expect(bad_optimized.url).to eq('//s3-upload-bucket.s3.us-west-1.amazonaws.com/somewhere/a.png') + expect(bad_optimized.url).to eq('//s3-upload-bucket.s3-us-west-1.amazonaws.com/somewhere/a.png') current_optimized.reload expect(current_optimized.url).to eq('//s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/somewhere/a.png')