Simplify container

bin/cml.js

@@ -82,10 +82,10 @@ const setupTelemetry = async (opts, { parsed: { defaulted } }) => {
   for (const [name, option] of Object.entries(opts.options)) {
     if (opts[name] && !defaulted[name]) {
       switch (option.telemetry) {
-        case 'presence':
+        case 'name':
           options[name] = null;
           break;
-        case 'full':
+        case 'name+value':
           options[name] = opts[name];
           break;
       }

bin/cml/asset/publish.js

@@ -56,7 +56,7 @@ exports.options = kebabcaseKeys({
   rmWatermark: {
     type: 'boolean',
     description: 'Avoid CML watermark.',
-    telemetry: 'presence'
+    telemetry: 'name'
   },
   mimeType: {
     type: 'string',

bin/cml/comment/create.js

@@ -34,7 +34,7 @@ exports.options = kebabcaseKeys({
     type: 'string',
     default: 'https://asset.cml.dev',
     description: 'Self-hosted image server URL',
-    telemetry: 'presence'
+    telemetry: 'name'
   },
   watch: {
     type: 'boolean',
@@ -49,7 +49,7 @@ exports.options = kebabcaseKeys({
     type: 'boolean',
     description:
       "Uses driver's native capabilities to upload assets instead of CML's storage; not available on GitHub",
-    telemetry: 'presence'
+    telemetry: 'name'
   },
   update: {
     type: 'boolean',
@@ -61,6 +61,6 @@ exports.options = kebabcaseKeys({
     type: 'boolean',
     description:
       'Avoid watermark; CML needs a watermark to be able to distinguish CML comments from others',
-    telemetry: 'presence'
+    telemetry: 'name'
   }
 });

bin/cml/runner/launch.js

@@ -467,14 +467,14 @@ exports.options = kebabcaseKeys({
     conflicts: ['single', 'reuseIdle'],
     description:
       "Don't launch a new runner if an existing one has the same name or overlapping labels",
-    telemetry: 'presence'
+    telemetry: 'name'
   },
   reuseIdle: {
     type: 'boolean',
     conflicts: ['reuse', 'single'],
     description:
       "Creates a new runner only if the matching labels don't exist or are already busy",
-    telemetry: 'presence'
+    telemetry: 'name'
   },
   workdir: {
     type: 'string',
@@ -491,7 +491,7 @@ exports.options = kebabcaseKeys({
     type: 'string',
     choices: ['aws', 'azure', 'gcp', 'kubernetes'],
     description: 'Cloud to deploy the runner',
-    telemetry: 'full'
+    telemetry: 'name+value'
   },
   cloudRegion: {
     type: 'string',
@@ -545,13 +545,13 @@ exports.options = kebabcaseKeys({
     default: -1,
     description:
       'Maximum spot instance bidding price in USD. Defaults to the current spot bidding price',
-    telemetry: 'presence'
+    telemetry: 'name'
   },
   cloudStartupScript: {
     type: 'string',
     description:
       'Run the provided Base64-encoded Linux shell script during the instance initialization',
-    telemetry: 'presence'
+    telemetry: 'name'
   },
   cloudAwsSecurityGroup: {
     type: 'string',

bin/cml/tensorboard/connect.js

@@ -141,6 +141,6 @@ exports.options = kebabcaseKeys({
   rmWatermark: {
     type: 'boolean',
     description: 'Avoid CML watermark',
-    telemetry: 'presence'
+    telemetry: 'name'
   }
 });

bin/cml/tensorboard/connect.test.js

@@ -34,7 +34,7 @@ describe('tbLink', () => {
       error = err;
     }
 
-    expect(error.message).toBe(`Tensorboard took too long. ${message}`);
+    expect(error.message).toBe(`Tensorboard took too long`);
   });
 
   test('valid url is returned', async () => {

src/analytics.test.js

@@ -8,8 +8,9 @@ describe('analytics tests', () => {
     const cml = new CML({ repo: REPO, token: TOKEN });
     const action = 'test';
     const cloud = 'azure';
+    const container = 'cml';
     const more = { one: 1, two: 2 };
-    const extra = { cloud, ...more };
+    const extra = { cloud, container, ...more };
     const error = 'Ouch!';
     const regex = /\d+\.\d+\.\d+/;