Skip to content

Commit a90b947

Browse files
committed
fix: add passIfNoBaseline to snyk-delta result
1 parent ce0ecb1 commit a90b947

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

src/lib/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const getDelta = async(snykTestOutput: string = '', debugMode = false):Promise<S
2626
const debug = utils.getDebugModule()
2727
const mode = argv.currentProject || argv.currentOrg ? "standalone" : "inline"
2828
let newVulns, newLicenseIssues
29+
let passIfNoBaseline = false
2930

3031
try {
3132
if(process.env.NODE_ENV == 'prod'){
@@ -101,6 +102,8 @@ const getDelta = async(snykTestOutput: string = '', debugMode = false):Promise<S
101102

102103
newVulns = typedSnykTestJsonResults.vulnerabilities.filter(x => x.type != "license")
103104
newLicenseIssues = typedSnykTestJsonResults.vulnerabilities.filter(x => x.type == "license")
105+
106+
passIfNoBaseline = true
104107

105108
} else {
106109
snykProject = await snyk.getProjectIssues(baselineOrg,baselineProject)
@@ -145,7 +148,7 @@ const getDelta = async(snykTestOutput: string = '', debugMode = false):Promise<S
145148
if(!module.parent || (isJestTesting() && !expect.getState().currentTestName.includes('module'))){
146149
process.exit(process.exitCode)
147150
} else {
148-
return {result: process.exitCode, newVulns: newVulns,newLicenseIssues: newLicenseIssues}
151+
return {result: process.exitCode, newVulns: newVulns,newLicenseIssues: newLicenseIssues, passIfNoBaseline: passIfNoBaseline}
149152
}
150153

151154
}

src/lib/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ export interface SnykDeltaOutput {
8686
result: number | undefined,
8787
newVulns: IssueWithPaths[] | undefined,
8888
newLicenseIssues: IssueWithPaths[] | undefined
89-
89+
passIfNoBaseline: boolean
9090
}

test/lib/index-module.test.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ describe('Test End 2 End - Module', () => {
6666
.readFileSync(fixturesFolderPath + 'snykTestsOutputs/test-goof.json')
6767
.toString(),
6868
);
69-
const expectedResult = { result: 0, newVulns: [], newLicenseIssues: [] };
69+
const expectedResult = {
70+
result: 0,
71+
newVulns: [],
72+
newLicenseIssues: [],
73+
passIfNoBaseline: false,
74+
};
7075
expect(result).toEqual(expectedResult);
7176
});
7277

@@ -78,7 +83,12 @@ describe('Test End 2 End - Module', () => {
7883
true,
7984
);
8085
expect(debug('snyk')).toBeTruthy();
81-
const expectedResult = { result: 0, newVulns: [], newLicenseIssues: [] };
86+
const expectedResult = {
87+
result: 0,
88+
newVulns: [],
89+
newLicenseIssues: [],
90+
passIfNoBaseline: false,
91+
};
8292
expect(result).toEqual(expectedResult);
8393
});
8494

@@ -162,6 +172,7 @@ describe('Test End 2 End - Module', () => {
162172
},
163173
],
164174
newLicenseIssues: [],
175+
passIfNoBaseline: false,
165176
};
166177

167178
expect(result).toEqual(expectedResult);

0 commit comments

Comments
 (0)