Skip to content

Commit cb42a72

Browse files
committed
cli/command: deprecate prompt utilities that were for internal use
- The `DisableInputEcho` and `PromptForInput` utilities were added in c15ade0 as part of a bug-fix, which was part of v28.x. [There are no (publicly visible) users][1] of either. - The `ErrPromptTerminated` was added in v26.x (originally added in 10bf91a, later updated in commit 7c722c0. [It is not used][2] - The `PromptForConfirmation` was added in [moby@280c872] (docker v1.13.0) as part of the `docker <object> prune` subcommands. It was meant for internal use but exported to allow re-using it in the `container`, `image` (etc.) packages. However, a breaking change to its signature was made in 10bf91a. It currently does [not appear to have any (public) users][2]. This patch deprecates the `ErrPromptTerminated`, `DisableInputEcho`, `PromptForInput`, and `PromptForConfirmation` utilities from the `cli/command` package. The core functionality of these is still available in the `internal/prompt` package, which we may make public at some point, but still needs some refining / decoupling. [moby@280c872]: moby/moby@280c872 [1]: https://grep.app/search?f.lang=Go&regexp=true&q=%5C.%28DisableInputEcho%7CPromptForInput%29%5C%28 [2]: https://grep.app/search?f.lang=Go&q=%5C.ErrPromptTerminated [3]: https://grep.app/search?f.lang=Go&q=.PromptForConfirmation%28 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 5ef48d6 commit cb42a72

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

cli/command/utils.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,17 @@ import (
1717
"github.com/pkg/errors"
1818
)
1919

20+
// ErrPromptTerminated is returned if the user terminated the prompt.
21+
//
22+
// Deprecated: this error is for internal use and will be removed in the next release.
2023
const ErrPromptTerminated = prompt.ErrTerminated
2124

2225
// DisableInputEcho disables input echo on the provided streams.In.
2326
// This is useful when the user provides sensitive information like passwords.
2427
// The function returns a restore function that should be called to restore the
2528
// terminal state.
29+
//
30+
// Deprecated: this function is for internal use and will be removed in the next release.
2631
func DisableInputEcho(ins *streams.In) (restore func() error, err error) {
2732
return prompt.DisableInputEcho(ins)
2833
}
@@ -34,6 +39,8 @@ func DisableInputEcho(ins *streams.In) (restore func() error, err error) {
3439
// When the prompt returns an error, the caller should propagate the error up
3540
// the stack and close the io.Reader used for the prompt which will prevent the
3641
// background goroutine from blocking indefinitely.
42+
//
43+
// Deprecated: this function is for internal use and will be removed in the next release.
3744
func PromptForInput(ctx context.Context, in io.Reader, out io.Writer, message string) (string, error) {
3845
return prompt.ReadInput(ctx, in, out, message)
3946
}
@@ -48,6 +55,8 @@ func PromptForInput(ctx context.Context, in io.Reader, out io.Writer, message st
4855
// When the prompt returns an error, the caller should propagate the error up
4956
// the stack and close the io.Reader used for the prompt which will prevent the
5057
// background goroutine from blocking indefinitely.
58+
//
59+
// Deprecated: this function is for internal use and will be removed in the next release.
5160
func PromptForConfirmation(ctx context.Context, ins io.Reader, outs io.Writer, message string) (bool, error) {
5261
return prompt.Confirm(ctx, ins, outs, message)
5362
}

0 commit comments

Comments
 (0)