@aws-sdk/find-v2 0.3.2 → 0.4.0

package/README.md

@@ -32,20 +32,31 @@ Commands:
 Run `lambda` command to scan Lambda Node.js Functions for JavaScript SDK v2.
 
 ```console
-$ npx @aws-sdk/find-v2 lambda
-
-Note about output:
-- [Y] means "aws-sdk" is found in Lambda function, and migration is recommended.
-- [N] means "aws-sdk" is not found in Lambda function.
-- [?] means script was not able to proceed, and it emits reason.
-
-Reading 4 functions from "us-east-2" region.
-[N] fn-without-aws-sdk-in-bundle
-[Y] fn-with-aws-sdk-in-bundle
-[Y] fn-with-aws-sdk-in-package-json-deps
-[N] fn-without-aws-sdk-in-package-json-deps
-
-Done.
+$ npx @aws-sdk/find-v2 lambda --yes
+[
+  {
+    "FunctionName": "fn-without-aws-sdk-in-bundle",
+    "Region": "us-east-2",
+    "ContainsAwsSdkJsV2": false
+  },
+  {
+    "FunctionName": "fn-with-aws-sdk-in-bundle",
+    "Region": "us-east-2",
+    "ContainsAwsSdkJsV2": true,
+    "AwsSdkJsV2Location": "Bundled in index file."
+  },
+  {
+    "FunctionName": "fn-with-aws-sdk-in-package-json-deps",
+    "Region": "us-east-2",
+    "ContainsAwsSdkJsV2": true,
+    "AwsSdkJsV2Location": "Defined in package.json dependencies."
+  },
+  {
+    "FunctionName": "fn-without-aws-sdk-in-package-json-deps",
+    "Region": "us-east-2",
+    "ContainsAwsSdkJsV2": false
+  }
+]
 ```
 
 This script requires AWS Managed Policy [AWSLambda_ReadOnlyAccess][].

package/dist/cli.js

@@ -1,4 +1,5 @@
 import { Command } from "commander";
+import { cpus } from "node:os";
 import packageJson from "../package.json" with { type: "json" };
 import { scanLambdaFunctions } from "./scanLambdaFunctions.js";
 /**
@@ -18,6 +19,17 @@ export const createProgram = () => {
         .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("-j, --jobs <count>", "number of parallel jobs", (value) => {
+        const trimmed = value.trim();
+        if (!/^\d+$/.test(trimmed)) {
+            throw new Error("jobs must be a positive integer");
+        }
+        const parsed = Number.parseInt(trimmed, 10);
+        if (parsed < 1) {
+            throw new Error("jobs must be a positive integer");
+        }
+        return parsed;
+    }, cpus().length)
         .action(async (options) => {
         await scanLambdaFunctions(options);
     });

package/dist/{scanLambdaFunction.js → getLambdaFunctionScanOutput.js}

@@ -1,15 +1,19 @@
-import { JS_SDK_V2_MARKER } from "./constants.js";
 import { downloadFile } from "./utils/downloadFile.js";
 import { getLambdaFunctionContents, } from "./utils/getLambdaFunctionContents.js";
 import { hasSdkV2InBundle } from "./utils/hasSdkV2InBundle.js";
 import { rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-export const scanLambdaFunction = async (client, functionName) => {
+export const getLambdaFunctionScanOutput = async (client, { functionName, region }) => {
+    const output = {
+        FunctionName: functionName,
+        Region: region,
+        ContainsAwsSdkJsV2: null,
+    };
     const response = await client.getFunction({ FunctionName: functionName });
     if (!response.Code?.Location) {
-        console.log(`${JS_SDK_V2_MARKER.UNKNOWN} ${functionName}: Code location not found.`);
-        return;
+        output.AwsSdkJsV2Error = "Function Code location not found.";
+        return output;
     }
     const zipPath = join(tmpdir(), `${functionName}.zip`);
     let lambdaFunctionContents;
@@ -17,6 +21,13 @@ export const scanLambdaFunction = async (client, functionName) => {
         await downloadFile(response.Code.Location, zipPath);
         lambdaFunctionContents = await getLambdaFunctionContents(zipPath);
     }
+    catch (error) {
+        output.AwsSdkJsV2Error =
+            error instanceof Error
+                ? `Error downloading or reading Lambda function code: ${error.message}`
+                : "Error downloading or reading Lambda function code.";
+        return output;
+    }
     finally {
         await rm(zipPath, { force: true });
     }
@@ -28,21 +39,27 @@ export const scanLambdaFunction = async (client, functionName) => {
                 const packageJson = JSON.parse(packageJsonContent);
                 const dependencies = packageJson.dependencies || {};
                 if ("aws-sdk" in dependencies) {
-                    console.log(`${JS_SDK_V2_MARKER.Y} ${functionName}`);
-                    return;
+                    output.ContainsAwsSdkJsV2 = true;
+                    output.AwsSdkJsV2Location = "Defined in package.json dependencies.";
+                    return output;
                 }
-                // oxlint-disable-next-line no-unused-vars
             }
             catch (error) {
-                // Parsing failure for package.json which is rare, continue.
+                output.AwsSdkJsV2Error =
+                    error instanceof Error
+                        ? `Error parsing package.json: ${error.message}`
+                        : "Error parsing package.json";
+                return output;
             }
         }
     }
     // Check for code of "aws-sdk" in bundle, if not found in package.json dependencies.
     if (bundleContent && hasSdkV2InBundle(bundleContent)) {
-        console.log(`${JS_SDK_V2_MARKER.Y} ${functionName}`);
-        return;
+        output.ContainsAwsSdkJsV2 = true;
+        output.AwsSdkJsV2Location = "Bundled in index file.";
+        return output;
     }
     // "aws-sdk" dependency/code not found.
-    console.log(`${JS_SDK_V2_MARKER.N} ${functionName}`);
+    output.ContainsAwsSdkJsV2 = false;
+    return output;
 };

package/dist/scanLambdaFunctions.js

@@ -1,15 +1,14 @@
 import { Lambda } from "@aws-sdk/client-lambda";
 import pLimit from "p-limit";
-import { cpus } from "node:os";
-import { JS_SDK_V2_MARKER } from "./constants.js";
-import { scanLambdaFunction } from "./scanLambdaFunction.js";
+import { getLambdaFunctionScanOutput } from "./getLambdaFunctionScanOutput.js";
 import { getDownloadConfirmation } from "./utils/getDownloadConfirmation.js";
 import { getLambdaFunctions } from "./utils/getLambdaFunctions.js";
-export const scanLambdaFunctions = async ({ region, yes } = {}) => {
+export const scanLambdaFunctions = async (options = {}) => {
+    const { region, yes, jobs } = options;
     const client = new Lambda({ region });
     const functions = await getLambdaFunctions(client);
     const functionCount = functions.length;
-    const concurrency = Math.min(functionCount, cpus().length || 1);
+    const concurrency = Math.min(functionCount, jobs || 1);
     const codeSizeToDownload = functions.reduce((acc, fn) => acc + (fn.CodeSize || 0), 0);
     const codeSizeToSaveOnDisk = functions
         .map((fn) => fn.CodeSize || 0)
@@ -17,7 +16,7 @@ export const scanLambdaFunctions = async ({ region, yes } = {}) => {
         .slice(0, concurrency)
         .reduce((acc, size) => acc + size, 0);
     if (functionCount === 0) {
-        console.log("No functions found.");
+        console.log("[]");
         process.exit(0);
     }
     if (!yes) {
@@ -28,13 +27,11 @@ export const scanLambdaFunctions = async ({ region, yes } = {}) => {
             process.exit(0);
         }
     }
-    console.log(`Note about output:`);
-    console.log(`- ${JS_SDK_V2_MARKER.Y} means "aws-sdk" is found in Lambda function, and migration is recommended.`);
-    console.log(`- ${JS_SDK_V2_MARKER.N} means "aws-sdk" is not found in Lambda function.`);
-    console.log(`- ${JS_SDK_V2_MARKER.UNKNOWN} means script was not able to proceed, and it emits reason.\n`);
     const clientRegion = await client.config.region();
-    console.log(`Reading ${functionCount} function${functionCount > 1 ? "s" : ""} from "${clientRegion}" region.`);
     const limit = pLimit(concurrency);
-    await Promise.all(functions.map((fn) => limit(() => scanLambdaFunction(client, fn.FunctionName))));
-    console.log("\nDone.");
+    const output = await Promise.all(functions.map((fn) => limit(() => getLambdaFunctionScanOutput(client, {
+        functionName: fn.FunctionName,
+        region: clientRegion,
+    }))));
+    console.log(JSON.stringify(output, null, 2));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/find-v2",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "CLI to find resources which call AWS using JavaScript SDK v2",
   "main": "dist/cli.js",
   "types": "dist/cli.d.ts",
@@ -18,6 +18,8 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
+    "@rspack/cli": "^1.6.8",
+    "@rspack/core": "^1.6.8",
     "@tsconfig/node-ts": "^23.6.2",
     "@tsconfig/node20": "^20.1.8",
     "@types/node": "^20.14.8",
@@ -25,6 +27,7 @@
     "esbuild": "~0.27.1",
     "oxfmt": "^0.18.0",
     "oxlint": "^1.33.0",
+    "parcel": "^2.16.3",
     "rolldown": "1.0.0-beta.54",
     "rollup": "^4.53.3",
     "typescript": "^5.9.3",
@@ -37,7 +40,7 @@
     "lint": "oxlint src/**/*.ts",
     "format": "oxfmt",
     "test": "vitest",
-    "test:generate:bundles": "node scripts/generateBundles.ts",
+    "test:generate:bundles": "sh scripts/generateBundles.sh",
     "release": "yarn build && changeset publish"
   },
   "repository": {

package/dist/constants.js

@@ -1,5 +0,0 @@
-export const JS_SDK_V2_MARKER = {
-    Y: "[Y]",
-    N: "[N]",
-    UNKNOWN: "[?]",
-};