balena-cli 23.2.15-build-update-compose-tar-dependencies-132ab39d4a4a27c2766acc7a6aee1cedfbe13a2c-1 → 23.2.15-build-mockttp-bf5ce35034d52be121edf75a0bf37797d46e3374-1

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').release.Request['contract']> {
+): Promise<
+	import('@balena/compose/dist/release/models').ReleaseModel['contract']
+> {
 	let fileContentAsString;
 	try {
 		fileContentAsString = await fs.readFile(filePath, 'utf8');

package/src/utils/device/api.ts

@@ -74,7 +74,9 @@ export class DeviceAPI {
 		addr: string,
 		port = 48484,
 	) {
-		this.deviceAddress = `http://${addr}:${port}/`;
+		// Allow override for testing with mock servers
+		this.deviceAddress =
+			process.env.BALENARC_SUPERVISOR_ADDRESS ?? `http://${addr}:${port}/`;
 	}
 
 	// Either return nothing, or throw an error with the info