Changes for using Google Cloud Storage instead of Amazon S3

timwhite · Oct 5, 2015 · 56cc81e58894150e5e8e89a3f59e25458d956080 · 56cc81e
1 parent f39b927
commit 56cc81e58894150e5e8e89a3f59e25458d956080
Unified Split

Showing with 10 additions and 2 deletions.

+1 −1 vendor/aws/Aws/Common/Client/ClientBuilder.php

+3 −0 vendor/aws/Aws/Common/Resources/public-endpoints.php

+6 −1 vendor/aws/Aws/S3/Resources/s3-2006-03-01.php
diff --git a/vendor/aws/Aws/Common/Client/ClientBuilder.php b/vendor/aws/Aws/Common/Client/ClientBuilder.php
@@ -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';
         }
     }
 

diff --git a/vendor/aws/Aws/Common/Resources/public-endpoints.php b/vendor/aws/Aws/Common/Resources/public-endpoints.php
@@ -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'
         ),

diff --git a/vendor/aws/Aws/S3/Resources/s3-2006-03-01.php b/vendor/aws/Aws/S3/Resources/s3-2006-03-01.php
@@ -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,