From 4b657e5313cd11b6ee534ffd82f095c5baad9205 Mon Sep 17 00:00:00 2001 From: Sammy Kerata Oina <44265300+SammyOina@users.noreply.github.com> Date: Thu, 31 Jul 2025 19:30:14 +0300 Subject: [PATCH] NOISSUE - Fix error handling in NewRemoveVMCmd to ensure proper connection checks before removing a VM (#488) * Fix error handling in NewRemoveVMCmd to ensure proper connection checks before removing a VM Signed-off-by: Sammy Oina * Update cli/manager.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Signed-off-by: Sammy Oina Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- cli/manager.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cli/manager.go b/cli/manager.go index 6c953181..e372eb3f 100644 --- a/cli/manager.go +++ b/cli/manager.go @@ -95,15 +95,12 @@ func (c *CLI) NewRemoveVMCmd() *cobra.Command { Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { if c.managerClient == nil || c.connectErr != nil { - if err := c.InitializeManagerClient(cmd); err == nil { - defer c.Close() + if err := c.InitializeManagerClient(cmd); err != nil { + printError(cmd, "Failed to connect to manager: %v ❌ ", err) + return } } - - if c.connectErr != nil { - printError(cmd, "Failed to connect to manager: %v ❌ ", c.connectErr) - return - } + defer c.Close() cmd.Println("🔗 Removing virtual machine")