chore: SP-1979 Removes sbom.json export format

scanoss · Dec 20, 2024 · d9c1aa9 · d9c1aa9
1 parent 66815e3
commit d9c1aa9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/__tests__/undeclared-argument-builder.test.ts b/__tests__/undeclared-argument-builder.test.ts
@@ -19,7 +19,6 @@ describe('UndeclaredArgumentBuilder', () => {
     appInput.REPO_DIR = 'repodir';
     appInput.OUTPUT_FILEPATH = 'results.json';
     appInput.SCANOSS_SETTINGS = false;
-    appInput.SBOM_ENABLED = true;
     const builder = new UndeclaredArgumentBuilder();
     const cmd = await builder.build();
     expect(cmd).toEqual([
@@ -32,9 +31,7 @@ describe('UndeclaredArgumentBuilder', () => {
       '--input',
       'results.json',
       '--format',
-      'md',
-      '--sbom-format',
-      'legacy'
+      'md'
     ]);
   });
 

diff --git a/src/app.input.ts b/src/app.input.ts
@@ -37,7 +37,7 @@ export const COPYLEFT_LICENSE_INCLUDE = core.getInput('licenses.copyleft.include
 export const COPYLEFT_LICENSE_EXCLUDE = core.getInput('licenses.copyleft.exclude');
 export const COPYLEFT_LICENSE_EXPLICIT = core.getInput('licenses.copyleft.explicit');
 export const REPO_DIR = process.env.GITHUB_WORKSPACE as string;
-export const RUNTIME_CONTAINER = core.getInput('runtimeContainer') || 'ghcr.io/scanoss/scanoss-py:v1.18.1';
+export const RUNTIME_CONTAINER = core.getInput('runtimeContainer') || 'ghcr.io/scanoss/scanoss-py:v1.18.0';
 export const SKIP_SNIPPETS = core.getInput('skipSnippets') === 'true';
 export const SCAN_FILES = core.getInput('scanFiles') === 'true';
 export const SCANOSS_SETTINGS = core.getInput('scanossSettings') === 'true';

diff --git a/src/policies/argument_builders/undeclared-argument-builder.ts b/src/policies/argument_builders/undeclared-argument-builder.ts
@@ -36,8 +36,7 @@ export class UndeclaredArgumentBuilder extends ArgumentBuilder {
       '--input',
       OUTPUT_FILEPATH,
       '--format',
-      'md',
-      ...(!SCANOSS_SETTINGS ? ['--sbom-format', 'legacy'] : []) // Sets sbom format output to legacy if SCANOSS_SETTINGS is not true
+      'md'
     ];
   }
 }
diff --git a/src/policies/undeclared-policy-check.ts b/src/policies/undeclared-policy-check.ts
@@ -24,7 +24,7 @@
 import { PolicyCheck } from './policy-check';
 import { CHECK_NAME } from '../app.config';
 import * as core from '@actions/core';
-import { EXECUTABLE } from '../app.input';
+import { EXECUTABLE, SCANOSS_SETTINGS } from '../app.input';
 import * as exec from '@actions/exec';
 import { UndeclaredArgumentBuilder } from './argument_builders/undeclared-argument-builder';
 import { ArgumentBuilder } from './argument_builders/argument-builder';