@adobe/helix-deploy 5.0.0 → 5.0.4

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [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)
+
+
+### Bug Fixes
+
+* wait for aws states completed between deploy steps ([#348](https://github.com/adobe/helix-deploy/issues/348)) ([9cf29ee](https://github.com/adobe/helix-deploy/commit/9cf29ee9807d6334fb951a2a21532ea56b7f9e72))
+
+## [5.0.2](https://github.com/adobe/helix-deploy/compare/v5.0.1...v5.0.2) (2021-12-11)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([b898a1d](https://github.com/adobe/helix-deploy/commit/b898a1da4e06a20cb616cf524458a98608124e6c))
+
+## [5.0.1](https://github.com/adobe/helix-deploy/compare/v5.0.0...v5.0.1) (2021-12-07)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([eca546c](https://github.com/adobe/helix-deploy/commit/eca546ce271ba6c6d37fcf1572f5d1d0f5c068b2))
+
 # [5.0.0](https://github.com/adobe/helix-deploy/compare/v4.15.1...v5.0.0) (2021-12-02)
 
 

package/CONTRIBUTING.md

@@ -72,3 +72,9 @@ The project's committers will release to the [Adobe organization on npmjs.org](h
 Please contact the [Adobe Open Source Advisory Board](https://git.corp.adobe.com/OpenSourceAdvisoryBoard/discuss/issues) to get access to the npmjs organization.
 
 The release process is fully automated using `semantic-release`, increasing the version numbers, etc. based on the contents of the commit messages found.
+
+# Managing Secrets
+
+## Azure
+
+The Azure deployment is using an application secret that is expiring on a regular basis. To update the secret, refer to the [Azure Active Directory Documentation on configuring access policies on resources](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal#option-2-create-a-new-application-secret)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "5.0.0",
+  "version": "5.0.4",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -39,38 +39,38 @@
   "dependencies": {
     "@adobe/fastly-native-promises": "2.0.0",
     "@adobe/helix-fetch": "3.0.0",
-    "@aws-sdk/client-apigatewayv2": "3.42.0",
-    "@aws-sdk/client-lambda": "3.42.0",
-    "@aws-sdk/client-s3": "3.42.0",
-    "@aws-sdk/client-secrets-manager": "3.42.0",
-    "@aws-sdk/client-ssm": "3.42.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.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.0",
-    "@rollup/plugin-alias": "3.1.8",
+    "@google-cloud/storage": "5.16.1",
+    "@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.2",
     "archiver": "5.3.0",
-    "chalk": "4.1.2",
+    "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.1",
+    "isomorphic-git": "1.10.3",
     "openwhisk": "3.21.5",
     "proxyquire": "2.1.3",
-    "rollup": "2.60.1",
+    "rollup": "2.62.0",
     "rollup-plugin-terser": "7.0.2",
     "semver": "7.3.5",
     "tar": "6.1.11",
-    "webpack": "5.64.4",
-    "yargs": "17.2.1"
+    "webpack": "5.65.0",
+    "yargs": "17.3.1"
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.1",
@@ -79,15 +79,15 @@
     "@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.3.0",
+    "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.5",
     "mocha": "9.1.3",
     "mocha-junit-reporter": "2.0.2",
     "mocha-multi-reporters": "1.5.1",

package/src/ActionBuilder.js

@@ -14,7 +14,7 @@
 import path from 'path';
 import fs from 'fs';
 import fse from 'fs-extra';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import git from 'isomorphic-git';
 import WebpackBundler from './bundler/WebpackBundler.js';
 import EdgeBundler from './bundler/EdgeBundler.js';
@@ -310,7 +310,7 @@ export default class ActionBuilder {
         // eslint-disable-next-line no-await-in-loop
         await dep[fnName](...args);
       } catch (e) {
-        cfg.log.error(`${chalk.red('error:')} ${dep.name} - ${e.message}`);
+        cfg.log.error(chalk`{red error:} ${dep.name} - ${e.message}`);
         errors.push(e);
       }
     }
@@ -338,7 +338,7 @@ export default class ActionBuilder {
   async updateLinks() {
     const { cfg } = this;
     if (cfg.baseName === cfg.name) {
-      cfg.log.warn(`${chalk.yellow('warn:')} unable to create version links. unsupported action name format. should be: "name@version"`);
+      cfg.log.warn(chalk`{yellow warn:} unable to create version links. unsupported action name format. should be: "name@version"`);
       return false;
     }
     return this.execute('updateLinks', 'updating links on ');

package/src/BaseConfig.js

@@ -12,7 +12,7 @@
 import crypto from 'crypto';
 import path from 'path';
 import fse from 'fs-extra';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import dotenv from 'dotenv';
 
 // eslint-disable-next-line no-template-curly-in-string

package/src/bundler/BaseBundler.js

@@ -12,7 +12,7 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
 import fse from 'fs-extra';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import archiver from 'archiver';
 import semver from 'semver';
 import { validateBundle } from '../utils.js';
@@ -65,7 +65,7 @@ export default class BaseBundler {
       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 {gray main()} function.`);
+    cfg.log.info(chalk`{green ok:} bundle can be loaded and has a {grey main()} function.`);
   }
 
   async createArchive() {

package/src/bundler/RollupBundler.js

@@ -14,7 +14,7 @@ import path from 'path';
 import fse from 'fs-extra';
 import { fileURLToPath } from 'url';
 import { rollup } from 'rollup';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import alias from '@rollup/plugin-alias';

package/src/bundler/WebpackBundler.js

@@ -13,7 +13,7 @@ import { fileURLToPath } from 'url';
 import path from 'path';
 import fse from 'fs-extra';
 import webpack from 'webpack';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import BaseBundler from './BaseBundler.js';
 
 // eslint-disable-next-line no-underscore-dangle

package/src/cli.js

@@ -12,7 +12,7 @@
 
 /* eslint-disable no-console */
 import yargs from 'yargs';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import { config as envConfig } from 'dotenv';
 import BaseConfig from './BaseConfig.js';
 import OpenWhiskDeployer from './deploy/OpenWhiskDeployer.js';
@@ -71,7 +71,7 @@ export default class CLI {
         console.log(JSON.stringify(res, null, 2));
       }
     } catch (err) {
-      console.log(`${chalk.red('error:')} ${err.message}`);
+      console.log(chalk`{red error:} ${err.message}`);
       process.exitCode = 1;
     }
   }

package/src/deploy/AWSDeployer.js

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-disable no-await-in-loop,no-restricted-syntax */
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import {
   CreateBucketCommand, DeleteBucketCommand, DeleteObjectCommand, DeleteObjectsCommand,
   ListBucketsCommand,
@@ -215,26 +215,41 @@ export default 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,
     }));
@@ -242,22 +257,23 @@ export default 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}`);
@@ -267,6 +283,7 @@ export default 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;
@@ -409,7 +426,7 @@ export default 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() {
@@ -517,7 +534,7 @@ export default 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');
     }
@@ -676,17 +693,17 @@ export default 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;

package/src/deploy/BaseDeployer.js

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import path from 'path';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import semver from 'semver';
 import { h1, context } from '@adobe/helix-fetch';
 
@@ -99,7 +99,7 @@ export default 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 @@ export default 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 @@ export default 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 @@ 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:} unable to create version sequences. error while parsing version: ${this.cfg.version}`);
           return;
         }
         if (link === 'major') {

package/src/deploy/GoogleDeployer.js

@@ -14,7 +14,7 @@ import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
 import path from 'path';
 import fs from 'fs';
 import semver from 'semver';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import BaseDeployer from './BaseDeployer.js';
 import GoogleConfig from './GoogleConfig.js';
 import { filterActions } from '../utils.js';

package/src/deploy/OpenWhiskDeployer.js

@@ -14,7 +14,7 @@ import ow from 'openwhisk';
 import os from 'os';
 import fse from 'fs-extra';
 import path from 'path';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import dotenv from 'dotenv';
 import BaseDeployer from './BaseDeployer.js';
 import OpenWhiskConfig from './OpenWhiskConfig.js';
@@ -86,7 +86,7 @@ export default 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,
@@ -115,7 +115,7 @@ export default 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}`);
       }
     }
 
@@ -185,7 +185,7 @@ export default 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}`);
       }
     }
 
@@ -201,9 +201,9 @@ export default 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.');
     }
   }
@@ -268,10 +268,10 @@ export default 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) {

package/src/gateway/FastlyGateway.js

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import Fastly from '@adobe/fastly-native-promises';
-import chalk from 'chalk';
+import chalk from 'chalk-template';
 import FastlyConfig from './FastlyConfig.js';
 import BaseDeployer from '../deploy/BaseDeployer.js';