ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-20 22:23:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config generate: Fix device type compatibility check

Browse Source 
Change-type: patch
This commit is contained in:
Paulo Castro 2020-10-25 16:40:11 +00:00
parent 260a30532a
commit 116ab1fbc1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/commands/config/generate.ts
View File

@ -130,7 +130,7 @@ export default class ConfigGenerateCmd extends Command {
await this.validateOptions(options); await this.validateOptions(options);
let deviceType = options.deviceType; let resourceDeviceType: string;
// Get device | application // Get device | application
let resource; let resource;
if (options.device != null) { if (options.device != null) {
@ -140,24 +140,26 @@ export default class ConfigGenerateCmd extends Command {
is_of__device_type: { $select: 'slug' }, is_of__device_type: { $select: 'slug' },
}, },
})) as DeviceWithDeviceType & { belongs_to__application: PineDeferred }; })) as DeviceWithDeviceType & { belongs_to__application: PineDeferred };
deviceType = deviceType || resource.is_of__device_type[0].slug; resourceDeviceType = resource.is_of__device_type[0].slug;
} else { } else {
resource = (await balena.models.application.get(options.application!, { resource = (await balena.models.application.get(options.application!, {
$expand: { $expand: {
is_for__device_type: { $select: 'slug' }, is_for__device_type: { $select: 'slug' },
}, },
})) as ApplicationWithDeviceType; })) as ApplicationWithDeviceType;
deviceType = deviceType || resource.is_for__device_type[0].slug; resourceDeviceType = resource.is_for__device_type[0].slug;
} }
const deviceType = options.deviceType || resourceDeviceType;
const deviceManifest = await balena.models.device.getManifestBySlug( const deviceManifest = await balena.models.device.getManifestBySlug(
deviceType!, deviceType,
); );
// Check compatibility if application and deviceType provided // Check compatibility if application and deviceType provided
if (options.application && options.deviceType) { if (options.application && options.deviceType) {
const appDeviceManifest = await balena.models.device.getManifestBySlug( const appDeviceManifest = await balena.models.device.getManifestBySlug(
deviceType!, resourceDeviceType,
); );
const helpers = await import('../../utils/helpers'); const helpers = await import('../../utils/helpers');