@adobe/helix-deploy 13.0.8 → 13.1.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [13.1.0](https://github.com/adobe/helix-deploy/compare/v13.0.9...v13.1.0) (2025-07-01)
+
+
+### Features
+
+* add script to install `helix-deploy-proxy` in new environment ([#827](https://github.com/adobe/helix-deploy/issues/827)) ([f5ef2d3](https://github.com/adobe/helix-deploy/commit/f5ef2d3c82f37e8ce7882fa7a060cada65c943df))
+
+## [13.0.9](https://github.com/adobe/helix-deploy/compare/v13.0.8...v13.0.9) (2025-06-25)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#822](https://github.com/adobe/helix-deploy/issues/822)) ([88c0589](https://github.com/adobe/helix-deploy/commit/88c0589d85c5f3c179a71c66a2e29f245fc2c1b0))
+
 ## [13.0.8](https://github.com/adobe/helix-deploy/compare/v13.0.7...v13.0.8) (2025-06-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "13.0.8",
+  "version": "13.1.0",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",
@@ -39,12 +39,12 @@
   "dependencies": {
     "@adobe/fetch": "4.2.2",
     "@adobe/helix-shared-process-queue": "3.1.3",
-    "@aws-sdk/client-apigatewayv2": "3.830.0",
-    "@aws-sdk/client-lambda": "3.830.0",
-    "@aws-sdk/client-s3": "3.830.0",
-    "@aws-sdk/client-secrets-manager": "3.830.0",
-    "@aws-sdk/client-ssm": "3.830.0",
-    "@aws-sdk/client-sts": "3.830.0",
+    "@aws-sdk/client-apigatewayv2": "3.835.0",
+    "@aws-sdk/client-lambda": "3.835.0",
+    "@aws-sdk/client-s3": "3.835.0",
+    "@aws-sdk/client-secrets-manager": "3.835.0",
+    "@aws-sdk/client-ssm": "3.835.0",
+    "@aws-sdk/client-sts": "3.835.0",
     "@google-cloud/functions": "4.1.0",
     "@google-cloud/secret-manager": "6.0.1",
     "@google-cloud/storage": "7.16.0",
@@ -54,13 +54,13 @@
     "esbuild": "0.25.5",
     "escalade": "3.2.0",
     "fs-extra": "11.3.0",
-    "isomorphic-git": "1.30.3",
+    "isomorphic-git": "1.31.1",
     "openwhisk": "3.21.8",
     "semver": "7.7.2",
     "yargs": "18.0.0"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.4",
+    "@adobe/eslint-config-helix": "3.0.6",
     "@adobe/helix-shared-wrap": "2.0.2",
     "@adobe/helix-status": "10.1.5",
     "@eslint/config-helpers": "0.2.3",
@@ -70,7 +70,7 @@
     "eslint": "9.4.0",
     "husky": "9.1.7",
     "lint-staged": "16.1.2",
-    "mocha": "11.6.0",
+    "mocha": "11.7.1",
     "mocha-junit-reporter": "2.2.1",
     "mocha-multi-reporters": "1.5.1",
     "nock": "13.5.6",

package/src/scripts/install-proxy.sh

@@ -0,0 +1,128 @@
+#!/bin/bash
+set -eo pipefail
+
+if [ -z "${HLX_AWS_ACCOUNT_ID}" ]; then
+  echo "HLX_AWS_ACCOUNT_ID required"
+  exit 1
+fi
+if [ -z "${HLX_AWS_API_ID}" ]; then
+  echo "HLX_AWS_API_ID required"
+  exit 1
+fi
+if [ -z "${HLX_AWS_REGION}" ]; then
+  echo "HLX_AWS_REGION required"
+  exit 1
+fi
+
+function_name="helix-deploy-proxy"
+runtime="nodejs22.x"
+role="arn:aws:iam::${HLX_AWS_ACCOUNT_ID}:role/helix-lambda-role"
+
+createZip() {
+  temp_dir=$(mktemp -d)
+  cp $(dirname $0)/../template/aws-proxy-code.js ${temp_dir}/index.mjs
+  cd $temp_dir
+  zip -q code.zip index.mjs
+  cd - > /dev/null
+  echo $temp_dir
+}
+
+createFunction() {
+  aws lambda create-function \
+    --function-name "arn:aws:lambda:${HLX_AWS_REGION}:${HLX_AWS_ACCOUNT_ID}:function:${function_name}" \
+    --runtime "${runtime}" \
+    --handler "index.handler" \
+    --role "${role}" \
+    --description "Helix Deploy Proxy" \
+    --timeout 60 \
+    --package-type Zip \
+    --zip-file "fileb://$1/code.zip"
+}
+
+createIntegration() {
+  json=$(aws apigatewayv2 create-integration \
+    --api-id ${HLX_AWS_API_ID} \
+    --integration-type "AWS_PROXY" \
+    --integration-uri "arn:aws:lambda:${HLX_AWS_REGION}:${HLX_AWS_ACCOUNT_ID}:function:${function_name}" \
+    --payload-format-version "2.0")
+  echo $(echo $json | jq -r '.IntegrationId')
+}
+
+createInvokePermissions() {
+  route=$1
+
+  aws lambda add-permission \
+    --statement-id run-${route}-1 \
+    --action lambda:InvokeFunction \
+    --function-name "arn:aws:lambda:${HLX_AWS_REGION}:${HLX_AWS_ACCOUNT_ID}:function:${function_name}" \
+    --principal apigateway.amazonaws.com \
+    --source-arn "arn:aws:execute-api:${HLX_AWS_REGION}:${HLX_AWS_ACCOUNT_ID}:${HLX_AWS_API_ID}/*/*/${route}/{action}/{version}"
+
+  aws lambda add-permission \
+    --statement-id run-${route}-2 \
+    --action lambda:InvokeFunction \
+    --function-name "arn:aws:lambda:${HLX_AWS_REGION}:${HLX_AWS_ACCOUNT_ID}:function:${function_name}" \
+    --principal apigateway.amazonaws.com \
+    --source-arn "arn:aws:execute-api:${HLX_AWS_REGION}:${HLX_AWS_ACCOUNT_ID}:${HLX_AWS_API_ID}/*/*/${route}/{action}/{version}/{path+}"
+}
+
+createRoutes() {
+  route=$1
+  integration=$2
+  authorizer=$3
+
+  if [ -z "${authorizer}" ]; then
+    aws apigatewayv2 create-route \
+      --api-id ${HLX_AWS_API_ID} \
+      --no-api-key-required \
+      --route-key "ANY /${route}/{action}/{version}" \
+      --target "integrations/${integration}"
+    aws apigatewayv2 create-route \
+      --api-id ${HLX_AWS_API_ID} \
+      --no-api-key-required \
+      --route-key "ANY /${route}/{action}/{version}/{path+}" \
+      --target "integrations/${integration}"
+  else
+    aws apigatewayv2 create-route \
+      --api-id ${HLX_AWS_API_ID} \
+      --no-api-key-required \
+      --route-key "ANY /${route}/{action}/{version}" \
+      --target "integrations/${integration}" \
+      --authorization-type "CUSTOM" \
+      --authorizer-id "${authorizer}"
+    aws apigatewayv2 create-route \
+      --api-id ${HLX_AWS_API_ID} \
+      --no-api-key-required \
+      --route-key "ANY /${route}/{action}/{version}/{path+}" \
+      --target "integrations/${integration}" \
+      --authorization-type "CUSTOM" \
+      --authorizer-id "${authorizer}"
+  fi
+}
+
+getAuthorizerId() {
+  authorizer=$(aws apigatewayv2 get-authorizers \
+    --api-id "${HLX_AWS_API_ID}" | jq -r '.Items[] | select(.Name=="helix-token-authorizer_v2") | .AuthorizerId')
+  echo $authorizer
+}
+
+#
+# Main
+#
+
+temp_dir=$(createZip)
+trap "rm -rf $temp_dir" 0 2 3 15
+createFunction $temp_dir
+
+integration=$(createIntegration)
+authorizer=$(getAuthorizerId)
+
+createRoutes helix-services $integration
+if [ ! -z "${authorizer}" ]; then
+  createRoutes helix3 $integration $authorizer
+fi
+
+createInvokePermissions helix-services
+if [ ! -z "${authorizer}" ]; then
+  createInvokePermissions helix3
+fi

package/src/template/{aws-function-proxy.js → aws-proxy-code.js}

@@ -49,8 +49,9 @@ export const handler = async (event) => {
   } catch (err) {
     console.error(err);
     return {
-      statusCode: err.statusCode,
-      body: err.message,
+      statusCode: err.$metadata?.httpStatusCode ?? err.statusCode,
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ message: err.message }),
     };
   }
 };