This repository has been archived by the owner on Jun 29, 2022. It is now read-only.
Add --confirm flag to delete component without asking for confirmation
#568
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
knrt10
force-pushed
the
knrt10/delete-component-flag
branch
2 times, most recently
from
c267bde
to
2b60357
Compare
knrt10
force-pushed
the
knrt10/delete-component-flag
branch
from
2b60357
to
eedd2a9
Compare
Fixes #495 Signed-off-by: knrt10 <kautilya@kinvolk.io>
knrt10
force-pushed
the
knrt10/delete-component-flag
branch
from
eedd2a9
to
feb4981
Compare
johananl
reviewed
Jun 5, 2020
| @@ -44,6 +44,7 @@ func init() { | |||
| componentCmd.AddCommand(componentDeleteCmd) | |||
| pf := componentDeleteCmd.PersistentFlags() | |||
| pf.BoolVarP(&deleteNamespace, "delete-namespace", "", false, "Delete namespace with component.") | |||
| pf.BoolVarP(&confirm, "confirm", "", false, "Delete component without asking for confirmation.") | |||
There was a problem hiding this comment.
AFAICT we don't end flag descriptions with periods. Example:
lokomotive/cli/cmd/cluster-apply.go
Line 47 in feb4981
| ) { | ||
| contextLogger.Info("Components deletion cancelled.") | ||
| return | ||
| if !confirm { |
There was a problem hiding this comment.
Nit - can save some indentation:
diff --git a/cli/cmd/component-delete.go b/cli/cmd/component-delete.go
index 76dfee7c..f4393f02 100644
--- a/cli/cmd/component-delete.go
+++ b/cli/cmd/component-delete.go
@@ -80,16 +80,14 @@ func runDelete(cmd *cobra.Command, args []string) {
componentsObjects[i] = compObj
}
- if !confirm {
- if !askForConfirmation(
- fmt.Sprintf(
- "The following components will be deleted:\n\t%s\n\nAre you sure you want to proceed?",
- strings.Join(componentsToDelete, "\n\t"),
- ),
- ) {
- contextLogger.Info("Components deletion cancelled.")
- return
- }
+ if !confirm && !askForConfirmation(
+ fmt.Sprintf(
+ "The following components will be deleted:\n\t%s\n\nAre you sure you want to proceed?",
+ strings.Join(componentsToDelete, "\n\t"),
+ ),
+ ) {
+ contextLogger.Info("Components deletion cancelled.")
+ return
}
kubeconfig, err := getKubeconfig()
|
Should I revert the changes and create a new PR @johananl? |
I'd create a new one that fixes periods at the end of flag descriptions for the whole project and another that does the indentation optimization. |
|
on it |
Nah, no need to discard your good work :-) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #495
Signed-off-by: knrt10 kautilya@kinvolk.io