CLOUDP-295956: Fix

Author: lovisaberggren

tools/spectral/ipa/__tests__/metrics/metricCollection.test.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { beforeEach, describe, expect, it, jest } from '@jest/globals';
 import { runMetricCollectionJob } from '../../metrics/metricCollection.js';
-import * as spectral from '@stoplight/spectral-core';
+import { Spectral } from '@stoplight/spectral-core';
 
 const dirname = path.dirname(fileURLToPath(require('url').pathToFileURL(__filename).toString()));
 const expectedResultFilePath = path.join(dirname, 'data', 'expected-metric-results.json');
@@ -26,6 +26,7 @@ describe('tools/spectral/ipa/metrics/metricCollection.js runMetricCollectionJob'
 
   it('Outputs the expected metrics collection results', async () => {
     const expectedResults = JSON.parse(fs.readFileSync(expectedResultFilePath, 'utf8'));
+    const spectral = new Spectral();
 
     const results = await runMetricCollectionJob(testConfig, spectral);
 

tools/spectral/ipa/metrics/scripts/runMetricCollection.js

@@ -4,6 +4,7 @@ import spectral from '@stoplight/spectral-core';
 import config from '../config.js';
 import { runMetricCollectionJob } from '../metricCollection.js';
 
+const { Spectral } = spectral;
 const args = process.argv.slice(2);
 const oasFilePath = args[0];
 
@@ -25,7 +26,7 @@ runMetricCollectionJob(
   {
     oasFilePath,
   },
-  spectral
+  new Spectral()
 )
   .then((results) => {
     console.log('Writing results');

tools/spectral/ipa/metrics/utils.js

@@ -21,10 +21,7 @@ export function getSeverityPerRule(ruleset) {
 }
 
 export async function loadRuleset(rulesetPath, spectral) {
-  const { Spectral } = spectral;
-
   try {
-    const spectral = new Spectral();
     const ruleset = await bundleAndLoadRuleset(rulesetPath, { fs, fetch });
     await spectral.setRuleset(ruleset);
     return ruleset;