Merge pull request aws#84 from chuck014/master

jeskew · jeskew · commit 47d805e4cd3f · 2015-09-18T12:48:38.000-07:00
remove credentials if blank, causing the SDK to use ec2 role
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,10 @@ php:
 
 sudo: false
 
+matrix:
+  allow_failures:
+    - php: hhvm
+
 install: travis_retry composer install --no-interaction --prefer-source
 
 script: vendor/bin/phpunit
diff --git a/config/aws.php b/config/aws.php
@@ -16,10 +16,7 @@
     | http://docs.aws.amazon.com/aws-sdk-php/v3/guide/guide/configuration.html
     |
     */
-    'credentials' => [
-        'key'    => env('AWS_ACCESS_KEY_ID'),
-        'secret' => env('AWS_SECRET_ACCESS_KEY'),
-    ],
+
     'region' => env('AWS_REGION', 'us-east-1'),
     'version' => 'latest',
     'ua_append' => [
diff --git a/src/AwsServiceProvider.php b/src/AwsServiceProvider.php
@@ -41,7 +41,8 @@ public function boot()
     public function register()
     {
         $this->app->singleton('aws', function ($app) {
-            return new Sdk($app['config']->get('aws'));
+            $config = $app['config']->get('aws');
+            return new Sdk($config);
         });
 
         $this->app->alias('aws', 'Aws\Sdk');

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ public function boot()`
`41`	`41`	`public function register()`
`42`	`42`	`{`
`43`	`43`	`$this->app->singleton('aws', function ($app) {`
`44`		`- return new Sdk($app['config']->get('aws'));`
	`44`	`+ $config = $app['config']->get('aws');`
	`45`	`+ return new Sdk($config);`
`45`	`46`	`});`
`46`	`47`
`47`	`48`	`$this->app->alias('aws', 'Aws\Sdk');`