[5.6] Passes token configuration value to AWS Client (#24746)

shrink · taylorotwell · commit bbe8950cbe86 · 2018-07-04T13:20:01.000-05:00
* Passes `token` configuration value to S3 Client

* Passes `token` configuration value to SQS client
diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -220,7 +220,7 @@ protected function formatS3Config(array $config)
         $config += ['version' => 'latest'];
 
         if ($config['key'] && $config['secret']) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret']);
+            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
         return $config;
diff --git a/src/Illuminate/Queue/Connectors/SqsConnector.php b/src/Illuminate/Queue/Connectors/SqsConnector.php
@@ -19,7 +19,7 @@ public function connect(array $config)
         $config = $this->getDefaultConfiguration($config);
 
         if ($config['key'] && $config['secret']) {
-            $config['credentials'] = Arr::only($config, ['key', 'secret']);
+            $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
         return new SqsQueue(

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ protected function formatS3Config(array $config)`
`220`	`220`	`$config += ['version' => 'latest'];`
`221`	`221`
`222`	`222`	`if ($config['key'] && $config['secret']) {`
`223`		`- $config['credentials'] = Arr::only($config, ['key', 'secret']);`
	`223`	`+ $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`return $config;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function connect(array $config)`
`19`	`19`	`$config = $this->getDefaultConfiguration($config);`
`20`	`20`
`21`	`21`	`if ($config['key'] && $config['secret']) {`
`22`		`- $config['credentials'] = Arr::only($config, ['key', 'secret']);`
	`22`	`+ $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`return new SqsQueue(`