f3fbc1d9ee
When reading values like access keys or secrets from the terminal, we would use the `terminal.ReadPassword` function to ensure characters the user typed were not echo'd back to the console, as a convience. When standard input was not connected to a tty (which would happen in some cases like in docker when -t was not passed or in CI), this would fail with an error about an bad ioctl. Update our logic such that when standard in is not connected to a terminal, we just read input normally. While I was in the area, I unified the code for Windows and *NIX for these functions. Fixes #2017
44 lines
1.3 KiB
Go
44 lines
1.3 KiB
Go
// Copyright 2016-2018, Pulumi Corporation.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package cmdutil
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"golang.org/x/crypto/ssh/terminal"
|
|
)
|
|
|
|
// ReadConsoleNoEcho reads from the console without echoing. This is useful for reading passwords.
|
|
func ReadConsoleNoEcho(prompt string) (string, error) {
|
|
// If standard input is not a terminal, we must not use ReadPassword as it will fail with an ioctl
|
|
// error when it tries to disable local echo.
|
|
//
|
|
// In this case, just read normally
|
|
if !terminal.IsTerminal(int(os.Stdin.Fd())) {
|
|
return ReadConsole(prompt)
|
|
}
|
|
|
|
if prompt != "" {
|
|
fmt.Print(prompt + ": ")
|
|
}
|
|
|
|
b, err := terminal.ReadPassword(int(os.Stdin.Fd()))
|
|
|
|
fmt.Println() // echo a newline, since the user's keypress did not generate one
|
|
|
|
return string(b), err
|
|
}
|