Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add AWS missing regions , add "version" to match AWS PHP SDK request requirements #190

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

add AWS missing regions , add "version" to match AWS PHP SDK request requirements #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2856775
update AWS region , add more regions based on AWS region list
ajaberdev Nov 30, 2020
4d1debe
clear whitespaces
ajaberdev Nov 30, 2020
8153fb3
Add version as AWS PHP SDK requires version
ajaberdev Nov 30, 2020
65bcf70
Add version AS AWS PHP SDK requires it
ajaberdev Nov 30, 2020
930a5cc
Add version AS AWS PHP SDK requires it
ajaberdev Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion storage-s3/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,40 @@ function getOptions() {
'us-west-2' => 'US West (Oregon) Region',
'us-west-1' => 'US West (Northern California) Region',
'eu-west-1' => 'EU (Ireland) Region',
'eu-north-1' => 'Europe (Stockholm) Region',
'ap-southeast-1' => 'Asia Pacific (Singapore) Region',
'ap-southeast-2' => 'Asia Pacific (Sydney) Region',
'ap-northeast-1' => 'Asia Pacific (Tokyo) Region',
'sa-east-1' => 'South America (Sao Paulo) Region',
'US East (Ohio)' => 'us-east-2',
'US East (N. Virginia)' => 'us-east-1',
'US West (N. California)' => 'us-west-1',
'US West (Oregon)' => 'us-west-2',
'Africa (Cape Town)' => 'af-south-1',
'Asia Pacific (Mumbai)' => 'ap-south-1',
'Asia Pacific (Osaka-Local)' => 'ap-northeast-3',
'Asia Pacific (Seoul)' => 'ap-northeast-2',
'Asia Pacific (Singapore)' => 'ap-southeast-1',
'Asia Pacific (Sydney)' => 'ap-southeast-2',
'Asia Pacific (Tokyo)' => 'ap-northeast-1',
'Canada (Central)' => 'ca-central-1',
'China (Beijing)' => 'cn-north-1',
'China (Ningxia)' => 'cn-northwest-1',
'Europe (Frankfurt)' => 'eu-central-1',
'Europe (Ireland)' => 'eu-west-1',
'Europe (London)' => 'eu-west-2',
'Europe (Milan)' => 'eu-south-1',
'Europe (Paris)' => 'eu-west-3',
'Europe (Stockholm)' => 'eu-north-1',
'Middle East (Bahrain)' => 'me-south-1',
'South America (São Paulo)' => 'sa-east-1',
Comment on lines +39 to +60
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The associations will have to be reversed. That is - 'ap-south-1' => 'Asia Pacific (Mumbai)', etc.

),
'default' => '',
)),
'version' => new ChoiceField(array(
'label' => $__('AWS SDK version'),
'version' => array(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This array needs to be named 'choices'

'latest' => 'latest',
),
'default' => '',
)),
Expand Down Expand Up @@ -79,7 +109,7 @@ function pre_save(&$config, &$errors) {
);
if ($config['aws-region'])
$credentials['region'] = $config['aws-region'];

if (!$credentials['secret'])
$this->getForm()->getField('secret-access-key')->addError(
$__('Secret access key is required'));
Expand Down
3 changes: 3 additions & 0 deletions storage-s3/storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ function __construct($meta) {
);
if ($config['aws-region'])
$credentials['region'] = $config['aws-region'];

if ($config['verion'])
$credentials['verion'] = $config['verion'];
Comment on lines +38 to +39
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The key is 'version', not 'verion'.


$this->client = S3Client::factory($credentials);
}
Expand Down