From 7ef2d3168dad50799c4137ef99ecf471d395ab81 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 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.go | 2 +- lib/client/mfa_test.go | 2 +- tool/teleport/common/configurator.go | 2 +- tool/tsh/mfa.go | 4 ++-- tool/tsh/tsh.go | 2 +- tool/tsh/tsh_test.go | 2 +- 19 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 55ea5ba10e5fc..99b1d614a9168 100644 --- a/api/go.mod +++ b/api/go.mod @@ -22,6 +22,7 @@ require ( golang.org/x/crypto v0.12.0 golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3 golang.org/x/net v0.14.0 + golang.org/x/term v0.11.0 google.golang.org/grpc v1.53.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 @@ -42,7 +43,6 @@ require ( go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect go.opentelemetry.io/otel/metric v0.34.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 google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // 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/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 0e55bdf524541..1d4a17bcb6fd5 100644 --- a/lib/client/api.go +++ b/lib/client/api.go @@ -63,6 +63,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/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/auth/touchid" @@ -83,7 +84,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 ed585bdbe7b6d..8d47781f4802f 100644 --- a/lib/client/api_login_test.go +++ b/lib/client/api_login_test.go @@ -37,6 +37,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/auth" "github.com/gravitational/teleport/lib/auth/mocku2f" wanlib "github.com/gravitational/teleport/lib/auth/webauthn" @@ -49,7 +50,6 @@ import ( "github.com/gravitational/teleport/lib/service" "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 50738ec170645..89485377f4b9f 100644 --- a/lib/client/identityfile/identity.go +++ b/lib/client/identityfile/identity.go @@ -34,11 +34,11 @@ import ( "github.com/gravitational/teleport/api/identityfile" "github.com/gravitational/teleport/api/utils/keypaths" + "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/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 d106a2e2d4d77..873525650c7e7 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.go b/lib/client/mfa.go index 5ef70e8653ef8..662290e5d8185 100644 --- a/lib/client/mfa.go +++ b/lib/client/mfa.go @@ -29,10 +29,10 @@ import ( oteltrace "go.opentelemetry.io/otel/trace" "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/utils/prompt" wanlib "github.com/gravitational/teleport/lib/auth/webauthn" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" "github.com/gravitational/teleport/lib/auth/webauthnwin" - "github.com/gravitational/teleport/lib/utils/prompt" ) // promptWebauthn provides indirection for tests. diff --git a/lib/client/mfa_test.go b/lib/client/mfa_test.go index 9a836a8e05e99..604a6db60c1f6 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" wanlib "github.com/gravitational/teleport/lib/auth/webauthn" wancli "github.com/gravitational/teleport/lib/auth/webauthncli" "github.com/gravitational/teleport/lib/client" - "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 2c83165adf71c..9607f355eae43 100644 --- a/tool/teleport/common/configurator.go +++ b/tool/teleport/common/configurator.go @@ -25,11 +25,11 @@ import ( "github.com/gravitational/teleport/api/types" apiutils "github.com/gravitational/teleport/api/utils" + "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/utils/prompt" ) // awsDatabaseTypes list of databases supported on the configurator. diff --git a/tool/tsh/mfa.go b/tool/tsh/mfa.go index 6871603f0d96e..a0e1d75814b07 100644 --- a/tool/tsh/mfa.go +++ b/tool/tsh/mfa.go @@ -33,6 +33,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" wanlib "github.com/gravitational/teleport/lib/auth/webauthn" @@ -41,14 +42,13 @@ import ( "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" - "github.com/gravitational/teleport/lib/utils/prompt" - "golang.org/x/exp/slices" "github.com/alecthomas/kingpin/v2" "github.com/ghodss/yaml" "github.com/gravitational/trace" "github.com/pquerna/otp" "github.com/pquerna/otp/totp" + "golang.org/x/exp/slices" ) const ( diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go index 15effa4746566..b7630c32a8b73 100644 --- a/tool/tsh/tsh.go +++ b/tool/tsh/tsh.go @@ -60,6 +60,7 @@ import ( "github.com/gravitational/teleport/api/types/wrappers" apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/api/utils/keys" + "github.com/gravitational/teleport/api/utils/prompt" apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" @@ -79,7 +80,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" ) diff --git a/tool/tsh/tsh_test.go b/tool/tsh/tsh_test.go index 448dd193df679..0d455b2c26ad5 100644 --- a/tool/tsh/tsh_test.go +++ b/tool/tsh/tsh_test.go @@ -54,6 +54,7 @@ import ( "github.com/gravitational/teleport/api/types/wrappers" 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" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/mocku2f" @@ -71,7 +72,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" )