balena-cli 17.4.1 → 17.4.2

package/lib/commands/{push.ts → push/index.ts}

@@ -17,18 +17,18 @@
 
 import { Flags, Args } from '@oclif/core';
 import type { Interfaces } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
-import { dockerignoreHelp, registrySecretsHelp } from '../utils/messages';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { dockerignoreHelp, registrySecretsHelp } from '../../utils/messages';
 import type { BalenaSDK } from 'balena-sdk';
-import { ExpectedError, instanceOf } from '../errors';
+import { ExpectedError, instanceOf } from '../../errors';
 import { RegistrySecrets } from '@balena/compose/dist/multibuild';
-import { lowercaseIfSlug } from '../utils/normalization';
+import { lowercaseIfSlug } from '../../utils/normalization';
 import {
 	applyReleaseTagKeysAndValues,
 	parseReleaseTagKeysAndValues,
-} from '../utils/compose_ts';
+} from '../../utils/compose_ts';
 
 enum BuildTarget {
 	Cloud,
@@ -233,7 +233,7 @@ export default class PushCmd extends Command {
 		logger.logDebug(`Using build source directory: ${options.source} `);
 
 		const sdk = getBalenaSdk();
-		const { validateProjectDirectory } = await import('../utils/compose_ts');
+		const { validateProjectDirectory } = await import('../../utils/compose_ts');
 		const { dockerfilePath, registrySecrets } = await validateProjectDirectory(
 			sdk,
 			{
@@ -276,8 +276,8 @@ export default class PushCmd extends Command {
 		dockerfilePath: string,
 		registrySecrets: RegistrySecrets,
 	) {
-		const remote = await import('../utils/remote-build');
-		const { getApplication } = await import('../utils/sdk');
+		const remote = await import('../../utils/remote-build');
+		const { getApplication } = await import('../../utils/sdk');
 
 		// Check for invalid options
 		const localOnlyOptions: Array<keyof FlagsDef> = [
@@ -356,7 +356,7 @@ export default class PushCmd extends Command {
 			'is only valid when pushing to a fleet',
 		);
 
-		const deviceDeploy = await import('../utils/device/deploy');
+		const deviceDeploy = await import('../../utils/device/deploy');
 
 		try {
 			await deviceDeploy.deployToDevice({
@@ -376,7 +376,7 @@ export default class PushCmd extends Command {
 				convertEol: !options['noconvert-eol'],
 			});
 		} catch (e) {
-			const { BuildError } = await import('../utils/device/errors');
+			const { BuildError } = await import('../../utils/device/errors');
 			if (instanceOf(e, BuildError)) {
 				throw new ExpectedError(e.toString());
 			} else {
@@ -386,7 +386,9 @@ export default class PushCmd extends Command {
 	}
 
 	protected async getBuildTarget(appOrDevice: string): Promise<BuildTarget> {
-		const { validateLocalHostnameOrIp } = await import('../utils/validation');
+		const { validateLocalHostnameOrIp } = await import(
+			'../../utils/validation'
+		);
 
 		return validateLocalHostnameOrIp(appOrDevice)
 			? BuildTarget.Device

package/lib/commands/{releases.ts → releases/index.ts}

@@ -16,12 +16,12 @@
  */
 
 import { Args } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
-import { applicationNameNote } from '../utils/messages';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
+import { applicationNameNote } from '../../utils/messages';
 import type * as BalenaSdk from 'balena-sdk';
-import { jsonInfo } from '../utils/messages';
+import { jsonInfo } from '../../utils/messages';
 
 export default class ReleasesCmd extends Command {
 	public static description = stripIndent`
@@ -67,7 +67,7 @@ export default class ReleasesCmd extends Command {
 		];
 
 		const balena = getBalenaSdk();
-		const { getFleetSlug } = await import('../utils/sdk');
+		const { getFleetSlug } = await import('../../utils/sdk');
 
 		const releases = await balena.models.release.getAllByApplication(
 			await getFleetSlug(balena, params.fleet),

package/lib/commands/{scan.ts → scan/index.ts}

@@ -16,9 +16,9 @@
  */
 
 import { Flags } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getCliUx, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getCliUx, stripIndent } from '../../utils/lazy';
 
 export default class ScanCmd extends Command {
 	public static description = stripIndent`
@@ -64,9 +64,11 @@ export default class ScanCmd extends Command {
 
 	public async run() {
 		const _ = await import('lodash');
-		const { discoverLocalBalenaOsDevices } = await import('../utils/discover');
+		const { discoverLocalBalenaOsDevices } = await import(
+			'../../utils/discover'
+		);
 		const prettyjson = await import('prettyjson');
-		const dockerUtils = await import('../utils/docker');
+		const dockerUtils = await import('../../utils/docker');
 
 		const dockerPort = 2375;
 		const dockerTimeout = 2000;

package/lib/commands/{settings.ts → settings/index.ts}

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 
 export default class SettingsCmd extends Command {
 	public static description = stripIndent`

package/lib/commands/{ssh.ts → ssh/index.ts}

@@ -16,10 +16,13 @@
  */
 
 import { Flags, Args } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
-import { parseAsInteger, validateLocalHostnameOrIp } from '../utils/validation';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import {
+	parseAsInteger,
+	validateLocalHostnameOrIp,
+} from '../../utils/validation';
 
 export default class SshCmd extends Command {
 	public static description = stripIndent`
@@ -108,7 +111,7 @@ export default class SshCmd extends Command {
 
 		// Local connection
 		if (validateLocalHostnameOrIp(params.fleetOrDevice)) {
-			const { performLocalDeviceSSH } = await import('../utils/device/ssh');
+			const { performLocalDeviceSSH } = await import('../../utils/device/ssh');
 			return await performLocalDeviceSSH({
 				hostname: params.fleetOrDevice,
 				port: options.port || 'local',
@@ -119,8 +122,8 @@ export default class SshCmd extends Command {
 		}
 
 		// Remote connection
-		const { getProxyConfig } = await import('../utils/helpers');
-		const { getOnlineTargetDeviceUuid } = await import('../utils/patterns');
+		const { getProxyConfig } = await import('../../utils/helpers');
+		const { getOnlineTargetDeviceUuid } = await import('../../utils/patterns');
 		const sdk = getBalenaSdk();
 
 		const proxyConfig = getProxyConfig();
@@ -134,7 +137,7 @@ export default class SshCmd extends Command {
 			params.fleetOrDevice,
 		);
 
-		const { which } = await import('../utils/which');
+		const { which } = await import('../../utils/which');
 
 		const [whichProxytunnel, { username }, proxyUrl] = await Promise.all([
 			useProxy ? which('proxytunnel', false) : undefined,
@@ -185,7 +188,9 @@ export default class SshCmd extends Command {
 		// that we know exists and is accessible
 		let containerId: string | undefined;
 		if (params.service != null) {
-			const { getContainerIdForService } = await import('../utils/device/ssh');
+			const { getContainerIdForService } = await import(
+				'../../utils/device/ssh'
+			);
 			containerId = await getContainerIdForService({
 				deviceUuid,
 				hostname: `ssh.${proxyUrl}`,
@@ -202,7 +207,7 @@ export default class SshCmd extends Command {
 		} else {
 			accessCommand = `host ${deviceUuid}`;
 		}
-		const { runRemoteCommand } = await import('../utils/ssh');
+		const { runRemoteCommand } = await import('../../utils/ssh');
 		await runRemoteCommand({
 			cmd: accessCommand,
 			hostname: `ssh.${proxyUrl}`,

package/lib/commands/{support.ts → support/index.ts}

@@ -16,11 +16,11 @@
  */
 
 import { Flags, Args } from '@oclif/core';
-import Command from '../command';
-import { ExpectedError } from '../errors';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, getCliUx, stripIndent } from '../utils/lazy';
-import { applicationIdInfo } from '../utils/messages';
+import Command from '../../command';
+import { ExpectedError } from '../../errors';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, getCliUx, stripIndent } from '../../utils/lazy';
+import { applicationIdInfo } from '../../utils/messages';
 
 export default class SupportCmd extends Command {
 	public static description = stripIndent`
@@ -116,7 +116,7 @@ export default class SupportCmd extends Command {
 			ux.action.stop();
 		}
 
-		const { getFleetSlug } = await import('../utils/sdk');
+		const { getFleetSlug } = await import('../../utils/sdk');
 
 		// Process applications
 		for (const appName of appNames) {

package/lib/commands/{tags.ts → tags/index.ts}

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import Command from '../command';
-import { ExpectedError } from '../errors';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
-import { applicationIdInfo } from '../utils/messages';
+import Command from '../../command';
+import { ExpectedError } from '../../errors';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
+import { applicationIdInfo } from '../../utils/messages';
 
 export default class TagsCmd extends Command {
 	public static description = stripIndent`
@@ -71,7 +71,7 @@ export default class TagsCmd extends Command {
 		let tags;
 
 		if (options.fleet) {
-			const { getFleetSlug } = await import('../utils/sdk');
+			const { getFleetSlug } = await import('../../utils/sdk');
 			tags = await balena.models.application.tags.getAllByApplication(
 				await getFleetSlug(balena, options.fleet),
 			);
@@ -81,7 +81,7 @@ export default class TagsCmd extends Command {
 		}
 		if (options.release) {
 			const { disambiguateReleaseParam } = await import(
-				'../utils/normalization'
+				'../../utils/normalization'
 			);
 			const releaseParam = await disambiguateReleaseParam(
 				balena,

package/lib/commands/{tunnel.ts → tunnel/index.ts}

@@ -16,15 +16,15 @@
  */
 
 import { Flags, Args } from '@oclif/core';
-import Command from '../command';
+import Command from '../../command';
 import {
 	NoPortsDefinedError,
 	InvalidPortMappingError,
 	ExpectedError,
-} from '../errors';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
-import { lowercaseIfSlug } from '../utils/normalization';
+} from '../../errors';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { lowercaseIfSlug } from '../../utils/normalization';
 
 import type { Server, Socket } from 'net';
 
@@ -122,7 +122,7 @@ export default class TunnelCmd extends Command {
 		}
 
 		// Ascertain device uuid
-		const { getOnlineTargetDeviceUuid } = await import('../utils/patterns');
+		const { getOnlineTargetDeviceUuid } = await import('../../utils/patterns');
 		const uuid = await getOnlineTargetDeviceUuid(sdk, params.deviceOrFleet);
 		logger.logInfo(`Opening a tunnel to ${uuid}...`);
 
@@ -133,7 +133,9 @@ export default class TunnelCmd extends Command {
 			})
 			.map(async ({ localPort, localAddress, remotePort }) => {
 				try {
-					const { tunnelConnectionToDevice } = await import('../utils/tunnel');
+					const { tunnelConnectionToDevice } = await import(
+						'../../utils/tunnel'
+					);
 					const handler = await tunnelConnectionToDevice(uuid, remotePort, sdk);
 
 					const { createServer } = await import('net');

package/lib/commands/{version.ts → version/index.ts}

@@ -16,8 +16,8 @@
  */
 
 import { Flags } from '@oclif/core';
-import Command from '../command';
-import { stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import { stripIndent } from '../../utils/lazy';
 
 export interface JsonVersions {
 	'balena-cli': string;
@@ -72,7 +72,7 @@ export default class VersionCmd extends Command {
 	public async run() {
 		const { flags: options } = await this.parse(VersionCmd);
 		const versions: JsonVersions = {
-			'balena-cli': (await import('../../package.json')).version,
+			'balena-cli': (await import('../../../package.json')).version,
 			'Node.js':
 				process.version && process.version.startsWith('v')
 					? process.version.slice(1)

package/lib/commands/{whoami.ts → whoami/index.ts}

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import Command from '../command';
-import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 
 export default class WhoamiCmd extends Command {
 	public static description = stripIndent`

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "balena-cli",
-  "version": "17.4.1",
+  "version": "17.4.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "balena-cli",
-      "version": "17.4.1",
+      "version": "17.4.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {