@adobe/helix-deploy 9.4.5 → 9.5.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [9.5.1](https://github.com/adobe/helix-deploy/compare/v9.5.0...v9.5.1) (2024-01-06)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([bbdc3d1](https://github.com/adobe/helix-deploy/commit/bbdc3d166ea14c26e386de7cac686aad0596ad01))
+
+# [9.5.0](https://github.com/adobe/helix-deploy/compare/v9.4.5...v9.5.0) (2024-01-05)
+
+
+### Features
+
+* cleanup ci and patch versions ([#632](https://github.com/adobe/helix-deploy/issues/632)) ([448f406](https://github.com/adobe/helix-deploy/commit/448f406e778a6f0704fc81054cd61dc728d62916))
+
 ## [9.4.5](https://github.com/adobe/helix-deploy/compare/v9.4.4...v9.4.5) (2023-12-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "9.4.5",
+  "version": "9.5.1",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -38,12 +38,13 @@
   "dependencies": {
     "@adobe/fastly-native-promises": "3.0.6",
     "@adobe/fetch": "4.1.1",
-    "@aws-sdk/client-apigatewayv2": "3.484.0",
-    "@aws-sdk/client-lambda": "3.484.0",
-    "@aws-sdk/client-s3": "3.484.0",
-    "@aws-sdk/client-secrets-manager": "3.484.0",
-    "@aws-sdk/client-ssm": "3.484.0",
-    "@aws-sdk/client-sts": "3.484.0",
+    "@adobe/helix-shared-process-queue": "3.0.0",
+    "@aws-sdk/client-apigatewayv2": "3.485.0",
+    "@aws-sdk/client-lambda": "3.485.0",
+    "@aws-sdk/client-s3": "3.485.0",
+    "@aws-sdk/client-secrets-manager": "3.485.0",
+    "@aws-sdk/client-ssm": "3.485.0",
+    "@aws-sdk/client-sts": "3.485.0",
     "@fastly/js-compute": "3.7.3",
     "@google-cloud/functions": "3.0.1",
     "@google-cloud/secret-manager": "5.0.1",
@@ -62,7 +63,7 @@
     "fs-extra": "11.2.0",
     "isomorphic-git": "1.25.2",
     "openwhisk": "3.21.8",
-    "rollup": "4.9.2",
+    "rollup": "4.9.4",
     "semver": "7.5.4",
     "tar": "6.2.0",
     "webpack": "5.89.0",

package/src/deploy/AWSDeployer.js

@@ -11,6 +11,8 @@
  */
 /* eslint-disable no-await-in-loop,no-restricted-syntax */
 import chalk from 'chalk-template';
+import processQueue from '@adobe/helix-shared-process-queue';
+
 import {
   DeleteObjectCommand,
   PutObjectCommand,
@@ -25,9 +27,10 @@ import {
 import {
   AddPermissionCommand,
   CreateAliasCommand,
-  CreateFunctionCommand, GetAliasCommand,
+  CreateFunctionCommand, DeleteAliasCommand, DeleteFunctionCommand, GetAliasCommand,
   GetFunctionCommand,
-  LambdaClient, PublishVersionCommand, UpdateAliasCommand, UpdateFunctionCodeCommand,
+  LambdaClient, ListAliasesCommand, ListVersionsByFunctionCommand,
+  PublishVersionCommand, UpdateAliasCommand, UpdateFunctionCodeCommand,
   UpdateFunctionConfigurationCommand,
 } from '@aws-sdk/client-lambda';
 
@@ -408,6 +411,34 @@ export default class AWSDeployer extends BaseDeployer {
     return authorizers;
   }
 
+  async listAliases(functionName) {
+    let nextMarker;
+    const aliases = [];
+    do {
+      const res = await this._lambda.send(new ListAliasesCommand({
+        FunctionName: functionName,
+        Marker: nextMarker,
+      }));
+      aliases.push(...res.Aliases);
+      nextMarker = res.NextMarker;
+    } while (nextMarker);
+    return aliases;
+  }
+
+  async listVersions(functionName) {
+    let nextMarker;
+    const versions = [];
+    do {
+      const res = await this._lambda.send(new ListVersionsByFunctionCommand({
+        FunctionName: functionName,
+        Marker: nextMarker,
+      }));
+      versions.push(...res.Versions);
+      nextMarker = res.NextMarker;
+    } while (nextMarker);
+    return versions;
+  }
+
   async createAPI() {
     const { cfg } = this;
     const { ApiId, ApiEndpoint } = await this.initApiId();
@@ -546,6 +577,63 @@ export default class AWSDeployer extends BaseDeployer {
     this.log.info(chalk`{green ok}: parameters updated.`);
   }
 
+  async cleanup() {
+    const { cfg, functionName } = this;
+    const cleanupMatchers = [{
+      name: 'CI',
+      property: 'cleanupCiAge',
+      match: (alias) => alias.match(/^ci(\d+)$/),
+    }, {
+      name: 'patch',
+      property: 'cleanupPatchAge',
+      match: (alias) => alias.match(/^(\d+)_(\d+)_(\d+)(-test)?$/),
+    }];
+
+    try {
+      this.log.info('Clean up old aliases and versions');
+      this.log.info(chalk`--: fetching aliases...`);
+      const aliases = await this.listAliases(functionName);
+      this.log.info(chalk`--: fetching versions...`);
+      const versions = (await this.listVersions(functionName))
+        .map((version) => ({
+          ...version,
+          Aliases: aliases
+            .filter(({ FunctionVersion }) => version.Version === FunctionVersion)
+            .map(({ Name }) => Name),
+        }));
+
+      for (const { name, property, match } of cleanupMatchers) {
+        if (cfg[property]) {
+          const cleanupBefore = Date.now() - (cfg[property] * 1000);
+          const oldVersions = versions
+            .filter(({ Aliases }) => Aliases.length > 0 && Aliases.every((alias) => match(alias)))
+            .filter(({ LastModified }) => Date.parse(LastModified) < cleanupBefore);
+          this.log.info(`Found ${oldVersions.length} old ${name} versions`);
+
+          if (oldVersions.length) {
+            this.log.info(chalk`--: deleting their aliases and versions...`);
+            const deleted = await processQueue(oldVersions, async ({ Aliases, Version }) => {
+              await Promise.all(Aliases.map(async (Name) => {
+                await this._lambda.send(new DeleteAliasCommand({
+                  FunctionName: functionName,
+                  Name,
+                }));
+              }));
+              await this._lambda.send(new DeleteFunctionCommand({
+                FunctionName: functionName,
+                Qualifier: Version,
+              }));
+              return Version;
+            }, 2);
+            this.log.info(chalk`{green ok}: deleted ${deleted.length} old ${name} versions.`);
+          }
+        }
+      }
+    } catch (e) {
+      this.log.error(chalk`{red error:} Cleanup failed, proceeding anyway.`, e);
+    }
+  }
+
   async cleanUpIntegrations(filter) {
     this.log.info('Clean up Integrations');
     const { ApiId } = await this.initApiId();