clean up _resolve_account_id_builtin

boto · Oct 19, 2023 · 3256448 · 3256448
1 parent c3a4168
commit 3256448
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/botocore/regions.py b/botocore/regions.py
@@ -583,7 +583,6 @@ def _get_provider_params(
 
     def _resolve_account_id_builtin(self, builtins):
         """Resolve the ``AWS::Auth::AccountId`` builtin."""
-        # do this check separately so mode is only validated if it's being used
         if 'AccountId' not in self._param_definitions:
             return
 
@@ -592,9 +591,8 @@ def _resolve_account_id_builtin(self, builtins):
         if not self._should_resolve_account_id_builtin():
             # Unset the account ID if endpoint mode is disabled.
             builtins[acct_id_builtin_key] = None
-            return
 
-        if builtins.get(acct_id_builtin_key) is None:
+        elif builtins.get(acct_id_builtin_key) is None:
             self._do_resolve_account_id_builtin(builtins)
 
     def _validate_account_id_endpoint_mode(self):