Allow sam local invoke to retrieve account id from current logged in session

samcli/commands/local/cli_common/invoke_context.py

@@ -10,6 +10,9 @@
 from pathlib import Path
 from typing import Any, Dict, List, Optional, TextIO, Tuple, Type, cast
 
+from botocore.exceptions import TokenRetrievalError
+
+import samcli.lib.utils.boto_utils
 from samcli.commands._utils.template import TemplateFailedParsingException, TemplateNotFoundException
 from samcli.commands.exceptions import ContainersInitializationException
 from samcli.commands.local.cli_common.user_exceptions import DebugContextException, InvokeContextException
@@ -173,6 +176,7 @@ def __init__(
         if aws_region:
             self._global_parameter_overrides = {"AWS::Region": aws_region}
 
+        self._add_account_id_to_global()
         self._layer_cache_basedir = layer_cache_basedir
         self._force_image_build = force_image_build
         self._aws_region = aws_region
@@ -345,6 +349,25 @@ def _clean_running_containers_and_related_resources(self) -> None:
         cast(WarmLambdaRuntime, self.lambda_runtime).clean_running_containers_and_related_resources()
         cast(RefreshableSamFunctionProvider, self._function_provider).stop_observer()
 
+    def _add_account_id_to_global(self):
+        """
+        Attempts to get the Account ID from the current session
+        If there is no current session, the standard parameter override for
+        AWS::AccountId is used
+        """
+        client_provider = samcli.lib.utils.boto_utils.get_boto_client_provider_with_config()
+
+        sts = client_provider("sts")
+
+        try:
+            account_id = sts.get_caller_identity().get("Account")
+            if account_id:
+                if self._global_parameter_overrides is None:
+                    self._global_parameter_overrides = {}
+                self._global_parameter_overrides["AWS::AccountId"] = account_id
+        except TokenRetrievalError:
+            LOG.warning("No current session found, using default AWS::AccountId")
+
     @property
     def function_identifier(self) -> str:
         """
@@ -472,6 +495,7 @@ def _is_debugging(self) -> bool:
 
     def _get_stacks(self) -> List[Stack]:
         try:
+            print(SamLocalStackProvider.get_stacks)
             stacks, _ = SamLocalStackProvider.get_stacks(
                 self._template_file,
                 parameter_overrides=self._parameter_overrides,

tests/unit/commands/local/cli_common/test_invoke_context.py

@@ -1360,3 +1360,19 @@ def test_must_pass_custom_region(self, get_stacks_mock):
         get_stacks_mock.assert_called_with(
             "template_file", parameter_overrides=None, global_parameter_overrides={"AWS::Region": "my-custom-region"}
         )
+
+
+class TestInvokeContext_add_account_id_to_global(TestCase):
+    def test_must_work_with_no_token(self):
+        invoke_context = InvokeContext("template_file")
+        invoke_context._add_account_id_to_global()
+        self.assertIsNone(invoke_context._global_parameter_overrides)
+
+    @patch("samcli.lib.utils.boto_utils.get_boto_client_provider_with_config")
+    def test_must_work_with_token(self, get_boto_client_provider_with_config_mock):
+        get_boto_client_provider_with_config_mock.return_value.return_value.get_caller_identity.return_value.get.return_value = (
+            "210987654321"
+        )
+        invoke_context = InvokeContext("template_file")
+        invoke_context._add_account_id_to_global()
+        self.assertEqual(invoke_context._global_parameter_overrides.get("AWS::AccountId"), "210987654321")