@jcoreio/toolchain-aws-lambda 4.3.5 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-aws-lambda",
-  "version": "4.3.5",
+  "version": "4.5.0",
   "description": "AWS Lambda function build toolchain",
   "repository": {
     "type": "git",
@@ -17,17 +17,18 @@
     "@aws-sdk/client-s3": "^3.575.0",
     "@aws-sdk/client-sts": "^3.575.0",
     "@jcoreio/cloudformation-tools": "^5.1.1",
-    "@jcoreio/pack-lambda": "^2.0.0",
+    "@jcoreio/pack-lambda": "^3.0.0",
     "@semantic-release/exec": "^6.0.3",
     "dedent-js": "^1.0.1",
     "dotenv": "^16.4.5",
     "resolve-bin": "^1.0.0",
     "zod": "^3.21.4",
-    "@jcoreio/toolchain": "4.3.5"
+    "@jcoreio/toolchain": "4.5.0"
   },
   "toolchainManaged": {
     "devDependencies": {
-      "@types/aws-lambda": "^8.10.137"
+      "@types/aws-lambda": "^8.10.137",
+      "@jcoreio/cloudformation-template-types": "^1.1.0"
     }
   }
 }

package/plugins/getConfigFiles.cjs

@@ -14,23 +14,27 @@ module.exports = [
         }
       `,
       [`scripts/cloudFormationTemplate.${isTS ? 'ts' : 'js'}`]: dedent`
+        import type {
+          CloudFormationTemplate,
+          CloudFormationTemplateParameterValues,
+        } from '@jcoreio/cloudformation-template-types'
+
         // export const StackName = 'StackName'
 
         export const Template = {
           AWSTemplateFormatVersion: '2010-09-09',
           // Description: 'Template Descrption',
-          Transform: 'AWS::Serverless-2016-10-31',
           Parameters: {
 
           },
           Resources: {
             LambdaFunction: {
-              Type: 'AWS::Serverless::Function',
+              Type: 'AWS::Lambda::Function',
               Properties: {
                 MemorySize: 128,
                 Timeout: 60,
-                // CodeUri: {
-                //   Bucket: 'BucketName',
+                // Code: {
+                //   S3Bucket: 'BucketName',
                 // },
               },
             },
@@ -38,11 +42,11 @@ module.exports = [
           Outputs: {
             LambdaFunction: { Value: { Ref: 'LambdaFunction' } },
           },
-        }
+        } satisfies CloudFormationTemplate
         
         export const Parameters = {
 
-        }
+        } satisfies CloudFormationTemplateParameterValues<typeof Template>
         
         export const Capabilities = ['CAPABILITY_IAM']
 

package/scripts/deploy.cjs

@@ -114,29 +114,69 @@ module.exports = async function deploy() {
     Properties.Handler = packageJson.main.replace(/\.[^.]+$/, '.handler')
   }
 
-  if (!Properties.CodeUri) Properties.CodeUri = {}
-  const { CodeUri } = Properties
-
-  if (!CodeUri.Bucket) {
+  const isServerless = lambdaResource.Type === 'AWS::Serverless::Function'
+
+  // Adapt between janky difference between AWS::Serverless::Function and AWS::Lambda::Function
+  const adapter = isServerless
+    ? {
+        get Code() {
+          const { CodeUri } = lambdaResource
+          return CodeUri
+            ? {
+                get S3Bucket() {
+                  return CodeUri.Bucket
+                },
+                set S3Bucket(value) {
+                  CodeUri.Bucket = value
+                },
+                get S3Key() {
+                  return CodeUri.Key
+                },
+                set S3Key(value) {
+                  CodeUri.Key = value
+                },
+              }
+            : undefined
+        },
+        set Code(value) {
+          lambdaResource.CodeUri = {
+            Bucket: value.S3Bucket,
+            Key: value.S3Key,
+          }
+        },
+      }
+    : lambdaResource.Properties
+
+  if (!adapter.Code) adapter.Code = {}
+  const { Code } = Properties
+
+  if (!Code.S3Bucket) {
     const sts = new STSClient()
     const { Account } = await sts.send(new GetCallerIdentityCommand({}))
     // eslint-disable-next-line no-console
-    console.error(`Defaulting Lambda CodeUri.Bucket to AWS Account: ${Account}`)
-    CodeUri.Bucket = Account
+    console.error(
+      `Defaulting Lambda ${
+        isServerless ? 'CodeUri.Bucket' : 'Code.S3Bucket'
+      } to AWS Account: ${Account}`
+    )
+    Code.S3Bucket = Account
   }
 
-  let Bucket = CodeUri.Bucket
-  if (CodeUri.Bucket instanceof Object) {
-    if (CodeUri.Bucket.Ref) {
+  let Bucket = Code.S3Bucket
+  if (Code.S3Bucket instanceof Object) {
+    if (Code.S3Bucket.Ref) {
       Bucket =
-        Parameters[CodeUri.Bucket.Ref] ||
-        (Template.Parameters[CodeUri.Bucket.Ref] || {}).Default
+        Parameters[Code.S3Bucket.Ref] ||
+        (Template.Parameters[Code.S3Bucket.Ref] || {}).Default
     }
     throw new Error(
-      `Lambda CodeUri.Bucket format not supported: ${inspect(Bucket)}`
+      `Lambda ${
+        isServerless ? 'CodeUri.Bucket' : 'Code.S3Bucket'
+      } format not supported: ${inspect(Bucket)}`
     )
   }
-  let Key = CodeUri.Key
+
+  let Key = Code.S3Key
 
   const s3 = new S3Client()
   try {
@@ -154,8 +194,9 @@ module.exports = async function deploy() {
     packageDir: path.resolve(projectDir, 'dist'),
     Bucket,
     Key,
+    useHash: true,
   }))
-  CodeUri.Key = Key
+  Code.S3Key = Key
 
   if (!Properties.Runtime) {
     Properties.Runtime = `nodejs20.x`