fixup! Delete inactive function versions at deploy time (#5927)

Author: dsotirho-ucsc

scripts/delete_other_function_versions.py renamed to scripts/delete_older_function_versions.py

@@ -35,9 +35,10 @@ def main(argv: list[str]):
                         required=True,
                         help='The Lambda function version to keep')
     args = parser.parse_args(argv)
-    log.info('Deleting function %r versions other than %r',
+    log.info('Deleting function %r versions older than %r',
              args.function_name, args.function_version)
-    Lambdas().delete_other_function_versions(args.function_name, args.function_version)
+    Lambdas().delete_older_function_versions(args.function_name,
+                                             args.function_version)
 
 
 if __name__ == '__main__':

src/azul/lambdas.py

@@ -114,12 +114,11 @@ def list_lambdas(self) -> list[Lambda]:
             for function in response['Functions']
         ]
 
-    def delete_other_function_versions(self,
+    def delete_older_function_versions(self,
                                        function_name: str,
                                        keep_version: str) -> None:
         """
-        Delete all published versions of a Lambda function except for the
-        version specified to keep.
+        Delete all versions of a Lambda function prior to the specified one.
         Raises an error if the specified version does not exist.
 
         :param function_name: The fully qualified name of the function
@@ -131,7 +130,10 @@ def delete_other_function_versions(self,
             function['Version']
             for page in paginator.paginate(FunctionName=function_name)
             for function in page['Versions']
-            if function['Version'] != '$LATEST'  # unpublished version
+            if (
+                function['Version'] != '$LATEST'  # The so-called "unpublished" version
+                and int(function['Version']) <= int(keep_version)
+            )
         ]
         try:
             versions.remove(keep_version)

terraform/api_gateway.tf.json.template.py

@@ -784,10 +784,9 @@ def add_waf_blocked_alarm(resources: JSON) -> JSON:
                     'triggers_replace': ['${aws_lambda_alias.%s.function_version}' % resource_name],
                     'provisioner': {
                         'local-exec': {
-                            # Script deletes any published version *except* the specified one
                             'command': ' '.join([
                                 'python',
-                                f'{config.project_root}/scripts/delete_other_function_versions.py',
+                                f'{config.project_root}/scripts/delete_older_function_versions.py',
                                 '--function-name ${aws_lambda_alias.%s.function_name}' % resource_name,
                                 '--function-version ${aws_lambda_alias.%s.function_version}' % resource_name
                             ])