remove account id from frozen creds

dlm6693 · Aug 11, 2023 · 3d7e551 · 3d7e551
1 parent 890dc9d
commit 3d7e551
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/botocore/credentials.py b/botocore/credentials.py
@@ -56,7 +56,7 @@
 
 logger = logging.getLogger(__name__)
 ReadOnlyCredentials = namedtuple(
-    'ReadOnlyCredentials', ['access_key', 'secret_key', 'token', 'account_id']
+    'ReadOnlyCredentials', ['access_key', 'secret_key', 'token']
 )
 
 _DEFAULT_MANDATORY_REFRESH_TIMEOUT = 10 * 60  # 10 min
@@ -337,7 +337,7 @@ def _normalize(self):
 
     def get_frozen_credentials(self):
         return ReadOnlyCredentials(
-            self.access_key, self.secret_key, self.token, self.account_id
+            self.access_key, self.secret_key, self.token
         )
 
 
@@ -384,7 +384,7 @@ def __init__(
         self._refresh_lock = threading.Lock()
         self.method = method
         self._frozen_credentials = ReadOnlyCredentials(
-            access_key, secret_key, token, account_id
+            access_key, secret_key, token
         )
         self._normalize()
 
@@ -553,7 +553,7 @@ def _protected_refresh(self, is_mandatory):
             return
         self._set_from_data(metadata)
         self._frozen_credentials = ReadOnlyCredentials(
-            self._access_key, self._secret_key, self._token, self._account_id
+            self._access_key, self._secret_key, self._token
         )
         if self._is_expired():
             # We successfully refreshed credentials but for whatever

diff --git a/tests/unit/test_credentials.py b/tests/unit/test_credentials.py
@@ -2993,7 +2993,6 @@ def test_assume_role_with_profile_provider(self):
         self.assertEqual(creds.access_key, 'foo')
         self.assertEqual(creds.secret_key, 'bar')
         self.assertEqual(creds.token, 'baz')
-        self.assertEqual(creds.account_id, '123456789012')
 
 
 class ProfileProvider:
@@ -3120,9 +3119,7 @@ def test_mandatory_refresh_needed(self):
             advisory_refresh=3,
         )
         temp = creds.get_frozen_credentials()
-        self.assertEqual(
-            temp, credentials.ReadOnlyCredentials('1', '1', '1', '1')
-        )
+        self.assertEqual(temp, credentials.ReadOnlyCredentials('1', '1', '1'))
 
     def test_advisory_refresh_needed(self):
         creds = IntegerRefresher(
@@ -3133,9 +3130,7 @@ def test_advisory_refresh_needed(self):
             advisory_refresh=5,
         )
         temp = creds.get_frozen_credentials()
-        self.assertEqual(
-            temp, credentials.ReadOnlyCredentials('1', '1', '1', '1')
-        )
+        self.assertEqual(temp, credentials.ReadOnlyCredentials('1', '1', '1'))
 
     def test_refresh_fails_is_not_an_error_during_advisory_period(self):
         fail_refresh = mock.Mock(side_effect=Exception("refresh failed"))
@@ -3152,9 +3147,7 @@ def test_refresh_fails_is_not_an_error_during_advisory_period(self):
         # Because we're in the advisory period we'll not propogate
         # the exception and return the current set of credentials
         # (generation '1').
-        self.assertEqual(
-            temp, credentials.ReadOnlyCredentials('0', '0', '0', '0')
-        )
+        self.assertEqual(temp, credentials.ReadOnlyCredentials('0', '0', '0'))
 
     def test_exception_propogated_on_error_during_mandatory_period(self):
         fail_refresh = mock.Mock(side_effect=Exception("refresh failed"))