diff --git a/internal/cmd/instance/deprovision.go b/internal/cmd/instance/deprovision.go index 23e5ebb..b28e9a3 100644 --- a/internal/cmd/instance/deprovision.go +++ b/internal/cmd/instance/deprovision.go @@ -48,7 +48,7 @@ func NewDeprovisionCmd(context *cmd.Context, input io.Reader) *DeprovisionCmd { // Validate validates command's arguments func (dbc *DeprovisionCmd) Validate(args []string) error { if len(args) != 1 { - return fmt.Errorf("single [name] is required") + return fmt.Errorf("Only single [name] is allowed.") } dbc.name = args[0] @@ -69,11 +69,11 @@ func (dbc *DeprovisionCmd) Run() error { return err } if len(toDeprovision.ServiceInstances) < 1 { - output.PrintMessage(dbc.Output, "Service Instance not found.\n") + output.PrintMessage(dbc.Output, "Service instance not found.\n") return nil } if len(toDeprovision.ServiceInstances) > 1 { - return fmt.Errorf("more than one service instance with name %s found. Use --id flag to specify id of the instance to be deleted", dbc.name) + return fmt.Errorf("More than one service instance with the specified name %s was found. Use --id flag to specify the ID of service instance you want to delete.", dbc.name) } dbc.id = toDeprovision.ServiceInstances[0].ID } @@ -85,14 +85,14 @@ func (dbc *DeprovisionCmd) Run() error { } location, err := dbc.Client.Deprovision(dbc.id, &dbc.Parameters) if err != nil { - output.PrintMessage(dbc.Output, "Could not delete service instance. Reason: ") + output.PrintMessage(dbc.Output, "Could not delete the service instance. Reason: ") return err } if len(location) != 0 { - cmd.CommonHandleAsyncExecution(dbc.Context, location, fmt.Sprintf("Service Instance %s successfully scheduled for deletion. To see status of the operation use:\n", dbc.name)) + cmd.CommonHandleAsyncExecution(dbc.Context, location, fmt.Sprintf("Service instance %s successfully scheduled for deletion. To see the current status, use:\n", dbc.name)) return nil } - output.PrintMessage(dbc.Output, "Service Instance successfully deleted.\n") + output.PrintMessage(dbc.Output, "Service instance successfully deleted.\n") return nil } @@ -104,7 +104,7 @@ func (dbc *DeprovisionCmd) HideUsage() bool { // AskForConfirmation asks the user to confirm deletion func (dbc *DeprovisionCmd) AskForConfirmation() (bool, error) { if !dbc.force { - message := fmt.Sprintf("Do you really want to delete instance with name [%s] (Y/n): ", dbc.name) + message := fmt.Sprintf("Do you really want to delete the instance with name [%s]? (y/n): ", dbc.name) return cmd.CommonConfirmationPrompt(message, dbc.Context, dbc.input) } return true, nil @@ -119,17 +119,17 @@ func (dbc *DeprovisionCmd) PrintDeclineMessage() { func (dbc *DeprovisionCmd) Prepare(prepare cmd.PrepareFunc) *cobra.Command { result := &cobra.Command{ Use: "deprovision [name]", - Short: "Deletes service instance", - Long: `Deletes service instance by name.`, + Short: "Deletes a service instance.", + Long: `Deletes service instance by the specified name. If more than one instance with the same name exists, use the --id flag instead.`, PreRunE: prepare(dbc, dbc.Context), RunE: cmd.RunE(dbc), } - forceUsage := "Use this parameter to delete a resource without raising a confirmation message." - forceDeleteUsage := "Delete the service instance and all of its associated resources from the database, including all its service bindings. Use this parameter if the service instance cannot be properly deleted. This parameter can only be used by operators with technical access." + forceUsage := "Deletes a resource without a preconditioned confirmation message." + forceDeleteUsage := "Delete the service instance and all its associated resources from the database, including its service bindings. Use this parameter if the service instance cannot be properly deleted. Operators can only use this parameter with technical access." result.Flags().BoolVarP(&dbc.force, "force", "f", false, forceUsage) result.Flags().BoolVarP(&dbc.forceDelete, "force-delete", "", false, forceDeleteUsage) - result.Flags().StringVarP(&dbc.id, "id", "", "", "ID of the service instance. Required when name is ambiguous.") + result.Flags().StringVarP(&dbc.id, "id", "", "", "ID of the service instance. Required when service instance name is ambiguous.") cmd.AddCommonQueryFlag(result.Flags(), &dbc.Parameters) cmd.AddModeFlag(result.Flags(), "async")