@adobe/helix-deploy 12.0.10 → 12.1.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [12.1.1](https://github.com/adobe/helix-deploy/compare/v12.1.0...v12.1.1) (2024-09-06)
+
+
+### Bug Fixes
+
+* Removing awsLayers does not remove layers from a deployed function [#734](https://github.com/adobe/helix-deploy/issues/734) ([#735](https://github.com/adobe/helix-deploy/issues/735)) ([b2bb82b](https://github.com/adobe/helix-deploy/commit/b2bb82bffc5c07abfac2d9db2f3e8d30b219e9cd))
+
+# [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)
 
 

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.10",
+  "version": "12.1.1",
   "description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
   "license": "Apache-2.0",
   "homepage": "https://github.com/adobe/helix-deploy#readme",

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,12 +246,12 @@ 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,
       ],
       LoggingConfig: this._cfg.logFormat ? { Format: this._cfg.logFormat } : undefined,
-      Layers: this._cfg.layers,
+      Layers: this._cfg.layers || [],
       TracingConfig: this._cfg.tracingMode ? { Mode: this._cfg.tracingMode } : undefined,
     };
 
@@ -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