Backport of boto client configuration change to version 0.48.2

* Allow customizing the boto client configuration * Originally from Miserlou#2121
ryancausey · Jun 15, 2020 · 4e3c2e0 · 4e3c2e0
1 parent c46d464
commit 4e3c2e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/zappa/cli.py b/zappa/cli.py
@@ -2093,6 +2093,7 @@ def load_settings(self, settings_file=None, session=None):
         self.context_header_mappings = self.stage_config.get('context_header_mappings', {})
         self.xray_tracing = self.stage_config.get('xray_tracing', False)
         self.desired_role_arn = self.stage_config.get('role_arn')
+        self.boto_client_config = self.stage_config.get('boto_client_config', {})
 
         # Load ALB-related settings
         self.use_alb = self.stage_config.get('alb_enabled', False)
@@ -2111,7 +2112,8 @@ def load_settings(self, settings_file=None, session=None):
                             runtime=self.runtime,
                             tags=self.tags,
                             endpoint_urls=self.stage_config.get('aws_endpoint_urls',{}),
-                            xray_tracing=self.xray_tracing
+                            xray_tracing=self.xray_tracing,
+                            boto_client_config=self.boto_client_config,
                         )
 
         for setting in CUSTOM_SETTINGS:

diff --git a/zappa/core.py b/zappa/core.py
@@ -252,7 +252,8 @@ def __init__(self,
             runtime='python2.7', # Detected at runtime in CLI
             tags=(),
             endpoint_urls={},
-            xray_tracing=False
+            xray_tracing=False,
+            boto_client_config={},
         ):
         """
         Instantiate this new Zappa instance, loading any custom credentials if necessary.
@@ -295,6 +296,7 @@ def __init__(self,
             'connect_timeout': 5,
             'read_timeout': 300
         }
+        long_config_dict.update(boto_client_config)
         long_config = botocore.client.Config(**long_config_dict)
 
         if load_credentials: