lambda-live-debugger 1.8.6 → 1.9.0

package/dist/lldebugger.mjs

@@ -58,52 +58,37 @@ async function run() {
     }
     await Configuration.discoverLambdas();
     if (Configuration.config.remove) {
-        await InfraDeploy.removeInfrastructure();
-        // await GitIgnore.removeFromGitIgnore();
-        // delete folder .lldebugger
-        const folder = path.join(getProjectDirname(), '.lldebugger');
-        Logger.verbose(`Removing ${folder} folder...`);
-        await fs.rm(folder, { recursive: true });
-        if (Configuration.config.remove === 'all') {
-            await InfraDeploy.deleteLayer();
-        }
-        Logger.log('Lambda Live Debugger removed!');
-        return;
-    }
-    if (!Configuration.getLambdas().length) {
-        Logger.error('No Lambdas found. Exiting...');
-        return;
-    }
-    if (Configuration.config.approval === true) {
-        const changes = await InfraDeploy.getPlanedInfrastructureChanges();
-        if (!changes.deployLayer &&
-            !changes.lambdasToUpdate.length &&
-            !changes.rolesToUpdate.length) {
-            Logger.verbose('No infrastructure changes required.');
+        const removalChanges = await InfraDeploy.getInfraChangesForRemoving();
+        const hasChanges = removalChanges.lambdasToRemove.length ||
+            removalChanges.rolesToRemove.length ||
+            Configuration.config.remove === 'all';
+        const changesMessage = `The following changes will be applied to your AWS account:${(removalChanges.lambdasToRemove.length
+            ? `\n - Remove LLD layer and environment variables from Lambdas:\n${removalChanges.lambdasToRemove
+                .map((l) => `   - ${l.functionName}`)
+                .join('\n')}`
+            : '') +
+            (removalChanges.rolesToRemove.length
+                ? `\n - Remove IoT permissions from IAM Roles:\n${removalChanges.rolesToRemove
+                    .map((r) => `   - ${r}`)
+                    .join('\n')}`
+                : '') +
+            (Configuration.config.remove === 'all'
+                ? `\n - Delete Lambda Live Debugger layer`
+                : '')}`;
+        if (!hasChanges) {
+            Logger.log('No infrastructure to remove.');
         }
-        else {
-            // list all changes and ask for approval
+        else if (Configuration.config.approval === true) {
+            // ask for approval with changes shown in the prompt
             try {
-                const confirn = await inquirer.prompt([
+                const confirm = await inquirer.prompt([
                     {
                         type: 'confirm',
                         name: 'approval',
-                        message: `\nThe following changes will be applied to your AWS account:${(changes.deployLayer
-                            ? `\n - Deploy Lambda Live Debugger layer version ${version}`
-                            : '') +
-                            (changes.lambdasToUpdate.length
-                                ? `\n - Attach the layer and add environment variables to the Lambdas:\n${changes.lambdasToUpdate
-                                    .map((l) => `   - ${l}`)
-                                    .join('\n')}`
-                                : '') +
-                            (changes.rolesToUpdate.length
-                                ? `\n - Add IoT permissions to IAM Roles:\n${changes.rolesToUpdate
-                                    .map((r) => `   - ${r}`)
-                                    .join('\n')}`
-                                : '')}\n\nDo you want to continue?`,
+                        message: `${changesMessage}\n\nDo you want to continue?`,
                     },
                 ]);
-                if (!confirn.approval) {
+                if (!confirm.approval) {
                     Logger.log('Exiting...');
                     return;
                 }
@@ -119,15 +104,102 @@ async function run() {
                 }
             }
         }
+        else {
+            // show changes without approval
+            Logger.log(changesMessage);
+        }
+        await InfraDeploy.applyRemoveInfra(removalChanges);
+        // await GitIgnore.removeFromGitIgnore();
+        // delete folder .lldebugger
+        const folder = path.join(getProjectDirname(), '.lldebugger');
+        try {
+            Logger.verbose(`Removing ${folder} folder...`);
+            await fs.access(folder);
+            await fs.rm(folder, { recursive: true });
+        }
+        catch {
+            Logger.verbose(`${folder} does not exist, skipping removal.`);
+        }
+        if (Configuration.config.remove === 'all') {
+            await InfraDeploy.deleteLayer();
+        }
+        Logger.log('Lambda Live Debugger removed!');
+        return;
+    }
+    if (!Configuration.getLambdasFiltered().length) {
+        Logger.error('No Lambdas found. Exiting...');
+        return;
+    }
+    const changes = await InfraDeploy.getInfraChangesForAdding();
+    const hasChanges = changes.deployLayer ||
+        changes.lambdasToAdd.length ||
+        changes.rolesToAdd.length ||
+        changes.lambdasToRemove.length ||
+        changes.rolesToRemove.length;
+    const changesMessage = `The following changes will be applied to your AWS account:${(changes.deployLayer
+        ? `\n - Deploy Lambda Live Debugger layer version ${version}`
+        : '') +
+        (changes.lambdasToAdd.length
+            ? `\n - Attach the layer and add environment variables to the Lambdas:\n${changes.lambdasToAdd
+                .map((l) => `   - ${l.functionName}`)
+                .join('\n')}`
+            : '') +
+        (changes.rolesToAdd.length
+            ? `\n - Add IoT permissions to IAM Roles:\n${changes.rolesToAdd
+                .map((r) => `   - ${r}`)
+                .join('\n')}`
+            : '') +
+        (changes.lambdasToRemove.length
+            ? `\n - Remove the layer and environment variables from Lambdas no longer in scope:\n${changes.lambdasToRemove
+                .map((f) => `   - ${f.functionName}`)
+                .join('\n')}`
+            : '') +
+        (changes.rolesToRemove.length
+            ? `\n - Remove IoT permissions from IAM Roles no longer in scope:\n${changes.rolesToRemove
+                .map((r) => `   - ${r}`)
+                .join('\n')}`
+            : '')}`;
+    if (!hasChanges) {
+        Logger.log('No infrastructure changes required.');
+    }
+    else if (Configuration.config.approval === true) {
+        // ask for approval with changes shown in the prompt
+        try {
+            const confirm = await inquirer.prompt([
+                {
+                    type: 'confirm',
+                    name: 'approval',
+                    message: `${changesMessage}\n\nDo you want to continue?`,
+                },
+            ]);
+            if (!confirm.approval) {
+                Logger.log('Exiting...');
+                return;
+            }
+        }
+        catch (error) {
+            if (error.name === 'ExitPromptError') {
+                // user canceled the prompt
+                Logger.log('Exiting...');
+                return;
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+    else {
+        // show changes without approval
+        Logger.log(changesMessage);
     }
-    await InfraDeploy.deployInfrastructure();
+    await InfraDeploy.applyAddingInfra(changes);
     const folders = [
         path.resolve('.'),
-        ...Configuration.getLambdas().map((l) => l.codePath),
+        ...Configuration.getLambdasFiltered().map((l) => l.codePath),
     ];
     // get the uppermost folder of all lambdas or the project root to watch for changes
-    const rootFolderForWarchingChanges = getRootFolder(folders);
-    FileWatcher.watchForFileChanges(rootFolderForWarchingChanges);
+    const rootFolderForWatchingChanges = getRootFolder(folders);
+    FileWatcher.watchForFileChanges(rootFolderForWatchingChanges);
     await LambdaConnection.connect();
     Logger.log('Debugger started!');
     Logger.info(`When you want to stop debugging and return to normal execution, type command 'lld -r' to remove LLD Layer from the functions.`);

package/dist/resourceDiscovery.mjs

@@ -46,10 +46,11 @@ async function getLambdas(config) {
         if (config.function && !config.remove) {
             // if we are removing the debugger, we don't want to filter by function name
             const functionNameFilter = config.function.trim();
-            resources = resources.filter(
-            // filter by function name, can use * as wildcard
-            (l) => l.functionName === functionNameFilter ||
-                new RegExp('^' + functionNameFilter.split('*').join('.*') + '$').test(l.functionName));
+            resources = resources.map((l) => {
+                const matches = l.functionName === functionNameFilter ||
+                    new RegExp('^' + functionNameFilter.split('*').join('.*') + '$').test(l.functionName);
+                return matches ? l : { ...l, filteredOut: true };
+            });
         }
     }
     else {

package/dist/types/resourcesDiscovery.d.ts

@@ -24,6 +24,7 @@ export type LambdaResource = {
          */
         cdkPath?: string;
     };
+    filteredOut?: boolean;
 };
 export declare enum BundlingType {
     ESBUILD = "ESBUILD",

package/node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/client-sso/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aws-sdk/client-sso",
   "description": "AWS SDK for JavaScript Sso Client for Node.js, Browser and React Native",
-  "version": "3.864.0",
+  "version": "3.879.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline client-sso",
@@ -20,37 +20,37 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "3.864.0",
-    "@aws-sdk/middleware-host-header": "3.862.0",
-    "@aws-sdk/middleware-logger": "3.862.0",
-    "@aws-sdk/middleware-recursion-detection": "3.862.0",
-    "@aws-sdk/middleware-user-agent": "3.864.0",
-    "@aws-sdk/region-config-resolver": "3.862.0",
+    "@aws-sdk/core": "3.879.0",
+    "@aws-sdk/middleware-host-header": "3.873.0",
+    "@aws-sdk/middleware-logger": "3.876.0",
+    "@aws-sdk/middleware-recursion-detection": "3.873.0",
+    "@aws-sdk/middleware-user-agent": "3.879.0",
+    "@aws-sdk/region-config-resolver": "3.873.0",
     "@aws-sdk/types": "3.862.0",
-    "@aws-sdk/util-endpoints": "3.862.0",
-    "@aws-sdk/util-user-agent-browser": "3.862.0",
-    "@aws-sdk/util-user-agent-node": "3.864.0",
+    "@aws-sdk/util-endpoints": "3.879.0",
+    "@aws-sdk/util-user-agent-browser": "3.873.0",
+    "@aws-sdk/util-user-agent-node": "3.879.0",
     "@smithy/config-resolver": "^4.1.5",
-    "@smithy/core": "^3.8.0",
+    "@smithy/core": "^3.9.0",
     "@smithy/fetch-http-handler": "^5.1.1",
     "@smithy/hash-node": "^4.0.5",
     "@smithy/invalid-dependency": "^4.0.5",
     "@smithy/middleware-content-length": "^4.0.5",
-    "@smithy/middleware-endpoint": "^4.1.18",
-    "@smithy/middleware-retry": "^4.1.19",
+    "@smithy/middleware-endpoint": "^4.1.19",
+    "@smithy/middleware-retry": "^4.1.20",
     "@smithy/middleware-serde": "^4.0.9",
     "@smithy/middleware-stack": "^4.0.5",
     "@smithy/node-config-provider": "^4.1.4",
     "@smithy/node-http-handler": "^4.1.1",
     "@smithy/protocol-http": "^5.1.3",
-    "@smithy/smithy-client": "^4.4.10",
+    "@smithy/smithy-client": "^4.5.0",
     "@smithy/types": "^4.3.2",
     "@smithy/url-parser": "^4.0.5",
     "@smithy/util-base64": "^4.0.0",
     "@smithy/util-body-length-browser": "^4.0.0",
     "@smithy/util-body-length-node": "^4.0.0",
-    "@smithy/util-defaults-mode-browser": "^4.0.26",
-    "@smithy/util-defaults-mode-node": "^4.0.26",
+    "@smithy/util-defaults-mode-browser": "^4.0.27",
+    "@smithy/util-defaults-mode-node": "^4.0.27",
     "@smithy/util-endpoints": "^3.0.7",
     "@smithy/util-middleware": "^4.0.5",
     "@smithy/util-retry": "^4.0.7",