[v13] Add gRPC error interceptors to API client

Makefile

@@ -1181,25 +1181,25 @@ buf/installed:
 		exit 1; \
 	fi
 
-# grpc generates GRPC stubs from service definitions.
+# grpc generates gRPC stubs from service definitions.
 # This target runs in the buildbox container.
 .PHONY: grpc
 grpc:
 	$(MAKE) -C build.assets grpc
 
-# grpc/host generates GRPC stubs.
+# grpc/host generates gRPC stubs.
 # Unlike grpc, this target runs locally.
 .PHONY: grpc/host
 grpc/host: protos/all
 	@build.assets/genproto.sh
 
-# protos-up-to-date checks if the generated GRPC stubs are up to date.
+# protos-up-to-date checks if the generated gRPC stubs are up to date.
 # This target runs in the buildbox container.
 .PHONY: protos-up-to-date
 protos-up-to-date:
 	$(MAKE) -C build.assets protos-up-to-date
 
-# protos-up-to-date/host checks if the generated GRPC stubs are up to date.
+# protos-up-to-date/host checks if the generated gRPC stubs are up to date.
 # Unlike protos-up-to-date, this target runs locally.
 .PHONY: protos-up-to-date/host
 protos-up-to-date/host: must-start-clean/host grpc/host

api/breaker/breaker.go

@@ -178,7 +178,7 @@ func NonNilErrorIsSuccess(_ interface{}, err error) bool {
 }
 
 // IsResponseSuccessful determines whether the error provided should be ignored by the circuit breaker. This checks
-// for http status codes < 500 and a few unsuccessful grpc status codes.
+// for http status codes < 500 and a few unsuccessful gRPC status codes.
 func IsResponseSuccessful(v interface{}, err error) bool {
 	switch t := v.(type) {
 	case nil:

api/client/accesslist/accesslist.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/gravitational/trace"
-	"github.com/gravitational/trace/trail"
 
 	accesslistv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/accesslist/v1"
 	"github.com/gravitational/teleport/api/types/accesslist"
@@ -42,15 +41,15 @@ func NewClient(grpcClient accesslistv1.AccessListServiceClient) *Client {
 func (c *Client) GetAccessLists(ctx context.Context) ([]*accesslist.AccessList, error) {
 	resp, err := c.grpcClient.GetAccessLists(ctx, &accesslistv1.GetAccessListsRequest{})
 	if err != nil {
-		return nil, trail.FromGRPC(err)
+		return nil, trace.Wrap(err)
 	}
 
 	accessLists := make([]*accesslist.AccessList, len(resp.AccessLists))
 	for i, accessList := range resp.AccessLists {
 		var err error
 		accessLists[i], err = conv.FromProto(accessList)
 		if err != nil {
-			return nil, trail.FromGRPC(err)
+			return nil, trace.Wrap(err)
 		}
 	}
 
@@ -64,15 +63,15 @@ func (c *Client) ListAccessLists(ctx context.Context, pageSize int, nextToken st
 		NextToken: nextToken,
 	})
 	if err != nil {
-		return nil, "", trail.FromGRPC(err)
+		return nil, "", trace.Wrap(err)
 	}
 
 	accessLists := make([]*accesslist.AccessList, len(resp.AccessLists))
 	for i, accessList := range resp.AccessLists {
 		var err error
 		accessLists[i], err = conv.FromProto(accessList)
 		if err != nil {
-			return nil, "", trail.FromGRPC(err)
+			return nil, "", trace.Wrap(err)
 		}
 	}
 
@@ -85,7 +84,7 @@ func (c *Client) GetAccessList(ctx context.Context, name string) (*accesslist.Ac
 		Name: name,
 	})
 	if err != nil {
-		return nil, trail.FromGRPC(err)
+		return nil, trace.Wrap(err)
 	}
 
 	accessList, err := conv.FromProto(resp, conv.WithOwnersIneligibleStatusField(resp.GetSpec().GetOwners()))
@@ -98,18 +97,18 @@ func (c *Client) UpsertAccessList(ctx context.Context, accessList *accesslist.Ac
 		AccessList: conv.ToProto(accessList),
 	})
 	if err != nil {
-		return nil, trail.FromGRPC(err)
+		return nil, trace.Wrap(err)
 	}
 	responseAccessList, err := conv.FromProto(resp)
-	return responseAccessList, trail.FromGRPC(err)
+	return responseAccessList, trace.Wrap(err)
 }
 
 // DeleteAccessList removes the specified access list resource.
 func (c *Client) DeleteAccessList(ctx context.Context, name string) error {
 	_, err := c.grpcClient.DeleteAccessList(ctx, &accesslistv1.DeleteAccessListRequest{
 		Name: name,
 	})
-	return trail.FromGRPC(err)
+	return trace.Wrap(err)
 }
 
 // DeleteAllAccessLists removes all access lists.
@@ -125,15 +124,15 @@ func (c *Client) ListAccessListMembers(ctx context.Context, accessList string, p
 		AccessList: accessList,
 	})
 	if err != nil {
-		return nil, "", trail.FromGRPC(err)
+		return nil, "", trace.Wrap(err)
 	}
 
 	members = make([]*accesslist.AccessListMember, len(resp.Members))
 	for i, member := range resp.Members {
 		var err error
 		members[i], err = conv.FromMemberProto(member, conv.WithMemberIneligibleStatusField(member))
 		if err != nil {
-			return nil, "", trail.FromGRPC(err)
+			return nil, "", trace.Wrap(err)
 		}
 	}
 
@@ -147,7 +146,7 @@ func (c *Client) GetAccessListMember(ctx context.Context, accessList string, mem
 		MemberName: memberName,
 	})
 	if err != nil {
-		return nil, trail.FromGRPC(err)
+		return nil, trace.Wrap(err)
 	}
 
 	member, err := conv.FromMemberProto(resp, conv.WithMemberIneligibleStatusField(resp))
@@ -160,10 +159,10 @@ func (c *Client) UpsertAccessListMember(ctx context.Context, member *accesslist.
 		Member: conv.ToMemberProto(member),
 	})
 	if err != nil {
-		return nil, trail.FromGRPC(err)
+		return nil, trace.Wrap(err)
 	}
 	responseMember, err := conv.FromMemberProto(resp)
-	return responseMember, trail.FromGRPC(err)
+	return responseMember, trace.Wrap(err)
 }
 
 // DeleteAccessListMember hard deletes the specified access list member resource.
@@ -172,15 +171,15 @@ func (c *Client) DeleteAccessListMember(ctx context.Context, accessList string,
 		AccessList: accessList,
 		MemberName: memberName,
 	})
-	return trail.FromGRPC(err)
+	return trace.Wrap(err)
 }
 
 // DeleteAllAccessListMembersForAccessList hard deletes all access list members for an access list.
 func (c *Client) DeleteAllAccessListMembersForAccessList(ctx context.Context, accessList string) error {
 	_, err := c.grpcClient.DeleteAllAccessListMembersForAccessList(ctx, &accesslistv1.DeleteAllAccessListMembersForAccessListRequest{
 		AccessList: accessList,
 	})
-	return trail.FromGRPC(err)
+	return trace.Wrap(err)
 }
 
 // DeleteAllAccessListMembers hard deletes all access list members.

api/client/auditstreamer.go

@@ -21,7 +21,6 @@ import (
 	"sync"
 
 	"github.com/gravitational/trace"
-	"github.com/gravitational/trace/trail"
 	"google.golang.org/grpc"
 	ggzip "google.golang.org/grpc/encoding/gzip"
 
@@ -35,7 +34,7 @@ func (c *Client) createOrResumeAuditStream(ctx context.Context, request proto.Au
 	stream, err := c.grpc.CreateAuditStream(closeCtx, grpc.UseCompressor(ggzip.Name))
 	if err != nil {
 		cancel()
-		return nil, trail.FromGRPC(err)
+		return nil, trace.Wrap(err)
 	}
 	s := &auditStreamer{
 		stream:   stream,
@@ -46,7 +45,7 @@ func (c *Client) createOrResumeAuditStream(ctx context.Context, request proto.Au
 	go s.recv()
 	err = s.stream.Send(&request)
 	if err != nil {
-		return nil, trace.NewAggregate(s.Close(ctx), trail.FromGRPC(err))
+		return nil, trace.NewAggregate(s.Close(ctx), trace.Wrap(err))
 	}
 	return s, nil
 }
@@ -83,7 +82,7 @@ type auditStreamer struct {
 // the stream completed and closes the stream instance.
 func (s *auditStreamer) Close(ctx context.Context) error {
 	defer s.closeWithError(nil)
-	return trail.FromGRPC(s.stream.Send(&proto.AuditStreamRequest{
+	return trace.Wrap(s.stream.Send(&proto.AuditStreamRequest{
 		Request: &proto.AuditStreamRequest_FlushAndCloseStream{
 			FlushAndCloseStream: &proto.FlushAndCloseStream{},
 		},
@@ -92,7 +91,7 @@ func (s *auditStreamer) Close(ctx context.Context) error {
 
 // Complete completes stream.
 func (s *auditStreamer) Complete(ctx context.Context) error {
-	return trail.FromGRPC(s.stream.Send(&proto.AuditStreamRequest{
+	return trace.Wrap(s.stream.Send(&proto.AuditStreamRequest{
 		Request: &proto.AuditStreamRequest_CompleteStream{
 			CompleteStream: &proto.CompleteStream{},
 		},
@@ -111,7 +110,7 @@ func (s *auditStreamer) EmitAuditEvent(ctx context.Context, event events.AuditEv
 	if err != nil {
 		return trace.Wrap(err)
 	}
-	err = trail.FromGRPC(s.stream.Send(&proto.AuditStreamRequest{
+	err = trace.Wrap(s.stream.Send(&proto.AuditStreamRequest{
 		Request: &proto.AuditStreamRequest_Event{Event: oneof},
 	}))
 	if err != nil {
@@ -139,7 +138,7 @@ func (s *auditStreamer) recv() {
 	for {
 		status, err := s.stream.Recv()
 		if err != nil {
-			s.closeWithError(trail.FromGRPC(err))
+			s.closeWithError(trace.Wrap(err))
 			return
 		}
 		select {