cloudburn 0.8.5 → 0.9.0

package/README.md

@@ -64,8 +64,10 @@ cloudburn discover
 cloudburn discover --region eu-central-1
 cloudburn discover --region all
 cloudburn discover --config .cloudburn.yml --enabled-rules CLDBRN-AWS-EBS-1
+cloudburn discover --service ec2,s3
 cloudburn discover list-enabled-regions --format text
 cloudburn rules list
+cloudburn rules list --service ec2 --source discovery
 ```
 
 `cloudburn discover --region all` needs an AWS Resource Explorer aggregator and an unfiltered default view in the aggregator region.

package/dist/cli.js

@@ -543,7 +543,7 @@ var getScanDiagnostics = (result) => result.diagnostics ?? [];
 var DEFAULT_TABLE_WIDTH = 200;
 var MIN_COLUMN_WIDTH = 4;
 var PREFERRED_MIN_COLUMN_WIDTH = 8;
-var supportedOutputFormats = ["text", "json", "table"];
+var supportedOutputFormats = ["json", "table"];
 var scanColumns = [
   { key: "provider", header: "Provider" },
   { key: "ruleId", header: "RuleId" },
@@ -557,7 +557,15 @@ var scanColumns = [
   { key: "column", header: "Column" },
   { key: "message", header: "Message" }
 ];
-var formatOptionDescription = "Options: table: human-readable terminal output.\ntext: tab-delimited output for grep, sed, and awk.\njson: machine-readable output for automation and downstream systems.";
+var ruleListColumns = [
+  { key: "ruleId", header: "RuleId" },
+  { key: "provider", header: "Provider" },
+  { key: "service", header: "Service" },
+  { key: "supports", header: "Supports" },
+  { key: "name", header: "Name" },
+  { key: "description", header: "Description" }
+];
+var formatOptionDescription = "Options: table: human-readable terminal output.\njson: machine-readable output for automation and downstream systems.";
 var OUTPUT_FORMAT_OPTION_DESCRIPTION = formatOptionDescription;
 var parseOutputFormat = (value) => {
   if (supportedOutputFormats.includes(value)) {
@@ -576,8 +584,6 @@ var renderResponse = (response, format) => {
   switch (format) {
     case "json":
       return renderJson(response);
-    case "text":
-      return renderText(response);
     case "table":
       return renderTable(response);
   }
@@ -600,25 +606,6 @@ var renderJson = (response) => {
       return JSON.stringify(response.values, null, 2);
   }
 };
-var renderText = (response) => {
-  switch (response.kind) {
-    case "document":
-      return response.content;
-    case "discovery-status":
-      return `${response.summaryText}
-${renderTextRows(response.rows, response.columns, "No discovery status available.")}`;
-    case "record-list":
-      return renderTextRows(response.rows, response.columns, response.emptyMessage);
-    case "rule-list":
-      return renderRuleList(response.rules, response.emptyMessage);
-    case "scan-result":
-      return renderTextRows(projectScanRows(response.result), scanColumns, "No findings.");
-    case "status":
-      return response.text;
-    case "string-list":
-      return response.values.length === 0 ? response.emptyMessage : response.values.join("\n");
-  }
-};
 var renderTable = (response) => {
   switch (response.kind) {
     case "document":
@@ -648,7 +635,7 @@ ${regionsTable}`;
     case "record-list":
       return response.rows.length === 0 ? response.emptyMessage : renderAsciiTable(response.rows, response.columns ?? inferColumns(response.rows));
     case "rule-list":
-      return renderRuleList(response.rules, response.emptyMessage);
+      return renderRuleTable(response.rules, response.emptyMessage);
     case "scan-result": {
       const rows = projectScanRows(response.result);
       return rows.length === 0 ? "No findings." : renderAsciiTable(rows, scanColumns);
@@ -696,39 +683,27 @@ var projectScanRows = (result) => [
     source: diagnostic.source
   }))
 ];
-var renderTextRows = (rows, columns, emptyMessage) => {
-  if (rows.length === 0) {
-    return emptyMessage;
-  }
-  const resolvedColumns = columns ?? inferColumns(rows);
-  return rows.map((row) => resolvedColumns.map((column) => toTextCell(row[column.key])).join("	")).join("\n");
-};
 var inferColumns = (rows) => {
   const keys = Array.from(new Set(rows.flatMap((row) => Object.keys(row)))).sort(
     (left, right) => left.localeCompare(right)
   );
   return keys.map((key) => ({ key, header: key }));
 };
-var renderRuleList = (rules, emptyMessage) => {
+var renderRuleTable = (rules, emptyMessage) => {
   if (rules.length === 0) {
     return emptyMessage;
   }
-  let currentProvider = "";
-  let currentService = "";
-  const lines = [];
-  for (const rule of rules) {
-    if (rule.provider !== currentProvider) {
-      currentProvider = rule.provider;
-      currentService = "";
-      lines.push(rule.provider);
-    }
-    if (rule.service !== currentService) {
-      currentService = rule.service;
-      lines.push(`  ${rule.service}`);
-    }
-    lines.push(`    ${rule.id}: ${rule.description}`);
-  }
-  return lines.join("\n");
+  return renderAsciiTable(
+    rules.map((rule) => ({
+      description: rule.description,
+      name: rule.name,
+      provider: rule.provider,
+      ruleId: rule.id,
+      service: rule.service,
+      supports: rule.supports
+    })),
+    ruleListColumns
+  );
 };
 var toTextCell = (value) => {
   if (value === null || value === void 0) {
@@ -857,21 +832,38 @@ var renderAsciiTable = (rows, columns) => {
 };
 
 // src/commands/config-options.ts
+import { builtInRuleMetadata } from "@cloudburn/sdk";
 import { InvalidArgumentError as InvalidArgumentError2 } from "commander";
+var parseCommaSeparatedList = (value, itemLabel) => {
+  const items = value.split(",").map((item) => item.trim()).filter((item) => item.length > 0);
+  if (items.length === 0) {
+    throw new InvalidArgumentError2(`Provide at least one ${itemLabel}.`);
+  }
+  return items;
+};
 var parseRuleIdList = (value) => {
-  const ruleIds = value.split(",").map((ruleId) => ruleId.trim()).filter((ruleId) => ruleId.length > 0);
-  if (ruleIds.length === 0) {
-    throw new InvalidArgumentError2("Provide at least one rule ID.");
+  return parseCommaSeparatedList(value, "rule ID");
+};
+var parseServiceList = (value) => parseCommaSeparatedList(value, "service").map((service) => service.toLowerCase());
+var parseSourceList = (value) => parseCommaSeparatedList(value, "source").map((source) => source.toLowerCase());
+var validateServiceList = (mode, services) => {
+  if (services === void 0) {
+    return void 0;
   }
-  return ruleIds;
+  const validServices = new Set(
+    builtInRuleMetadata.filter((rule) => rule.supports.includes(mode)).map((rule) => rule.service)
+  );
+  const invalidService = services.find((service) => !validServices.has(service));
+  if (invalidService) {
+    throw new InvalidArgumentError2(
+      `Unknown service "${invalidService}" for ${mode}. Allowed services: ${Array.from(validServices).sort().join(", ")}.`
+    );
+  }
+  return services;
 };
 
 // src/commands/discover.ts
-var describeDiscoverySummary = (status) => {
-  const aggregatorSummary = status.aggregatorRegion ? ` Aggregator region: ${status.aggregatorRegion}.` : "";
-  const warningSummary = status.warning ? ` ${status.warning}` : "";
-  return `Coverage: ${status.coverage}. Indexed ${status.indexedRegionCount} of ${status.totalRegionCount} enabled regions.${aggregatorSummary}${warningSummary}`.trim();
-};
+var parseDiscoveryServiceList = (value) => validateServiceList("discovery", parseServiceList(value)) ?? [];
 var describeInitializationMessage = (result) => {
   const baseMessage = result.indexType === "aggregator" ? result.aggregatorAction === "promoted" ? `Promoted the existing local Resource Explorer index in ${result.aggregatorRegion} to the aggregator.` : result.aggregatorAction === "created" ? `Configured ${result.aggregatorRegion} as the Resource Explorer aggregator.` : result.coverage === "full" ? `Resource Explorer aggregator already exists in ${result.aggregatorRegion}.` : `Resource Explorer aggregator already exists in ${result.aggregatorRegion}, but only ${result.observedStatus.indexedRegionCount} of ${result.observedStatus.totalRegionCount} regions are indexed.` : result.status === "EXISTING" ? `Local Resource Explorer setup already exists in ${result.aggregatorRegion}.` : `Local Resource Explorer setup created in ${result.aggregatorRegion}.`;
   const indexSummaryParts = [];
@@ -945,13 +937,14 @@ var parseDiscoverRegion = (value) => {
 };
 var resolveDiscoveryTarget = (region) => region === void 0 ? { mode: "current" } : region === "all" ? { mode: "all" } : { mode: "region", region };
 var toDiscoveryConfigOverride = (options) => {
-  if (options.enabledRules === void 0 && options.disabledRules === void 0) {
+  if (options.enabledRules === void 0 && options.disabledRules === void 0 && options.service === void 0) {
     return void 0;
   }
   return {
     discovery: {
       disabledRules: options.disabledRules,
-      enabledRules: options.enabledRules
+      enabledRules: options.enabledRules,
+      services: options.service
     }
   };
 };
@@ -978,14 +971,18 @@ var registerDiscoverCommand = (program) => {
       "--disabled-rules <ruleIds>",
       "Comma-separated rule IDs to disable. By default, all rules are enabled; use this to exclude specific rules.",
       parseRuleIdList
+    ).option(
+      "--service <services>",
+      "Comma-separated services to include in the discovery rule set.",
+      parseDiscoveryServiceList
     ).option("--exit-code", "Exit with code 1 when findings exist").action(async (options, command) => {
       await runCommand(async () => {
         const scanner = new CloudBurnClient();
+        const configOverride = toDiscoveryConfigOverride(options);
         const loadedConfig = await scanner.loadConfig(options.config);
         const discoveryOptions = {
           target: resolveDiscoveryTarget(options.region)
         };
-        const configOverride = toDiscoveryConfigOverride(options);
         if (configOverride !== void 0) {
           discoveryOptions.config = configOverride;
         }
@@ -1055,8 +1052,7 @@ var registerDiscoverCommand = (program) => {
             { key: "notes", header: "Notes" }
           ],
           rows,
-          summary,
-          summaryText: describeDiscoverySummary(status)
+          summary
         },
         format
       );
@@ -1102,8 +1098,7 @@ var registerDiscoverCommand = (program) => {
       const output = renderResponse(
         {
           kind: "status",
-          data: buildInitializationStatusData(result, message, format),
-          text: message
+          data: buildInitializationStatusData(result, message, format)
         },
         format
       );
@@ -1151,8 +1146,7 @@ var registerEstimateCommand = (program) => {
             message: "No server configured. This command is optional and requires a dashboard URL.",
             server: "",
             status: "NOT_CONFIGURED"
-          },
-          text: "No server configured. This command is optional and requires a dashboard URL."
+          }
         },
         format
       );
@@ -1167,8 +1161,7 @@ var registerEstimateCommand = (program) => {
           message: `Estimate request scaffold ready for server: ${options.server}`,
           server: options.server,
           status: "READY"
-        },
-        text: `Estimate request scaffold ready for server: ${options.server}`
+        }
       },
       format
     );
@@ -1184,12 +1177,16 @@ var CONFIG_FILENAMES = [".cloudburn.yml", ".cloudburn.yaml"];
 var starterConfig = `# Static IaC scan configuration.
 # enabled-rules restricts scans to only the listed rule IDs.
 # disabled-rules removes specific rule IDs from the active set.
+# services restricts scans to rules for the listed services.
 # format sets the default output format when --format is not passed.
 iac:
   enabled-rules:
     - CLDBRN-AWS-EBS-1
   disabled-rules:
     - CLDBRN-AWS-EC2-2
+  services:
+    - ebs
+    - ec2
   format: table
 
 # Live AWS discovery configuration.
@@ -1199,16 +1196,29 @@ discovery:
     - CLDBRN-AWS-EBS-1
   disabled-rules:
     - CLDBRN-AWS-S3-1
+  services:
+    - ebs
+    - s3
   format: json
 `;
-var renderStarterConfig = (command) => renderResponse(
-  {
-    kind: "document",
-    content: starterConfig,
-    contentType: "application/yaml"
-  },
-  resolveOutputFormat(command, void 0, "text")
-);
+var resolveExplicitOutputFormat = (command) => {
+  const options = typeof command.optsWithGlobals === "function" ? command.optsWithGlobals() : command.opts();
+  return options.format;
+};
+var renderStarterConfig = (command) => {
+  const explicitFormat = resolveExplicitOutputFormat(command);
+  if (explicitFormat === void 0) {
+    return starterConfig;
+  }
+  return renderResponse(
+    {
+      kind: "document",
+      content: starterConfig,
+      contentType: "application/yaml"
+    },
+    explicitFormat
+  );
+};
 var fileExists = async (path) => {
   try {
     await access(path);
@@ -1264,8 +1274,7 @@ var registerInitCommand = (program) => {
           data: {
             message: "Created CloudBurn config.",
             path: configPath
-          },
-          text: `Created ${configPath}.`
+          }
         },
         resolveOutputFormat(this)
       );
@@ -1281,17 +1290,41 @@ var registerInitCommand = (program) => {
 };
 
 // src/commands/rules-list.ts
-import { builtInRuleMetadata } from "@cloudburn/sdk";
+import { builtInRuleMetadata as builtInRuleMetadata2 } from "@cloudburn/sdk";
+import { InvalidArgumentError as InvalidArgumentError4 } from "commander";
+var VALID_SOURCES = ["discovery", "iac"];
+var validateSelectedValues = (values, validValues, label) => {
+  const invalidValue = values.find((value) => !validValues.has(value));
+  if (invalidValue !== void 0) {
+    throw new InvalidArgumentError4(
+      `Unknown ${label} "${invalidValue}". Allowed ${label}s: ${Array.from(validValues).sort().join(", ")}.`
+    );
+  }
+  return values;
+};
+var parseRulesListServiceList = (value) => validateSelectedValues(parseServiceList(value), new Set(builtInRuleMetadata2.map((rule) => rule.service)), "service");
+var parseRulesListSourceList = (value) => validateSelectedValues(parseSourceList(value), new Set(VALID_SOURCES), "source");
+var filterRules = (options) => {
+  return builtInRuleMetadata2.filter((rule) => {
+    if (options.service !== void 0 && !options.service.includes(rule.service)) {
+      return false;
+    }
+    if (options.source !== void 0 && !options.source.some((source) => rule.supports.includes(source))) {
+      return false;
+    }
+    return true;
+  });
+};
 var registerRulesListCommand = (program) => {
   const rulesCommand = registerParentCommand(program, "rules", "Inspect built-in CloudBurn rules");
-  rulesCommand.command("list").description("List built-in CloudBurn rules").action(function() {
+  rulesCommand.command("list").description("List built-in CloudBurn rules").option("--service <services>", "Comma-separated services to include.", parseRulesListServiceList).option("--source <sources>", "Comma-separated sources to include (`iac`, `discovery`).", parseRulesListSourceList).action(function(options) {
     const output = renderResponse(
       {
         kind: "rule-list",
         emptyMessage: "No built-in rules are available.",
-        rules: builtInRuleMetadata
+        rules: filterRules(options)
       },
-      resolveOutputFormat(this, void 0, "text")
+      resolveOutputFormat(this, void 0, "table")
     );
     process.stdout.write(`${output}
 `);
@@ -1300,14 +1333,16 @@ var registerRulesListCommand = (program) => {
 
 // src/commands/scan.ts
 import { CloudBurnClient as CloudBurnClient2 } from "@cloudburn/sdk";
+var parseIaCServiceList = (value) => validateServiceList("iac", parseServiceList(value)) ?? [];
 var toScanConfigOverride = (options) => {
-  if (options.enabledRules === void 0 && options.disabledRules === void 0) {
+  if (options.enabledRules === void 0 && options.disabledRules === void 0 && options.service === void 0) {
     return void 0;
   }
   return {
     iac: {
       disabledRules: options.disabledRules,
-      enabledRules: options.enabledRules
+      enabledRules: options.enabledRules,
+      services: options.service
     }
   };
 };
@@ -1321,11 +1356,11 @@ var registerScanCommand = (program) => {
       "--disabled-rules <ruleIds>",
       "Comma-separated rule IDs to disable. By default, all rules are enabled; use this to exclude specific rules.",
       parseRuleIdList
-    ).option("--exit-code", "Exit with code 1 when findings exist").action(async (path, options, command) => {
+    ).option("--service <services>", "Comma-separated services to include in the scan rule set.", parseIaCServiceList).option("--exit-code", "Exit with code 1 when findings exist").action(async (path, options, command) => {
       try {
         const scanner = new CloudBurnClient2();
-        const loadedConfig = await scanner.loadConfig(options.config);
         const configOverride = toScanConfigOverride(options);
+        const loadedConfig = await scanner.loadConfig(options.config);
         const scanPath = path ?? process.cwd();
         const result = configOverride === void 0 && options.config === void 0 ? await scanner.scanStatic(scanPath) : options.config === void 0 ? await scanner.scanStatic(scanPath, configOverride) : await scanner.scanStatic(scanPath, configOverride, { configPath: options.config });
         const format = resolveOutputFormat(command, void 0, loadedConfig.iac.format ?? "table");
@@ -1363,7 +1398,7 @@ var isCliEntrypoint = (moduleUrl, argvEntry = process.argv[1]) => {
 };
 var createProgram = () => {
   const program = createCliCommand();
-  program.name("cloudburn").usage("[command]").description("Know what you spend. Fix what you waste.").version("0.8.5").option("--format <format>", OUTPUT_FORMAT_OPTION_DESCRIPTION, parseOutputFormat);
+  program.name("cloudburn").usage("[command]").description("Know what you spend. Fix what you waste.").version("0.9.0").option("--format <format>", OUTPUT_FORMAT_OPTION_DESCRIPTION, parseOutputFormat);
   configureCliHelp(program);
   registerCompletionCommand(program);
   registerDiscoverCommand(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudburn",
-  "version": "0.8.5",
+  "version": "0.9.0",
   "description": "Cloudburn CLI for cloud cost optimization",
   "homepage": "https://cloudburn.io/docs",
   "bugs": {
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "commander": "^13.1.0",
-    "@cloudburn/sdk": "0.13.3"
+    "@cloudburn/sdk": "0.15.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.6",