@freshworks/shiftleft-tools 1.1.13 → 1.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freshworks/shiftleft-tools",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "CLI for managing Cursor rules/skills and Postman test infrastructure across Java Spring Boot and Node.js/Express projects",
   "type": "module",
   "main": "src/index.js",

package/templates/postman/scripts/lib/report_consolidated.py

@@ -135,7 +135,19 @@ def generate_consolidated_report(args):
             for col in json.loads(args.collection_links):
                 f = col.get('file', '')
                 slug = f.split('/')[0] if '/' in f else 'legacy'
-                collections.append({'name': col.get('name', ''), 'file': f, 'product_slug': slug})
+                total_a = int(col.get('assertions_total', 0) or 0)
+                failed_a = int(col.get('assertions_failed', 0) or 0)
+                passed_a = max(total_a - failed_a, 0)
+                collections.append({
+                    'name': col.get('name', ''),
+                    'file': f,
+                    'product_slug': slug,
+                    'assertions_total': total_a,
+                    'assertions_passed': passed_a,
+                    'assertions_failed': failed_a,
+                    'detail_href': f"{f}#pills-failed" if failed_a > 0 else f,
+                    'status': 'passed' if failed_a == 0 else 'failed',
+                })
         except json.JSONDecodeError:
             pass
 

package/templates/postman/scripts/report-generators/generate-consolidated-report.sh

@@ -130,12 +130,15 @@ for json_file in "${JSON_FILES[@]}"; do
         html_file="${col_name}-${TIMESTAMP}.html"
         display_name=$(echo "$col_name" | sed 's/-/ /g' | sed 's/^[0-9]* //')
     fi
+    # Per-collection assertion counts so the report cards show passed/failed.
+    col_total=$(jq '.run.stats.assertions.total // 0' "$json_file" 2>/dev/null || echo 0)
+    col_failed=$(jq '.run.stats.assertions.failed // 0' "$json_file" 2>/dev/null || echo 0)
     if [ "$first" = true ]; then
         first=false
     else
         COLLECTION_LINKS_JSON="${COLLECTION_LINKS_JSON},"
     fi
-    COLLECTION_LINKS_JSON="${COLLECTION_LINKS_JSON}{\"name\":\"${display_name}\",\"file\":\"${html_file}\"}"
+    COLLECTION_LINKS_JSON="${COLLECTION_LINKS_JSON}{\"name\":\"${display_name}\",\"file\":\"${html_file}\",\"assertions_total\":${col_total},\"assertions_failed\":${col_failed}}"
 done
 COLLECTION_LINKS_JSON="${COLLECTION_LINKS_JSON}]"
 

package/templates/postman/scripts/run-all.sh

@@ -400,11 +400,17 @@ fi
 # links to a stale consolidated report whose per-collection detail files have
 # already been cleaned up. Only fall back to the newest existing one if this
 # run produced no consolidated JSON to render.
-POSTMAN_CONSOLIDATED_HTML="$REPORTS_DIR/consolidated-${POSTMAN_ENV}-${TIMESTAMP}.html"
-CONSOLIDATED_JSON_THIS_RUN="$REPORTS_DIR/consolidated-${POSTMAN_ENV}-${TIMESTAMP}.json"
-if [ ! -f "$POSTMAN_CONSOLIDATED_HTML" ] && [ -f "$CONSOLIDATED_JSON_THIS_RUN" ]; then
-    echo -e "${YELLOW}Generating consolidated HTML report...${NC}"
-    "$SCRIPT_DIR/report-generators/generate-consolidated-report.sh" "$POSTMAN_ENV" "$TIMESTAMP" "$REPORTS_DIR" "$POSTMAN_PASSED" "$POSTMAN_FAILED" 0 >/dev/null 2>&1 || true
+# The Postman runner self-timestamps its artifacts, so the consolidated JSON's
+# timestamp differs from this orchestrator's $TIMESTAMP. Derive the HTML name
+# from the actual consolidated JSON (resolved above) rather than $TIMESTAMP.
+POSTMAN_CONSOLIDATED_HTML=""
+if [ -n "$CONSOLIDATED_JSON" ] && [ -f "$CONSOLIDATED_JSON" ]; then
+    CONSOLIDATED_TS=$(basename "$CONSOLIDATED_JSON" .json | sed "s/^consolidated-${POSTMAN_ENV}-//")
+    POSTMAN_CONSOLIDATED_HTML="$REPORTS_DIR/consolidated-${POSTMAN_ENV}-${CONSOLIDATED_TS}.html"
+    if [ ! -f "$POSTMAN_CONSOLIDATED_HTML" ]; then
+        echo -e "${YELLOW}Generating consolidated HTML report...${NC}"
+        "$SCRIPT_DIR/report-generators/generate-consolidated-report.sh" "$POSTMAN_ENV" "$CONSOLIDATED_TS" "$REPORTS_DIR" "$POSTMAN_PASSED" "$POSTMAN_FAILED" 0 >/dev/null 2>&1 || true
+    fi
 fi
 if [ ! -f "$POSTMAN_CONSOLIDATED_HTML" ]; then
     POSTMAN_CONSOLIDATED_HTML=$(ls -t "$REPORTS_DIR"/consolidated-*.html 2>/dev/null | head -1 || true)

package/templates/postman-node/scripts/run-all.sh

@@ -276,10 +276,16 @@ if [ "$SKIP_REPORT" = false ]; then
     # combined report never links to a stale consolidated whose per-collection
     # detail files have been cleaned up. Fall back to the newest only if this run
     # produced no consolidated JSON to render.
-    POSTMAN_CONSOLIDATED_HTML="$REPORTS_DIR/consolidated-${POSTMAN_ENV}-${TIMESTAMP}.html"
-    CONSOLIDATED_JSON_THIS_RUN="$REPORTS_DIR/consolidated-${POSTMAN_ENV}-${TIMESTAMP}.json"
-    if [ ! -f "$POSTMAN_CONSOLIDATED_HTML" ] && [ -f "$CONSOLIDATED_JSON_THIS_RUN" ]; then
-        "$SCRIPT_DIR/report-generators/generate-consolidated-report.sh" "$POSTMAN_ENV" "$TIMESTAMP" "$REPORTS_DIR" "$POSTMAN_PASSED" "$POSTMAN_FAILED" 0 >/dev/null 2>&1 || true
+    # The Postman runner self-timestamps, so the consolidated JSON's timestamp
+    # differs from this orchestrator's $TIMESTAMP. Derive the HTML name from the
+    # actual consolidated JSON rather than $TIMESTAMP.
+    POSTMAN_CONSOLIDATED_HTML=""
+    if [ -n "$CONSOLIDATED_JSON" ] && [ -f "$CONSOLIDATED_JSON" ]; then
+        CONSOLIDATED_TS=$(basename "$CONSOLIDATED_JSON" .json | sed "s/^consolidated-${POSTMAN_ENV}-//")
+        POSTMAN_CONSOLIDATED_HTML="$REPORTS_DIR/consolidated-${POSTMAN_ENV}-${CONSOLIDATED_TS}.html"
+        if [ ! -f "$POSTMAN_CONSOLIDATED_HTML" ]; then
+            "$SCRIPT_DIR/report-generators/generate-consolidated-report.sh" "$POSTMAN_ENV" "$CONSOLIDATED_TS" "$REPORTS_DIR" "$POSTMAN_PASSED" "$POSTMAN_FAILED" 0 >/dev/null 2>&1 || true
+        fi
     fi
     if [ ! -f "$POSTMAN_CONSOLIDATED_HTML" ]; then
         POSTMAN_CONSOLIDATED_HTML=$(ls -t "$REPORTS_DIR"/consolidated-*.html 2>/dev/null | head -1 || true)