Skip to content

Fix bug with enableFreeMonitoring #287

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

Merged
merged 2 commits into from
Aug 17, 2020
Merged

Fix bug with enableFreeMonitoring #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
383534d
Fix bug with enableFreeMonitoring
aherlihy Aug 14, 2020
0650f4e
update tests
aherlihy Aug 14, 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
21 changes: 13 additions & 8 deletions packages/shell-api/src/database.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,7 @@ describe('Database', () => {

it('calls serviceProvider.runCommand on the database', async() => {
serviceProvider.runCommand.onCall(0).resolves({ ismaster: true });
serviceProvider.runCommand.onCall(1).resolves({ ok: 1, state: 'enabled' });
serviceProvider.runCommand.onCall(1).resolves({ ok: 1 });
await database.enableFreeMonitoring();

expect(serviceProvider.runCommand).to.have.been.calledWith(
Expand All @@ -1778,23 +1778,27 @@ describe('Database', () => {
});

it('returns whatever serviceProvider.runCommand returns if enabled', async() => {
const expectedResult = { ok: 1, state: 'enabled' };
const expectedFMState = { ok: 1, state: 'enabled' };

serviceProvider.runCommand.onCall(0).resolves({ ismaster: true });
serviceProvider.runCommand.onCall(1).resolves(expectedResult);
serviceProvider.runCommand.onCall(1).resolves({ ok: 1 });
serviceProvider.runCommand.onCall(2).resolves(expectedFMState);
const result = await database.enableFreeMonitoring();
expect(result).to.deep.equal(expectedResult);
expect(result).to.deep.equal(expectedFMState);
});
it('returns warning if not enabled', async() => {
serviceProvider.runCommand.onCall(0).resolves({ ismaster: true });
serviceProvider.runCommand.onCall(1).resolves({ ok: 1, enabled: false });
serviceProvider.runCommand.onCall(2).resolves({ cloudFreeMonitoringEndpointURL: 'URL' });
serviceProvider.runCommand.onCall(1).resolves({ ok: 1 });
serviceProvider.runCommand.onCall(2).resolves({ ok: 1, enabled: false });
serviceProvider.runCommand.onCall(3).resolves({ cloudFreeMonitoringEndpointURL: 'URL' });
const result = await database.enableFreeMonitoring();
expect(result).to.include('URL');
});

it('returns warning if returns ok: 0 with auth error', async() => {
serviceProvider.runCommand.onCall(0).resolves({ ismaster: true });
serviceProvider.runCommand.onCall(1).resolves({ ok: 0, codeName: 'Unauthorized' });
serviceProvider.runCommand.onCall(1).resolves({ ok: 1 });
serviceProvider.runCommand.onCall(2).resolves({ ok: 0, codeName: 'Unauthorized' });
const result = await database.enableFreeMonitoring();
expect(result).to.be.a('string');
expect(result).to.include('privilege');
Expand All @@ -1803,7 +1807,8 @@ describe('Database', () => {
const expectedError = new Error();
(expectedError as any).codeName = 'Unauthorized';
serviceProvider.runCommand.onCall(0).resolves({ ismaster: true });
serviceProvider.runCommand.onCall(1).rejects(expectedError);
serviceProvider.runCommand.onCall(1).resolves({ ok: 1 });
serviceProvider.runCommand.onCall(2).rejects(expectedError);
const result = await database.enableFreeMonitoring();
expect(result).to.be.a('string');
expect(result).to.include('privilege');
Expand Down
13 changes: 9 additions & 4 deletions packages/shell-api/src/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,15 +807,20 @@ export default class Database extends ShellApiClass {
throw new MongoshInvalidInputError('db.enableFreeMonitoring() may only be run on a primary');
}

// driver should check that ok: 1
await this._mongo._serviceProvider.runCommand(
ADMIN_DB,
{
setFreeMonitoring: 1,
action: 'enable'
}
);
let result;
let error;
try {
result = await this._mongo._serviceProvider.runCommand(
ADMIN_DB,
{
setFreeMonitoring: 1,
action: 'enable'
}
{ getFreeMonitoringStatus: 1 }
);
} catch (err) {
error = err;
Expand Down