Add stackName to plugin params

changelog.md

@@ -2,6 +2,15 @@
 
 ---
 
+## [5.0.8] 2025-01-23
+
+### Changed
+
+- Added `stackName` property to Deploy plugin params
+- Improved error handling during Lambda direct updates
+
+---
+
 ## [5.0.7] 2024-04-30
 
 ### Fixed

package.json

@@ -46,7 +46,7 @@
     "@aws-lite/s3": "^0.1.21",
     "@aws-lite/ssm": "^0.2.3",
     "chalk": "4.1.2",
-    "fs-extra": "~11.2.0",
+    "fs-extra": "~11.3.0",
     "get-folder-size": "2.0.1",
     "glob": "~10.3.12",
     "mime-types": "~2.1.35",
@@ -61,11 +61,11 @@
   "devDependencies": {
     "@architect/eslint-config": "~3.0.0",
     "cross-env": "~7.0.3",
-    "eslint": "~9.1.1",
+    "eslint": "~9.18.0",
     "mock-tmp": "~0.0.4",
     "nyc": "~15.1.0",
     "proxyquire": "~2.1.3",
-    "tap-arc": "~1.2.2",
-    "tape": "~5.7.5"
+    "tap-arc": "~1.3.2",
+    "tape": "~5.9.0"
   }
 }

src/direct/update.js

@@ -29,16 +29,21 @@ module.exports = function updateLambda (params, callback) {
   } = params
 
   // Check the Lambda lifecycle state after each mutation to prevent async update issues
+  // 40x checks every 250ms = 10s
   function checkin (count, callback) {
-    if (count === 10) {
+    if (count === 40) {
       callback(Error('Timed out waiting to perform Lambda update'))
     }
     else {
       aws.lambda.GetFunctionConfiguration({ FunctionName })
         .then(config => {
-          if (config?.LastUpdateStatus !== 'Successful') {
+          if (config?.LastUpdateStatus === 'InProgress') {
             setTimeout(() => checkin(++count, callback), 250)
           }
+          else if (config?.LastUpdateStatus === 'Failed') {
+            callback(Error('Lambda update error'))
+          }
+          // Only three states: InProgress, Failed, or Successful
           else callback()
         })
         .catch(callback)

src/sam/index.js

@@ -60,6 +60,8 @@ module.exports = function samDeploy (params, callback) {
   if (name) {
     stackname += toLogicalID(name)
   }
+  // For plugins
+  let stackName = stackname
 
   if (eject) {
     update = updater('Deploy [eject]')
@@ -105,12 +107,12 @@ module.exports = function samDeploy (params, callback) {
 
     // deploy.start plugins
     function runStartPlugins (cloudformation, callback) {
-      plugins.start({ cloudformation, dryRun, inventory, stage }, callback)
+      plugins.start({ cloudformation, dryRun, inventory, stackName, stage }, callback)
     },
 
     // deploy.services plugins
     function runServicesPlugins (cloudformation, callback) {
-      plugins.services({ cloudformation, dryRun, inventory, stage }, callback)
+      plugins.services({ cloudformation, dryRun, inventory, stackName, stage }, callback)
     },
 
     // Fingerprint static assets + ensure ASAP has static.json
@@ -221,7 +223,7 @@ module.exports = function samDeploy (params, callback) {
     // deploy.target plugins
     function runTargetPlugins (callback) {
       let cloudformation = finalCloudFormation
-      plugins.target({ cloudformation, dryRun, inventory, stage }, callback)
+      plugins.target({ cloudformation, dryRun, inventory, stackName, stage }, callback)
     },
 
     // Post-deploy static assets
@@ -252,7 +254,7 @@ module.exports = function samDeploy (params, callback) {
     // deploy.end plugins
     function runEndPlugins (callback) {
       let cloudformation = finalCloudFormation
-      plugins.end({ cloudformation, dryRun, inventory, stage }, callback)
+      plugins.end({ cloudformation, dryRun, inventory, stackName, stage }, callback)
     },
   ], callback)
 }

src/sam/plugins/end.js

@@ -4,14 +4,14 @@ let { deepFrozenCopy } = require('@architect/utils')
  * deploy.end plugins
  */
 module.exports = function endPlugins (params, callback) {
-  let { cloudformation, dryRun, stage } = params
+  let { cloudformation, dryRun, stackName, stage } = params
   let deployEndPlugins = params.inventory.inv.plugins?._methods?.deploy?.end
   if (deployEndPlugins) {
     let inventory = deepFrozenCopy(params.inventory)
     let { arc } = inventory.inv._project
     async function runPlugins () {
       for (let plugin of deployEndPlugins) {
-        await plugin({ arc, cloudformation, dryRun, inventory, stage })
+        await plugin({ arc, cloudformation, dryRun, inventory, stackName, stage })
       }
     }
     runPlugins()

src/sam/plugins/services.js

@@ -3,15 +3,15 @@ let { deepFrozenCopy, getLambdaName, toLogicalID } = require('@architect/utils')
  * deploy.services plugins
  */
 module.exports = function servicesPlugins (params, callback) {
-  let { cloudformation, dryRun, stage } = params
+  let { cloudformation, dryRun, stackName, stage } = params
   let serviceDiscoveryPlugins = params.inventory.inv.plugins?._methods?.deploy?.services
   if (serviceDiscoveryPlugins) {
     let inventory = deepFrozenCopy(params.inventory)
     let { arc } = inventory.inv._project
     async function runPlugins () {
       for (let plugin of serviceDiscoveryPlugins) {
         let pluginName = getLambdaName(plugin._plugin)
-        let result = await plugin({ arc, cloudformation, dryRun, inventory, stage })
+        let result = await plugin({ arc, cloudformation, dryRun, inventory, stackName, stage })
         if (result && Object.keys(result).length) {
           Object.entries(result).forEach(([ key, Value ]) => {
             let ServiceParam = `${toLogicalID(pluginName)}${toLogicalID(key)}Param`

src/sam/plugins/start.js

@@ -4,7 +4,7 @@ let { deepFrozenCopy } = require('@architect/utils')
  * deploy.start plugins
  */
 module.exports = function startPlugins (params, callback) {
-  let { cloudformation, dryRun, stage } = params
+  let { cloudformation, dryRun, stackName, stage } = params
   let deployStartPlugins = params.inventory.inv.plugins?._methods?.deploy?.start
   if (deployStartPlugins) {
     let inventory = deepFrozenCopy(params.inventory)
@@ -15,7 +15,7 @@ module.exports = function startPlugins (params, callback) {
         let result
         // Plugins accept an option object
         if (_type === 'plugin') {
-          result = await plugin({ arc, cloudformation, dryRun, inventory, stage })
+          result = await plugin({ arc, cloudformation, dryRun, inventory, stackName, stage })
         }
         // Legacy macros use ordered args
         if (_type === 'macro') {

src/sam/plugins/target.js

@@ -4,14 +4,14 @@ let { deepFrozenCopy } = require('@architect/utils')
  * deploy.target plugins
  */
 module.exports = function targetPlugins (params, callback) {
-  let { cloudformation, dryRun, stage } = params
+  let { cloudformation, dryRun, stackName, stage } = params
   let deployTargetPlugins = params.inventory.inv.plugins?._methods?.deploy?.target
   if (deployTargetPlugins) {
     let inventory = deepFrozenCopy(params.inventory)
     let { arc } = inventory.inv._project
     async function runPlugins () {
       for (let plugin of deployTargetPlugins) {
-        await plugin({ arc, cloudformation, dryRun, inventory, stage })
+        await plugin({ arc, cloudformation, dryRun, inventory, stackName, stage })
       }
     }
     runPlugins()