Skip to content

Commit 6ab9db4

Browse files
SIGINT-2714: ADO: create SARIF with .sarif format for ADO
1 parent 52c339c commit 6ab9db4

File tree

8 files changed

+29
-4
lines changed

8 files changed

+29
-4
lines changed

.github/workflows/check-dist.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
id: diff
4848

4949
# If index.js was different than expected, upload the expected version as an artifact
50-
- uses: actions/upload-artifact@v3
50+
- uses: actions/upload-artifact@v4
5151
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
5252
with:
5353
name: dist

blackduck-security-task/dist/index.js

+8-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

blackduck-security-task/dist/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

blackduck-security-task/src/blackduck-security-task/application-constant.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ export const BRIDGECLI_INSTALL_DIRECTORY_KEY_CLASSIC_EDITOR =
430430

431431
export const UPLOAD_FOLDER_ARTIFACT_NAME = "bridge_cli_diagnostics";
432432
export const BRIDGE_CLI_LOCAL_DIRECTORY = ".bridge";
433-
export const SARIF_DEFAULT_FILE_NAME = "report.sarif.json";
433+
export const SARIF_DEFAULT_FILE_NAME = "report.sarif.sarif";
434434
export const DEFAULT_BLACKDUCK_SARIF_GENERATOR_DIRECTORY =
435435
"Blackduck SCA SARIF Generator";
436436
export const DEFAULT_POLARIS_SARIF_GENERATOR_DIRECTORY =

blackduck-security-task/src/blackduck-security-task/model/azure.ts

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export interface AzureData {
66
organization: Organization;
77
project: Project;
88
repository: Repository;
9+
sarifExtension: string;
910
}
1011

1112
export interface Api {

blackduck-security-task/src/blackduck-security-task/tools-parameter.ts

+15
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,16 @@ export class BridgeCliToolsParameter {
228228
if (parseToBoolean(inputs.POLARIS_REPORTS_SARIF_CREATE)) {
229229
if (!isPullRequest) {
230230
polData.data.polaris.reports = this.setSarifReportsInputsForPolaris();
231+
polData.data.azure = this.setAzureData(
232+
"",
233+
AZURE_TOKEN,
234+
"",
235+
"",
236+
"",
237+
"",
238+
""
239+
);
240+
polData.data.azure.sarifExtension = "sarif";
231241
} else {
232242
console.info(
233243
"Polaris SARIF report create/upload is ignored for pull request scan"
@@ -396,6 +406,10 @@ export class BridgeCliToolsParameter {
396406
if (!isPullRequest) {
397407
blackduckData.data.blackducksca.reports =
398408
this.setSarifReportsInputsForBlackduck();
409+
blackduckData.data.azure = azureData;
410+
if (blackduckData.data.azure) {
411+
blackduckData.data.azure.sarifExtension = "sarif";
412+
}
399413
} else {
400414
console.info(
401415
"Black Duck SCA SARIF report create/upload is ignored for pull request scan"
@@ -908,6 +922,7 @@ export class BridgeCliToolsParameter {
908922
},
909923
pull: {},
910924
},
925+
sarifExtension: "sarif",
911926
};
912927

913928
if (azurePullRequestNumber != null) {

blackduck-security-task/test/unit/blackduck-security-task/azure-service-client.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ describe("getPullRequestIdForClassicEditorFlow", () => {
5454
},
5555
pull: {},
5656
},
57+
sarifExtension:"sarif"
5758
};
5859

5960

blackduck-security-task/test/unit/blackduck-security-task/tools-parameter.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1364,6 +1364,7 @@ describe("Bridge CLI Tools Parameter test", () => {
13641364
expect(jsonData.data.blackducksca.reports.sarif.file.path).to.be.equals('test-path');
13651365
expect(jsonData.data.blackducksca.reports.sarif.severities).to.be.contains('CRITICAL');
13661366
expect(jsonData.data.blackducksca.reports.sarif.groupSCAIssues).to.be.equals(false);
1367+
expect(jsonData.data.azure.sarifExtension).to.be.equals("sarif")
13671368
expect(formattedCommand).contains('--stage blackducksca');
13681369

13691370
blackduckStateFile = '"'.concat(blackduckStateFile).concat('"');

0 commit comments

Comments
 (0)