Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changes for using Google Cloud Storage instead of Amazon S3
  • Loading branch information
timwhite committed Oct 5, 2015
1 parent f39b927 commit 56cc81e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion vendor/aws/Aws/Common/Client/ClientBuilder.php
Expand Up @@ -446,7 +446,7 @@ private function handleRegion(Collection $config)
'A region is required when using ' . $description->getData('serviceFullName')
);
} elseif ($global && !$region) {
$config[Options::REGION] = 'us-east-1';
$config[Options::REGION] = 'global';
}
}

Expand Down
3 changes: 3 additions & 0 deletions vendor/aws/Aws/Common/Resources/public-endpoints.php
Expand Up @@ -54,6 +54,9 @@
'us-east-1/s3' => array(
'endpoint' => 's3.amazonaws.com'
),
'global/s3' => array(
'endpoint' => 'storage.googleapis.com'
),
'us-west-1/s3' => array(
'endpoint' => 's3-{region}.amazonaws.com'
),
Expand Down
7 changes: 6 additions & 1 deletion vendor/aws/Aws/S3/Resources/s3-2006-03-01.php
Expand Up @@ -21,10 +21,15 @@
'serviceAbbreviation' => 'Amazon S3',
'serviceType' => 'rest-xml',
'timestampFormat' => 'rfc822',
'globalEndpoint' => 's3.amazonaws.com',
'globalEndpoint' => 'storage.googleapis.com',
'signatureVersion' => 's3',
'namespace' => 'S3',
'regions' => array(
'global' => array(
'http' => true,
'https' => true,
'hostname' => 'storage.googleapis.com',
),
'us-east-1' => array(
'http' => true,
'https' => true,
Expand Down

0 comments on commit 56cc81e

Please sign in to comment.