device os-update: Refactor to use the overall_progress field

Change-type: patch Signed-off-by: Thodoris Greasidis <thodoris@balena.io>
balena-io · Apr 21, 2020 · 467324e · 467324e
1 parent 32b1a7b
commit 467324e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 44 deletions.
diff --git a/lib/utils/device/progress.ts b/lib/utils/device/progress.ts
diff --git a/lib/utils/patterns.ts b/lib/utils/patterns.ts
@@ -279,7 +279,6 @@ export function awaitDevice(uuid: string) {
 
 export function awaitDeviceOsUpdate(uuid: string, targetOsVersion: string) {
 	const balena = getBalenaSdk();
-	const { getDeviceOsProgress } = require('./device/progress');
 
 	return balena.models.device.getName(uuid).then(deviceName => {
 		const visuals = getVisuals();
@@ -291,8 +290,8 @@ export function awaitDeviceOsUpdate(uuid: string, targetOsVersion: string) {
 		const poll = (): Bluebird<void> => {
 			return Bluebird.all([
 				balena.models.device.getOsUpdateStatus(uuid),
-				balena.models.device.get(uuid).then(getDeviceOsProgress),
-			]).then(([osUpdateStatus, osUpdateProgress]) => {
+				balena.models.device.get(uuid, { $select: 'overall_progress' }),
+			]).then(([osUpdateStatus, { overall_progress: osUpdateProgress }]) => {
 				if (osUpdateStatus.status === 'done') {
 					console.info(
 						`The device ${deviceName} has been updated to v${targetOsVersion} and will restart shortly!`,