feat(Telemetry): Report projectId in remove command

serverless · Dec 23, 2021 · 0de3bc3 · 0de3bc3
1 parent 56bdef5
commit 0de3bc3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
@@ -37,6 +37,15 @@ class AwsRemove {
               .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
           );
           log.info(); // Ensure gap between verbose logging
+
+          // This is used to ensure that for `remove` command, the `accountId` will be resolved and available
+          // for `generatePayload` telemetry logic
+          this.provider.getAccountId().then(
+            (accountId) => (this.provider.accountId = accountId),
+            () => {
+              /* pass on all errors */
+            }
+          );
         }
       },
       'remove:remove': async () => {

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
@@ -20,6 +20,7 @@ const ci = require('ci-info');
 const AWS = require('aws-sdk');
 
 const configValidationModeValues = new Set(['off', 'warn', 'error']);
+const commandsReportingProjectId = new Set(['deploy', '', 'remove']);
 
 const checkIsTabAutocompletionInstalled = () => {
   try {
@@ -300,7 +301,7 @@ module.exports = ({
     payload.isConfigValid = getConfigurationValidationResult(configuration);
     payload.dashboard.orgUid = serverless && serverless.service.orgUid;
 
-    if (isAwsProvider && serverless && (command === 'deploy' || command === '')) {
+    if (isAwsProvider && serverless && commandsReportingProjectId.has(command)) {
       const serviceName = isObject(configuration.service)
         ? configuration.service.name
         : configuration.service;
@@ -311,7 +312,9 @@ module.exports = ({
           .update(`${serviceName}-${accountId}`)
           .digest('base64');
       }
+    }
 
+    if (isAwsProvider && serverless && (command === 'deploy' || command === '')) {
       payload.didCreateService = Boolean(
         serverless && serverless.getProvider('aws').didCreateService
       );