Skip to content

Move lib/utils/prompt to api/utils/prompt #32334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Joerger merged 4 commits into from
Sep 25, 2023
Merged

Move lib/utils/prompt to api/utils/prompt #32334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e35870
Move /lib/utils/prompt to /api/utils/prompt.
Joerger Sep 21, 2023
eb8d01c
Replace uses of lib/utils/prompt with api/utils/prompt and delete pac…
Joerger Sep 21, 2023
0910a7b
go mod tidy.
Joerger Sep 25, 2023
a8433f5
Merge branch 'master' into joerger/move-prompt-to-api
Joerger Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ require (
golang.org/x/crypto v0.13.0
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
golang.org/x/net v0.15.0
golang.org/x/term v0.12.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98
google.golang.org/grpc v1.58.2
google.golang.org/protobuf v1.31.0
Expand All @@ -45,7 +46,6 @@ require (
github.com/russellhaering/goxmldsig v1.4.0 // indirect
go.opentelemetry.io/otel/metric v1.18.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/term v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
0 lib/utils/prompt/confirmation.go → api/utils/prompt/confirmation.go
View file
Open in desktop
File renamed without changes.
0 lib/utils/prompt/confirmation_test.go → api/utils/prompt/confirmation_test.go
View file
Open in desktop
File renamed without changes.
0 lib/utils/prompt/context_reader.go → api/utils/prompt/context_reader.go
View file
Open in desktop
File renamed without changes.
0 lib/utils/prompt/context_reader_test.go → api/utils/prompt/context_reader_test.go
View file
Open in desktop
File renamed without changes.
0 lib/utils/prompt/mock.go → api/utils/prompt/mock.go
View file
Open in desktop
File renamed without changes.
0 lib/utils/prompt/stdin.go → api/utils/prompt/stdin.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/dynamoathenamigration/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ import (
"golang.org/x/sync/errgroup"

apievents "github.com/gravitational/teleport/api/types/events"
"github.com/gravitational/teleport/api/utils/prompt"
"github.com/gravitational/teleport/lib/events"
"github.com/gravitational/teleport/lib/events/athena"
"github.com/gravitational/teleport/lib/utils/prompt"
)

type Config struct {
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamoathenamigration/migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"github.com/stretchr/testify/require"

apievents "github.com/gravitational/teleport/api/types/events"
"github.com/gravitational/teleport/api/utils/prompt"
"github.com/gravitational/teleport/lib/utils"
"github.com/gravitational/teleport/lib/utils/prompt"
)

func TestMigrateProcessDataObjects(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,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"
Expand Down Expand Up @@ -98,7 +99,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"
)

Expand Down
2 changes: 1 addition & 1 deletion lib/auth/webauthncli/prompt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/auth/webauthncli/prompt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import (
apiutils "github.com/gravitational/teleport/api/utils"
"github.com/gravitational/teleport/api/utils/grpc/interceptors"
"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"
Expand All @@ -87,7 +88,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"
)

Expand Down
2 changes: 1 addition & 1 deletion lib/client/api_login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/client/identityfile/identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/client/keyagent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,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.
Expand Down
2 changes: 1 addition & 1 deletion lib/client/mfa/prompt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"github.com/gravitational/teleport"
"github.com/gravitational/teleport/api/client/proto"
"github.com/gravitational/teleport/api/observability/tracing"
"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"
)

// AdminMFAHintBeforePrompt is a hint used for MFA prompts for admin-level API requests.
Expand Down
2 changes: 1 addition & 1 deletion lib/client/mfa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tool/teleport/common/configurator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tool/tsh/common/mfa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tool/tsh/common/tsh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,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"
Expand All @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion tool/tsh/common/tsh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/integration/kube"
"github.com/gravitational/teleport/lib"
"github.com/gravitational/teleport/lib/auth"
Expand All @@ -84,7 +85,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"
)

Expand Down