Merge pull request #1363 from balena-io/mixpanel-args-v10

Update mixpanel tracking (v10)

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 10.17.6 - 2019-07-23
+
+* [BACKPORT] Update mixpanel tracking [Paulo Castro]
+* [BACKPORT] Fix type checker, linter and prettier errors to allow backport changes [Paulo Castro]
+
 ## 10.17.5 - 2019-06-04
 
 * Pin moment-duration-format package (ReferenceError: window is not defined) [Paulo Castro]

automation/build-bin.ts

@@ -51,7 +51,7 @@ execPkg(['--target', 'host', '--output', 'build-bin/balena', 'package.json'])
 	.then(nativeExtensions => {
 		console.log(`\nCopying to build-bin:\n${nativeExtensions.join('\n')}`);
 
-		return nativeExtensions.map(extPath => {
+		return nativeExtensions.map((extPath: string) => {
 			return fs.copy(
 				extPath,
 				extPath.replace(

automation/capitanodoc/utils.ts

@@ -126,9 +126,7 @@ export class MarkdownFileParser {
 				} else {
 					reject(
 						new Error(
-							`Markdown section not found: title="${title}" file="${
+							`Markdown section not found: title="${title}" file="${this.mdFilePath}"`,
-								this.mdFilePath
-							}"`,
 						),
 					);
 				}

lib/actions/environment-variables.ts

@@ -223,9 +223,7 @@ export const add: CommandDefinition<
 					throw new Error(`Environment value not found for key: ${params.key}`);
 				} else {
 					console.info(
-						`Warning: using ${params.key}=${
+						`Warning: using ${params.key}=${params.value} from host environment`,
-							params.value
-						} from host environment`,
 					);
 				}
 			}

lib/actions/push.ts

@@ -88,9 +88,7 @@ async function getAppOwner(sdk: BalenaSDK, appName: string) {
 	});
 
 	const selected = await selectFromList(
-		`${
+		`${entries.length} applications found with that name, please select the application you would like to push to`,
-			entries.length
-		} applications found with that name, please select the application you would like to push to`,
 		entries,
 	);
 

lib/actions/tunnel.ts

@@ -212,9 +212,7 @@ export const tunnel: CommandDefinition<Args, Options> = {
 							)
 							.then(() => {
 								logger.logInfo(
-									` - tunnelling ${localAddress}:${localPort} to ${
+									` - tunnelling ${localAddress}:${localPort} to ${device.uuid}:${remotePort}`,
-										device.uuid
-									}:${remotePort}`,
 								);
 
 								return true;

lib/events.ts

@@ -49,16 +49,19 @@ export function trackCommand(capitanoCli: Capitano.Cli) {
 						username,
 					},
 				});
-
+				// `command.signature.toString()` results in a string like, for example:
+				//     "push <applicationOrDevice>"
+				// That's literally so: "applicationOrDevice" is NOT replaced with
+				// the actual application ID or device ID. The purpose is find out the
+				// most / least used command verbs, so we can focus our development
+				// effort where it is most beneficial to end users.
 				return mixpanel.track(`[CLI] ${command.signature.toString()}`, {
 					distinct_id: username,
-					argv: process.argv.join(' '),
 					version: packageJSON.version,
 					node: process.version,
 					arch: process.arch,
-					balenaUrl,
+					balenaUrl, // e.g. 'balena-cloud.com' or 'balena-staging.com'
 					platform: process.platform,
-					command: capitanoCli,
 				});
 			});
 		})

lib/utils/compose_ts.ts

@@ -51,9 +51,7 @@ export async function parseRegistrySecrets(
 		return registrySecrets;
 	} catch (error) {
 		return exitWithExpectedError(
-			`Error validating registry secrets file "${secretsFilename}":\n${
+			`Error validating registry secrets file "${secretsFilename}":\n${error.message}`,
-				error.message
-			}`,
 		);
 	}
 }
@@ -144,9 +142,7 @@ async function performResolution(
 					buildTask.buildStream = clonedStream;
 					if (!buildTask.external && !buildTask.resolved) {
 						throw new Error(
-							`Project type for service "${
+							`Project type for service "${buildTask.serviceName}" could not be determined. Missing a Dockerfile?`,
-								buildTask.serviceName
-							}" could not be determined. Missing a Dockerfile?`,
 						);
 					}
 					return buildTask;

lib/utils/device/deploy.ts

@@ -92,9 +92,7 @@ async function environmentFromInput(
 			// exists
 			if (!(match[1] in ret)) {
 				logger.logDebug(
-					`Warning: Cannot find a service with name ${
+					`Warning: Cannot find a service with name ${match[1]}. Treating the string as part of the environment variable name.`,
-						match[1]
-					}. Treating the string as part of the environment variable name.`,
 				);
 				match[2] = `${match[1]}:${match[2]}`;
 			} else {
@@ -132,9 +130,7 @@ export async function deployToDevice(opts: DeviceDeployOptions): Promise<void> {
 		await api.ping();
 	} catch (e) {
 		exitWithExpectedError(
-			`Could not communicate with local mode device at address ${
+			`Could not communicate with local mode device at address ${opts.deviceHost}`,
-				opts.deviceHost
-			}`,
 		);
 	}
 

lib/utils/helpers.ts

@@ -45,13 +45,9 @@ export function stateToString(state: OperationState) {
 
 	switch (state.operation.command) {
 		case 'copy':
-			return `${result} ${state.operation.from.path} -> ${
+			return `${result} ${state.operation.from.path} -> ${state.operation.to.path}`;
-				state.operation.to.path
-			}`;
 		case 'replace':
-			return `${result} ${state.operation.file.path}, ${
+			return `${result} ${state.operation.file.path}, ${state.operation.copy} -> ${state.operation.replace}`;
-				state.operation.copy
-			} -> ${state.operation.replace}`;
 		case 'run-script':
 			return `${result} ${state.operation.script}`;
 		default:

lib/utils/remote-build.ts

@@ -279,9 +279,7 @@ function createRemoteBuildRequest(
 			if (response.statusCode >= 100 && response.statusCode < 400) {
 				if (DEBUG_MODE) {
 					console.log(
-						`[debug] received HTTP ${response.statusCode} ${
+						`[debug] received HTTP ${response.statusCode} ${response.statusMessage}`,
-							response.statusMessage
-						}`,
 					);
 				}
 			} else {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "10.17.5",
+  "version": "10.17.6",
   "description": "The official balena CLI tool",
   "main": "./build/actions/index.js",
   "homepage": "https://github.com/balena-io/balena-cli",