fix(@angular/cli): do not collect analytics when running in non TTY mode

alan-agius4 · alan-agius4 · commit 61fab6413ab5 · 2022-10-14T15:55:03.000+02:00
Prior to this change we collected analytics when config was not present and the CLI was running in non TTY mode.
diff --git a/packages/angular/cli/src/analytics/analytics.ts b/packages/angular/cli/src/analytics/analytics.ts
@@ -184,7 +184,7 @@ export async function getAnalyticsUserId(
     }
   }
 
-  return globalConfig || randomUUID();
+  return globalConfig;
 }
 
 function analyticsConfigValueToHumanFormat(value: unknown): 'enabled' | 'disabled' | 'not set' {
diff --git a/tests/legacy-cli/e2e/tests/commands/analytics/analytics-enable-disable.ts b/tests/legacy-cli/e2e/tests/commands/analytics/analytics-enable-disable.ts
@@ -0,0 +1,11 @@
+import assert from 'node:assert';
+import { readFile } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
+
+export default async function () {
+  await ng('analytics', 'enable');
+  assert.ok(JSON.parse(await readFile('angular.json')).cli.analytics);
+
+  await ng('analytics', 'disable');
+  assert.strictEqual(JSON.parse(await readFile('angular.json')).cli.analytics, false);
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/analytics/analytics-info.ts b/tests/legacy-cli/e2e/tests/commands/analytics/analytics-info.ts
@@ -0,0 +1,27 @@
+import { execAndWaitForOutputToMatch } from '../../../utils/process';
+import { updateJsonFile } from '../../../utils/project';
+
+export default async function () {
+  // Should be disabled by default.
+  await configureTest(undefined /** analytics */);
+  await execAndWaitForOutputToMatch('ng', ['analytics', 'info'], /Effective status: disabled/, {
+    NG_FORCE_TTY: '0', // Disable prompts
+  });
+
+  await configureTest('1dba0835-38a3-4957-bf34-9974e2df0df3' /** analytics */);
+  await execAndWaitForOutputToMatch('ng', ['analytics', 'info'], /Effective status: enabled/, {
+    NG_FORCE_TTY: '0', // Disable prompts
+  });
+
+  await configureTest(false /** analytics */);
+  await execAndWaitForOutputToMatch('ng', ['analytics', 'info'], /Effective status: disabled/, {
+    NG_FORCE_TTY: '0', // Disable prompts
+  });
+}
+
+async function configureTest(analytics: false | string | undefined): Promise<void> {
+  await updateJsonFile('angular.json', (config) => {
+    config.cli ??= {};
+    config.cli.analytics = analytics;
+  });
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/analytics/ask-analytics-command.ts b/tests/legacy-cli/e2e/tests/commands/analytics/ask-analytics-command.ts
@@ -1,5 +1,5 @@
-import { execWithEnv } from '../../utils/process';
-import { mockHome } from '../../utils/utils';
+import { execWithEnv } from '../../../utils/process';
+import { mockHome } from '../../../utils/utils';
 
 const ANALYTICS_PROMPT = /Would you like to share pseudonymous usage data/;
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ export async function getAnalyticsUserId(`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`187`		`- return globalConfig \|\| randomUUID();`
	`187`	`+ return globalConfig;`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`function analyticsConfigValueToHumanFormat(value: unknown): 'enabled' \| 'disabled' \| 'not set' {`