From 02d3220f2d78e63af45acbcaacb02c74e5227d15 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Wed, 22 Dec 2021 15:04:58 +0100 Subject: [PATCH] Fix some app/fleet terminology issues Signed-off-by: Scott Lowe --- lib/commands/fleet/rename.ts | 13 +++++++++++++ lib/commands/tag/set.ts | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/commands/fleet/rename.ts b/lib/commands/fleet/rename.ts index c8efc4a7..ef58d281 100644 --- a/lib/commands/fleet/rename.ts +++ b/lib/commands/fleet/rename.ts @@ -108,6 +108,13 @@ export default class FleetRenameCmd extends Command { })) || ''; + // Check they haven't used slug in new name + if (newName.includes('/')) { + throw new ExpectedError( + `New fleet name cannot include '/', please check that you are not specifying fleet slug.`, + ); + } + // Rename try { await balena.models.application.rename(application.id, newName); @@ -116,6 +123,12 @@ export default class FleetRenameCmd extends Command { if ((e.message || '').toLowerCase().includes('unique')) { throw new ExpectedError(`Error: fleet ${newName} already exists.`); } + // BalenaRequestError: Request error: App name may only contain [a-zA-Z0-9_-]. + if ((e.message || '').toLowerCase().includes('name may only contain')) { + throw new ExpectedError( + `Error: new fleet name may only include characters [a-zA-Z0-9_-].`, + ); + } throw e; } diff --git a/lib/commands/tag/set.ts b/lib/commands/tag/set.ts index 82a62e26..82b5ef12 100644 --- a/lib/commands/tag/set.ts +++ b/lib/commands/tag/set.ts @@ -75,15 +75,15 @@ export default class TagSetCmd extends Command { public static flags: flags.Input = { fleet: { ...cf.fleet, - exclusive: ['app', 'application', 'device', 'release'], + exclusive: ['device', 'release'], }, device: { ...cf.device, - exclusive: ['app', 'application', 'fleet', 'release'], + exclusive: ['fleet', 'release'], }, release: { ...cf.release, - exclusive: ['app', 'application', 'fleet', 'device'], + exclusive: ['fleet', 'device'], }, help: cf.help, };