[v11] protobuf changes in preparation for buf breaking

api/client/proto/types.go

@@ -39,30 +39,6 @@ func (d *Duration) Set(value time.Duration) {
 	*d = Duration(value)
 }
 
-// FromWatchKind converts the watch kind value between internal
-// and the protobuf format
-func FromWatchKind(wk types.WatchKind) WatchKind {
-	return WatchKind{
-		Name:        wk.Name,
-		Kind:        wk.Kind,
-		SubKind:     wk.SubKind,
-		LoadSecrets: wk.LoadSecrets,
-		Filter:      wk.Filter,
-	}
-}
-
-// ToWatchKind converts the watch kind value between the protobuf
-// and the internal format
-func ToWatchKind(wk WatchKind) types.WatchKind {
-	return types.WatchKind{
-		Name:        wk.Name,
-		Kind:        wk.Kind,
-		SubKind:     wk.SubKind,
-		LoadSecrets: wk.LoadSecrets,
-		Filter:      wk.Filter,
-	}
-}
-
 // CheckAndSetDefaults checks and sets default values
 func (req *HostCertsRequest) CheckAndSetDefaults() error {
 	if req.HostID == "" {

api/client/streamwatcher.go

@@ -30,11 +30,7 @@ import (
 // NewWatcher returns a new streamWatcher
 func (c *Client) NewWatcher(ctx context.Context, watch types.Watch) (types.Watcher, error) {
 	cancelCtx, cancel := context.WithCancel(ctx)
-	var protoWatch proto.Watch
-	for _, kind := range watch.Kinds {
-		protoWatch.Kinds = append(protoWatch.Kinds, proto.FromWatchKind(kind))
-	}
-	stream, err := c.grpc.WatchEvents(cancelCtx, &protoWatch, c.callOpts...)
+	stream, err := c.grpc.WatchEvents(cancelCtx, &proto.Watch{Kinds: watch.Kinds}, c.callOpts...)
 	if err != nil {
 		cancel()
 		return nil, trail.FromGRPC(err)

api/proto/buf.yaml

@@ -47,4 +47,4 @@ lint:
       - teleport/legacy/client/proto/joinservice.proto
 breaking:
   use:
-    - FILE
+    - WIRE_JSON

api/proto/teleport/legacy/client/proto/authservice.proto

@@ -125,29 +125,12 @@ message Event {
 // Watch specifies watch parameters
 message Watch {
   // Kinds specifies object kinds to watch
-  repeated WatchKind Kinds = 1 [
+  repeated types.WatchKind Kinds = 1 [
     (gogoproto.nullable) = false,
     (gogoproto.jsontag) = "kinds,omitempty"
   ];
 }
 
-// WatchKind specifies resource kind to watch
-message WatchKind {
-  // Kind is a resource kind to watch
-  string Kind = 1 [(gogoproto.jsontag) = "kind"];
-  // LoadSecrets specifies whether to load secrets
-  bool LoadSecrets = 2 [(gogoproto.jsontag) = "load_secrets"];
-  // Name is an optional specific resource type to watch,
-  // if specified only the events with a specific resource
-  // name will be sent
-  string Name = 3 [(gogoproto.jsontag) = "name"];
-  // Filter is an optional mapping of custom filter parameters.
-  // Valid values vary by resource kind.
-  map<string, string> Filter = 4 [(gogoproto.jsontag) = "filter,omitempty"];
-  // SubKind is a resource subkind to watch
-  string SubKind = 5 [(gogoproto.jsontag) = "sub_kind,omitempty"];
-}
-
 // HostCertsRequest specifies certificate-generation parameters
 // for a server.
 message HostCertsRequest {
@@ -306,8 +289,6 @@ message UserCertsRequest {
   // reserving the struct field number 18 to prevent future breakage.
   //
   // https://github.com/gravitational/teleport/issues/24817
-  reserved 18;
-  reserved "RequesterName";
 
   // SSHLogin is the OS Login for the SSH session that the certificate will be used for.
   // This login is used when performing RBAC checks to determine if MFA is required

api/proto/teleport/legacy/types/events/events.proto

@@ -3848,13 +3848,13 @@ message DatabaseSessionMalformedPacket {
 // ElasticsearchCategory specifies Elasticsearch request category.
 enum ElasticsearchCategory {
   // GENERAL is for otherwise uncategorized calls.
-  GENERAL = 0;
+  ELASTICSEARCH_CATEGORY_GENERAL = 0;
   // SECURITY is for _security and _ssl APIs.
-  SECURITY = 1;
+  ELASTICSEARCH_CATEGORY_SECURITY = 1;
   // SEARCH is for search-related APIs.
-  SEARCH = 2;
+  ELASTICSEARCH_CATEGORY_SEARCH = 2;
   // SQL covers _sql API.
-  SQL = 3;
+  ELASTICSEARCH_CATEGORY_SQL = 3;
 }
 
 // ElasticsearchRequest is emitted when user executes an Elasticsearch request, which isn't

api/proto/teleport/legacy/types/types.proto

@@ -4674,3 +4674,22 @@ enum RequireMFAType {
   // requiring double touch on session requests, normal Session MFA is disabled.
   HARDWARE_KEY_TOUCH = 3;
 }
+
+// WatchKind specifies resource kind to watch
+message WatchKind {
+  // Kind is a resource kind to watch
+  string Kind = 1 [(gogoproto.jsontag) = "kind"];
+  // LoadSecrets specifies whether to load secrets
+  bool LoadSecrets = 2 [(gogoproto.jsontag) = "load_secrets"];
+  // Name is an optional specific resource type to watch,
+  // if specified only the events with a specific resource
+  // name will be sent
+  string Name = 3 [(gogoproto.jsontag) = "name"];
+  // Filter is an optional mapping of custom filter parameters.
+  // Valid values vary by resource kind.
+  map<string, string> Filter = 4 [(gogoproto.jsontag) = "filter,omitempty"];
+  // SubKind is a resource subkind to watch
+  string SubKind = 5 [(gogoproto.jsontag) = "sub_kind,omitempty"];
+  // Version optionally specifies the resource version to watch.
+  string Version = 6 [(gogoproto.jsontag) = "version,omitempty"];
+}

api/types/events.go

@@ -99,27 +99,6 @@ type Watch struct {
 	MetricComponent string
 }
 
-// WatchKind specifies resource kind to watch
-type WatchKind struct {
-	// Kind is a resource kind to watch
-	Kind string
-	// SubKind optionally specifies the subkind of resource to watch.
-	// Some resource kinds are ambigious like web sessions, subkind in this case
-	// specifies the type of web session
-	SubKind string
-	// Name is an optional specific resource type to watch,
-	// if specified, only the events with the given resource
-	// name will be sent
-	Name string
-	// Version optionally specifies the resource version to watch.
-	Version string
-	// LoadSecrets specifies whether to load secrets
-	LoadSecrets bool
-	// Filter supplies custom event filter parameters that differ by
-	// resource (e.g. "state":"pending" for access requests).
-	Filter map[string]string
-}
-
 // Matches attempts to determine if the supplied event matches
 // this WatchKind.  If the WatchKind is misconfigured, or the
 // event appears malformed, an error is returned.