From 4f22acb345453223cc7c110e9e41445a6fd3e337 Mon Sep 17 00:00:00 2001
From: George Boot <884482+georgeboot@users.noreply.github.com>
Date: Thu, 17 Nov 2022 11:01:25 +0100
Subject: [PATCH 1/2] Strip key, secret and token from root config options on
 aws clients

Revert style fix
---
 src/Illuminate/Filesystem/FilesystemManager.php  | 2 +-
 src/Illuminate/Mail/MailManager.php              | 2 +-
 src/Illuminate/Queue/Connectors/SqsConnector.php | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
index 77e820512f46..35c05dab8b2c 100644
--- a/src/Illuminate/Filesystem/FilesystemManager.php
+++ b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -265,7 +265,7 @@ protected function formatS3Config(array $config)
             $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
-        return $config;
+        return Arr::except($config, ['key', 'secret', 'token']);
     }
 
     /**
diff --git a/src/Illuminate/Mail/MailManager.php b/src/Illuminate/Mail/MailManager.php
index 03edae29bfcd..63bc142efd2c 100644
--- a/src/Illuminate/Mail/MailManager.php
+++ b/src/Illuminate/Mail/MailManager.php
@@ -253,7 +253,7 @@ protected function addSesCredentials(array $config)
             $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
-        return $config;
+        return Arr::except($config, ['key', 'secret', 'token']);
     }
 
     /**
diff --git a/src/Illuminate/Queue/Connectors/SqsConnector.php b/src/Illuminate/Queue/Connectors/SqsConnector.php
index 029c607c4328..e6dba1c45d11 100755
--- a/src/Illuminate/Queue/Connectors/SqsConnector.php
+++ b/src/Illuminate/Queue/Connectors/SqsConnector.php
@@ -23,7 +23,9 @@ public function connect(array $config)
         }
 
         return new SqsQueue(
-            new SqsClient($config),
+            new SqsClient(
+                Arr::except($config, ['key', 'secret', 'token'])
+            ),
             $config['queue'],
             $config['prefix'] ?? '',
             $config['suffix'] ?? '',

From ef5d5738371af9748cf2a15f82948a4c211299f9 Mon Sep 17 00:00:00 2001
From: George Boot <884482+georgeboot@users.noreply.github.com>
Date: Thu, 17 Nov 2022 11:20:06 +0100
Subject: [PATCH 2/2] Only strip token for now

---
 src/Illuminate/Filesystem/FilesystemManager.php  | 2 +-
 src/Illuminate/Mail/MailManager.php              | 2 +-
 src/Illuminate/Queue/Connectors/SqsConnector.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
index 35c05dab8b2c..9bfab780cb81 100644
--- a/src/Illuminate/Filesystem/FilesystemManager.php
+++ b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -265,7 +265,7 @@ protected function formatS3Config(array $config)
             $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
-        return Arr::except($config, ['key', 'secret', 'token']);
+        return Arr::except($config, ['token']);
     }
 
     /**
diff --git a/src/Illuminate/Mail/MailManager.php b/src/Illuminate/Mail/MailManager.php
index 63bc142efd2c..8d60b34dad17 100644
--- a/src/Illuminate/Mail/MailManager.php
+++ b/src/Illuminate/Mail/MailManager.php
@@ -253,7 +253,7 @@ protected function addSesCredentials(array $config)
             $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
-        return Arr::except($config, ['key', 'secret', 'token']);
+        return Arr::except($config, ['token']);
     }
 
     /**
diff --git a/src/Illuminate/Queue/Connectors/SqsConnector.php b/src/Illuminate/Queue/Connectors/SqsConnector.php
index e6dba1c45d11..d70bd8e5f9c4 100755
--- a/src/Illuminate/Queue/Connectors/SqsConnector.php
+++ b/src/Illuminate/Queue/Connectors/SqsConnector.php
@@ -24,7 +24,7 @@ public function connect(array $config)
 
         return new SqsQueue(
             new SqsClient(
-                Arr::except($config, ['key', 'secret', 'token'])
+                Arr::except($config, ['token'])
             ),
             $config['queue'],
             $config['prefix'] ?? '',