[envoy-15622] add generic XDS protobuf definitions

api/envoy/service/status/v3/csds.proto

@@ -7,6 +7,8 @@ import "envoy/config/core/v3/base.proto";
 import "envoy/type/matcher/v3/node.proto";
 
 import "google/api/annotations.proto";
+import "google/protobuf/any.proto";
+import "google/protobuf/timestamp.proto";
 
 import "envoy/annotations/deprecation.proto";
 import "udpa/annotations/status.proto";
@@ -124,10 +126,54 @@ message ClientConfig {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.service.status.v2.ClientConfig";
 
+  // GenericXdsConfig is a simpler and generic version of specifying
+  // XDS config status and the dump.
+  // [#next-free-field: 9]
+  message GenericXdsConfig {
+    // type_url represents the fully qualified name of xDS resource type
+    // like envoy.v3.Cluster, envoy.v3.ClusterLoadAssignment etc.
+    string type_url = 1;
+
+    // name of the xDS resource
+    string name = 2;
+
+    // This is the :ref:`version_info <envoy_api_field_service.discovery.v3.DiscoveryResponse.version_info>`
+    // in the last processed xDS discovery response. If there are only static bootstrap listeners, this
+    // field will be ""
+    string version_info = 3;
+
+    // The xDS resource config. Actual content depends on the type
+    google.protobuf.Any xds_config = 4;
+
+    // Timestamp when the xDS resource was last updated
+    google.protobuf.Timestamp last_updated = 5;
+
+    // Per xDS resource config status. It is generated by management servers.
+    // It will not be present if the CSDS server is an xDS client.
+    ConfigStatus config_status = 6;
+
+    // Per xDS resource status from the view of a xDS client
+    admin.v3.ClientResourceStatus client_status = 7;
+
+    // Set if the last update failed, cleared after the next successful update.
+    // The *error_state* field contains the rejected version of this particular
+    // resource along with the reason and timestamp. For successfully updated or
+    // acknowledged resource, this field should be empty.
+    // [#not-implemented-hide:]
+    admin.v3.UpdateFailureState error_state = 8;
+  }
+
   // Node for a particular client.
   config.core.v3.Node node = 1;
 
-  repeated PerXdsConfig xds_config = 2;
+  // This field is deprecated in favor of generic_xds_configs which is
+  // much simpler and uniform in structure.
+  repeated PerXdsConfig xds_config = 2
+      [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"];
+
+  // Represents generic xDS config and the exact config structure depends on
+  // the type URL (like Cluster if it is CDS)
+  repeated GenericXdsConfig generic_xds_configs = 3;
 }
 
 message ClientStatusResponse {