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

Merge branch 'master' of github.com:spulec/moto

Browse Source
This commit is contained in:
John Corrales 2019-01-09 18:02:45 -08:00
commit fcc5a165ea
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/awslambda/models.py
View File

@ -386,7 +386,7 @@ class LambdaFunction(BaseModel):
'Role': properties['Role'], 'Role': properties['Role'],
'Runtime': properties['Runtime'], 'Runtime': properties['Runtime'],
} }
optional_properties = 'Description MemorySize Publish Timeout VpcConfig'.split() optional_properties = 'Description MemorySize Publish Timeout VpcConfig Environment'.split()
# NOTE: Not doing `properties.get(k, DEFAULT)` to avoid duplicating the # NOTE: Not doing `properties.get(k, DEFAULT)` to avoid duplicating the
# default logic # default logic
for prop in optional_properties: for prop in optional_properties:

10
tests/test_cloudformation/test_cloudformation_stack_integration.py
View File

@ -1952,7 +1952,12 @@ def lambda_handler(event, context):
"Description": "Test function", "Description": "Test function",
"MemorySize": 128, "MemorySize": 128,
"Role": "test-role", "Role": "test-role",
"Runtime": "python2.7" "Runtime": "python2.7",
"Environment": {
"Variables": {
"TEST_ENV_KEY": "test-env-val",
}
},
} }
} }
} }
@ -1973,6 +1978,9 @@ def lambda_handler(event, context):
result['Functions'][0]['MemorySize'].should.equal(128) result['Functions'][0]['MemorySize'].should.equal(128)
result['Functions'][0]['Role'].should.equal('test-role') result['Functions'][0]['Role'].should.equal('test-role')
result['Functions'][0]['Runtime'].should.equal('python2.7') result['Functions'][0]['Runtime'].should.equal('python2.7')
result['Functions'][0]['Environment'].should.equal({
"Variables": {"TEST_ENV_KEY": "test-env-val"}
})
@mock_cloudformation @mock_cloudformation