balena-cli 16.2.5 → 16.2.6

package/build/utils/patterns.js

@@ -115,15 +115,17 @@ async function confirm(yesOption, message, yesMessage, defaultValue = false) {
     }
 }
 exports.confirm = confirm;
+const selectApplicationPineOptions = {
+    $select: ['id', 'slug', 'app_name'],
+    $expand: {
+        is_for__device_type: {
+            $select: 'slug',
+        },
+    },
+};
 async function selectApplication(filter, errorOnEmptySelection = false) {
     const balena = (0, lazy_1.getBalenaSdk)();
-    const apps = (await balena.models.application.getAllDirectlyAccessible({
-        $expand: {
-            is_for__device_type: {
-                $select: 'slug',
-            },
-        },
-    }));
+    const apps = (await balena.models.application.getAllDirectlyAccessible(selectApplicationPineOptions));
     if (!apps.length) {
         throw new errors_1.ExpectedError('No fleets found');
     }
@@ -142,7 +144,9 @@ async function selectApplication(filter, errorOnEmptySelection = false) {
 }
 exports.selectApplication = selectApplication;
 async function selectOrganization(organizations) {
-    organizations !== null && organizations !== void 0 ? organizations : (organizations = await (0, lazy_1.getBalenaSdk)().models.organization.getAll());
+    organizations !== null && organizations !== void 0 ? organizations : (organizations = await (0, lazy_1.getBalenaSdk)().models.organization.getAll({
+        $select: ['name', 'handle'],
+    }));
     return (0, lazy_1.getCliForm)().ask({
         message: 'Select an organization',
         type: 'list',
@@ -209,7 +213,9 @@ async function getOnlineTargetDeviceUuid(sdk, fleetOrDevice) {
         try {
             logger.logDebug(`Fetching fleet ${fleetOrDevice}`);
             const { getApplication } = await Promise.resolve().then(() => require('./sdk'));
-            return await getApplication(sdk, fleetOrDevice);
+            return await getApplication(sdk, fleetOrDevice, {
+                $select: ['id', 'slug'],
+            });
         }
         catch (err) {
             const { BalenaApplicationNotFound } = await Promise.resolve().then(() => require('balena-errors'));

package/build/utils/patterns.js.map

@@ -1 +1 @@
-{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../lib/utils/patterns.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"patterns.js","sourceRoot":"","sources":["../../lib/utils/patterns.ts"],"names":[],"mappings":"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"}

package/build/utils/sdk.d.ts

@@ -3,3 +3,4 @@ export declare function getApplication(sdk: BalenaSDK, nameOrSlugOrId: string |
 export declare function getApplication<TP extends PineOptions<Application>>(sdk: BalenaSDK, nameOrSlugOrId: string | number, options?: TP): Promise<PineTypedResult<Application, TP>>;
 export declare function getFleetSlug(sdk: BalenaSDK, nameOrSlug: string): Promise<string>;
 export declare function getOwnOrganizations(sdk: BalenaSDK): Promise<Organization[]>;
+export declare function getOwnOrganizations<TP extends PineOptions<Organization>>(sdk: BalenaSDK, options: TP): Promise<Array<PineTypedResult<Organization, TP>>>;

package/build/utils/sdk.js

@@ -13,13 +13,13 @@ exports.getApplication = getApplication;
 async function getFleetSlug(sdk, nameOrSlug) {
     const { looksLikeFleetSlug } = await Promise.resolve().then(() => require('./validation'));
     if (!looksLikeFleetSlug(nameOrSlug)) {
-        return (await getApplication(sdk, nameOrSlug)).slug;
+        return (await getApplication(sdk, nameOrSlug, { $select: 'slug' })).slug;
     }
     return nameOrSlug.toLowerCase();
 }
 exports.getFleetSlug = getFleetSlug;
-async function getOwnOrganizations(sdk) {
-    return await sdk.models.organization.getAll({
+async function getOwnOrganizations(sdk, options) {
+    return await sdk.models.organization.getAll(sdk.utils.mergePineOptions({
         $filter: {
             organization_membership: {
                 $any: {
@@ -33,7 +33,7 @@ async function getOwnOrganizations(sdk) {
             },
         },
         $orderby: 'name asc',
-    });
+    }, options));
 }
 exports.getOwnOrganizations = getOwnOrganizations;
 //# sourceMappingURL=sdk.js.map

package/build/utils/sdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../lib/utils/sdk.ts"],"names":[],"mappings":";;;AAuCO,KAAK,UAAU,cAAc,CACnC,GAAc,EACd,cAA+B,EAC/B,OAAkC;IAElC,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IACC,OAAO,cAAc,KAAK,QAAQ;QAClC,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAClC;QAGD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAC/C,cAAc,EACd,OAAO,EACP,qBAAqB,CACrB,CAAC;KACF;IACD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CACxD,cAAc,EACd,OAAO,CACP,CAAC;AACH,CAAC;AAtBD,wCAsBC;AASM,KAAK,UAAU,YAAY,CACjC,GAAc,EACd,UAAkB;IAElB,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QAGpC,OAAO,CAAC,MAAM,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;KACpD;IACD,OAAO,UAAU,CAAC,WAAW,EAAE,CAAC;AACjC,CAAC;AAXD,oCAWC;AAMM,KAAK,UAAU,mBAAmB,CACxC,GAAc;IAEd,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;QAC3C,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,IAAI,EAAE;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE;wBACN,GAAG,EAAE;4BACJ,IAAI,EAAE,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE;yBAChC;qBACD;iBACD;aACD;SACD;QACD,QAAQ,EAAE,UAAU;KACpB,CAAC,CAAC;AACJ,CAAC;AAlBD,kDAkBC"}
+{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../lib/utils/sdk.ts"],"names":[],"mappings":";;;AAuCO,KAAK,UAAU,cAAc,CACnC,GAAc,EACd,cAA+B,EAC/B,OAAkC;IAElC,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IACC,OAAO,cAAc,KAAK,QAAQ;QAClC,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAClC;QAGD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAC/C,cAAc,EACd,OAAO,EACP,qBAAqB,CACrB,CAAC;KACF;IACD,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CACxD,cAAc,EACd,OAAO,CACP,CAAC;AACH,CAAC;AAtBD,wCAsBC;AASM,KAAK,UAAU,YAAY,CACjC,GAAc,EACd,UAAkB;IAElB,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;IAC5D,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QAGpC,OAAO,CAAC,MAAM,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACzE;IACD,OAAO,UAAU,CAAC,WAAW,EAAE,CAAC;AACjC,CAAC;AAXD,oCAWC;AAaM,KAAK,UAAU,mBAAmB,CACxC,GAAc,EACd,OAAmC;IAEnC,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAC1C,GAAG,CAAC,KAAK,CAAC,gBAAgB,CACzB;QACC,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,IAAI,EAAE;oBACL,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE;wBACN,GAAG,EAAE;4BACJ,IAAI,EAAE,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE;yBAChC;qBACD;iBACD;aACD;SACD;QACD,QAAQ,EAAE,UAAU;KACpB,EACD,OAAO,CACP,CACD,CAAC;AACH,CAAC;AAxBD,kDAwBC"}

package/lib/commands/config/generate.ts

@@ -147,6 +147,7 @@ export default class ConfigGenerateCmd extends Command {
 	public async getApplication(balena: BalenaSDK, fleet: string) {
 		const { getApplication } = await import('../../utils/sdk');
 		return await getApplication(balena, fleet, {
+			$select: 'slug',
 			$expand: {
 				is_for__device_type: { $select: 'slug' },
 			},

package/lib/commands/device/init.ts

@@ -131,6 +131,7 @@ export default class DeviceInitCmd extends Command {
 					await (await import('../../utils/patterns')).selectApplication()
 				).slug,
 			{
+				$select: ['id', 'slug'],
 				$expand: {
 					is_for__device_type: {
 						$select: 'slug',

package/lib/commands/device/move.ts

@@ -30,13 +30,6 @@ import { ExpectedError } from '../../errors';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 import { applicationIdInfo } from '../../utils/messages';
 
-type ExtendedDevice = PineTypedResult<
-	Device,
-	typeof import('../../utils/helpers').expandForAppNameAndCpuArch
-> & {
-	application_name?: string;
-};
-
 interface FlagsDef {
 	fleet?: string;
 	help: void;
@@ -82,6 +75,33 @@ export default class DeviceMoveCmd extends Command {
 
 	public static authenticated = true;
 
+	private async getDevices(balena: BalenaSDK, deviceUuids: string[]) {
+		const deviceOptions = {
+			$select: 'belongs_to__application',
+			$expand: {
+				is_of__device_type: {
+					$select: 'is_of__cpu_architecture',
+					$expand: {
+						is_of__cpu_architecture: {
+							$select: 'slug',
+						},
+					},
+				},
+			},
+		} satisfies PineOptions<Device>;
+
+		// TODO: Refacor once `device.get()` accepts an array of uuids`
+		const devices = await Promise.all(
+			deviceUuids.map(
+				(uuid) =>
+					balena.models.device.get(uuid, deviceOptions) as Promise<
+						PineTypedResult<Device, typeof deviceOptions>
+					>,
+			),
+		);
+		return devices;
+	}
+
 	public async run() {
 		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
 			DeviceMoveCmd,
@@ -89,36 +109,17 @@ export default class DeviceMoveCmd extends Command {
 
 		const balena = getBalenaSdk();
 
-		const { expandForAppNameAndCpuArch } = await import('../../utils/helpers');
-
 		// Split uuids string into array of uuids
 		const deviceUuids = params.uuid.split(',');
 
-		// Get devices
-		const devices = await Promise.all(
-			deviceUuids.map(
-				(uuid) =>
-					balena.models.device.get(
-						uuid,
-						expandForAppNameAndCpuArch,
-					) as Promise<ExtendedDevice>,
-			),
-		);
-
-		// Map application name for each device
-		for (const device of devices) {
-			const belongsToApplication = device.belongs_to__application;
-			device.application_name = belongsToApplication?.[0]
-				? belongsToApplication[0].app_name
-				: 'N/a';
-		}
+		const devices = await this.getDevices(balena, deviceUuids);
 
 		// Disambiguate application
 		const { getApplication } = await import('../../utils/sdk');
 
 		// Get destination application
 		const application = options.fleet
-			? await getApplication(balena, options.fleet)
+			? await getApplication(balena, options.fleet, { $select: ['id', 'slug'] })
 			: await this.interactivelySelectApplication(balena, devices);
 
 		// Move each device
@@ -135,7 +136,7 @@ export default class DeviceMoveCmd extends Command {
 
 	async interactivelySelectApplication(
 		balena: BalenaSDK,
-		devices: ExtendedDevice[],
+		devices: Awaited<ReturnType<typeof this.getDevices>>,
 	) {
 		const { getExpandedProp } = await import('../../utils/pine');
 		// deduplicate the slugs
@@ -181,7 +182,9 @@ export default class DeviceMoveCmd extends Command {
 			const application = await patterns.selectApplication(
 				(app) =>
 					compatibleDeviceTypeSlugs.has(app.is_for__device_type[0].slug) &&
-					devices.some((device) => device.application_name !== app.app_name),
+					devices.some(
+						(device) => device.belongs_to__application.__id !== app.id,
+					),
 				true,
 			);
 			return application;

package/lib/commands/device/register.ts

@@ -78,7 +78,9 @@ export default class DeviceRegisterCmd extends Command {
 
 		const balena = getBalenaSdk();
 
-		const application = await getApplication(balena, params.fleet);
+		const application = await getApplication(balena, params.fleet, {
+			$select: ['id', 'slug'],
+		});
 		const uuid = options.uuid ?? balena.models.device.generateUniqueKey();
 
 		console.info(`Registering to ${application.slug}: ${uuid}`);

package/lib/commands/devices/index.ts

@@ -92,7 +92,9 @@ export default class DevicesCmd extends Command {
 
 		if (options.fleet != null) {
 			const { getApplication } = await import('../../utils/sdk');
-			const application = await getApplication(balena, options.fleet);
+			const application = await getApplication(balena, options.fleet, {
+				$select: 'id',
+			});
 			devices = (await balena.models.device.getAllByApplication(
 				application.id,
 				devicesOptions,

package/lib/commands/fleet/create.ts

@@ -130,7 +130,9 @@ export default class FleetCreateCmd extends Command {
 
 	async getOrganization() {
 		const { getOwnOrganizations } = await import('../../utils/sdk');
-		const organizations = await getOwnOrganizations(getBalenaSdk());
+		const organizations = await getOwnOrganizations(getBalenaSdk(), {
+			$select: ['name', 'handle'],
+		});
 
 		if (organizations.length === 0) {
 			// User is not a member of any organizations (should not happen).

package/lib/commands/fleet/purge.ts

@@ -65,7 +65,9 @@ export default class FleetPurgeCmd extends Command {
 
 		// balena.models.application.purge only accepts a numeric id
 		// so we must first fetch the app to get it's id,
-		const application = await getApplication(balena, params.fleet);
+		const application = await getApplication(balena, params.fleet, {
+			$select: 'id',
+		});
 
 		try {
 			await balena.models.application.purge(application.id);

package/lib/commands/fleet/rename.ts

@@ -77,9 +77,10 @@ export default class FleetRenameCmd extends Command {
 		// Disambiguate target application (if params.params is a number, it could either be an ID or a numerical name)
 		const { getApplication } = await import('../../utils/sdk');
 		const application = await getApplication(balena, params.fleet, {
+			$select: ['id', 'app_name', 'slug'],
 			$expand: {
 				application_type: {
-					$select: ['slug'],
+					$select: 'slug',
 				},
 			},
 		});
@@ -132,9 +133,9 @@ export default class FleetRenameCmd extends Command {
 		}
 
 		// Get application again, to be sure of results
-		const renamedApplication = await balena.models.application.get(
-			application.id,
-		);
+		const renamedApplication = await getApplication(balena, application.id, {
+			$select: ['app_name', 'slug'],
+		});
 
 		// Output result
 		console.log(`Fleet renamed`);

package/lib/commands/fleet/restart.ts

@@ -63,7 +63,9 @@ export default class FleetRestartCmd extends Command {
 		const balena = getBalenaSdk();
 
 		// Disambiguate application
-		const application = await getApplication(balena, params.fleet);
+		const application = await getApplication(balena, params.fleet, {
+			$select: 'slug',
+		});
 
 		await balena.models.application.restart(application.slug);
 	}

package/lib/commands/fleet/rm.ts

@@ -76,7 +76,9 @@ export default class FleetRmCmd extends Command {
 		);
 
 		// Disambiguate application (if is a number, it could either be an ID or a numerical name)
-		const application = await getApplication(balena, params.fleet);
+		const application = await getApplication(balena, params.fleet, {
+			$select: 'slug',
+		});
 
 		// Remove
 		await balena.models.application.remove(application.slug);

package/lib/commands/orgs.ts

@@ -46,7 +46,9 @@ export default class OrgsCmd extends Command {
 		const { getOwnOrganizations } = await import('../utils/sdk');
 
 		// Get organizations
-		const organizations = await getOwnOrganizations(getBalenaSdk());
+		const organizations = await getOwnOrganizations(getBalenaSdk(), {
+			$select: ['name', 'handle'],
+		});
 
 		// Display
 		console.log(

package/lib/commands/push.ts

@@ -328,7 +328,7 @@ export default class PushCmd extends Command {
 		]);
 
 		const application = await getApplication(sdk, appNameOrSlug, {
-			$select: ['app_name', 'slug'],
+			$select: 'slug',
 		});
 
 		const opts = {

package/lib/utils/helpers.ts

@@ -437,20 +437,6 @@ export const expandForAppName = {
 	},
 } satisfies BalenaSdk.PineOptions<BalenaSdk.Device>;
 
-export const expandForAppNameAndCpuArch = {
-	$expand: {
-		...expandForAppName.$expand,
-		is_of__device_type: {
-			$select: 'slug',
-			$expand: {
-				is_of__cpu_architecture: {
-					$select: 'slug',
-				},
-			},
-		},
-	},
-} satisfies BalenaSdk.PineOptions<BalenaSdk.Device>;
-
 /**
  * Use the `readline` library on Windows to install SIGINT handlers.
  * This appears to be necessary on MSYS / Git for Windows, and also useful

package/lib/utils/patterns.ts

@@ -14,7 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import type { BalenaSDK, Device, Organization } from 'balena-sdk';
+import type {
+	Application,
+	BalenaSDK,
+	Device,
+	Organization,
+	PineOptions,
+	PineTypedResult,
+} from 'balena-sdk';
 import _ = require('lodash');
 
 import { instanceOf, NotLoggedInError, ExpectedError } from '../errors';
@@ -157,18 +164,28 @@ export async function confirm(
 	}
 }
 
+const selectApplicationPineOptions = {
+	$select: ['id', 'slug', 'app_name'],
+	$expand: {
+		is_for__device_type: {
+			$select: 'slug',
+		},
+	},
+} satisfies PineOptions<Application>;
+
+type SelectApplicationResult = PineTypedResult<
+	Application,
+	typeof selectApplicationPineOptions
+>;
+
 export async function selectApplication(
-	filter?: (app: ApplicationWithDeviceType) => boolean,
+	filter?: (app: SelectApplicationResult) => boolean,
 	errorOnEmptySelection = false,
 ) {
 	const balena = getBalenaSdk();
-	const apps = (await balena.models.application.getAllDirectlyAccessible({
-		$expand: {
-			is_for__device_type: {
-				$select: 'slug',
-			},
-		},
-	})) as ApplicationWithDeviceType[];
+	const apps = (await balena.models.application.getAllDirectlyAccessible(
+		selectApplicationPineOptions,
+	)) as SelectApplicationResult[];
 
 	if (!apps.length) {
 		throw new ExpectedError('No fleets found');
@@ -193,7 +210,9 @@ export async function selectOrganization(
 	organizations?: Array<Pick<Organization, 'handle' | 'name'>>,
 ) {
 	// Use either provided orgs (if e.g. already loaded) or load from cloud
-	organizations ??= await getBalenaSdk().models.organization.getAll();
+	organizations ??= await getBalenaSdk().models.organization.getAll({
+		$select: ['name', 'handle'],
+	});
 	return getCliForm().ask({
 		message: 'Select an organization',
 		type: 'list',
@@ -296,7 +315,9 @@ export async function getOnlineTargetDeviceUuid(
 		try {
 			logger.logDebug(`Fetching fleet ${fleetOrDevice}`);
 			const { getApplication } = await import('./sdk');
-			return await getApplication(sdk, fleetOrDevice);
+			return await getApplication(sdk, fleetOrDevice, {
+				$select: ['id', 'slug'],
+			});
 		} catch (err) {
 			const { BalenaApplicationNotFound } = await import('balena-errors');
 			if (instanceOf(err, BalenaApplicationNotFound)) {

package/lib/utils/sdk.ts

@@ -76,31 +76,44 @@ export async function getFleetSlug(
 	if (!looksLikeFleetSlug(nameOrSlug)) {
 		// Not a slug: must be an app name.
 		// TODO: revisit this logic when we add support for fleet UUIDs.
-		return (await getApplication(sdk, nameOrSlug)).slug;
+		return (await getApplication(sdk, nameOrSlug, { $select: 'slug' })).slug;
 	}
 	return nameOrSlug.toLowerCase();
 }
 
+export async function getOwnOrganizations(
+	sdk: BalenaSDK,
+): Promise<Organization[]>;
+export async function getOwnOrganizations<TP extends PineOptions<Organization>>(
+	sdk: BalenaSDK,
+	options: TP,
+): Promise<Array<PineTypedResult<Organization, TP>>>;
 /**
  * Wraps the sdk organization.getAll method,
  * restricting to those orgs user is a member of
  */
 export async function getOwnOrganizations(
 	sdk: BalenaSDK,
+	options?: PineOptions<Organization>,
 ): Promise<Organization[]> {
-	return await sdk.models.organization.getAll({
-		$filter: {
-			organization_membership: {
-				$any: {
-					$alias: 'orm',
-					$expr: {
-						orm: {
-							user: await sdk.auth.getUserId(),
+	return await sdk.models.organization.getAll(
+		sdk.utils.mergePineOptions(
+			{
+				$filter: {
+					organization_membership: {
+						$any: {
+							$alias: 'orm',
+							$expr: {
+								orm: {
+									user: await sdk.auth.getUserId(),
+								},
+							},
 						},
 					},
 				},
+				$orderby: 'name asc',
 			},
-		},
-		$orderby: 'name asc',
-	});
+			options,
+		),
+	);
 }

package/npm-shrinkwrap.json

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