feat(Telemetry): Inspect docker availability

serverless · May 31, 2023 · 83670f9 · 83670f9
1 parent 72b27cb
commit 83670f9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/lib/utils/telemetry/generate-payload.js b/lib/utils/telemetry/generate-payload.js
@@ -139,6 +139,7 @@ module.exports = ({
   commandUsage,
   variableSources,
   isConsoleAuthenticated,
+  isDockerInstalled,
 }) => {
   let commandDurationMs;
 
@@ -197,6 +198,7 @@ module.exports = ({
   const payload = {
     ciName,
     isTtyTerminal: process.stdin.isTTY && process.stdout.isTTY,
+    isDockerInstalled,
     cliName: 'serverless',
     command,
     commandOptionNames,

diff --git a/scripts/serverless.js b/scripts/serverless.js
@@ -32,6 +32,7 @@ let serviceDir = null;
 let configuration = null;
 let serverless;
 let isConsoleAuthenticated = false;
+let isDockerInstalled;
 const commandUsage = {};
 const variableSourcesInConfig = new Set();
 
@@ -81,6 +82,7 @@ const finalize = async ({ error, shouldBeSync, telemetryData, shouldSendTelemetr
       commandUsage,
       variableSources: variableSourcesInConfig,
       isConsoleAuthenticated,
+      isDockerInstalled,
     }),
     ...telemetryData,
   });
@@ -814,6 +816,14 @@ processSpanPromise = (async () => {
           serverless = interactiveContext.serverless;
         }
       } else {
+        if (commands.join(' ') === 'deploy') {
+          const spawn = require('child-process-ext/spawn');
+          spawn('docker', ['--version']).then(
+            () => (isDockerInstalled = true),
+            () => (isDockerInstalled = false)
+          );
+        }
+
         processLog.debug('run Serverless instance');
         // Run command
         await serverless.run();

diff --git a/test/unit/lib/utils/telemetry/generate-payload.test.js b/test/unit/lib/utils/telemetry/generate-payload.test.js
@@ -167,6 +167,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       },
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
+      isDockerInstalled: undefined,
       notificationsMode: 'on',
       npmDependencies: ['fooDep', 'barDep', 'fooOpt', 'someDev', 'otherDev'],
       triggeredDeprecations: [],
@@ -232,6 +233,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       },
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
+      isDockerInstalled: undefined,
       notificationsMode: 'on',
       npmDependencies: [],
       triggeredDeprecations: [],
@@ -274,6 +276,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
+      isDockerInstalled: undefined,
       notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',
@@ -329,6 +332,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       },
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
+      isDockerInstalled: undefined,
       triggeredDeprecations: [],
       installationType: 'global:other',
       notificationsMode: 'on',
@@ -369,6 +373,7 @@ describe('test/unit/lib/utils/telemetry/generate-payload.test.js', () => {
       commandOptionNames: [],
       isAutoUpdateEnabled: false,
       isUsingCompose: false,
+      isDockerInstalled: undefined,
       notificationsMode: 'on',
       triggeredDeprecations: [],
       installationType: 'global:other',