@infrascan/cli 0.2.3 → 0.3.0

package/dist/index.mjs

@@ -69,44 +69,63 @@ var GraphCmd = class extends CommandLineAction {
 };
 
 // src/commands/scan.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-import { resolve as resolve2, join as join2 } from "path";
+import { writeFileSync as writeFileSync2 } from "fs";
+import { resolve as resolve3, join as join2 } from "path";
 import {
   CommandLineAction as CommandLineAction2
 } from "@rushstack/ts-command-line";
 import buildFsConnector2 from "@infrascan/fs-connector";
 import {
   fromIni,
+  fromNodeProviderChain,
   fromTemporaryCredentials
 } from "@aws-sdk/credential-providers";
+import {
+  loadSharedConfigFiles
+} from "@smithy/shared-ini-file-loader";
+
+// src/config.ts
+import { readFileSync as readFileSync2 } from "fs";
+import { resolve as resolve2 } from "path";
+import { env } from "process";
+import { DEFAULT_PROFILE } from "@smithy/shared-ini-file-loader";
 function getConfig(path) {
   const resolvedConfigPath = resolve2(path);
   return JSON.parse(readFileSync2(resolvedConfigPath, "utf8"));
 }
+function getDefaultRegion(parsedAwsConfig, currentProfile) {
+  const profile = currentProfile ?? env.AWS_PROFILE ?? DEFAULT_PROFILE;
+  return env.AWS_REGION ?? parsedAwsConfig?.[profile]?.region;
+}
+
+// src/commands/scan.ts
 function writeScanMetadata(outputDirectory, metadata) {
   writeFileSync2(
-    join2(resolve2(outputDirectory), "metadata.json"),
+    join2(resolve3(outputDirectory), "metadata.json"),
     JSON.stringify(metadata),
     "utf8"
   );
 }
-function resolveCredentials(profile, roleToAssume) {
+function resolveCredentialProvider(profile, roleToAssume) {
   if (profile) {
-    return fromIni({
-      profile
+    return (region) => fromIni({
+      profile,
+      clientConfig: { region }
     });
   }
   if (roleToAssume) {
-    return fromTemporaryCredentials({
+    return (region) => fromTemporaryCredentials({
       params: {
         RoleArn: roleToAssume,
         RoleSessionName: "infrascan-cli-scan"
-      }
+      },
+      clientConfig: { region }
     });
   }
-  throw new Error(
-    "An error occurred while resolving credentials for Infrascan \u2014 no profile or role given."
+  console.log(
+    "No profile or role given, falling back to default provider chain."
   );
+  return (region) => fromNodeProviderChain({ clientConfig: { region } });
 }
 var ScanCmd = class extends CommandLineAction2 {
   constructor(infrascanClient) {
@@ -122,8 +141,7 @@ var ScanCmd = class extends CommandLineAction2 {
       parameterLongName: "--config",
       parameterShortName: "-c",
       argumentName: "PATH_TO_CONFIG",
-      description: "Config to use for the scan.",
-      defaultValue: "./config.json"
+      description: "Config to use for the scan."
     });
     this._outputDirectory = this.defineStringParameter({
       parameterLongName: "--output",
@@ -132,20 +150,43 @@ var ScanCmd = class extends CommandLineAction2 {
       description: "Location to save scan output to.",
       defaultValue: "./state"
     });
+    this._regions = this.defineStringListParameter({
+      parameterLongName: "--region",
+      argumentName: "REGION_TO_SCAN",
+      description: "The region to scan. This flag can be provided many times e.g. --region us-east-1 --region eu-west-1"
+    });
   }
   async onExecute() {
-    const scanConfig = getConfig(this._config.value);
+    const awsConfig = await loadSharedConfigFiles().catch((err) => {
+      console.warn(
+        `Failed to load AWS config file, falling back to @infrascan/sdk defaults. (${err.message})`
+      );
+      return void 0;
+    });
+    const defaultRegionFromEnv = getDefaultRegion(awsConfig?.configFile);
+    const runtimeRegionsToScan = this._regions.values.length > 0 ? this._regions.values : void 0;
+    const scanConfig = this._config.value ? getConfig(this._config.value) : [
+      {
+        defaultRegion: defaultRegionFromEnv
+      }
+    ];
     const connector = buildFsConnector2(this._outputDirectory.value, {
       createTargetDirectory: true
     });
     const metadata = [];
     for (const accountConfig of scanConfig) {
-      const { profile, roleToAssume, regions } = accountConfig;
-      const credentials = resolveCredentials(profile, roleToAssume);
+      const {
+        profile,
+        roleToAssume,
+        regions,
+        defaultRegion: configDefaultRegion
+      } = accountConfig;
+      const credentials = resolveCredentialProvider(profile, roleToAssume);
+      const defaultRegion = configDefaultRegion ?? getDefaultRegion(awsConfig?.configFile, profile);
       const accountMetadata = await this.infrascanClient.performScan(
         credentials,
         connector,
-        { regions }
+        { regions: runtimeRegionsToScan ?? regions, defaultRegion }
       );
       metadata.push(accountMetadata);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrascan/cli",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Thin command line wrapper around the infrascan sdk",
   "main": "dist/index.mjs",
   "scripts": {
@@ -39,13 +39,15 @@
     "@aws-sdk/credential-providers": "3.428.0",
     "@infrascan/aws": "^0.3.0",
     "@infrascan/fs-connector": "^0.2.2",
-    "@infrascan/sdk": "^0.2.2",
+    "@infrascan/sdk": "^0.3.1",
     "@rushstack/ts-command-line": "^4.15.2",
+    "@smithy/shared-ini-file-loader": "^2.2.2",
     "minimatch": "^6.1.6"
   },
   "devDependencies": {
     "@aws-sdk/types": "3.428.0",
     "@infrascan/shared-types": "^0.2.2",
+    "@smithy/types": "^2.4.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.3"
   }