@adobe/helix-deploy 5.0.3 → 5.1.0

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [5.1.0](https://github.com/adobe/helix-deploy/compare/v5.0.6...v5.1.0) (2022-01-12)
+
+
+### Features
+
+* use lambda adapter to validate bundle and execute it ([#354](https://github.com/adobe/helix-deploy/issues/354)) ([c48b4f0](https://github.com/adobe/helix-deploy/commit/c48b4f0dfcae09fd784212b770bcdc7246a7d332)), closes [#353](https://github.com/adobe/helix-deploy/issues/353)
+
+## [5.0.6](https://github.com/adobe/helix-deploy/compare/v5.0.5...v5.0.6) (2022-01-11)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#352](https://github.com/adobe/helix-deploy/issues/352)) ([ee411f3](https://github.com/adobe/helix-deploy/commit/ee411f3c03993f23eecbd024eff8d2a7e0b97ab7))
+
+## [5.0.5](https://github.com/adobe/helix-deploy/compare/v5.0.4...v5.0.5) (2022-01-03)
+
+
+### Bug Fixes
+
+* use fixed import conditions ([#350](https://github.com/adobe/helix-deploy/issues/350)) ([28464d2](https://github.com/adobe/helix-deploy/commit/28464d245229236ff15bad6e20278ce5ebd8594b))
+
+## [5.0.4](https://github.com/adobe/helix-deploy/compare/v5.0.3...v5.0.4) (2022-01-03)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#349](https://github.com/adobe/helix-deploy/issues/349)) ([ab4ceda](https://github.com/adobe/helix-deploy/commit/ab4cedaf66372443c401d0a476af3b5f11860c4b))
+
 ## [5.0.3](https://github.com/adobe/helix-deploy/compare/v5.0.2...v5.0.3) (2021-12-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -39,59 +39,59 @@
   "dependencies": {
     "@adobe/fastly-native-promises": "2.0.0",
     "@adobe/helix-fetch": "3.0.0",
-    "@aws-sdk/client-apigatewayv2": "3.43.0",
-    "@aws-sdk/client-lambda": "3.43.0",
-    "@aws-sdk/client-s3": "3.44.0",
-    "@aws-sdk/client-secrets-manager": "3.43.0",
-    "@aws-sdk/client-ssm": "3.44.0",
+    "@aws-sdk/client-apigatewayv2": "3.46.0",
+    "@aws-sdk/client-lambda": "3.46.0",
+    "@aws-sdk/client-s3": "3.46.0",
+    "@aws-sdk/client-secrets-manager": "3.46.0",
+    "@aws-sdk/client-ssm": "3.46.0",
     "@azure/arm-appservice": "9.0.0",
-    "@azure/ms-rest-nodeauth": "3.1.0",
+    "@azure/ms-rest-nodeauth": "3.1.1",
     "@fastly/js-compute": "0.2.1",
     "@google-cloud/functions": "1.2.0",
     "@google-cloud/secret-manager": "3.10.1",
-    "@google-cloud/storage": "5.16.1",
-    "@rollup/plugin-alias": "3.1.8",
+    "@google-cloud/storage": "5.17.0",
+    "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-commonjs": "21.0.1",
     "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "13.0.6",
+    "@rollup/plugin-node-resolve": "13.1.3",
     "archiver": "5.3.0",
     "chalk-template": "0.2.0",
     "constants-browserify": "1.0.0",
     "dotenv": "10.0.0",
-    "express": "4.17.1",
+    "express": "4.17.2",
     "form-data": "4.0.0",
     "fs-extra": "10.0.0",
     "get-stream": "6.0.1",
-    "isomorphic-git": "1.10.2",
-    "openwhisk": "3.21.5",
+    "isomorphic-git": "1.10.3",
+    "openwhisk": "3.21.6",
     "proxyquire": "2.1.3",
-    "rollup": "2.61.1",
+    "rollup": "2.63.0",
     "rollup-plugin-terser": "7.0.2",
     "semver": "7.3.5",
     "tar": "6.1.11",
     "webpack": "5.65.0",
-    "yargs": "17.3.0"
+    "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "1.3.1",
+    "@adobe/eslint-config-helix": "1.3.2",
     "@adobe/helix-shared-wrap": "1.0.0",
     "@adobe/helix-status": "9.2.4",
     "@adobe/helix-universal-logger": "2.0.0",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
-    "c8": "7.10.0",
+    "c8": "7.11.0",
     "chai": "4.3.4",
     "chai-http": "4.3.0",
     "codecov": "3.8.3",
-    "eslint": "8.4.1",
+    "eslint": "8.6.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-import": "2.25.4",
     "husky": "7.0.4",
-    "lint-staged": "12.1.2",
+    "lint-staged": "12.1.7",
     "mocha": "9.1.3",
     "mocha-junit-reporter": "2.0.2",
     "mocha-multi-reporters": "1.5.1",
-    "nock": "13.2.1",
+    "nock": "13.2.2",
     "semantic-release": "18.0.1",
     "sinon": "12.0.1",
     "yauzl": "2.10.0"

package/src/ActionBuilder.js

@@ -381,6 +381,10 @@ export default class ActionBuilder {
       for (const bundler of this.bundlers) {
         await bundler.createBundle();
         await bundler.createArchive();
+      }
+    }
+    if (cfg.build || cfg.test !== undefined || cfg.testBundle !== undefined) {
+      for (const bundler of this.bundlers) {
         await bundler.validateBundle();
       }
     }
@@ -408,7 +412,7 @@ export default class ActionBuilder {
       await this.delete();
     }
 
-    if (typeof cfg.test === 'string' || Object.keys(cfg.testParams).length) {
+    if (cfg.test !== undefined || Object.keys(cfg.testParams).length) {
       await this.validateDeployers();
       await this.test();
     }

package/src/BaseConfig.js

@@ -58,6 +58,7 @@ export default class BaseConfig {
       nodeVersion: null,
       deploy: false,
       test: null,
+      testBundle: null,
       testUrl: null,
       testParams: {},
       testHeaders: {},
@@ -173,6 +174,7 @@ export default class BaseConfig {
       .withDelete(argv.delete)
       .withDeploy(argv.deploy)
       .withTest(argv.test)
+      .withTestBundle(argv.testBundle)
       .withTestParams(argv.testParams)
       .withTestHeaders(argv.testHeaders)
       .withTestUrl(argv.testUrl)
@@ -279,6 +281,11 @@ export default class BaseConfig {
     return this;
   }
 
+  withTestBundle(enable) {
+    this.testBundle = enable;
+    return this;
+  }
+
   withTestUrl(value) {
     this.testUrl = value;
     return this;
@@ -572,7 +579,7 @@ export default class BaseConfig {
         default: '.',
       })
 
-      .group(['help', 'build', 'deploy', 'test', 'update-package', 'version-link', 'delete'], 'Operation Options')
+      .group(['help', 'build', 'deploy', 'test', 'test-bundle', 'update-package', 'version-link', 'delete'], 'Operation Options')
       .option('build', {
         description: 'Build the deployment package',
         type: 'boolean',
@@ -587,6 +594,10 @@ export default class BaseConfig {
         description: 'Invoke action after deployment. Can be relative url or "true"',
         type: 'string',
       })
+      .option('test-bundle', {
+        description: 'Invoke bundle after build. Can be relative url or "true". Defaults to the same as --test',
+        type: 'string',
+      })
       .option('version-link', {
         alias: 'l',
         description: 'Create symlinks (sequences) after deployment. "major" and "minor" will create respective version links',

package/src/bundler/BaseBundler.js

@@ -60,12 +60,15 @@ export default class BaseBundler {
   async validateBundle() {
     const { cfg } = this;
     cfg.log.info('--: validating bundle ...');
-    const result = await validateBundle(cfg.bundle);
+    const result = await validateBundle(cfg.bundle, cfg);
     if (result.error) {
-      cfg.log.error(chalk`{red error:}`, result.error);
       throw Error(`Validation failed: ${result.error}`);
     }
-    cfg.log.info(chalk`{green ok:} bundle can be loaded and has a {grey main()} function.`);
+    if (result.response) {
+      cfg.log.info(chalk`{green ok:} bundle can be loaded and {grey lambda()} function can be executed.`);
+    } else {
+      cfg.log.info(chalk`{green ok:} bundle can be loaded and has a {grey lambda()} function.`);
+    }
   }
 
   async createArchive() {

package/src/bundler/WebpackBundler.js

@@ -74,6 +74,8 @@ export default class WebpackBundler extends BaseBundler {
           // the main.js is imported in the universal adapter and is _the_ action entry point
           './main.js': cfg.file,
         },
+        // use fixed conditions to omit the `development` condition.
+        conditionNames: ['node', 'require'],
       },
       node: {
         __dirname: true,

package/src/template/validate-bundle.js

@@ -9,19 +9,54 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-async function run(bundlePath, opts) {
+async function run(bundlePath, cfg) {
   const result = {
+    status: 'ok',
   };
   try {
     const bundle = await import(bundlePath);
-    const main = bundle.default?.main;
-    if (!main || typeof main !== 'function') {
-      throw Error('Action has no main() function.');
+    const lambda = bundle.default?.lambda;
+    if (!lambda || typeof lambda !== 'function') {
+      throw Error('Action has no lambda() function.');
     }
-    if (opts.invoke) {
-      result.response = await main({});
+    const test = cfg.testBundle ?? cfg.test;
+    if (test !== undefined) {
+      const event = {
+        headers: cfg.testHeaders || {},
+        rawPath: `/${cfg.packageName}/${cfg.baseName}/${cfg.version}`,
+        rawQueryString: '',
+        pathParameters: {
+          path: '',
+        },
+        requestContext: {
+          domainName: 'localhost',
+          http: {
+            method: 'get',
+          },
+        },
+      };
+
+      const testUrl = String(test).startsWith('/') ? test : cfg.testUrl;
+      if (testUrl) {
+        const url = new URL(testUrl, 'https://localhost/');
+        event.pathParameters.path = url.pathname.substring(1);
+        event.rawPath += url.pathname;
+        event.rawQueryString = url.searchParams.toString();
+      }
+      const fn = typeof lambda.raw === 'function' ? lambda.raw : lambda;
+      result.response = await fn(event, {
+        invokedFunctionArn: `arn:aws:lambda:us-east-1:118435662149:function:${cfg.packageName}--${cfg.baseName}:${cfg.version}`,
+        getRemainingTimeInMillis: () => 60 * 1000,
+      });
+      if (cfg.verbose) {
+        // eslint-disable-next-line no-console
+        console.log(result.response);
+      }
+      if (result.response.statusCode !== 200) {
+        result.status = 'error';
+        result.error = result.response.statusCode;
+      }
     }
-    result.status = 'ok';
   } catch (e) {
     result.status = 'error';
     result.error = `${e.message}\n${e.stack}`;

package/src/utils.js

@@ -155,12 +155,9 @@ export function filterActions(fns, now, {
     ...cleanmajorbyage, ...cleanmajorbycount];
 }
 
-export async function validateBundle(bundlePath, invoke = false) {
+export async function validateBundle(bundlePath, cfg) {
   try {
-    const opts = {
-      invoke,
-    };
-    const child = fork(path.resolve(__dirname, 'template', 'validate-bundle.js'), [bundlePath, JSON.stringify(opts)]);
+    const child = fork(path.resolve(__dirname, 'template', 'validate-bundle.js'), [bundlePath, JSON.stringify(cfg)]);
     const ret = await new Promise((resolve, reject) => {
       child.on('message', resolve);
       child.on('error', reject);