From d1037401bef37a5ffbd8347f0d51d0fee475eb38 Mon Sep 17 00:00:00 2001 From: Mikita Pilinka Date: Tue, 19 Mar 2024 09:43:57 +0100 Subject: [PATCH] fix: improve the error message format Ticket: ENT-11134 Changelog: None Signed-off-by: Mikita Pilinka --- cf_remote/commands.py | 2 +- cf_remote/spawn.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cf_remote/commands.py b/cf_remote/commands.py index 4927fbf..4245f2f 100644 --- a/cf_remote/commands.py +++ b/cf_remote/commands.py @@ -404,7 +404,7 @@ def spawn( spawned_cb=print_progress_dot, ) except ValueError as e: - print("Failed to spawn VMs with following error:\n" + str(e)) + print("\nError: Failed to spawn VMs - " + str(e)) return 1 print("DONE") diff --git a/cf_remote/spawn.py b/cf_remote/spawn.py index 4735ac0..f3279ab 100644 --- a/cf_remote/spawn.py +++ b/cf_remote/spawn.py @@ -308,14 +308,15 @@ def spawn_vm_in_aws( size=None, role=None, ): + if platform not in aws_platforms: + raise ValueError("Platform '%s' does not exist. (Available platforms: %s)" % (platform, + ", ".join(cloud_data.aws_platforms.keys()))) try: driver = get_cloud_driver(Providers.AWS, aws_creds, region) existing_vms = driver.list_nodes() except InvalidCredsError as error: raise ValueError( - "Invalid credentials, check cloud_config.json file, details: \n" - + str(error) - ) + "Invalid credentials, check cloud_config.json (%s.)" % str(error)[1:-1]) if name is None: name = _get_unused_name( [vm.name for vm in existing_vms], platform, _NAME_RANDOM_PART_LENGTH @@ -323,9 +324,6 @@ def spawn_vm_in_aws( else: if any(vm.state in (0, "running") and vm.name == name for vm in existing_vms): raise ValueError("VM with the name '%s' already exists" % name) - if not platform in aws_platforms: - raise ValueError("Platform '%s' does not exist.\nList of available platforms:\n%s" % (platform, - "\n".join(cloud_data.aws_platforms.keys()))) aws_platform = aws_platforms[platform] size = size or aws_platform.get("xlsize") or aws_platform["size"] user = aws_platform.get("user")