@adobe/helix-deploy 11.1.10 → 11.1.12

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [11.1.12](https://github.com/adobe/helix-deploy/compare/v11.1.11...v11.1.12) (2024-06-10)
+
+
+### Bug Fixes
+
+* restore worker settings ([#712](https://github.com/adobe/helix-deploy/issues/712)) ([8ba9ca1](https://github.com/adobe/helix-deploy/commit/8ba9ca1414c3e2ea10258bef64e509e53d4cd72a))
+
+## [11.1.11](https://github.com/adobe/helix-deploy/compare/v11.1.10...v11.1.11) (2024-06-08)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#713](https://github.com/adobe/helix-deploy/issues/713)) ([2a74389](https://github.com/adobe/helix-deploy/commit/2a7438900244dab1c2923cb823d94644ca00fbcc))
+
 ## [11.1.10](https://github.com/adobe/helix-deploy/compare/v11.1.9...v11.1.10) (2024-06-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "11.1.10",
+  "version": "11.1.12",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -40,16 +40,16 @@
     "@adobe/fastly-native-promises": "3.0.10",
     "@adobe/fetch": "4.1.8",
     "@adobe/helix-shared-process-queue": "3.0.4",
-    "@aws-sdk/client-apigatewayv2": "3.588.0",
-    "@aws-sdk/client-lambda": "3.588.0",
-    "@aws-sdk/client-s3": "3.588.0",
-    "@aws-sdk/client-secrets-manager": "3.588.0",
-    "@aws-sdk/client-ssm": "3.588.0",
-    "@aws-sdk/client-sts": "3.588.0",
-    "@fastly/js-compute": "3.14.2",
+    "@aws-sdk/client-apigatewayv2": "3.592.0",
+    "@aws-sdk/client-lambda": "3.592.0",
+    "@aws-sdk/client-s3": "3.592.0",
+    "@aws-sdk/client-secrets-manager": "3.592.0",
+    "@aws-sdk/client-ssm": "3.592.0",
+    "@aws-sdk/client-sts": "3.592.0",
+    "@fastly/js-compute": "3.15.0",
     "@google-cloud/functions": "3.4.0",
     "@google-cloud/secret-manager": "5.6.0",
-    "@google-cloud/storage": "7.11.1",
+    "@google-cloud/storage": "7.11.2",
     "@rollup/plugin-alias": "5.1.0",
     "@rollup/plugin-commonjs": "25.0.8",
     "@rollup/plugin-json": "6.1.0",

package/src/bundler/BaseBundler.js

@@ -155,7 +155,10 @@ export default class BaseBundler {
 
   async updateArchive(archive, packageJson) {
     const { cfg } = this;
-    archive.file(cfg.bundle, { name: 'index.js' });
+    if (cfg.archs.includes('node')) {
+      archive.file(cfg.bundle, { name: 'index.js' });
+    }
+
     cfg.statics.forEach(([src, name]) => {
       try {
         if (fse.lstatSync(src)
@@ -168,6 +171,7 @@ export default class BaseBundler {
         throw Error(`error with static file: ${e.message}`);
       }
     });
+
     cfg.modules.forEach((mod) => {
       archive.directory(path.resolve(cfg.cwd, `node_modules/${mod}`), `node_modules/${mod}`);
     });

package/src/bundler/EdgeBundler.js

@@ -124,4 +124,9 @@ export default class EdgeBundler extends WebpackBundler {
     }
     return this.createWebpackBundle('edge');
   }
+
+  // eslint-disable-next-line class-methods-use-this
+  validateBundle() {
+    // TODO: validate edge bundle, skipped since we're on node
+  }
 }

package/src/deploy/CloudflareConfig.js

@@ -44,7 +44,12 @@ export default class CloudflareConfig {
 
   static yarg(yargs) {
     return yargs
-      .group(['cloudflare-account-id', 'cloudflare-auth', 'cloudflare-email', 'cloudflare-test-domain'], 'Cloudflare Workers Deployment Options')
+      .group([
+        'cloudflare-account-id',
+        'cloudflare-auth',
+        'cloudflare-email',
+        'cloudflare-test-domain',
+      ], 'Cloudflare Workers Deployment Options')
       .option('cloudflare-account-id', {
         description: 'the Cloudflare account ID to deploy to',
         type: 'string',

package/src/deploy/CloudflareDeployer.js

@@ -43,6 +43,7 @@ export default class CloudflareDeployer extends BaseDeployer {
 
   async deploy() {
     const body = fs.readFileSync(this.cfg.edgeBundle);
+    const settings = await this.getSettings();
     const { id } = await this.createKVNamespace(`${this.cfg.packageName}--secrets`);
 
     const metadata = {
@@ -86,12 +87,46 @@ export default class CloudflareDeployer extends BaseDeployer {
     }
 
     await this.updatePackageParams(id, this.cfg.packageParams);
+
+    await this.restoreSettings(settings);
+  }
+
+  async getSettings() {
+    const res = await this.fetch(`https://api.cloudflare.com/client/v4/accounts/${this._cfg.accountID}/workers/scripts/${this.fullFunctionName}/script-settings`, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${this._cfg.auth}`,
+      },
+    });
+    if (!res.ok) {
+      return null;
+    }
+    const { result } = await res.json();
+    return result;
+  }
+
+  async restoreSettings(existing) {
+    if (!existing) {
+      return true;
+    }
+    const res = await this.fetch(`https://api.cloudflare.com/client/v4/accounts/${this._cfg.accountID}/workers/scripts/${this.fullFunctionName}/script-settings`, {
+      method: 'PATCH',
+      headers: {
+        Authorization: `Bearer ${this._cfg.auth}`,
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify(existing),
+    });
+    return res.ok;
   }
 
   async updatePackageParams(id, params) {
     const kvlist = Object.entries(params).map(([key, value]) => ({
       key, value,
     }));
+    if (!kvlist.length) {
+      return true;
+    }
 
     const res = await this.fetch(`https://api.cloudflare.com/client/v4/accounts/${this._cfg.accountID}/storage/kv/namespaces/${id}/bulk`, {
       method: 'PUT',

package/src/template/validate-bundle.js

@@ -35,7 +35,6 @@ async function run(bundlePath, cfg) {
           },
         },
       };
-
       const testUrl = String(test).startsWith('/') ? test : cfg.testUrl;
       if (testUrl) {
         const url = new URL(testUrl, 'https://localhost/');
@@ -43,6 +42,7 @@ async function run(bundlePath, cfg) {
         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}`,