@adobe/helix-deploy 4.15.1 → 5.0.3

package/src/deploy/AWSDeployer.js

@@ -10,60 +10,47 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-disable no-await-in-loop,no-restricted-syntax */
-const chalk = require('chalk');
-const {
-  S3Client,
-  CreateBucketCommand,
+import chalk from 'chalk-template';
+import {
+  CreateBucketCommand, DeleteBucketCommand, DeleteObjectCommand, DeleteObjectsCommand,
   ListBucketsCommand,
-  ListObjectsV2Command,
-  PutObjectCommand,
-  DeleteBucketCommand,
-  DeleteObjectCommand,
-  DeleteObjectsCommand,
-} = require('@aws-sdk/client-s3');
-const {
-  LambdaClient,
-  CreateFunctionCommand,
+  ListObjectsV2Command, PutObjectCommand,
+  S3Client,
+} from '@aws-sdk/client-s3';
+
+import {
+  AddPermissionCommand,
+  CreateAliasCommand,
+  CreateFunctionCommand, GetAliasCommand,
   GetFunctionCommand,
+  LambdaClient, PublishVersionCommand, UpdateAliasCommand, UpdateFunctionCodeCommand,
   UpdateFunctionConfigurationCommand,
-  UpdateFunctionCodeCommand,
-  GetAliasCommand,
-  PublishVersionCommand,
-  CreateAliasCommand,
-  UpdateAliasCommand,
-  AddPermissionCommand,
-} = require('@aws-sdk/client-lambda');
-const {
+} from '@aws-sdk/client-lambda';
+
+import {
   ApiGatewayV2Client,
-  GetApisCommand,
-  GetApiCommand,
-  GetStagesCommand,
-  GetIntegrationsCommand,
   CreateApiCommand,
+  CreateIntegrationCommand, CreateRouteCommand,
   CreateStageCommand,
-  CreateIntegrationCommand,
   DeleteIntegrationCommand,
-  CreateRouteCommand,
-  GetRoutesCommand,
-  UpdateRouteCommand,
-} = require('@aws-sdk/client-apigatewayv2');
-const {
-  SSMClient,
-  PutParameterCommand,
-} = require('@aws-sdk/client-ssm');
-const {
-  SecretsManagerClient,
-  PutSecretValueCommand,
-} = require('@aws-sdk/client-secrets-manager');
-
-const path = require('path');
-const fse = require('fs-extra');
-const crypto = require('crypto');
-const BaseDeployer = require('./BaseDeployer');
-const ActionBuilder = require('../ActionBuilder.js');
-const AWSConfig = require('./AWSConfig.js');
-
-class AWSDeployer extends BaseDeployer {
+  GetApiCommand,
+  GetApisCommand,
+  GetIntegrationsCommand, GetRoutesCommand,
+  GetStagesCommand, UpdateRouteCommand,
+} from '@aws-sdk/client-apigatewayv2';
+
+import { PutParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
+
+import { PutSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager';
+
+import path from 'path';
+import fse from 'fs-extra';
+import crypto from 'crypto';
+import BaseDeployer from './BaseDeployer.js';
+import ActionBuilder from '../ActionBuilder.js';
+import AWSConfig from './AWSConfig.js';
+
+export default class AWSDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
 
@@ -228,26 +215,41 @@ class AWSDeployer extends BaseDeployer {
 
     this.log.info(`--: using lambda role "${this._cfg.role}"`);
 
+    // check if function already exists
+    let baseARN;
     try {
-      this.log.info(`--: updating existing Lambda function ${functionName}`);
-      await this._lambda.send(new GetFunctionCommand({
+      this.log.info(chalk`--: checking existing Lambda function {yellow ${functionName}}`);
+      const { Configuration: { FunctionArn } } = await this._lambda.send(new GetFunctionCommand({
         FunctionName: functionName,
       }));
-      await this._lambda.send(new UpdateFunctionConfigurationCommand(functionConfig));
-      await this._lambda.send(new UpdateFunctionCodeCommand({
-        FunctionName: functionName,
-        ...functionConfig.Code,
-      }));
+      baseARN = FunctionArn;
+      this.log.info(chalk`{green ok}: exist {yellow ${FunctionArn}}`);
     } catch (e) {
       if (e.name === 'ResourceNotFoundException') {
-        this.log.info(`--: creating new Lambda function ${functionName}`);
+        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));
       } else {
-        this.log.error(`Unable to verify existence of Lambda function ${functionName}`);
+        this.log.error(chalk`Unable to verify existence of Lambda function {yellow ${functionName}}`);
         throw e;
       }
     }
 
+    // update existing function
+    if (baseARN) {
+      await this.checkFunctionReady(baseARN);
+      this.log.info(chalk`--: updating existing Lambda function configuration {yellow ${functionName}}`);
+      await this._lambda.send(new UpdateFunctionConfigurationCommand(functionConfig));
+      await this.checkFunctionReady(baseARN);
+      this.log.info('--: updating Lambda function code...');
+      await this._lambda.send(new UpdateFunctionCodeCommand({
+        FunctionName: functionName,
+        ...functionConfig.Code,
+      }));
+    }
+    await this.checkFunctionReady(baseARN);
+
+    this.log.info('--: publishing new version');
     const versiondata = await this._lambda.send(new PublishVersionCommand({
       FunctionName: functionName,
     }));
@@ -255,22 +257,23 @@ class AWSDeployer extends BaseDeployer {
     this._functionARN = versiondata.FunctionArn;
     // eslint-disable-next-line prefer-destructuring
     this._accountId = this._functionARN.split(':')[4];
-
     const versionNum = versiondata.Version;
+    this.log.info(chalk`{green ok}: version {yellow ${versionNum}} published.`);
+
     try {
       await this._lambda.send(new GetAliasCommand({
         FunctionName: functionName,
         Name: functionVersion,
       }));
 
-      this.log.info(`--: updating existing alias ${functionName}:${functionVersion} to v${versionNum}`);
+      this.log.info(chalk`--: updating existing alias {yellow ${functionName}:${functionVersion}} to version {yellow ${versionNum}}`);
       const updatedata = await this._lambda.send(new UpdateAliasCommand({
         FunctionName: functionName,
         Name: functionVersion,
         FunctionVersion: versionNum,
       }));
-
       this._aliasARN = updatedata.AliasArn;
+      this.log.info(chalk`{green ok}: alias {yellow ${this._aliasARN}} updated.`);
     } catch (e) {
       if (e.name === 'ResourceNotFoundException') {
         this.log.info(`--: creating new alias ${functionName}:${functionVersion} at v${versionNum}`);
@@ -280,6 +283,7 @@ class AWSDeployer extends BaseDeployer {
           FunctionVersion: versionNum,
         }));
         this._aliasARN = createdata.AliasArn;
+        this.log.info(chalk`{green ok}: alias {yellow ${this._aliasARN}} created.`);
       } else {
         this.log.error(`Unable to verify existence of Lambda alias ${functionName}:${functionVersion}`);
         throw e;
@@ -422,7 +426,7 @@ class AWSDeployer extends BaseDeployer {
       // ignore, most likely the permission already exists
     }
 
-    this.log.info(chalk`{green ok:} function deployed: ${chalk.blueBright(this._functionURL)}`);
+    this.log.info(chalk`{green ok:} function deployed: {blueBright ${this._functionURL}}`);
   }
 
   async test() {
@@ -530,7 +534,7 @@ class AWSDeployer extends BaseDeployer {
     });
     const unused = [];
     if (filter) {
-      this.log.info(chalk`Integrations / Routes for {gray ${filter}}`);
+      this.log.info(chalk`Integrations / Routes for {grey ${filter}}`);
     } else {
       this.log.info('Integrations / Routes');
     }
@@ -689,17 +693,17 @@ class AWSDeployer extends BaseDeployer {
     }
   }
 
-  async checkFunctionReady() {
+  async checkFunctionReady(arn) {
     let tries = 3;
     while (tries > 0) {
       try {
         tries -= 1;
         this.log.info(chalk`--: checking function state ...`);
         const { Configuration } = await this._lambda.send(new GetFunctionCommand({
-          FunctionName: this._functionARN,
+          FunctionName: arn ?? this._functionARN,
         }));
-        if (Configuration.State !== 'Active') {
-          this.log.warn(chalk`{yellow warn:} function is {blue ${Configuration.State}} and last update was {blue ${Configuration.LastUpdateStatus}}.`);
+        if (Configuration.State !== 'Active' || Configuration.LastUpdateStatus === 'InProgress') {
+          this.log.info(chalk`{yellow !!:} function is {blue ${Configuration.State}} and last update was {blue ${Configuration.LastUpdateStatus}} (retry...)`);
         } else {
           this.log.info(chalk`{green ok:} function is {blue ${Configuration.State}} and last update was {blue ${Configuration.LastUpdateStatus}}.`);
           return;
@@ -752,4 +756,3 @@ class AWSDeployer extends BaseDeployer {
 }
 
 AWSDeployer.Config = AWSConfig;
-module.exports = AWSDeployer;

package/src/deploy/AzureConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class AzureConfig {
+export default class AzureConfig {
   constructor() {
     Object.assign(this, {
       appName: '',
@@ -36,5 +36,3 @@ class AzureConfig {
       });
   }
 }
-
-module.exports = AzureConfig;

package/src/deploy/AzureDeployer.js

@@ -9,13 +9,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const msRestNodeAuth = require('@azure/ms-rest-nodeauth');
-const { WebSiteManagementClient } = require('@azure/arm-appservice');
-const fs = require('fs');
-const BaseDeployer = require('./BaseDeployer');
-const AzureConfig = require('./AzureConfig.js');
+import msRestNodeAuth from '@azure/ms-rest-nodeauth';
+import { WebSiteManagementClient } from '@azure/arm-appservice';
 
-class AzureDeployer extends BaseDeployer {
+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, {
@@ -229,4 +230,3 @@ class AzureDeployer extends BaseDeployer {
 }
 
 AzureDeployer.Config = AzureConfig;
-module.exports = AzureDeployer;

package/src/deploy/BaseDeployer.js

@@ -9,12 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const path = require('path');
-const chalk = require('chalk');
-const semver = require('semver');
-const fetchAPI = require('@adobe/helix-fetch');
+import path from 'path';
+import chalk from 'chalk-template';
+import semver from 'semver';
+import { h1, context } from '@adobe/helix-fetch';
 
-class BaseDeployer {
+export default class BaseDeployer {
   constructor(cfg) {
     this.isDeployer = true;
     this.cfg = cfg;
@@ -42,8 +42,8 @@ class BaseDeployer {
   getOrCreateFetchContext() {
     if (!this._fetchContext) {
       this._fetchContext = process.env.HELIX_FETCH_FORCE_HTTP1
-        ? fetchAPI.h1()
-        : fetchAPI.context();
+        ? h1()
+        : context();
     }
     return this._fetchContext;
   }
@@ -99,7 +99,7 @@ class BaseDeployer {
     while (retry404 >= 0) {
       // eslint-disable-next-line no-param-reassign
       const testUrl = `${url}${this.cfg.testPath || ''}`;
-      this.log.info(`--: requesting: ${chalk.blueBright(testUrl)} ...`);
+      this.log.info(chalk`--: requesting: {blueBright ${testUrl}} ...`);
       // eslint-disable-next-line no-await-in-loop
       const ret = await this.fetch(testUrl, {
         headers,
@@ -110,21 +110,21 @@ class BaseDeployer {
       const body = await ret.text();
       const id = idHeader ? ret.headers.get(idHeader) : 'n/a';
       if (ret.ok) {
-        this.log.info(`id: ${chalk.grey(id)}`);
-        this.log.info(`${chalk.green('ok:')} ${ret.status}`);
-        this.log.debug(chalk.grey(JSON.stringify(ret.headers.plain(), null, 2)));
+        this.log.info(chalk`id: {grey ${id}}`);
+        this.log.info(chalk`{green ok:} ${ret.status}`);
+        this.log.debug(chalk`{grey ${JSON.stringify(ret.headers.plain(), null, 2)}}`);
         this.log.debug('');
-        this.log.debug(chalk.grey(body));
+        this.log.debug(chalk`{grey ${body}}`);
         return;
       }
       if (ret.status === 302 || ret.status === 301) {
-        this.log.info(`${chalk.green('ok:')} ${ret.status}`);
-        this.log.debug(chalk.grey(`Location: ${ret.headers.get('location')}`));
+        this.log.info(chalk`{green ok:} ${ret.status}`);
+        this.log.debug(chalk`{grey Location: ${ret.headers.get('location')}}`);
         return;
       }
-      this.log.info(`id: ${chalk.grey(id)}`);
+      this.log.info(chalk`id: {grey ${id}}`);
       if ((ret.status === 404 || ret.status === 500) && retry404) {
-        this.log.info(`${chalk.yellow('warn:')} ${ret.status} (retry)`);
+        this.log.info(chalk`{yellow warn:} ${ret.status} (retry)`);
         // eslint-disable-next-line no-param-reassign
         retry404 -= 1;
         // eslint-disable-next-line no-await-in-loop
@@ -132,7 +132,7 @@ class BaseDeployer {
           setTimeout(resolve, 1500);
         });
       } else {
-        // this.log.info(`${chalk.red('error:')} test failed: ${ret.status} ${body}`);
+        // this.log.info(chalk`{red error:} test failed: ${ret.status} ${body}`);
         throw new Error(`test failed: ${ret.status} ${body}`);
       }
     }
@@ -164,7 +164,7 @@ 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:} unable to create version sequences. error while parsing version: ${this.cfg.version}`);
           return;
         }
         if (link === 'major') {
@@ -179,5 +179,3 @@ class BaseDeployer {
     return sfx;
   }
 }
-
-module.exports = BaseDeployer;

package/src/deploy/CloudflareConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class CloudflareConfig {
+export default class CloudflareConfig {
   constructor() {
     Object.assign(this, {});
   }
@@ -67,5 +67,3 @@ class CloudflareConfig {
       });
   }
 }
-
-module.exports = CloudflareConfig;

package/src/deploy/CloudflareDeployer.js

@@ -9,13 +9,13 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const path = require('path');
-const fs = require('fs');
-const FormData = require('form-data');
-const BaseDeployer = require('./BaseDeployer');
-const CloudflareConfig = require('./CloudflareConfig');
+import path from 'path';
+import fs from 'fs';
+import FormData from 'form-data';
+import BaseDeployer from './BaseDeployer.js';
+import CloudflareConfig from './CloudflareConfig.js';
 
-class CloudflareDeployer extends BaseDeployer {
+export default class CloudflareDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -142,4 +142,3 @@ class CloudflareDeployer extends BaseDeployer {
 }
 
 CloudflareDeployer.Config = CloudflareConfig;
-module.exports = CloudflareDeployer;

package/src/deploy/ComputeAtEdgeConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class ComputeAtEdgeConfig {
+export default class ComputeAtEdgeConfig {
   constructor() {
     Object.assign(this, {});
   }
@@ -89,5 +89,3 @@ class ComputeAtEdgeConfig {
       });
   }
 }
-
-module.exports = ComputeAtEdgeConfig;

package/src/deploy/ComputeAtEdgeDeployer.js

@@ -9,14 +9,18 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { fork } = require('child_process');
-const path = require('path');
-const fs = require('fs/promises');
-const tar = require('tar');
-const getStream = require('get-stream');
-const Fastly = require('@adobe/fastly-native-promises');
-const BaseDeployer = require('./BaseDeployer');
-const ComputeAtEdgeConfig = require('./ComputeAtEdgeConfig');
+import { fork } from 'child_process';
+import { fileURLToPath } from 'url';
+import path from 'path';
+import fs from 'fs/promises';
+import tar from 'tar';
+import getStream from 'get-stream';
+import Fastly from '@adobe/fastly-native-promises';
+import BaseDeployer from './BaseDeployer.js';
+import ComputeAtEdgeConfig from './ComputeAtEdgeConfig.js';
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * The class ComputeAtEdgeDeployer deploys to Fastly's Compute(at)Edge (WASM) runtime.
@@ -24,7 +28,7 @@ const ComputeAtEdgeConfig = require('./ComputeAtEdgeConfig');
  * and not confused with the FastlyGateway (which only routes requests, but
  * does not handle them.)
  */
-class ComputeAtEdgeDeployer extends BaseDeployer {
+export default class ComputeAtEdgeDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -187,4 +191,3 @@ service_id = ""
 }
 
 ComputeAtEdgeDeployer.Config = ComputeAtEdgeConfig;
-module.exports = ComputeAtEdgeDeployer;

package/src/deploy/GoogleConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class GoogleConfig {
+export default class GoogleConfig {
   constructor() {
     Object.assign(this, {
       appName: '',
@@ -69,5 +69,3 @@ class GoogleConfig {
       });
   }
 }
-
-module.exports = GoogleConfig;

package/src/deploy/GoogleDeployer.js

@@ -9,17 +9,17 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { CloudFunctionsServiceClient } = require('@google-cloud/functions');
-const { SecretManagerServiceClient } = require('@google-cloud/secret-manager');
-const path = require('path');
-const fs = require('fs');
-const semver = require('semver');
-const chalk = require('chalk');
-const BaseDeployer = require('./BaseDeployer');
-const GoogleConfig = require('./GoogleConfig.js');
-const { filterActions } = require('../utils.js');
-
-class GoogleDeployer extends BaseDeployer {
+import { CloudFunctionsServiceClient } from '@google-cloud/functions';
+import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import path from 'path';
+import fs from 'fs';
+import semver from 'semver';
+import chalk from 'chalk-template';
+import BaseDeployer from './BaseDeployer.js';
+import GoogleConfig from './GoogleConfig.js';
+import { filterActions } from '../utils.js';
+
+export default class GoogleDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -344,4 +344,3 @@ class GoogleDeployer extends BaseDeployer {
 }
 
 GoogleDeployer.Config = GoogleConfig;
-module.exports = GoogleDeployer;

package/src/deploy/OpenWhiskConfig.js

@@ -14,7 +14,7 @@
  * @field {string} actionName Action as it would be deployed (package + name)
  * @field {boolean} packageShared If package is shared.
  */
-class OpenWhiskConfig {
+export default class OpenWhiskConfig {
   constructor() {
     Object.assign(this, {
       namespace: '',
@@ -52,5 +52,3 @@ class OpenWhiskConfig {
       });
   }
 }
-
-module.exports = OpenWhiskConfig;

package/src/deploy/OpenWhiskDeployer.js

@@ -10,18 +10,16 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-disable no-underscore-dangle */
+import ow from 'openwhisk';
+import os from 'os';
+import fse from 'fs-extra';
+import path from 'path';
+import chalk from 'chalk-template';
+import dotenv from 'dotenv';
+import BaseDeployer from './BaseDeployer.js';
+import OpenWhiskConfig from './OpenWhiskConfig.js';
 
-const ow = require('openwhisk');
-const os = require('os');
-const fse = require('fs-extra');
-const path = require('path');
-const chalk = require('chalk');
-const dotenv = require('dotenv');
-
-const BaseDeployer = require('./BaseDeployer');
-const OpenWhiskConfig = require('./OpenWhiskConfig.js');
-
-class OpenWhiskDeployer extends BaseDeployer {
+export default class OpenWhiskDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
 
@@ -88,7 +86,7 @@ class OpenWhiskDeployer extends BaseDeployer {
 
   getOpenwhiskClient() {
     if (!this._cfg.apiHost || !this._cfg.auth || !this._cfg.namespace) {
-      throw Error(chalk`\nMissing OpenWhisk credentials. Make sure you have a {grey .wskprops} in your home directory.\nYou can also set {grey WSK_NAMESPACE}, {gray WSK_AUTH} and {gray WSK_API_HOST} environment variables.`);
+      throw Error(chalk`\nMissing OpenWhisk credentials. Make sure you have a {grey .wskprops} in your home directory.\nYou can also set {grey WSK_NAMESPACE}, {grey WSK_AUTH} and {grey WSK_API_HOST} environment variables.`);
     }
     return ow({
       apihost: this._cfg.apiHost,
@@ -117,7 +115,7 @@ class OpenWhiskDeployer extends BaseDeployer {
         });
         this.log.info(chalk`{green ok:} package created. ${res.namespace}/${res.name}`);
       } else {
-        this.log.error(`${chalk.red('error: ')} ${e.message}`);
+        this.log.error(chalk`{red error:} ${e.message}`);
       }
     }
 
@@ -187,7 +185,7 @@ class OpenWhiskDeployer extends BaseDeployer {
         fn = openwhisk.packages.create.bind(openwhisk.packages);
         verb = 'created';
       } else {
-        this.log.error(`${chalk.red('error: ')} ${e.message}`);
+        this.log.error(chalk`{red error:} ${e.message}`);
       }
     }
 
@@ -203,9 +201,9 @@ class OpenWhiskDeployer extends BaseDeployer {
           parameters,
         },
       });
-      this.log.info(`${chalk.green('ok:')} ${verb} package ${chalk.whiteBright(`/${result.namespace}/${result.name}`)}`);
+      this.log.info(chalk`{green ok:} ${verb} package {whiteBright /${result.namespace}/${result.name}}`);
     } catch (e) {
-      this.log.error(`${chalk.red('error: failed processing package: ')} ${e.stack}`);
+      this.log.error(chalk`{red error: failed processing package: } ${e.stack}`);
       throw Error('abort.');
     }
   }
@@ -270,10 +268,10 @@ class OpenWhiskDeployer extends BaseDeployer {
       try {
         this.log.debug(`creating sequence: ${options.name} -> ${options.action.exec.components[0]}`);
         const result = await openwhisk.actions.update(options);
-        this.log.info(`${chalk.green('ok:')} created sequence ${chalk.whiteBright(`/${result.namespace}/${result.name}`)} -> ${chalk.whiteBright(fqn)}`);
+        this.log.info(chalk`{green ok:} created sequence {whiteBright /${result.namespace}/${result.name}} -> {whiteBright ${fqn}}`);
       } catch (e) {
         hasErrors = true;
-        this.log.error(`${chalk.red('error:')} failed creating sequence: ${e.message}`);
+        this.log.error(chalk`{red error:} failed creating sequence: ${e.message}`);
       }
     }));
     if (hasErrors) {
@@ -283,4 +281,3 @@ class OpenWhiskDeployer extends BaseDeployer {
 }
 
 OpenWhiskDeployer.Config = OpenWhiskConfig;
-module.exports = OpenWhiskDeployer;

package/src/gateway/FastlyConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class FastlyConfig {
+export default class FastlyConfig {
   constructor() {
     Object.assign(this, {
       service: null,
@@ -94,5 +94,3 @@ class FastlyConfig {
       });
   }
 }
-
-module.exports = FastlyConfig;

package/src/gateway/FastlyGateway.js

@@ -9,15 +9,16 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const Fastly = require('@adobe/fastly-native-promises');
-const chalk = require('chalk');
+import Fastly from '@adobe/fastly-native-promises';
+import chalk from 'chalk-template';
+import FastlyConfig from './FastlyConfig.js';
+import BaseDeployer from '../deploy/BaseDeployer.js';
+
 const {
   toString, vcl, time, req, res, str, concat,
-} = require('@adobe/fastly-native-promises').loghelpers;
-const FastlyConfig = require('./FastlyConfig.js');
-const BaseDeployer = require('../deploy/BaseDeployer.js');
+} = Fastly.loghelpers;
 
-class FastlyGateway {
+export default class FastlyGateway {
   constructor(baseConfig, config) {
     Object.assign(this, {
       cfg: baseConfig,
@@ -505,4 +506,3 @@ if (req.url ~ "^/([^/]+)/([^/@_]+)([@_]([^/@_?]+)+)?(.*$)") {
 }
 
 FastlyGateway.Config = FastlyConfig;
-module.exports = FastlyGateway;

package/src/index.js

@@ -12,6 +12,6 @@
  * governing permissions and limitations under the License.
  */
 
-const CLI = require('./cli.js');
+import CLI from './cli.js';
 
 new CLI().run(process.argv.slice(2));