From c20e8568e0b0a168569496ed602fec3aa912d18c Mon Sep 17 00:00:00 2001 From: Aidan Fewster Date: Fri, 13 Jul 2018 12:53:00 +0100 Subject: [PATCH] APIGateway - Generate API key value when no value provided (#1713) --- moto/apigateway/models.py | 6 +----- tests/test_apigateway/test_apigateway.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/moto/apigateway/models.py b/moto/apigateway/models.py index 868262ccc..5fdaed1e8 100644 --- a/moto/apigateway/models.py +++ b/moto/apigateway/models.py @@ -300,11 +300,7 @@ class ApiKey(BaseModel, dict): generateDistinctId=False, value=None, stageKeys=None, customerId=None): super(ApiKey, self).__init__() self['id'] = create_id() - if generateDistinctId: - # Best guess of what AWS does internally - self['value'] = ''.join(random.sample(string.ascii_letters + string.digits, 40)) - else: - self['value'] = value + self['value'] = value if value else ''.join(random.sample(string.ascii_letters + string.digits, 40)) self['name'] = name self['customerId'] = customerId self['description'] = description diff --git a/tests/test_apigateway/test_apigateway.py b/tests/test_apigateway/test_apigateway.py index 3f75b3ebd..99fef0481 100644 --- a/tests/test_apigateway/test_apigateway.py +++ b/tests/test_apigateway/test_apigateway.py @@ -981,7 +981,7 @@ def test_api_keys(): apikey['value'].should.equal(apikey_value) apikey_name = 'TESTKEY2' - payload = {'name': apikey_name, 'generateDistinctId': True} + payload = {'name': apikey_name } response = client.create_api_key(**payload) apikey_id = response['id'] apikey = client.get_api_key(apiKey=apikey_id)