Improve application-identifier disambiguation

Change-type: patch
Resolves: #2077
Signed-off-by: Scott Lowe <scott@balena.io>
This commit is contained in:
Scott Lowe
2020-11-04 16:42:31 +01:00
parent fcd0932df8
commit 46249e319b
9 changed files with 94 additions and 38 deletions

View File

@ -84,18 +84,19 @@ export default class DeviceInitCmd extends Command {
const tmp = await import('tmp');
const tmpNameAsync = promisify(tmp.tmpName);
tmp.setGracefulCleanup();
const balena = getBalenaSdk();
const { downloadOSImage } = await import('../../utils/cloud');
const Logger = await import('../../utils/logger');
const { getApplication } = await import('../../utils/sdk');
const logger = Logger.getLogger();
const logger = await Command.getLogger();
const balena = getBalenaSdk();
// Consolidate application options
options.application = options.application || options.app;
delete options.app;
// Get application and
const application = (await balena.models.application.get(
const application = (await getApplication(
balena,
options['application'] ||
(await (await import('../../utils/patterns')).selectApplication()),
{