Refactor API key search and add validation for removing current API k…

…ey close Civo apikey issue #355

Signed-off-by: Alejandro J. Nuñez Madrazo <[email protected]>

cmd/apikey/apikey.go

@@ -3,7 +3,6 @@ package apikey
 import (
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/civo/cli/config"
 	"github.com/spf13/cobra"
@@ -29,7 +28,7 @@ between them when required.`,
 func apiKeyFind(search string) (string, error) {
 	var result string
 	for key, value := range config.Current.APIKeys {
-		if strings.Contains(key, search) || strings.Contains(value, search) {
+		if key == search || value == search {
 			result = key
 		}
 	}

cmd/apikey/apikey_remove.go

@@ -23,6 +23,12 @@ var apikeyRemoveCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
+		// Check if the requested API key is the current one
+		if index == config.Current.Meta.CurrentAPIKey {
+			utility.Warning("The API key %q is the current one, please change it before removing it", args[0])
+			os.Exit(1)
+		}
+
 		if utility.UserConfirmedDeletion("api key", common.DefaultYes, args[0]) {
 			numKeys := len(config.Current.APIKeys)
 			delete(config.Current.APIKeys, index)