Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into strideynet/central-…
Browse files Browse the repository at this point in the history
…client
  • Loading branch information
strideynet committed Mar 4, 2024
2 parents a62379a + f713fa4 commit adcd4da
Show file tree
Hide file tree
Showing 80 changed files with 2,544 additions and 1,484 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ applications in Kubernetes clusters. When connected to a Kubernetes cluster (or
deployed as a Helm chart), Teleport discovery service will automatically find
and enroll web applications for use with app access.

See documentation [here](docs/pages/application-access/enroll-kubernetes-applications.mdx).
See documentation [here](docs/pages/auto-discovery/kubernetes-applications.mdx).

#### Extended Kubernetes per-resource RBAC

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ Instructions for contributing changes to the Teleport Helm chart are available
# Contributing to Docs

See our public resources for docs contributors:
https://goteleport.com/docs/contributing/documentation/
https://github.com/gravitational/docs
14 changes: 7 additions & 7 deletions api/client/proxy/transport/transportv1/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func TestClient_DialHost(t *testing.T) {
return trail.ToGRPC(trace.NotImplemented("not implemented"))
case req.DialTarget.Cluster == "payload-too-large":
// send the initial cluster details
if err := server.Send(&transportv1pb.ProxySSHResponse{Details: &transportv1pb.ClusterDetails{FipsEnabled: true}}); err != nil {
if err := server.Send(&transportv1pb.ProxySSHResponse{Details: &transportv1pb.ClusterDetails{FipsEnabled: true}}); err != nil && !errors.Is(err, io.EOF) {
return trail.ToGRPC(trace.Wrap(err))
}

Expand All @@ -255,7 +255,7 @@ func TestClient_DialHost(t *testing.T) {
if err := server.Send(&transportv1pb.ProxySSHResponse{
Details: nil,
Frame: &transportv1pb.ProxySSHResponse_Ssh{Ssh: &transportv1pb.Frame{Payload: bytes.Repeat([]byte{0}, 1001)}},
}); err != nil {
}); err != nil && !errors.Is(err, io.EOF) {
return trail.ToGRPC(trace.Wrap(err))
}
case *transportv1pb.ProxySSHRequest_Agent:
Expand All @@ -265,7 +265,7 @@ func TestClient_DialHost(t *testing.T) {
return nil
case req.DialTarget.Cluster == "echo":
// send the initial cluster details
if err := server.Send(&transportv1pb.ProxySSHResponse{Details: &transportv1pb.ClusterDetails{FipsEnabled: true}}); err != nil {
if err := server.Send(&transportv1pb.ProxySSHResponse{Details: &transportv1pb.ClusterDetails{FipsEnabled: true}}); err != nil && !errors.Is(err, io.EOF) {
return trail.ToGRPC(trace.Wrap(err))
}

Expand All @@ -281,7 +281,7 @@ func TestClient_DialHost(t *testing.T) {
if err := server.Send(&transportv1pb.ProxySSHResponse{
Details: nil,
Frame: &transportv1pb.ProxySSHResponse_Ssh{Ssh: &transportv1pb.Frame{Payload: f.Ssh.Payload}},
}); err != nil {
}); err != nil && !errors.Is(err, io.EOF) {
return trail.ToGRPC(trace.Wrap(err))
}
case *transportv1pb.ProxySSHRequest_Agent:
Expand All @@ -290,7 +290,7 @@ func TestClient_DialHost(t *testing.T) {
return nil
case req.DialTarget.Cluster == "forward":
// send the initial cluster details
if err := server.Send(&transportv1pb.ProxySSHResponse{Details: &transportv1pb.ClusterDetails{FipsEnabled: true}}); err != nil {
if err := server.Send(&transportv1pb.ProxySSHResponse{Details: &transportv1pb.ClusterDetails{FipsEnabled: true}}); err != nil && !errors.Is(err, io.EOF) {
return trail.ToGRPC(trace.Wrap(err))
}

Expand All @@ -306,7 +306,7 @@ func TestClient_DialHost(t *testing.T) {
if err := server.Send(&transportv1pb.ProxySSHResponse{
Details: nil,
Frame: &transportv1pb.ProxySSHResponse_Ssh{Ssh: &transportv1pb.Frame{Payload: f.Ssh.Payload}},
}); err != nil {
}); err != nil && !errors.Is(err, io.EOF) {
return trail.ToGRPC(trace.Wrap(err))
}
case *transportv1pb.ProxySSHRequest_Agent:
Expand Down Expand Up @@ -360,7 +360,7 @@ func TestClient_DialHost(t *testing.T) {
if err := server.Send(&transportv1pb.ProxySSHResponse{
Details: nil,
Frame: &transportv1pb.ProxySSHResponse_Ssh{Ssh: &transportv1pb.Frame{Payload: keys[0].Blob}},
}); err != nil {
}); err != nil && !errors.Is(err, io.EOF) {
return trail.ToGRPC(trace.Wrap(err))
}
return nil
Expand Down
127 changes: 64 additions & 63 deletions api/gen/proto/go/teleport/notifications/v1/notifications.pb.go

Large diffs are not rendered by default.

0 comments on commit adcd4da

Please sign in to comment.