From 1a9afa976ddd9285b7bfdc7adfde3300ab2e66db Mon Sep 17 00:00:00 2001 From: Dean Taylor Date: Wed, 12 Apr 2017 07:26:25 +0100 Subject: [PATCH] FEATURE: Add AWS S3 EU (London) "eu-west-2" region --- app/models/s3_region_site_setting.rb | 1 + config/locales/client.en.yml | 1 + spec/models/s3_region_site_setting_spec.rb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb index 14fbea51d47..153f92171be 100644 --- a/app/models/s3_region_site_setting.rb +++ b/app/models/s3_region_site_setting.rb @@ -15,6 +15,7 @@ class S3RegionSiteSetting < EnumSiteSetting 'us-west-2', 'us-gov-west-1', 'eu-west-1', + 'eu-west-2', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index caa2c4e0c5f..378a3d2855a 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -181,6 +181,7 @@ en: us_west_2: "US West (Oregon)" us_gov_west_1: "AWS GovCloud (US)" eu_west_1: "EU (Ireland)" + eu_west_2: "EU (London)" eu_central_1: "EU (Frankfurt)" ap_southeast_1: "Asia Pacific (Singapore)" ap_southeast_2: "Asia Pacific (Sydney)" diff --git a/spec/models/s3_region_site_setting_spec.rb b/spec/models/s3_region_site_setting_spec.rb index fb8b203350b..9f36a09e28a 100644 --- a/spec/models/s3_region_site_setting_spec.rb +++ b/spec/models/s3_region_site_setting_spec.rb @@ -14,7 +14,7 @@ describe S3RegionSiteSetting do describe 'values' do it 'returns all the S3 regions' do - expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-south-1', 'ap-northeast-1', 'ap-northeast-2', 'sa-east-1', 'cn-north-1'].sort) + expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'eu-west-2', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-south-1', 'ap-northeast-1', 'ap-northeast-2', 'sa-east-1', 'cn-north-1'].sort) end end