Modify service provider to use different config for publishing and default usage (#149)

holorhythms · web-flow · commit 4449ed0434c0 · 2018-12-03T14:34:51.000-08:00
diff --git a/config/aws_default.php b/config/aws_default.php
@@ -0,0 +1,25 @@
+<?php
+
+use Aws\Laravel\AwsServiceProvider;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | AWS SDK Configuration
+    |--------------------------------------------------------------------------
+    |
+    | The configuration options set in this file will be passed directly to the
+    | `Aws\Sdk` object, from which all client objects are created. This file
+    | sets the default minimum configuration used by the service provider even
+    | if no configuration is set by the user. The full set of possible options
+    | are documented at:
+    | http://docs.aws.amazon.com/aws-sdk-php/v3/guide/guide/configuration.html
+    |
+    */
+    'region' => env('AWS_REGION', 'us-east-1'),
+    'version' => 'latest',
+    'ua_append' => [
+        'L5MOD/' . AwsServiceProvider::VERSION,
+    ],
+];
diff --git a/config/aws_publish.php b/config/aws_publish.php
@@ -10,9 +10,9 @@
     |--------------------------------------------------------------------------
     |
     | The configuration options set in this file will be passed directly to the
-    | `Aws\Sdk` object, from which all client objects are created. The minimum
-    | required options are declared here, but the full set of possible options
-    | are documented at:
+    | `Aws\Sdk` object, from which all client objects are created. This file
+    | is published to the application config directory for modification by the
+    | user. The full set of possible options are documented at:
     | http://docs.aws.amazon.com/aws-sdk-php/v3/guide/guide/configuration.html
     |
     */
diff --git a/src/AwsServiceProvider.php b/src/AwsServiceProvider.php
@@ -26,15 +26,15 @@ class AwsServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $source = dirname(__DIR__).'/config/aws.php';
-
         if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
-            $this->publishes([$source => config_path('aws.php')]);
+            $this->publishes([
+                dirname(__DIR__).'/config/aws_publish.php' => config_path('aws.php')
+            ]);
         } elseif ($this->app instanceof LumenApplication) {
             $this->app->configure('aws');
         }
 
-        $this->mergeConfigFrom($source, 'aws');
+        $this->mergeConfigFrom(dirname(__DIR__).'/config/aws_default.php', 'aws');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`\|--------------------------------------------------------------------------`
`11`	`11`	`\|`
`12`	`12`	`\| The configuration options set in this file will be passed directly to the`
`13`		- \| `Aws\Sdk` object, from which all client objects are created. The minimum
`14`		`- \| required options are declared here, but the full set of possible options`
`15`		`- \| are documented at:`
	`13`	+ \| `Aws\Sdk` object, from which all client objects are created. This file
	`14`	`+ \| is published to the application config directory for modification by the`
	`15`	`+ \| user. The full set of possible options are documented at:`
`16`	`16`	`\| http://docs.aws.amazon.com/aws-sdk-php/v3/guide/guide/configuration.html`
`17`	`17`	`\|`
`18`	`18`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ class AwsServiceProvider extends ServiceProvider`
`26`	`26`	`*/`
`27`	`27`	`public function boot()`
`28`	`28`	`{`
`29`		`- $source = dirname(__DIR__).'/config/aws.php';`
`30`		`-`
`31`	`29`	`if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {`
`32`		`- $this->publishes([$source => config_path('aws.php')]);`
	`30`	`+ $this->publishes([`
	`31`	`+ dirname(__DIR__).'/config/aws_publish.php' => config_path('aws.php')`
	`32`	`+ ]);`
`33`	`33`	`} elseif ($this->app instanceof LumenApplication) {`
`34`	`34`	`$this->app->configure('aws');`
`35`	`35`	`}`
`36`	`36`
`37`		`- $this->mergeConfigFrom($source, 'aws');`
	`37`	`+ $this->mergeConfigFrom(dirname(__DIR__).'/config/aws_default.php', 'aws');`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`