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

Merge pull request #2390 from gdippolito/master

Browse Source 
Add tag support to API Gateway keys
This commit is contained in:
Steve Pulec 2019-09-11 21:45:08 -05:00 committed by GitHub
commit ac8d3c6792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/apigateway/models.py
View File

@ -298,7 +298,7 @@ class Stage(BaseModel, dict):
class ApiKey(BaseModel, dict): class ApiKey(BaseModel, dict):
def __init__(self, name=None, description=None, enabled=True, def __init__(self, name=None, description=None, enabled=True,
generateDistinctId=False, value=None, stageKeys=None, customerId=None): generateDistinctId=False, value=None, stageKeys=None, tags=None, customerId=None):
super(ApiKey, self).__init__() super(ApiKey, self).__init__()
self['id'] = create_id() self['id'] = create_id()
self['value'] = value if value else ''.join(random.sample(string.ascii_letters + string.digits, 40)) self['value'] = value if value else ''.join(random.sample(string.ascii_letters + string.digits, 40))
@ -308,6 +308,7 @@ class ApiKey(BaseModel, dict):
self['enabled'] = enabled self['enabled'] = enabled
self['createdDate'] = self['lastUpdatedDate'] = int(time.time()) self['createdDate'] = self['lastUpdatedDate'] = int(time.time())
self['stageKeys'] = stageKeys self['stageKeys'] = stageKeys
self['tags'] = tags
def update_operations(self, patch_operations): def update_operations(self, patch_operations):
for op in patch_operations: for op in patch_operations:

4
tests/test_apigateway/test_apigateway.py
View File

@ -981,11 +981,13 @@ def test_api_keys():
apikey['value'].should.equal(apikey_value) apikey['value'].should.equal(apikey_value)
apikey_name = 'TESTKEY2' apikey_name = 'TESTKEY2'
payload = {'name': apikey_name } payload = {'name': apikey_name, 'tags': {'tag1': 'test_tag1', 'tag2': '1'}}
response = client.create_api_key(**payload) response = client.create_api_key(**payload)
apikey_id = response['id'] apikey_id = response['id']
apikey = client.get_api_key(apiKey=apikey_id) apikey = client.get_api_key(apiKey=apikey_id)
apikey['name'].should.equal(apikey_name) apikey['name'].should.equal(apikey_name)
apikey['tags']['tag1'].should.equal('test_tag1')
apikey['tags']['tag2'].should.equal('1')
len(apikey['value']).should.equal(40) len(apikey['value']).should.equal(40)
apikey_name = 'TESTKEY3' apikey_name = 'TESTKEY3'