@adobe/helix-deploy 9.1.4 → 9.1.6

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [9.1.6](https://github.com/adobe/helix-deploy/compare/v9.1.5...v9.1.6) (2023-07-01)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([3dd1182](https://github.com/adobe/helix-deploy/commit/3dd11826d86d40243ab4d6bdc118c1d604050dc9))
+
+## [9.1.5](https://github.com/adobe/helix-deploy/compare/v9.1.4...v9.1.5) (2023-06-29)
+
+
+### Bug Fixes
+
+* **deps:** create tgz file for compute package instead of stream ([f27831d](https://github.com/adobe/helix-deploy/commit/f27831d50971a091935f78ce3f8a8f0bcc30ef9c))
+
 ## [9.1.4](https://github.com/adobe/helix-deploy/compare/v9.1.3...v9.1.4) (2023-06-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "9.1.4",
+  "version": "9.1.6",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -38,12 +38,12 @@
   "dependencies": {
     "@adobe/fastly-native-promises": "3.0.4",
     "@adobe/fetch": "4.0.13",
-    "@aws-sdk/client-apigatewayv2": "3.359.0",
-    "@aws-sdk/client-lambda": "3.359.0",
-    "@aws-sdk/client-s3": "3.359.0",
-    "@aws-sdk/client-secrets-manager": "3.359.0",
-    "@aws-sdk/client-ssm": "3.359.0",
-    "@aws-sdk/client-sts": "3.359.0",
+    "@aws-sdk/client-apigatewayv2": "3.363.0",
+    "@aws-sdk/client-lambda": "3.363.0",
+    "@aws-sdk/client-s3": "3.363.0",
+    "@aws-sdk/client-secrets-manager": "3.363.0",
+    "@aws-sdk/client-ssm": "3.363.0",
+    "@aws-sdk/client-sts": "3.363.0",
     "@fastly/js-compute": "2.4.0",
     "@google-cloud/functions": "2.5.0",
     "@google-cloud/secret-manager": "4.2.2",
@@ -60,13 +60,12 @@
     "express": "4.18.2",
     "form-data": "4.0.0",
     "fs-extra": "11.1.1",
-    "get-stream": "6.0.1",
     "isomorphic-git": "1.24.2",
     "openwhisk": "3.21.7",
-    "rollup": "3.25.1",
+    "rollup": "3.26.0",
     "semver": "7.5.3",
     "tar": "6.1.15",
-    "webpack": "5.88.0",
+    "webpack": "5.88.1",
     "yargs": "17.7.2"
   },
   "devDependencies": {
@@ -75,15 +74,15 @@
     "@adobe/helix-status": "10.0.9",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "c8": "7.14.0",
-    "eslint": "8.43.0",
+    "c8": "8.0.0",
+    "eslint": "8.44.0",
     "husky": "8.0.3",
-    "lint-staged": "13.2.2",
+    "lint-staged": "13.2.3",
     "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.3.1",
-    "semantic-release": "21.0.5",
+    "semantic-release": "21.0.6",
     "yauzl": "2.10.0"
   },
   "engines": {

package/src/deploy/ComputeAtEdgeDeployer.js

@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 import { fork } from 'child_process';
+import chalk from 'chalk-template';
 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';
@@ -66,7 +66,7 @@ export default class ComputeAtEdgeDeployer extends BaseDeployer {
    */
   async bundle() {
     const bundleDir = path.dirname(this.cfg.edgeBundle);
-    this.log.debug(`Creating fastly.toml in ${bundleDir}`);
+    this.log.debug(`--: creating fastly.toml in ${bundleDir}`);
     fs.writeFile(path.resolve(bundleDir, 'fastly.toml'), `
 # This file describes a Fastly Compute@Edge package. To learn more visit:
 # https://developer.fastly.com/reference/fastly-toml/
@@ -97,21 +97,22 @@ service_id = ""
       );
       child.on('data', (data) => resolve(data));
       child.on('error', (err) => reject(err));
-      child.on('close', (err) => {
+      child.on('close', async (err) => {
         if (err) {
           // non-zero status code
           reject(err);
         } else {
-          this.log.debug(`Created WASM bundle of script and interpreter in ${bundleDir}/bin/main.wasm`);
-          const stream = tar.c({
+          const file = path.resolve(bundleDir, 'fastly-bundle.tar.gz');
+          this.log.debug(chalk`{green ok:} created WASM bundle of script and interpreter in ${bundleDir}/bin/main.wasm`);
+          await tar.c({
             gzip: true,
             // sync: true,
             cwd: bundleDir,
             prefix: 'Test',
-            // file: path.resolve(bundleDir, 'fastly-bundle.tar.gz')
+            file,
           }, ['bin/main.wasm', 'fastly.toml']);
-          // this.log.debug(`Created tar file in ${bundleDir}/fastly-bundle.tar.gz`);
-          resolve(getStream.buffer(stream));
+          this.log.debug(chalk`{green ok:} created tar file in ${bundleDir}/fastly-bundle.tar.gz`);
+          resolve(fs.readFile(file));
         }
       });
     });
@@ -119,19 +120,19 @@ service_id = ""
 
   async deploy() {
     const buf = await this.bundle();
-
     this.init();
 
     await this._fastly.transact(async (version) => {
+      this.log.debug('--: uploading package to fastly');
       await this._fastly.writePackage(version, buf);
 
+      this.log.debug('--: creating secrets dictionary');
       await this._fastly.writeDictionary(version, 'secrets', {
         name: 'secrets',
         write_only: 'true',
       });
 
       const host = this._cfg.fastlyGateway;
-      console.log('Host', host);
       const backend = {
         hostname: host,
         ssl_cert_hostname: host,
@@ -149,12 +150,13 @@ service_id = ""
         max_conn: 200,
         use_ssl: true,
       };
+      this.log.debug(`--: updating gateway backend: ${host}`);
       await this._fastly.writeBackend(version, 'gateway', backend);
     }, true);
   }
 
   async updatePackage() {
-    this.log.info('--: updating app (gateway) config ...');
+    this.log.info(`--: updating app (gateway) config for https://${this._cfg.fastlyGateway}/${this.cfg.packageName}/...`);
 
     this.init();
 
@@ -168,7 +170,6 @@ service_id = ""
 
     await this._fastly.bulkUpdateDictItems(undefined, 'secrets', ...functionparams);
     await this._fastly.updateDictItem(undefined, 'secrets', '_token', this.cfg.packageToken);
-    console.log('package', `https://${this._cfg.fastlyGateway}/${this.cfg.packageName}/`);
     await this._fastly.updateDictItem(undefined, 'secrets', '_package', `https://${this._cfg.fastlyGateway}/${this.cfg.packageName}/`);
 
     this._fastly.discard();