refactor(ssh-keys): Check for errors in decorateAsyncOperations

exoscale · Oct 14, 2024 · 8203e03 · 8203e03
1 parent c95e972
commit 8203e03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cmd/ssh_key_delete.go b/cmd/ssh_key_delete.go
@@ -32,7 +32,6 @@ func (c *computeSSHKeyDeleteCmd) cmdPreRun(cmd *cobra.Command, args []string) er
 }
 
 func (c *computeSSHKeyDeleteCmd) cmdRun(_ *cobra.Command, _ []string) error {
-
 	ctx := gContext
 
 	if !c.Force {
@@ -41,7 +40,7 @@ func (c *computeSSHKeyDeleteCmd) cmdRun(_ *cobra.Command, _ []string) error {
 		}
 	}
 
-	decorateAsyncOperations(fmt.Sprintf("Deleting SSH key %s...", c.Name), func() error {
+	err := decorateAsyncOperations(fmt.Sprintf("Deleting SSH key %s...", c.Name), func() error {
 		op, err := globalstate.EgoscaleV3Client.DeleteSSHKey(ctx, c.Name)
 
 		if err != nil {
@@ -55,6 +54,9 @@ func (c *computeSSHKeyDeleteCmd) cmdRun(_ *cobra.Command, _ []string) error {
 
 		return nil
 	})
+	if err != nil {
+		return err
+	}
 
 	return nil
 }

diff --git a/cmd/ssh_key_register.go b/cmd/ssh_key_register.go
@@ -62,7 +62,7 @@ func (c *computeSSHKeyRegisterCmd) cmdRun(cmd *cobra.Command, _ []string) error
 		PublicKey: string(publicKey),
 	}
 
-	decorateAsyncOperations(fmt.Sprintf("Registering SSH key %q...", c.Name), func() error {
+	err = decorateAsyncOperations(fmt.Sprintf("Registering SSH key %q...", c.Name), func() error {
 		op, err := client.RegisterSSHKey(ctx, registerKeyRequest)
 
 		if err != nil {
@@ -76,9 +76,11 @@ func (c *computeSSHKeyRegisterCmd) cmdRun(cmd *cobra.Command, _ []string) error
 
 		return nil
 	})
+	if err != nil {
+		return err
+	}
 
 	if !globalstate.Quiet {
-
 		sshKey, err = client.GetSSHKey(ctx, c.Name)
 		if err != nil {
 			return err