Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix URL generation for MongoDB 4.4 #329

Merged
merged 4 commits into from
Aug 2, 2020
Merged

Fix URL generation for MongoDB 4.4 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d800c7
allow MongoDB 4.4 on macOS
tinovyatkin Jul 31, 2020
2646d5d
fix test for macOS
tinovyatkin Jul 31, 2020
0addae3
fix url generation for Windows
tinovyatkin Jul 31, 2020
e4e8530
adjust version check for Windows
tinovyatkin Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions packages/mongodb-memory-server-core/src/util/MongoBinaryDownloadUrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export default class MongoBinaryDownloadUrl {
case 'osx':
return this.getArchiveNameOsx();
case 'win32':
case 'windows':
return this.getArchiveNameWin();
case 'linux':
default:
Expand All @@ -71,9 +72,9 @@ export default class MongoBinaryDownloadUrl {
async getArchiveNameWin(): Promise<string> {
let name = `mongodb-${this.platform}`;
name += `-${this.arch}`;
if (this.version.indexOf('4.2') === 0) {
if (this.version.startsWith('4.2')) {
name += '-2012plus';
} else {
} else if (/^[1-3]\./.test(this.version)) {
name += '-2008plus-ssl';
}
name += `-${this.version}.zip`;
Expand All @@ -88,14 +89,14 @@ export default class MongoBinaryDownloadUrl {
let name = `mongodb-osx`;
if (
!(
this.version.indexOf('3.0') === 0 ||
this.version.indexOf('2.') === 0 ||
this.version.indexOf('1.') === 0
this.version.startsWith('3.0') ||
this.version.startsWith('2.') ||
this.version.startsWith('1.')
)
) {
name += '-ssl';
}
if (this.version.indexOf('4.2') === 0) {
if (this.version.startsWith('4.')) {
name = `mongodb-macos`;
}
name += `-${this.arch}`;
Expand Down Expand Up @@ -336,7 +337,7 @@ export default class MongoBinaryDownloadUrl {
case 'darwin':
return 'osx';
case 'win32':
return 'win32';
return /^(4\.[4-9]|[5-9])/.test(this.version) ? 'windows' : 'win32';
case 'linux':
case 'elementary OS':
return 'linux';
Expand Down
17 changes: 14 additions & 3 deletions packages/mongodb-memory-server-core/src/util/__tests__/MongoBinaryDownloadUrl-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import MongoBinaryDownloadUrl from '../MongoBinaryDownloadUrl';
describe('MongoBinaryDownloadUrl', () => {
describe('getDownloadUrl()', () => {
describe('for mac', () => {
it('4.2', async () => {
it('4.4', async () => {
const du = new MongoBinaryDownloadUrl({
platform: 'darwin',
arch: 'x64',
version: '4.2.0',
version: '4.4.0',
});
expect(await du.getDownloadUrl()).toBe(
'https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-4.2.0.tgz'
'https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-4.4.0.tgz'
);
});

Expand Down Expand Up @@ -91,6 +91,17 @@ describe('MongoBinaryDownloadUrl', () => {
);
});

it('4.4 for win32', async () => {
const du = new MongoBinaryDownloadUrl({
platform: 'win32',
arch: 'x64',
version: '4.4.0',
});
expect(await du.getDownloadUrl()).toBe(
'https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-4.4.0.zip'
);
});

it('fallback', async () => {
console.warn = jest.fn(); // mock it to prevent writing to console

Expand Down