From ddb509adb492a52066fc1dda37935f5142f31d02 Mon Sep 17 00:00:00 2001 From: Brian Joerger Date: Mon, 25 Sep 2023 12:31:37 -0700 Subject: [PATCH] Move `lib/utils/prompt` to `api/utils/prompt` (#32334) * Move /lib/utils/prompt to /api/utils/prompt. * Replace uses of lib/utils/prompt with api/utils/prompt and delete pacakge. * go mod tidy. --- api/go.mod | 2 +- {lib => api}/utils/prompt/confirmation.go | 0 {lib => api}/utils/prompt/confirmation_test.go | 0 {lib => api}/utils/prompt/context_reader.go | 0 {lib => api}/utils/prompt/context_reader_test.go | 0 {lib => api}/utils/prompt/mock.go | 0 {lib => api}/utils/prompt/stdin.go | 0 integration/integration_test.go | 2 +- lib/auth/webauthncli/prompt.go | 2 +- lib/auth/webauthncli/prompt_test.go | 2 +- lib/client/api.go | 2 +- lib/client/api_login_test.go | 2 +- lib/client/identityfile/identity.go | 2 +- lib/client/keyagent.go | 2 +- lib/client/mfa/prompt.go | 2 +- lib/client/mfa_test.go | 2 +- tool/teleport/common/configurator.go | 2 +- tool/tsh/mfa.go | 2 +- tool/tsh/tsh.go | 2 +- tool/tsh/tsh_test.go | 2 +- 20 files changed, 14 insertions(+), 14 deletions(-) rename {lib => api}/utils/prompt/confirmation.go (100%) rename {lib => api}/utils/prompt/confirmation_test.go (100%) rename {lib => api}/utils/prompt/context_reader.go (100%) rename {lib => api}/utils/prompt/context_reader_test.go (100%) rename {lib => api}/utils/prompt/mock.go (100%) rename {lib => api}/utils/prompt/stdin.go (100%) diff --git a/api/go.mod b/api/go.mod index 3a471507406e1..f4e47a470c23c 100644 --- a/api/go.mod +++ b/api/go.mod @@ -24,6 +24,7 @@ require ( golang.org/x/crypto v0.12.0 golang.org/x/exp v0.0.0-20221126150942-6ab00d035af9 golang.org/x/net v0.14.0 + golang.org/x/term v0.11.0 google.golang.org/genproto v0.0.0-20230327152035-dc694ad2151e google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.30.0 @@ -45,7 +46,6 @@ require ( go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect go.opentelemetry.io/otel/metric v0.37.0 // indirect golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/lib/utils/prompt/confirmation.go b/api/utils/prompt/confirmation.go similarity index 100% rename from lib/utils/prompt/confirmation.go rename to api/utils/prompt/confirmation.go diff --git a/lib/utils/prompt/confirmation_test.go b/api/utils/prompt/confirmation_test.go similarity index 100% rename from lib/utils/prompt/confirmation_test.go rename to api/utils/prompt/confirmation_test.go diff --git a/lib/utils/prompt/context_reader.go b/api/utils/prompt/context_reader.go similarity index 100% rename from lib/utils/prompt/context_reader.go rename to api/utils/prompt/context_reader.go diff --git a/lib/utils/prompt/context_reader_test.go b/api/utils/prompt/context_reader_test.go similarity index 100% rename from lib/utils/prompt/context_reader_test.go rename to api/utils/prompt/context_reader_test.go diff --git a/lib/utils/prompt/mock.go b/api/utils/prompt/mock.go similarity index 100% rename from lib/utils/prompt/mock.go rename to api/utils/prompt/mock.go diff --git a/lib/utils/prompt/stdin.go b/api/utils/prompt/stdin.go similarity index 100% rename from lib/utils/prompt/stdin.go rename to api/utils/prompt/stdin.go diff --git a/integration/integration_test.go b/integration/integration_test.go index 5a1fdde382477..a6d3622072d12 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -70,6 +70,7 @@ import ( apievents "github.com/gravitational/teleport/api/types/events" apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/api/utils/keypaths" + "github.com/gravitational/teleport/api/utils/prompt" apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/integration/helpers" "github.com/gravitational/teleport/lib" @@ -96,7 +97,6 @@ import ( "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/prompt" "github.com/gravitational/teleport/lib/web" ) diff --git a/lib/auth/webauthncli/prompt.go b/lib/auth/webauthncli/prompt.go index 32b7e0948376f..943df0efaa46f 100644 --- a/lib/auth/webauthncli/prompt.go +++ b/lib/auth/webauthncli/prompt.go @@ -24,8 +24,8 @@ import ( "github.com/gravitational/trace" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/auth/touchid" - "github.com/gravitational/teleport/lib/utils/prompt" ) // DefaultPrompt is a default implementation for LoginPrompt and diff --git a/lib/auth/webauthncli/prompt_test.go b/lib/auth/webauthncli/prompt_test.go index bfd25efa4bc2b..da392e7097bd5 100644 --- a/lib/auth/webauthncli/prompt_test.go +++ b/lib/auth/webauthncli/prompt_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/auth/touchid" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" - "github.com/gravitational/teleport/lib/utils/prompt" ) func TestDefaultPrompt_PromptCredential(t *testing.T) { diff --git a/lib/client/api.go b/lib/client/api.go index 5127104ec98ec..9fb65e65afe11 100644 --- a/lib/client/api.go +++ b/lib/client/api.go @@ -62,6 +62,7 @@ import ( apievents "github.com/gravitational/teleport/api/types/events" apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/api/utils/keys" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/auth/touchid" @@ -86,7 +87,6 @@ import ( "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/utils/agentconn" - "github.com/gravitational/teleport/lib/utils/prompt" "github.com/gravitational/teleport/lib/utils/proxy" ) diff --git a/lib/client/api_login_test.go b/lib/client/api_login_test.go index 0df0e8b5aa7ea..fffab5553b839 100644 --- a/lib/client/api_login_test.go +++ b/lib/client/api_login_test.go @@ -39,6 +39,7 @@ import ( "github.com/gravitational/teleport/api/constants" devicepb "github.com/gravitational/teleport/api/gen/proto/go/teleport/devicetrust/v1" "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/mocku2f" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" @@ -51,7 +52,6 @@ import ( "github.com/gravitational/teleport/lib/service/servicecfg" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/prompt" ) func TestTeleportClient_Login_local(t *testing.T) { diff --git a/lib/client/identityfile/identity.go b/lib/client/identityfile/identity.go index d390464a00f8d..1367c662690c4 100644 --- a/lib/client/identityfile/identity.go +++ b/lib/client/identityfile/identity.go @@ -39,12 +39,12 @@ import ( "github.com/gravitational/teleport/api/profile" "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/teleport/api/utils/keys" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/kube/kubeconfig" "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/prompt" ) // Format describes possible file formats how a user identity can be stored. diff --git a/lib/client/keyagent.go b/lib/client/keyagent.go index 98784db55170d..fa47eb10ea9d7 100644 --- a/lib/client/keyagent.go +++ b/lib/client/keyagent.go @@ -33,10 +33,10 @@ import ( "github.com/gravitational/teleport" "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/tlsca" - "github.com/gravitational/teleport/lib/utils/prompt" ) // LocalKeyAgent holds Teleport certificates for a user connected to a cluster. diff --git a/lib/client/mfa/prompt.go b/lib/client/mfa/prompt.go index a05c8b490db61..9d03489c3c737 100644 --- a/lib/client/mfa/prompt.go +++ b/lib/client/mfa/prompt.go @@ -29,10 +29,10 @@ import ( "github.com/gravitational/teleport" "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/utils/prompt" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" wantypes "github.com/gravitational/teleport/lib/auth/webauthntypes" "github.com/gravitational/teleport/lib/auth/webauthnwin" - "github.com/gravitational/teleport/lib/utils/prompt" ) var log = logrus.WithFields(logrus.Fields{ diff --git a/lib/client/mfa_test.go b/lib/client/mfa_test.go index a47812cd9e9b8..97819109ed04d 100644 --- a/lib/client/mfa_test.go +++ b/lib/client/mfa_test.go @@ -24,10 +24,10 @@ import ( "github.com/gravitational/teleport/api/client/proto" wanpb "github.com/gravitational/teleport/api/types/webauthn" + "github.com/gravitational/teleport/api/utils/prompt" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" wantypes "github.com/gravitational/teleport/lib/auth/webauthntypes" "github.com/gravitational/teleport/lib/client/mfa" - "github.com/gravitational/teleport/lib/utils/prompt" ) // TestPromptMFAChallenge_usingNonRegisteredDevice tests a specific MFA scenario diff --git a/tool/teleport/common/configurator.go b/tool/teleport/common/configurator.go index bb80e021def7e..1cff4cf4ac830 100644 --- a/tool/teleport/common/configurator.go +++ b/tool/teleport/common/configurator.go @@ -25,12 +25,12 @@ import ( "golang.org/x/exp/slices" "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/config" "github.com/gravitational/teleport/lib/configurators" awsconfigurators "github.com/gravitational/teleport/lib/configurators/aws" "github.com/gravitational/teleport/lib/configurators/configuratorbuilder" "github.com/gravitational/teleport/lib/service/servicecfg" - "github.com/gravitational/teleport/lib/utils/prompt" ) // awsDatabaseTypes list of databases supported on the configurator. diff --git a/tool/tsh/mfa.go b/tool/tsh/mfa.go index 84384da1d5dc8..dc39966b1281b 100644 --- a/tool/tsh/mfa.go +++ b/tool/tsh/mfa.go @@ -35,6 +35,7 @@ import ( "github.com/gravitational/teleport/api/client/proto" "github.com/gravitational/teleport/api/constants" "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth/touchid" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" @@ -44,7 +45,6 @@ import ( "github.com/gravitational/teleport/lib/client/mfa" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/prompt" "github.com/alecthomas/kingpin/v2" "github.com/ghodss/yaml" diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go index 7ac6fa435640b..4f0aad3d8438a 100644 --- a/tool/tsh/tsh.go +++ b/tool/tsh/tsh.go @@ -62,6 +62,7 @@ import ( apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/api/types/wrappers" "github.com/gravitational/teleport/api/utils/keys" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" @@ -81,7 +82,6 @@ import ( "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/utils/mlock" - "github.com/gravitational/teleport/lib/utils/prompt" "github.com/gravitational/teleport/tool/common" ) diff --git a/tool/tsh/tsh_test.go b/tool/tsh/tsh_test.go index dc27b5012e6f0..7ca1f80ba4b55 100644 --- a/tool/tsh/tsh_test.go +++ b/tool/tsh/tsh_test.go @@ -56,6 +56,7 @@ import ( apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/teleport/api/utils/keys" + "github.com/gravitational/teleport/api/utils/prompt" "github.com/gravitational/teleport/integration/kube" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/auth" @@ -77,7 +78,6 @@ import ( "github.com/gravitational/teleport/lib/sshutils/x11" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/prompt" "github.com/gravitational/teleport/tool/common" )