From a49d9d6a028885d0a09d723c5de42d2967d61fd1 Mon Sep 17 00:00:00 2001 From: Joel Scheuner Date: Wed, 18 Jan 2023 11:54:35 +0100 Subject: [PATCH] Rename resolved alias and version Resolves misleading naming especially for latest_version (pretends it is $LATEST) but actually refers to the resolved qualifier. Fixes Daniel's comment: https://github.com/localstack/localstack/pull/7482#discussion_r1073361124 --- localstack/services/awslambda/provider.py | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/localstack/services/awslambda/provider.py b/localstack/services/awslambda/provider.py index 19878e6f061d1..ea0620d4882ae 100644 --- a/localstack/services/awslambda/provider.py +++ b/localstack/services/awslambda/provider.py @@ -1756,13 +1756,13 @@ def add_permission( # TODO: re-evaluate data model to prevent this dirty hack just for bumping the revision id # TODO: does that need a `with function.lock` for atomic updates of the policy + revision_id? if api_utils.qualifier_is_alias(resolved_qualifier): - latest_alias = resolved_fn.aliases[resolved_qualifier] - resolved_fn.aliases[resolved_qualifier] = dataclasses.replace(latest_alias) + resolved_alias = resolved_fn.aliases[resolved_qualifier] + resolved_fn.aliases[resolved_qualifier] = dataclasses.replace(resolved_alias) # Assumes that a non-alias is a version else: - latest_version = resolved_fn.versions[resolved_qualifier] + resolved_version = resolved_fn.versions[resolved_qualifier] resolved_fn.versions[resolved_qualifier] = dataclasses.replace( - latest_version, config=dataclasses.replace(latest_version.config) + resolved_version, config=dataclasses.replace(resolved_version.config) ) return AddPermissionResponse(Statement=json.dumps(permission_statement)) @@ -1819,13 +1819,13 @@ def remove_permission( # TODO: re-evaluate data model to prevent this dirty hack just for bumping the revision id # TODO: does that need a `with function.lock` for atomic updates of the policy + revision_id? if api_utils.qualifier_is_alias(resolved_qualifier): - latest_alias = resolved_fn.aliases[resolved_qualifier] - resolved_fn.aliases[resolved_qualifier] = dataclasses.replace(latest_alias) + resolved_alias = resolved_fn.aliases[resolved_qualifier] + resolved_fn.aliases[resolved_qualifier] = dataclasses.replace(resolved_alias) # Assumes that a non-alias is a version else: - latest_version = resolved_fn.versions[resolved_qualifier] + resolved_version = resolved_fn.versions[resolved_qualifier] resolved_fn.versions[resolved_qualifier] = dataclasses.replace( - latest_version, config=dataclasses.replace(latest_version.config) + resolved_version, config=dataclasses.replace(resolved_version.config) ) # remove the policy as a whole when there's no statement left in it @@ -1856,12 +1856,12 @@ def get_policy( fn_revision_id = None if api_utils.qualifier_is_alias(resolved_qualifier): - latest_alias = resolved_fn.aliases[resolved_qualifier] - fn_revision_id = latest_alias.revision_id + resolved_alias = resolved_fn.aliases[resolved_qualifier] + fn_revision_id = resolved_alias.revision_id # Assumes that a non-alias is a version else: - latest_version = resolved_fn.versions[resolved_qualifier] - fn_revision_id = latest_version.config.revision_id + resolved_version = resolved_fn.versions[resolved_qualifier] + fn_revision_id = resolved_version.config.revision_id return GetPolicyResponse( Policy=json.dumps(dataclasses.asdict(function_permission.policy)),