@adobe/helix-deploy 9.3.11 → 9.3.13

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [9.3.13](https://github.com/adobe/helix-deploy/compare/v9.3.12...v9.3.13) (2023-10-30)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/fetch to v4.1.1 ([#612](https://github.com/adobe/helix-deploy/issues/612)) ([7bf12eb](https://github.com/adobe/helix-deploy/commit/7bf12eb6668ae27a4cada9679b23826245753c41))
+
+## [9.3.12](https://github.com/adobe/helix-deploy/compare/v9.3.11...v9.3.12) (2023-10-28)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#610](https://github.com/adobe/helix-deploy/issues/610)) ([1612ba6](https://github.com/adobe/helix-deploy/commit/1612ba6818f6514c01e29c4deece90d623b4d5e5))
+
 ## [9.3.11](https://github.com/adobe/helix-deploy/compare/v9.3.10...v9.3.11) (2023-10-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "9.3.11",
+  "version": "9.3.13",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -37,17 +37,17 @@
   },
   "dependencies": {
     "@adobe/fastly-native-promises": "3.0.5",
-    "@adobe/fetch": "4.1.0",
-    "@aws-sdk/client-apigatewayv2": "3.433.0",
-    "@aws-sdk/client-lambda": "3.433.0",
-    "@aws-sdk/client-s3": "3.433.0",
-    "@aws-sdk/client-secrets-manager": "3.433.0",
-    "@aws-sdk/client-ssm": "3.433.0",
-    "@aws-sdk/client-sts": "3.433.0",
-    "@fastly/js-compute": "3.7.0",
+    "@adobe/fetch": "4.1.1",
+    "@aws-sdk/client-apigatewayv2": "3.438.0",
+    "@aws-sdk/client-lambda": "3.438.0",
+    "@aws-sdk/client-s3": "3.438.0",
+    "@aws-sdk/client-secrets-manager": "3.438.0",
+    "@aws-sdk/client-ssm": "3.438.0",
+    "@aws-sdk/client-sts": "3.438.0",
+    "@fastly/js-compute": "3.7.2",
     "@google-cloud/functions": "3.0.1",
     "@google-cloud/secret-manager": "5.0.1",
-    "@google-cloud/storage": "7.3.1",
+    "@google-cloud/storage": "7.4.0",
     "@rollup/plugin-alias": "5.0.1",
     "@rollup/plugin-commonjs": "25.0.7",
     "@rollup/plugin-json": "6.0.1",
@@ -62,14 +62,14 @@
     "fs-extra": "11.1.1",
     "isomorphic-git": "1.24.5",
     "openwhisk": "3.21.7",
-    "rollup": "4.1.4",
+    "rollup": "4.1.5",
     "semver": "7.5.4",
     "tar": "6.2.0",
     "webpack": "5.89.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.3",
+    "@adobe/eslint-config-helix": "2.0.4",
     "@adobe/helix-shared-wrap": "2.0.0",
     "@adobe/helix-status": "10.0.10",
     "@semantic-release/changelog": "6.0.3",

package/src/bundler/EdgeBundler.js

@@ -44,6 +44,7 @@ export default class EdgeBundler extends WebpackBundler {
         'aws-sdk',
         '@google-cloud/secret-manager',
         '@google-cloud/storage',
+        'fastly:env',
       ].reduce((obj, ext) => {
         // this makes webpack to ignore the module and just leave it as normal require.
         // eslint-disable-next-line no-param-reassign

package/src/deploy/ComputeAtEdgeDeployer.js

@@ -72,10 +72,10 @@ export default class ComputeAtEdgeDeployer extends BaseDeployer {
 # https://developer.fastly.com/reference/fastly-toml/
 
 authors = ["Helix Deploy"]
-description = "Test Project"
+description = "${this.cfg.packageName} project generated by Helix Deploy"
 language = "javascript"
 manifest_version = 2
-name = "Test"
+name = "${this.cfg.packageName}"
 service_id = ""
     `);
 
@@ -108,7 +108,7 @@ service_id = ""
             gzip: true,
             // sync: true,
             cwd: bundleDir,
-            prefix: 'Test',
+            prefix: this.cfg.packageName,
             file,
           }, ['bin/main.wasm', 'fastly.toml']);
           this.log.debug(chalk`{green ok:} created tar file in ${bundleDir}/fastly-bundle.tar.gz`);
@@ -123,7 +123,7 @@ service_id = ""
     this.init();
 
     await this._fastly.transact(async (version) => {
-      this.log.debug('--: uploading package to fastly');
+      this.log.debug('--: uploading package to fastly, service version', version);
       await this._fastly.writePackage(version, buf);
 
       this.log.debug('--: creating secrets dictionary');

package/src/template/fastly-adapter.js

@@ -12,9 +12,38 @@
 /* eslint-env serviceworker */
 /* global Dictionary */
 
+export function getEnvInfo(req, env) {
+  const serviceVersion = env('FASTLY_SERVICE_VERSION');
+  const requestId = env('FASTLY_TRACE_ID');
+  const region = env('FASTLY_POP');
+  const functionName = env('FASTLY_SERVICE_ID');
+  const functionFQN = `${env('FASTLY_CUSTOMER_ID')}-${functionName}-${serviceVersion}`;
+  const txId = req.headers.get('x-transaction-id') ?? env('FASTLY_TRACE_ID');
+
+  console.debug('Env info sv: ', serviceVersion, ' reqId: ', requestId, ' region: ', region, ' functionName: ', functionName, ' functionFQN: ', functionFQN, ' txId: ', txId);
+
+  return {
+    functionFQN,
+    functionName,
+    region,
+    requestId,
+    serviceVersion,
+    txId,
+  };
+}
+
+async function getEnvironmentInfo(req) {
+  // The fastly:env import will be available in the fastly c@e environment
+  /* eslint-disable-next-line import/no-unresolved */
+  const mod = await import('fastly:env');
+  return getEnvInfo(req, mod.env);
+}
+
 async function handler(event) {
   try {
     const { request } = event;
+    const env = await getEnvironmentInfo(request);
+
     console.log('Fastly Adapter is here');
     let packageParams;
     // eslint-disable-next-line import/no-unresolved,global-require
@@ -26,20 +55,20 @@ async function handler(event) {
       },
       runtime: {
         name: 'compute-at-edge',
-        // region: request.cf.colo,
+        region: env.region,
       },
       func: {
-        name: null,
+        name: env.functionName,
         package: null,
-        version: null,
-        fqn: null,
+        version: env.serviceVersion,
+        fqn: env.functionFQN,
         app: null,
       },
       invocation: {
         id: null,
         deadline: null,
-        transactionId: null,
-        requestId: null,
+        transactionId: env.txId,
+        requestId: env.requestId,
       },
       env: new Proxy(new Dictionary('secrets'), {
         get: (target, prop) => {
@@ -87,7 +116,7 @@ async function handler(event) {
   }
 }
 
-function fastly() {
+export default function fastly() {
   console.log('checking for fastly environment');
   /* eslint-disable-next-line no-undef */
   if (CacheOverride) {
@@ -95,5 +124,3 @@ function fastly() {
   }
   return false;
 }
-
-module.exports = fastly;

package/src/template/serviceworker-index.js

@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-env serviceworker */
-const fastly = require('./fastly-adapter.js');
+
+import fastly from './fastly-adapter.js';
+
 const cloudflare = require('./cloudflare-adapter.js');
 
 /* eslint-disable no-restricted-globals */