From 6cd4b3f765fd6755d1f87f426a6b5a83b8eb899c Mon Sep 17 00:00:00 2001 From: Harry Bagdi Date: Wed, 3 Aug 2022 13:27:18 -0700 Subject: [PATCH] chore: run codegen for compatiblity API additions --- .../gen/grpc/kong/admin/model/v1/node.pb.go | 312 ++++++++++++++++-- .../grpc/kong/admin/model/v1/pagination.pb.go | 12 +- .../grpc/kong/nonpublic/v1/node_status.pb.go | 183 ++++++++++ .../grpc/kong/relay/service/v1/status.pb.go | 293 +++++++++++----- .../kong/relay/service/v1/status_grpc.pb.go | 36 ++ .../grpc/kong/util/v1/data_plane_prereq.pb.go | 1 + internal/gen/swagger/koko.swagger.json | 76 +++++ .../wrpc/kong/services/config/v1/config.pb.go | 2 +- .../grpc/proto/kong/admin/model/v1/node.proto | 4 +- .../proto/kong/nonpublic/v1/node_status.proto | 2 +- 10 files changed, 810 insertions(+), 111 deletions(-) create mode 100644 internal/gen/grpc/kong/nonpublic/v1/node_status.pb.go diff --git a/internal/gen/grpc/kong/admin/model/v1/node.pb.go b/internal/gen/grpc/kong/admin/model/v1/node.pb.go index a5ce00d86..8572f1041 100644 --- a/internal/gen/grpc/kong/admin/model/v1/node.pb.go +++ b/internal/gen/grpc/kong/admin/model/v1/node.pb.go @@ -25,14 +25,15 @@ type Node struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` - Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` - LastPing int32 `protobuf:"varint,4,opt,name=last_ping,json=lastPing,proto3" json:"last_ping,omitempty"` - Type string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"` - CreatedAt int32 `protobuf:"varint,6,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` - UpdatedAt int32 `protobuf:"varint,7,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` - ConfigHash string `protobuf:"bytes,8,opt,name=config_hash,json=configHash,proto3" json:"config_hash,omitempty"` // int32 last_config = 8; + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` + Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` + LastPing int32 `protobuf:"varint,4,opt,name=last_ping,json=lastPing,proto3" json:"last_ping,omitempty"` + Type string `protobuf:"bytes,5,opt,name=type,proto3" json:"type,omitempty"` + CreatedAt int32 `protobuf:"varint,6,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + UpdatedAt int32 `protobuf:"varint,7,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` + ConfigHash string `protobuf:"bytes,8,opt,name=config_hash,json=configHash,proto3" json:"config_hash,omitempty"` + CompatibilityStatus *CompatibilityStatus `protobuf:"bytes,9,opt,name=compatibility_status,json=compatibilityStatus,proto3" json:"compatibility_status,omitempty"` } func (x *Node) Reset() { @@ -123,13 +124,209 @@ func (x *Node) GetConfigHash() string { return "" } +func (x *Node) GetCompatibilityStatus() *CompatibilityStatus { + if x != nil { + return x.CompatibilityStatus + } + return nil +} + +type CompatibilityStatus struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + State string `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"` + Issues []*CompatibilityIssue `protobuf:"bytes,2,rep,name=issues,proto3" json:"issues,omitempty"` +} + +func (x *CompatibilityStatus) Reset() { + *x = CompatibilityStatus{} + if protoimpl.UnsafeEnabled { + mi := &file_kong_admin_model_v1_node_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CompatibilityStatus) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CompatibilityStatus) ProtoMessage() {} + +func (x *CompatibilityStatus) ProtoReflect() protoreflect.Message { + mi := &file_kong_admin_model_v1_node_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CompatibilityStatus.ProtoReflect.Descriptor instead. +func (*CompatibilityStatus) Descriptor() ([]byte, []int) { + return file_kong_admin_model_v1_node_proto_rawDescGZIP(), []int{1} +} + +func (x *CompatibilityStatus) GetState() string { + if x != nil { + return x.State + } + return "" +} + +func (x *CompatibilityStatus) GetIssues() []*CompatibilityIssue { + if x != nil { + return x.Issues + } + return nil +} + +type CompatibilityIssue struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Code string `protobuf:"bytes,1,opt,name=code,proto3" json:"code,omitempty"` + Severity string `protobuf:"bytes,2,opt,name=severity,proto3" json:"severity,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + Resolution string `protobuf:"bytes,4,opt,name=resolution,proto3" json:"resolution,omitempty"` + AffectedResources []*Resource `protobuf:"bytes,5,rep,name=affected_resources,json=affectedResources,proto3" json:"affected_resources,omitempty"` +} + +func (x *CompatibilityIssue) Reset() { + *x = CompatibilityIssue{} + if protoimpl.UnsafeEnabled { + mi := &file_kong_admin_model_v1_node_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CompatibilityIssue) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CompatibilityIssue) ProtoMessage() {} + +func (x *CompatibilityIssue) ProtoReflect() protoreflect.Message { + mi := &file_kong_admin_model_v1_node_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CompatibilityIssue.ProtoReflect.Descriptor instead. +func (*CompatibilityIssue) Descriptor() ([]byte, []int) { + return file_kong_admin_model_v1_node_proto_rawDescGZIP(), []int{2} +} + +func (x *CompatibilityIssue) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +func (x *CompatibilityIssue) GetSeverity() string { + if x != nil { + return x.Severity + } + return "" +} + +func (x *CompatibilityIssue) GetDescription() string { + if x != nil { + return x.Description + } + return "" +} + +func (x *CompatibilityIssue) GetResolution() string { + if x != nil { + return x.Resolution + } + return "" +} + +func (x *CompatibilityIssue) GetAffectedResources() []*Resource { + if x != nil { + return x.AffectedResources + } + return nil +} + +type Resource struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"` +} + +func (x *Resource) Reset() { + *x = Resource{} + if protoimpl.UnsafeEnabled { + mi := &file_kong_admin_model_v1_node_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Resource) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Resource) ProtoMessage() {} + +func (x *Resource) ProtoReflect() protoreflect.Message { + mi := &file_kong_admin_model_v1_node_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Resource.ProtoReflect.Descriptor instead. +func (*Resource) Descriptor() ([]byte, []int) { + return file_kong_admin_model_v1_node_proto_rawDescGZIP(), []int{3} +} + +func (x *Resource) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *Resource) GetType() string { + if x != nil { + return x.Type + } + return "" +} + var File_kong_admin_model_v1_node_proto protoreflect.FileDescriptor var file_kong_admin_model_v1_node_proto_rawDesc = []byte{ 0x0a, 0x1e, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x22, 0xdc, 0x01, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x0e, + 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x22, 0xb9, 0x02, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, @@ -143,11 +340,40 @@ var file_kong_admin_model_v1_node_proto_rawDesc = []byte{ 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x48, 0x61, 0x73, 0x68, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x6b, 0x6f, 0x6b, 0x6f, 0x2f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x6b, - 0x6f, 0x6e, 0x67, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2f, - 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x48, 0x61, 0x73, 0x68, 0x12, 0x5b, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x13, 0x63, 0x6f, + 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x22, 0x6c, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3f, + 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, + 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x79, 0x49, 0x73, 0x73, 0x75, 0x65, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x22, + 0xd4, 0x01, 0x0a, 0x12, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x49, 0x73, 0x73, 0x75, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, + 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, + 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, + 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x73, 0x6f, + 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, + 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4c, 0x0a, 0x12, 0x61, 0x66, 0x66, 0x65, + 0x63, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x05, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, + 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x52, 0x11, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0x2e, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x6b, 0x6f, 0x6b, 0x6f, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x72, 0x70, 0x63, + 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -162,16 +388,22 @@ func file_kong_admin_model_v1_node_proto_rawDescGZIP() []byte { return file_kong_admin_model_v1_node_proto_rawDescData } -var file_kong_admin_model_v1_node_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_kong_admin_model_v1_node_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_kong_admin_model_v1_node_proto_goTypes = []interface{}{ - (*Node)(nil), // 0: kong.admin.model.v1.Node + (*Node)(nil), // 0: kong.admin.model.v1.Node + (*CompatibilityStatus)(nil), // 1: kong.admin.model.v1.CompatibilityStatus + (*CompatibilityIssue)(nil), // 2: kong.admin.model.v1.CompatibilityIssue + (*Resource)(nil), // 3: kong.admin.model.v1.Resource } var file_kong_admin_model_v1_node_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 1, // 0: kong.admin.model.v1.Node.compatibility_status:type_name -> kong.admin.model.v1.CompatibilityStatus + 2, // 1: kong.admin.model.v1.CompatibilityStatus.issues:type_name -> kong.admin.model.v1.CompatibilityIssue + 3, // 2: kong.admin.model.v1.CompatibilityIssue.affected_resources:type_name -> kong.admin.model.v1.Resource + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_kong_admin_model_v1_node_proto_init() } @@ -192,6 +424,42 @@ func file_kong_admin_model_v1_node_proto_init() { return nil } } + file_kong_admin_model_v1_node_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompatibilityStatus); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_kong_admin_model_v1_node_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CompatibilityIssue); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_kong_admin_model_v1_node_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Resource); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -199,7 +467,7 @@ func file_kong_admin_model_v1_node_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_kong_admin_model_v1_node_proto_rawDesc, NumEnums: 0, - NumMessages: 1, + NumMessages: 4, NumExtensions: 0, NumServices: 0, }, diff --git a/internal/gen/grpc/kong/admin/model/v1/pagination.pb.go b/internal/gen/grpc/kong/admin/model/v1/pagination.pb.go index d6b8533f7..d53615b44 100644 --- a/internal/gen/grpc/kong/admin/model/v1/pagination.pb.go +++ b/internal/gen/grpc/kong/admin/model/v1/pagination.pb.go @@ -33,13 +33,15 @@ type PaginationRequest struct { // following CEL expressions are supported: // // - Matches resources that have `tag1` as any tag: - // - `"tag1" in tags` + // - `"tag1" in tags` + // // - Matches all resources that have both `tag1` & `tag2`: - // - `["tag1", "tag2"].all(x, x in tags)` - // - `"tag1" in tags && "tag2" in tags` + // - `["tag1", "tag2"].all(x, x in tags)` + // - `"tag1" in tags && "tag2" in tags` + // // - Matches resources that have `tag1` or `tag2`: - // - `["tag1", "tag2"].exists(x, x in tags)` - // - `"tag1" in tags || "tag2" in tags` + // - `["tag1", "tag2"].exists(x, x in tags)` + // - `"tag1" in tags || "tag2" in tags` // // Limitations: // Currently, it is only possible to filter on tags, and supported logical diff --git a/internal/gen/grpc/kong/nonpublic/v1/node_status.pb.go b/internal/gen/grpc/kong/nonpublic/v1/node_status.pb.go new file mode 100644 index 000000000..00ddd42fb --- /dev/null +++ b/internal/gen/grpc/kong/nonpublic/v1/node_status.pb.go @@ -0,0 +1,183 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.1 +// protoc (unknown) +// source: kong/nonpublic/v1/node_status.proto + +package v1 + +import ( + v1 "github.com/kong/koko/internal/gen/grpc/kong/admin/model/v1" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type NodeStatus struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + CreatedAt int32 `protobuf:"varint,2,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` + UpdatedAt int32 `protobuf:"varint,3,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` + Issues []*v1.CompatibilityIssue `protobuf:"bytes,4,rep,name=issues,proto3" json:"issues,omitempty"` +} + +func (x *NodeStatus) Reset() { + *x = NodeStatus{} + if protoimpl.UnsafeEnabled { + mi := &file_kong_nonpublic_v1_node_status_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *NodeStatus) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*NodeStatus) ProtoMessage() {} + +func (x *NodeStatus) ProtoReflect() protoreflect.Message { + mi := &file_kong_nonpublic_v1_node_status_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use NodeStatus.ProtoReflect.Descriptor instead. +func (*NodeStatus) Descriptor() ([]byte, []int) { + return file_kong_nonpublic_v1_node_status_proto_rawDescGZIP(), []int{0} +} + +func (x *NodeStatus) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *NodeStatus) GetCreatedAt() int32 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *NodeStatus) GetUpdatedAt() int32 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +func (x *NodeStatus) GetIssues() []*v1.CompatibilityIssue { + if x != nil { + return x.Issues + } + return nil +} + +var File_kong_nonpublic_v1_node_status_proto protoreflect.FileDescriptor + +var file_kong_nonpublic_v1_node_status_proto_rawDesc = []byte{ + 0x0a, 0x23, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x6e, 0x6f, 0x6e, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, + 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x6e, 0x6f, 0x6e, 0x70, + 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x76, 0x31, 0x1a, 0x1e, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x61, + 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, + 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9b, 0x01, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, + 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x3f, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, + 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x49, 0x73, 0x73, 0x75, 0x65, 0x52, 0x06, + 0x69, 0x73, 0x73, 0x75, 0x65, 0x73, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x6b, 0x6f, 0x6b, 0x6f, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x72, 0x70, 0x63, + 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x6e, 0x6f, 0x6e, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, + 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_kong_nonpublic_v1_node_status_proto_rawDescOnce sync.Once + file_kong_nonpublic_v1_node_status_proto_rawDescData = file_kong_nonpublic_v1_node_status_proto_rawDesc +) + +func file_kong_nonpublic_v1_node_status_proto_rawDescGZIP() []byte { + file_kong_nonpublic_v1_node_status_proto_rawDescOnce.Do(func() { + file_kong_nonpublic_v1_node_status_proto_rawDescData = protoimpl.X.CompressGZIP(file_kong_nonpublic_v1_node_status_proto_rawDescData) + }) + return file_kong_nonpublic_v1_node_status_proto_rawDescData +} + +var file_kong_nonpublic_v1_node_status_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_kong_nonpublic_v1_node_status_proto_goTypes = []interface{}{ + (*NodeStatus)(nil), // 0: kong.nonpublic.v1.NodeStatus + (*v1.CompatibilityIssue)(nil), // 1: kong.admin.model.v1.CompatibilityIssue +} +var file_kong_nonpublic_v1_node_status_proto_depIdxs = []int32{ + 1, // 0: kong.nonpublic.v1.NodeStatus.issues:type_name -> kong.admin.model.v1.CompatibilityIssue + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_kong_nonpublic_v1_node_status_proto_init() } +func file_kong_nonpublic_v1_node_status_proto_init() { + if File_kong_nonpublic_v1_node_status_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_kong_nonpublic_v1_node_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*NodeStatus); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_kong_nonpublic_v1_node_status_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_kong_nonpublic_v1_node_status_proto_goTypes, + DependencyIndexes: file_kong_nonpublic_v1_node_status_proto_depIdxs, + MessageInfos: file_kong_nonpublic_v1_node_status_proto_msgTypes, + }.Build() + File_kong_nonpublic_v1_node_status_proto = out.File + file_kong_nonpublic_v1_node_status_proto_rawDesc = nil + file_kong_nonpublic_v1_node_status_proto_goTypes = nil + file_kong_nonpublic_v1_node_status_proto_depIdxs = nil +} diff --git a/internal/gen/grpc/kong/relay/service/v1/status.pb.go b/internal/gen/grpc/kong/relay/service/v1/status.pb.go index 9e01fd571..c6af17a3b 100644 --- a/internal/gen/grpc/kong/relay/service/v1/status.pb.go +++ b/internal/gen/grpc/kong/relay/service/v1/status.pb.go @@ -8,6 +8,7 @@ package v1 import ( v1 "github.com/kong/koko/internal/gen/grpc/kong/admin/model/v1" + v11 "github.com/kong/koko/internal/gen/grpc/kong/nonpublic/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -309,6 +310,91 @@ func (*UpdateExpectedHashResponse) Descriptor() ([]byte, []int) { return file_kong_relay_service_v1_status_proto_rawDescGZIP(), []int{5} } +type UpdateNodeStatusRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + NodeStatus *v11.NodeStatus `protobuf:"bytes,1,opt,name=node_status,json=nodeStatus,proto3" json:"node_status,omitempty"` +} + +func (x *UpdateNodeStatusRequest) Reset() { + *x = UpdateNodeStatusRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_kong_relay_service_v1_status_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UpdateNodeStatusRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateNodeStatusRequest) ProtoMessage() {} + +func (x *UpdateNodeStatusRequest) ProtoReflect() protoreflect.Message { + mi := &file_kong_relay_service_v1_status_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateNodeStatusRequest.ProtoReflect.Descriptor instead. +func (*UpdateNodeStatusRequest) Descriptor() ([]byte, []int) { + return file_kong_relay_service_v1_status_proto_rawDescGZIP(), []int{6} +} + +func (x *UpdateNodeStatusRequest) GetNodeStatus() *v11.NodeStatus { + if x != nil { + return x.NodeStatus + } + return nil +} + +type UpdateNodeStatusResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *UpdateNodeStatusResponse) Reset() { + *x = UpdateNodeStatusResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_kong_relay_service_v1_status_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UpdateNodeStatusResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateNodeStatusResponse) ProtoMessage() {} + +func (x *UpdateNodeStatusResponse) ProtoReflect() protoreflect.Message { + mi := &file_kong_relay_service_v1_status_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateNodeStatusResponse.ProtoReflect.Descriptor instead. +func (*UpdateNodeStatusResponse) Descriptor() ([]byte, []int) { + return file_kong_relay_service_v1_status_proto_rawDescGZIP(), []int{7} +} + var File_kong_relay_service_v1_status_proto protoreflect.FileDescriptor var file_kong_relay_service_v1_status_proto_rawDesc = []byte{ @@ -320,67 +406,84 @@ var file_kong_relay_service_v1_status_proto_rawDesc = []byte{ 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x85, 0x01, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, - 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x12, 0x3d, 0x0a, 0x07, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6b, 0x6f, 0x6e, - 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, - 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, - 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0x47, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x2f, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x04, 0x69, 0x74, 0x65, - 0x6d, 0x22, 0xa6, 0x01, 0x0a, 0x12, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x51, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x78, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x3d, 0x0a, 0x07, 0x63, - 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6b, - 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, - 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x6c, - 0x65, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x6e, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, - 0x74, 0x65, 0x64, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, - 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x61, - 0x73, 0x68, 0x12, 0x3d, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, - 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, - 0x72, 0x22, 0x1c, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, - 0x74, 0x65, 0x64, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, - 0xd9, 0x02, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x67, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x12, 0x2a, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, + 0x1a, 0x23, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x6e, 0x6f, 0x6e, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, + 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85, 0x01, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2f, 0x0a, + 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6b, 0x6f, + 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, + 0x31, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x12, 0x3d, + 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x23, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0x47, 0x0a, + 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x52, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x22, 0xa6, 0x01, 0x0a, 0x12, 0x43, 0x6c, 0x65, 0x61, 0x72, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x51, 0x0a, + 0x11, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, + 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x45, + 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x10, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, + 0x12, 0x3d, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x23, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, + 0x15, 0x0a, 0x13, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x6e, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x3d, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x76, 0x31, 0x2e, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x07, 0x63, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x22, 0x1c, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x59, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, + 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x3e, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x6e, 0x6f, 0x6e, 0x70, + 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x52, 0x0a, 0x6e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, + 0x1a, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xce, 0x03, 0x0a, 0x0d, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x67, 0x0a, + 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2a, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x64, 0x0a, 0x0b, 0x43, 0x6c, - 0x65, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x29, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, + 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, - 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x65, - 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x79, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, - 0x65, 0x64, 0x48, 0x61, 0x73, 0x68, 0x12, 0x30, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, - 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x48, 0x61, 0x73, - 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, - 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x48, - 0x61, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3c, 0x5a, 0x3a, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x6b, - 0x6f, 0x6b, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, 0x6e, - 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2f, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x64, 0x0a, 0x0b, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x29, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, + 0x61, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, + 0x65, 0x61, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x2a, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x72, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x79, 0x0a, 0x12, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x48, 0x61, + 0x73, 0x68, 0x12, 0x30, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x6b, 0x6f, 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, + 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x45, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x48, 0x61, 0x73, 0x68, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x73, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2e, 0x2e, 0x6b, 0x6f, + 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x6b, 0x6f, + 0x6e, 0x67, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3c, 0x5a, 0x3a, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, + 0x6b, 0x6f, 0x6b, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x6b, 0x6f, 0x6e, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -395,7 +498,7 @@ func file_kong_relay_service_v1_status_proto_rawDescGZIP() []byte { return file_kong_relay_service_v1_status_proto_rawDescData } -var file_kong_relay_service_v1_status_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_kong_relay_service_v1_status_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_kong_relay_service_v1_status_proto_goTypes = []interface{}{ (*UpdateStatusRequest)(nil), // 0: kong.relay.service.v1.UpdateStatusRequest (*UpdateStatusResponse)(nil), // 1: kong.relay.service.v1.UpdateStatusResponse @@ -403,28 +506,34 @@ var file_kong_relay_service_v1_status_proto_goTypes = []interface{}{ (*ClearStatusResponse)(nil), // 3: kong.relay.service.v1.ClearStatusResponse (*UpdateExpectedHashRequest)(nil), // 4: kong.relay.service.v1.UpdateExpectedHashRequest (*UpdateExpectedHashResponse)(nil), // 5: kong.relay.service.v1.UpdateExpectedHashResponse - (*v1.Status)(nil), // 6: kong.admin.model.v1.Status - (*v1.RequestCluster)(nil), // 7: kong.admin.model.v1.RequestCluster - (*v1.EntityReference)(nil), // 8: kong.admin.model.v1.EntityReference + (*UpdateNodeStatusRequest)(nil), // 6: kong.relay.service.v1.UpdateNodeStatusRequest + (*UpdateNodeStatusResponse)(nil), // 7: kong.relay.service.v1.UpdateNodeStatusResponse + (*v1.Status)(nil), // 8: kong.admin.model.v1.Status + (*v1.RequestCluster)(nil), // 9: kong.admin.model.v1.RequestCluster + (*v1.EntityReference)(nil), // 10: kong.admin.model.v1.EntityReference + (*v11.NodeStatus)(nil), // 11: kong.nonpublic.v1.NodeStatus } var file_kong_relay_service_v1_status_proto_depIdxs = []int32{ - 6, // 0: kong.relay.service.v1.UpdateStatusRequest.item:type_name -> kong.admin.model.v1.Status - 7, // 1: kong.relay.service.v1.UpdateStatusRequest.cluster:type_name -> kong.admin.model.v1.RequestCluster - 6, // 2: kong.relay.service.v1.UpdateStatusResponse.item:type_name -> kong.admin.model.v1.Status - 8, // 3: kong.relay.service.v1.ClearStatusRequest.context_reference:type_name -> kong.admin.model.v1.EntityReference - 7, // 4: kong.relay.service.v1.ClearStatusRequest.cluster:type_name -> kong.admin.model.v1.RequestCluster - 7, // 5: kong.relay.service.v1.UpdateExpectedHashRequest.cluster:type_name -> kong.admin.model.v1.RequestCluster - 0, // 6: kong.relay.service.v1.StatusService.UpdateStatus:input_type -> kong.relay.service.v1.UpdateStatusRequest - 2, // 7: kong.relay.service.v1.StatusService.ClearStatus:input_type -> kong.relay.service.v1.ClearStatusRequest - 4, // 8: kong.relay.service.v1.StatusService.UpdateExpectedHash:input_type -> kong.relay.service.v1.UpdateExpectedHashRequest - 1, // 9: kong.relay.service.v1.StatusService.UpdateStatus:output_type -> kong.relay.service.v1.UpdateStatusResponse - 3, // 10: kong.relay.service.v1.StatusService.ClearStatus:output_type -> kong.relay.service.v1.ClearStatusResponse - 5, // 11: kong.relay.service.v1.StatusService.UpdateExpectedHash:output_type -> kong.relay.service.v1.UpdateExpectedHashResponse - 9, // [9:12] is the sub-list for method output_type - 6, // [6:9] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 8, // 0: kong.relay.service.v1.UpdateStatusRequest.item:type_name -> kong.admin.model.v1.Status + 9, // 1: kong.relay.service.v1.UpdateStatusRequest.cluster:type_name -> kong.admin.model.v1.RequestCluster + 8, // 2: kong.relay.service.v1.UpdateStatusResponse.item:type_name -> kong.admin.model.v1.Status + 10, // 3: kong.relay.service.v1.ClearStatusRequest.context_reference:type_name -> kong.admin.model.v1.EntityReference + 9, // 4: kong.relay.service.v1.ClearStatusRequest.cluster:type_name -> kong.admin.model.v1.RequestCluster + 9, // 5: kong.relay.service.v1.UpdateExpectedHashRequest.cluster:type_name -> kong.admin.model.v1.RequestCluster + 11, // 6: kong.relay.service.v1.UpdateNodeStatusRequest.node_status:type_name -> kong.nonpublic.v1.NodeStatus + 0, // 7: kong.relay.service.v1.StatusService.UpdateStatus:input_type -> kong.relay.service.v1.UpdateStatusRequest + 2, // 8: kong.relay.service.v1.StatusService.ClearStatus:input_type -> kong.relay.service.v1.ClearStatusRequest + 4, // 9: kong.relay.service.v1.StatusService.UpdateExpectedHash:input_type -> kong.relay.service.v1.UpdateExpectedHashRequest + 6, // 10: kong.relay.service.v1.StatusService.UpdateNodeStatus:input_type -> kong.relay.service.v1.UpdateNodeStatusRequest + 1, // 11: kong.relay.service.v1.StatusService.UpdateStatus:output_type -> kong.relay.service.v1.UpdateStatusResponse + 3, // 12: kong.relay.service.v1.StatusService.ClearStatus:output_type -> kong.relay.service.v1.ClearStatusResponse + 5, // 13: kong.relay.service.v1.StatusService.UpdateExpectedHash:output_type -> kong.relay.service.v1.UpdateExpectedHashResponse + 7, // 14: kong.relay.service.v1.StatusService.UpdateNodeStatus:output_type -> kong.relay.service.v1.UpdateNodeStatusResponse + 11, // [11:15] is the sub-list for method output_type + 7, // [7:11] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_kong_relay_service_v1_status_proto_init() } @@ -505,6 +614,30 @@ func file_kong_relay_service_v1_status_proto_init() { return nil } } + file_kong_relay_service_v1_status_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UpdateNodeStatusRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_kong_relay_service_v1_status_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UpdateNodeStatusResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -512,7 +645,7 @@ func file_kong_relay_service_v1_status_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_kong_relay_service_v1_status_proto_rawDesc, NumEnums: 0, - NumMessages: 6, + NumMessages: 8, NumExtensions: 0, NumServices: 1, }, diff --git a/internal/gen/grpc/kong/relay/service/v1/status_grpc.pb.go b/internal/gen/grpc/kong/relay/service/v1/status_grpc.pb.go index 758e1cb80..0712de783 100644 --- a/internal/gen/grpc/kong/relay/service/v1/status_grpc.pb.go +++ b/internal/gen/grpc/kong/relay/service/v1/status_grpc.pb.go @@ -28,6 +28,7 @@ type StatusServiceClient interface { // ClearStatus deletes any status associated with the entity in the request. ClearStatus(ctx context.Context, in *ClearStatusRequest, opts ...grpc.CallOption) (*ClearStatusResponse, error) UpdateExpectedHash(ctx context.Context, in *UpdateExpectedHashRequest, opts ...grpc.CallOption) (*UpdateExpectedHashResponse, error) + UpdateNodeStatus(ctx context.Context, in *UpdateNodeStatusRequest, opts ...grpc.CallOption) (*UpdateNodeStatusResponse, error) } type statusServiceClient struct { @@ -65,6 +66,15 @@ func (c *statusServiceClient) UpdateExpectedHash(ctx context.Context, in *Update return out, nil } +func (c *statusServiceClient) UpdateNodeStatus(ctx context.Context, in *UpdateNodeStatusRequest, opts ...grpc.CallOption) (*UpdateNodeStatusResponse, error) { + out := new(UpdateNodeStatusResponse) + err := c.cc.Invoke(ctx, "/kong.relay.service.v1.StatusService/UpdateNodeStatus", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // StatusServiceServer is the server API for StatusService service. // All implementations must embed UnimplementedStatusServiceServer // for forward compatibility @@ -75,6 +85,7 @@ type StatusServiceServer interface { // ClearStatus deletes any status associated with the entity in the request. ClearStatus(context.Context, *ClearStatusRequest) (*ClearStatusResponse, error) UpdateExpectedHash(context.Context, *UpdateExpectedHashRequest) (*UpdateExpectedHashResponse, error) + UpdateNodeStatus(context.Context, *UpdateNodeStatusRequest) (*UpdateNodeStatusResponse, error) mustEmbedUnimplementedStatusServiceServer() } @@ -91,6 +102,9 @@ func (UnimplementedStatusServiceServer) ClearStatus(context.Context, *ClearStatu func (UnimplementedStatusServiceServer) UpdateExpectedHash(context.Context, *UpdateExpectedHashRequest) (*UpdateExpectedHashResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateExpectedHash not implemented") } +func (UnimplementedStatusServiceServer) UpdateNodeStatus(context.Context, *UpdateNodeStatusRequest) (*UpdateNodeStatusResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateNodeStatus not implemented") +} func (UnimplementedStatusServiceServer) mustEmbedUnimplementedStatusServiceServer() {} // UnsafeStatusServiceServer may be embedded to opt out of forward compatibility for this service. @@ -158,6 +172,24 @@ func _StatusService_UpdateExpectedHash_Handler(srv interface{}, ctx context.Cont return interceptor(ctx, in, info, handler) } +func _StatusService_UpdateNodeStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateNodeStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StatusServiceServer).UpdateNodeStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/kong.relay.service.v1.StatusService/UpdateNodeStatus", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StatusServiceServer).UpdateNodeStatus(ctx, req.(*UpdateNodeStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + // StatusService_ServiceDesc is the grpc.ServiceDesc for StatusService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -177,6 +209,10 @@ var StatusService_ServiceDesc = grpc.ServiceDesc{ MethodName: "UpdateExpectedHash", Handler: _StatusService_UpdateExpectedHash_Handler, }, + { + MethodName: "UpdateNodeStatus", + Handler: _StatusService_UpdateNodeStatus_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "kong/relay/service/v1/status.proto", diff --git a/internal/gen/grpc/kong/util/v1/data_plane_prereq.pb.go b/internal/gen/grpc/kong/util/v1/data_plane_prereq.pb.go index e69734540..4d4ea63c3 100644 --- a/internal/gen/grpc/kong/util/v1/data_plane_prereq.pb.go +++ b/internal/gen/grpc/kong/util/v1/data_plane_prereq.pb.go @@ -26,6 +26,7 @@ type DataPlanePrerequisite struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Config: + // // *DataPlanePrerequisite_RequiredPlugins Config isDataPlanePrerequisite_Config `protobuf_oneof:"config"` } diff --git a/internal/gen/swagger/koko.swagger.json b/internal/gen/swagger/koko.swagger.json index 33c8992c6..a0b8b714d 100644 --- a/internal/gen/swagger/koko.swagger.json +++ b/internal/gen/swagger/koko.swagger.json @@ -3503,6 +3503,43 @@ "key" ] }, + "kong.admin.model.v1.CompatibilityIssue": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "severity": { + "type": "string" + }, + "description": { + "type": "string" + }, + "resolution": { + "type": "string" + }, + "affected_resources": { + "type": "array", + "items": { + "$ref": "#/definitions/kong.admin.model.v1.Resource" + } + } + } + }, + "kong.admin.model.v1.CompatibilityStatus": { + "type": "object", + "properties": { + "state": { + "type": "string" + }, + "issues": { + "type": "array", + "items": { + "$ref": "#/definitions/kong.admin.model.v1.CompatibilityIssue" + } + } + } + }, "kong.admin.model.v1.Condition": { "type": "object", "properties": { @@ -3611,6 +3648,9 @@ }, "config_hash": { "type": "string" + }, + "compatibility_status": { + "$ref": "#/definitions/kong.admin.model.v1.CompatibilityStatus" } } }, @@ -3771,6 +3811,17 @@ } } }, + "kong.admin.model.v1.Resource": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "type": { + "type": "string" + } + } + }, "kong.admin.model.v1.Route": { "type": "object", "properties": { @@ -4650,6 +4701,28 @@ "kong.admin.service.v1.ValidateUpstreamSchemaResponse": { "type": "object" }, + "kong.nonpublic.v1.NodeStatus": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "created_at": { + "type": "integer", + "format": "int32" + }, + "updated_at": { + "type": "integer", + "format": "int32" + }, + "issues": { + "type": "array", + "items": { + "$ref": "#/definitions/kong.admin.model.v1.CompatibilityIssue" + } + } + } + }, "kong.relay.service.v1.ClearStatusResponse": { "type": "object" }, @@ -4659,6 +4732,9 @@ "kong.relay.service.v1.UpdateExpectedHashResponse": { "type": "object" }, + "kong.relay.service.v1.UpdateNodeStatusResponse": { + "type": "object" + }, "kong.relay.service.v1.UpdateStatusResponse": { "type": "object", "properties": { diff --git a/internal/gen/wrpc/kong/services/config/v1/config.pb.go b/internal/gen/wrpc/kong/services/config/v1/config.pb.go index 676b8c9ea..ba4616be6 100644 --- a/internal/gen/wrpc/kong/services/config/v1/config.pb.go +++ b/internal/gen/wrpc/kong/services/config/v1/config.pb.go @@ -257,6 +257,7 @@ type ReportMetadataResponse struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Response: + // // *ReportMetadataResponse_Ok // *ReportMetadataResponse_Error Response isReportMetadataResponse_Response `protobuf_oneof:"response"` @@ -488,7 +489,6 @@ type SyncConfigRequest struct { // in the request. // Version field has no significance outside the context of a single ephemeral // connection between a DP node and a CP node. - // Version uint64 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` // raw binary hash of the config data. ConfigHash string `protobuf:"bytes,3,opt,name=config_hash,json=configHash,proto3" json:"config_hash,omitempty"` diff --git a/internal/grpc/proto/kong/admin/model/v1/node.proto b/internal/grpc/proto/kong/admin/model/v1/node.proto index 86a4b0829..b485a63fa 100644 --- a/internal/grpc/proto/kong/admin/model/v1/node.proto +++ b/internal/grpc/proto/kong/admin/model/v1/node.proto @@ -30,6 +30,6 @@ message CompatibilityIssue { } message Resource { - string type = 1; - string id = 2; + string id = 1; + string type = 2; } diff --git a/internal/grpc/proto/kong/nonpublic/v1/node_status.proto b/internal/grpc/proto/kong/nonpublic/v1/node_status.proto index 1c434583c..c43e407c8 100644 --- a/internal/grpc/proto/kong/nonpublic/v1/node_status.proto +++ b/internal/grpc/proto/kong/nonpublic/v1/node_status.proto @@ -10,5 +10,5 @@ message NodeStatus { string id = 1; int32 created_at = 2; int32 updated_at = 3; - repeated kong.admin.model.v1.CompatibilityIssue issues = 5; + repeated kong.admin.model.v1.CompatibilityIssue issues = 4; }