mirror of
https://github.com/gravitational/teleport.git
synced 2026-09-21 05:55:42 +08:00
rollback - Upgrade api version. (#7751)
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"`
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ package defaults
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/constants"
|
||||
"github.com/gravitational/teleport/api/constants"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
module github.com/gravitational/teleport/api/v7
|
||||
module github.com/gravitational/teleport/api
|
||||
|
||||
go 1.15
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/utils"
|
||||
"github.com/gravitational/teleport/api/utils"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
+1
-1
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/constants"
|
||||
"github.com/gravitational/teleport/api/constants"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
+1
-1
@@ -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"
|
||||
)
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
"regexp"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/defaults"
|
||||
"github.com/gravitational/teleport/api/defaults"
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
+2
-2
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/defaults"
|
||||
"github.com/gravitational/teleport/api/defaults"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
+4
-4
@@ -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"
|
||||
|
||||
+2
-2
@@ -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"
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/constants"
|
||||
"github.com/gravitational/teleport/api/constants"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/defaults"
|
||||
"github.com/gravitational/teleport/api/defaults"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/utils"
|
||||
"github.com/gravitational/teleport/api/utils"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/defaults"
|
||||
"github.com/gravitational/teleport/api/defaults"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
+10
-10
@@ -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
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/gravitational/teleport/api/v7/utils"
|
||||
"github.com/gravitational/teleport/api/utils"
|
||||
|
||||
"github.com/gravitational/trace"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
+1
-1
Submodule e updated: ca7211e1df...dca171d80c
@@ -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
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+2
-2
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+7
-7
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+6
-6
@@ -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"
|
||||
|
||||
+3
-3
@@ -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"
|
||||
|
||||
+4
-4
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+4
-4
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
+4
-4
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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:")
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
+2
-2
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+3
-3
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+5
-5
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+4
-4
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user