From db7e94d7c59b6e96df8c15323672696561eece4a Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 12 Feb 2021 18:04:18 +0100 Subject: [PATCH 1/2] fix(cli-repl): show telemetry info only once MONGOSH-582 --- packages/cli-repl/src/cli-repl.ts | 1 - packages/cli-repl/src/mongosh-repl.spec.ts | 1 + packages/cli-repl/src/mongosh-repl.ts | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts index 09f68490bc..22b8ea7d2e 100644 --- a/packages/cli-repl/src/cli-repl.ts +++ b/packages/cli-repl/src/cli-repl.ts @@ -201,7 +201,6 @@ class CliRepl { async setConfig(key: K, value: UserConfig[K]): Promise { this.config[key] = value; if (key === 'enableTelemetry') { - this.config.disableGreetingMessage = true; this.bus.emit('mongosh:update-user', this.config.userId, this.config.enableTelemetry); } try { diff --git a/packages/cli-repl/src/mongosh-repl.spec.ts b/packages/cli-repl/src/mongosh-repl.spec.ts index 657e7e2d31..b5cffe1d29 100644 --- a/packages/cli-repl/src/mongosh-repl.spec.ts +++ b/packages/cli-repl/src/mongosh-repl.spec.ts @@ -94,6 +94,7 @@ describe('MongoshNodeRepl', () => { expect(output).to.match(/Using MongoDB:\s+4.4.1/); expect(output).to.match(/Using Mongosh Beta:/); expect(output).to.match(/You can opt-out by running the .*disableTelemetry\(\).* command/); + expect(config.disableGreetingMessage).to.equal(true); }); it('evaluates javascript', async() => { diff --git a/packages/cli-repl/src/mongosh-repl.ts b/packages/cli-repl/src/mongosh-repl.ts index 9b93b7fec4..728b876abd 100644 --- a/packages/cli-repl/src/mongosh-repl.ts +++ b/packages/cli-repl/src/mongosh-repl.ts @@ -240,6 +240,7 @@ class MongoshNodeRepl implements EvaluationListener { text += `${MONGOSH_WIKI}\n`; if (!await this.configProvider.getConfig('disableGreetingMessage')) { text += `${TELEMETRY_GREETING_MESSAGE}\n`; + await this.configProvider.setConfig('disableGreetingMessage', true); } this.output.write(text); } From 7bb8daaa2a70fe3c59b9e46c8b8bbd30396c8961 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 12 Feb 2021 19:26:14 +0100 Subject: [PATCH 2/2] fixup --- packages/cli-repl/test/e2e.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-repl/test/e2e.spec.ts b/packages/cli-repl/test/e2e.spec.ts index 866cf4736e..49b9595c29 100644 --- a/packages/cli-repl/test/e2e.spec.ts +++ b/packages/cli-repl/test/e2e.spec.ts @@ -550,7 +550,7 @@ describe('e2e', function() { const config = await readConfig(); expect(config.userId).to.match(/^[a-f0-9]{24}$/); expect(config.enableTelemetry).to.be.true; - expect(config.disableGreetingMessage).to.be.false; + expect(config.disableGreetingMessage).to.be.true; }); it('persists between sessions', async() => {