fix

Author: yelizhenden-mdb

.gitignore

@@ -22,3 +22,5 @@
 *.out
 **/*ipa-collector-results-combined.log
 **/*metric-collection-results.json
+**/*spectral-output.txt
+**/*spectral-report.xml

tools/spectral/ipa/metrics/config.js

@@ -2,13 +2,16 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 
 const dirname = path.dirname(fileURLToPath(import.meta.url));
+const outputDir = path.join(dirname, 'outputs');
 const rootDir = path.resolve(dirname, '../../../../');
 
 const config = {
   defaultOasFilePath: path.join(rootDir, 'openapi', 'v2.json'),
-  defaultCollectorResultsFilePath: path.join(dirname, 'ipa-collector-results-combined.log'),
   defaultRulesetFilePath: path.join(dirname, '..', 'ipa-spectral.yaml'),
-  defaultMetricCollectionResultsFilePath: path.join(dirname, 'metric-collection-results.json'),
+  defaultCollectorResultsFilePath: path.join(dirname, 'ipa-collector-results-combined.log'),
+  defaultMetricCollectionResultsFilePath: path.join(outputDir, 'metric-collection-results.json'),
+  defaultSpectralReportFile: path.join(outputDir, 'spectral-report.xml'),
+  defaultSpectralOutputFile: path.join(outputDir, 'spectral-output.txt'),
 };
 
 export default config;

tools/spectral/ipa/metrics/metricCollection.js

@@ -1,5 +1,6 @@
 import spectral from '@stoplight/spectral-core';
 import * as fs from 'node:fs';
+import { spawnSync } from 'child_process';
 import {
   loadOpenAPIFile,
   extractTeamOwnership,
@@ -9,7 +10,6 @@ import {
   merge,
 } from './utils.js';
 import config from './config.js';
-import collector from './collector.js';
 const { Spectral } = spectral;
 
 async function runMetricCollectionJob(oasFilePath = config.defaultOasFilePath) {
@@ -20,22 +20,16 @@ async function runMetricCollectionJob(oasFilePath = config.defaultOasFilePath) {
     console.log('Extracting team ownership data...');
     const ownershipData = extractTeamOwnership(oasContent);
 
-    console.log('Initializing Spectral...');
+    console.log('Getting rule severities...');
     const spectral = new Spectral();
     const ruleset = await loadRuleset(config.defaultRulesetFilePath, spectral);
-
-    console.log('Getting rule severities...');
     const ruleSeverityMap = getSeverityPerRule(ruleset);
 
-    console.log('Running Spectral analysis...');
-    const spectralResults = await spectral.run(oasContent);
-    collector.flushToFile();
-
     console.log('Loading collector results...');
     const collectorResults = loadCollectorResults(config.defaultCollectorResultsFilePath);
 
     console.log('Merging results...');
-    const mergedResults = merge(spectralResults, ownershipData, collectorResults, ruleSeverityMap);
+    const mergedResults = merge(ownershipData, collectorResults, ruleSeverityMap);
 
     console.log('Metric collection job complete.');
     return mergedResults;
@@ -48,6 +42,34 @@ async function runMetricCollectionJob(oasFilePath = config.defaultOasFilePath) {
 const args = process.argv.slice(2);
 const customOasFile = args[0];
 
+const result = spawnSync(
+  'spectral',
+  [
+    'lint',
+    '--ruleset',
+    config.defaultRulesetFilePath,
+    '--format',
+    'stylish',
+    '--verbose',
+    '--format',
+    'junit',
+    '--output.junit',
+    config.defaultSpectralReportFile,
+    config.defaultOasFilePath,
+  ],
+  {
+    encoding: 'utf-8',
+  }
+);
+
+if (result.error) {
+  console.error('Error running Spectral lint:', result.error);
+  process.exit(1);
+}
+
+console.log('Spectral lint completed successfully.');
+fs.writeFileSync(config.defaultSpectralOutputFile, result.stdout);
+
 runMetricCollectionJob(customOasFile)
   .then((results) => fs.writeFileSync(config.defaultMetricCollectionResultsFilePath, JSON.stringify(results)))
   .catch((error) => console.error(error.message));

tools/spectral/ipa/metrics/utils.js

@@ -73,7 +73,7 @@ function getIPAFromIPARule(ipaRule) {
   }
 }
 
-export function merge(spectralResults, ownershipData, collectorResults, ruleSeverityMap) {
+export function merge(ownershipData, collectorResults, ruleSeverityMap) {
   const results = [];
 
   function addEntry(entryType, adoptionStatus) {