Merge pull request #23323 from Fryguy/better_sort_npm_excludes

Include the GHSA number when sorting npm excludes
ManageIQ · Feb 3, 2025 · 939322c · 939322c
2 parents f6aa990 + b98210c
commit 939322c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/tasks/test_security_helper.rb b/lib/tasks/test_security_helper.rb
@@ -166,7 +166,7 @@ def self.rebuild_yarn_audit_pending
         end
 
         values
-        .sort_by { |v| YARN_AUDIT_SEVERITY_SORT.index(v[1]) || Float::MAX }
+        .sort_by { |v| [YARN_AUDIT_SEVERITY_SORT.index(v[1]) || Float::MAX, v[2]] } # Sort by severity, then by the GHSA number, for consistency
         .tableize(:header => false)
         .lines
         .map { |l| l.sub(/^ /, "# ") }