Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#3359 - Only initiate Docker when invoking Lambdas

Browse Source
This commit is contained in:
Bert Blommers 2020-11-08 14:18:49 +00:00
parent c0700aa704
commit 390a4d5510
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
moto/awslambda/models.py
View File

@ -162,25 +162,11 @@ class LambdaFunction(CloudFormationModel):
self.run_time = spec["Runtime"] self.run_time = spec["Runtime"]
self.logs_backend = logs_backends[self.region] self.logs_backend = logs_backends[self.region]
self.environment_vars = spec.get("Environment", {}).get("Variables", {}) self.environment_vars = spec.get("Environment", {}).get("Variables", {})
self.docker_client = docker.from_env() self.docker_client = None
self.policy = None self.policy = None
self.state = "Active" self.state = "Active"
self.reserved_concurrency = spec.get("ReservedConcurrentExecutions", None) self.reserved_concurrency = spec.get("ReservedConcurrentExecutions", None)
# Unfortunately mocking replaces this method w/o fallback enabled, so we
# need to replace it if we detect it's been mocked
if requests.adapters.HTTPAdapter.send != _orig_adapter_send:
_orig_get_adapter = self.docker_client.api.get_adapter
def replace_adapter_send(*args, **kwargs):
adapter = _orig_get_adapter(*args, **kwargs)
if isinstance(adapter, requests.adapters.HTTPAdapter):
adapter.send = functools.partial(_orig_adapter_send, adapter)
return adapter
self.docker_client.api.get_adapter = replace_adapter_send
# optional # optional
self.description = spec.get("Description", "") self.description = spec.get("Description", "")
self.memory_size = spec.get("MemorySize", 128) self.memory_size = spec.get("MemorySize", 128)
@ -242,6 +228,26 @@ class LambdaFunction(CloudFormationModel):
self.tags = dict() self.tags = dict()
def initiate_docker_client(self):
# We should only initiate the Docker Client at runtime.
# The docker.from_env() call will fall if Docker is not running
if self.docker_client is None:
self.docker_client = docker.from_env()
# Unfortunately mocking replaces this method w/o fallback enabled, so we
# need to replace it if we detect it's been mocked
if requests.adapters.HTTPAdapter.send != _orig_adapter_send:
_orig_get_adapter = self.docker_client.api.get_adapter
def replace_adapter_send(*args, **kwargs):
adapter = _orig_get_adapter(*args, **kwargs)
if isinstance(adapter, requests.adapters.HTTPAdapter):
adapter.send = functools.partial(_orig_adapter_send, adapter)
return adapter
self.docker_client.api.get_adapter = replace_adapter_send
def set_version(self, version): def set_version(self, version):
self.function_arn = make_function_ver_arn( self.function_arn = make_function_ver_arn(
self.region, ACCOUNT_ID, self.function_name, version self.region, ACCOUNT_ID, self.function_name, version
@ -412,6 +418,8 @@ class LambdaFunction(CloudFormationModel):
env_vars.update(self.environment_vars) env_vars.update(self.environment_vars)
self.initiate_docker_client()
container = exit_code = None container = exit_code = None
log_config = docker.types.LogConfig(type=docker.types.LogConfig.types.JSON) log_config = docker.types.LogConfig(type=docker.types.LogConfig.types.JSON)
with _DockerDataVolumeContext(self) as data_vol: with _DockerDataVolumeContext(self) as data_vol: