@aws-sdk/find-v2 0.4.0 → 0.4.2

package/README.md

@@ -43,13 +43,13 @@ $ npx @aws-sdk/find-v2 lambda --yes
     "FunctionName": "fn-with-aws-sdk-in-bundle",
     "Region": "us-east-2",
     "ContainsAwsSdkJsV2": true,
-    "AwsSdkJsV2Location": "Bundled in index file."
+    "AwsSdkJsV2Location": "Bundled in 'index.js'"
   },
   {
     "FunctionName": "fn-with-aws-sdk-in-package-json-deps",
     "Region": "us-east-2",
     "ContainsAwsSdkJsV2": true,
-    "AwsSdkJsV2Location": "Defined in package.json dependencies."
+    "AwsSdkJsV2Location": "Defined in dependencies of 'package.json'"
   },
   {
     "FunctionName": "fn-without-aws-sdk-in-package-json-deps",

package/dist/cli.js

@@ -17,8 +17,9 @@ export const createProgram = () => {
     program
         .command("lambda")
         .description("Scans Lambda Node.js Functions for JavaScript SDK v2")
-        .option("-r, --region <region>", "AWS region to scan")
         .option("-y, --yes", "answer yes for all prompts")
+        .option("-r, --region <region>", "AWS region to scan")
+        .option("-p, --profile <profile>", "AWS profile to use")
         .option("-j, --jobs <count>", "number of parallel jobs", (value) => {
         const trimmed = value.trim();
         if (!/^\d+$/.test(trimmed)) {

package/dist/getLambdaFunctionScanOutput.js

@@ -31,32 +31,31 @@ export const getLambdaFunctionScanOutput = async (client, { functionName, region
     finally {
         await rm(zipPath, { force: true });
     }
-    const { packageJsonContents, bundleContent } = lambdaFunctionContents;
+    const { packageJsonFiles, bundleFile } = lambdaFunctionContents;
     // Search for "aws-sdk" in package.json dependencies if present.
-    if (packageJsonContents && packageJsonContents.length > 0) {
-        for (const packageJsonContent of packageJsonContents) {
+    if (packageJsonFiles && packageJsonFiles.length > 0) {
+        for (const { path: packageJsonPath, content: packageJsonContent } of packageJsonFiles) {
             try {
                 const packageJson = JSON.parse(packageJsonContent);
                 const dependencies = packageJson.dependencies || {};
                 if ("aws-sdk" in dependencies) {
                     output.ContainsAwsSdkJsV2 = true;
-                    output.AwsSdkJsV2Location = "Defined in package.json dependencies.";
+                    output.AwsSdkJsV2Location = `Defined in dependencies of '${packageJsonPath}'`;
                     return output;
                 }
             }
             catch (error) {
+                const errorPrefix = `Error parsing '${packageJsonPath}'`;
                 output.AwsSdkJsV2Error =
-                    error instanceof Error
-                        ? `Error parsing package.json: ${error.message}`
-                        : "Error parsing package.json";
+                    error instanceof Error ? `${errorPrefix}: ${error.message}` : errorPrefix;
                 return output;
             }
         }
     }
     // Check for code of "aws-sdk" in bundle, if not found in package.json dependencies.
-    if (bundleContent && hasSdkV2InBundle(bundleContent)) {
+    if (bundleFile && hasSdkV2InBundle(bundleFile.content)) {
         output.ContainsAwsSdkJsV2 = true;
-        output.AwsSdkJsV2Location = "Bundled in index file.";
+        output.AwsSdkJsV2Location = `Bundled in '${bundleFile.path}'`;
         return output;
     }
     // "aws-sdk" dependency/code not found.

package/dist/scanLambdaFunctions.js

@@ -4,8 +4,11 @@ import { getLambdaFunctionScanOutput } from "./getLambdaFunctionScanOutput.js";
 import { getDownloadConfirmation } from "./utils/getDownloadConfirmation.js";
 import { getLambdaFunctions } from "./utils/getLambdaFunctions.js";
 export const scanLambdaFunctions = async (options = {}) => {
-    const { region, yes, jobs } = options;
-    const client = new Lambda({ region });
+    const { region, yes, jobs, profile } = options;
+    const client = new Lambda({
+        ...(region && { region }),
+        ...(profile && { profile }),
+    });
     const functions = await getLambdaFunctions(client);
     const functionCount = functions.length;
     const concurrency = Math.min(functionCount, jobs || 1);

package/dist/utils/getLambdaFunctionContents.js

@@ -10,7 +10,7 @@ const PACKAGE_JSON_FILENAME = "package.json";
  */
 export const getLambdaFunctionContents = async (zipPath) => {
     const zip = new StreamZip.async({ file: zipPath });
-    const packageJsonContents = [];
+    const packageJsonFiles = [];
     let zipEntries = {};
     try {
         zipEntries = await zip.entries();
@@ -31,16 +31,19 @@ export const getLambdaFunctionContents = async (zipPath) => {
             continue;
         try {
             const packageJsonContent = await zip.entryData(zipEntry.name);
-            packageJsonContents.push(packageJsonContent.toString());
+            packageJsonFiles.push({
+                path: zipEntry.name,
+                content: packageJsonContent.toString(),
+            });
         }
         catch {
             // Continue without adding package.json file, if entry data can't be read.
             // ToDo: add warning when logging is supported in future.
         }
     }
-    if (packageJsonContents.length !== 0) {
+    if (packageJsonFiles.length !== 0) {
         await zip.close();
-        return { packageJsonContents };
+        return { packageJsonFiles };
     }
     for (const path of ["index.js", "index.mjs", "index.cjs"]) {
         if (!zipEntries[path])
@@ -50,7 +53,12 @@ export const getLambdaFunctionContents = async (zipPath) => {
         try {
             const bundleContent = await zip.entryData(path);
             await zip.close();
-            return { bundleContent: bundleContent.toString() };
+            return {
+                bundleFile: {
+                    path,
+                    content: bundleContent.toString(),
+                },
+            };
         }
         catch {
             // Continue processing next index file, if entry data can't be read.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/find-v2",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "CLI to find resources which call AWS using JavaScript SDK v2",
   "main": "dist/cli.js",
   "types": "dist/cli.d.ts",