Skip to content

Commit ea90745

Browse files
calhar-snykcalhar-snyk
authored
chore: Adjust java installation in CI/CD to directly use java version (#204)
* chore: Adjust java installation in CI/CD to directly use java version * chore: Fix verbose test for java8
1 parent 7f8a39e commit ea90745

File tree

4 files changed

+51
-39
lines changed

4 files changed

+51
-39
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ commands:
101101
steps:
102102
- run:
103103
name: Installing JDK
104-
command: sdk install java $(sdk list java | grep -o -m1 "<< parameters.jdk_version >>\.[0-9\.]\+hs-adpt")
104+
command: sdk install java << parameters.jdk_version >>
105105

106106
install_jdk_windows:
107107
description: Install JDK

‎tests/fixtures/dverbose-dependency-management/expected-dverbose-dep-graph-dev-old-maven.json‎ renamed to ‎tests/fixtures/dverbose-dependency-management/expected-dverbose-dep-graph-dev-java8.json‎

File renamed without changes.

‎tests/jest/system/dverbose-flag-all-versions.spec.ts‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as plugin from '../../../lib';
22
import * as path from 'path';
33
import { readFixtureJSON } from '../../helpers/read';
4-
import * as subProcess from '../../../lib/sub-process';
54
import { sortDependencyGraphDeps } from '../../helpers/sort';
65
import { DepGraphData } from '@snyk/dep-graph';
76
import { legacyPlugin } from '@snyk/cli-interface';
7+
import { MultiProjectResult } from '@snyk/cli-interface/legacy/plugin';
88

99
const testsPath = path.join(__dirname, '../..');
1010
const fixturesPath = path.join(testsPath, 'fixtures');
@@ -36,7 +36,7 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
3636
const result = res.scannedProjects[0].depGraph.toJSON();
3737
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
3838
const actualGraphSorted = sortDependencyGraphDeps(result);
39-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
39+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
4040
expect(
4141
res.plugin.meta.versionBuildInfo.metaBuildVersion.mavenPluginVersion,
4242
).toEqual('3.6.1');
@@ -63,37 +63,43 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
6363
);
6464
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
6565
const actualGraphSorted = sortDependencyGraphDeps(result);
66-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
66+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
6767
},
6868
TESTS_TIMEOUT,
6969
);
7070

7171
test(
7272
'inspect on dverbose-dependency-management pom using -Dverbose and --dev deps',
7373
async () => {
74-
const res: Record<string, any> = await plugin.inspect(
74+
const res = (await plugin.inspect(
7575
'.',
7676
path.join(testManagedProjectPath, 'pom.xml'),
7777
{
7878
dev: true,
7979
args: ['-Dverbose'],
8080
mavenVerboseIncludeAllVersions: true,
8181
},
82-
);
83-
const result = res.scannedProjects[0].depGraph.toJSON();
82+
)) as MultiProjectResult;
83+
const result = res.scannedProjects[0].depGraph?.toJSON() as DepGraphData;
8484

85-
// if running windows with an older version of maven 3.3.9.2 - one of the deps will be omitted
86-
const mavenVersion = await subProcess.execute('mvn', ['--version'], {});
87-
let expectedJSON = await readFixtureJSON(
85+
const javaVersion =
86+
res.plugin.meta?.versionBuildInfo?.metaBuildVersion.javaVersion || '';
87+
const isJava8 =
88+
javaVersion.includes('1.8.') || javaVersion.includes('version: 8');
89+
90+
// Java 8 has a missing dependency
91+
const expectedFileName = isJava8
92+
? 'expected-dverbose-dep-graph-dev-java8.json'
93+
: 'expected-dverbose-dep-graph-dev.json';
94+
95+
const expectedJSON = await readFixtureJSON(
8896
'dverbose-dependency-management',
89-
mavenVersion.includes('3.3.9') && mavenVersion.includes('C:')
90-
? 'expected-dverbose-dep-graph-dev-old-maven.json'
91-
: 'expected-dverbose-dep-graph-dev.json',
97+
expectedFileName,
9298
);
9399

94100
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
95101
const actualGraphSorted = sortDependencyGraphDeps(result);
96-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
102+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
97103
},
98104
TESTS_TIMEOUT,
99105
);
@@ -125,7 +131,7 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
125131
expectedJSON.scannedProjects[i].depGraph,
126132
);
127133
const actualGraphSorted = sortDependencyGraphDeps(depGraph);
128-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
134+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
129135
}
130136
},
131137
TESTS_TIMEOUT,
@@ -150,7 +156,7 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
150156
const result = res.scannedProjects[0].depGraph.toJSON();
151157
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
152158
const actualGraphSorted = sortDependencyGraphDeps(result);
153-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
159+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
154160
},
155161
TESTS_TIMEOUT,
156162
);
@@ -176,7 +182,7 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
176182
const result = res.scannedProjects[0].depGraph.toJSON();
177183
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
178184
const actualGraphSorted = sortDependencyGraphDeps(result);
179-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
185+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
180186
},
181187
TESTS_TIMEOUT,
182188
);
@@ -202,7 +208,7 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
202208
const result = res.scannedProjects[0].depGraph.toJSON();
203209
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
204210
const actualGraphSorted = sortDependencyGraphDeps(result);
205-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
211+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
206212
},
207213
TESTS_TIMEOUT,
208214
);
@@ -230,7 +236,7 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
230236
}
231237
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
232238
const actualGraphSorted = sortDependencyGraphDeps(res);
233-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
239+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
234240
},
235241
TESTS_TIMEOUT,
236242
);
@@ -258,7 +264,7 @@ describe('Dverbose reuturning all considered versions for dependencies tests', (
258264
}
259265
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
260266
const actualGraphSorted = sortDependencyGraphDeps(res);
261-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
267+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
262268
},
263269
TESTS_TIMEOUT,
264270
);

‎tests/jest/system/dverbose-flag.spec.ts‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as plugin from '../../../lib';
22
import * as path from 'path';
33
import { readFixtureJSON } from '../../helpers/read';
4-
import * as subProcess from '../../../lib/sub-process';
54
import { sortDependencyGraphDeps } from '../../helpers/sort';
65
import { DepGraphData } from '@snyk/dep-graph';
76
import { legacyPlugin } from '@snyk/cli-interface';
7+
import { MultiProjectResult } from '@snyk/cli-interface/legacy/plugin';
88

99
const testsPath = path.join(__dirname, '../..');
1010
const fixturesPath = path.join(testsPath, 'fixtures');
@@ -34,7 +34,7 @@ test(
3434
const result = res.scannedProjects[0].depGraph.toJSON();
3535
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
3636
const actualGraphSorted = sortDependencyGraphDeps(result);
37-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
37+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
3838
expect(
3939
res.plugin.meta.versionBuildInfo.metaBuildVersion.mavenPluginVersion,
4040
).toEqual('3.6.1');
@@ -60,36 +60,42 @@ test(
6060
);
6161
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
6262
const actualGraphSorted = sortDependencyGraphDeps(result);
63-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
63+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
6464
},
6565
TESTS_TIMEOUT,
6666
);
6767

6868
test(
6969
'inspect on dverbose-dependency-management pom using -Dverbose and --dev deps',
7070
async () => {
71-
const res: Record<string, any> = await plugin.inspect(
71+
const res = (await plugin.inspect(
7272
'.',
7373
path.join(testManagedProjectPath, 'pom.xml'),
7474
{
7575
dev: true,
7676
args: ['-Dverbose'],
7777
},
78-
);
79-
const result = res.scannedProjects[0].depGraph.toJSON();
78+
)) as MultiProjectResult;
79+
const result = res.scannedProjects[0].depGraph?.toJSON() as DepGraphData;
8080

81-
// if running windows with an older version of maven 3.3.9.2 - one of the deps will be omitted
82-
const mavenVersion = await subProcess.execute('mvn', ['--version'], {});
83-
let expectedJSON = await readFixtureJSON(
81+
const javaVersion =
82+
res.plugin.meta?.versionBuildInfo?.metaBuildVersion.javaVersion || '';
83+
const isJava8 =
84+
javaVersion.includes('1.8.') || javaVersion.includes('version: 8');
85+
86+
// Java 8 has a missing dependency
87+
const expectedFileName = isJava8
88+
? 'expected-dverbose-dep-graph-dev-java8.json'
89+
: 'expected-dverbose-dep-graph-dev.json';
90+
91+
const expectedJSON = await readFixtureJSON(
8492
'dverbose-dependency-management',
85-
mavenVersion.includes('3.3.9') && mavenVersion.includes('C:')
86-
? 'expected-dverbose-dep-graph-dev-old-maven.json'
87-
: 'expected-dverbose-dep-graph-dev.json',
93+
expectedFileName,
8894
);
8995

9096
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
9197
const actualGraphSorted = sortDependencyGraphDeps(result);
92-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
98+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
9399
},
94100
TESTS_TIMEOUT,
95101
);
@@ -120,7 +126,7 @@ test(
120126
expectedJSON.scannedProjects[i].depGraph,
121127
);
122128
const actualGraphSorted = sortDependencyGraphDeps(depGraph);
123-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
129+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
124130
}
125131
},
126132
TESTS_TIMEOUT,
@@ -144,7 +150,7 @@ test(
144150
const result = res.scannedProjects[0].depGraph.toJSON();
145151
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
146152
const actualGraphSorted = sortDependencyGraphDeps(result);
147-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
153+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
148154
},
149155
TESTS_TIMEOUT,
150156
);
@@ -169,7 +175,7 @@ test(
169175
const result = res.scannedProjects[0].depGraph.toJSON();
170176
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
171177
const actualGraphSorted = sortDependencyGraphDeps(result);
172-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
178+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
173179
},
174180
TESTS_TIMEOUT,
175181
);
@@ -194,7 +200,7 @@ test(
194200
const result = res.scannedProjects[0].depGraph.toJSON();
195201
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
196202
const actualGraphSorted = sortDependencyGraphDeps(result);
197-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
203+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
198204
},
199205
TESTS_TIMEOUT,
200206
);
@@ -221,7 +227,7 @@ test(
221227
}
222228
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
223229
const actualGraphSorted = sortDependencyGraphDeps(res);
224-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
230+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
225231
},
226232
TESTS_TIMEOUT,
227233
);
@@ -248,7 +254,7 @@ test(
248254
}
249255
const expectedGraphSorted = sortDependencyGraphDeps(expectedJSON);
250256
const actualGraphSorted = sortDependencyGraphDeps(res);
251-
expect(expectedGraphSorted).toEqual(actualGraphSorted);
257+
expect(actualGraphSorted).toEqual(expectedGraphSorted);
252258
},
253259
TESTS_TIMEOUT,
254260
);

0 commit comments

Comments
 (0)