@adobe/helix-deploy 6.2.22 → 6.2.25

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [6.2.25](https://github.com/adobe/helix-deploy/compare/v6.2.24...v6.2.25) (2022-04-22)
+
+
+### Bug Fixes
+
+* **aws:** link integration to v alias of function ([#401](https://github.com/adobe/helix-deploy/issues/401)) ([1a46a0e](https://github.com/adobe/helix-deploy/commit/1a46a0e3543d460c5fc3378b8bcf2e3ff837c5d4))
+
+## [6.2.24](https://github.com/adobe/helix-deploy/compare/v6.2.23...v6.2.24) (2022-04-19)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#400](https://github.com/adobe/helix-deploy/issues/400)) ([4d9623c](https://github.com/adobe/helix-deploy/commit/4d9623c62bf5c7c3bdb6830f7e6fe8b9352ddadb))
+
+## [6.2.23](https://github.com/adobe/helix-deploy/compare/v6.2.22...v6.2.23) (2022-04-10)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#396](https://github.com/adobe/helix-deploy/issues/396)) ([7ca715d](https://github.com/adobe/helix-deploy/commit/7ca715d7dbd24a6ac988ea19a6ce2ca1016b54d1))
+
 ## [6.2.22](https://github.com/adobe/helix-deploy/compare/v6.2.21...v6.2.22) (2022-04-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "6.2.22",
+  "version": "6.2.25",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -37,61 +37,61 @@
     "@adobe/helix-universal": ">=1.9.0"
   },
   "dependencies": {
-    "@adobe/fastly-native-promises": "2.0.6",
-    "@adobe/helix-fetch": "3.0.8",
-    "@aws-sdk/client-apigatewayv2": "3.58.0",
-    "@aws-sdk/client-lambda": "3.58.0",
-    "@aws-sdk/client-s3": "3.58.0",
-    "@aws-sdk/client-secrets-manager": "3.58.0",
-    "@aws-sdk/client-ssm": "3.58.0",
+    "@adobe/fastly-native-promises": "2.0.7",
+    "@adobe/helix-fetch": "3.0.9",
+    "@aws-sdk/client-apigatewayv2": "3.72.0",
+    "@aws-sdk/client-lambda": "3.72.0",
+    "@aws-sdk/client-s3": "3.72.0",
+    "@aws-sdk/client-secrets-manager": "3.72.0",
+    "@aws-sdk/client-ssm": "3.72.0",
     "@fastly/js-compute": "0.2.4",
     "@google-cloud/functions": "1.2.0",
-    "@google-cloud/secret-manager": "3.11.0",
-    "@google-cloud/storage": "5.18.3",
+    "@google-cloud/secret-manager": "3.12.0",
+    "@google-cloud/storage": "5.19.2",
     "@rollup/plugin-alias": "3.1.9",
-    "@rollup/plugin-commonjs": "21.0.3",
+    "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "13.1.3",
-    "archiver": "5.3.0",
+    "@rollup/plugin-node-resolve": "13.2.1",
+    "archiver": "5.3.1",
     "chalk-template": "0.4.0",
     "constants-browserify": "1.0.0",
     "dotenv": "16.0.0",
     "express": "4.17.3",
     "form-data": "4.0.0",
-    "fs-extra": "10.0.1",
+    "fs-extra": "10.1.0",
     "get-stream": "6.0.1",
-    "isomorphic-git": "1.17.0",
+    "isomorphic-git": "1.17.1",
     "openwhisk": "3.21.6",
     "proxyquire": "2.1.3",
-    "rollup": "2.70.1",
+    "rollup": "2.70.2",
     "rollup-plugin-terser": "7.0.2",
-    "semver": "7.3.5",
+    "semver": "7.3.7",
     "tar": "6.1.11",
-    "webpack": "5.71.0",
-    "yargs": "17.4.0"
+    "webpack": "5.72.0",
+    "yargs": "17.4.1"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
     "@adobe/helix-shared-wrap": "1.0.4",
-    "@adobe/helix-status": "9.2.10",
-    "@adobe/helix-universal-logger": "2.0.6",
+    "@adobe/helix-status": "9.2.11",
+    "@adobe/helix-universal-logger": "2.0.7",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
     "c8": "7.11.0",
     "chai": "4.3.6",
     "chai-http": "4.3.0",
     "codecov": "3.8.3",
-    "eslint": "8.12.0",
+    "eslint": "8.13.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-import": "2.26.0",
     "husky": "7.0.4",
-    "lint-staged": "12.3.7",
+    "lint-staged": "12.3.8",
     "mocha": "9.2.2",
     "mocha-junit-reporter": "2.0.2",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.2.4",
     "semantic-release": "19.0.2",
-    "sinon": "13.0.1",
+    "sinon": "13.0.2",
     "yauzl": "2.10.0"
   },
   "engines": {

package/src/deploy/AWSDeployer.js

@@ -228,7 +228,8 @@ export default class AWSDeployer extends BaseDeployer {
       if (e.name === 'ResourceNotFoundException') {
         this.log.info(chalk`{green ok}: does not exist yet.`);
         this.log.info(chalk`--: creating new Lambda function {yellow ${functionName}}`);
-        await this._lambda.send(new CreateFunctionCommand(functionConfig));
+        const res = await this._lambda.send(new CreateFunctionCommand(functionConfig));
+        baseARN = res.FunctionArn;
       } else {
         this.log.error(chalk`Unable to verify existence of Lambda function {yellow ${functionName}}`);
         throw e;
@@ -627,21 +628,23 @@ export default class AWSDeployer extends BaseDeployer {
         Name: name,
       }));
       this.log.info(chalk`--: updating alias {blue ${name}}...`);
-      await this._lambda.send(new UpdateAliasCommand({
+      const res = await this._lambda.send(new UpdateAliasCommand({
         FunctionName: functionName,
         Name: name,
         FunctionVersion: functionVersion,
       }));
       this.log.info(chalk`{green ok:} updated alias {blue ${name}} to version {yellow ${functionVersion}}.`);
+      return res.AliasArn;
     } catch (e) {
       if (e.name === 'ResourceNotFoundException') {
         this.log.info(chalk`--: creating alias {blue ${name}}...`);
-        await this._lambda.send(new CreateAliasCommand({
+        const res = await this._lambda.send(new CreateAliasCommand({
           FunctionName: functionName,
           Name: name,
           FunctionVersion: functionVersion,
         }));
         this.log.info(chalk`{green ok:} created alias {blue ${name}} for version {yellow ${functionVersion}}.`);
+        return res.AliasArn;
       } else {
         this.log.error(`Unable to verify existence of Lambda alias ${name}`);
         throw e;
@@ -654,9 +657,7 @@ export default class AWSDeployer extends BaseDeployer {
     const { ApiId } = await this.initApiId();
     const functionVersion = cfg.version.replace(/\./g, '_');
 
-    // get function alias
     let res;
-    let aliasArn;
     let incrementalVersion;
     try {
       this.log.info(chalk`--: fetching alias ...`);
@@ -664,71 +665,95 @@ export default class AWSDeployer extends BaseDeployer {
         FunctionName: functionName,
         Name: functionVersion,
       }));
-      aliasArn = res.AliasArn;
       incrementalVersion = res.FunctionVersion;
-      this.log.info(chalk`{green ok}: ${aliasArn}`);
+      this.log.info(chalk`{green ok}: ${functionName}@${functionVersion} => ${incrementalVersion}`);
     } catch (e) {
       this.log.error(chalk`{red error}: Unable to create link to function ${functionName}`);
       throw e;
     }
 
-    // find integration
-    let integration = await this.findIntegration(ApiId, aliasArn);
-    let cleanup = false;
-    if (integration) {
-      this.log.info(`--: using existing integration "${integration.IntegrationId}" for "${aliasArn}"`);
-    } else {
-      integration = await this._api.send(new CreateIntegrationCommand({
-        ApiId,
-        IntegrationMethod: 'POST',
-        IntegrationType: 'AWS_PROXY',
-        IntegrationUri: aliasArn,
-        PayloadFormatVersion: '2.0',
-        TimeoutInMillis: Math.min(cfg.timeout, 30000),
-      }));
-      this.log.info(chalk`{green ok:} created new integration "${integration.IntegrationId}" for "${aliasArn}"`);
-      cleanup = true;
-    }
-    const { IntegrationId } = integration;
-
     // get all the routes
     this.log.info(chalk`--: fetching routes ...`);
     const routes = await this.fetchRoutes(ApiId);
-    const routeParams = {
-      ApiId,
-      Target: `integrations/${IntegrationId}`,
-      AuthorizerId: undefined,
-      AuthorizationType: 'NONE',
-    };
-    if (this._cfg.attachAuthorizer) {
-      this.log.info(chalk`--: fetching authorizers...`);
-      const authorizers = await this.fetchAuthorizers(ApiId);
-      const authorizer = authorizers.find((info) => info.Name === this._cfg.attachAuthorizer);
-      if (!authorizer) {
-        throw Error(`Specified authorizer ${this._cfg.attachAuthorizer} does not exist in api ${ApiId}.`);
-      }
-      routeParams.AuthorizerId = authorizer.AuthorizerId;
-      routeParams.AuthorizationType = 'CUSTOM';
-      this.log.info(chalk`{green ok:} configuring routes with authorizer {blue ${this._cfg.attachAuthorizer}} {yellow ${authorizer.AuthorizerId}}`);
-    }
 
     // create routes for each symlink
     const sfx = this.getLinkVersions();
 
     for (const suffix of sfx) {
-      // check if route already exists
+      // create or update alias
+      const aliasArn = await this.createOrUpdateAlias(suffix.replace('.', '_'), functionName, incrementalVersion);
+
+      // find or create integration
+      let integration = await this.findIntegration(ApiId, aliasArn);
+      if (integration) {
+        this.log.info(`--: using existing integration "${integration.IntegrationId}" for "${aliasArn}"`);
+      } else {
+        integration = await this._api.send(new CreateIntegrationCommand({
+          ApiId,
+          IntegrationMethod: 'POST',
+          IntegrationType: 'AWS_PROXY',
+          IntegrationUri: aliasArn,
+          PayloadFormatVersion: '2.0',
+          TimeoutInMillis: Math.min(cfg.timeout, 30000),
+        }));
+        this.log.info(chalk`{green ok:} created new integration "${integration.IntegrationId}" for "${aliasArn}"`);
+      }
+      const { IntegrationId } = integration;
+
+      const routeParams = {
+        ApiId,
+        Target: `integrations/${IntegrationId}`,
+        AuthorizerId: undefined,
+        AuthorizationType: 'NONE',
+      };
+      if (this._cfg.attachAuthorizer) {
+        this.log.info(chalk`--: fetching authorizers...`);
+        const authorizers = await this.fetchAuthorizers(ApiId);
+        const authorizer = authorizers.find((info) => info.Name === this._cfg.attachAuthorizer);
+        if (!authorizer) {
+          throw Error(`Specified authorizer ${this._cfg.attachAuthorizer} does not exist in api ${ApiId}.`);
+        }
+        routeParams.AuthorizerId = authorizer.AuthorizerId;
+        routeParams.AuthorizationType = 'CUSTOM';
+        this.log.info(chalk`{green ok:} configuring routes with authorizer {blue ${this._cfg.attachAuthorizer}} {yellow ${authorizer.AuthorizerId}}`);
+      }
+
+      // create or update routes
       await this.createOrUpdateRoute(routes, routeParams, `ANY /${cfg.packageName}/${cfg.baseName}/${suffix}`);
       await this.createOrUpdateRoute(routes, routeParams, `ANY /${cfg.packageName}/${cfg.baseName}/${suffix}/{path+}`);
 
-      // create or update alias
-      await this.createOrUpdateAlias(suffix.replace('.', '_'), functionName, incrementalVersion);
-    }
+      await this.updateAuthorizers(ApiId, functionName, aliasArn);
 
-    if (cleanup) {
-      await this.cleanUpIntegrations(functionName);
+      // add permissions to invoke function (with and without path)
+      let sourceArn = `arn:aws:execute-api:${this._cfg.region}:${this._accountId}:${ApiId}/*/*/${cfg.packageName}/${cfg.baseName}/${suffix}`;
+      try {
+        // eslint-disable-next-line no-await-in-loop
+        await this._lambda.send(new AddPermissionCommand({
+          FunctionName: aliasArn,
+          Action: 'lambda:InvokeFunction',
+          SourceArn: sourceArn,
+          Principal: 'apigateway.amazonaws.com',
+          StatementId: crypto.createHash('md5').update(aliasArn + sourceArn).digest('hex'),
+        }));
+        this.log.info(chalk`{green ok:} added invoke permissions for ${sourceArn}`);
+      } catch (e) {
+        // ignore, most likely the permission already exists
+      }
+      sourceArn = `arn:aws:execute-api:${this._cfg.region}:${this._accountId}:${ApiId}/*/*/${cfg.packageName}/${cfg.baseName}/${suffix}/{path+}`;
+      try {
+        // eslint-disable-next-line no-await-in-loop
+        await this._lambda.send(new AddPermissionCommand({
+          FunctionName: aliasArn,
+          Action: 'lambda:InvokeFunction',
+          SourceArn: sourceArn,
+          Principal: 'apigateway.amazonaws.com',
+          StatementId: crypto.createHash('md5').update(aliasArn + sourceArn).digest('hex'),
+        }));
+        this.log.info(chalk`{green ok:} added invoke permissions for ${sourceArn}`);
+      } catch (e) {
+        // ignore, most likely the permission already exists
+      }
     }
-
-    await this.updateAuthorizers(ApiId, functionName, aliasArn);
   }
 
   async updateAuthorizers(ApiId, functionName, aliasArn) {

package/src/deploy/BaseDeployer.js

@@ -153,7 +153,7 @@ export default class BaseDeployer {
   }
 
   /**
-   * Returns the link versions based on the configruation. eg ['v8', 'ci']
+   * Returns the link versions based on the configuration. eg ['v8', 'ci']
    */
   getLinkVersions() {
     const sfx = [];
@@ -164,7 +164,7 @@ export default class BaseDeployer {
       if (link === 'major' || link === 'minor') {
         if (!s) {
           // eslint-disable-next-line no-underscore-dangle
-          this.log.warn(chalk`{yellow warn:} unable to create version sequences. error while parsing version: ${this.cfg.version}`);
+          this.log.warn(chalk`{yellow warn:} Ignoring ${link} version link for ${this.cfg.version}. No semver format.`);
           return;
         }
         if (link === 'major') {

package/src/gateway/FastlyGateway.js

@@ -54,7 +54,7 @@ export default class FastlyGateway {
       }));
 
     await this._fastly.bulkUpdateDictItems(undefined, 'aliases', ...versionstrings);
-    this._fastly.discard();
+    await this._fastly.discard();
     this.log.info(chalk`{green ok:} updated links on the Gateway for version ${version}.`);
   }