diff options
Diffstat (limited to 'commands')
35 files changed, 174 insertions, 200 deletions
diff --git a/commands/add.go b/commands/add.go index 3a28c424f..504207fbc 100644 --- a/commands/add.go +++ b/commands/add.go @@ -19,13 +19,12 @@ func newAddCommand() *cobra.Command { options := addOptions{} cmd := &cobra.Command{ - Use: "add", - Short: "Create a new bug.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "add", + Short: "Create a new bug.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runAdd(env, options) - }, + }), } flags := cmd.Flags() diff --git a/commands/bridge.go b/commands/bridge.go index 46b3d9ecd..8ce35aa36 100644 --- a/commands/bridge.go +++ b/commands/bridge.go @@ -10,13 +10,12 @@ func newBridgeCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "bridge", - Short: "Configure and use bridges to other bug trackers.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "bridge", + Short: "Configure and use bridges to other bug trackers.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridge(env) - }, + }), Args: cobra.NoArgs, } diff --git a/commands/bridge_auth.go b/commands/bridge_auth.go index db4c5212c..50306b8da 100644 --- a/commands/bridge_auth.go +++ b/commands/bridge_auth.go @@ -16,13 +16,12 @@ func newBridgeAuthCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "auth", - Short: "List all known bridge authentication credentials.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "auth", + Short: "List all known bridge authentication credentials.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridgeAuth(env) - }, + }), Args: cobra.NoArgs, } diff --git a/commands/bridge_auth_addtoken.go b/commands/bridge_auth_addtoken.go index 272eab8cf..c0458fdaa 100644 --- a/commands/bridge_auth_addtoken.go +++ b/commands/bridge_auth_addtoken.go @@ -27,13 +27,12 @@ func newBridgeAuthAddTokenCommand() *cobra.Command { options := bridgeAuthAddTokenOptions{} cmd := &cobra.Command{ - Use: "add-token [TOKEN]", - Short: "Store a new token", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "add-token [TOKEN]", + Short: "Store a new token", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridgeAuthAddToken(env, options, args) - }, + }), Args: cobra.MaximumNArgs(1), } diff --git a/commands/bridge_auth_show.go b/commands/bridge_auth_show.go index 408a6cf17..f174cdb73 100644 --- a/commands/bridge_auth_show.go +++ b/commands/bridge_auth_show.go @@ -15,13 +15,12 @@ func newBridgeAuthShow() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "show", - Short: "Display an authentication credential.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "show", + Short: "Display an authentication credential.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridgeAuthShow(env, args) - }, + }), Args: cobra.ExactArgs(1), } diff --git a/commands/bridge_configure.go b/commands/bridge_configure.go index c0ce14612..6533e4971 100644 --- a/commands/bridge_configure.go +++ b/commands/bridge_configure.go @@ -85,11 +85,10 @@ git bug bridge configure \ --target=github \ --url=https://github.com/michaelmure/git-bug \ --token=$(TOKEN)`, - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridgeConfigure(env, options) - }, + }), } flags := cmd.Flags() diff --git a/commands/bridge_pull.go b/commands/bridge_pull.go index 95eb2fe04..3155ebf4a 100644 --- a/commands/bridge_pull.go +++ b/commands/bridge_pull.go @@ -26,13 +26,12 @@ func newBridgePullCommand() *cobra.Command { options := bridgePullOptions{} cmd := &cobra.Command{ - Use: "pull [NAME]", - Short: "Pull updates.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "pull [NAME]", + Short: "Pull updates.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridgePull(env, options, args) - }, + }), Args: cobra.MaximumNArgs(1), } diff --git a/commands/bridge_push.go b/commands/bridge_push.go index 64e3ff4bc..a232f0f07 100644 --- a/commands/bridge_push.go +++ b/commands/bridge_push.go @@ -17,13 +17,12 @@ func newBridgePushCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "push [NAME]", - Short: "Push updates.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "push [NAME]", + Short: "Push updates.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridgePush(env, args) - }, + }), Args: cobra.MaximumNArgs(1), } diff --git a/commands/bridge_rm.go b/commands/bridge_rm.go index 9f5c81c7c..121a35adf 100644 --- a/commands/bridge_rm.go +++ b/commands/bridge_rm.go @@ -10,13 +10,12 @@ func newBridgeRm() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "rm NAME", - Short: "Delete a configured bridge.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "rm NAME", + Short: "Delete a configured bridge.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runBridgeRm(env, args) - }, + }), Args: cobra.ExactArgs(1), } diff --git a/commands/comment.go b/commands/comment.go index eb90624aa..90657e4a9 100644 --- a/commands/comment.go +++ b/commands/comment.go @@ -12,13 +12,12 @@ func newCommentCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "comment [ID]", - Short: "Display or add comments to a bug.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "comment [ID]", + Short: "Display or add comments to a bug.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runComment(env, args) - }, + }), } cmd.AddCommand(newCommentAddCommand()) diff --git a/commands/comment_add.go b/commands/comment_add.go index 54c75702f..11ba5ad3a 100644 --- a/commands/comment_add.go +++ b/commands/comment_add.go @@ -19,13 +19,12 @@ func newCommentAddCommand() *cobra.Command { options := commentAddOptions{} cmd := &cobra.Command{ - Use: "add [ID]", - Short: "Add a new comment to a bug.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "add [ID]", + Short: "Add a new comment to a bug.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runCommentAdd(env, options, args) - }, + }), } flags := cmd.Flags() diff --git a/commands/comment_edit.go b/commands/comment_edit.go index 6c93ed8bc..759ea1948 100644 --- a/commands/comment_edit.go +++ b/commands/comment_edit.go @@ -17,14 +17,13 @@ func newCommentEditCommand() *cobra.Command { options := commentEditOptions{} cmd := &cobra.Command{ - Use: "edit [COMMENT_ID]", - Short: "Edit an existing comment on a bug.", - Args: cobra.ExactArgs(1), - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "edit [COMMENT_ID]", + Short: "Edit an existing comment on a bug.", + Args: cobra.ExactArgs(1), + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runCommentEdit(env, options, args) - }, + }), } flags := cmd.Flags() diff --git a/commands/deselect.go b/commands/deselect.go index 23f77e2d5..d8c44dd75 100644 --- a/commands/deselect.go +++ b/commands/deselect.go @@ -17,11 +17,10 @@ git bug comment git bug status git bug deselect `, - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runDeselect(env) - }, + }), } return cmd diff --git a/commands/env.go b/commands/env.go index 8d12c5bfa..ac7b789a4 100644 --- a/commands/env.go +++ b/commands/env.go @@ -136,15 +136,23 @@ func loadBackendEnsureUser(env *Env) func(*cobra.Command, []string) error { } } -// closeBackend is a post-run function that will close the backend properly +// closeBackend is a wrapper for a RunE function that will close the backend properly // if it has been opened. -func closeBackend(env *Env) func(*cobra.Command, []string) error { +// This wrapper style is necessary because a Cobra PostE function does not run if RunE return an error. +func closeBackend(env *Env, runE func(cmd *cobra.Command, args []string) error) func(*cobra.Command, []string) error { return func(cmd *cobra.Command, args []string) error { + errRun := runE(cmd, args) + if env.backend == nil { return nil } err := env.backend.Close() env.backend = nil + + // prioritize the RunE error + if errRun != nil { + return errRun + } return err } } diff --git a/commands/label.go b/commands/label.go index e3ffdb644..d108b0894 100644 --- a/commands/label.go +++ b/commands/label.go @@ -10,13 +10,12 @@ func newLabelCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "label [ID]", - Short: "Display, add or remove labels to/from a bug.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "label [ID]", + Short: "Display, add or remove labels to/from a bug.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runLabel(env, args) - }, + }), } cmd.AddCommand(newLabelAddCommand()) diff --git a/commands/label_add.go b/commands/label_add.go index 30c0d77f9..c60ecfebb 100644 --- a/commands/label_add.go +++ b/commands/label_add.go @@ -11,13 +11,12 @@ func newLabelAddCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "add [ID] LABEL...", - Short: "Add a label to a bug.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "add [ID] LABEL...", + Short: "Add a label to a bug.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runLabelAdd(env, args) - }, + }), } return cmd diff --git a/commands/label_rm.go b/commands/label_rm.go index 9fb3e0967..1cdcd248a 100644 --- a/commands/label_rm.go +++ b/commands/label_rm.go @@ -11,13 +11,12 @@ func newLabelRmCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "rm [ID] LABEL...", - Short: "Remove a label from a bug.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "rm [ID] LABEL...", + Short: "Remove a label from a bug.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runLabelRm(env, args) - }, + }), } return cmd diff --git a/commands/ls-id.go b/commands/ls-id.go index 686f432af..41f017e84 100644 --- a/commands/ls-id.go +++ b/commands/ls-id.go @@ -8,13 +8,12 @@ func newLsIdCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "ls-id [PREFIX]", - Short: "List bug identifiers.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "ls-id [PREFIX]", + Short: "List bug identifiers.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runLsId(env, args) - }, + }), } return cmd diff --git a/commands/ls-labels.go b/commands/ls-labels.go index a7c2fb6ff..086943a9e 100644 --- a/commands/ls-labels.go +++ b/commands/ls-labels.go @@ -13,11 +13,10 @@ func newLsLabelCommand() *cobra.Command { Long: `List valid labels. Note: in the future, a proper label policy could be implemented where valid labels are defined in a configuration file. Until that, the default behavior is to return the list of labels already used.`, - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runLsLabel(env) - }, + }), } return cmd diff --git a/commands/ls.go b/commands/ls.go index 71c420c63..9134d7527 100644 --- a/commands/ls.go +++ b/commands/ls.go @@ -52,11 +52,10 @@ git bug ls "foo bar" baz Use queries, flags, and full text search: git bug ls status:open --by creation "foo bar" baz `, - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runLs(env, options, args) - }, + }), } flags := cmd.Flags() diff --git a/commands/pull.go b/commands/pull.go index 3ad4a0c91..f3a314148 100644 --- a/commands/pull.go +++ b/commands/pull.go @@ -12,13 +12,12 @@ func newPullCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "pull [REMOTE]", - Short: "Pull bugs update from a git remote.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "pull [REMOTE]", + Short: "Pull bugs update from a git remote.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runPull(env, args) - }, + }), } return cmd diff --git a/commands/push.go b/commands/push.go index 89385f108..9d6ca7df3 100644 --- a/commands/push.go +++ b/commands/push.go @@ -10,13 +10,12 @@ func newPushCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "push [REMOTE]", - Short: "Push bugs update to a git remote.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "push [REMOTE]", + Short: "Push bugs update to a git remote.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runPush(env, args) - }, + }), } return cmd diff --git a/commands/rm.go b/commands/rm.go index 3ad4548de..8205c128c 100644 --- a/commands/rm.go +++ b/commands/rm.go @@ -10,14 +10,13 @@ func newRmCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "rm ID", - Short: "Remove an existing bug.", - Long: "Remove an existing bug in the local repository. Note removing bugs that were imported from bridges will not remove the bug on the remote, and will only remove the local copy of the bug.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "rm ID", + Short: "Remove an existing bug.", + Long: "Remove an existing bug in the local repository. Note removing bugs that were imported from bridges will not remove the bug on the remote, and will only remove the local copy of the bug.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runRm(env, args) - }, + }), } flags := cmd.Flags() diff --git a/commands/select.go b/commands/select.go index 64e38d9bd..34d00a325 100644 --- a/commands/select.go +++ b/commands/select.go @@ -27,11 +27,10 @@ instead of The complementary command is "git bug deselect" performing the opposite operation. `, - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runSelect(env, args) - }, + }), } return cmd diff --git a/commands/show.go b/commands/show.go index 10087f927..551403578 100644 --- a/commands/show.go +++ b/commands/show.go @@ -23,13 +23,12 @@ func newShowCommand() *cobra.Command { options := showOptions{} cmd := &cobra.Command{ - Use: "show [ID]", - Short: "Display the details of a bug.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "show [ID]", + Short: "Display the details of a bug.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runShow(env, options, args) - }, + }), } flags := cmd.Flags() diff --git a/commands/status.go b/commands/status.go index 4dceb51c3..c1e45c5fa 100644 --- a/commands/status.go +++ b/commands/status.go @@ -9,13 +9,12 @@ func newStatusCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "status [ID]", - Short: "Display or change a bug status.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "status [ID]", + Short: "Display or change a bug status.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runStatus(env, args) - }, + }), } cmd.AddCommand(newStatusCloseCommand()) diff --git a/commands/status_close.go b/commands/status_close.go index 76f2a758a..8541aa0b6 100644 --- a/commands/status_close.go +++ b/commands/status_close.go @@ -9,13 +9,12 @@ func newStatusCloseCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "close [ID]", - Short: "Mark a bug as closed.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "close [ID]", + Short: "Mark a bug as closed.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runStatusClose(env, args) - }, + }), } return cmd diff --git a/commands/status_open.go b/commands/status_open.go index ff7785610..ee6bd27ab 100644 --- a/commands/status_open.go +++ b/commands/status_open.go @@ -9,13 +9,12 @@ func newStatusOpenCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "open [ID]", - Short: "Mark a bug as open.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "open [ID]", + Short: "Mark a bug as open.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runStatusOpen(env, args) - }, + }), } return cmd diff --git a/commands/termui.go b/commands/termui.go index 1470790fc..4df6cdaf5 100644 --- a/commands/termui.go +++ b/commands/termui.go @@ -10,14 +10,13 @@ func newTermUICommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "termui", - Aliases: []string{"tui"}, - Short: "Launch the terminal UI.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "termui", + Aliases: []string{"tui"}, + Short: "Launch the terminal UI.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runTermUI(env) - }, + }), } return cmd diff --git a/commands/title.go b/commands/title.go index 7afa07ce7..c42935306 100644 --- a/commands/title.go +++ b/commands/title.go @@ -9,13 +9,12 @@ func newTitleCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "title [ID]", - Short: "Display or change a title of a bug.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "title [ID]", + Short: "Display or change a title of a bug.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runTitle(env, args) - }, + }), } cmd.AddCommand(newTitleEditCommand()) diff --git a/commands/title_edit.go b/commands/title_edit.go index 09415e499..810c5e622 100644 --- a/commands/title_edit.go +++ b/commands/title_edit.go @@ -18,13 +18,12 @@ func newTitleEditCommand() *cobra.Command { options := titleEditOptions{} cmd := &cobra.Command{ - Use: "edit [ID]", - Short: "Edit a title of a bug.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "edit [ID]", + Short: "Edit a title of a bug.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runTitleEdit(env, options, args) - }, + }), } flags := cmd.Flags() diff --git a/commands/user.go b/commands/user.go index 29c4e9320..b6a2e4851 100644 --- a/commands/user.go +++ b/commands/user.go @@ -18,13 +18,12 @@ func newUserCommand() *cobra.Command { options := userOptions{} cmd := &cobra.Command{ - Use: "user [USER-ID]", - Short: "Display or change the user identity.", - PreRunE: loadBackendEnsureUser(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "user [USER-ID]", + Short: "Display or change the user identity.", + PreRunE: loadBackendEnsureUser(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runUser(env, options, args) - }, + }), } cmd.AddCommand(newUserAdoptCommand()) diff --git a/commands/user_adopt.go b/commands/user_adopt.go index 5ab6e39c0..166063ae7 100644 --- a/commands/user_adopt.go +++ b/commands/user_adopt.go @@ -8,14 +8,13 @@ func newUserAdoptCommand() *cobra.Command { env := newEnv() cmd := &cobra.Command{ - Use: "adopt USER-ID", - Short: "Adopt an existing identity as your own.", - Args: cobra.ExactArgs(1), - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "adopt USER-ID", + Short: "Adopt an existing identity as your own.", + Args: cobra.ExactArgs(1), + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runUserAdopt(env, args) - }, + }), } return cmd diff --git a/commands/user_create.go b/commands/user_create.go index 0dcfa9b3c..b5cb0528b 100644 --- a/commands/user_create.go +++ b/commands/user_create.go @@ -18,13 +18,12 @@ func newUserCreateCommand() *cobra.Command { options := createUserOptions{} cmd := &cobra.Command{ - Use: "create", - Short: "Create a new identity.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "create", + Short: "Create a new identity.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runUserCreate(env, options) - }, + }), } flags := cmd.Flags() diff --git a/commands/user_ls.go b/commands/user_ls.go index 05d343d68..98800b87b 100644 --- a/commands/user_ls.go +++ b/commands/user_ls.go @@ -19,13 +19,12 @@ func newUserLsCommand() *cobra.Command { options := userLsOptions{} cmd := &cobra.Command{ - Use: "ls", - Short: "List identities.", - PreRunE: loadBackend(env), - PostRunE: closeBackend(env), - RunE: func(cmd *cobra.Command, args []string) error { + Use: "ls", + Short: "List identities.", + PreRunE: loadBackend(env), + RunE: closeBackend(env, func(cmd *cobra.Command, args []string) error { return runUserLs(env, options) - }, + }), } flags := cmd.Flags() |