Skip to content

Commit

Permalink
Merge branch 'master' into stevenGravy/tctlplugins
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenGravy authored Jul 30, 2024
2 parents 0de8b58 + c9a141b commit 091de84
Show file tree
Hide file tree
Showing 301 changed files with 9,752 additions and 6,848 deletions.
4 changes: 2 additions & 2 deletions api/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestMain(m *testing.M) {
}

type pingService struct {
*proto.UnimplementedAuthServiceServer
proto.UnimplementedAuthServiceServer
userAgentFromLastCallValue atomic.Value
}

Expand Down Expand Up @@ -192,7 +192,7 @@ func TestWaitForConnectionReady(t *testing.T) {
}

type listResourcesService struct {
*proto.UnimplementedAuthServiceServer
proto.UnimplementedAuthServiceServer
}

func (s *listResourcesService) ListResources(ctx context.Context, req *proto.ListResourcesRequest) (*proto.ListResourcesResponse, error) {
Expand Down
2 changes: 1 addition & 1 deletion api/client/joinservice_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
)

type mockJoinServiceServer struct {
*proto.UnimplementedJoinServiceServer
proto.UnimplementedJoinServiceServer
registerUsingTPMMethod func(srv proto.JoinService_RegisterUsingTPMMethodServer) error
}

Expand Down
2,070 changes: 1,141 additions & 929 deletions api/client/proto/authservice.pb.go

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions api/client/proxy/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,15 @@ type fakeGRPCServer struct {
}

type fakeAuthServer struct {
*proto.UnimplementedAuthServiceServer
proto.UnimplementedAuthServiceServer
listener net.Listener
srv *grpc.Server
}

func newFakeAuthServer(t *testing.T, conn net.Conn) *fakeAuthServer {
f := &fakeAuthServer{
listener: newOneShotListener(conn),
UnimplementedAuthServiceServer: &proto.UnimplementedAuthServiceServer{},
srv: grpc.NewServer(),
listener: newOneShotListener(conn),
srv: grpc.NewServer(),
}

t.Cleanup(f.Stop)
Expand Down
52 changes: 38 additions & 14 deletions api/gen/proto/go/teleport/accessgraph/v1/authorized_key.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

141 changes: 38 additions & 103 deletions api/gen/proto/go/teleport/accessgraph/v1/secrets_service_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 091de84

Please sign in to comment.