@adobe/helix-deploy 5.0.4 → 6.0.0

package/CHANGELOG.md

@@ -1,3 +1,36 @@
+# [6.0.0](https://github.com/adobe/helix-deploy/compare/v5.1.0...v6.0.0) (2022-01-18)
+
+
+### Bug Fixes
+
+* remove support for Azure deployments ([#359](https://github.com/adobe/helix-deploy/issues/359)) ([14322ef](https://github.com/adobe/helix-deploy/commit/14322ef5dd51224f538f0f32f8116cccde4c26d6))
+
+
+### BREAKING CHANGES
+
+* azure support dropped.
+
+# [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)
 
 

package/README.md

@@ -53,85 +53,139 @@ Operation Options
       --build           Build the deployment package   [boolean] [default: true]
       --deploy          Automatically deploy to specified targets
                                                       [boolean] [default: false]
-      --test            Invoke action after deployment. Can be relative url.
-                                                                        [string]
+      --test            Invoke action after deployment. Can be relative url or "
+                        true"                                           [string]
+      --test-bundle     Invoke bundle after build. Can be relative url or "true"
+                        . Defaults to the same as --test                [string]
       --update-package  Create or update package with params.
                                                       [boolean] [default: false]
-  -l, --version-link    Create symlinks (sequences) after deployment. "major"
-                        and "minor" will create respective version links [array]
+  -l, --version-link    Create symlinks (sequences) after deployment. "major" an
+                        d "minor" will create respective version links   [array]
       --delete          Delete the action from OpenWhisk. Implies no-build
                                                       [boolean] [default: false]
 
 Build Options
-      --minify     Minify the final bundle            [boolean] [default: false]
-  -s, --static     Includes a static file into the archive [array] [default: []]
-      --entryFile  Specifies the entry file.           [default: "src/index.js"]
-      --externals  Defines the externals for webpack.      [array] [default: []]
-  -m, --modules    Include a node_module as is.            [array] [default: []]
+      --minify       Minify the final bundle          [boolean] [default: false]
+  -s, --static       Includes a static file into the archive
+                                                           [array] [default: []]
+      --entryFile    Specifies the entry file (the universal function).
+                                                       [default: "src/index.js"]
+      --externals    Defines the externals for the bundler.[array] [default: []]
+  -m, --modules      Include a node_module as is.          [array] [default: []]
+      --adapterFile  Specifies the adapter file (the exported module).
+      --esm          Produce EcmaScript Module (experimental, disables edge arch
+                     )                                [boolean] [default: false]
+      --bundler      Select bundler backend (webpack, rollup)
+                                                   [string] [default: "webpack"]
 
 Deploy Options
-      --target             Select target(s) for test, deploy, update-package
-                           actions (wsk,aws,azure,google,auto)
-                                                     [array] [default: ["auto"]]
+      --target             Select target(s) for test, deploy, update-package act
+                           ions (wsk,aws,google,auto)[array] [default: ["auto"]]
       --hints, --no-hints  Show additional hints for deployment
                                                        [boolean] [default: true]
 
 Test Options
-      --target       Select target(s) for test, deploy, update-package actions
-                     (wsk,aws,azure,google,auto)     [array] [default: ["auto"]]
-      --test-params  Invoke openwhisk action after deployment with the given
-                     params.                               [array] [default: []]
+      --target        Select target(s) for test, deploy, update-package actions
+                      (wsk,aws,google,auto)          [array] [default: ["auto"]]
+      --test-params   Invoke openwhisk action after deployment with the given pa
+                      rams.                                [array] [default: []]
+      --test-url      Test url to use after deployment, in case --test is not an
+                       url.                                             [string]
+      --test-headers  Test headers to send in test requests.
+                                                           [array] [default: []]
 
 Link Options
-      --target       Select target(s) for test, deploy, update-package actions
-                     (wsk,aws,azure,google,auto)     [array] [default: ["auto"]]
+      --target       Select target(s) for test, deploy, update-package actions (
+                     wsk,aws,google,auto)            [array] [default: ["auto"]]
       --linkPackage  Package name for version links                     [string]
 
 Update Package Options
       --package.params       OpenWhisk package params.     [array] [default: []]
       --package.params-file  OpenWhisk package params file.[array] [default: []]
 
+Cleanup Old Deployments: automatically delete redundant versions older than spe
+cified.
+  Use a pattern like 7d or 1m to specify time frames.
+  Use a simple number like --cleanup-ci=5 to retain the last five CI builds
+      --cleanup-ci     Automatically delete redundant CI versions
+      --cleanup-patch  Automatically delete redundant patch versions. At least o
+                       ne patch version for each minor version will be kept.
+      --cleanup-minor  Automatically delete redundant minor versions. At least o
+                       ne minor version for each major version will be kept.
+      --cleanup-major  Automatically delete redundant major versions.
+
 General Action Options
       --name          Action name. Can be prefixed with package.
       --package.name  Action package name.                              [string]
-      --node-version  Specifies the node.js version to use in the serverless
-                      runtime                                    [default: "12"]
+      --node-version  Specifies the node.js version to use in the serverless run
+                      time                                       [default: "14"]
   -p, --params        Include the given action param. can be json or env.
                                                            [array] [default: []]
   -f, --params-file   Include the given action param from a file; can be json or
-                      env.                                 [array] [default: []]
+                       env.                                [array] [default: []]
       --updated-by    user that updated the action or sequence.         [string]
-      --updated-at    unix timestamp when the action or sequence was updated
-                      (defaults to the current time).
-                                               [number] [default: 1611635868339]
+      --updated-at    unix timestamp when the action or sequence was updated (de
+                      faults to the current time).
+                                               [number] [default: 1642491741896]
       --web-secure    Annotates the action with require-whisk-auth. leave empty
                       to generate random token.                         [string]
-  -t, --timeout       the timeout limit in milliseconds after which the action
-                      is terminated                             [default: 60000]
+  -t, --timeout       the timeout limit in milliseconds after which the action i
+                      s terminated                              [default: 60000]
       --pkgVersion    Version use in the embedded package.json.
       --memory        the maximum memory LIMIT in MB for the action
-      --concurrency   the maximum intra-container concurrent activation LIMIT
-                      for the action
+      --concurrency   the maximum intra-container concurrent activation LIMIT fo
+                      r the action
 
 OpenWhisk Action Options
-      --namespace       OpenWhisk namespace. Needs to match the namespace
-                        provided with the openwhisk credentials.
+      --namespace       OpenWhisk namespace. Needs to match the namespace provid
+                        ed with the openwhisk credentials.
       --package.shared  OpenWhisk package scope.      [boolean] [default: false]
 
 AWS Deployment Options
-      --aws-region           the AWS region to deploy lambda functions to
-                                                          [string] [default: ""]
-      --aws-api              the AWS API Gateway name. (id, "auto" or "create")
-                                                      [string] [default: "auto"]
-      --aws-role             the AWS role ARN to execute lambda functions with
+      --aws-region                the AWS region to deploy lambda functions to
                                                           [string] [default: ""]
-      --aws-cleanup-buckets  Cleans up stray temporary S3 buckets
+      --aws-api                   the AWS API Gateway name. (id, "auto" or "crea
+                                  te")                [string] [default: "auto"]
+      --aws-role                  the AWS role ARN to execute lambda functions w
+                                  ith                     [string] [default: ""]
+      --aws-cleanup-buckets       Cleans up stray temporary S3 buckets
                                                       [boolean] [default: false]
-      --aws-create-routes    Create routes for function (usually not needed due
-                             to proxy function).      [boolean] [default: false]
+      --aws-cleanup-integrations  Cleans up unused integrations
+                                                      [boolean] [default: false]
+      --aws-create-routes         Create routes for function (usually not needed
+                                   due to proxy function).
+                                                      [boolean] [default: false]
+
+Google Deployment Options
+      --google-project-id  the Google Cloud project to deploy to. Optional when
+                           the key file is a JSON file    [string] [default: ""]
+      --google-key-file    full path to the a .json, .pem, or .p12 key downloade
+                           d from the Google Developers Console
+                                                          [string] [default: ""]
+      --google-email       the Google  account email address. Required when usin
+                           g a .pem or .p12 credential file
+                                                          [string] [default: ""]
+
+Cloudflare Workers Deployment Options
+      --cloudflare-account-id   the Cloudflare account ID to deploy to
+                                                          [string] [default: ""]
+      --cloudflare-auth         the Cloudflare API token from https://dash.cloud
+                                flare.com/profile/api-tokens
+                                                          [string] [default: ""]
+      --cloudflare-email        the Cloudflare email address belonging to the au
+                                thentication token        [string] [default: ""]
+      --cloudflare-test-domain  the *.workers.dev subdomain to use for testing d
+                                eployed scripts           [string] [default: ""]
 
-Azure Deployment Options
-      --azure-app  the Azure function app to deploy to    [string] [default: ""]
+Fastly Compute@Edge Options
+      --compute-service-id     the Fastly Service to deploy the action to
+                                                          [string] [default: ""]
+      --compute-domain
+      --fastly-auth            the Fastly token           [string] [default: ""]
+      --coralogix-token        the Coralogix token (to enable logging)
+                                                          [string] [default: ""]
+      --compute-coralogix-app  the Application name
+                                            [string] [default: "fastly-compute"]
 
 Fastly Gateway Options
       --fastly-service-id  the Fastly Service to use as a gateway
@@ -139,12 +193,40 @@ Fastly Gateway Options
       --fastly-auth        the Fastly token               [string] [default: ""]
       --checkpath          the path to check as part of the Fastly health check
                                                           [string] [default: ""]
+      --coralogix-token    the Coralogix token (to enable logging)
+                                                          [string] [default: ""]
+      --coralogix-app      the Application name
+                                         [string] [default: "universal-runtime"]
 
 Options:
-      --format    Action formats
+      --arch                   Select archs(s) for bundles (node,edge).
+                                                     [array] [default: ["node"]]
+      --format                 Action formats
                      [default: {"aws":"/${packageName}/${baseName}/${version}"}]
-      --property  Additional properties that can be used in formats.
-                                                                   [default: {}]
+      --property               Additional properties that can be used in formats
+                               .                                   [default: {}]
+      --package-token          Protects access to the gateway-stored package par
+                               ameters with this token. leave empty to generate
+                               random token.
+              [string] [default: "gXhVnUf6kIqZ64Xr0E4nTnlGBrKOrybQA7Ifx1S/2CA="]
+      --aws-parameter-manager  Manager to use for storing package params. (eithe
+                               r "secret" for Secrets Manager or "system" for Sy
+                               stem Manager)
+                                          [array] [default: ["secret","system"]]
+      --aws-lambda-format      Format to use to create lambda functions (note th
+                               at all dots ('.') will be replaced with underscor
+                               es.
+                               [string] [default: "${packageName}--${baseName}"]
+      --google-region          the Google Cloud region to deploy in
+                                                          [string] [default: ""]
+      --compute-test-domain    the domain name of the Compute@Edge service (used
+                                for testing)              [string] [default: ""]
+      --fastly-gateway         the hostname of the Fastly gateway for package pa
+                               rams                       [string] [default: ""]
+      --checkinterval          the interval in milliseconds that each Fastly POP
+                                should perform a health check. Set to 0 to disab
+                               le health checks entirely.
+                                                     [number] [default: 6000000]
 ```
 
 With no arguments,the `hedy` just bundles your code into the respective `action.zip`:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "5.0.4",
+  "version": "6.0.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,41 +39,39 @@
   "dependencies": {
     "@adobe/fastly-native-promises": "2.0.0",
     "@adobe/helix-fetch": "3.0.0",
-    "@aws-sdk/client-apigatewayv2": "3.45.0",
-    "@aws-sdk/client-lambda": "3.45.0",
-    "@aws-sdk/client-s3": "3.45.0",
-    "@aws-sdk/client-secrets-manager": "3.45.0",
-    "@aws-sdk/client-ssm": "3.45.0",
-    "@azure/arm-appservice": "9.0.0",
-    "@azure/ms-rest-nodeauth": "3.1.1",
+    "@aws-sdk/client-apigatewayv2": "3.47.0",
+    "@aws-sdk/client-lambda": "3.47.0",
+    "@aws-sdk/client-s3": "3.47.0",
+    "@aws-sdk/client-secrets-manager": "3.47.0",
+    "@aws-sdk/client-ssm": "3.47.0",
     "@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",
+    "@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.1.2",
+    "@rollup/plugin-node-resolve": "13.1.3",
     "archiver": "5.3.0",
-    "chalk-template": "0.2.0",
+    "chalk-template": "0.3.0",
     "constants-browserify": "1.0.0",
-    "dotenv": "10.0.0",
+    "dotenv": "14.1.0",
     "express": "4.17.2",
     "form-data": "4.0.0",
     "fs-extra": "10.0.0",
     "get-stream": "6.0.1",
-    "isomorphic-git": "1.10.3",
-    "openwhisk": "3.21.5",
+    "isomorphic-git": "1.10.4",
+    "openwhisk": "3.21.6",
     "proxyquire": "2.1.3",
-    "rollup": "2.62.0",
+    "rollup": "2.64.0",
     "rollup-plugin-terser": "7.0.2",
     "semver": "7.3.5",
     "tar": "6.1.11",
-    "webpack": "5.65.0",
+    "webpack": "5.66.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",
@@ -83,15 +81,15 @@
     "chai": "4.3.4",
     "chai-http": "4.3.0",
     "codecov": "3.8.3",
-    "eslint": "8.6.0",
+    "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.4",
     "husky": "7.0.4",
-    "lint-staged": "12.1.5",
-    "mocha": "9.1.3",
+    "lint-staged": "12.1.7",
+    "mocha": "9.1.4",
     "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',
@@ -653,7 +664,7 @@ export default class BaseConfig {
 
       .group(['target', 'hints'], 'Deploy Options')
       .option('target', {
-        description: 'Select target(s) for test, deploy, update-package actions (wsk,aws,azure,google,auto)',
+        description: 'Select target(s) for test, deploy, update-package actions (wsk,aws,google,auto)',
         type: 'string',
         default: ['auto'],
         array: true,

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() {
@@ -179,9 +182,6 @@ export default class BaseBundler {
       'workers_dev = true',
     ].join('\n'), { name: 'wrangler.toml' });
 
-    // azure functions manifest
-    archive.append(JSON.stringify(this.functionJson, null, '  '), { name: 'function.json' });
-
     // this allows to use a cjs loader for the esm modules. but it still doesn't work on AWS
     if (cfg.esm) {
       archive.directory('esm-adapter');

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/cli.js

@@ -17,7 +17,6 @@ import { config as envConfig } from 'dotenv';
 import BaseConfig from './BaseConfig.js';
 import OpenWhiskDeployer from './deploy/OpenWhiskDeployer.js';
 import AWSDeployer from './deploy/AWSDeployer.js';
-import AzureDeployer from './deploy/AzureDeployer.js';
 import GoogleDeployer from './deploy/GoogleDeployer.js';
 import CloudflareDeployer from './deploy/CloudflareDeployer.js';
 import ComputeAtEdgeDeployer from './deploy/ComputeAtEdgeDeployer.js';
@@ -27,7 +26,6 @@ import ActionBuilder from './ActionBuilder.js';
 const PLUGINS = [
   OpenWhiskDeployer,
   AWSDeployer,
-  AzureDeployer,
   GoogleDeployer,
   CloudflareDeployer,
   ComputeAtEdgeDeployer,

package/src/template/node-index.js

@@ -14,14 +14,13 @@ const {
   openwhisk,
   aws,
   google,
-  azure,
 } = require('@adobe/helix-universal').adapter;
 
 // eslint-disable-next-line no-underscore-dangle
 global.__rootdir = dirname(__filename); // __dirname is transformed by webpack, __filename isn't
 
-module.exports = Object.assign(azure, {
+module.exports = {
   main: openwhisk,
   lambda: aws,
   google,
-});
+};

package/src/template/node-index.mjs

@@ -13,13 +13,13 @@
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { adapter } from '@adobe/helix-universal';
-const { openwhisk, aws, google, azure } = adapter;
+const { openwhisk, aws, google } = adapter;
 
 // eslint-disable-next-line no-underscore-dangle
 global.__rootdir = dirname(fileURLToPath(import.meta.url));
 
-export default Object.assign(azure, {
+export default {
   main: openwhisk,
   lambda: aws,
   google,
-});
+};

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);

package/src/deploy/AzureConfig.js

@@ -1,38 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-export default class AzureConfig {
-  constructor() {
-    Object.assign(this, {
-      appName: '',
-    });
-  }
-
-  configure(argv) {
-    return this
-      .withAzureApp(argv.azureApp);
-  }
-
-  withAzureApp(value) {
-    this.appName = value;
-    return this;
-  }
-
-  static yarg(yargs) {
-    return yargs
-      .group(['azure-app'], 'Azure Deployment Options')
-      .option('azure-app', {
-        description: 'the Azure function app to deploy to',
-        type: 'string',
-        default: '',
-      });
-  }
-}

package/src/deploy/AzureDeployer.js

@@ -1,232 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-import msRestNodeAuth from '@azure/ms-rest-nodeauth';
-import { WebSiteManagementClient } from '@azure/arm-appservice';
-
-import fs from 'fs';
-import BaseDeployer from './BaseDeployer.js';
-import AzureConfig from './AzureConfig.js';
-
-export default class AzureDeployer extends BaseDeployer {
-  constructor(baseConfig, config) {
-    super(baseConfig);
-    Object.assign(this, {
-      id: 'azure',
-      name: 'Azure',
-      _cfg: config,
-      _auth: null,
-      _pubcreds: null,
-    });
-  }
-
-  ready() {
-    return !!this._cfg.appName && !!this._auth;
-  }
-
-  validate() {
-    if (!this.ready()) {
-      throw Error('Azure target needs --azure-app');
-    }
-  }
-
-  get basePath() {
-    return `/api/${this.cfg.packageName}/${this.cfg.name.replace('@', '/')}`;
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  get customVCL() {
-    // fix azure's blob handling
-    // todo: more comprehensive regex of commonly uploaded mime types
-    return `if (req.http.content-type != "" && req.http.content-type ~ "^(image)/.*") {
-      set req.http.x-backup-content-type = req.http.content-type;
-      set req.http.content-type = "application/octet-stream";
-    }`;
-  }
-
-  async init() {
-    const clientId = process.env.AZURE_CLIENT_ID;
-    const secret = process.env.AZURE_CLIENT_SECRET;
-    const tenantId = process.env.AZURE_TENANT_ID;
-
-    if (!!clientId && !!secret && !!tenantId && !!this._cfg.appName) {
-      try {
-        const res = await msRestNodeAuth.loginWithServicePrincipalSecretWithAuthResponse(
-          clientId,
-          secret,
-          tenantId,
-        );
-        this._auth = res;
-
-        const subscription = process.env.AZURE_SUBSCRIPTION_ID || this._auth.subscriptions[0].id;
-
-        this._client = new WebSiteManagementClient(
-          this._auth.credentials,
-          subscription,
-        );
-        const [apps] = (await this._client.webApps.list()).filter(
-          (app) => app.name === this._cfg.appName,
-        );
-        this._app = apps;
-
-        this._pubcreds = await this._client.webApps.listPublishingCredentials(
-          this._app.resourceGroup,
-          this._cfg.appName,
-        );
-      } catch (e) {
-        this.log.error(`Unable to authenticate with Azure:${e.message}`);
-        throw e;
-      }
-    }
-  }
-
-  get fullFunctionName() {
-    const { cfg } = this;
-    const funcname = `${cfg.packageName}--${cfg.name}`.replace('@', '_').replace(/\./g, '_');
-    return funcname;
-  }
-
-  async uploadFunctionZIP() {
-    const { cfg } = this;
-    const url = new URL(
-      `${this._pubcreds.scmUri}/api/zip/site/wwwroot/${this.fullFunctionName}/`,
-    ).href.replace(/https:\/\/.*?@/, 'https://');
-    // const url = new URL(this._pubcreds.scmUri + `/api/zip/site/wwwroot/${'newfunc'.replace('/', '--')}/`).href.replace(/https:\/\/.*?@/, 'https://');
-    const body = fs.createReadStream(cfg.zipFile);
-    const authorization = `Basic ${Buffer.from(
-      `${this._pubcreds.publishingUserName
-      }:${
-        this._pubcreds.publishingPassword}`,
-    ).toString('base64')}`;
-
-    this.log.info(`--: uploading ${this.relZip} to Azure bucket ${url} ...`);
-
-    const resp = await this.fetch(url, {
-      method: 'PUT',
-      body,
-      headers: {
-        authorization,
-      },
-    });
-    if (resp.ok) {
-      this.log.info(`File uploaded ${await resp.text()}`);
-    } else {
-      throw new Error(
-        `File upload failed (${resp.status}): ${await resp.text()}`,
-      );
-    }
-  }
-
-  async updateParams() {
-    const { cfg } = this;
-    this.log.info('--: updating function parameters ...');
-    const url = new URL(
-      `${this._pubcreds.scmUri}/api/vfs/site/wwwroot/${this.fullFunctionName}/params.json`,
-    ).href.replace(/https:\/\/.*?@/, 'https://');
-
-    const authorization = `Basic ${Buffer.from(
-      `${this._pubcreds.publishingUserName
-      }:${
-        this._pubcreds.publishingPassword}`,
-    ).toString('base64')}`;
-
-    let params = {};
-    let ifmatch = '*';
-    try {
-      const prereq = await this.fetch(url, {
-        method: 'GET',
-        headers: {
-          authorization,
-        },
-      });
-      ifmatch = prereq.headers.get('ETag');
-      params = prereq.json();
-    } catch (err) {
-      this.log.warn('Unable to get existing function parameters, starting from scratch.');
-    }
-
-    const resp = await this.fetch(url, {
-      method: 'PUT',
-      body: JSON.stringify({
-        ...cfg.params,
-        ...params,
-      }),
-      headers: {
-        authorization,
-        'Content-Type': 'application/json',
-        'If-Match': ifmatch,
-      },
-    });
-
-    if (resp.ok) {
-      this.log.info(`Params updated ${await resp.text()}`);
-    } else {
-      throw new Error(
-        `Parameter update failed (${resp.status}): ${await resp.text()}`,
-      );
-    }
-  }
-
-  async updatePackage() {
-    const { cfg } = this;
-    this.log.info('--: updating app (package) parameters ...');
-
-    const result = await this._client.webApps.listApplicationSettings(
-      this._app.resourceGroup,
-      this._cfg.appName,
-    );
-
-    const update = {
-      ...cfg.packageParams,
-      ...result.properties,
-    };
-
-    await this._client.webApps.updateApplicationSettings(
-      this._app.resourceGroup,
-      this._cfg.appName,
-      {
-        properties: update,
-      },
-    );
-
-    this.log.info(`${Object.keys(update).length} package parameters have been updated.`);
-  }
-
-  async deploy() {
-    try {
-      await this.uploadFunctionZIP();
-      await this.updateParams();
-    } catch (err) {
-      this.log.error(`Unable to update Azure function: ${err.message}`);
-      throw err;
-    }
-  }
-
-  get host() {
-    return this._app.hostNames[0];
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  get urlVCL() {
-    return '"/api/" + var.package + "/" + var.action + var.slashversion + var.rest';
-  }
-
-  async test() {
-    const url = `https://${this._app.hostNames[0]}/api/${this.cfg.packageName}/${this.cfg.name.replace('@', '/')}`;
-    return this.testRequest({
-      url,
-      // idHeader: 'X-Cloud-Trace-Context',
-      retry404: 1,
-    });
-  }
-}
-
-AzureDeployer.Config = AzureConfig;