From 9d8df0b78122fedee2290a2b3ca784ae1d8461a6 Mon Sep 17 00:00:00 2001 From: Thodoris Greasidis Date: Sat, 20 May 2023 00:24:23 +0300 Subject: [PATCH] fleet rm,restart,rename,purge: Stop fetching unnecessary app fields Halves the amout of application data retrieved. Change-type: patch --- lib/commands/fleet/purge.ts | 4 +++- lib/commands/fleet/rename.ts | 9 +++++---- lib/commands/fleet/restart.ts | 4 +++- lib/commands/fleet/rm.ts | 4 +++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/commands/fleet/purge.ts b/lib/commands/fleet/purge.ts index 9961cfc7..1f577e08 100644 --- a/lib/commands/fleet/purge.ts +++ b/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); diff --git a/lib/commands/fleet/rename.ts b/lib/commands/fleet/rename.ts index 8d87bef8..23e0f183 100644 --- a/lib/commands/fleet/rename.ts +++ b/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`); diff --git a/lib/commands/fleet/restart.ts b/lib/commands/fleet/restart.ts index 9afebb6d..f4838ccf 100644 --- a/lib/commands/fleet/restart.ts +++ b/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); } diff --git a/lib/commands/fleet/rm.ts b/lib/commands/fleet/rm.ts index 73bd9b04..f47acb02 100644 --- a/lib/commands/fleet/rm.ts +++ b/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);