balena-cli 23.2.14-build-update-compose-tar-dependencies-8decbe453ca1f661f606bfb12ed61e774d54276a-1 → 23.2.14

package/src/utils/compose-types.d.ts

@@ -15,9 +15,12 @@
  * limitations under the License.
  */
 
-import type * as compose from '@balena/compose';
+import type {
+	ImageModel,
+	ReleaseModel,
+} from '@balena/compose/dist/release/models';
+import type { Composition, ImageDescriptor } from '@balena/compose/dist/parse';
 import type { Pack } from 'tar-stream';
-import type { BalenaModel } from 'balena-sdk';
 
 interface Image {
 	context: string;
@@ -39,10 +42,7 @@ export interface BuiltImage {
 
 export interface TaggedImage {
 	localImage: import('dockerode').Image;
-	serviceImage: Omit<
-		BalenaModel['image']['Read'],
-		'created_at' | 'is_a_build_of__service'
-	>;
+	serviceImage: import('@balena/compose/dist/release/models').ImageModel;
 	serviceName: string;
 	logs: string;
 	props: BuiltImage.props;
@@ -75,14 +75,14 @@ export interface ComposeCliFlags {
 export interface ComposeProject {
 	path: string;
 	name: string;
-	composition: compose.parse.Composition;
-	descriptors: compose.parse.ImageDescriptor[];
+	composition: Composition;
+	descriptors: ImageDescriptor[];
 }
 
 export interface Release {
-	client: compose.release.Request['client'];
+	client: import('@balena/compose').release.Request['client'];
 	release: Pick<
-		BalenaModel['release']['Read'],
+		ReleaseModel,
 		| 'id'
 		| 'status'
 		| 'commit'
@@ -95,12 +95,12 @@ export interface Release {
 		| 'end_timestamp'
 	>;
 	serviceImages: Dictionary<
-		Omit<BalenaModel['image']['Read'], 'created_at' | 'is_a_build_of__service'>
+		Omit<ImageModel, 'created_at' | 'is_a_build_of__service'>
 	>;
 }
 
 interface TarDirectoryOptions {
-	composition?: compose.parse.Composition;
+	composition?: Composition;
 	convertEol?: boolean;
 	multiDockerignore?: boolean;
 	preFinalizeCallback?: (pack: Pack) => void | Promise<void>;

package/src/utils/compose.ts

@@ -128,7 +128,7 @@ export const createRelease = async function (
 	composition: Composition,
 	draft: boolean,
 	semver: string | undefined,
-	contract: import('@balena/compose/dist/release').Request['contract'],
+	contract: import('@balena/compose/dist/release/models').ReleaseModel['contract'],
 	imgDescriptors: ImageDescriptor[],
 ): Promise<Release> {
 	const crypto = require('crypto') as typeof import('crypto');
@@ -156,7 +156,7 @@ export const createRelease = async function (
 		);
 
 	const { id: userId } = await sdk.auth.getUserInfo();
-	const { release, serviceImages: $serviceImages } = await releaseMod.create({
+	const { release, serviceImages } = await releaseMod.create({
 		client: pinejsClient,
 		user: userId,
 		application: appId,
@@ -169,19 +169,14 @@ export const createRelease = async function (
 		imgDescriptors,
 	});
 
-	const serviceImages = Object.fromEntries(
-		Object.entries($serviceImages).map(([key, serviceImage]) => {
-			if (
-				'created_at' in serviceImage ||
-				'is_a_build_of__service' in serviceImage
-			) {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars -- omit the created_at, is_a_build_of__service props
-				const { created_at, is_a_build_of__service, ...si } = serviceImage;
-				return [key, si];
-			}
-			return [key, serviceImage];
-		}),
-	);
+	for (const serviceImage of Object.values(serviceImages)) {
+		if ('created_at' in serviceImage) {
+			delete serviceImage.created_at;
+		}
+		if ('is_a_build_of__service' in serviceImage) {
+			delete serviceImage.is_a_build_of__service;
+		}
+	}
 
 	return {
 		client: pinejsClient,

package/src/utils/compose_ts.ts

@@ -37,7 +37,6 @@ import type {
 	BuiltImage,
 	ComposeOpts,
 	ComposeProject,
-	Release,
 	TaggedImage,
 	TarDirectoryOptions,
 } from './compose-types';
@@ -45,6 +44,7 @@ import type { DeviceInfo } from './device/api';
 import { getBalenaSdk, getCliUx, stripIndent } from './lazy';
 import Logger = require('./logger');
 import { exists } from './which';
+import { pick } from './helpers';
 
 const allowedContractTypes = ['sw.application', 'sw.block'];
 
@@ -1274,7 +1274,7 @@ async function pushAndUpdateServiceImages(
 	token: string,
 	images: TaggedImage[],
 	afterEach: (
-		serviceImage: TaggedImage['serviceImage'],
+		serviceImage: import('@balena/compose/dist/release/models').ImageModel,
 		props: object,
 	) => Promise<void>,
 ) {
@@ -1338,7 +1338,7 @@ async function pushAndUpdateServiceImages(
 			if (props.endTime) {
 				serviceImage.end_timestamp = props.endTime;
 			}
-			serviceImage.push_timestamp = new Date().toISOString();
+			serviceImage.push_timestamp = new Date();
 			serviceImage.status = 'success';
 		} catch (error) {
 			serviceImage.error_message = '' + error;
@@ -1378,23 +1378,23 @@ async function pushServiceImages(
 			logger.logDebug(
 				`Saving image ${serviceImage.is_stored_at__image_location}`,
 			);
+			if (skipLogUpload) {
+				delete serviceImage.build_log;
+			}
 
 			// These are the only update-able image fields in bC atm, and passing
 			// the whole image object in v7+ would result the allowlist to reject the request.
-			const imagePayloadFields = [
+			const imagePayload = pick(serviceImage, [
 				'end_timestamp',
 				'project_type',
 				'error_message',
+				'build_log',
 				'push_timestamp',
 				'status',
 				'content_hash',
 				'dockerfile',
 				'image_size',
-			];
-			if (!skipLogUpload) {
-				imagePayloadFields.push('build_log');
-			}
-			const imagePayload = _.pick(serviceImage, imagePayloadFields);
+			]);
 
 			if (
 				typeof imagePayload.error_message === 'string' &&
@@ -1425,7 +1425,7 @@ export async function deployProject(
 	projectPath: string,
 	isDraft: boolean,
 	imgDescriptors: ImageDescriptor[],
-): Promise<Release['release']> {
+): Promise<import('@balena/compose/dist/release/models').ReleaseModel> {
 	const releaseMod = await import('@balena/compose/dist/release');
 	const { createRelease, tagServiceImages } = await import('./compose');
 	const tty = (await import('./tty'))(process.stdout);
@@ -1496,7 +1496,7 @@ export async function deployProject(
 		}
 	} finally {
 		await runSpinner(tty, spinner, `${prefix}Saving release...`, async () => {
-			release.end_timestamp = new Date().toISOString();
+			release.end_timestamp = new Date();
 			if (release.id != null) {
 				await releaseMod.updateRelease(pineClient, release.id, {
 					status: release.status,
@@ -1552,7 +1552,9 @@ export function createRunLoop(tick: (...args: any[]) => void) {
 
 async function getContractContent(
 	filePath: string,
-): Promise<import('@balena/compose/dist/release').Request['contract']> {
+): Promise<
+	import('@balena/compose/dist/release/models').ReleaseModel['contract']
+> {
 	let fileContentAsString;
 	try {
 		fileContentAsString = await fs.readFile(filePath, 'utf8');

package/src/utils/patterns.ts

@@ -294,10 +294,10 @@ export async function getOnlineTargetDeviceUuid(
 				`Trying to fetch device by UUID ${fleetOrDevice} (${typeof fleetOrDevice})`,
 			);
 			const device = await sdk.models.device.get(fleetOrDevice, {
-				$select: ['uuid', 'is_online'],
+				$select: ['uuid', 'is_connected_to_vpn'],
 			});
 
-			if (!device.is_online) {
+			if (!device.is_connected_to_vpn) {
 				throw new ExpectedError(
 					`Device with UUID ${fleetOrDevice} is disconnected`,
 				);
@@ -325,7 +325,7 @@ export async function getOnlineTargetDeviceUuid(
 				$expand: {
 					owns__device: {
 						$select: ['device_name', 'uuid'],
-						$filter: { is_online: true },
+						$filter: { is_connected_to_vpn: true },
 						$orderby: { device_name: 'asc' },
 					},
 				},