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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "23.2.13",
+  "version": "23.2.14-build-update-compose-tar-dependencies-8decbe453ca1f661f606bfb12ed61e774d54276a-1",
   "description": "The official balena Command Line Interface",
   "main": "./build/app.js",
   "homepage": "https://github.com/balena-io/balena-cli",
@@ -176,7 +176,7 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@balena/compose": "^7.0.10",
+    "@balena/compose": "^7.2.1",
     "@balena/dockerignore": "^1.0.2",
     "@balena/env-parsing": "^1.1.8",
     "@balena/es-version": "^1.0.1",
@@ -243,8 +243,8 @@
     "stream-to-promise": "^2.2.0",
     "string-width": "^4.2.3",
     "strip-ansi-stream": "^1.0.0",
-    "tar-stream": "^2.1.3",
-    "tar-utils": "^3.0.3",
+    "tar-stream": "^3.1.7",
+    "tar-utils": "^3.1.1",
     "through2": "^2.0.3",
     "tmp": "^0.2.1",
     "typed-error": "^3.2.1",
@@ -262,6 +262,6 @@
     "balena-request": "14.0.6"
   },
   "versionist": {
-    "publishedAt": "2025-12-29T14:29:28.509Z"
+    "publishedAt": "2025-12-30T07:41:17.796Z"
   }
 }

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

@@ -15,12 +15,9 @@
  * limitations under the License.
  */
 
-import type {
-	ImageModel,
-	ReleaseModel,
-} from '@balena/compose/dist/release/models';
-import type { Composition, ImageDescriptor } from '@balena/compose/dist/parse';
+import type * as compose from '@balena/compose';
 import type { Pack } from 'tar-stream';
+import type { BalenaModel } from 'balena-sdk';
 
 interface Image {
 	context: string;
@@ -42,7 +39,10 @@ export interface BuiltImage {
 
 export interface TaggedImage {
 	localImage: import('dockerode').Image;
-	serviceImage: import('@balena/compose/dist/release/models').ImageModel;
+	serviceImage: Omit<
+		BalenaModel['image']['Read'],
+		'created_at' | 'is_a_build_of__service'
+	>;
 	serviceName: string;
 	logs: string;
 	props: BuiltImage.props;
@@ -75,14 +75,14 @@ export interface ComposeCliFlags {
 export interface ComposeProject {
 	path: string;
 	name: string;
-	composition: Composition;
-	descriptors: ImageDescriptor[];
+	composition: compose.parse.Composition;
+	descriptors: compose.parse.ImageDescriptor[];
 }
 
 export interface Release {
-	client: import('@balena/compose').release.Request['client'];
+	client: compose.release.Request['client'];
 	release: Pick<
-		ReleaseModel,
+		BalenaModel['release']['Read'],
 		| 'id'
 		| 'status'
 		| 'commit'
@@ -95,12 +95,12 @@ export interface Release {
 		| 'end_timestamp'
 	>;
 	serviceImages: Dictionary<
-		Omit<ImageModel, 'created_at' | 'is_a_build_of__service'>
+		Omit<BalenaModel['image']['Read'], 'created_at' | 'is_a_build_of__service'>
 	>;
 }
 
 interface TarDirectoryOptions {
-	composition?: Composition;
+	composition?: compose.parse.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/models').ReleaseModel['contract'],
+	contract: import('@balena/compose/dist/release').Request['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 } = await releaseMod.create({
+	const { release, serviceImages: $serviceImages } = await releaseMod.create({
 		client: pinejsClient,
 		user: userId,
 		application: appId,
@@ -169,14 +169,19 @@ export const createRelease = async function (
 		imgDescriptors,
 	});
 
-	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;
-		}
-	}
+	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];
+		}),
+	);
 
 	return {
 		client: pinejsClient,

package/src/utils/compose_ts.ts

@@ -37,6 +37,7 @@ import type {
 	BuiltImage,
 	ComposeOpts,
 	ComposeProject,
+	Release,
 	TaggedImage,
 	TarDirectoryOptions,
 } from './compose-types';
@@ -44,7 +45,6 @@ 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: import('@balena/compose/dist/release/models').ImageModel,
+		serviceImage: TaggedImage['serviceImage'],
 		props: object,
 	) => Promise<void>,
 ) {
@@ -1338,7 +1338,7 @@ async function pushAndUpdateServiceImages(
 			if (props.endTime) {
 				serviceImage.end_timestamp = props.endTime;
 			}
-			serviceImage.push_timestamp = new Date();
+			serviceImage.push_timestamp = new Date().toISOString();
 			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 imagePayload = pick(serviceImage, [
+			const imagePayloadFields = [
 				'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<import('@balena/compose/dist/release/models').ReleaseModel> {
+): Promise<Release['release']> {
 	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();
+			release.end_timestamp = new Date().toISOString();
 			if (release.id != null) {
 				await releaseMod.updateRelease(pineClient, release.id, {
 					status: release.status,
@@ -1552,9 +1552,7 @@ export function createRunLoop(tick: (...args: any[]) => void) {
 
 async function getContractContent(
 	filePath: string,
-): Promise<
-	import('@balena/compose/dist/release/models').ReleaseModel['contract']
-> {
+): Promise<import('@balena/compose/dist/release').Request['contract']> {
 	let fileContentAsString;
 	try {
 		fileContentAsString = await fs.readFile(filePath, 'utf8');