@adobe/helix-deploy 6.2.1 → 6.2.5

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [6.2.5](https://github.com/adobe/helix-deploy/compare/v6.2.4...v6.2.5) (2022-02-04)
+
+
+### Bug Fixes
+
+* fix more dev-server params ([#370](https://github.com/adobe/helix-deploy/issues/370)) ([300a457](https://github.com/adobe/helix-deploy/commit/300a4579e492da496f5ec2d66eb6bcf5d691438a))
+
+## [6.2.4](https://github.com/adobe/helix-deploy/compare/v6.2.3...v6.2.4) (2022-02-04)
+
+
+### Bug Fixes
+
+* fix development server dev params ([#368](https://github.com/adobe/helix-deploy/issues/368)) ([2e91e18](https://github.com/adobe/helix-deploy/commit/2e91e18d24222f936f978410857f1f1a675bc0da))
+
+## [6.2.3](https://github.com/adobe/helix-deploy/compare/v6.2.2...v6.2.3) (2022-02-04)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([478db45](https://github.com/adobe/helix-deploy/commit/478db455cd8313cea648f49b85f0329514fe38a5))
+
+## [6.2.2](https://github.com/adobe/helix-deploy/compare/v6.2.1...v6.2.2) (2022-01-31)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#365](https://github.com/adobe/helix-deploy/issues/365)) ([1c5d845](https://github.com/adobe/helix-deploy/commit/1c5d8450ea20a2605d74b0fd82701bb7f771728b))
+
 ## [6.2.1](https://github.com/adobe/helix-deploy/compare/v6.2.0...v6.2.1) (2022-01-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "6.2.1",
+  "version": "6.2.5",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -38,16 +38,16 @@
   },
   "dependencies": {
     "@adobe/fastly-native-promises": "2.0.0",
-    "@adobe/helix-fetch": "3.0.0",
-    "@aws-sdk/client-apigatewayv2": "3.48.0",
-    "@aws-sdk/client-lambda": "3.48.0",
-    "@aws-sdk/client-s3": "3.48.0",
-    "@aws-sdk/client-secrets-manager": "3.48.0",
-    "@aws-sdk/client-ssm": "3.48.0",
+    "@adobe/helix-fetch": "3.0.2",
+    "@aws-sdk/client-apigatewayv2": "3.49.0",
+    "@aws-sdk/client-lambda": "3.49.0",
+    "@aws-sdk/client-s3": "3.49.0",
+    "@aws-sdk/client-secrets-manager": "3.49.0",
+    "@aws-sdk/client-ssm": "3.49.0",
     "@fastly/js-compute": "0.2.1",
     "@google-cloud/functions": "1.2.0",
     "@google-cloud/secret-manager": "3.10.1",
-    "@google-cloud/storage": "5.18.0",
+    "@google-cloud/storage": "5.18.1",
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-commonjs": "21.0.1",
     "@rollup/plugin-json": "4.1.0",
@@ -55,15 +55,15 @@
     "archiver": "5.3.0",
     "chalk-template": "0.3.1",
     "constants-browserify": "1.0.0",
-    "dotenv": "14.2.0",
+    "dotenv": "15.0.0",
     "express": "4.17.2",
     "form-data": "4.0.0",
     "fs-extra": "10.0.0",
     "get-stream": "6.0.1",
-    "isomorphic-git": "1.10.5",
+    "isomorphic-git": "1.11.1",
     "openwhisk": "3.21.6",
     "proxyquire": "2.1.3",
-    "rollup": "2.66.0",
+    "rollup": "2.66.1",
     "rollup-plugin-terser": "7.0.2",
     "semver": "7.3.5",
     "tar": "6.1.11",
@@ -72,26 +72,26 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-helix": "1.3.2",
-    "@adobe/helix-shared-wrap": "1.0.0",
+    "@adobe/helix-shared-wrap": "1.0.1",
     "@adobe/helix-status": "9.2.4",
-    "@adobe/helix-universal-logger": "2.0.0",
+    "@adobe/helix-universal-logger": "2.0.1",
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
     "c8": "7.11.0",
-    "chai": "4.3.4",
+    "chai": "4.3.6",
     "chai-http": "4.3.0",
     "codecov": "3.8.3",
-    "eslint": "8.7.0",
+    "eslint": "8.8.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.25.4",
     "husky": "7.0.4",
-    "lint-staged": "12.3.1",
-    "mocha": "9.1.4",
+    "lint-staged": "12.3.2",
+    "mocha": "9.2.0",
     "mocha-junit-reporter": "2.0.2",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.2.2",
     "semantic-release": "19.0.2",
-    "sinon": "12.0.1",
+    "sinon": "13.0.0",
     "yauzl": "2.10.0"
   },
   "engines": {

package/src/DevelopmentServer.js

@@ -87,6 +87,11 @@ export default class DevelopmentServer {
     return this;
   }
 
+  withDirectory(value) {
+    this._cwd = value;
+    return this;
+  }
+
   get port() {
     return this._port;
   }
@@ -102,23 +107,33 @@ export default class DevelopmentServer {
     // load the action params params
     let pkgJson = {};
     try {
-      pkgJson = await fse.readJson(path.resolve('package.json'));
+      pkgJson = await fse.readJson(path.resolve(this._cwd, 'package.json'));
     } catch (e) {
       // ignore
     }
     const config = new BaseConfig();
-    if (pkgJson.wsk && pkgJson.wsk['params-file']) {
-      config.withParamsFile(pkgJson.wsk['params-file']);
-    }
-    if (pkgJson.wsk && pkgJson.wsk.package && pkgJson.wsk.package['params-file']) {
-      config.withParamsFile(pkgJson.wsk.package['params-file']);
-    }
-    if (pkgJson.wsk && pkgJson.wsk['dev-params-file']) {
-      const file = pkgJson.wsk['dev-params-file'];
-      if (await fse.exists(file)) {
-        config.withParamsFile(file);
-      }
+    if (pkgJson.wsk) {
+      const withParamsFile = async (file) => {
+        if (!file) {
+          return;
+        }
+        // eslint-disable-next-line no-param-reassign
+        const files = (Array.isArray(file) ? file : [file]).map((f) => path.resolve(this._cwd, f));
+        await Promise.all(files.map(async (f) => {
+          if (await fse.exists(f)) {
+            config.withParamsFile(f);
+          }
+        }));
+      };
+
+      await withParamsFile(pkgJson.wsk?.package?.['params-file']);
+      config.withParams(pkgJson.wsk?.package?.params);
+      await withParamsFile(pkgJson.wsk?.['params-file']);
+      config.withParams(pkgJson.wsk?.params);
+      await withParamsFile(pkgJson.wsk?.dev?.['params-file']);
+      config.withParams(pkgJson.wsk?.dev?.params);
     }
+
     const builder = new ActionBuilder().withConfig(config);
     await builder.validate();
 
@@ -129,8 +144,7 @@ export default class DevelopmentServer {
       './main.js': {
         main: this._main,
       },
-      './google-package-params.js': () => (config.params),
-    });
+    }).raw;
     this.params = config.params;
     return this;
   }
@@ -140,6 +154,11 @@ export default class DevelopmentServer {
    * @returns {Promise<void>}
    */
   async start() {
+    Object.entries(this.params).forEach(([key, value]) => {
+      if (!(key in process.env)) {
+        process.env[key] = value;
+      }
+    });
     this.app = express();
     await new Promise((resolve, reject) => {
       try {
@@ -154,7 +173,9 @@ export default class DevelopmentServer {
       }
     });
     this.app.use(rawBody());
-    this.app.use(addRequestHeader('x-forwarded-host', this._xfh.replace('{port}', this._port)));
+    if (this._xfh) {
+      this.app.use(addRequestHeader('x-forwarded-host', this._xfh.replace('{port}', this._port)));
+    }
     this.app.all('*', this._handler);
   }