@aws-sdk/find-v2 0.4.3 → 0.6.0

package/README.md

@@ -33,17 +33,17 @@ Run `lambda` command to scan Lambda Node.js Functions for JavaScript SDK v2.
 
 ```console
 $ npx @aws-sdk/find-v2 lambda --yes --output table
-┌─────────────────────────────────────────┬───────────┬────────────────────────────────────────────────┐
-│ FunctionName                            │ Region    │ ContainsAwsSdkJsV2                             │
-├─────────────────────────────────────────┼───────────┼────────────────────────────────────────────────┤
-│ fn-without-aws-sdk-in-bundle            │ us-east-2 │ No.                                            │
-├─────────────────────────────────────────┼───────────┼────────────────────────────────────────────────┤
-│ fn-with-aws-sdk-in-bundle               │ us-east-2 │ Yes. Bundled in 'index.js'                     │
-├─────────────────────────────────────────┼───────────┼────────────────────────────────────────────────┤
-│ fn-with-aws-sdk-in-package-json-deps    │ us-east-2 │ Yes. Defined in dependencies of 'package.json' │
-├─────────────────────────────────────────┼───────────┼────────────────────────────────────────────────┤
-│ fn-without-aws-sdk-in-package-json-deps │ us-east-2 │ No.                                            │
-└─────────────────────────────────────────┴───────────┴────────────────────────────────────────────────┘
+┌─────────────────────────────────────────┬───────────┬────────────┬────────────┬────────────────────────────────────────────────┐
+│ FunctionName                            │ Region    │ Runtime    │ SdkVersion │ ContainsAwsSdkJsV2                             │
+├─────────────────────────────────────────┼───────────┼────────────┼────────────┼────────────────────────────────────────────────┤
+│ fn-without-aws-sdk-in-bundle            │ us-east-2 │ nodejs24.x │ >=2.0.0    │ No.                                            │
+├─────────────────────────────────────────┼───────────┼────────────┼────────────┼────────────────────────────────────────────────┤
+│ fn-with-aws-sdk-in-bundle               │ us-east-2 │ nodejs24.x │ >=2.0.0    │ Yes. Bundled in 'index.js'                     │
+├─────────────────────────────────────────┼───────────┼────────────┼────────────┼────────────────────────────────────────────────┤
+│ fn-with-aws-sdk-in-package-json-deps    │ us-east-2 │ nodejs24.x │ >=2.0.0    │ Yes. Defined in dependencies of 'package.json' │
+├─────────────────────────────────────────┼───────────┼────────────┼────────────┼────────────────────────────────────────────────┤
+│ fn-without-aws-sdk-in-package-json-deps │ us-east-2 │ nodejs24.x │ >=2.0.0    │ No.                                            │
+└─────────────────────────────────────────┴───────────┴────────────┴────────────┴────────────────────────────────────────────────┘
 ```
 
 This script requires AWS Managed Policy [AWSLambda_ReadOnlyAccess][].

package/dist/cli.js

@@ -1,4 +1,5 @@
 import { Command, Option } from "commander";
+import { satisfies } from "compare-versions";
 import { cpus } from "node:os";
 import packageJson from "../package.json" with { type: "json" };
 import { scanLambdaFunctions } from "./scanLambdaFunctions.js";
@@ -19,8 +20,26 @@ export const createProgram = () => {
         .command("lambda")
         .description("Scans Lambda Node.js Functions for JavaScript SDK v2")
         .option("-y, --yes", "answer yes for all prompts", false)
-        .option("-r, --region <region>", "AWS region to scan")
-        .option("-p, --profile <profile>", "AWS profile to use")
+        .option("--node <semver>", "Semver range string to select Lambda Node.js major versions", (value) => {
+        try {
+            satisfies("0", value);
+        }
+        catch {
+            throw new Error(`Invalid semver range: ${value}`);
+        }
+        return value;
+    }, ">=20")
+        .option("--sdk <semver>", "Semver range string to check for AWS SDK for JavaScript v2", (value) => {
+        try {
+            satisfies("0", value);
+        }
+        catch {
+            throw new Error(`Invalid semver range: ${value}`);
+        }
+        return value;
+    }, ">=2.0.0")
+        .option("--region <region>", "AWS region to scan")
+        .option("--profile <profile>", "AWS profile to use")
         .addOption(new Option("-o, --output <output>", "Output format")
         .choices(Object.values(LambdaCommandOutputType))
         .default(LambdaCommandOutputType.json))

package/dist/scanLambdaFunctions.js

@@ -3,14 +3,20 @@ import pLimit from "p-limit";
 import { getDownloadConfirmation } from "./utils/getDownloadConfirmation.js";
 import { getLambdaFunctions } from "./utils/getLambdaFunctions.js";
 import { getLambdaFunctionScanOutput } from "./utils/getLambdaFunctionScanOutput.js";
+import { getLambdaNodeJsMatchingVersions } from "./utils/getLambdaNodeJsMatchingVersions.js";
 import { LambdaCommandOutputType, printLambdaCommandOutput, } from "./utils/printLambdaCommandOutput.js";
 export const scanLambdaFunctions = async (options) => {
-    const { yes, region, profile, output, jobs } = options;
+    const { yes, node, sdk, region, profile, output, jobs } = options;
     const client = new Lambda({
         ...(region && { region }),
         ...(profile && { profile }),
     });
-    const functions = await getLambdaFunctions(client);
+    const lambdaNodeJsMajorVersions = getLambdaNodeJsMatchingVersions(node);
+    if (lambdaNodeJsMajorVersions.length === 0) {
+        printLambdaCommandOutput([], output);
+        return;
+    }
+    const functions = await getLambdaFunctions(client, lambdaNodeJsMajorVersions);
     const functionCount = functions.length;
     const concurrency = Math.min(functionCount, jobs || 1);
     const codeSizeToDownload = functions.reduce((acc, fn) => acc + (fn.CodeSize || 0), 0);
@@ -20,15 +26,15 @@ export const scanLambdaFunctions = async (options) => {
         .slice(0, concurrency)
         .reduce((acc, size) => acc + size, 0);
     if (functionCount === 0) {
-        console.log("[]");
-        process.exit(0);
+        printLambdaCommandOutput([], output);
+        return;
     }
     if (!yes) {
         const confirmation = await getDownloadConfirmation(functionCount, codeSizeToDownload, codeSizeToSaveOnDisk);
         console.log();
         if (!confirmation) {
             console.log("Exiting.");
-            process.exit(0);
+            return;
         }
     }
     const clientRegion = await client.config.region();
@@ -36,6 +42,8 @@ export const scanLambdaFunctions = async (options) => {
     const scanOutput = await Promise.all(functions.map((fn) => limit(() => getLambdaFunctionScanOutput(client, {
         functionName: fn.FunctionName,
         region: clientRegion,
+        runtime: fn.Runtime,
+        sdkVersionRange: sdk,
     }))));
     printLambdaCommandOutput(scanOutput, output);
 };

package/dist/utils/getLambdaFunctionScanOutput.js

@@ -1,13 +1,27 @@
+import { satisfies } from "compare-versions";
 import { downloadFile } from "./downloadFile.js";
 import { getLambdaFunctionContents, } from "./getLambdaFunctionContents.js";
 import { hasSdkV2InBundle } from "./hasSdkV2InBundle.js";
 import { rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-export const getLambdaFunctionScanOutput = async (client, { functionName, region }) => {
+/**
+ * Scans a Lambda function to detect AWS SDK for JavaScript v2 usage.
+ *
+ * Downloads the function code, extracts it, and checks for v2 SDK in:
+ * 1. package.json dependencies
+ * 2. Bundled index file
+ *
+ * @param client - AWS Lambda client instance
+ * @param options - Scan configuration options
+ * @returns Scan results including SDK v2 detection status and location
+ */
+export const getLambdaFunctionScanOutput = async (client, { functionName, region, runtime, sdkVersionRange }) => {
     const output = {
         FunctionName: functionName,
         Region: region,
+        Runtime: runtime,
+        SdkVersion: sdkVersionRange,
         ContainsAwsSdkJsV2: null,
     };
     const response = await client.getFunction({ FunctionName: functionName });
@@ -22,10 +36,9 @@ export const getLambdaFunctionScanOutput = async (client, { functionName, region
         lambdaFunctionContents = await getLambdaFunctionContents(zipPath);
     }
     catch (error) {
+        const errorPrefix = "Error downloading or reading Lambda function code";
         output.AwsSdkJsV2Error =
-            error instanceof Error
-                ? `Error downloading or reading Lambda function code: ${error.message}`
-                : "Error downloading or reading Lambda function code.";
+            error instanceof Error ? `${errorPrefix}: ${error.message}` : errorPrefix;
         return output;
     }
     finally {
@@ -39,6 +52,17 @@ export const getLambdaFunctionScanOutput = async (client, { functionName, region
                 const packageJson = JSON.parse(packageJsonContent);
                 const dependencies = packageJson.dependencies || {};
                 if ("aws-sdk" in dependencies) {
+                    try {
+                        if (!satisfies(dependencies["aws-sdk"], sdkVersionRange)) {
+                            continue;
+                        }
+                    }
+                    catch (error) {
+                        const errorPrefix = `Error checking version range '${sdkVersionRange}' for aws-sdk@${dependencies["aws-sdk"]} in '${packageJsonPath}'`;
+                        output.AwsSdkJsV2Error =
+                            error instanceof Error ? `${errorPrefix}: ${error.message}` : errorPrefix;
+                        return output;
+                    }
                     output.ContainsAwsSdkJsV2 = true;
                     output.AwsSdkJsV2Location = `Defined in dependencies of '${packageJsonPath}'`;
                     return output;
@@ -53,10 +77,20 @@ export const getLambdaFunctionScanOutput = async (client, { functionName, region
         }
     }
     // Check for code of "aws-sdk" in bundle, if not found in package.json dependencies.
-    if (bundleFile && hasSdkV2InBundle(bundleFile.content)) {
-        output.ContainsAwsSdkJsV2 = true;
-        output.AwsSdkJsV2Location = `Bundled in '${bundleFile.path}'`;
-        return output;
+    if (bundleFile) {
+        try {
+            if (hasSdkV2InBundle(bundleFile.content, sdkVersionRange)) {
+                output.ContainsAwsSdkJsV2 = true;
+                output.AwsSdkJsV2Location = `Bundled in '${bundleFile.path}'`;
+                return output;
+            }
+        }
+        catch (error) {
+            const errorPrefix = `Error reading bundle '${bundleFile.path}' for aws-sdk@${sdkVersionRange}`;
+            output.AwsSdkJsV2Error =
+                error instanceof Error ? `${errorPrefix}: ${error.message}` : errorPrefix;
+            return output;
+        }
     }
     // "aws-sdk" dependency/code not found.
     output.ContainsAwsSdkJsV2 = false;

package/dist/utils/getLambdaFunctions.js

@@ -3,17 +3,19 @@ import { paginateListFunctions } from "@aws-sdk/client-lambda";
  * Retrieves all Lambda functions with Node.js runtime from AWS
  *
  * @param client - AWS Lambda client instance
+ * @param lambdaNodeJsMajorVersions - Array of Node.js major versions to filter (e.g., ["18", "20"])
  * @returns Promise that resolves to array of Lambda function configurations
  * @description
  * - Uses AWS SDK v3 pagination to handle large number of functions
- * - Filters results to only include Node.js runtimes
+ * - Filters results to only include specified Node.js runtimes
  * - Returns empty array if no functions found
  */
-export const getLambdaFunctions = async (client) => {
+export const getLambdaFunctions = async (client, lambdaNodeJsMajorVersions) => {
     const functions = [];
+    const lambdaNodeJsIdentifiers = lambdaNodeJsMajorVersions.map((version) => `nodejs${version}.x`);
     const paginator = paginateListFunctions({ client }, {});
     for await (const page of paginator) {
-        functions.push(...(page.Functions ?? []).filter((fn) => fn.Runtime?.startsWith("nodejs")));
+        functions.push(...(page.Functions ?? []).filter((fn) => lambdaNodeJsIdentifiers.includes(fn.Runtime ?? "")));
     }
     return functions;
 };

package/dist/utils/getLambdaNodeJsMatchingVersions.js

@@ -0,0 +1,17 @@
+import { satisfies } from "compare-versions";
+// Refs: https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html
+export const LambdaNodeJsMajorVersions = ["10", "12", "14", "16", "18", "20", "22", "24"];
+/**
+ * Returns Lambda Node.js major versions that satisfy the given semver range.
+ * @param semverRange - A valid semver range string (e.g., ">=18")
+ * @returns Array of matching Node.js major version strings supported by Lambda
+ */
+export const getLambdaNodeJsMatchingVersions = (semverRange) => {
+    const matchingVersions = [];
+    for (const nodejsVersion of LambdaNodeJsMajorVersions) {
+        if (satisfies(nodejsVersion, semverRange)) {
+            matchingVersions.push(nodejsVersion);
+        }
+    }
+    return matchingVersions;
+};

package/dist/utils/hasSdkV2InBundle.js

@@ -1,3 +1,4 @@
+import { satisfies } from "compare-versions";
 const AWS_SDK_ENV_VARS = [
     "AWS_CONFIG_FILE",
     // "AWS_CONTAINER_AUTHORIZATION_TOKEN", // Tree shaken by esbuild
@@ -32,13 +33,23 @@ const AWS_SDK_ENV_VARS = [
  * Checks if AWS SDK v2 is present in the provided bundle content by looking for specific environment variables.
  *
  * @param bundleContent - The string content of the bundle to check.
+ * @param sdkVersionRange - Semver range string to check for AWS SDK for JavaScript v2
  * @returns boolean - Returns true if all AWS SDK v2 environment variables are found in the bundle content, false otherwise.
  */
-export const hasSdkV2InBundle = (bundleContent) => {
+export const hasSdkV2InBundle = (bundleContent, sdkVersionRange) => {
     for (const envVar of AWS_SDK_ENV_VARS) {
         if (!bundleContent.includes(envVar)) {
             return false;
         }
     }
-    return true;
+    // Get version number from `VERSION:'2.X.Y'` or `VERSION: '2.X.Y'`, including double quotes and backticks.
+    const matches = bundleContent.match(/VERSION:\s*(['"`])(2\.\d+\.\d+)\1/);
+    if (matches && matches[2]) {
+        const version = matches[2];
+        // If version is in the specified range, return true
+        if (satisfies(version, sdkVersionRange)) {
+            return true;
+        }
+    }
+    return false;
 };

package/dist/utils/printLambdaCommandOutput.js

@@ -13,7 +13,7 @@ export const printLambdaCommandOutput = (output, outputType) => {
     }
     // Output as table
     const table = new Table({
-        head: ["FunctionName", "Region", "ContainsAwsSdkJsV2"],
+        head: ["FunctionName", "Region", "Runtime", "SdkVersion", "ContainsAwsSdkJsV2"],
         style: { head: ["bold"] },
     });
     for (const scanOutput of output) {
@@ -28,7 +28,13 @@ export const printLambdaCommandOutput = (output, outputType) => {
         if (scanOutput.AwsSdkJsV2Location !== undefined) {
             notes += ` ${scanOutput.AwsSdkJsV2Location}`;
         }
-        table.push([scanOutput.FunctionName, scanOutput.Region, notes]);
+        table.push([
+            scanOutput.FunctionName,
+            scanOutput.Region,
+            scanOutput.Runtime,
+            scanOutput.SdkVersion,
+            notes,
+        ]);
     }
     console.log(table.toString());
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/find-v2",
-  "version": "0.4.3",
+  "version": "0.6.0",
   "description": "CLI to find resources which call AWS using JavaScript SDK v2",
   "main": "dist/cli.js",
   "types": "dist/cli.d.ts",
@@ -9,6 +9,7 @@
     "@aws-sdk/client-lambda": "^3.942.0",
     "cli-table3": "^0.6.5",
     "commander": "^14.0.2",
+    "compare-versions": "^6.1.1",
     "node-stream-zip": "^1.15.0",
     "p-limit": "^7.2.0"
   },
@@ -24,12 +25,12 @@
     "@tsconfig/node-ts": "^23.6.2",
     "@tsconfig/node20": "^20.1.8",
     "@types/node": "^20.14.8",
-    "aws-sdk": "^2.1692.0",
+    "aws-sdk": "2.1693.0",
     "esbuild": "~0.27.1",
-    "oxfmt": "^0.18.0",
+    "oxfmt": "^0.21.0",
     "oxlint": "^1.33.0",
     "parcel": "^2.16.3",
-    "rolldown": "1.0.0-beta.54",
+    "rolldown": "1.0.0-beta.58",
     "rollup": "^4.53.3",
     "typescript": "^5.9.3",
     "vitest": "^4.0.15",