Skip to content

Adding delimiter between the hash data components. #1060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2019
Merged

Adding delimiter between the hash data components. #1060

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e70ec7
adding delimiter
praneetap Aug 1, 2019
1add876
addressed cr comments
praneetap Aug 1, 2019
6da5e80
fixes for tests
praneetap Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions samtranslator/model/apigateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ class ApiGatewayAccount(Resource):


class ApiGatewayDeployment(Resource):
_X_HASH_DELIMITER = "||"

resource_type = 'AWS::ApiGateway::Deployment'
property_types = {
'Description': PropertyType(False, is_str()),
Expand Down Expand Up @@ -90,13 +92,15 @@ def make_auto_deployable(self, stage, openapi_version=None, swagger=None):
# to prevent redeployment when API has not changed

# NOTE: `str(swagger)` is for backwards compatibility. Changing it to a JSON or something will break compat
hash_input = str(swagger)
hash_input = [str(swagger)]
if openapi_version:
hash_input = hash_input + str(openapi_version)
generator = logical_id_generator.LogicalIdGenerator(self.logical_id, hash_input)
hash_input.append(str(openapi_version))

data = self._X_HASH_DELIMITER.join(hash_input)
generator = logical_id_generator.LogicalIdGenerator(self.logical_id, data)
self.logical_id = generator.gen()
hash = generator.get_hash(length=40) # Get the full hash
self.Description = "RestApi deployment id: {}".format(hash)
digest = generator.get_hash(length=40) # Get the full hash
self.Description = "RestApi deployment id: {}".format(digest)
stage.update_deployment_ref(self.logical_id)


Expand Down