diff --git a/Makefile b/Makefile index dffc7e98c24..4caa68f5a20 100644 --- a/Makefile +++ b/Makefile @@ -744,8 +744,8 @@ update-vendor: go mod vendor # delete the vendored api package. In its place # create a symlink to the the original api package - rm -r vendor/github.com/gravitational/teleport/api/v7 - ln -s -r $(shell readlink -f api) vendor/github.com/gravitational/teleport/api/v7 + rm -r vendor/github.com/gravitational/teleport/api + ln -s -r $(shell readlink -f api) vendor/github.com/gravitational/teleport # update-webassets updates the minified code in the webassets repo using the latest webapps # repo and creates a PR in the teleport repo to update webassets submodule. diff --git a/api/client/auditstreamer.go b/api/client/auditstreamer.go index 2d1cc0453bd..d4025c2faa2 100644 --- a/api/client/auditstreamer.go +++ b/api/client/auditstreamer.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/trace" "github.com/gravitational/trace/trail" diff --git a/api/client/client.go b/api/client/client.go index 08adda672f4..245e29f1d4a 100644 --- a/api/client/client.go +++ b/api/client/client.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/metadata" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/events" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/metadata" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/events" + "github.com/gravitational/teleport/api/utils" "github.com/golang/protobuf/ptypes/empty" "github.com/gravitational/trace" diff --git a/api/client/client_test.go b/api/client/client_test.go index 5ddf82133be..4e6826e1c39 100644 --- a/api/client/client_test.go +++ b/api/client/client_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "github.com/gravitational/trace/trail" diff --git a/api/client/contextdialer.go b/api/client/contextdialer.go index a3afe87ac9a..0082c2d4544 100644 --- a/api/client/contextdialer.go +++ b/api/client/contextdialer.go @@ -21,9 +21,9 @@ import ( "net" "time" - "github.com/gravitational/teleport/api/v7/client/webclient" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/client/webclient" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/api/client/credentials.go b/api/client/credentials.go index 8c7b92c13a9..7cd06d85dac 100644 --- a/api/client/credentials.go +++ b/api/client/credentials.go @@ -21,9 +21,9 @@ import ( "crypto/x509" "io/ioutil" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/identityfile" - "github.com/gravitational/teleport/api/v7/profile" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/identityfile" + "github.com/gravitational/teleport/api/profile" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/api/client/credentials_test.go b/api/client/credentials_test.go index 9ec92536e4d..1de08a24a7b 100644 --- a/api/client/credentials_test.go +++ b/api/client/credentials_test.go @@ -26,9 +26,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/gravitational/teleport/api/v7/identityfile" - "github.com/gravitational/teleport/api/v7/profile" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/identityfile" + "github.com/gravitational/teleport/api/profile" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/stretchr/testify/require" "golang.org/x/crypto/ssh" diff --git a/api/client/doc_test.go b/api/client/doc_test.go index 020f6017322..dd43001ad3b 100644 --- a/api/client/doc_test.go +++ b/api/client/doc_test.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/types" ) // Below is an example of creating a new Teleport Auth client with Profile credentials, diff --git a/api/client/keepaliver.go b/api/client/keepaliver.go index a96a15d4e48..0b797bf1cdf 100644 --- a/api/client/keepaliver.go +++ b/api/client/keepaliver.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/golang/protobuf/ptypes/empty" "github.com/gravitational/trace/trail" diff --git a/api/client/proto/authservice.pb.go b/api/client/proto/authservice.pb.go index a0e875ce9a1..2a743ba8826 100644 --- a/api/client/proto/authservice.pb.go +++ b/api/client/proto/authservice.pb.go @@ -11,10 +11,10 @@ import ( github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" empty "github.com/golang/protobuf/ptypes/empty" _ "github.com/golang/protobuf/ptypes/timestamp" - types "github.com/gravitational/teleport/api/v7/types" - events "github.com/gravitational/teleport/api/v7/types/events" - _ "github.com/gravitational/teleport/api/v7/types/wrappers" - github_com_gravitational_teleport_api_types_wrappers "github.com/gravitational/teleport/api/v7/types/wrappers" + types "github.com/gravitational/teleport/api/types" + events "github.com/gravitational/teleport/api/types/events" + _ "github.com/gravitational/teleport/api/types/wrappers" + github_com_gravitational_teleport_api_types_wrappers "github.com/gravitational/teleport/api/types/wrappers" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -1269,7 +1269,7 @@ type RequestStateSetter struct { // Annotations are key/value pairs received from plugins during request // resolution. They are currently only used to provide additional logging // information. - Annotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,5,opt,name=Annotations,proto3,customtype=github.com/gravitational/teleport/api/v7/types/wrappers.Traits" json:"annotations,omitempty"` + Annotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,5,opt,name=Annotations,proto3,customtype=github.com/gravitational/teleport/api/types/wrappers.Traits" json:"annotations,omitempty"` // Roles, if present, overrides the existing set of roles associated // with the access request. Roles []string `protobuf:"bytes,6,rep,name=Roles,proto3" json:"roles,omitempty"` diff --git a/api/client/proto/proto.go b/api/client/proto/proto.go index 894927656a7..d47ba7c9b41 100644 --- a/api/client/proto/proto.go +++ b/api/client/proto/proto.go @@ -18,7 +18,7 @@ limitations under the License. package proto import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) // FromWatchKind converts the watch kind value between internal diff --git a/api/client/sessions.go b/api/client/sessions.go index 7cf8a072b13..16273fdbb85 100644 --- a/api/client/sessions.go +++ b/api/client/sessions.go @@ -19,7 +19,7 @@ package client import ( "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "github.com/gravitational/trace/trail" diff --git a/api/client/streamwatcher.go b/api/client/streamwatcher.go index 1dc6f451835..35e9bd805eb 100644 --- a/api/client/streamwatcher.go +++ b/api/client/streamwatcher.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "github.com/gravitational/trace/trail" diff --git a/api/client/webclient/webclient.go b/api/client/webclient/webclient.go index b5d4b40f058..d4020a6a4f3 100644 --- a/api/client/webclient/webclient.go +++ b/api/client/webclient/webclient.go @@ -25,7 +25,7 @@ import ( "fmt" "net/http" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/trace" ) diff --git a/api/defaults/defaults.go b/api/defaults/defaults.go index cd4606f5f2b..0de3f1be351 100644 --- a/api/defaults/defaults.go +++ b/api/defaults/defaults.go @@ -20,7 +20,7 @@ package defaults import ( "time" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" ) const ( diff --git a/api/go.mod b/api/go.mod index 9ce3cd705e4..c66aade7faf 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/gravitational/teleport/api/v7 +module github.com/gravitational/teleport/api go 1.15 diff --git a/api/identityfile/identityfile.go b/api/identityfile/identityfile.go index a031739def4..c0608a756fd 100644 --- a/api/identityfile/identityfile.go +++ b/api/identityfile/identityfile.go @@ -27,8 +27,8 @@ import ( "io/ioutil" "os" - "github.com/gravitational/teleport/api/v7/utils/keypaths" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/utils/keypaths" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/api/identityfile/identityfile_test.go b/api/identityfile/identityfile_test.go index 0b7cd947c91..97f391fe44c 100644 --- a/api/identityfile/identityfile_test.go +++ b/api/identityfile/identityfile_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "github.com/gravitational/teleport/api/v7/identityfile" + "github.com/gravitational/teleport/api/identityfile" "github.com/stretchr/testify/require" ) diff --git a/api/metadata/metadata.go b/api/metadata/metadata.go index 023733ed25a..103bd04c8a6 100644 --- a/api/metadata/metadata.go +++ b/api/metadata/metadata.go @@ -19,7 +19,7 @@ package metadata import ( "context" - "github.com/gravitational/teleport/api/v7" + "github.com/gravitational/teleport/api" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/api/profile/profile.go b/api/profile/profile.go index 98726626746..ea14edc004e 100644 --- a/api/profile/profile.go +++ b/api/profile/profile.go @@ -27,8 +27,8 @@ import ( "path/filepath" "strings" - "github.com/gravitational/teleport/api/v7/utils/keypaths" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/utils/keypaths" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/api/profile/profile_test.go b/api/profile/profile_test.go index 5a671402120..affbc8d5dcc 100644 --- a/api/profile/profile_test.go +++ b/api/profile/profile_test.go @@ -23,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/gravitational/teleport/api/v7/profile" + "github.com/gravitational/teleport/api/profile" "github.com/gravitational/trace" "github.com/stretchr/testify/require" diff --git a/api/types/access_request.go b/api/types/access_request.go index 152a0b53f6b..0e099d72de7 100644 --- a/api/types/access_request.go +++ b/api/types/access_request.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/audit.go b/api/types/audit.go index d2d7e4c16b7..5019f5c489c 100644 --- a/api/types/audit.go +++ b/api/types/audit.go @@ -19,7 +19,7 @@ package types import ( "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" ) diff --git a/api/types/authentication.go b/api/types/authentication.go index 887e34b7096..89af11198d7 100644 --- a/api/types/authentication.go +++ b/api/types/authentication.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/utils/tlsutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/utils/tlsutils" "github.com/gogo/protobuf/jsonpb" "github.com/gravitational/trace" diff --git a/api/types/authority.go b/api/types/authority.go index 1fff1d9bd34..ab6ed78c7bf 100644 --- a/api/types/authority.go +++ b/api/types/authority.go @@ -20,8 +20,8 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/duration.go b/api/types/duration.go index 10fbc7a3da8..1aa1ebd2cdd 100644 --- a/api/types/duration.go +++ b/api/types/duration.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/trace" ) diff --git a/api/types/github.go b/api/types/github.go index 8d95f597690..218db2267ce 100644 --- a/api/types/github.go +++ b/api/types/github.go @@ -19,7 +19,7 @@ package types import ( "time" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/lock.go b/api/types/lock.go index dced366d373..0d8106c774e 100644 --- a/api/types/lock.go +++ b/api/types/lock.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gogo/protobuf/proto" "github.com/google/go-cmp/cmp" diff --git a/api/types/namespace.go b/api/types/namespace.go index acc384d1e2e..2b5860fab5b 100644 --- a/api/types/namespace.go +++ b/api/types/namespace.go @@ -20,7 +20,7 @@ import ( "regexp" "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" ) diff --git a/api/types/networking.go b/api/types/networking.go index 6db32dc436e..bfec17e52da 100644 --- a/api/types/networking.go +++ b/api/types/networking.go @@ -19,7 +19,7 @@ package types import ( "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" ) diff --git a/api/types/oidc.go b/api/types/oidc.go index 5d6eff8af17..f8c2d9ba8c4 100644 --- a/api/types/oidc.go +++ b/api/types/oidc.go @@ -19,8 +19,8 @@ package types import ( "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/presence.go b/api/types/presence.go index 8af89979647..db95f186b4a 100644 --- a/api/types/presence.go +++ b/api/types/presence.go @@ -19,8 +19,8 @@ package types import ( "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" ) diff --git a/api/types/provisioning.go b/api/types/provisioning.go index 448808f2916..2855aaf9d45 100644 --- a/api/types/provisioning.go +++ b/api/types/provisioning.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" ) diff --git a/api/types/resource.go b/api/types/resource.go index c046e1ece42..40aebb5590a 100644 --- a/api/types/resource.go +++ b/api/types/resource.go @@ -20,8 +20,8 @@ import ( "regexp" "time" - "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/role.go b/api/types/role.go index 84c161cc3d2..e3c517ae321 100644 --- a/api/types/role.go +++ b/api/types/role.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types/wrappers" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types/wrappers" + "github.com/gravitational/teleport/api/utils" "github.com/gogo/protobuf/proto" "github.com/gravitational/trace" diff --git a/api/types/saml.go b/api/types/saml.go index 4f8e7a74088..62c109a7524 100644 --- a/api/types/saml.go +++ b/api/types/saml.go @@ -19,8 +19,8 @@ package types import ( "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/semaphore.go b/api/types/semaphore.go index 9cd65444eaa..4e2148df860 100644 --- a/api/types/semaphore.go +++ b/api/types/semaphore.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/trace" ) diff --git a/api/types/server.go b/api/types/server.go index 67be9ccabe5..9d108f6bd8f 100644 --- a/api/types/server.go +++ b/api/types/server.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gogo/protobuf/proto" "github.com/gravitational/trace" diff --git a/api/types/session.go b/api/types/session.go index 360f03a18c1..2463e0bb5c6 100644 --- a/api/types/session.go +++ b/api/types/session.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" ) diff --git a/api/types/sessionrecording.go b/api/types/sessionrecording.go index 6870caeb226..0270977dff3 100644 --- a/api/types/sessionrecording.go +++ b/api/types/sessionrecording.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/trustedcluster.go b/api/types/trustedcluster.go index 080c139105a..29bfa6b73cb 100644 --- a/api/types/trustedcluster.go +++ b/api/types/trustedcluster.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/types/tunnelconn.go b/api/types/tunnelconn.go index 0c8b2d5a558..0de0daece87 100644 --- a/api/types/tunnelconn.go +++ b/api/types/tunnelconn.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" ) diff --git a/api/types/types.pb.go b/api/types/types.pb.go index beaec12a98d..9c00e57e179 100644 --- a/api/types/types.pb.go +++ b/api/types/types.pb.go @@ -10,9 +10,9 @@ import ( proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/timestamp" - github_com_gravitational_teleport_api_constants "github.com/gravitational/teleport/api/v7/constants" - _ "github.com/gravitational/teleport/api/v7/types/wrappers" - github_com_gravitational_teleport_api_types_wrappers "github.com/gravitational/teleport/api/v7/types/wrappers" + github_com_gravitational_teleport_api_constants "github.com/gravitational/teleport/api/constants" + _ "github.com/gravitational/teleport/api/types/wrappers" + github_com_gravitational_teleport_api_types_wrappers "github.com/gravitational/teleport/api/types/wrappers" io "io" math "math" math_bits "math/bits" @@ -1907,7 +1907,7 @@ type ClusterAuditConfigSpecV2 struct { AuditSessionsURI string `protobuf:"bytes,3,opt,name=AuditSessionsURI,proto3" json:"audit_sessions_uri,omitempty"` // AuditEventsURI is a parameter with all supported outputs // for audit events - AuditEventsURI github_com_gravitational_teleport_api_types_wrappers.Strings `protobuf:"bytes,4,opt,name=AuditEventsURI,proto3,customtype=github.com/gravitational/teleport/api/v7/types/wrappers.Strings" json:"audit_events_uri,omitempty"` + AuditEventsURI github_com_gravitational_teleport_api_types_wrappers.Strings `protobuf:"bytes,4,opt,name=AuditEventsURI,proto3,customtype=github.com/gravitational/teleport/api/types/wrappers.Strings" json:"audit_events_uri,omitempty"` // EnableContinuousBackups is used to enable (or disable) PITR (Point-In-Time Recovery). EnableContinuousBackups bool `protobuf:"varint,6,opt,name=EnableContinuousBackups,proto3" json:"continuous_backups,omitempty"` // EnableAutoScaling is used to enable (or disable) auto scaling policy. @@ -2267,7 +2267,7 @@ type AuthPreferenceSpecV2 struct { // Type is the type of authentication. Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` // SecondFactor is the type of second factor. - SecondFactor github_com_gravitational_teleport_api_constants.SecondFactorType `protobuf:"bytes,2,opt,name=SecondFactor,proto3,casttype=github.com/gravitational/teleport/api/v7/constants.SecondFactorType" json:"second_factor,omitempty"` + SecondFactor github_com_gravitational_teleport_api_constants.SecondFactorType `protobuf:"bytes,2,opt,name=SecondFactor,proto3,casttype=github.com/gravitational/teleport/api/constants.SecondFactorType" json:"second_factor,omitempty"` // ConnectorName is the name of the OIDC or SAML connector. If this value is // not set the first connector in the backend will be used. ConnectorName string `protobuf:"bytes,3,opt,name=ConnectorName,proto3" json:"connector_name,omitempty"` @@ -2802,7 +2802,7 @@ type AccessReview struct { // Created is the time at which the review was created. Created time.Time `protobuf:"bytes,5,opt,name=Created,proto3,stdtime" json:"created,omitempty"` // Annotations is the proposed value of the request's resolve_annotations field. - Annotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,6,opt,name=Annotations,proto3,customtype=github.com/gravitational/teleport/api/v7/types/wrappers.Traits" json:"annotations,omitempty"` + Annotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,6,opt,name=Annotations,proto3,customtype=github.com/gravitational/teleport/api/types/wrappers.Traits" json:"annotations,omitempty"` // ThresholdIndexes stores the indexes of thresholds which this review matches // (internal use only). ThresholdIndexes []uint32 `protobuf:"varint,7,rep,packed,name=ThresholdIndexes,proto3" json:"i,omitempty"` @@ -2998,13 +2998,13 @@ type AccessRequestSpecV3 struct { // resolving parties during approval/denial. Importantly, these annotations are // included in the access_request.update event, allowing plugins to propagate // arbitrary structured data to the audit log. - ResolveAnnotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,8,opt,name=ResolveAnnotations,proto3,customtype=github.com/gravitational/teleport/api/v7/types/wrappers.Traits" json:"resolve_annotations,omitempty"` + ResolveAnnotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,8,opt,name=ResolveAnnotations,proto3,customtype=github.com/gravitational/teleport/api/types/wrappers.Traits" json:"resolve_annotations,omitempty"` // SystemAnnotations is a set of programmatically generated annotations attached // to pending access requests by teleport. These annotations are generated by // applying variable interpolation to the RoleConditions.Request.Annotations block // of a user's role(s). These annotations serve as a mechanism for administrators // to pass extra information to plugins when they process pending access requests. - SystemAnnotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,9,opt,name=SystemAnnotations,proto3,customtype=github.com/gravitational/teleport/api/v7/types/wrappers.Traits" json:"system_annotations,omitempty"` + SystemAnnotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,9,opt,name=SystemAnnotations,proto3,customtype=github.com/gravitational/teleport/api/types/wrappers.Traits" json:"system_annotations,omitempty"` // Thresholds is a list of review thresholds relevant to this request. Order must be // preserved, as thresholds are referenced by index (internal use only). Thresholds []AccessReviewThreshold `protobuf:"bytes,10,rep,name=Thresholds,proto3" json:"thresholds,omitempty"` @@ -3696,7 +3696,7 @@ type AccessRequestConditions struct { // syntax, they also offer a mechanism for forwarding claims from an // external identity provider, to a plugin via `{{external.trait_name}}` // style substitutions. - Annotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,3,opt,name=Annotations,proto3,customtype=github.com/gravitational/teleport/api/v7/types/wrappers.Traits" json:"annotations,omitempty"` + Annotations github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,3,opt,name=Annotations,proto3,customtype=github.com/gravitational/teleport/api/types/wrappers.Traits" json:"annotations,omitempty"` // Thresholds is a list of thresholds, one of which must be met in order for reviews // to trigger a state-transition. If no thresholds are provided, a default threshold // of 1 for approval and denial is used. @@ -4040,7 +4040,7 @@ type UserSpecV2 struct { // Traits are key/value pairs received from an identity provider (through // OIDC claims or SAML assertions) or from a system administrator for local // accounts. Traits are used to populate role variables. - Traits github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,5,opt,name=Traits,proto3,customtype=github.com/gravitational/teleport/api/v7/types/wrappers.Traits" json:"traits,omitempty"` + Traits github_com_gravitational_teleport_api_types_wrappers.Traits `protobuf:"bytes,5,opt,name=Traits,proto3,customtype=github.com/gravitational/teleport/api/types/wrappers.Traits" json:"traits,omitempty"` // Status is a login status of the user Status LoginStatus `protobuf:"bytes,6,opt,name=Status,proto3" json:"status,omitempty"` // Expires if set sets TTL on the user diff --git a/api/types/user.go b/api/types/user.go index b42820df35e..a564527f054 100644 --- a/api/types/user.go +++ b/api/types/user.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" ) diff --git a/api/utils/sshutils/chconn.go b/api/utils/sshutils/chconn.go index 17696bd3388..a09fcce4edf 100644 --- a/api/utils/sshutils/chconn.go +++ b/api/utils/sshutils/chconn.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/api/utils/sshutils/conn.go b/api/utils/sshutils/conn.go index f033e49e8e5..ae7a64f45e9 100644 --- a/api/utils/sshutils/conn.go +++ b/api/utils/sshutils/conn.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" ) diff --git a/api/utils/sshutils/ssh.go b/api/utils/sshutils/ssh.go index 32c73ecceb7..669fb4226f9 100644 --- a/api/utils/sshutils/ssh.go +++ b/api/utils/sshutils/ssh.go @@ -25,8 +25,8 @@ import ( "net" "runtime" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/e b/e index ca7211e1df6..dca171d80c8 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit ca7211e1df608bc887e514835824a9d676f75014 +Subproject commit dca171d80c89995de976408d20db6355073c8db8 diff --git a/examples/go-client/go.mod b/examples/go-client/go.mod index 4e76eb638d9..47b88275f13 100644 --- a/examples/go-client/go.mod +++ b/examples/go-client/go.mod @@ -2,9 +2,9 @@ module go-client go 1.15 -replace github.com/gravitational/teleport/api/v7 => ../../api +replace github.com/gravitational/teleport/api => ../../api require ( - github.com/gravitational/teleport/api/v7 v7.0.0 + github.com/gravitational/teleport/api v0.0.0 github.com/pborman/uuid v1.2.1 ) diff --git a/examples/go-client/main.go b/examples/go-client/main.go index 92c4f37cd5f..d89816e7ec6 100644 --- a/examples/go-client/main.go +++ b/examples/go-client/main.go @@ -21,8 +21,8 @@ import ( "fmt" "log" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/types" "github.com/pborman/uuid" ) diff --git a/go.mod b/go.mod index e8965f91ad7..d0709445de6 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/gravitational/oxy v0.0.0-20210316180922-c73d80d27348 github.com/gravitational/reporting v0.0.0-20180907002058-ac7b85c75c4c github.com/gravitational/roundtrip v1.0.0 - github.com/gravitational/teleport/api/v7 v7.0.0 + github.com/gravitational/teleport/api v0.0.0 github.com/gravitational/trace v1.1.16-0.20210609220119-4855e69c89fc github.com/gravitational/ttlmap v0.0.0-20171116003245-91fd36b9004c github.com/hashicorp/golang-lru v0.5.4 @@ -128,6 +128,6 @@ require ( replace ( github.com/coreos/go-oidc => github.com/gravitational/go-oidc v0.0.4 github.com/gogo/protobuf => github.com/gravitational/protobuf v1.3.2-0.20201123192827-2b9fcfaffcbf - github.com/gravitational/teleport/api/v7 => ./api + github.com/gravitational/teleport/api => ./api github.com/siddontang/go-mysql v1.1.0 => github.com/gravitational/go-mysql v1.1.1-0.20210212011549-886316308a77 ) diff --git a/integration/app_integration_test.go b/integration/app_integration_test.go index c08e9f004b6..41b0402ce56 100644 --- a/integration/app_integration_test.go +++ b/integration/app_integration_test.go @@ -34,7 +34,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/testauthority" diff --git a/integration/db_integration_test.go b/integration/db_integration_test.go index 257dfdea54a..6ee5b066769 100644 --- a/integration/db_integration_test.go +++ b/integration/db_integration_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/testauthority" diff --git a/integration/helpers.go b/integration/helpers.go index fc04961bec8..defabd83bd7 100644 --- a/integration/helpers.go +++ b/integration/helpers.go @@ -40,9 +40,9 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/auth/testauthority" diff --git a/integration/integration_test.go b/integration/integration_test.go index 5cd5a0a180e..4de6297ebb4 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -44,12 +44,12 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/profile" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" - "github.com/gravitational/teleport/api/v7/utils/keypaths" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/profile" + "github.com/gravitational/teleport/api/types" + 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/lib" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/testauthority" diff --git a/integration/kube_integration_test.go b/integration/kube_integration_test.go index 3f582845ffc..bb12b857f7c 100644 --- a/integration/kube_integration_test.go +++ b/integration/kube_integration_test.go @@ -38,9 +38,9 @@ import ( "github.com/stretchr/testify/require" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/profile" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/profile" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/events" diff --git a/integration/port_forwarding_test.go b/integration/port_forwarding_test.go index 41343a72806..34a558f5cec 100644 --- a/integration/port_forwarding_test.go +++ b/integration/port_forwarding_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/session" diff --git a/integration/utmp_integration_test.go b/integration/utmp_integration_test.go index cce53dcb930..cb9f4522e83 100644 --- a/integration/utmp_integration_test.go +++ b/integration/utmp_integration_test.go @@ -24,9 +24,9 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/pam" diff --git a/lib/auth/api.go b/lib/auth/api.go index a133525efca..7ff5fd4fbc7 100644 --- a/lib/auth/api.go +++ b/lib/auth/api.go @@ -20,8 +20,8 @@ import ( "context" "io" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/session" diff --git a/lib/auth/apiserver.go b/lib/auth/apiserver.go index a3da082f7b5..0aebbced293 100644 --- a/lib/auth/apiserver.go +++ b/lib/auth/apiserver.go @@ -29,10 +29,10 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/client/proto" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client/proto" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/httplib" diff --git a/lib/auth/apiserver_test.go b/lib/auth/apiserver_test.go index 81197fb7d2e..8e4f0f69924 100644 --- a/lib/auth/apiserver_test.go +++ b/lib/auth/apiserver_test.go @@ -24,8 +24,8 @@ import ( "net/http/httptest" "testing" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "github.com/google/go-cmp/cmp" diff --git a/lib/auth/auth.go b/lib/auth/auth.go index 1bdb1ab8437..7ec5cf1dea1 100644 --- a/lib/auth/auth.go +++ b/lib/auth/auth.go @@ -38,13 +38,13 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - "github.com/gravitational/teleport/api/v7/types/wrappers" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + "github.com/gravitational/teleport/api/types/wrappers" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/auth/auth_test.go b/lib/auth/auth_test.go index cf81ba021f2..41864095b43 100644 --- a/lib/auth/auth_test.go +++ b/lib/auth/auth_test.go @@ -32,11 +32,11 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apiutils "github.com/gravitational/teleport/api/utils" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth/testauthority" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/auth/u2f" diff --git a/lib/auth/auth_with_roles.go b/lib/auth/auth_with_roles.go index 8c76f2f5ec3..b041c44ed0b 100644 --- a/lib/auth/auth_with_roles.go +++ b/lib/auth/auth_with_roles.go @@ -22,13 +22,13 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - "github.com/gravitational/teleport/api/v7/types/wrappers" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + "github.com/gravitational/teleport/api/types/wrappers" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/auth/auth_with_roles_test.go b/lib/auth/auth_with_roles_test.go index 4c111b552be..a01d78d5a33 100644 --- a/lib/auth/auth_with_roles_test.go +++ b/lib/auth/auth_with_roles_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" "github.com/google/go-cmp/cmp" diff --git a/lib/auth/clt.go b/lib/auth/clt.go index 54b94c7795a..b65b1301bd5 100644 --- a/lib/auth/clt.go +++ b/lib/auth/clt.go @@ -32,12 +32,12 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/auth/db.go b/lib/auth/db.go index 92ded8b35d4..42aed31099a 100644 --- a/lib/auth/db.go +++ b/lib/auth/db.go @@ -21,9 +21,9 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/modules" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/auth/github.go b/lib/auth/github.go index c40e14b1f68..5b004ca6a9a 100644 --- a/lib/auth/github.go +++ b/lib/auth/github.go @@ -25,10 +25,10 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/github_test.go b/lib/auth/github_test.go index 14894237e16..6be77aa4c46 100644 --- a/lib/auth/github_test.go +++ b/lib/auth/github_test.go @@ -21,7 +21,7 @@ import ( "net/url" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/auth/grpcserver.go b/lib/auth/grpcserver.go index 84443729b45..9b731200313 100644 --- a/lib/auth/grpcserver.go +++ b/lib/auth/grpcserver.go @@ -24,11 +24,11 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/metadata" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/metadata" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/httplib" diff --git a/lib/auth/grpcserver_test.go b/lib/auth/grpcserver_test.go index 7d3f9e39894..9a05801e734 100644 --- a/lib/auth/grpcserver_test.go +++ b/lib/auth/grpcserver_test.go @@ -34,12 +34,12 @@ import ( "github.com/stretchr/testify/require" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/metadata" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/metadata" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth/mocku2f" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/backend" diff --git a/lib/auth/helpers.go b/lib/auth/helpers.go index f85d2fd0f8a..6330f369de7 100644 --- a/lib/auth/helpers.go +++ b/lib/auth/helpers.go @@ -26,10 +26,10 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/memory" diff --git a/lib/auth/httpfallback.go b/lib/auth/httpfallback.go index 0c373336ee9..5bdee8eb1f3 100644 --- a/lib/auth/httpfallback.go +++ b/lib/auth/httpfallback.go @@ -23,7 +23,7 @@ import ( "net/url" "strconv" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/init.go b/lib/auth/init.go index 49b9bb8779e..79b63dbc076 100644 --- a/lib/auth/init.go +++ b/lib/auth/init.go @@ -28,10 +28,10 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/backend" diff --git a/lib/auth/init_test.go b/lib/auth/init_test.go index 32ee07c20c3..42db5b8c2a4 100644 --- a/lib/auth/init_test.go +++ b/lib/auth/init_test.go @@ -30,9 +30,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/backend" diff --git a/lib/auth/keystore/hsm.go b/lib/auth/keystore/hsm.go index 2ca97f206e6..db2ee147099 100644 --- a/lib/auth/keystore/hsm.go +++ b/lib/auth/keystore/hsm.go @@ -23,7 +23,7 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/trace" diff --git a/lib/auth/keystore/keystore.go b/lib/auth/keystore/keystore.go index a36f362ec29..bdf1291ca20 100644 --- a/lib/auth/keystore/keystore.go +++ b/lib/auth/keystore/keystore.go @@ -22,7 +22,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) var pkcs11Prefix = []byte("pkcs11:") diff --git a/lib/auth/keystore/keystore_test.go b/lib/auth/keystore/keystore_test.go index c1f3ab15564..13865b45410 100644 --- a/lib/auth/keystore/keystore_test.go +++ b/lib/auth/keystore/keystore_test.go @@ -28,7 +28,7 @@ import ( "os/exec" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/keystore" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/auth/keystore/raw.go b/lib/auth/keystore/raw.go index c98584210af..bee00bdc5d5 100644 --- a/lib/auth/keystore/raw.go +++ b/lib/auth/keystore/raw.go @@ -5,7 +5,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/auth/kube.go b/lib/auth/kube.go index 3fcbba9af03..d48d3bca95b 100644 --- a/lib/auth/kube.go +++ b/lib/auth/kube.go @@ -20,8 +20,8 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/modules" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/auth/kube_test.go b/lib/auth/kube_test.go index d1c72f20589..ef79ea9923d 100644 --- a/lib/auth/kube_test.go +++ b/lib/auth/kube_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services/suite" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/trace" diff --git a/lib/auth/methods.go b/lib/auth/methods.go index 35c913dc94c..6daea4003e9 100644 --- a/lib/auth/methods.go +++ b/lib/auth/methods.go @@ -22,9 +22,9 @@ import ( "golang.org/x/crypto/ssh" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/middleware.go b/lib/auth/middleware.go index ae5526445c7..9869ba17b0d 100644 --- a/lib/auth/middleware.go +++ b/lib/auth/middleware.go @@ -25,10 +25,10 @@ import ( "net/http" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/limiter" "github.com/gravitational/teleport/lib/multiplexer" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/auth/middleware_test.go b/lib/auth/middleware_test.go index 7ae3e7eb3e1..9a7cb85d0a8 100644 --- a/lib/auth/middleware_test.go +++ b/lib/auth/middleware_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/auth/native/native.go b/lib/auth/native/native.go index 7934782107b..cfdafe616a2 100644 --- a/lib/auth/native/native.go +++ b/lib/auth/native/native.go @@ -28,10 +28,10 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/auth/native/native_test.go b/lib/auth/native/native_test.go index b3c6d75cb24..c80ecf258d3 100644 --- a/lib/auth/native/native_test.go +++ b/lib/auth/native/native_test.go @@ -23,9 +23,9 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth/test" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/oidc.go b/lib/auth/oidc.go index 261156866cb..0fd5bb75cb8 100644 --- a/lib/auth/oidc.go +++ b/lib/auth/oidc.go @@ -25,11 +25,11 @@ import ( "net/url" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/oidc_test.go b/lib/auth/oidc_test.go index 0018f46b616..013109103c4 100644 --- a/lib/auth/oidc_test.go +++ b/lib/auth/oidc_test.go @@ -23,7 +23,7 @@ import ( "net/http/httptest" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/auth/password.go b/lib/auth/password.go index 507db72cc4e..9a1b0b87c88 100644 --- a/lib/auth/password.go +++ b/lib/auth/password.go @@ -9,9 +9,9 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/auth/password_test.go b/lib/auth/password_test.go index d03e38b6847..44ac6ff1751 100644 --- a/lib/auth/password_test.go +++ b/lib/auth/password_test.go @@ -23,9 +23,9 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/auth/permissions.go b/lib/auth/permissions.go index 2b075f49cc4..7899055d9e8 100644 --- a/lib/auth/permissions.go +++ b/lib/auth/permissions.go @@ -23,9 +23,9 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/auth/permissions_test.go b/lib/auth/permissions_test.go index 4a2736d5f88..134adfabfc6 100644 --- a/lib/auth/permissions_test.go +++ b/lib/auth/permissions_test.go @@ -25,7 +25,7 @@ import ( "github.com/jonboulle/clockwork" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" ) diff --git a/lib/auth/register.go b/lib/auth/register.go index ff94dde85da..7b62500bcbf 100644 --- a/lib/auth/register.go +++ b/lib/auth/register.go @@ -21,8 +21,8 @@ import ( "crypto/x509" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/auth/resetpasswordtoken.go b/lib/auth/resetpasswordtoken.go index 493ac0bc973..9a1c294b694 100644 --- a/lib/auth/resetpasswordtoken.go +++ b/lib/auth/resetpasswordtoken.go @@ -24,8 +24,8 @@ import ( "net/url" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/resetpasswordtoken_test.go b/lib/auth/resetpasswordtoken_test.go index 2497b481204..916710f9be5 100644 --- a/lib/auth/resetpasswordtoken_test.go +++ b/lib/auth/resetpasswordtoken_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/rotate.go b/lib/auth/rotate.go index 4b612197614..73cd89dafab 100644 --- a/lib/auth/rotate.go +++ b/lib/auth/rotate.go @@ -21,7 +21,7 @@ import ( "crypto/x509/pkix" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/jwt" diff --git a/lib/auth/saml.go b/lib/auth/saml.go index f8a8df1254d..9b62667e833 100644 --- a/lib/auth/saml.go +++ b/lib/auth/saml.go @@ -27,10 +27,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/saml_test.go b/lib/auth/saml_test.go index a623e1f3c78..0700b6b3bb6 100644 --- a/lib/auth/saml_test.go +++ b/lib/auth/saml_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/backend/lite" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/auth/sessions.go b/lib/auth/sessions.go index fcf6e064b7d..988fadb2729 100644 --- a/lib/auth/sessions.go +++ b/lib/auth/sessions.go @@ -21,7 +21,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/jwt" "github.com/gravitational/teleport/lib/modules" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/state.go b/lib/auth/state.go index d16009d7131..891a05ad6cd 100644 --- a/lib/auth/state.go +++ b/lib/auth/state.go @@ -21,7 +21,7 @@ import ( "encoding/json" "strings" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/auth/test/suite.go b/lib/auth/test/suite.go index 0d282ce5dc7..b65ab752a30 100644 --- a/lib/auth/test/suite.go +++ b/lib/auth/test/suite.go @@ -23,9 +23,9 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/sshca" diff --git a/lib/auth/tls_test.go b/lib/auth/tls_test.go index 680b72d1143..4646af2d40d 100644 --- a/lib/auth/tls_test.go +++ b/lib/auth/tls_test.go @@ -38,14 +38,14 @@ import ( "github.com/stretchr/testify/require" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apiutils "github.com/gravitational/teleport/api/utils" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/auth/trustedcluster.go b/lib/auth/trustedcluster.go index d58acac8fd3..6713b41636b 100644 --- a/lib/auth/trustedcluster.go +++ b/lib/auth/trustedcluster.go @@ -25,8 +25,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/httplib" diff --git a/lib/auth/trustedcluster_test.go b/lib/auth/trustedcluster_test.go index 6854c6a41e7..2b66080b3b8 100644 --- a/lib/auth/trustedcluster_test.go +++ b/lib/auth/trustedcluster_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/backend/memory" "github.com/gravitational/teleport/lib/services" diff --git a/lib/auth/u2f/authenticate.go b/lib/auth/u2f/authenticate.go index 5b68927c3da..9154ac90120 100644 --- a/lib/auth/u2f/authenticate.go +++ b/lib/auth/u2f/authenticate.go @@ -31,7 +31,7 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/ttlmap" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) // Authentication sequence: diff --git a/lib/auth/u2f/device.go b/lib/auth/u2f/device.go index e8da185e32e..a54cfd4ef48 100644 --- a/lib/auth/u2f/device.go +++ b/lib/auth/u2f/device.go @@ -28,7 +28,7 @@ import ( "github.com/sirupsen/logrus" "github.com/tstranex/u2f" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) // DeviceStorage is a persistent storage for MFA devices. diff --git a/lib/auth/u2f/register.go b/lib/auth/u2f/register.go index ab9f4da5d1e..57e8cf8b634 100644 --- a/lib/auth/u2f/register.go +++ b/lib/auth/u2f/register.go @@ -31,8 +31,8 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/ttlmap" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/tlsutils" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/tlsutils" ) // Registration sequence: diff --git a/lib/auth/user.go b/lib/auth/user.go index 814c7855cd4..6e1bd8495b6 100644 --- a/lib/auth/user.go +++ b/lib/auth/user.go @@ -26,9 +26,9 @@ package auth import ( "context" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/backend/backend.go b/lib/backend/backend.go index 7d986581c36..076a937ea08 100644 --- a/lib/backend/backend.go +++ b/lib/backend/backend.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/jonboulle/clockwork" ) diff --git a/lib/backend/buffer.go b/lib/backend/buffer.go index 7ae31274f94..5f43c1ddee5 100644 --- a/lib/backend/buffer.go +++ b/lib/backend/buffer.go @@ -24,7 +24,7 @@ import ( "sync" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" radix "github.com/armon/go-radix" "github.com/gravitational/trace" diff --git a/lib/backend/buffer_test.go b/lib/backend/buffer_test.go index ffaa8a139c4..cb2e2c9a6ed 100644 --- a/lib/backend/buffer_test.go +++ b/lib/backend/buffer_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" log "github.com/sirupsen/logrus" check "gopkg.in/check.v1" diff --git a/lib/backend/dynamo/dynamodbbk.go b/lib/backend/dynamo/dynamodbbk.go index 06f9bf08a04..b0567be5ddb 100644 --- a/lib/backend/dynamo/dynamodbbk.go +++ b/lib/backend/dynamo/dynamodbbk.go @@ -26,7 +26,7 @@ import ( "sync/atomic" "time" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/backend/dynamo/shards.go b/lib/backend/dynamo/shards.go index eb2902d8818..c30a5172e1f 100644 --- a/lib/backend/dynamo/shards.go +++ b/lib/backend/dynamo/shards.go @@ -21,7 +21,7 @@ import ( "io" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/backend/etcdbk/etcd.go b/lib/backend/etcdbk/etcd.go index b17d172d9c1..a1d5196a4dd 100644 --- a/lib/backend/etcdbk/etcd.go +++ b/lib/backend/etcdbk/etcd.go @@ -28,9 +28,9 @@ import ( "strings" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/backend/firestore/firestorebk.go b/lib/backend/firestore/firestorebk.go index 854ae7b60fd..d8c9877fca5 100644 --- a/lib/backend/firestore/firestorebk.go +++ b/lib/backend/firestore/firestorebk.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/backend/lite/lite.go b/lib/backend/lite/lite.go index e5e442c2929..5baaf4d5c0e 100644 --- a/lib/backend/lite/lite.go +++ b/lib/backend/lite/lite.go @@ -28,8 +28,8 @@ import ( "sync/atomic" "time" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/trace" diff --git a/lib/backend/memory/memory.go b/lib/backend/memory/memory.go index e7ef502b6b1..648ae2073ce 100644 --- a/lib/backend/memory/memory.go +++ b/lib/backend/memory/memory.go @@ -24,7 +24,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/google/btree" diff --git a/lib/backend/report.go b/lib/backend/report.go index 9426786d0dd..b05cdaf9897 100644 --- a/lib/backend/report.go +++ b/lib/backend/report.go @@ -23,8 +23,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/backend/report_test.go b/lib/backend/report_test.go index cbec013f9bf..5688ed2ca09 100644 --- a/lib/backend/report_test.go +++ b/lib/backend/report_test.go @@ -5,7 +5,7 @@ import ( "sync/atomic" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/lib/backend/test/suite.go b/lib/backend/test/suite.go index 9717123b2bb..64bf750602a 100644 --- a/lib/backend/test/suite.go +++ b/lib/backend/test/suite.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/benchmark/benchmark.go b/lib/benchmark/benchmark.go index 74ed9527bb2..5b1d728b1e8 100644 --- a/lib/benchmark/benchmark.go +++ b/lib/benchmark/benchmark.go @@ -29,7 +29,7 @@ import ( "syscall" "time" - "github.com/gravitational/teleport/api/v7/profile" + "github.com/gravitational/teleport/api/profile" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/bpf/bpf.go b/lib/bpf/bpf.go index 3ed2bed3c3e..298ccd4d3b5 100644 --- a/lib/bpf/bpf.go +++ b/lib/bpf/bpf.go @@ -33,8 +33,8 @@ import ( "time" "unsafe" - "github.com/gravitational/teleport/api/v7/constants" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + apievents "github.com/gravitational/teleport/api/types/events" controlgroup "github.com/gravitational/teleport/lib/cgroup" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/bpf/bpf_test.go b/lib/bpf/bpf_test.go index e13faa3aac8..e9a31394824 100644 --- a/lib/bpf/bpf_test.go +++ b/lib/bpf/bpf_test.go @@ -33,9 +33,9 @@ import ( "unsafe" "github.com/aquasecurity/libbpfgo" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/lib/bpf/common.go b/lib/bpf/common.go index f9678d8ac44..04e450d09d0 100644 --- a/lib/bpf/common.go +++ b/lib/bpf/common.go @@ -24,8 +24,8 @@ import "C" import ( "context" - "github.com/gravitational/teleport/api/v7/constants" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/constants" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/cache/cache.go b/lib/cache/cache.go index bf68c29dfc2..52e58635635 100644 --- a/lib/cache/cache.go +++ b/lib/cache/cache.go @@ -23,8 +23,8 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/services" diff --git a/lib/cache/cache_test.go b/lib/cache/cache_test.go index 579082a402d..e947b20ea1a 100644 --- a/lib/cache/cache_test.go +++ b/lib/cache/cache_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" "github.com/gravitational/teleport/lib/backend/memory" diff --git a/lib/cache/collections.go b/lib/cache/collections.go index 821155ab7df..11e45be8c55 100644 --- a/lib/cache/collections.go +++ b/lib/cache/collections.go @@ -20,8 +20,8 @@ import ( "context" "strings" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/trace" diff --git a/lib/client/api.go b/lib/client/api.go index 1c26e8e49ce..8436b51eeb2 100644 --- a/lib/client/api.go +++ b/lib/client/api.go @@ -46,14 +46,14 @@ import ( "golang.org/x/term" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/client/webclient" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/profile" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" - "github.com/gravitational/teleport/api/v7/utils/keypaths" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/client/webclient" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/profile" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" + "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/client/api_test.go b/lib/client/api_test.go index dde2972f81f..dd2fde21226 100644 --- a/lib/client/api_test.go +++ b/lib/client/api_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "github.com/gravitational/teleport/api/v7/client/webclient" + "github.com/gravitational/teleport/api/client/webclient" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/client/client.go b/lib/client/client.go index 63e3ec7e19f..0bd27094912 100644 --- a/lib/client/client.go +++ b/lib/client/client.go @@ -33,10 +33,10 @@ import ( "golang.org/x/crypto/ssh/agent" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/client/proto" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/client/proto" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/client/identityfile/identity.go b/lib/client/identityfile/identity.go index 2866d8462c4..6f5e129bca7 100644 --- a/lib/client/identityfile/identity.go +++ b/lib/client/identityfile/identity.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/gravitational/teleport/api/v7/identityfile" - "github.com/gravitational/teleport/api/v7/utils/keypaths" + "github.com/gravitational/teleport/api/identityfile" + "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/kube/kubeconfig" "github.com/gravitational/teleport/lib/sshutils" diff --git a/lib/client/identityfile/identity_test.go b/lib/client/identityfile/identity_test.go index 26917659dbe..4e3b366db3d 100644 --- a/lib/client/identityfile/identity_test.go +++ b/lib/client/identityfile/identity_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/gravitational/teleport/api/v7/utils/keypaths" + "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/kube/kubeconfig" diff --git a/lib/client/interfaces.go b/lib/client/interfaces.go index c1143b2a7e9..3d32dc5a2cf 100644 --- a/lib/client/interfaces.go +++ b/lib/client/interfaces.go @@ -22,8 +22,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/identityfile" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/identityfile" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/services" diff --git a/lib/client/keyagent.go b/lib/client/keyagent.go index 04d089d87a3..220ed7cc645 100644 --- a/lib/client/keyagent.go +++ b/lib/client/keyagent.go @@ -31,7 +31,7 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/utils/prompt" diff --git a/lib/client/keyagent_test.go b/lib/client/keyagent_test.go index d1cc7e583d7..70a894e3116 100644 --- a/lib/client/keyagent_test.go +++ b/lib/client/keyagent_test.go @@ -31,8 +31,8 @@ import ( "golang.org/x/crypto/ssh/agent" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/keypaths" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/client/keystore.go b/lib/client/keystore.go index 026ce525bc8..9cf1efabdd1 100644 --- a/lib/client/keystore.go +++ b/lib/client/keystore.go @@ -29,8 +29,8 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/profile" - "github.com/gravitational/teleport/api/v7/utils/keypaths" + "github.com/gravitational/teleport/api/profile" + "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/sshutils" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/client/keystore_test.go b/lib/client/keystore_test.go index aa2e196120d..9f7995e2c26 100644 --- a/lib/client/keystore_test.go +++ b/lib/client/keystore_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/keypaths" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/keypaths" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/client/mfa.go b/lib/client/mfa.go index 8d9e9bdac1d..0d27b96ce80 100644 --- a/lib/client/mfa.go +++ b/lib/client/mfa.go @@ -24,7 +24,7 @@ import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/client/proto" + "github.com/gravitational/teleport/api/client/proto" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/utils/prompt" ) diff --git a/lib/client/weblogin.go b/lib/client/weblogin.go index 1b1e81373c0..df781d7120f 100644 --- a/lib/client/weblogin.go +++ b/lib/client/weblogin.go @@ -28,8 +28,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/config/configuration.go b/lib/config/configuration.go index ed14c57ca3d..42238275454 100644 --- a/lib/config/configuration.go +++ b/lib/config/configuration.go @@ -37,9 +37,9 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/config/configuration_test.go b/lib/config/configuration_test.go index 8669a009047..35955815448 100644 --- a/lib/config/configuration_test.go +++ b/lib/config/configuration_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/config/fileconf.go b/lib/config/fileconf.go index b1974520f40..3701c9f1c68 100644 --- a/lib/config/fileconf.go +++ b/lib/config/fileconf.go @@ -32,10 +32,10 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" - "github.com/gravitational/teleport/api/v7/utils/tlsutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" + "github.com/gravitational/teleport/api/utils/tlsutils" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/config/fileconf_test.go b/lib/config/fileconf_test.go index cfed2a876fe..dade64f8685 100644 --- a/lib/config/fileconf_test.go +++ b/lib/config/fileconf_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" ) diff --git a/lib/config/formatter.go b/lib/config/formatter.go index 76cf5c7fb01..6df66c79820 100644 --- a/lib/config/formatter.go +++ b/lib/config/formatter.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" log "github.com/sirupsen/logrus" ) diff --git a/lib/defaults/defaults.go b/lib/defaults/defaults.go index 0102079df8d..d35c72e0c1b 100644 --- a/lib/defaults/defaults.go +++ b/lib/defaults/defaults.go @@ -24,7 +24,7 @@ import ( "net/http" "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/teleport/lib/limiter" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/api.go b/lib/events/api.go index 14a46ff9156..5eca8bed973 100644 --- a/lib/events/api.go +++ b/lib/events/api.go @@ -23,8 +23,8 @@ import ( "math" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/trace" diff --git a/lib/events/auditlog.go b/lib/events/auditlog.go index 31d97d030c4..7addfd48d75 100644 --- a/lib/events/auditlog.go +++ b/lib/events/auditlog.go @@ -32,9 +32,9 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/auditlog_test.go b/lib/events/auditlog_test.go index 673befdf226..c337baffefd 100644 --- a/lib/events/auditlog_test.go +++ b/lib/events/auditlog_test.go @@ -30,10 +30,10 @@ import ( "gopkg.in/check.v1" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/events" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/fixtures" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/auditwriter.go b/lib/events/auditwriter.go index 5d49370f65a..f0e7b410594 100644 --- a/lib/events/auditwriter.go +++ b/lib/events/auditwriter.go @@ -21,8 +21,8 @@ import ( "sync" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/auditwriter_test.go b/lib/events/auditwriter_test.go index 58a696b89d7..d72280821bc 100644 --- a/lib/events/auditwriter_test.go +++ b/lib/events/auditwriter_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/trace" diff --git a/lib/events/complete.go b/lib/events/complete.go index 984e779c086..93e1aae400d 100644 --- a/lib/events/complete.go +++ b/lib/events/complete.go @@ -21,10 +21,10 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types/events" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types/events" + apievents "github.com/gravitational/teleport/api/types/events" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/discard.go b/lib/events/discard.go index 4dd90c46f04..383135125c5 100644 --- a/lib/events/discard.go +++ b/lib/events/discard.go @@ -20,8 +20,8 @@ import ( "context" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" ) diff --git a/lib/events/dynamic.go b/lib/events/dynamic.go index fffcd7189ab..e11425e50d1 100644 --- a/lib/events/dynamic.go +++ b/lib/events/dynamic.go @@ -17,9 +17,9 @@ limitations under the License. package events import ( - "github.com/gravitational/teleport/api/v7/types/events" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types/events" + apievents "github.com/gravitational/teleport/api/types/events" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/events/dynamoevents/dynamoevents.go b/lib/events/dynamoevents/dynamoevents.go index 370db7473b3..11ea93afc92 100644 --- a/lib/events/dynamoevents/dynamoevents.go +++ b/lib/events/dynamoevents/dynamoevents.go @@ -31,9 +31,9 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/dynamo" "github.com/gravitational/teleport/lib/events" diff --git a/lib/events/dynamoevents/dynamoevents_test.go b/lib/events/dynamoevents/dynamoevents_test.go index d1aca6e490e..c386adb329e 100644 --- a/lib/events/dynamoevents/dynamoevents_test.go +++ b/lib/events/dynamoevents/dynamoevents_test.go @@ -32,9 +32,9 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/backend/memory" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/events/test" diff --git a/lib/events/emitter.go b/lib/events/emitter.go index 01f5d6ff9a7..c1acd86a761 100644 --- a/lib/events/emitter.go +++ b/lib/events/emitter.go @@ -23,7 +23,7 @@ import ( "time" "github.com/gravitational/teleport" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/emitter_test.go b/lib/events/emitter_test.go index 674fbdf7c68..56e532a1319 100644 --- a/lib/events/emitter_test.go +++ b/lib/events/emitter_test.go @@ -28,7 +28,7 @@ import ( "time" "github.com/gravitational/teleport" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/events_test.go b/lib/events/events_test.go index ea34d674c9d..8910e31e6eb 100644 --- a/lib/events/events_test.go +++ b/lib/events/events_test.go @@ -23,7 +23,7 @@ import ( "gopkg.in/check.v1" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/fixtures" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/events/fields.go b/lib/events/fields.go index 7d83d0796bc..3952c5d6fa9 100644 --- a/lib/events/fields.go +++ b/lib/events/fields.go @@ -25,8 +25,8 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/events/filelog.go b/lib/events/filelog.go index cac855fd4d8..c6b6a86e79b 100644 --- a/lib/events/filelog.go +++ b/lib/events/filelog.go @@ -31,8 +31,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/filelog_test.go b/lib/events/filelog_test.go index 6a6a88f071d..53ae66e98a0 100644 --- a/lib/events/filelog_test.go +++ b/lib/events/filelog_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/events" "github.com/jonboulle/clockwork" "github.com/stretchr/testify/require" diff --git a/lib/events/filesessions/fileasync.go b/lib/events/filesessions/fileasync.go index b1852d0b700..7097cc323c3 100644 --- a/lib/events/filesessions/fileasync.go +++ b/lib/events/filesessions/fileasync.go @@ -27,8 +27,8 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/session" diff --git a/lib/events/filesessions/fileasync_chaos_test.go b/lib/events/filesessions/fileasync_chaos_test.go index 21a4a15829b..b6f4f77c275 100644 --- a/lib/events/filesessions/fileasync_chaos_test.go +++ b/lib/events/filesessions/fileasync_chaos_test.go @@ -33,7 +33,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/session" diff --git a/lib/events/filesessions/fileasync_test.go b/lib/events/filesessions/fileasync_test.go index b62d18dd780..aec9f59121a 100644 --- a/lib/events/filesessions/fileasync_test.go +++ b/lib/events/filesessions/fileasync_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/session" diff --git a/lib/events/firestoreevents/firestoreevents.go b/lib/events/firestoreevents/firestoreevents.go index 8274663bc0b..55de71efa4f 100644 --- a/lib/events/firestoreevents/firestoreevents.go +++ b/lib/events/firestoreevents/firestoreevents.go @@ -25,14 +25,14 @@ import ( "strconv" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/backend" "github.com/prometheus/client_golang/prometheus" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + apiutils "github.com/gravitational/teleport/api/utils" firestorebk "github.com/gravitational/teleport/lib/backend/firestore" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/events/generate.go b/lib/events/generate.go index dad6b20f65b..6dbff6b4ff7 100644 --- a/lib/events/generate.go +++ b/lib/events/generate.go @@ -20,7 +20,7 @@ import ( "bytes" "time" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/jonboulle/clockwork" "github.com/pborman/uuid" ) diff --git a/lib/events/mock.go b/lib/events/mock.go index af8e73918e9..64fd51be5bf 100644 --- a/lib/events/mock.go +++ b/lib/events/mock.go @@ -21,7 +21,7 @@ import ( "sync" "time" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/trace" diff --git a/lib/events/multilog.go b/lib/events/multilog.go index cbf94e8344b..eda90b817d4 100644 --- a/lib/events/multilog.go +++ b/lib/events/multilog.go @@ -20,8 +20,8 @@ import ( "context" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/trace" diff --git a/lib/events/playback.go b/lib/events/playback.go index a8d6a9bfdc2..604df6eba79 100644 --- a/lib/events/playback.go +++ b/lib/events/playback.go @@ -29,7 +29,7 @@ import ( "path/filepath" "github.com/gravitational/teleport" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/recorder.go b/lib/events/recorder.go index 4379379d82c..34bbbeb3263 100644 --- a/lib/events/recorder.go +++ b/lib/events/recorder.go @@ -22,8 +22,8 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/session" diff --git a/lib/events/stream.go b/lib/events/stream.go index 02b1f3d3628..b2666ff3421 100644 --- a/lib/events/stream.go +++ b/lib/events/stream.go @@ -27,7 +27,7 @@ import ( "sync" "time" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/events/test/suite.go b/lib/events/test/suite.go index aa748d95fab..c6521a0d1d9 100644 --- a/lib/events/test/suite.go +++ b/lib/events/test/suite.go @@ -26,9 +26,9 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/fixtures" "github.com/gravitational/teleport/lib/session" diff --git a/lib/events/writer.go b/lib/events/writer.go index 1ada067baea..3d37799e312 100644 --- a/lib/events/writer.go +++ b/lib/events/writer.go @@ -22,8 +22,8 @@ import ( "io" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/session" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/kube/proxy/forwarder.go b/lib/kube/proxy/forwarder.go index 8f9610c3426..f2ad1980ad7 100644 --- a/lib/kube/proxy/forwarder.go +++ b/lib/kube/proxy/forwarder.go @@ -32,10 +32,10 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/kube/proxy/forwarder_test.go b/lib/kube/proxy/forwarder_test.go index 9412b5497ab..2d90fb5da47 100644 --- a/lib/kube/proxy/forwarder_test.go +++ b/lib/kube/proxy/forwarder_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/kube/proxy/remotecommand.go b/lib/kube/proxy/remotecommand.go index d3f327f04af..7a97e9da5ca 100644 --- a/lib/kube/proxy/remotecommand.go +++ b/lib/kube/proxy/remotecommand.go @@ -24,7 +24,7 @@ import ( "net/http" "time" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/trace" log "github.com/sirupsen/logrus" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/lib/kube/proxy/server.go b/lib/kube/proxy/server.go index fcacae3b5c4..19a700e8cec 100644 --- a/lib/kube/proxy/server.go +++ b/lib/kube/proxy/server.go @@ -24,8 +24,8 @@ import ( "sync" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/limiter" diff --git a/lib/kube/proxy/server_test.go b/lib/kube/proxy/server_test.go index 5bef1d5e578..15585856d30 100644 --- a/lib/kube/proxy/server_test.go +++ b/lib/kube/proxy/server_test.go @@ -33,7 +33,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/kube/proxy/url.go b/lib/kube/proxy/url.go index a040ec61bc6..34b2fbc791b 100644 --- a/lib/kube/proxy/url.go +++ b/lib/kube/proxy/url.go @@ -21,7 +21,7 @@ import ( "path" "strings" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" ) type apiResource struct { diff --git a/lib/kube/utils/utils.go b/lib/kube/utils/utils.go index f6649291088..93e926e81bd 100644 --- a/lib/kube/utils/utils.go +++ b/lib/kube/utils/utils.go @@ -21,8 +21,8 @@ import ( "encoding/hex" "sort" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/trace" "k8s.io/client-go/kubernetes" diff --git a/lib/kube/utils/utils_test.go b/lib/kube/utils/utils_test.go index 4d5ed8d4229..5b4e387d2aa 100644 --- a/lib/kube/utils/utils_test.go +++ b/lib/kube/utils/utils_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/stretchr/testify/require" ) diff --git a/lib/labels/labels.go b/lib/labels/labels.go index 41cab72db53..3fce155e1e6 100644 --- a/lib/labels/labels.go +++ b/lib/labels/labels.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/trace" "github.com/sirupsen/logrus" diff --git a/lib/labels/labels_test.go b/lib/labels/labels_test.go index 9ea66a1bb18..6788ba6516a 100644 --- a/lib/labels/labels_test.go +++ b/lib/labels/labels_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" "github.com/pborman/uuid" diff --git a/lib/modules/modules.go b/lib/modules/modules.go index 379261fe95a..fa9850685ae 100644 --- a/lib/modules/modules.go +++ b/lib/modules/modules.go @@ -26,9 +26,9 @@ import ( "sync" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" ) diff --git a/lib/modules/modules_test.go b/lib/modules/modules_test.go index edb952c8374..b1312c9e999 100644 --- a/lib/modules/modules_test.go +++ b/lib/modules/modules_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/modules" diff --git a/lib/restrictedsession/audit.go b/lib/restrictedsession/audit.go index 7df6ea243b5..30e79cbffd2 100644 --- a/lib/restrictedsession/audit.go +++ b/lib/restrictedsession/audit.go @@ -25,7 +25,7 @@ import ( "net" "unsafe" - "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/bpf" api "github.com/gravitational/teleport/lib/events" "github.com/gravitational/trace" diff --git a/lib/restrictedsession/manager.go b/lib/restrictedsession/manager.go index eb4e345de5d..94a1b21bf81 100644 --- a/lib/restrictedsession/manager.go +++ b/lib/restrictedsession/manager.go @@ -17,7 +17,7 @@ limitations under the License. package restrictedsession import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/services" ) diff --git a/lib/restrictedsession/restricted_test.go b/lib/restrictedsession/restricted_test.go index 4bbc3816973..3abc946b7b1 100644 --- a/lib/restrictedsession/restricted_test.go +++ b/lib/restrictedsession/restricted_test.go @@ -30,9 +30,9 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - api "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + api "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/restrictedsession/watcher.go b/lib/restrictedsession/watcher.go index ba2e5d2e3b2..2259939ad74 100644 --- a/lib/restrictedsession/watcher.go +++ b/lib/restrictedsession/watcher.go @@ -25,7 +25,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/reversetunnel/agent.go b/lib/reversetunnel/agent.go index c34177561c5..5c98c8accbf 100644 --- a/lib/reversetunnel/agent.go +++ b/lib/reversetunnel/agent.go @@ -28,10 +28,10 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/reversetunnel/track" "github.com/gravitational/teleport/lib/sshutils" diff --git a/lib/reversetunnel/api.go b/lib/reversetunnel/api.go index 47ddc840a59..6a803ae3f7f 100644 --- a/lib/reversetunnel/api.go +++ b/lib/reversetunnel/api.go @@ -23,7 +23,7 @@ import ( "net" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/teleagent" ) diff --git a/lib/reversetunnel/cache.go b/lib/reversetunnel/cache.go index 0a6a09d5dcb..e9f0033ea11 100644 --- a/lib/reversetunnel/cache.go +++ b/lib/reversetunnel/cache.go @@ -23,8 +23,8 @@ import ( "golang.org/x/crypto/ssh" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/sshca" diff --git a/lib/reversetunnel/conn.go b/lib/reversetunnel/conn.go index 3059af95c3a..0da13e92edf 100644 --- a/lib/reversetunnel/conn.go +++ b/lib/reversetunnel/conn.go @@ -26,8 +26,8 @@ import ( "golang.org/x/crypto/ssh" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/trace" diff --git a/lib/reversetunnel/discovery.go b/lib/reversetunnel/discovery.go index 3ec3f022757..b5bd521d705 100644 --- a/lib/reversetunnel/discovery.go +++ b/lib/reversetunnel/discovery.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/reversetunnel/localsite.go b/lib/reversetunnel/localsite.go index f7030282d9d..87ec5480a5a 100644 --- a/lib/reversetunnel/localsite.go +++ b/lib/reversetunnel/localsite.go @@ -25,9 +25,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/srv/forward" diff --git a/lib/reversetunnel/peer.go b/lib/reversetunnel/peer.go index 1e35050afe3..962a60111d6 100644 --- a/lib/reversetunnel/peer.go +++ b/lib/reversetunnel/peer.go @@ -23,7 +23,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/services" diff --git a/lib/reversetunnel/rc_manager_test.go b/lib/reversetunnel/rc_manager_test.go index aa47e484b55..db9766f6518 100644 --- a/lib/reversetunnel/rc_manager_test.go +++ b/lib/reversetunnel/rc_manager_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/services" diff --git a/lib/reversetunnel/remotesite.go b/lib/reversetunnel/remotesite.go index 3e804ee3103..24e4f604aaf 100644 --- a/lib/reversetunnel/remotesite.go +++ b/lib/reversetunnel/remotesite.go @@ -26,10 +26,10 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/srv/forward" diff --git a/lib/reversetunnel/srv.go b/lib/reversetunnel/srv.go index 966ca648418..d274202f58f 100644 --- a/lib/reversetunnel/srv.go +++ b/lib/reversetunnel/srv.go @@ -28,9 +28,9 @@ import ( "github.com/coreos/go-semver/semver" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/reversetunnel/srv_test.go b/lib/reversetunnel/srv_test.go index 1b0e9d39857..2522bdaadc8 100644 --- a/lib/reversetunnel/srv_test.go +++ b/lib/reversetunnel/srv_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/reversetunnel/transport.go b/lib/reversetunnel/transport.go index 404cf869624..91a9ec422b4 100644 --- a/lib/reversetunnel/transport.go +++ b/lib/reversetunnel/transport.go @@ -27,9 +27,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/utils/proxy" diff --git a/lib/service/acme.go b/lib/service/acme.go index 6617f6a7093..014177b96e7 100644 --- a/lib/service/acme.go +++ b/lib/service/acme.go @@ -21,7 +21,7 @@ import ( "net" "strings" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/reversetunnel" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/web/app" diff --git a/lib/service/cfg.go b/lib/service/cfg.go index b1c9de44b56..9a0e7b8fb89 100644 --- a/lib/service/cfg.go +++ b/lib/service/cfg.go @@ -34,8 +34,8 @@ import ( "golang.org/x/net/http/httpguts" "k8s.io/apimachinery/pkg/util/validation" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/service/connect.go b/lib/service/connect.go index c4060d2e42c..3f2d0faec9a 100644 --- a/lib/service/connect.go +++ b/lib/service/connect.go @@ -26,10 +26,10 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/roundtrip" - apiclient "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/client/webclient" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + apiclient "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/client/webclient" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/client" diff --git a/lib/service/db.go b/lib/service/db.go index 2eacaa31b31..aa2bae4fa5f 100644 --- a/lib/service/db.go +++ b/lib/service/db.go @@ -18,7 +18,7 @@ package service import ( "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/cache" "github.com/gravitational/teleport/lib/events" diff --git a/lib/service/kubernetes.go b/lib/service/kubernetes.go index 24ab4e60982..977a760dc58 100644 --- a/lib/service/kubernetes.go +++ b/lib/service/kubernetes.go @@ -21,8 +21,8 @@ import ( "net/http" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/cache" "github.com/gravitational/teleport/lib/events" diff --git a/lib/service/service.go b/lib/service/service.go index a2ccd011fec..0579c160013 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -48,12 +48,12 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/client/webclient" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/client/webclient" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/backend" diff --git a/lib/service/service_test.go b/lib/service/service_test.go index 28f165324ff..ecd19bf599e 100644 --- a/lib/service/service_test.go +++ b/lib/service/service_test.go @@ -28,7 +28,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/backend/memory" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/services/access.go b/lib/services/access.go index 2f9b74db88d..8130dff5e38 100644 --- a/lib/services/access.go +++ b/lib/services/access.go @@ -19,7 +19,7 @@ package services import ( "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) // LockGetter is a service that gets locks. diff --git a/lib/services/access_request.go b/lib/services/access_request.go index 9b8b7de9ba9..6681ba16364 100644 --- a/lib/services/access_request.go +++ b/lib/services/access_request.go @@ -22,8 +22,8 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/utils/parse" diff --git a/lib/services/access_request_test.go b/lib/services/access_request_test.go index e5720cfba3d..76d99b59e2c 100644 --- a/lib/services/access_request_test.go +++ b/lib/services/access_request_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/fixtures" "github.com/google/go-cmp/cmp" diff --git a/lib/services/audit.go b/lib/services/audit.go index 728184e5cd2..d5e6a6e0217 100644 --- a/lib/services/audit.go +++ b/lib/services/audit.go @@ -17,8 +17,8 @@ limitations under the License. package services import ( - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" ) diff --git a/lib/services/authentication.go b/lib/services/authentication.go index 77311a5d99a..ea0b693e684 100644 --- a/lib/services/authentication.go +++ b/lib/services/authentication.go @@ -22,7 +22,7 @@ import ( "encoding/json" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/authority.go b/lib/services/authority.go index a40d686626f..57cb7c5f0eb 100644 --- a/lib/services/authority.go +++ b/lib/services/authority.go @@ -22,9 +22,9 @@ import ( "encoding/json" "time" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/jwt" diff --git a/lib/services/authority_test.go b/lib/services/authority_test.go index 1ba64150685..35395d1c8cf 100644 --- a/lib/services/authority_test.go +++ b/lib/services/authority_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" ) diff --git a/lib/services/clusterconfig.go b/lib/services/clusterconfig.go index 026ad9bc039..c1960e0fe1e 100644 --- a/lib/services/clusterconfig.go +++ b/lib/services/clusterconfig.go @@ -19,8 +19,8 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/clustername.go b/lib/services/clustername.go index a682dd95d6d..50acf1b444e 100644 --- a/lib/services/clustername.go +++ b/lib/services/clustername.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" "github.com/pborman/uuid" diff --git a/lib/services/configuration.go b/lib/services/configuration.go index 8d287ef3526..836d3f2f6f0 100644 --- a/lib/services/configuration.go +++ b/lib/services/configuration.go @@ -19,7 +19,7 @@ package services import ( "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) // ClusterConfiguration stores the cluster configuration in the backend. All diff --git a/lib/services/databaseserver.go b/lib/services/databaseserver.go index bc2d8cdb079..d39a314bd3d 100644 --- a/lib/services/databaseserver.go +++ b/lib/services/databaseserver.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/fanout.go b/lib/services/fanout.go index fbc5fe23ec7..d84c3a0457c 100644 --- a/lib/services/fanout.go +++ b/lib/services/fanout.go @@ -20,7 +20,7 @@ import ( "context" "sync" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" ) diff --git a/lib/services/fanout_test.go b/lib/services/fanout_test.go index a1d145adfbe..d3c15470a4b 100644 --- a/lib/services/fanout_test.go +++ b/lib/services/fanout_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/stretchr/testify/assert" ) diff --git a/lib/services/github.go b/lib/services/github.go index e1ad747d307..f873a456d30 100644 --- a/lib/services/github.go +++ b/lib/services/github.go @@ -21,7 +21,7 @@ import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/github_test.go b/lib/services/github_test.go index 1d489341b2e..28786ffa7fe 100644 --- a/lib/services/github_test.go +++ b/lib/services/github_test.go @@ -17,7 +17,7 @@ limitations under the License. package services import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" check "gopkg.in/check.v1" ) diff --git a/lib/services/identity.go b/lib/services/identity.go index 31410107f65..9dc09fabd7f 100644 --- a/lib/services/identity.go +++ b/lib/services/identity.go @@ -24,8 +24,8 @@ import ( "context" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/services/impersonate.go b/lib/services/impersonate.go index a5bc3d3bbef..17bc05b4307 100644 --- a/lib/services/impersonate.go +++ b/lib/services/impersonate.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "github.com/vulcand/predicate" diff --git a/lib/services/impersonate_test.go b/lib/services/impersonate_test.go index d6207cfe84c..2a21fc56a8d 100644 --- a/lib/services/impersonate_test.go +++ b/lib/services/impersonate_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "github.com/stretchr/testify/require" diff --git a/lib/services/license.go b/lib/services/license.go index 3fc3e8ea571..e8a84228fa2 100644 --- a/lib/services/license.go +++ b/lib/services/license.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/license_test.go b/lib/services/license_test.go index 9ae8ad9c5d0..70f64123eda 100644 --- a/lib/services/license_test.go +++ b/lib/services/license_test.go @@ -17,7 +17,7 @@ limitations under the License. package services import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/fixtures" "gopkg.in/check.v1" diff --git a/lib/services/local/access.go b/lib/services/local/access.go index 1b66d2b6ce0..6fca3bd2cee 100644 --- a/lib/services/local/access.go +++ b/lib/services/local/access.go @@ -20,7 +20,7 @@ import ( "context" "sort" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/access_test.go b/lib/services/local/access_test.go index 9b647e92f39..75492b5cf26 100644 --- a/lib/services/local/access_test.go +++ b/lib/services/local/access_test.go @@ -25,7 +25,7 @@ import ( "github.com/gravitational/trace" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend/lite" ) diff --git a/lib/services/local/configuration.go b/lib/services/local/configuration.go index ba91919d281..e13552962bd 100644 --- a/lib/services/local/configuration.go +++ b/lib/services/local/configuration.go @@ -22,7 +22,7 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/modules" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/configuration_test.go b/lib/services/local/configuration_test.go index ddcadea9e57..536b12cc14e 100644 --- a/lib/services/local/configuration_test.go +++ b/lib/services/local/configuration_test.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/services/local/dynamic_access.go b/lib/services/local/dynamic_access.go index 71c932d897f..01fdf8cf06c 100644 --- a/lib/services/local/dynamic_access.go +++ b/lib/services/local/dynamic_access.go @@ -22,8 +22,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/local/events.go b/lib/services/local/events.go index 995925a2d36..3b83bfd7d3b 100644 --- a/lib/services/local/events.go +++ b/lib/services/local/events.go @@ -20,8 +20,8 @@ import ( "bytes" "context" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/perf_test.go b/lib/services/local/perf_test.go index 1176acf8903..9b2c2fb2a2a 100644 --- a/lib/services/local/perf_test.go +++ b/lib/services/local/perf_test.go @@ -23,8 +23,8 @@ import ( "os" "testing" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" "github.com/gravitational/teleport/lib/backend/memory" diff --git a/lib/services/local/presence.go b/lib/services/local/presence.go index dc093c5978a..c3c7aaa4146 100644 --- a/lib/services/local/presence.go +++ b/lib/services/local/presence.go @@ -23,8 +23,8 @@ import ( "sort" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/local/presence_test.go b/lib/services/local/presence_test.go index ff521b2c136..37063e84112 100644 --- a/lib/services/local/presence_test.go +++ b/lib/services/local/presence_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/check.v1" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/services/local/provisioning.go b/lib/services/local/provisioning.go index 539830fa8f1..a89b28da22f 100644 --- a/lib/services/local/provisioning.go +++ b/lib/services/local/provisioning.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/resetpasswordtoken.go b/lib/services/local/resetpasswordtoken.go index 63de74f338f..49046d20ab3 100644 --- a/lib/services/local/resetpasswordtoken.go +++ b/lib/services/local/resetpasswordtoken.go @@ -20,7 +20,7 @@ import ( "bytes" "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/resource.go b/lib/services/local/resource.go index 686fd7bc50f..ac05346e532 100644 --- a/lib/services/local/resource.go +++ b/lib/services/local/resource.go @@ -21,7 +21,7 @@ import ( "encoding/json" "strings" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/resource_test.go b/lib/services/local/resource_test.go index 526e3312a3d..a7fa580ca33 100644 --- a/lib/services/local/resource_test.go +++ b/lib/services/local/resource_test.go @@ -27,8 +27,8 @@ import ( "golang.org/x/crypto/bcrypt" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/services/local/restrictions.go b/lib/services/local/restrictions.go index 8c6946c2d2a..4f3ce58bc8c 100644 --- a/lib/services/local/restrictions.go +++ b/lib/services/local/restrictions.go @@ -19,7 +19,7 @@ package local import ( "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/session.go b/lib/services/local/session.go index b06a579b941..a0e761cec64 100644 --- a/lib/services/local/session.go +++ b/lib/services/local/session.go @@ -19,7 +19,7 @@ package local import ( "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/trust.go b/lib/services/local/trust.go index 14d1e424b28..c04c99a16c5 100644 --- a/lib/services/local/trust.go +++ b/lib/services/local/trust.go @@ -3,7 +3,7 @@ package local import ( "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/services" diff --git a/lib/services/local/users.go b/lib/services/local/users.go index ca6d2ac7195..3f6b3d7f1f7 100644 --- a/lib/services/local/users.go +++ b/lib/services/local/users.go @@ -27,7 +27,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/services/lock.go b/lib/services/lock.go index 69e8507a419..81d522f5e23 100644 --- a/lib/services/lock.go +++ b/lib/services/lock.go @@ -19,7 +19,7 @@ package services import ( "fmt" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/map_test.go b/lib/services/map_test.go index b994498230f..eed603001c7 100644 --- a/lib/services/map_test.go +++ b/lib/services/map_test.go @@ -17,8 +17,8 @@ limitations under the License. package services import ( - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "gopkg.in/check.v1" diff --git a/lib/services/namespace.go b/lib/services/namespace.go index 066054e6e19..d0a3d581ed1 100644 --- a/lib/services/namespace.go +++ b/lib/services/namespace.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/networking.go b/lib/services/networking.go index a893137c503..fbb93710f55 100644 --- a/lib/services/networking.go +++ b/lib/services/networking.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/oidc.go b/lib/services/oidc.go index 3f91c38d29c..ecfd049ac08 100644 --- a/lib/services/oidc.go +++ b/lib/services/oidc.go @@ -23,7 +23,7 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/oidc_test.go b/lib/services/oidc_test.go index 454ea4ea0f6..2059b983c3e 100644 --- a/lib/services/oidc_test.go +++ b/lib/services/oidc_test.go @@ -22,7 +22,7 @@ import ( "github.com/coreos/go-oidc/jose" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/stretchr/testify/require" ) diff --git a/lib/services/parser.go b/lib/services/parser.go index f86f620f0c9..84f35250b6c 100644 --- a/lib/services/parser.go +++ b/lib/services/parser.go @@ -23,8 +23,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" "github.com/gravitational/trace" log "github.com/sirupsen/logrus" diff --git a/lib/services/plugin_data.go b/lib/services/plugin_data.go index a4f2376eb39..15ed30d0df1 100644 --- a/lib/services/plugin_data.go +++ b/lib/services/plugin_data.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/presence.go b/lib/services/presence.go index 101bbb5d5b9..aa5bb9b329c 100644 --- a/lib/services/presence.go +++ b/lib/services/presence.go @@ -19,7 +19,7 @@ package services import ( "context" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) // ProxyGetter is a service that gets proxies. diff --git a/lib/services/presets.go b/lib/services/presets.go index fc2f0f57972..eea5c1225f2 100644 --- a/lib/services/presets.go +++ b/lib/services/presets.go @@ -19,9 +19,9 @@ package services import ( "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/pborman/uuid" ) diff --git a/lib/services/provisioning.go b/lib/services/provisioning.go index a11283a489e..3f035ab5cab 100644 --- a/lib/services/provisioning.go +++ b/lib/services/provisioning.go @@ -22,7 +22,7 @@ import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/remotecluster.go b/lib/services/remotecluster.go index a84f5e4b72f..a463aea5cd3 100644 --- a/lib/services/remotecluster.go +++ b/lib/services/remotecluster.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/resetpasswordtoken.go b/lib/services/resetpasswordtoken.go index e06ebbb027e..209a15c7402 100644 --- a/lib/services/resetpasswordtoken.go +++ b/lib/services/resetpasswordtoken.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/resetpasswordtoken_test.go b/lib/services/resetpasswordtoken_test.go index 3ff82e42427..ef9917a78ad 100644 --- a/lib/services/resetpasswordtoken_test.go +++ b/lib/services/resetpasswordtoken_test.go @@ -20,7 +20,7 @@ import ( "gopkg.in/check.v1" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/fixtures" ) diff --git a/lib/services/resetpasswordtokensecrets.go b/lib/services/resetpasswordtokensecrets.go index 9ed86c62c39..ac20d294233 100644 --- a/lib/services/resetpasswordtokensecrets.go +++ b/lib/services/resetpasswordtokensecrets.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/resource.go b/lib/services/resource.go index 0e5c6c12261..60c2145e3cf 100644 --- a/lib/services/resource.go +++ b/lib/services/resource.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" ) diff --git a/lib/services/restrictions.go b/lib/services/restrictions.go index 81aac64131a..a320c602d04 100644 --- a/lib/services/restrictions.go +++ b/lib/services/restrictions.go @@ -20,7 +20,7 @@ import ( "context" "encoding/json" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/services/role.go b/lib/services/role.go index c1e37b631a2..3929a3b3c64 100644 --- a/lib/services/role.go +++ b/lib/services/role.go @@ -27,11 +27,11 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/modules" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/role_test.go b/lib/services/role_test.go index ac2cd670b9b..86d1a49cf46 100644 --- a/lib/services/role_test.go +++ b/lib/services/role_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/defaults" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" - apiutils "github.com/gravitational/teleport/api/v7/utils" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" + apiutils "github.com/gravitational/teleport/api/utils" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/fixtures" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/services/saml.go b/lib/services/saml.go index 3cacc51f42c..17e0f3f0575 100644 --- a/lib/services/saml.go +++ b/lib/services/saml.go @@ -28,7 +28,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/semaphore.go b/lib/services/semaphore.go index 83a5b1d56d8..dfa0e54d9ea 100644 --- a/lib/services/semaphore.go +++ b/lib/services/semaphore.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/semaphore_test.go b/lib/services/semaphore_test.go index 94153740d6b..0aa027acb28 100644 --- a/lib/services/semaphore_test.go +++ b/lib/services/semaphore_test.go @@ -19,7 +19,7 @@ package services import ( "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "gopkg.in/check.v1" ) diff --git a/lib/services/server.go b/lib/services/server.go index 6f964936ad9..5d50059d79b 100644 --- a/lib/services/server.go +++ b/lib/services/server.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/servers_test.go b/lib/services/servers_test.go index 09a499fbd77..e01cd6e78fb 100644 --- a/lib/services/servers_test.go +++ b/lib/services/servers_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/services/services.go b/lib/services/services.go index 76b8da497de..c4cba530c11 100644 --- a/lib/services/services.go +++ b/lib/services/services.go @@ -16,7 +16,7 @@ limitations under the License. package services -import "github.com/gravitational/teleport/api/v7/types" +import "github.com/gravitational/teleport/api/types" // Services collects all services type Services interface { diff --git a/lib/services/services_test.go b/lib/services/services_test.go index ae4b3bb0ed4..408426503fa 100644 --- a/lib/services/services_test.go +++ b/lib/services/services_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/fixtures" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/session.go b/lib/services/session.go index 4f79606ca72..ffd66fb79ba 100644 --- a/lib/services/session.go +++ b/lib/services/session.go @@ -19,8 +19,8 @@ package services import ( "encoding/json" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/services/sessionrecording.go b/lib/services/sessionrecording.go index 7dbe54ad8ce..a993a593293 100644 --- a/lib/services/sessionrecording.go +++ b/lib/services/sessionrecording.go @@ -17,7 +17,7 @@ limitations under the License. package services import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/services/statictokens.go b/lib/services/statictokens.go index cc808cc03f5..9cbc6990193 100644 --- a/lib/services/statictokens.go +++ b/lib/services/statictokens.go @@ -19,7 +19,7 @@ package services import ( "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/suite/presence_test.go b/lib/services/suite/presence_test.go index 0a2a310fff4..d6aa6c96839 100644 --- a/lib/services/suite/presence_test.go +++ b/lib/services/suite/presence_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "gopkg.in/check.v1" ) diff --git a/lib/services/suite/suite.go b/lib/services/suite/suite.go index 7487dae564d..d2f46d748a0 100644 --- a/lib/services/suite/suite.go +++ b/lib/services/suite/suite.go @@ -31,9 +31,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/services/traits.go b/lib/services/traits.go index 4c21dde75d1..011f1486c5e 100644 --- a/lib/services/traits.go +++ b/lib/services/traits.go @@ -19,8 +19,8 @@ package services import ( "fmt" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/teleport/lib/utils/parse" diff --git a/lib/services/traits_test.go b/lib/services/traits_test.go index b6e76b253c2..ad6531ec577 100644 --- a/lib/services/traits_test.go +++ b/lib/services/traits_test.go @@ -19,8 +19,8 @@ package services import ( "testing" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/stretchr/testify/require" ) diff --git a/lib/services/trust.go b/lib/services/trust.go index 82aa63e72b2..3302865b9a0 100644 --- a/lib/services/trust.go +++ b/lib/services/trust.go @@ -16,7 +16,7 @@ limitations under the License. package services -import "github.com/gravitational/teleport/api/v7/types" +import "github.com/gravitational/teleport/api/types" // Trust is responsible for managing certificate authorities // Each authority is managing some domain, e.g. example.com diff --git a/lib/services/trustedcluster.go b/lib/services/trustedcluster.go index 09d3b7c6049..49fdfefd3fb 100644 --- a/lib/services/trustedcluster.go +++ b/lib/services/trustedcluster.go @@ -19,8 +19,8 @@ package services import ( "fmt" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/services/tunnel.go b/lib/services/tunnel.go index 85d384eb537..328c74aa198 100644 --- a/lib/services/tunnel.go +++ b/lib/services/tunnel.go @@ -19,7 +19,7 @@ package services import ( "encoding/json" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/services/tunnelconn.go b/lib/services/tunnelconn.go index c860cf22087..aa71a1692d3 100644 --- a/lib/services/tunnelconn.go +++ b/lib/services/tunnelconn.go @@ -20,7 +20,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" "github.com/gravitational/trace" diff --git a/lib/services/user.go b/lib/services/user.go index 035e74046b0..db899951266 100644 --- a/lib/services/user.go +++ b/lib/services/user.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/gravitational/trace" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/services/user_test.go b/lib/services/user_test.go index ea65f694ff0..a0ec0af2876 100644 --- a/lib/services/user_test.go +++ b/lib/services/user_test.go @@ -20,14 +20,14 @@ import ( "encoding/json" "fmt" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" "github.com/coreos/go-oidc/jose" saml2 "github.com/russellhaering/gosaml2" samltypes "github.com/russellhaering/gosaml2/types" "gopkg.in/check.v1" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) type UserSuite struct { diff --git a/lib/services/watcher.go b/lib/services/watcher.go index 5a53f51b8e3..1b75350ce57 100644 --- a/lib/services/watcher.go +++ b/lib/services/watcher.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/services/watcher_test.go b/lib/services/watcher_test.go index e28835d3d7d..40d48a69701 100644 --- a/lib/services/watcher_test.go +++ b/lib/services/watcher_test.go @@ -26,7 +26,7 @@ import ( "github.com/jonboulle/clockwork" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend/lite" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/services/local" diff --git a/lib/services/wrappers_test.go b/lib/services/wrappers_test.go index 916735c17fc..33d6f2bef7f 100644 --- a/lib/services/wrappers_test.go +++ b/lib/services/wrappers_test.go @@ -22,7 +22,7 @@ import ( "gopkg.in/check.v1" - "github.com/gravitational/teleport/api/v7/types/wrappers" + "github.com/gravitational/teleport/api/types/wrappers" ) type WrappersSuite struct{} diff --git a/lib/session/session.go b/lib/session/session.go index 24eac3716a7..e0b315a2674 100644 --- a/lib/session/session.go +++ b/lib/session/session.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/session/session_test.go b/lib/session/session_test.go index 89c93490516..c04f8dd5d7b 100644 --- a/lib/session/session_test.go +++ b/lib/session/session_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/srv/app/server.go b/lib/srv/app/server.go index bfe9cfb6453..c85591ee94d 100644 --- a/lib/srv/app/server.go +++ b/lib/srv/app/server.go @@ -29,8 +29,8 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/labels" diff --git a/lib/srv/app/server_test.go b/lib/srv/app/server_test.go index ffcc2d3ddb8..70105969a84 100644 --- a/lib/srv/app/server_test.go +++ b/lib/srv/app/server_test.go @@ -37,10 +37,10 @@ import ( "github.com/pborman/uuid" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/defaults" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/srv/app/session.go b/lib/srv/app/session.go index b9f160a7d3b..0703cf5dde2 100644 --- a/lib/srv/app/session.go +++ b/lib/srv/app/session.go @@ -23,9 +23,9 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/events/filesessions" diff --git a/lib/srv/app/transport.go b/lib/srv/app/transport.go index e894babd17c..ee4198de64c 100644 --- a/lib/srv/app/transport.go +++ b/lib/srv/app/transport.go @@ -25,10 +25,10 @@ import ( "path" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - "github.com/gravitational/teleport/api/v7/types/wrappers" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + "github.com/gravitational/teleport/api/types/wrappers" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/srv/authhandlers.go b/lib/srv/authhandlers.go index a2e864f0f84..c0f7d874283 100644 --- a/lib/srv/authhandlers.go +++ b/lib/srv/authhandlers.go @@ -25,9 +25,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/srv/ctx.go b/lib/srv/ctx.go index 7b3f712646c..f990247b56b 100644 --- a/lib/srv/ctx.go +++ b/lib/srv/ctx.go @@ -30,8 +30,8 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/srv/db/access_test.go b/lib/srv/db/access_test.go index 313e45c26c4..788efd43c5b 100644 --- a/lib/srv/db/access_test.go +++ b/lib/srv/db/access_test.go @@ -26,8 +26,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/srv/db/audit_test.go b/lib/srv/db/audit_test.go index d97aad7fc4f..5595c98cb37 100644 --- a/lib/srv/db/audit_test.go +++ b/lib/srv/db/audit_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/events" libevents "github.com/gravitational/teleport/lib/events" "github.com/gravitational/trace" diff --git a/lib/srv/db/auth_test.go b/lib/srv/db/auth_test.go index c39132a9bcd..8192166c156 100644 --- a/lib/srv/db/auth_test.go +++ b/lib/srv/db/auth_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/srv/db/common" diff --git a/lib/srv/db/ca.go b/lib/srv/db/ca.go index 2492184551b..19e5c6aeb27 100644 --- a/lib/srv/db/ca.go +++ b/lib/srv/db/ca.go @@ -24,7 +24,7 @@ import ( "path/filepath" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/srv/db/ca_test.go b/lib/srv/db/ca_test.go index 1de017c8a54..272d7a261b0 100644 --- a/lib/srv/db/ca_test.go +++ b/lib/srv/db/ca_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/fixtures" diff --git a/lib/srv/db/common/audit.go b/lib/srv/db/common/audit.go index 51404803daf..6158ae0633b 100644 --- a/lib/srv/db/common/audit.go +++ b/lib/srv/db/common/audit.go @@ -19,8 +19,8 @@ package common import ( "context" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types/events" libevents "github.com/gravitational/teleport/lib/events" "github.com/gravitational/trace" diff --git a/lib/srv/db/common/auth.go b/lib/srv/db/common/auth.go index 54875b9ce2a..ef374506ad5 100644 --- a/lib/srv/db/common/auth.go +++ b/lib/srv/db/common/auth.go @@ -25,8 +25,8 @@ import ( "io" "time" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" libauth "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/srv/db/common/session.go b/lib/srv/db/common/session.go index 0fd12d15c88..ea2c691c104 100644 --- a/lib/srv/db/common/session.go +++ b/lib/srv/db/common/session.go @@ -19,7 +19,7 @@ package common import ( "fmt" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/srv/db/common/test.go b/lib/srv/db/common/test.go index cc1bde509af..079962bc065 100644 --- a/lib/srv/db/common/test.go +++ b/lib/srv/db/common/test.go @@ -23,8 +23,8 @@ import ( "crypto/x509/pkix" "time" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/client" diff --git a/lib/srv/db/ha_test.go b/lib/srv/db/ha_test.go index 63418b2757b..a20e5603e53 100644 --- a/lib/srv/db/ha_test.go +++ b/lib/srv/db/ha_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/srv/db/common" "github.com/gravitational/teleport/lib/srv/db/postgres" diff --git a/lib/srv/db/mysql/engine.go b/lib/srv/db/mysql/engine.go index e9c8867dc00..03e98784e77 100644 --- a/lib/srv/db/mysql/engine.go +++ b/lib/srv/db/mysql/engine.go @@ -22,7 +22,7 @@ import ( "net" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/services" diff --git a/lib/srv/db/postgres/engine.go b/lib/srv/db/postgres/engine.go index 23a22b47e14..68987e2f982 100644 --- a/lib/srv/db/postgres/engine.go +++ b/lib/srv/db/postgres/engine.go @@ -22,7 +22,7 @@ import ( "fmt" "net" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/srv/db/common" diff --git a/lib/srv/db/proxy_test.go b/lib/srv/db/proxy_test.go index e95938d26af..db79c36b987 100644 --- a/lib/srv/db/proxy_test.go +++ b/lib/srv/db/proxy_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/multiplexer" diff --git a/lib/srv/db/proxyserver.go b/lib/srv/db/proxyserver.go index f91ce936be9..0b5bbb414ad 100644 --- a/lib/srv/db/proxyserver.go +++ b/lib/srv/db/proxyserver.go @@ -27,10 +27,10 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client/proto" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/multiplexer" diff --git a/lib/srv/db/server.go b/lib/srv/db/server.go index 2bcaf425e2d..bc48a267c77 100644 --- a/lib/srv/db/server.go +++ b/lib/srv/db/server.go @@ -23,8 +23,8 @@ import ( "sync" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/srv/db/server_test.go b/lib/srv/db/server_test.go index 58e50442dc2..11c41e668af 100644 --- a/lib/srv/db/server_test.go +++ b/lib/srv/db/server_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/stretchr/testify/require" ) diff --git a/lib/srv/db/streamer.go b/lib/srv/db/streamer.go index ed96c9a4be3..5929d3a657e 100644 --- a/lib/srv/db/streamer.go +++ b/lib/srv/db/streamer.go @@ -22,8 +22,8 @@ import ( "path/filepath" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" libevents "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/events/filesessions" "github.com/gravitational/teleport/lib/services" diff --git a/lib/srv/exec.go b/lib/srv/exec.go index 1d2def2422a..3547ba8018b 100644 --- a/lib/srv/exec.go +++ b/lib/srv/exec.go @@ -31,8 +31,8 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apievents "github.com/gravitational/teleport/api/types/events" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/srv/exec_test.go b/lib/srv/exec_test.go index 7a248c885db..d489196cb07 100644 --- a/lib/srv/exec_test.go +++ b/lib/srv/exec_test.go @@ -35,9 +35,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" authority "github.com/gravitational/teleport/lib/auth/testauthority" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/srv/forward/sshserver.go b/lib/srv/forward/sshserver.go index ee64cdda87b..7725359f501 100644 --- a/lib/srv/forward/sshserver.go +++ b/lib/srv/forward/sshserver.go @@ -27,10 +27,10 @@ import ( "golang.org/x/crypto/ssh/agent" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/events" diff --git a/lib/srv/forward/subsystem.go b/lib/srv/forward/subsystem.go index 00d8e3fd836..bd62d8641cd 100644 --- a/lib/srv/forward/subsystem.go +++ b/lib/srv/forward/subsystem.go @@ -23,7 +23,7 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/srv" "github.com/gravitational/trace" diff --git a/lib/srv/heartbeat.go b/lib/srv/heartbeat.go index c92f248b732..dbba9134fac 100644 --- a/lib/srv/heartbeat.go +++ b/lib/srv/heartbeat.go @@ -22,7 +22,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/services" diff --git a/lib/srv/heartbeat_test.go b/lib/srv/heartbeat_test.go index 68d2b354d79..1a5c6610b3b 100644 --- a/lib/srv/heartbeat_test.go +++ b/lib/srv/heartbeat_test.go @@ -24,8 +24,8 @@ import ( "github.com/jonboulle/clockwork" "github.com/stretchr/testify/require" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/trace" diff --git a/lib/srv/monitor.go b/lib/srv/monitor.go index a6259c77402..d5b28d228d9 100644 --- a/lib/srv/monitor.go +++ b/lib/srv/monitor.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/services" diff --git a/lib/srv/regular/proxy.go b/lib/srv/regular/proxy.go index 3aaf490bb61..47a16cb8c02 100644 --- a/lib/srv/regular/proxy.go +++ b/lib/srv/regular/proxy.go @@ -29,9 +29,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/reversetunnel" "github.com/gravitational/teleport/lib/srv" diff --git a/lib/srv/regular/proxy_test.go b/lib/srv/regular/proxy_test.go index beaeb225621..66627768190 100644 --- a/lib/srv/regular/proxy_test.go +++ b/lib/srv/regular/proxy_test.go @@ -17,7 +17,7 @@ limitations under the License. package regular import ( - apidefaults "github.com/gravitational/teleport/api/v7/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/teleport/lib/srv" "gopkg.in/check.v1" diff --git a/lib/srv/regular/sites.go b/lib/srv/regular/sites.go index cc96f649388..54e84ddc609 100644 --- a/lib/srv/regular/sites.go +++ b/lib/srv/regular/sites.go @@ -21,7 +21,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/srv" "github.com/gravitational/trace" diff --git a/lib/srv/regular/sshserver.go b/lib/srv/regular/sshserver.go index 951e922ef9a..ca587ce2200 100644 --- a/lib/srv/regular/sshserver.go +++ b/lib/srv/regular/sshserver.go @@ -34,9 +34,9 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/defaults" diff --git a/lib/srv/regular/sshserver_test.go b/lib/srv/regular/sshserver_test.go index 35b08d5cc38..f1a033febde 100644 --- a/lib/srv/regular/sshserver_test.go +++ b/lib/srv/regular/sshserver_test.go @@ -39,9 +39,9 @@ import ( "golang.org/x/crypto/ssh/agent" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/limiter" diff --git a/lib/srv/sess.go b/lib/srv/sess.go index ce2ad87bf34..a0dcf1f7215 100644 --- a/lib/srv/sess.go +++ b/lib/srv/sess.go @@ -28,8 +28,8 @@ import ( "golang.org/x/crypto/ssh" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/bpf" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/events" diff --git a/lib/sshutils/authority.go b/lib/sshutils/authority.go index 14d1f78fed4..c145cb9178e 100644 --- a/lib/sshutils/authority.go +++ b/lib/sshutils/authority.go @@ -17,7 +17,7 @@ limitations under the License. package sshutils import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/lib/sshutils/signer.go b/lib/sshutils/signer.go index eaee2831bbe..6f0f12dc298 100644 --- a/lib/sshutils/signer.go +++ b/lib/sshutils/signer.go @@ -20,7 +20,7 @@ import ( "crypto" "io" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/utils/sshutils" "golang.org/x/crypto/ssh" diff --git a/lib/tlsca/ca.go b/lib/tlsca/ca.go index c3758a80e70..0916473b33b 100644 --- a/lib/tlsca/ca.go +++ b/lib/tlsca/ca.go @@ -29,8 +29,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/types/wrappers" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/types/wrappers" "github.com/gravitational/trace" "github.com/jonboulle/clockwork" diff --git a/lib/utils/certs.go b/lib/utils/certs.go index eecd24ffdd6..c912dd56bb6 100644 --- a/lib/utils/certs.go +++ b/lib/utils/certs.go @@ -27,7 +27,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/utils/tlsutils" + "github.com/gravitational/teleport/api/utils/tlsutils" "github.com/gravitational/trace" "github.com/jonboulle/clockwork" diff --git a/lib/utils/chconn_test.go b/lib/utils/chconn_test.go index 2a6a3266e7b..481e764f2d1 100644 --- a/lib/utils/chconn_test.go +++ b/lib/utils/chconn_test.go @@ -26,7 +26,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/stretchr/testify/require" "golang.org/x/crypto/ssh" diff --git a/lib/utils/errors.go b/lib/utils/errors.go index df58ca20dce..5ba63adf7d9 100644 --- a/lib/utils/errors.go +++ b/lib/utils/errors.go @@ -19,7 +19,7 @@ package utils import ( "strings" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/trace" ) diff --git a/lib/utils/fs.go b/lib/utils/fs.go index ddc78717091..c1295e5347b 100644 --- a/lib/utils/fs.go +++ b/lib/utils/fs.go @@ -22,7 +22,7 @@ import ( "runtime" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/trace" ) diff --git a/lib/utils/kernel.go b/lib/utils/kernel.go index bd09f3db17c..f687301cb75 100644 --- a/lib/utils/kernel.go +++ b/lib/utils/kernel.go @@ -25,7 +25,7 @@ import ( "runtime" "strings" - "github.com/gravitational/teleport/api/v7/constants" + "github.com/gravitational/teleport/api/constants" "github.com/gravitational/trace" "github.com/coreos/go-semver/semver" diff --git a/lib/utils/proxy/proxy.go b/lib/utils/proxy/proxy.go index cf6bfb601f4..48cb0017ba1 100644 --- a/lib/utils/proxy/proxy.go +++ b/lib/utils/proxy/proxy.go @@ -26,7 +26,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/trace" "golang.org/x/crypto/ssh" diff --git a/lib/utils/roles_test.go b/lib/utils/roles_test.go index 992689e4ecd..8758467f111 100644 --- a/lib/utils/roles_test.go +++ b/lib/utils/roles_test.go @@ -17,7 +17,7 @@ limitations under the License. package utils import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "gopkg.in/check.v1" ) diff --git a/lib/utils/utils.go b/lib/utils/utils.go index c66a4856d0d..fa182c639f4 100644 --- a/lib/utils/utils.go +++ b/lib/utils/utils.go @@ -33,8 +33,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/modules" "github.com/gravitational/trace" diff --git a/lib/utils/utils_test.go b/lib/utils/utils_test.go index 52a7ee6b50e..630fd178dd8 100644 --- a/lib/utils/utils_test.go +++ b/lib/utils/utils_test.go @@ -27,7 +27,7 @@ import ( "time" "github.com/gravitational/teleport" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/fixtures" "github.com/stretchr/testify/require" diff --git a/lib/web/apiserver.go b/lib/web/apiserver.go index e94ba769aad..609c14e22e2 100644 --- a/lib/web/apiserver.go +++ b/lib/web/apiserver.go @@ -36,12 +36,12 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/client/webclient" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/client/webclient" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/client" diff --git a/lib/web/apiserver_test.go b/lib/web/apiserver_test.go index cfdb8434ab6..0bd87e068ff 100644 --- a/lib/web/apiserver_test.go +++ b/lib/web/apiserver_test.go @@ -45,11 +45,11 @@ import ( "golang.org/x/text/encoding/unicode" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/client/webclient" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + "github.com/gravitational/teleport/api/client/webclient" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/mocku2f" "github.com/gravitational/teleport/lib/auth/u2f" diff --git a/lib/web/app/fragment.go b/lib/web/app/fragment.go index 64ee21a4e1b..bd0b7dbda5e 100644 --- a/lib/web/app/fragment.go +++ b/lib/web/app/fragment.go @@ -23,7 +23,7 @@ import ( "net/http" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/httplib" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/web/app/handler.go b/lib/web/app/handler.go index e806b7a7a82..2fd78719131 100644 --- a/lib/web/app/handler.go +++ b/lib/web/app/handler.go @@ -26,7 +26,7 @@ import ( "net/url" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/reversetunnel" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/web/app/handler_test.go b/lib/web/app/handler_test.go index 8469bf74bc4..d04d565c5ba 100644 --- a/lib/web/app/handler_test.go +++ b/lib/web/app/handler_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/utils" diff --git a/lib/web/app/logout.go b/lib/web/app/logout.go index 0421581d74f..cf7c50b2ddc 100644 --- a/lib/web/app/logout.go +++ b/lib/web/app/logout.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" "github.com/julienschmidt/httprouter" diff --git a/lib/web/app/match.go b/lib/web/app/match.go index cf68150862c..d286a04c4e3 100644 --- a/lib/web/app/match.go +++ b/lib/web/app/match.go @@ -21,9 +21,9 @@ import ( "math/rand" "strings" - "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/reversetunnel" "github.com/gravitational/teleport/lib/services" diff --git a/lib/web/app/session.go b/lib/web/app/session.go index cb89bf741b0..b696d3552a2 100644 --- a/lib/web/app/session.go +++ b/lib/web/app/session.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/tlsca" diff --git a/lib/web/app/transport.go b/lib/web/app/transport.go index 71ff6aeeb51..d2fc3d1af74 100644 --- a/lib/web/app/transport.go +++ b/lib/web/app/transport.go @@ -23,8 +23,8 @@ import ( "net" "net/http" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/reversetunnel" diff --git a/lib/web/apps.go b/lib/web/apps.go index 51af429c464..5c0d7e0b70d 100644 --- a/lib/web/apps.go +++ b/lib/web/apps.go @@ -22,9 +22,9 @@ import ( "context" "net/http" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apievents "github.com/gravitational/teleport/api/v7/types/events" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apievents "github.com/gravitational/teleport/api/types/events" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/events" "github.com/gravitational/teleport/lib/httplib" diff --git a/lib/web/files.go b/lib/web/files.go index adb6dd82eb3..96ad8f85249 100644 --- a/lib/web/files.go +++ b/lib/web/files.go @@ -19,7 +19,7 @@ package web import ( "net/http" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/reversetunnel" diff --git a/lib/web/resources.go b/lib/web/resources.go index fb6d5c2a208..5de38b944b4 100644 --- a/lib/web/resources.go +++ b/lib/web/resources.go @@ -21,7 +21,7 @@ import ( "net/http" "strings" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/httplib" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/web/ui" diff --git a/lib/web/resources_test.go b/lib/web/resources_test.go index e333872eb49..a588adcf40c 100644 --- a/lib/web/resources_test.go +++ b/lib/web/resources_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/web/ui" "github.com/gravitational/trace" diff --git a/lib/web/servers.go b/lib/web/servers.go index 5ccffc332f1..9293e0dbd12 100644 --- a/lib/web/servers.go +++ b/lib/web/servers.go @@ -19,7 +19,7 @@ package web import ( "net/http" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/teleport/lib/reversetunnel" "github.com/gravitational/teleport/lib/web/ui" "github.com/gravitational/trace" diff --git a/lib/web/sessions.go b/lib/web/sessions.go index 719154501f3..eb5812ffe21 100644 --- a/lib/web/sessions.go +++ b/lib/web/sessions.go @@ -30,10 +30,10 @@ import ( "golang.org/x/crypto/ssh/agent" "github.com/gravitational/teleport" - apiclient "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" - "github.com/gravitational/teleport/api/v7/utils/sshutils" + apiclient "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/client" diff --git a/lib/web/terminal.go b/lib/web/terminal.go index 8e10a2163b0..832a7f83020 100644 --- a/lib/web/terminal.go +++ b/lib/web/terminal.go @@ -32,8 +32,8 @@ import ( "golang.org/x/text/encoding/unicode" "github.com/gravitational/teleport" - authproto "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + authproto "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/client" diff --git a/lib/web/ui/app.go b/lib/web/ui/app.go index 29f805b5056..fb14132d9d3 100644 --- a/lib/web/ui/app.go +++ b/lib/web/ui/app.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/tlsca" "github.com/gravitational/teleport/lib/utils" ) diff --git a/lib/web/ui/cluster.go b/lib/web/ui/cluster.go index 20dde1bba00..c2162432728 100644 --- a/lib/web/ui/cluster.go +++ b/lib/web/ui/cluster.go @@ -21,8 +21,8 @@ import ( "sort" "time" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/reversetunnel" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/trace" diff --git a/lib/web/ui/perf_test.go b/lib/web/ui/perf_test.go index 08f6884402a..f4597605728 100644 --- a/lib/web/ui/perf_test.go +++ b/lib/web/ui/perf_test.go @@ -25,8 +25,8 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/backend/lite" diff --git a/lib/web/ui/resource.go b/lib/web/ui/resource.go index a3473bdd815..e0628fa877d 100644 --- a/lib/web/ui/resource.go +++ b/lib/web/ui/resource.go @@ -19,7 +19,7 @@ package ui import ( "fmt" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" diff --git a/lib/web/ui/server.go b/lib/web/ui/server.go index 24482ba1ade..bcb85d2d8fc 100644 --- a/lib/web/ui/server.go +++ b/lib/web/ui/server.go @@ -19,7 +19,7 @@ package ui import ( "sort" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" ) // Label describes label for webapp diff --git a/lib/web/ui/user.go b/lib/web/ui/user.go index 34aa3d90d94..2b0d037a204 100644 --- a/lib/web/ui/user.go +++ b/lib/web/ui/user.go @@ -17,7 +17,7 @@ limitations under the License. package ui import ( - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" ) diff --git a/lib/web/ui/usercontext.go b/lib/web/ui/usercontext.go index 18799146404..cee1914dd5c 100644 --- a/lib/web/ui/usercontext.go +++ b/lib/web/ui/usercontext.go @@ -17,10 +17,10 @@ limitations under the License. package ui import ( - "github.com/gravitational/teleport/api/v7/client/proto" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/client/proto" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/services" ) diff --git a/lib/web/ui/usercontext_test.go b/lib/web/ui/usercontext_test.go index c8c9824514d..5a55769a4f9 100644 --- a/lib/web/ui/usercontext_test.go +++ b/lib/web/ui/usercontext_test.go @@ -3,9 +3,9 @@ package ui import ( "testing" - "github.com/gravitational/teleport/api/v7/client/proto" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/services" "gopkg.in/check.v1" ) diff --git a/lib/web/ui/webconfig.go b/lib/web/ui/webconfig.go index d64a4e844de..7edad93ff60 100644 --- a/lib/web/ui/webconfig.go +++ b/lib/web/ui/webconfig.go @@ -16,7 +16,7 @@ limitations under the License. package ui -import "github.com/gravitational/teleport/api/v7/constants" +import "github.com/gravitational/teleport/api/constants" const ( // WebConfigAuthProviderOIDCType is OIDC provider type diff --git a/lib/web/users.go b/lib/web/users.go index 18493c53a0c..bac3d28a6d9 100644 --- a/lib/web/users.go +++ b/lib/web/users.go @@ -22,7 +22,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/httplib" "github.com/gravitational/teleport/lib/web/ui" diff --git a/lib/web/users_test.go b/lib/web/users_test.go index 1ce0e77d8d6..0a4fcb90c44 100644 --- a/lib/web/users_test.go +++ b/lib/web/users_test.go @@ -23,7 +23,7 @@ import ( "net/http" "testing" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/trace" diff --git a/tool/tctl/common/access_request_command.go b/tool/tctl/common/access_request_command.go index 3c9d455a1fc..192a4cb73f5 100644 --- a/tool/tctl/common/access_request_command.go +++ b/tool/tctl/common/access_request_command.go @@ -27,7 +27,7 @@ import ( "github.com/gravitational/kingpin" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/service" diff --git a/tool/tctl/common/app_command.go b/tool/tctl/common/app_command.go index 46bb9fd7e12..5374e316b6d 100644 --- a/tool/tctl/common/app_command.go +++ b/tool/tctl/common/app_command.go @@ -24,7 +24,7 @@ import ( "github.com/gravitational/trace" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/service" ) diff --git a/tool/tctl/common/auth_command.go b/tool/tctl/common/auth_command.go index 38acf53e402..ac3284911dc 100644 --- a/tool/tctl/common/auth_command.go +++ b/tool/tctl/common/auth_command.go @@ -13,9 +13,9 @@ import ( "text/template" "time" - "github.com/gravitational/teleport/api/v7/client/proto" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/auth/native" "github.com/gravitational/teleport/lib/client" diff --git a/tool/tctl/common/auth_command_test.go b/tool/tctl/common/auth_command_test.go index c6865676974..82dfc6a89f2 100644 --- a/tool/tctl/common/auth_command_test.go +++ b/tool/tctl/common/auth_command_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/client/identityfile" diff --git a/tool/tctl/common/collection.go b/tool/tctl/common/collection.go index 3230660c86d..b51429018ed 100644 --- a/tool/tctl/common/collection.go +++ b/tool/tctl/common/collection.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/services" "github.com/gravitational/teleport/lib/sshutils" diff --git a/tool/tctl/common/db_command.go b/tool/tctl/common/db_command.go index 1b1148a431d..5a2462e095c 100644 --- a/tool/tctl/common/db_command.go +++ b/tool/tctl/common/db_command.go @@ -22,7 +22,7 @@ import ( "text/template" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" + apidefaults "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/service" diff --git a/tool/tctl/common/helpers_test.go b/tool/tctl/common/helpers_test.go index 812df75334f..0469964ce0a 100644 --- a/tool/tctl/common/helpers_test.go +++ b/tool/tctl/common/helpers_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/gravitational/teleport/api/v7/defaults" + "github.com/gravitational/teleport/api/defaults" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/config" "github.com/gravitational/teleport/lib/service" diff --git a/tool/tctl/common/node_command.go b/tool/tctl/common/node_command.go index de596ee2362..94c17c50f34 100644 --- a/tool/tctl/common/node_command.go +++ b/tool/tctl/common/node_command.go @@ -27,8 +27,8 @@ import ( "github.com/gravitational/kingpin" "github.com/gravitational/trace" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" "github.com/gravitational/teleport/lib/service" diff --git a/tool/tctl/common/resource_command.go b/tool/tctl/common/resource_command.go index be5d5d7778b..ad8846c8cfb 100644 --- a/tool/tctl/common/resource_command.go +++ b/tool/tctl/common/resource_command.go @@ -24,9 +24,9 @@ import ( "time" "github.com/gravitational/teleport" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/defaults" diff --git a/tool/tctl/common/resource_command_test.go b/tool/tctl/common/resource_command_test.go index 32ded9b66b0..c451b064fe2 100644 --- a/tool/tctl/common/resource_command_test.go +++ b/tool/tctl/common/resource_command_test.go @@ -22,7 +22,7 @@ import ( "github.com/gravitational/trace" "github.com/stretchr/testify/require" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/config" ) diff --git a/tool/tctl/common/status_command.go b/tool/tctl/common/status_command.go index 27fda20506e..fe5adac7eef 100644 --- a/tool/tctl/common/status_command.go +++ b/tool/tctl/common/status_command.go @@ -22,8 +22,8 @@ import ( "strings" "github.com/gravitational/kingpin" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/service" diff --git a/tool/tctl/common/tctl.go b/tool/tctl/common/tctl.go index 9f8c645c7ca..5d3096bd2c5 100644 --- a/tool/tctl/common/tctl.go +++ b/tool/tctl/common/tctl.go @@ -26,9 +26,9 @@ import ( "strconv" "github.com/gravitational/teleport" - apiclient "github.com/gravitational/teleport/api/v7/client" - "github.com/gravitational/teleport/api/v7/client/webclient" - "github.com/gravitational/teleport/api/v7/types" + apiclient "github.com/gravitational/teleport/api/client" + "github.com/gravitational/teleport/api/client/webclient" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/config" diff --git a/tool/tctl/common/token_command.go b/tool/tctl/common/token_command.go index 1e7578e893e..13ac3db699a 100644 --- a/tool/tctl/common/token_command.go +++ b/tool/tctl/common/token_command.go @@ -26,7 +26,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" libclient "github.com/gravitational/teleport/lib/client" diff --git a/tool/tctl/common/top_command.go b/tool/tctl/common/top_command.go index 43da047625d..924cd9e20cb 100644 --- a/tool/tctl/common/top_command.go +++ b/tool/tctl/common/top_command.go @@ -27,8 +27,8 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/service" diff --git a/tool/tctl/common/user_command.go b/tool/tctl/common/user_command.go index 92008ee7c5b..487643ba242 100644 --- a/tool/tctl/common/user_command.go +++ b/tool/tctl/common/user_command.go @@ -26,7 +26,7 @@ import ( "github.com/gravitational/kingpin" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/defaults" diff --git a/tool/tsh/access_request.go b/tool/tsh/access_request.go index a0b8a4a85cb..f3b9c3dce0f 100644 --- a/tool/tsh/access_request.go +++ b/tool/tsh/access_request.go @@ -25,7 +25,7 @@ import ( "time" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/services" diff --git a/tool/tsh/app.go b/tool/tsh/app.go index c84afa7728e..a3b55589ffb 100644 --- a/tool/tsh/app.go +++ b/tool/tsh/app.go @@ -22,8 +22,8 @@ import ( "strings" "text/template" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/tlsca" diff --git a/tool/tsh/config.go b/tool/tsh/config.go index e1ec19bd7ef..4103287737a 100644 --- a/tool/tsh/config.go +++ b/tool/tsh/config.go @@ -22,8 +22,8 @@ import ( "strings" "text/template" - "github.com/gravitational/teleport/api/v7/profile" - "github.com/gravitational/teleport/api/v7/utils/keypaths" + "github.com/gravitational/teleport/api/profile" + "github.com/gravitational/teleport/api/utils/keypaths" "github.com/gravitational/trace" ) diff --git a/tool/tsh/db.go b/tool/tsh/db.go index 4a02a06111b..8f83c1f33f9 100644 --- a/tool/tsh/db.go +++ b/tool/tsh/db.go @@ -25,8 +25,8 @@ import ( "strings" "text/template" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/client" dbprofile "github.com/gravitational/teleport/lib/client/db" "github.com/gravitational/teleport/lib/defaults" diff --git a/tool/tsh/kube.go b/tool/tsh/kube.go index f7efde5f4e1..36bdf20370b 100644 --- a/tool/tsh/kube.go +++ b/tool/tsh/kube.go @@ -24,7 +24,7 @@ import ( "github.com/gravitational/kingpin" "github.com/gravitational/trace" - apiutils "github.com/gravitational/teleport/api/v7/utils" + apiutils "github.com/gravitational/teleport/api/utils" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/client" "github.com/gravitational/teleport/lib/kube/kubeconfig" diff --git a/tool/tsh/mfa.go b/tool/tsh/mfa.go index 406a40e824e..4c7b3e60723 100644 --- a/tool/tsh/mfa.go +++ b/tool/tsh/mfa.go @@ -32,8 +32,8 @@ import ( "github.com/pquerna/otp" "github.com/pquerna/otp/totp" - "github.com/gravitational/teleport/api/v7/client/proto" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/client/proto" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth/u2f" "github.com/gravitational/teleport/lib/client" diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go index 27264f7d025..8ce5437b403 100644 --- a/tool/tsh/tsh.go +++ b/tool/tsh/tsh.go @@ -36,10 +36,10 @@ import ( "golang.org/x/crypto/ssh/agent" "github.com/gravitational/teleport" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/types" - apisshutils "github.com/gravitational/teleport/api/v7/utils/sshutils" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/types" + apisshutils "github.com/gravitational/teleport/api/utils/sshutils" "github.com/gravitational/teleport/lib/asciitable" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/benchmark" diff --git a/tool/tsh/tsh_test.go b/tool/tsh/tsh_test.go index 0964bd08d6c..11f1f14210a 100644 --- a/tool/tsh/tsh_test.go +++ b/tool/tsh/tsh_test.go @@ -29,10 +29,10 @@ import ( "go.uber.org/atomic" "golang.org/x/crypto/ssh" - "github.com/gravitational/teleport/api/v7/constants" - apidefaults "github.com/gravitational/teleport/api/v7/defaults" - "github.com/gravitational/teleport/api/v7/profile" - "github.com/gravitational/teleport/api/v7/types" + "github.com/gravitational/teleport/api/constants" + apidefaults "github.com/gravitational/teleport/api/defaults" + "github.com/gravitational/teleport/api/profile" + "github.com/gravitational/teleport/api/types" "github.com/gravitational/teleport/lib/auth" "github.com/gravitational/teleport/lib/backend" "github.com/gravitational/teleport/lib/client" diff --git a/vendor/github.com/gravitational/teleport/api b/vendor/github.com/gravitational/teleport/api new file mode 120000 index 00000000000..1f1f7368ff8 --- /dev/null +++ b/vendor/github.com/gravitational/teleport/api @@ -0,0 +1 @@ +../../../../api \ No newline at end of file diff --git a/vendor/github.com/gravitational/teleport/api/v7 b/vendor/github.com/gravitational/teleport/api/v7 deleted file mode 120000 index 0034bb2b8aa..00000000000 --- a/vendor/github.com/gravitational/teleport/api/v7 +++ /dev/null @@ -1 +0,0 @@ -../../../../../api \ No newline at end of file diff --git a/vendor/modules.txt b/vendor/modules.txt index 5696c86d915..2795a8424aa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -286,24 +286,24 @@ github.com/gravitational/reporting/types # github.com/gravitational/roundtrip v1.0.0 ## explicit github.com/gravitational/roundtrip -# github.com/gravitational/teleport/api/v7 v7.0.0 => ./api +# github.com/gravitational/teleport/api v0.0.0 => ./api ## explicit -github.com/gravitational/teleport/api/v7 -github.com/gravitational/teleport/api/v7/client -github.com/gravitational/teleport/api/v7/client/proto -github.com/gravitational/teleport/api/v7/client/webclient -github.com/gravitational/teleport/api/v7/constants -github.com/gravitational/teleport/api/v7/defaults -github.com/gravitational/teleport/api/v7/identityfile -github.com/gravitational/teleport/api/v7/metadata -github.com/gravitational/teleport/api/v7/profile -github.com/gravitational/teleport/api/v7/types -github.com/gravitational/teleport/api/v7/types/events -github.com/gravitational/teleport/api/v7/types/wrappers -github.com/gravitational/teleport/api/v7/utils -github.com/gravitational/teleport/api/v7/utils/keypaths -github.com/gravitational/teleport/api/v7/utils/sshutils -github.com/gravitational/teleport/api/v7/utils/tlsutils +github.com/gravitational/teleport/api +github.com/gravitational/teleport/api/client +github.com/gravitational/teleport/api/client/proto +github.com/gravitational/teleport/api/client/webclient +github.com/gravitational/teleport/api/constants +github.com/gravitational/teleport/api/defaults +github.com/gravitational/teleport/api/identityfile +github.com/gravitational/teleport/api/metadata +github.com/gravitational/teleport/api/profile +github.com/gravitational/teleport/api/types +github.com/gravitational/teleport/api/types/events +github.com/gravitational/teleport/api/types/wrappers +github.com/gravitational/teleport/api/utils +github.com/gravitational/teleport/api/utils/keypaths +github.com/gravitational/teleport/api/utils/sshutils +github.com/gravitational/teleport/api/utils/tlsutils # github.com/gravitational/trace v1.1.16-0.20210609220119-4855e69c89fc ## explicit github.com/gravitational/trace @@ -1103,4 +1103,4 @@ sigs.k8s.io/structured-merge-diff/v4/value sigs.k8s.io/yaml # github.com/coreos/go-oidc => github.com/gravitational/go-oidc v0.0.4 # github.com/gogo/protobuf => github.com/gravitational/protobuf v1.3.2-0.20201123192827-2b9fcfaffcbf -# github.com/gravitational/teleport/api/v7 => ./api +# github.com/gravitational/teleport/api => ./api