@adobe/helix-deploy 12.0.9 → 12.1.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [12.1.0](https://github.com/adobe/helix-deploy/compare/v12.0.10...v12.1.0) (2024-08-28)
+
+
+### Features
+
+* **aws:** support configuring Lambda Handler ([#733](https://github.com/adobe/helix-deploy/issues/733)) ([dfb1be9](https://github.com/adobe/helix-deploy/commit/dfb1be95ee1ed58359c2b49cf32ccdfacb3da036))
+
+## [12.0.10](https://github.com/adobe/helix-deploy/compare/v12.0.9...v12.0.10) (2024-08-24)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#732](https://github.com/adobe/helix-deploy/issues/732)) ([83e96fe](https://github.com/adobe/helix-deploy/commit/83e96fea25a5e651c45367dee5b7111847822982))
+
 ## [12.0.9](https://github.com/adobe/helix-deploy/compare/v12.0.8...v12.0.9) (2024-08-17)
 
 

package/README.md

@@ -137,6 +137,7 @@ AWS Deployment Options
       --aws-tracing-mode          The lambda tracing mode. Can be either "Active" or "PassThrough".  [string]
       --aws-extra-permissions     A list of additional invoke permissions to add to the lambda function in the form <SourceARN>@<Principal>. Optionally, you can use <SourceARN>@<Principal>:<Alias> if you want to scope the permission to a specific alias.  [array]
       --aws-tags                  A list of additional tags to attach to the lambda function in the form key=value. To remove a tag, use key= (i.e. without a value).  [array]
+      --aws-handler               Set custom lambda Handler. For example, set if an AWS layer provides another function entry point.  [string]
 
 Google Deployment Options
       --google-project-id  the Google Cloud project to deploy to. Optional when the key file is a JSON file  [string] [default: ""]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-deploy",
-  "version": "12.0.9",
+  "version": "12.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,13 +39,13 @@
   "dependencies": {
     "@adobe/fetch": "4.1.8",
     "@adobe/helix-shared-process-queue": "3.0.4",
-    "@aws-sdk/client-apigatewayv2": "3.632.0",
-    "@aws-sdk/client-lambda": "3.632.0",
-    "@aws-sdk/client-s3": "3.633.0",
-    "@aws-sdk/client-secrets-manager": "3.632.0",
-    "@aws-sdk/client-ssm": "3.632.0",
-    "@aws-sdk/client-sts": "3.632.0",
-    "@google-cloud/functions": "3.5.0",
+    "@aws-sdk/client-apigatewayv2": "3.637.0",
+    "@aws-sdk/client-lambda": "3.637.0",
+    "@aws-sdk/client-s3": "3.637.0",
+    "@aws-sdk/client-secrets-manager": "3.637.0",
+    "@aws-sdk/client-ssm": "3.637.0",
+    "@aws-sdk/client-sts": "3.637.0",
+    "@google-cloud/functions": "3.6.0",
     "@google-cloud/secret-manager": "5.6.0",
     "@google-cloud/storage": "7.12.1",
     "archiver": "7.0.1",
@@ -55,7 +55,7 @@
     "isomorphic-git": "1.27.1",
     "openwhisk": "3.21.8",
     "semver": "7.6.3",
-    "webpack": "5.93.0",
+    "webpack": "5.94.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
@@ -66,12 +66,12 @@
     "@semantic-release/git": "10.0.1",
     "c8": "10.1.2",
     "eslint": "8.57.0",
-    "husky": "9.1.4",
+    "husky": "9.1.5",
     "lint-staged": "15.2.9",
     "mocha": "10.7.3",
     "mocha-junit-reporter": "2.2.1",
     "mocha-multi-reporters": "1.5.1",
-    "nock": "13.5.4",
+    "nock": "13.5.5",
     "semantic-release": "24.1.0",
     "yauzl": "3.1.3"
   },

package/src/deploy/AWSConfig.js

@@ -35,6 +35,7 @@ export default class AWSConfig {
       tracingMode: undefined,
       extraPermissions: undefined,
       tags: undefined,
+      handler: undefined,
     });
   }
 
@@ -58,7 +59,8 @@ export default class AWSConfig {
       .withAWSLayers(argv.awsLayers)
       .withAWSTracingMode(argv.awsTracingMode)
       .withAWSExtraPermissions(argv.awsExtraPermissions)
-      .withAWSTags(argv.awsTags);
+      .withAWSTags(argv.awsTags)
+      .withAWSHandler(argv.awsHandler);
   }
 
   withAWSRegion(value) {
@@ -162,13 +164,18 @@ export default class AWSConfig {
     return this;
   }
 
+  withAWSHandler(value) {
+    this.handler = value;
+    return this;
+  }
+
   static yarg(yargs) {
     return yargs
       .group(['aws-region', 'aws-api', 'aws-role', 'aws-cleanup-buckets', 'aws-cleanup-integrations',
         'aws-cleanup-versions', 'aws-create-routes', 'aws-create-authorizer', 'aws-attach-authorizer',
         'aws-lambda-format', 'aws-parameter-manager', 'aws-deploy-template', 'aws-arch', 'aws-update-secrets',
         'aws-deploy-bucket', 'aws-identity-source', 'aws-log-format', 'aws-layers',
-        'aws-tracing-mode', 'aws-extra-permissions', 'aws-tags'], 'AWS Deployment Options')
+        'aws-tracing-mode', 'aws-extra-permissions', 'aws-tags', 'aws-handler'], 'AWS Deployment Options')
       .option('aws-region', {
         description: 'the AWS region to deploy lambda functions to',
         type: 'string',
@@ -263,6 +270,10 @@ export default class AWSConfig {
         description: 'A list of additional tags to attach to the lambda function in the form key=value. To remove a tag, use key= (i.e. without a value).',
         type: 'array',
         array: true,
+      })
+      .option('aws-handler', {
+        description: 'Set custom lambda Handler. For example, set if an AWS layer provides another function entry point.',
+        type: 'string',
       });
   }
 }

package/src/deploy/AWSDeployer.js

@@ -218,9 +218,8 @@ export default class AWSDeployer extends BaseDeployer {
     this.log.info(chalk`{green ok:} deleted deploy package {blueBright s3://${this._bucket}/${this._key}}.`);
   }
 
-  async createLambda() {
+  get functionConfig() {
     const { cfg, functionName, additionalTags } = this;
-    const functionVersion = cfg.version.replace(/\./g, '_');
 
     const functionConfig = {
       Code: {
@@ -247,7 +246,7 @@ export default class AWSDeployer extends BaseDeployer {
       Environment: {
         Variables: cfg.params,
       },
-      Handler: cfg.esm ? 'esm-adapter/index.handler' : 'index.lambda',
+      Handler: this._cfg.handler || (cfg.esm ? 'esm-adapter/index.handler' : 'index.lambda'),
       Architectures: [
         this._cfg.arch,
       ],
@@ -263,6 +262,15 @@ export default class AWSDeployer extends BaseDeployer {
       }
     });
 
+    return functionConfig;
+  }
+
+  async createLambda() {
+    const {
+      cfg, functionName, additionalTags, functionConfig,
+    } = this;
+    const functionVersion = cfg.version.replace(/\./g, '_');
+
     this.log.info(`--: using lambda role "${this._cfg.role}"`);
 
     // check if function already exists