From 11ec55800562709f3e80565e6b696b18a6b04c8d Mon Sep 17 00:00:00 2001 From: Kenny Leung Date: Mon, 16 Sep 2024 16:02:05 -0700 Subject: [PATCH 1/3] Export a1acca3da337b8474fe06e4defe5f0c57d8b37de Export: a1acca3da337b8474fe06e4defe5f0c57d8b37de --- events/apk/apk.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/events/apk/apk.go b/events/apk/apk.go index 1b82482..d9ef905 100644 --- a/events/apk/apk.go +++ b/events/apk/apk.go @@ -55,7 +55,12 @@ type PushEvent struct { // APKPath is a convenience method for constructing the full path to the APK. func (e PushEvent) APKPath() string { - return fmt.Sprintf("%s/%s/%s-%s.apk", e.RepoID, e.Architecture, e.Package, e.Version) + return fmt.Sprintf("%s/%s", e.RepoID, e.APKBasePath()) +} + +// APKPath is a convenience method for constructing the base path to the APK. +func (e PushEvent) APKBasePath() string { + return fmt.Sprintf("%s/%s-%s.apk", e.Architecture, e.Package, e.Version) } type Error struct { From aaf8fe8b135c33a3388cd9cfc05597ecaeb2a3dd Mon Sep 17 00:00:00 2001 From: Jason Hall Date: Tue, 17 Sep 2024 17:16:56 -0400 Subject: [PATCH 2/3] Export 4720a056f44b152a4685145e4dc74ccf7da1453f Export: 4720a056f44b152a4685145e4dc74ccf7da1453f --- proto/platform/apk/v1/test/apk.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/platform/apk/v1/test/apk.go b/proto/platform/apk/v1/test/apk.go index 87cdd00..ff53ba2 100644 --- a/proto/platform/apk/v1/test/apk.go +++ b/proto/platform/apk/v1/test/apk.go @@ -20,11 +20,11 @@ var _ apk.Clients = (*MockAPKClients)(nil) type MockAPKClients struct { OnClose error - apkClient MockAPKClient + APKClient MockAPKClient } func (m MockAPKClients) APK() apk.APKClient { - return &m.apkClient + return &m.APKClient } func (m MockAPKClients) Close() error { From fe7f87b0891c9fac30acd06a8575c16fbdc073ba Mon Sep 17 00:00:00 2001 From: Colin Douglas <16968564+cmdpdx@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:01:24 -0700 Subject: [PATCH 3/3] Export 6c13dab29eb9a69ffcd8e704224a3402baf0d806 Export: 6c13dab29eb9a69ffcd8e704224a3402baf0d806 --- .../v1/vulnerabilities.platform.pb.go | 566 ++++++------------ .../v1/vulnerabilities.platform.pb.gw.go | 240 -------- .../v1/vulnerabilities.platform.proto | 43 -- .../v1/vulnerabilities.platform_grpc.pb.go | 80 +-- 4 files changed, 188 insertions(+), 741 deletions(-) diff --git a/proto/platform/registry/v1/vulnerabilities.platform.pb.go b/proto/platform/registry/v1/vulnerabilities.platform.pb.go index d02901b..41baf26 100644 --- a/proto/platform/registry/v1/vulnerabilities.platform.pb.go +++ b/proto/platform/registry/v1/vulnerabilities.platform.pb.go @@ -69,7 +69,7 @@ func (x Scanner_Name) Number() protoreflect.EnumNumber { // Deprecated: Use Scanner_Name.Descriptor instead. func (Scanner_Name) EnumDescriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{4, 0} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{3, 0} } type Vulnerability_Severity int32 @@ -124,7 +124,7 @@ func (x Vulnerability_Severity) Number() protoreflect.EnumNumber { // Deprecated: Use Vulnerability_Severity.Descriptor instead. func (Vulnerability_Severity) EnumDescriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{8, 0} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{6, 0} } type Vulnerability_Fix_State int32 @@ -176,7 +176,7 @@ func (x Vulnerability_Fix_State) Number() protoreflect.EnumNumber { // Deprecated: Use Vulnerability_Fix_State.Descriptor instead. func (Vulnerability_Fix_State) EnumDescriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{8, 1, 0} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{6, 1, 0} } type GetRawVulnReportRequest struct { @@ -332,73 +332,6 @@ func (x *RawVulnReport) GetRawReportUrl() string { return "" } -type CreateVulnReportRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // repo_id is the exact UIDP of the repo this image belongs to. - RepoId string `protobuf:"bytes,1,opt,name=repo_id,json=repoId,proto3" json:"repo_id,omitempty"` - // vuln_report is the vulnerability report as generated by the scanner. - VulnReport *VulnReport `protobuf:"bytes,2,opt,name=vuln_report,json=vulnReport,proto3" json:"vuln_report,omitempty"` - // raw_report_filepath is the uri to the location is GCS of the raw JSON - // of the vuln scan report. - RawReportFilepath string `protobuf:"bytes,3,opt,name=raw_report_filepath,json=rawReportFilepath,proto3" json:"raw_report_filepath,omitempty"` -} - -func (x *CreateVulnReportRequest) Reset() { - *x = CreateVulnReportRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CreateVulnReportRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CreateVulnReportRequest) ProtoMessage() {} - -func (x *CreateVulnReportRequest) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_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 CreateVulnReportRequest.ProtoReflect.Descriptor instead. -func (*CreateVulnReportRequest) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{2} -} - -func (x *CreateVulnReportRequest) GetRepoId() string { - if x != nil { - return x.RepoId - } - return "" -} - -func (x *CreateVulnReportRequest) GetVulnReport() *VulnReport { - if x != nil { - return x.VulnReport - } - return nil -} - -func (x *CreateVulnReportRequest) GetRawReportFilepath() string { - if x != nil { - return x.RawReportFilepath - } - return "" -} - type VulnReport struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -418,7 +351,7 @@ type VulnReport struct { func (x *VulnReport) Reset() { *x = VulnReport{} if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[3] + mi := &file_vulnerabilities_platform_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -431,7 +364,7 @@ func (x *VulnReport) String() string { func (*VulnReport) ProtoMessage() {} func (x *VulnReport) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_proto_msgTypes[3] + mi := &file_vulnerabilities_platform_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -444,7 +377,7 @@ func (x *VulnReport) ProtoReflect() protoreflect.Message { // Deprecated: Use VulnReport.ProtoReflect.Descriptor instead. func (*VulnReport) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{3} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{2} } func (x *VulnReport) GetDigest() string { @@ -492,7 +425,7 @@ type Scanner struct { func (x *Scanner) Reset() { *x = Scanner{} if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[4] + mi := &file_vulnerabilities_platform_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -505,7 +438,7 @@ func (x *Scanner) String() string { func (*Scanner) ProtoMessage() {} func (x *Scanner) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_proto_msgTypes[4] + mi := &file_vulnerabilities_platform_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -518,7 +451,7 @@ func (x *Scanner) ProtoReflect() protoreflect.Message { // Deprecated: Use Scanner.ProtoReflect.Descriptor instead. func (*Scanner) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{4} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{3} } func (x *Scanner) GetName() Scanner_Name { @@ -567,7 +500,7 @@ type VulnReportFilter struct { func (x *VulnReportFilter) Reset() { *x = VulnReportFilter{} if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[5] + mi := &file_vulnerabilities_platform_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -580,7 +513,7 @@ func (x *VulnReportFilter) String() string { func (*VulnReportFilter) ProtoMessage() {} func (x *VulnReportFilter) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_proto_msgTypes[5] + mi := &file_vulnerabilities_platform_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -593,7 +526,7 @@ func (x *VulnReportFilter) ProtoReflect() protoreflect.Message { // Deprecated: Use VulnReportFilter.ProtoReflect.Descriptor instead. func (*VulnReportFilter) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{5} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{4} } func (x *VulnReportFilter) GetRepoId() string { @@ -642,7 +575,7 @@ type VulnReportList struct { func (x *VulnReportList) Reset() { *x = VulnReportList{} if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[6] + mi := &file_vulnerabilities_platform_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -655,7 +588,7 @@ func (x *VulnReportList) String() string { func (*VulnReportList) ProtoMessage() {} func (x *VulnReportList) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_proto_msgTypes[6] + mi := &file_vulnerabilities_platform_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -668,7 +601,7 @@ func (x *VulnReportList) ProtoReflect() protoreflect.Message { // Deprecated: Use VulnReportList.ProtoReflect.Descriptor instead. func (*VulnReportList) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{6} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{5} } func (x *VulnReportList) GetItems() []*VulnReport { @@ -678,53 +611,6 @@ func (x *VulnReportList) GetItems() []*VulnReport { return nil } -type CreateVulnRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Vulnerability *Vulnerability `protobuf:"bytes,1,opt,name=vulnerability,proto3" json:"vulnerability,omitempty"` -} - -func (x *CreateVulnRequest) Reset() { - *x = CreateVulnRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CreateVulnRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CreateVulnRequest) ProtoMessage() {} - -func (x *CreateVulnRequest) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_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 CreateVulnRequest.ProtoReflect.Descriptor instead. -func (*CreateVulnRequest) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{7} -} - -func (x *CreateVulnRequest) GetVulnerability() *Vulnerability { - if x != nil { - return x.Vulnerability - } - return nil -} - type Vulnerability struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -756,7 +642,7 @@ type Vulnerability struct { func (x *Vulnerability) Reset() { *x = Vulnerability{} if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[8] + mi := &file_vulnerabilities_platform_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -769,7 +655,7 @@ func (x *Vulnerability) String() string { func (*Vulnerability) ProtoMessage() {} func (x *Vulnerability) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_proto_msgTypes[8] + mi := &file_vulnerabilities_platform_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -782,7 +668,7 @@ func (x *Vulnerability) ProtoReflect() protoreflect.Message { // Deprecated: Use Vulnerability.ProtoReflect.Descriptor instead. func (*Vulnerability) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{8} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{6} } func (x *Vulnerability) GetId() string { @@ -869,7 +755,7 @@ type Vulnerability_CVSS struct { func (x *Vulnerability_CVSS) Reset() { *x = Vulnerability_CVSS{} if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[9] + mi := &file_vulnerabilities_platform_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -882,7 +768,7 @@ func (x *Vulnerability_CVSS) String() string { func (*Vulnerability_CVSS) ProtoMessage() {} func (x *Vulnerability_CVSS) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_proto_msgTypes[9] + mi := &file_vulnerabilities_platform_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -895,7 +781,7 @@ func (x *Vulnerability_CVSS) ProtoReflect() protoreflect.Message { // Deprecated: Use Vulnerability_CVSS.ProtoReflect.Descriptor instead. func (*Vulnerability_CVSS) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{8, 0} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{6, 0} } func (x *Vulnerability_CVSS) GetScore() string { @@ -926,7 +812,7 @@ type Vulnerability_Fix struct { func (x *Vulnerability_Fix) Reset() { *x = Vulnerability_Fix{} if protoimpl.UnsafeEnabled { - mi := &file_vulnerabilities_platform_proto_msgTypes[10] + mi := &file_vulnerabilities_platform_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -939,7 +825,7 @@ func (x *Vulnerability_Fix) String() string { func (*Vulnerability_Fix) ProtoMessage() {} func (x *Vulnerability_Fix) ProtoReflect() protoreflect.Message { - mi := &file_vulnerabilities_platform_proto_msgTypes[10] + mi := &file_vulnerabilities_platform_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -952,7 +838,7 @@ func (x *Vulnerability_Fix) ProtoReflect() protoreflect.Message { // Deprecated: Use Vulnerability_Fix.ProtoReflect.Descriptor instead. func (*Vulnerability_Fix) Descriptor() ([]byte, []int) { - return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{8, 1} + return file_vulnerabilities_platform_proto_rawDescGZIP(), []int{6, 1} } func (x *Vulnerability_Fix) GetVersions() []string { @@ -981,163 +867,127 @@ var file_vulnerabilities_platform_proto_rawDesc = []byte{ 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0xb2, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x61, 0x77, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, - 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, - 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x67, - 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, - 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, - 0x74, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x4e, 0x61, 0x6d, 0x65, - 0x52, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x41, 0x74, 0x22, 0xe8, 0x01, 0x0a, 0x0d, 0x52, 0x61, 0x77, 0x56, 0x75, 0x6c, 0x6e, - 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x3f, - 0x0a, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x25, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, - 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x53, - 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb2, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x61, 0x77, + 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x07, 0x73, 0x63, 0x61, + 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x63, 0x68, 0x61, + 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, + 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, + 0x72, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, - 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x61, - 0x77, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x72, 0x61, 0x77, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x72, 0x61, 0x77, - 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x72, 0x61, 0x77, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x55, 0x72, 0x6c, 0x22, - 0xad, 0x01, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, - 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x72, - 0x65, 0x70, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, - 0x70, 0x6f, 0x49, 0x64, 0x12, 0x49, 0x0a, 0x0b, 0x76, 0x75, 0x6c, 0x6e, 0x5f, 0x72, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x63, 0x68, 0x61, 0x69, + 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x22, 0xe8, 0x01, 0x0a, 0x0d, 0x52, + 0x61, 0x77, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, + 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, + 0x67, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, + 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, + 0x73, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x07, 0x73, 0x63, + 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, + 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, + 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x61, 0x77, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x61, 0x77, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, + 0x24, 0x0a, 0x0e, 0x72, 0x61, 0x77, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x75, 0x72, + 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x61, 0x77, 0x52, 0x65, 0x70, 0x6f, + 0x72, 0x74, 0x55, 0x72, 0x6c, 0x22, 0xf7, 0x01, 0x0a, 0x0a, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, + 0x70, 0x6f, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x07, + 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, + 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, + 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, + 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x39, 0x0a, + 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x55, 0x0a, 0x0f, 0x76, 0x75, 0x6c, 0x6e, + 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x2b, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, + 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, + 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0f, + 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, + 0xce, 0x01, 0x0a, 0x07, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x63, 0x68, 0x61, 0x69, + 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, + 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, + 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, 0x3e, 0x0a, 0x0d, 0x64, 0x62, 0x5f, 0x62, 0x75, 0x69, 0x6c, + 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, + 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x64, 0x62, 0x42, 0x75, 0x69, 0x6c, + 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x29, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0b, 0x0a, + 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x52, + 0x59, 0x50, 0x45, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52, 0x49, 0x56, 0x59, 0x10, 0x02, + 0x22, 0xd7, 0x01, 0x0a, 0x10, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x46, + 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x6f, 0x5f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x49, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x3f, 0x0a, 0x07, 0x73, 0x63, 0x61, 0x6e, + 0x6e, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, - 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x52, 0x0a, 0x76, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, - 0x2e, 0x0a, 0x13, 0x72, 0x61, 0x77, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x66, 0x69, - 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x72, 0x61, - 0x77, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x22, - 0xf7, 0x01, 0x0a, 0x0a, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x16, - 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, - 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, - 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, - 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x07, - 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, - 0x41, 0x74, 0x12, 0x55, 0x0a, 0x0f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x63, 0x68, + 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, + 0x52, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x0d, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x0e, 0x56, 0x75, + 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3e, 0x0a, 0x05, + 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, - 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, - 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0f, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, - 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0xce, 0x01, 0x0a, 0x07, 0x53, 0x63, - 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x3e, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x2a, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, - 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 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, - 0x3e, 0x0a, 0x0d, 0x64, 0x62, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x52, 0x0b, 0x64, 0x62, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0x29, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, - 0x57, 0x4e, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x52, 0x59, 0x50, 0x45, 0x10, 0x01, 0x12, - 0x09, 0x0a, 0x05, 0x54, 0x52, 0x49, 0x56, 0x59, 0x10, 0x02, 0x22, 0xd7, 0x01, 0x0a, 0x10, 0x56, - 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, - 0x17, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x6f, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, - 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, - 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, - 0x61, 0x67, 0x12, 0x3f, 0x0a, 0x07, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, - 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x72, 0x79, 0x2e, 0x53, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x07, 0x73, 0x63, 0x61, 0x6e, - 0x6e, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x0d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x73, - 0x69, 0x6e, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, - 0x69, 0x6e, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x0e, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, - 0x72, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, - 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x66, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x51, 0x0a, 0x0d, 0x76, - 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, - 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, - 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, - 0x0d, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0xd4, - 0x05, 0x0a, 0x0d, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x75, - 0x72, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, - 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x50, 0x0a, 0x08, - 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x34, - 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, - 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, - 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x53, 0x65, 0x76, 0x65, - 0x72, 0x69, 0x74, 0x79, 0x52, 0x08, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x44, - 0x0a, 0x04, 0x63, 0x76, 0x73, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x63, + 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x52, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0xd4, 0x05, 0x0a, + 0x0d, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, + 0x0a, 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x07, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x75, 0x72, 0x6c, + 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x70, 0x75, 0x72, 0x6c, 0x73, 0x12, 0x20, + 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x18, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x50, 0x0a, 0x08, 0x73, 0x65, + 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x34, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, - 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x56, 0x53, 0x53, 0x52, 0x04, - 0x63, 0x76, 0x73, 0x73, 0x12, 0x41, 0x0a, 0x03, 0x66, 0x69, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x2f, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, + 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, + 0x74, 0x79, 0x52, 0x08, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x44, 0x0a, 0x04, + 0x63, 0x76, 0x73, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x63, 0x68, 0x61, + 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, + 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, + 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x56, 0x53, 0x53, 0x52, 0x04, 0x63, 0x76, + 0x73, 0x73, 0x12, 0x41, 0x0a, 0x03, 0x66, 0x69, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x2f, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, + 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, + 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x46, 0x69, 0x78, + 0x52, 0x03, 0x66, 0x69, 0x78, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, + 0x5f, 0x75, 0x72, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x6c, + 0x61, 0x74, 0x65, 0x64, 0x55, 0x72, 0x6c, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x36, 0x0a, 0x04, 0x43, 0x56, 0x53, 0x53, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, + 0x63, 0x6f, 0x72, 0x65, 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, 0x1a, 0xac, + 0x01, 0x0a, 0x03, 0x46, 0x69, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x73, 0x12, 0x4b, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x35, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x46, - 0x69, 0x78, 0x52, 0x03, 0x66, 0x69, 0x78, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, 0x6c, 0x61, 0x74, - 0x65, 0x64, 0x5f, 0x75, 0x72, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x72, - 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x55, 0x72, 0x6c, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x6f, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6c, - 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x36, 0x0a, 0x04, 0x43, 0x56, 0x53, 0x53, - 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 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, - 0x1a, 0xac, 0x01, 0x0a, 0x03, 0x46, 0x69, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x76, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4b, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x35, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, - 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x2e, 0x46, 0x69, 0x78, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x22, 0x3c, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, - 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x49, 0x58, 0x45, 0x44, - 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x49, 0x58, 0x45, 0x44, 0x10, - 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x57, 0x4f, 0x4e, 0x54, 0x5f, 0x46, 0x49, 0x58, 0x10, 0x03, 0x22, - 0x44, 0x0a, 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0b, 0x0a, 0x07, 0x55, - 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4c, 0x4f, 0x57, 0x10, - 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x44, 0x49, 0x55, 0x4d, 0x10, 0x02, 0x12, 0x08, 0x0a, - 0x04, 0x48, 0x49, 0x47, 0x48, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x52, 0x49, 0x54, 0x49, - 0x43, 0x41, 0x4c, 0x10, 0x04, 0x32, 0xb1, 0x06, 0x0a, 0x0f, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, - 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x8b, 0x02, 0x0a, 0x10, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x35, - 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, - 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, - 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, - 0x95, 0x01, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x35, 0x3a, 0x0b, 0x76, 0x75, 0x6c, 0x6e, 0x5f, 0x72, - 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x26, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, - 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, - 0x2f, 0x7b, 0x72, 0x65, 0x70, 0x6f, 0x5f, 0x69, 0x64, 0x3d, 0x2a, 0x2a, 0x7d, 0x8a, 0xaf, 0xa8, - 0xd2, 0x05, 0x08, 0x12, 0x06, 0x0a, 0x04, 0xfe, 0x0c, 0xfc, 0x0c, 0xc2, 0xf0, 0x8e, 0xfc, 0x0b, - 0x46, 0x0a, 0x3b, 0x64, 0x65, 0x76, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, - 0x64, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x76, 0x75, 0x6c, 0x6e, 0x5f, 0x72, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x2e, 0x76, 0x31, 0x12, 0x05, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x12, 0xa0, 0x01, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, + 0x69, 0x78, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, + 0x3c, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, + 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x49, 0x58, 0x45, 0x44, 0x10, 0x01, + 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x49, 0x58, 0x45, 0x44, 0x10, 0x02, 0x12, + 0x0c, 0x0a, 0x08, 0x57, 0x4f, 0x4e, 0x54, 0x5f, 0x46, 0x49, 0x58, 0x10, 0x03, 0x22, 0x44, 0x0a, + 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, + 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4c, 0x4f, 0x57, 0x10, 0x01, 0x12, + 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x44, 0x49, 0x55, 0x4d, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x48, + 0x49, 0x47, 0x48, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x52, 0x49, 0x54, 0x49, 0x43, 0x41, + 0x4c, 0x10, 0x04, 0x32, 0xe2, 0x02, 0x0a, 0x0f, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0xa0, 0x01, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x2e, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x56, 0x75, 0x6c, 0x6e, 0x52, @@ -1158,28 +1008,16 @@ var file_vulnerabilities_platform_proto_rawDesc = []byte{ 0x6f, 0x72, 0x74, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x12, 0x1d, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f, 0x76, 0x31, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2f, 0x72, 0x61, 0x77, 0x8a, 0xaf, 0xa8, 0xd2, 0x05, 0x08, - 0x12, 0x06, 0x0a, 0x02, 0xfd, 0x0c, 0x10, 0x01, 0x12, 0xbe, 0x01, 0x0a, 0x12, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x75, 0x6c, 0x6e, 0x12, - 0x2f, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, 0x61, - 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x56, 0x75, 0x6c, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x2b, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x70, 0x6c, - 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2e, - 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x4a, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x38, 0x3a, 0x0d, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x79, 0x22, 0x27, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f, - 0x76, 0x31, 0x2f, 0x76, 0x75, 0x6c, 0x6e, 0x2f, 0x7b, 0x76, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x69, 0x64, 0x3d, 0x2a, 0x2a, 0x7d, 0x8a, 0xaf, 0xa8, - 0xd2, 0x05, 0x06, 0x12, 0x04, 0x0a, 0x02, 0xfe, 0x0c, 0x42, 0x80, 0x01, 0x0a, 0x27, 0x64, 0x65, - 0x76, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x73, 0x64, 0x6b, - 0x2e, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x72, 0x79, 0x2e, 0x76, 0x31, 0x42, 0x24, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x63, - 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x73, 0x64, - 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, - 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x06, 0x0a, 0x02, 0xfd, 0x0c, 0x10, 0x01, 0x42, 0x80, 0x01, 0x0a, 0x27, 0x64, 0x65, 0x76, + 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x73, 0x64, 0x6b, 0x2e, + 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, + 0x79, 0x2e, 0x76, 0x31, 0x42, 0x24, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x52, 0x65, + 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x56, 0x75, 0x6c, 0x6e, 0x65, 0x72, 0x61, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x69, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x63, 0x68, + 0x61, 0x69, 0x6e, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x73, 0x64, 0x6b, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, + 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -1195,56 +1033,48 @@ func file_vulnerabilities_platform_proto_rawDescGZIP() []byte { } var file_vulnerabilities_platform_proto_enumTypes = make([]protoimpl.EnumInfo, 3) -var file_vulnerabilities_platform_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_vulnerabilities_platform_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_vulnerabilities_platform_proto_goTypes = []any{ (Scanner_Name)(0), // 0: chainguard.platform.registry.Scanner.Name (Vulnerability_Severity)(0), // 1: chainguard.platform.registry.Vulnerability.Severity (Vulnerability_Fix_State)(0), // 2: chainguard.platform.registry.Vulnerability.Fix.State (*GetRawVulnReportRequest)(nil), // 3: chainguard.platform.registry.GetRawVulnReportRequest (*RawVulnReport)(nil), // 4: chainguard.platform.registry.RawVulnReport - (*CreateVulnReportRequest)(nil), // 5: chainguard.platform.registry.CreateVulnReportRequest - (*VulnReport)(nil), // 6: chainguard.platform.registry.VulnReport - (*Scanner)(nil), // 7: chainguard.platform.registry.Scanner - (*VulnReportFilter)(nil), // 8: chainguard.platform.registry.VulnReportFilter - (*VulnReportList)(nil), // 9: chainguard.platform.registry.VulnReportList - (*CreateVulnRequest)(nil), // 10: chainguard.platform.registry.CreateVulnRequest - (*Vulnerability)(nil), // 11: chainguard.platform.registry.Vulnerability - (*Vulnerability_CVSS)(nil), // 12: chainguard.platform.registry.Vulnerability.CVSS - (*Vulnerability_Fix)(nil), // 13: chainguard.platform.registry.Vulnerability.Fix - (*timestamppb.Timestamp)(nil), // 14: google.protobuf.Timestamp + (*VulnReport)(nil), // 5: chainguard.platform.registry.VulnReport + (*Scanner)(nil), // 6: chainguard.platform.registry.Scanner + (*VulnReportFilter)(nil), // 7: chainguard.platform.registry.VulnReportFilter + (*VulnReportList)(nil), // 8: chainguard.platform.registry.VulnReportList + (*Vulnerability)(nil), // 9: chainguard.platform.registry.Vulnerability + (*Vulnerability_CVSS)(nil), // 10: chainguard.platform.registry.Vulnerability.CVSS + (*Vulnerability_Fix)(nil), // 11: chainguard.platform.registry.Vulnerability.Fix + (*timestamppb.Timestamp)(nil), // 12: google.protobuf.Timestamp } var file_vulnerabilities_platform_proto_depIdxs = []int32{ 0, // 0: chainguard.platform.registry.GetRawVulnReportRequest.scanner:type_name -> chainguard.platform.registry.Scanner.Name - 14, // 1: chainguard.platform.registry.GetRawVulnReportRequest.created_at:type_name -> google.protobuf.Timestamp - 7, // 2: chainguard.platform.registry.RawVulnReport.scanner:type_name -> chainguard.platform.registry.Scanner - 14, // 3: chainguard.platform.registry.RawVulnReport.created_at:type_name -> google.protobuf.Timestamp - 6, // 4: chainguard.platform.registry.CreateVulnReportRequest.vuln_report:type_name -> chainguard.platform.registry.VulnReport - 7, // 5: chainguard.platform.registry.VulnReport.scanner:type_name -> chainguard.platform.registry.Scanner - 14, // 6: chainguard.platform.registry.VulnReport.created_at:type_name -> google.protobuf.Timestamp - 11, // 7: chainguard.platform.registry.VulnReport.vulnerabilities:type_name -> chainguard.platform.registry.Vulnerability - 0, // 8: chainguard.platform.registry.Scanner.name:type_name -> chainguard.platform.registry.Scanner.Name - 14, // 9: chainguard.platform.registry.Scanner.db_build_time:type_name -> google.protobuf.Timestamp - 7, // 10: chainguard.platform.registry.VulnReportFilter.scanner:type_name -> chainguard.platform.registry.Scanner - 14, // 11: chainguard.platform.registry.VulnReportFilter.created_since:type_name -> google.protobuf.Timestamp - 6, // 12: chainguard.platform.registry.VulnReportList.items:type_name -> chainguard.platform.registry.VulnReport - 11, // 13: chainguard.platform.registry.CreateVulnRequest.vulnerability:type_name -> chainguard.platform.registry.Vulnerability - 1, // 14: chainguard.platform.registry.Vulnerability.severity:type_name -> chainguard.platform.registry.Vulnerability.Severity - 12, // 15: chainguard.platform.registry.Vulnerability.cvss:type_name -> chainguard.platform.registry.Vulnerability.CVSS - 13, // 16: chainguard.platform.registry.Vulnerability.fix:type_name -> chainguard.platform.registry.Vulnerability.Fix - 2, // 17: chainguard.platform.registry.Vulnerability.Fix.state:type_name -> chainguard.platform.registry.Vulnerability.Fix.State - 5, // 18: chainguard.platform.registry.Vulnerabilities.CreateVulnReport:input_type -> chainguard.platform.registry.CreateVulnReportRequest - 8, // 19: chainguard.platform.registry.Vulnerabilities.ListVulnReports:input_type -> chainguard.platform.registry.VulnReportFilter - 3, // 20: chainguard.platform.registry.Vulnerabilities.GetRawVulnReport:input_type -> chainguard.platform.registry.GetRawVulnReportRequest - 10, // 21: chainguard.platform.registry.Vulnerabilities.CreateOrUpdateVuln:input_type -> chainguard.platform.registry.CreateVulnRequest - 6, // 22: chainguard.platform.registry.Vulnerabilities.CreateVulnReport:output_type -> chainguard.platform.registry.VulnReport - 9, // 23: chainguard.platform.registry.Vulnerabilities.ListVulnReports:output_type -> chainguard.platform.registry.VulnReportList - 4, // 24: chainguard.platform.registry.Vulnerabilities.GetRawVulnReport:output_type -> chainguard.platform.registry.RawVulnReport - 11, // 25: chainguard.platform.registry.Vulnerabilities.CreateOrUpdateVuln:output_type -> chainguard.platform.registry.Vulnerability - 22, // [22:26] is the sub-list for method output_type - 18, // [18:22] is the sub-list for method input_type - 18, // [18:18] is the sub-list for extension type_name - 18, // [18:18] is the sub-list for extension extendee - 0, // [0:18] is the sub-list for field type_name + 12, // 1: chainguard.platform.registry.GetRawVulnReportRequest.created_at:type_name -> google.protobuf.Timestamp + 6, // 2: chainguard.platform.registry.RawVulnReport.scanner:type_name -> chainguard.platform.registry.Scanner + 12, // 3: chainguard.platform.registry.RawVulnReport.created_at:type_name -> google.protobuf.Timestamp + 6, // 4: chainguard.platform.registry.VulnReport.scanner:type_name -> chainguard.platform.registry.Scanner + 12, // 5: chainguard.platform.registry.VulnReport.created_at:type_name -> google.protobuf.Timestamp + 9, // 6: chainguard.platform.registry.VulnReport.vulnerabilities:type_name -> chainguard.platform.registry.Vulnerability + 0, // 7: chainguard.platform.registry.Scanner.name:type_name -> chainguard.platform.registry.Scanner.Name + 12, // 8: chainguard.platform.registry.Scanner.db_build_time:type_name -> google.protobuf.Timestamp + 6, // 9: chainguard.platform.registry.VulnReportFilter.scanner:type_name -> chainguard.platform.registry.Scanner + 12, // 10: chainguard.platform.registry.VulnReportFilter.created_since:type_name -> google.protobuf.Timestamp + 5, // 11: chainguard.platform.registry.VulnReportList.items:type_name -> chainguard.platform.registry.VulnReport + 1, // 12: chainguard.platform.registry.Vulnerability.severity:type_name -> chainguard.platform.registry.Vulnerability.Severity + 10, // 13: chainguard.platform.registry.Vulnerability.cvss:type_name -> chainguard.platform.registry.Vulnerability.CVSS + 11, // 14: chainguard.platform.registry.Vulnerability.fix:type_name -> chainguard.platform.registry.Vulnerability.Fix + 2, // 15: chainguard.platform.registry.Vulnerability.Fix.state:type_name -> chainguard.platform.registry.Vulnerability.Fix.State + 7, // 16: chainguard.platform.registry.Vulnerabilities.ListVulnReports:input_type -> chainguard.platform.registry.VulnReportFilter + 3, // 17: chainguard.platform.registry.Vulnerabilities.GetRawVulnReport:input_type -> chainguard.platform.registry.GetRawVulnReportRequest + 8, // 18: chainguard.platform.registry.Vulnerabilities.ListVulnReports:output_type -> chainguard.platform.registry.VulnReportList + 4, // 19: chainguard.platform.registry.Vulnerabilities.GetRawVulnReport:output_type -> chainguard.platform.registry.RawVulnReport + 18, // [18:20] is the sub-list for method output_type + 16, // [16:18] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_vulnerabilities_platform_proto_init() } @@ -1278,18 +1108,6 @@ func file_vulnerabilities_platform_proto_init() { } } file_vulnerabilities_platform_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*CreateVulnReportRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_vulnerabilities_platform_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*VulnReport); i { case 0: return &v.state @@ -1301,7 +1119,7 @@ func file_vulnerabilities_platform_proto_init() { return nil } } - file_vulnerabilities_platform_proto_msgTypes[4].Exporter = func(v any, i int) any { + file_vulnerabilities_platform_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*Scanner); i { case 0: return &v.state @@ -1313,7 +1131,7 @@ func file_vulnerabilities_platform_proto_init() { return nil } } - file_vulnerabilities_platform_proto_msgTypes[5].Exporter = func(v any, i int) any { + file_vulnerabilities_platform_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*VulnReportFilter); i { case 0: return &v.state @@ -1325,7 +1143,7 @@ func file_vulnerabilities_platform_proto_init() { return nil } } - file_vulnerabilities_platform_proto_msgTypes[6].Exporter = func(v any, i int) any { + file_vulnerabilities_platform_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*VulnReportList); i { case 0: return &v.state @@ -1337,19 +1155,7 @@ func file_vulnerabilities_platform_proto_init() { return nil } } - file_vulnerabilities_platform_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*CreateVulnRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_vulnerabilities_platform_proto_msgTypes[8].Exporter = func(v any, i int) any { + file_vulnerabilities_platform_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*Vulnerability); i { case 0: return &v.state @@ -1361,7 +1167,7 @@ func file_vulnerabilities_platform_proto_init() { return nil } } - file_vulnerabilities_platform_proto_msgTypes[9].Exporter = func(v any, i int) any { + file_vulnerabilities_platform_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*Vulnerability_CVSS); i { case 0: return &v.state @@ -1373,7 +1179,7 @@ func file_vulnerabilities_platform_proto_init() { return nil } } - file_vulnerabilities_platform_proto_msgTypes[10].Exporter = func(v any, i int) any { + file_vulnerabilities_platform_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*Vulnerability_Fix); i { case 0: return &v.state @@ -1392,7 +1198,7 @@ func file_vulnerabilities_platform_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_vulnerabilities_platform_proto_rawDesc, NumEnums: 3, - NumMessages: 11, + NumMessages: 9, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/platform/registry/v1/vulnerabilities.platform.pb.gw.go b/proto/platform/registry/v1/vulnerabilities.platform.pb.gw.go index da4936c..9bd12fd 100644 --- a/proto/platform/registry/v1/vulnerabilities.platform.pb.gw.go +++ b/proto/platform/registry/v1/vulnerabilities.platform.pb.gw.go @@ -26,84 +26,6 @@ var _ = runtime.String var _ = utilities.NewDoubleArray var _ = metadata.Join -var ( - filter_Vulnerabilities_CreateVulnReport_0 = &utilities.DoubleArray{Encoding: map[string]int{"vuln_report": 0, "repo_id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} -) - -func request_Vulnerabilities_CreateVulnReport_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CreateVulnReportRequest - var metadata runtime.ServerMetadata - - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.VulnReport); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["repo_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "repo_id") - } - - protoReq.RepoId, err = runtime.String(val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "repo_id", err) - } - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Vulnerabilities_CreateVulnReport_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.CreateVulnReport(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Vulnerabilities_CreateVulnReport_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CreateVulnReportRequest - var metadata runtime.ServerMetadata - - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.VulnReport); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["repo_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "repo_id") - } - - protoReq.RepoId, err = runtime.String(val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "repo_id", err) - } - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Vulnerabilities_CreateVulnReport_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.CreateVulnReport(ctx, &protoReq) - return msg, metadata, err - -} - var ( filter_Vulnerabilities_ListVulnReports_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} ) @@ -176,66 +98,6 @@ func local_request_Vulnerabilities_GetRawVulnReport_0(ctx context.Context, marsh } -func request_Vulnerabilities_CreateOrUpdateVuln_0(ctx context.Context, marshaler runtime.Marshaler, client VulnerabilitiesClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CreateVulnRequest - var metadata runtime.ServerMetadata - - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vulnerability); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["vulnerability.id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "vulnerability.id") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "vulnerability.id", val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "vulnerability.id", err) - } - - msg, err := client.CreateOrUpdateVuln(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Vulnerabilities_CreateOrUpdateVuln_0(ctx context.Context, marshaler runtime.Marshaler, server VulnerabilitiesServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq CreateVulnRequest - var metadata runtime.ServerMetadata - - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vulnerability); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["vulnerability.id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "vulnerability.id") - } - - err = runtime.PopulateFieldFromPath(&protoReq, "vulnerability.id", val) - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "vulnerability.id", err) - } - - msg, err := server.CreateOrUpdateVuln(ctx, &protoReq) - return msg, metadata, err - -} - // RegisterVulnerabilitiesHandlerServer registers the http handlers for service Vulnerabilities to "mux". // UnaryRPC :call VulnerabilitiesServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -243,31 +105,6 @@ func local_request_Vulnerabilities_CreateOrUpdateVuln_0(ctx context.Context, mar // GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.ServeMux, server VulnerabilitiesServer) error { - mux.Handle("POST", pattern_Vulnerabilities_CreateVulnReport_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/chainguard.platform.registry.Vulnerabilities/CreateVulnReport", runtime.WithHTTPPathPattern("/registry/v1/vuln_reports/{repo_id=**}")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Vulnerabilities_CreateVulnReport_0(annotatedContext, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - - forward_Vulnerabilities_CreateVulnReport_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("GET", pattern_Vulnerabilities_ListVulnReports_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -318,31 +155,6 @@ func RegisterVulnerabilitiesHandlerServer(ctx context.Context, mux *runtime.Serv }) - mux.Handle("POST", pattern_Vulnerabilities_CreateOrUpdateVuln_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/chainguard.platform.registry.Vulnerabilities/CreateOrUpdateVuln", runtime.WithHTTPPathPattern("/registry/v1/vuln/{vulnerability.id=**}")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Vulnerabilities_CreateOrUpdateVuln_0(annotatedContext, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - - forward_Vulnerabilities_CreateOrUpdateVuln_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - return nil } @@ -384,28 +196,6 @@ func RegisterVulnerabilitiesHandler(ctx context.Context, mux *runtime.ServeMux, // "VulnerabilitiesClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.ServeMux, client VulnerabilitiesClient) error { - mux.Handle("POST", pattern_Vulnerabilities_CreateVulnReport_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/chainguard.platform.registry.Vulnerabilities/CreateVulnReport", runtime.WithHTTPPathPattern("/registry/v1/vuln_reports/{repo_id=**}")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Vulnerabilities_CreateVulnReport_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - - forward_Vulnerabilities_CreateVulnReport_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("GET", pattern_Vulnerabilities_ListVulnReports_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -450,47 +240,17 @@ func RegisterVulnerabilitiesHandlerClient(ctx context.Context, mux *runtime.Serv }) - mux.Handle("POST", pattern_Vulnerabilities_CreateOrUpdateVuln_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/chainguard.platform.registry.Vulnerabilities/CreateOrUpdateVuln", runtime.WithHTTPPathPattern("/registry/v1/vuln/{vulnerability.id=**}")) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Vulnerabilities_CreateOrUpdateVuln_0(annotatedContext, inboundMarshaler, client, req, pathParams) - annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) - if err != nil { - runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) - return - } - - forward_Vulnerabilities_CreateOrUpdateVuln_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - return nil } var ( - pattern_Vulnerabilities_CreateVulnReport_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3}, []string{"registry", "v1", "vuln_reports", "repo_id"}, "")) - pattern_Vulnerabilities_ListVulnReports_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"registry", "v1", "vuln_reports"}, "")) pattern_Vulnerabilities_GetRawVulnReport_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"registry", "v1", "vuln_reports", "raw"}, "")) - - pattern_Vulnerabilities_CreateOrUpdateVuln_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3}, []string{"registry", "v1", "vuln", "vulnerability.id"}, "")) ) var ( - forward_Vulnerabilities_CreateVulnReport_0 = runtime.ForwardResponseMessage - forward_Vulnerabilities_ListVulnReports_0 = runtime.ForwardResponseMessage forward_Vulnerabilities_GetRawVulnReport_0 = runtime.ForwardResponseMessage - - forward_Vulnerabilities_CreateOrUpdateVuln_0 = runtime.ForwardResponseMessage ) diff --git a/proto/platform/registry/v1/vulnerabilities.platform.proto b/proto/platform/registry/v1/vulnerabilities.platform.proto index 0381395..edb906c 100644 --- a/proto/platform/registry/v1/vulnerabilities.platform.proto +++ b/proto/platform/registry/v1/vulnerabilities.platform.proto @@ -10,25 +10,8 @@ package chainguard.platform.registry; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; import "annotations/auth.proto"; -import "annotations/events.proto"; service Vulnerabilities { - rpc CreateVulnReport(CreateVulnReportRequest) returns (VulnReport) { - option (google.api.http) = { - post: "/registry/v1/vuln_reports/{repo_id=**}" - body: "vuln_report" - }; - option (chainguard.annotations.iam) = { - enabled: { - capabilities: [CAP_VULN_CREATE, CAP_VULN_REPORT_CREATE] - } - }; - option (chainguard.annotations.events) = { - type: "dev.chainguard.api.platform.registry.vuln_report.created.v1" - extensions: ["group"] - audience: CUSTOMER - }; - } rpc ListVulnReports(VulnReportFilter) returns (VulnReportList) { option (google.api.http) = { get: "/registry/v1/vuln_reports" @@ -52,18 +35,6 @@ service Vulnerabilities { } }; } - - rpc CreateOrUpdateVuln(CreateVulnRequest) returns (Vulnerability) { - option (google.api.http) = { - post: "/registry/v1/vuln/{vulnerability.id=**}" - body: "vulnerability" - }; - option (chainguard.annotations.iam) = { - enabled: { - capabilities: [CAP_VULN_CREATE] - } - }; - } } message GetRawVulnReportRequest { @@ -91,16 +62,6 @@ message RawVulnReport { string raw_report_url = 5; } -message CreateVulnReportRequest { - // repo_id is the exact UIDP of the repo this image belongs to. - string repo_id = 1; - // vuln_report is the vulnerability report as generated by the scanner. - VulnReport vuln_report = 2; - // raw_report_filepath is the uri to the location is GCS of the raw JSON - // of the vuln scan report. - string raw_report_filepath = 3; -} - message VulnReport { // digest is the exact digest of the scanned image. string digest = 1; @@ -151,10 +112,6 @@ message VulnReportList { repeated VulnReport items = 1; } -message CreateVulnRequest { - Vulnerability vulnerability = 1; -} - message Vulnerability { // The unique identifier for the vulnerability. // e.g. CVE-2024-12345 diff --git a/proto/platform/registry/v1/vulnerabilities.platform_grpc.pb.go b/proto/platform/registry/v1/vulnerabilities.platform_grpc.pb.go index aead719..60f8c1c 100644 --- a/proto/platform/registry/v1/vulnerabilities.platform_grpc.pb.go +++ b/proto/platform/registry/v1/vulnerabilities.platform_grpc.pb.go @@ -19,20 +19,16 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - Vulnerabilities_CreateVulnReport_FullMethodName = "/chainguard.platform.registry.Vulnerabilities/CreateVulnReport" - Vulnerabilities_ListVulnReports_FullMethodName = "/chainguard.platform.registry.Vulnerabilities/ListVulnReports" - Vulnerabilities_GetRawVulnReport_FullMethodName = "/chainguard.platform.registry.Vulnerabilities/GetRawVulnReport" - Vulnerabilities_CreateOrUpdateVuln_FullMethodName = "/chainguard.platform.registry.Vulnerabilities/CreateOrUpdateVuln" + Vulnerabilities_ListVulnReports_FullMethodName = "/chainguard.platform.registry.Vulnerabilities/ListVulnReports" + Vulnerabilities_GetRawVulnReport_FullMethodName = "/chainguard.platform.registry.Vulnerabilities/GetRawVulnReport" ) // VulnerabilitiesClient is the client API for Vulnerabilities service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type VulnerabilitiesClient interface { - CreateVulnReport(ctx context.Context, in *CreateVulnReportRequest, opts ...grpc.CallOption) (*VulnReport, error) ListVulnReports(ctx context.Context, in *VulnReportFilter, opts ...grpc.CallOption) (*VulnReportList, error) GetRawVulnReport(ctx context.Context, in *GetRawVulnReportRequest, opts ...grpc.CallOption) (*RawVulnReport, error) - CreateOrUpdateVuln(ctx context.Context, in *CreateVulnRequest, opts ...grpc.CallOption) (*Vulnerability, error) } type vulnerabilitiesClient struct { @@ -43,16 +39,6 @@ func NewVulnerabilitiesClient(cc grpc.ClientConnInterface) VulnerabilitiesClient return &vulnerabilitiesClient{cc} } -func (c *vulnerabilitiesClient) CreateVulnReport(ctx context.Context, in *CreateVulnReportRequest, opts ...grpc.CallOption) (*VulnReport, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(VulnReport) - err := c.cc.Invoke(ctx, Vulnerabilities_CreateVulnReport_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *vulnerabilitiesClient) ListVulnReports(ctx context.Context, in *VulnReportFilter, opts ...grpc.CallOption) (*VulnReportList, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(VulnReportList) @@ -73,24 +59,12 @@ func (c *vulnerabilitiesClient) GetRawVulnReport(ctx context.Context, in *GetRaw return out, nil } -func (c *vulnerabilitiesClient) CreateOrUpdateVuln(ctx context.Context, in *CreateVulnRequest, opts ...grpc.CallOption) (*Vulnerability, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Vulnerability) - err := c.cc.Invoke(ctx, Vulnerabilities_CreateOrUpdateVuln_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - // VulnerabilitiesServer is the server API for Vulnerabilities service. // All implementations must embed UnimplementedVulnerabilitiesServer // for forward compatibility. type VulnerabilitiesServer interface { - CreateVulnReport(context.Context, *CreateVulnReportRequest) (*VulnReport, error) ListVulnReports(context.Context, *VulnReportFilter) (*VulnReportList, error) GetRawVulnReport(context.Context, *GetRawVulnReportRequest) (*RawVulnReport, error) - CreateOrUpdateVuln(context.Context, *CreateVulnRequest) (*Vulnerability, error) mustEmbedUnimplementedVulnerabilitiesServer() } @@ -101,18 +75,12 @@ type VulnerabilitiesServer interface { // pointer dereference when methods are called. type UnimplementedVulnerabilitiesServer struct{} -func (UnimplementedVulnerabilitiesServer) CreateVulnReport(context.Context, *CreateVulnReportRequest) (*VulnReport, error) { - return nil, status.Errorf(codes.Unimplemented, "method CreateVulnReport not implemented") -} func (UnimplementedVulnerabilitiesServer) ListVulnReports(context.Context, *VulnReportFilter) (*VulnReportList, error) { return nil, status.Errorf(codes.Unimplemented, "method ListVulnReports not implemented") } func (UnimplementedVulnerabilitiesServer) GetRawVulnReport(context.Context, *GetRawVulnReportRequest) (*RawVulnReport, error) { return nil, status.Errorf(codes.Unimplemented, "method GetRawVulnReport not implemented") } -func (UnimplementedVulnerabilitiesServer) CreateOrUpdateVuln(context.Context, *CreateVulnRequest) (*Vulnerability, error) { - return nil, status.Errorf(codes.Unimplemented, "method CreateOrUpdateVuln not implemented") -} func (UnimplementedVulnerabilitiesServer) mustEmbedUnimplementedVulnerabilitiesServer() {} func (UnimplementedVulnerabilitiesServer) testEmbeddedByValue() {} @@ -134,24 +102,6 @@ func RegisterVulnerabilitiesServer(s grpc.ServiceRegistrar, srv VulnerabilitiesS s.RegisterService(&Vulnerabilities_ServiceDesc, srv) } -func _Vulnerabilities_CreateVulnReport_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateVulnReportRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(VulnerabilitiesServer).CreateVulnReport(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Vulnerabilities_CreateVulnReport_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(VulnerabilitiesServer).CreateVulnReport(ctx, req.(*CreateVulnReportRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Vulnerabilities_ListVulnReports_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(VulnReportFilter) if err := dec(in); err != nil { @@ -188,24 +138,6 @@ func _Vulnerabilities_GetRawVulnReport_Handler(srv interface{}, ctx context.Cont return interceptor(ctx, in, info, handler) } -func _Vulnerabilities_CreateOrUpdateVuln_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateVulnRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(VulnerabilitiesServer).CreateOrUpdateVuln(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Vulnerabilities_CreateOrUpdateVuln_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(VulnerabilitiesServer).CreateOrUpdateVuln(ctx, req.(*CreateVulnRequest)) - } - return interceptor(ctx, in, info, handler) -} - // Vulnerabilities_ServiceDesc is the grpc.ServiceDesc for Vulnerabilities service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -213,10 +145,6 @@ var Vulnerabilities_ServiceDesc = grpc.ServiceDesc{ ServiceName: "chainguard.platform.registry.Vulnerabilities", HandlerType: (*VulnerabilitiesServer)(nil), Methods: []grpc.MethodDesc{ - { - MethodName: "CreateVulnReport", - Handler: _Vulnerabilities_CreateVulnReport_Handler, - }, { MethodName: "ListVulnReports", Handler: _Vulnerabilities_ListVulnReports_Handler, @@ -225,10 +153,6 @@ var Vulnerabilities_ServiceDesc = grpc.ServiceDesc{ MethodName: "GetRawVulnReport", Handler: _Vulnerabilities_GetRawVulnReport_Handler, }, - { - MethodName: "CreateOrUpdateVuln", - Handler: _Vulnerabilities_CreateOrUpdateVuln_Handler, - }, }, Streams: []grpc.StreamDesc{}, Metadata: "vulnerabilities.platform.proto",