@meyicloud/meyi-cost-server 1.8.6 → 1.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meyicloud/meyi-cost-server",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "description": "Tenant-aware AWS CUR and Athena cost plugin server for MeyiConnect",
   "type": "module",
   "main": "./index.js",

package/src/services/cur.service.js

@@ -112,27 +112,37 @@ function rangeWhere(range) {
     AND CAST(line_item_usage_start_date AS TIMESTAMP) < TIMESTAMP ${sqlString(`${range.End} 00:00:00`)}`;
 }
 
-function inCondition(column, values = []) {
+function inCondition(column, values = []) {
   if (!values.length) return "";
   return `AND CAST("${column}" AS VARCHAR) IN (${values.map(sqlString).join(", ")})`;
-}
-
-function cur2TagExpression(tagKey) {
-  const key = String(tagKey || "Name").trim();
-  if (!key) throw new Error("Invalid CUR tag key");
-  return `COALESCE(element_at(resource_tags, ${sqlString(`user:${key.replace(/^user:/, "")}`)}), element_at(resource_tags, ${sqlString(key.replace(/^user:/, ""))}))`;
-}
+}
+
+function cur2TagExpression(tagKey) {
+  const key = String(tagKey || "").trim();
+  if (!key) throw new Error("Invalid CUR tag key");
+  const plainKey = key.replace(/^(?:user:|resourceTags\/)/, "");
+  const candidates = key.includes("/")
+    ? [key]
+    : [`resourceTags/${plainKey}`, `user:${plainKey}`, plainKey];
+  return `COALESCE(${[...new Set(candidates)].map((candidate) => `element_at(resource_tags, ${sqlString(candidate)})`).join(", ")})`;
+}
+
+const regionExpression = `COALESCE(
+  NULLIF(TRIM(CAST(product_region_code AS VARCHAR)), ''),
+  NULLIF(regexp_extract(COALESCE(line_item_resource_id, ''), '^arn:[^:]+:[^:]+:([^:]+):', 1), ''),
+  'Region unavailable in CUR'
+)`;
 
 function inExpression(expression, values = []) {
   if (!values.length) return "";
   return `AND CAST(${expression} AS VARCHAR) IN (${values.map(sqlString).join(", ")})`;
 }
 
-function filterWhere(filters = {}) {
-  const conditions = [
-    inCondition("product_product_name", filters.services),
-    inCondition("product_region_code", filters.regions),
-    inCondition("line_item_usage_account_id", filters.accountIds),
+function filterWhere(filters = {}) {
+  const conditions = [
+    inCondition("product_product_name", filters.services),
+    inExpression(regionExpression, filters.regions),
+    inCondition("line_item_usage_account_id", filters.accountIds),
   ];
   if (filters.tagKey && filters.tagValues?.length) {
     conditions.push(inExpression(cur2TagExpression(filters.tagKey), filters.tagValues));
@@ -141,14 +151,15 @@ function filterWhere(filters = {}) {
 }
 
 function dimensionExpression(groupBy, tagKey) {
-  const dimensions = {
-    service: "product_product_name",
-    account: "line_item_usage_account_id",
-    region: "product_region_code",
-    resource: "line_item_resource_id",
-  };
-  if (groupBy === "tag") return cur2TagExpression(tagKey);
-  return dimensions[groupBy] ? `"${dimensions[groupBy]}"` : undefined;
+  const dimensions = {
+    service: "product_product_name",
+    account: "line_item_usage_account_id",
+    region: regionExpression,
+    resource: "line_item_resource_id",
+  };
+  if (groupBy === "tag") return cur2TagExpression(tagKey);
+  if (groupBy === "region") return dimensions.region;
+  return dimensions[groupBy] ? `"${dimensions[groupBy]}"` : undefined;
 }
 
 function summarize(periods, accountNames = new Map()) {
@@ -166,7 +177,7 @@ function summarize(periods, accountNames = new Map()) {
     .sort((a, b) => b.amount - a.amount);
 }
 
-export async function getCurReport({ client, config, tenant, range, groupBy, granularity = "MONTHLY", tagKey, accountNames = new Map(), filters = {}, includeBreakdown = false }) {
+export async function getCurReport({ client, config, tenant, range, groupBy, granularity = "MONTHLY", tagKey, accountNames = new Map(), filters = {}, includeBreakdown = false }) {
   const column = dimensionExpression(groupBy, tagKey);
   if (!column) throw new Error("Unsupported CUR report group");
   const bucket = granularity === "DAILY" ? "day" : "month";
@@ -178,9 +189,10 @@ export async function getCurReport({ client, config, tenant, range, groupBy, gra
       CAST(SUM(line_item_unblended_cost) AS DOUBLE) AS amount
     FROM ${table(config)}
     WHERE ${sourceWhere(config, tenant)}
-      AND ${rangeWhere(range)}
-      AND line_item_unblended_cost > 0
-      ${filterWhere(filters)}
+      AND ${rangeWhere(range)}
+      AND line_item_unblended_cost > 0
+      ${groupBy === "tag" ? `AND NULLIF(TRIM(CAST(${column} AS VARCHAR)), '') IS NOT NULL` : ""}
+      ${filterWhere(filters)}
     GROUP BY 1, 2
     ORDER BY 1, 3 DESC
     ${limit}
@@ -188,18 +200,19 @@ export async function getCurReport({ client, config, tenant, range, groupBy, gra
   const rows = await execute(client, config, query);
   const periods = rows.map((row) => ({ start: String(row.period_start).slice(0, 10), key: row.item_key || "Unallocated", amount: amount(row.amount) }));
   let summary = summarize(periods, accountNames);
-  if (includeBreakdown && groupBy !== "resource") {
+  if (includeBreakdown) {
     const relationQuery = `
       SELECT
         COALESCE(NULLIF(CAST(${column} AS VARCHAR), ''), 'Unallocated') AS item_key,
         COALESCE(NULLIF(CAST(line_item_usage_account_id AS VARCHAR), ''), 'Unallocated') AS account_key,
-        COALESCE(NULLIF(CAST(product_region_code AS VARCHAR), ''), 'GLOBAL') AS region_key,
+        ${regionExpression} AS region_key,
         CAST(SUM(line_item_unblended_cost) AS DOUBLE) AS amount
       FROM ${table(config)}
       WHERE ${sourceWhere(config, tenant)}
-        AND ${rangeWhere(range)}
-        AND line_item_unblended_cost > 0
-        ${filterWhere(filters)}
+        AND ${rangeWhere(range)}
+        AND line_item_unblended_cost > 0
+        ${groupBy === "tag" ? `AND NULLIF(TRIM(CAST(${column} AS VARCHAR)), '') IS NOT NULL` : ""}
+        ${filterWhere(filters)}
       GROUP BY 1, 2, 3
     `;
     const relationRows = await execute(client, config, relationQuery);
@@ -213,7 +226,7 @@ export async function getCurReport({ client, config, tenant, range, groupBy, gra
         values.set(relationKey, (values.get(relationKey) || 0) + amount(row.amount));
       };
       add(accountsByItem, row.account_key || "Unallocated");
-      add(regionsByItem, row.region_key || "GLOBAL");
+      add(regionsByItem, row.region_key || "Region unavailable in CUR");
     }
     const relations = (target, key, type) => [...(target.get(key) || new Map()).entries()].map(([value, cost]) => ({ key: value, label: type === "account" ? accountNames.get(value) || value : value, amount: round(cost) })).sort((a, b) => b.amount - a.amount);
     summary = summary.map((item) => ({ ...item, accounts: relations(accountsByItem, item.key, "account"), regions: relations(regionsByItem, item.key, "region") }));
@@ -302,7 +315,7 @@ export async function getCurOverview({ client, config, tenant, range, trendRange
   };
 }
 
-export async function getCurTags({ client, config, tenant }) {
+export async function getCurTags({ client, config, tenant }) {
   if (!tenant) throw new Error("A tenant is required to list CUR tags");
   const query = `
     SELECT DISTINCT tag_key
@@ -314,8 +327,10 @@ export async function getCurTags({ client, config, tenant }) {
     ORDER BY tag_key
   `;
   const rows = await execute(client, config, query);
-  return rows.map((row) => String(row.tag_key || "").replace(/^user:/, "")).filter(Boolean);
-}
+  return rows
+    .map((row) => String(row.tag_key || "").replace(/^(?:user:|resourceTags\/)/, ""))
+    .filter(Boolean);
+}
 
 export async function getCurFilterOptions({ client, config, tenant, range, tagKey, accountNames = new Map() }) {
   const distinct = async (column) => execute(client, config, `
@@ -328,9 +343,16 @@ export async function getCurFilterOptions({ client, config, tenant, range, tagKe
       AND TRIM(CAST("${column}" AS VARCHAR)) <> ''
     ORDER BY 1
   `);
-  const [services, regions, accounts, tags] = await Promise.all([
-    distinct("product_product_name"),
-    distinct("product_region_code"),
+  const [services, regions, accounts, tags] = await Promise.all([
+    distinct("product_product_name"),
+    execute(client, config, `
+      SELECT DISTINCT CAST(${regionExpression} AS VARCHAR) AS value
+      FROM ${table(config)}
+      WHERE ${sourceWhere(config, tenant)}
+        AND ${rangeWhere(range)}
+        AND line_item_unblended_cost > 0
+      ORDER BY 1
+    `),
     distinct("line_item_usage_account_id"),
     getCurTags({ client, config, tenant }),
   ]);

package/src/workers/cost-analysis-report.worker.js

@@ -7,7 +7,13 @@ export class CostAnalysisReportWorker {
     this.logger = logger;
     this.enabled = String(env.COST_AI_ENABLED || "").toLowerCase() === "true";
     this.pollMs = Math.max(Number(env.COST_AI_REPORT_POLL_INTERVAL_MS || 60_000), 10_000);
-    this.leaseMs = Math.max(Number(env.COST_AI_REPORT_LEASE_MS || 30 * 60_000), 60_000);
+    // Must exceed COST_AI_ANALYSER_TIMEOUT_MS (45 min). claimDue holds a
+    // schedule by pushing next_run_at forward by the lease; run() releases it
+    // on every exit path, so the value only matters when the process dies
+    // mid-run. A lease shorter than the analyser timeout lets a second worker
+    // re-claim a schedule whose Fargate task is still running - a duplicate
+    // report row and a duplicate billed model run.
+    this.leaseMs = Math.max(Number(env.COST_AI_REPORT_LEASE_MS || 60 * 60_000), 60_000);
     this.batchSize = Math.min(Math.max(Number(env.COST_AI_REPORT_BATCH_SIZE || 5), 1), 25);
     this.running = false;
     this.timer = null;