Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Api key del #421

Merged
merged 2 commits into from
May 17, 2024
Merged

Api key del #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8781a2b
Enable Deletion of current API key
uzaxirr Apr 27, 2024
730db18
Added --force flag
uzaxirr May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/apikey/apikey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ func init() {

// Flags for "civo apikey save" command
apikeySaveCmd.Flags().BoolVar(&loadAPIKeyFromEnv, "load-from-env", false, "When set, the name and key will be taken from environment variables (see notes above)")
apikeyRemoveCmd.Flags().BoolVar(&forceFlag, "force", false, "Force removal of the current API key without confirmation")
}
14 changes: 10 additions & 4 deletions cmd/apikey/apikey_remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"github.com/spf13/cobra"
)

var forceFlag bool

var apikeyRemoveCmd = &cobra.Command{
Use: "remove",
Aliases: []string{"delete", "rm"},
Expand All @@ -19,17 +21,21 @@ var apikeyRemoveCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
index, err := apiKeyFind(args[0])
if err != nil {
utility.Error("Unable find the API key %s", err.Error())
utility.Error("Unable to find the API key %s", err.Error())
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 forceFlag {
utility.Warning("The API key %q is the current one. You are using the --force flag, so it will be deleted.", args[0])
} else {
utility.Warning("The API key %q is the current one. If you remove it, you will need to set another API key as the current one to continue using the CLI.", args[0])
}
}

if utility.UserConfirmedDeletion("api key", common.DefaultYes, args[0]) {
// Confirm deletion of the API key
if forceFlag || utility.UserConfirmedDeletion("API key", common.DefaultYes, args[0]) {
numKeys := len(config.Current.APIKeys)
delete(config.Current.APIKeys, index)
config.SaveConfig()
Expand Down
Loading