From 711e0d7437c510cbf96d0f32f3d3bea44a6a25ad Mon Sep 17 00:00:00 2001 From: Oran Moshai <12291998+oranmoshai@users.noreply.github.com> Date: Thu, 12 May 2022 11:07:38 +0300 Subject: [PATCH] refactor(tags): send build id and run as dedicated field (#107) Also removed duplicate code in tmp dir create Co-authored-by: oranmoshai --- pkg/buildClient/upload.go | 13 +- pkg/proto/buildsecurity.proto | 2 + pkg/proto/buildsecurity/buildsecurity.pb.go | 307 ++++++++++-------- .../buildsecurity/buildsecurity.twirp.go | 153 ++++----- pkg/scanner/diff.go | 6 +- pkg/scanner/scanner.go | 8 +- 6 files changed, 249 insertions(+), 240 deletions(-) diff --git a/pkg/buildClient/upload.go b/pkg/buildClient/upload.go index 376b2c32..c1a61fab 100644 --- a/pkg/buildClient/upload.go +++ b/pkg/buildClient/upload.go @@ -28,17 +28,6 @@ func (bc *TwirpClient) Upload(results []*buildsecurity.Result, tags map[string]s buildSystem := metadata.GetBuildSystem() run, buildID := metadata.GetBuildInfo(buildSystem) - // add tags only if not exist and allow override - if _, ok := tags["run"]; !ok { - if run != "" { - tags["run"] = run - } - } - if _, ok := tags["build_id"]; !ok { - if buildID != "" { - tags["build_id"] = buildID - } - } createScanReq := &buildsecurity.CreateScanReq{ RepositoryID: bc.repoId, @@ -49,6 +38,8 @@ func (bc *TwirpClient) Upload(results []*buildsecurity.Result, tags map[string]s System: buildSystem, Tags: tags, TriggeredBy: scanner.MatchTriggeredBy(bc.c.String("triggered-by")), + Run: run, + BuildID: buildID, } _, err = client.CreateScan(ctx, createScanReq) diff --git a/pkg/proto/buildsecurity.proto b/pkg/proto/buildsecurity.proto index 8db22386..2ef5cb61 100644 --- a/pkg/proto/buildsecurity.proto +++ b/pkg/proto/buildsecurity.proto @@ -44,6 +44,8 @@ message CreateScanReq { repeated Result Results = 7; map Tags = 8; TriggeredByEnum TriggeredBy = 9; + string Run = 10; + string BuildID = 11; } enum TriggeredByEnum { diff --git a/pkg/proto/buildsecurity/buildsecurity.pb.go b/pkg/proto/buildsecurity/buildsecurity.pb.go index cdc0032c..8df74dc4 100644 --- a/pkg/proto/buildsecurity/buildsecurity.pb.go +++ b/pkg/proto/buildsecurity/buildsecurity.pb.go @@ -554,6 +554,8 @@ type CreateScanReq struct { Results []*Result `protobuf:"bytes,7,rep,name=Results,proto3" json:"Results,omitempty"` Tags map[string]string `protobuf:"bytes,8,rep,name=Tags,proto3" json:"Tags,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` TriggeredBy TriggeredByEnum `protobuf:"varint,9,opt,name=TriggeredBy,proto3,enum=buildsecurity.TriggeredByEnum" json:"TriggeredBy,omitempty"` + Run string `protobuf:"bytes,10,opt,name=Run,proto3" json:"Run,omitempty"` + BuildID string `protobuf:"bytes,11,opt,name=BuildID,proto3" json:"BuildID,omitempty"` } func (x *CreateScanReq) Reset() { @@ -644,6 +646,20 @@ func (x *CreateScanReq) GetTriggeredBy() TriggeredByEnum { return TriggeredByEnum_TRIGGERED_BY_UNKNOWN } +func (x *CreateScanReq) GetRun() string { + if x != nil { + return x.Run + } + return "" +} + +func (x *CreateScanReq) GetBuildID() string { + if x != nil { + return x.BuildID + } + return "" +} + type CreateScanResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1194,8 +1210,8 @@ var file_buildsecurity_proto_rawDesc = []byte{ 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x31, 0x0a, 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x50, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x52, 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x22, 0xf7, - 0x02, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, + 0x6c, 0x69, 0x63, 0x79, 0x52, 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x22, 0xa3, + 0x03, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x18, 0x02, @@ -1214,151 +1230,154 @@ var file_buildsecurity_proto_rawDesc = []byte{ 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x45, 0x6e, - 0x75, 0x6d, 0x52, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x1a, - 0x37, 0x0a, 0x09, 0x54, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x28, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x63, - 0x61, 0x6e, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x63, 0x61, 0x6e, - 0x49, 0x44, 0x22, 0xb9, 0x01, 0x0a, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1a, 0x0a, - 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x45, 0x6e, 0x66, - 0x6f, 0x72, 0x63, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x45, 0x6e, 0x66, - 0x6f, 0x72, 0x63, 0x65, 0x64, 0x12, 0x38, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, - 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x52, 0x08, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x12, - 0x3d, 0x0a, 0x0a, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, - 0x69, 0x74, 0x79, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x45, 0x6e, - 0x75, 0x6d, 0x52, 0x0a, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x96, - 0x01, 0x0a, 0x0d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x56, 0x44, 0x49, 0x44, 0x73, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x41, 0x56, 0x44, 0x49, 0x44, 0x73, 0x12, 0x37, - 0x0a, 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x1b, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, - 0x2e, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x08, 0x53, - 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x22, 0x76, 0x0a, 0x0c, 0x50, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x06, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x61, 0x73, 0x6f, - 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, - 0xeb, 0x06, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x56, - 0x44, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x56, 0x44, 0x49, 0x44, - 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x54, 0x79, - 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, - 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, - 0x54, 0x79, 0x70, 0x65, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x37, - 0x0a, 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, + 0x75, 0x6d, 0x52, 0x0b, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x52, 0x75, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x52, 0x75, + 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x44, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x44, 0x1a, 0x37, 0x0a, 0x09, 0x54, + 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x28, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, + 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x63, 0x61, 0x6e, 0x49, 0x44, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53, 0x63, 0x61, 0x6e, 0x49, 0x44, 0x22, 0xb9, + 0x01, 0x0a, 0x06, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f, 0x6c, + 0x69, 0x63, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6f, 0x6c, + 0x69, 0x63, 0x79, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, + 0x64, 0x12, 0x38, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x18, 0x03, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, + 0x69, 0x74, 0x79, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x52, 0x08, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x12, 0x3d, 0x0a, 0x0a, 0x50, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x1d, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, + 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0a, + 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x96, 0x01, 0x0a, 0x0d, 0x50, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x12, 0x1a, 0x0a, 0x08, + 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x56, 0x44, 0x49, 0x44, 0x73, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x06, 0x41, 0x56, 0x44, 0x49, 0x44, 0x73, 0x12, 0x37, 0x0a, 0x08, 0x53, 0x65, + 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x62, + 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x53, 0x65, 0x76, + 0x65, 0x72, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, + 0x69, 0x74, 0x79, 0x22, 0x76, 0x0a, 0x0c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x44, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x44, 0x12, + 0x1a, 0x0a, 0x08, 0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x08, 0x45, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x46, + 0x61, 0x69, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x46, 0x61, 0x69, + 0x6c, 0x65, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x22, 0xeb, 0x06, 0x0a, 0x06, + 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x56, 0x44, 0x49, 0x44, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x56, 0x44, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, + 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, + 0x72, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x54, 0x79, 0x70, 0x65, + 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x37, 0x0a, 0x08, 0x53, 0x65, + 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x62, + 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x53, 0x65, 0x76, + 0x65, 0x72, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, + 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x46, 0x69, 0x6c, + 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x46, 0x69, 0x6c, + 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x72, 0x74, 0x4c, 0x69, + 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x53, 0x74, 0x61, 0x72, 0x74, 0x4c, + 0x69, 0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x64, 0x4c, 0x69, 0x6e, 0x65, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x45, 0x6e, 0x64, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x0d, 0x50, 0x6f, 0x6c, + 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, - 0x2e, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x08, 0x53, - 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x74, 0x61, - 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x53, 0x74, - 0x61, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e, 0x64, 0x4c, 0x69, - 0x6e, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x45, 0x6e, 0x64, 0x4c, 0x69, 0x6e, - 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x41, 0x0a, - 0x0d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x0b, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, - 0x72, 0x69, 0x74, 0x79, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x52, 0x0d, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, - 0x12, 0x18, 0x0a, 0x07, 0x50, 0x6b, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x50, 0x6b, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x46, 0x69, - 0x78, 0x65, 0x64, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, - 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, - 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x56, 0x65, - 0x6e, 0x64, 0x6f, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x10, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1c, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, - 0x79, 0x2e, 0x56, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x52, - 0x0d, 0x56, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x24, - 0x0a, 0x0d, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, - 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, - 0x64, 0x44, 0x61, 0x74, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x50, 0x75, 0x62, - 0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x44, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x61, - 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x22, 0xbc, - 0x01, 0x0a, 0x08, 0x54, 0x79, 0x70, 0x65, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x0c, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x12, 0x0a, - 0x0e, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x52, 0x52, 0x41, 0x46, 0x4f, 0x52, 0x4d, 0x10, - 0x01, 0x12, 0x17, 0x0a, 0x13, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4c, 0x4f, 0x55, 0x44, 0x46, - 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x59, - 0x50, 0x45, 0x5f, 0x44, 0x4f, 0x43, 0x4b, 0x45, 0x52, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x03, 0x12, - 0x13, 0x0a, 0x0f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4b, 0x55, 0x42, 0x45, 0x52, 0x4e, 0x45, 0x54, - 0x45, 0x53, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x59, 0x41, 0x4d, - 0x4c, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x48, 0x43, 0x4c, 0x10, - 0x06, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x56, 0x55, 0x4c, 0x4e, 0x45, 0x52, - 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x49, 0x45, 0x53, 0x10, 0x07, 0x12, 0x10, 0x0a, 0x0c, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x53, 0x45, 0x43, 0x52, 0x45, 0x54, 0x53, 0x10, 0x08, 0x22, 0x9b, 0x01, - 0x0a, 0x0d, 0x56, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12, - 0x1e, 0x0a, 0x0a, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x18, 0x0a, 0x07, 0x56, 0x32, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, - 0x52, 0x07, 0x56, 0x32, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x56, 0x32, 0x56, - 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x56, 0x32, 0x56, - 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x33, 0x53, 0x63, 0x6f, 0x72, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x07, 0x56, 0x33, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x56, 0x33, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x56, 0x33, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2a, 0x71, 0x0a, 0x0f, 0x54, - 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x18, - 0x0a, 0x14, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x45, 0x44, 0x5f, 0x42, 0x59, 0x5f, 0x55, - 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x52, 0x49, 0x47, - 0x47, 0x45, 0x52, 0x45, 0x44, 0x5f, 0x42, 0x59, 0x5f, 0x50, 0x55, 0x53, 0x48, 0x10, 0x01, 0x12, - 0x13, 0x0a, 0x0f, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x45, 0x44, 0x5f, 0x42, 0x59, 0x5f, - 0x50, 0x52, 0x10, 0x02, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x45, - 0x44, 0x5f, 0x42, 0x59, 0x5f, 0x4f, 0x46, 0x46, 0x4c, 0x49, 0x4e, 0x45, 0x10, 0x03, 0x2a, 0x87, - 0x01, 0x0a, 0x0c, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x12, - 0x14, 0x0a, 0x10, 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, - 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, - 0x59, 0x5f, 0x4c, 0x4f, 0x57, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x45, 0x56, 0x45, 0x52, - 0x49, 0x54, 0x59, 0x5f, 0x4d, 0x45, 0x44, 0x49, 0x55, 0x4d, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, - 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x48, 0x49, 0x47, 0x48, 0x10, 0x03, 0x12, - 0x15, 0x0a, 0x11, 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x43, 0x52, 0x49, 0x54, - 0x49, 0x43, 0x41, 0x4c, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, - 0x54, 0x59, 0x5f, 0x4d, 0x41, 0x58, 0x10, 0x05, 0x2a, 0x45, 0x0a, 0x0e, 0x50, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x4f, - 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, - 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x59, 0x50, - 0x45, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x32, - 0xe2, 0x02, 0x0a, 0x0d, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, - 0x79, 0x12, 0x5b, 0x0a, 0x10, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x22, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, + 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x0d, 0x50, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, + 0x50, 0x6b, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x50, + 0x6b, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, + 0x6c, 0x65, 0x64, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x10, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x46, 0x69, 0x78, 0x65, 0x64, 0x56, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, + 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x0d, 0x56, 0x65, 0x6e, 0x64, 0x6f, 0x72, + 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, + 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x56, 0x65, + 0x6e, 0x64, 0x6f, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0d, 0x56, 0x65, 0x6e, + 0x64, 0x6f, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x75, + 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x11, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x73, 0x75, 0x70, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x44, + 0x12, 0x24, 0x0a, 0x0d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x65, 0x64, 0x44, 0x61, 0x74, + 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, + 0x65, 0x64, 0x44, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x61, 0x73, 0x74, 0x4d, 0x6f, + 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x4c, 0x61, + 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x22, 0xbc, 0x01, 0x0a, 0x08, 0x54, + 0x79, 0x70, 0x65, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, + 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x54, 0x59, 0x50, + 0x45, 0x5f, 0x54, 0x45, 0x52, 0x52, 0x41, 0x46, 0x4f, 0x52, 0x4d, 0x10, 0x01, 0x12, 0x17, 0x0a, + 0x13, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4c, 0x4f, 0x55, 0x44, 0x46, 0x4f, 0x52, 0x4d, 0x41, + 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, + 0x4f, 0x43, 0x4b, 0x45, 0x52, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x03, 0x12, 0x13, 0x0a, 0x0f, 0x54, + 0x59, 0x50, 0x45, 0x5f, 0x4b, 0x55, 0x42, 0x45, 0x52, 0x4e, 0x45, 0x54, 0x45, 0x53, 0x10, 0x04, + 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x59, 0x41, 0x4d, 0x4c, 0x10, 0x05, 0x12, + 0x0c, 0x0a, 0x08, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x48, 0x43, 0x4c, 0x10, 0x06, 0x12, 0x18, 0x0a, + 0x14, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x56, 0x55, 0x4c, 0x4e, 0x45, 0x52, 0x41, 0x42, 0x49, 0x4c, + 0x49, 0x54, 0x49, 0x45, 0x53, 0x10, 0x07, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x59, 0x50, 0x45, 0x5f, + 0x53, 0x45, 0x43, 0x52, 0x45, 0x54, 0x53, 0x10, 0x08, 0x22, 0x9b, 0x01, 0x0a, 0x0d, 0x56, 0x65, + 0x6e, 0x64, 0x6f, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x76, + 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0a, 0x76, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x56, + 0x32, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x07, 0x56, 0x32, + 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x56, 0x32, 0x56, 0x65, 0x63, 0x74, 0x6f, + 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x56, 0x32, 0x56, 0x65, 0x63, 0x74, 0x6f, + 0x72, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x33, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x02, 0x52, 0x07, 0x56, 0x33, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x56, + 0x33, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x56, + 0x33, 0x56, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2a, 0x71, 0x0a, 0x0f, 0x54, 0x72, 0x69, 0x67, 0x67, + 0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x14, 0x54, 0x52, + 0x49, 0x47, 0x47, 0x45, 0x52, 0x45, 0x44, 0x5f, 0x42, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, + 0x57, 0x4e, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x45, + 0x44, 0x5f, 0x42, 0x59, 0x5f, 0x50, 0x55, 0x53, 0x48, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x54, + 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x45, 0x44, 0x5f, 0x42, 0x59, 0x5f, 0x50, 0x52, 0x10, 0x02, + 0x12, 0x18, 0x0a, 0x14, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x45, 0x44, 0x5f, 0x42, 0x59, + 0x5f, 0x4f, 0x46, 0x46, 0x4c, 0x49, 0x4e, 0x45, 0x10, 0x03, 0x2a, 0x87, 0x01, 0x0a, 0x0c, 0x53, + 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x10, 0x53, + 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, + 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x4c, 0x4f, + 0x57, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, + 0x4d, 0x45, 0x44, 0x49, 0x55, 0x4d, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x45, 0x56, 0x45, + 0x52, 0x49, 0x54, 0x59, 0x5f, 0x48, 0x49, 0x47, 0x48, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x53, + 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x43, 0x52, 0x49, 0x54, 0x49, 0x43, 0x41, 0x4c, + 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x45, 0x56, 0x45, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x4d, + 0x41, 0x58, 0x10, 0x05, 0x2a, 0x45, 0x0a, 0x0e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, + 0x70, 0x65, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, + 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x00, 0x12, 0x1b, + 0x0a, 0x17, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x55, + 0x50, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x32, 0xe2, 0x02, 0x0a, 0x0d, + 0x42, 0x75, 0x69, 0x6c, 0x64, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x12, 0x5b, 0x0a, + 0x10, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, + 0x79, 0x12, 0x22, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, + 0x79, 0x2e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, + 0x72, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x62, 0x75, 0x69, 0x6c, - 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, - 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x5b, - 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, - 0x72, 0x79, 0x12, 0x22, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, + 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x5b, 0x0a, 0x10, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x22, + 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, + 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x23, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, - 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4c, 0x0a, 0x0b, 0x47, - 0x65, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x62, 0x75, 0x69, - 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6f, - 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1e, 0x2e, 0x62, 0x75, 0x69, 0x6c, - 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x6c, - 0x69, 0x63, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x49, 0x0a, 0x0a, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x12, 0x1c, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, - 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, - 0x61, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, - 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x61, 0x6e, - 0x52, 0x65, 0x73, 0x70, 0x42, 0x10, 0x5a, 0x0e, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, - 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4c, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x50, 0x6f, + 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, + 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, + 0x65, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1e, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, + 0x75, 0x72, 0x69, 0x74, 0x79, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x49, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, + 0x63, 0x61, 0x6e, 0x12, 0x1c, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, + 0x69, 0x74, 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x52, 0x65, + 0x71, 0x1a, 0x1d, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, + 0x79, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, + 0x42, 0x10, 0x5a, 0x0e, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, + 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/proto/buildsecurity/buildsecurity.twirp.go b/pkg/proto/buildsecurity/buildsecurity.twirp.go index 95c970a4..18b87171 100644 --- a/pkg/proto/buildsecurity/buildsecurity.twirp.go +++ b/pkg/proto/buildsecurity/buildsecurity.twirp.go @@ -1928,82 +1928,83 @@ func callClientError(ctx context.Context, h *twirp.ClientHooks, err twirp.Error) } var twirpFileDescriptor0 = []byte{ - // 1228 bytes of a gzipped FileDescriptorProto + // 1247 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcb, 0x6e, 0xdb, 0x46, 0x17, 0x0e, 0x75, 0xb3, 0x74, 0x2c, 0xc9, 0x93, 0xb1, 0x93, 0x10, 0x4e, 0x62, 0x18, 0xfc, 0x7f, - 0x14, 0x86, 0x0b, 0x38, 0xa8, 0xbc, 0x48, 0x10, 0xa0, 0x68, 0x75, 0xa1, 0x6c, 0x22, 0xd4, 0x05, - 0x43, 0x4a, 0xa9, 0xdb, 0x45, 0xc0, 0x48, 0x13, 0x87, 0x88, 0x4c, 0x32, 0x1c, 0xca, 0xa8, 0x9e, - 0xa0, 0x6f, 0xd0, 0x4d, 0x9f, 0xa4, 0x40, 0x9f, 0xa6, 0xdb, 0x3e, 0x40, 0xb7, 0xc5, 0xcc, 0x90, - 0x34, 0x29, 0x09, 0x69, 0xda, 0xee, 0xf8, 0x7d, 0xe7, 0x3b, 0x97, 0x39, 0x73, 0x66, 0x38, 0xb0, - 0xff, 0x76, 0xe9, 0x2e, 0xe6, 0x8c, 0xce, 0x96, 0xa1, 0x1b, 0xad, 0xce, 0x82, 0xd0, 0x8f, 0x7c, - 0xdc, 0xc8, 0x91, 0xda, 0x97, 0xb0, 0x6f, 0xfa, 0xfe, 0x87, 0x65, 0x40, 0x68, 0xe0, 0x33, 0x37, - 0xf2, 0xc3, 0x15, 0xa1, 0x1f, 0xf1, 0x01, 0x94, 0xad, 0xee, 0xc0, 0xe8, 0xa9, 0xca, 0xb1, 0x72, - 0x52, 0x23, 0x12, 0x68, 0x2f, 0xe1, 0x60, 0x53, 0xcc, 0x02, 0xac, 0x41, 0xfd, 0x8e, 0x31, 0x7a, - 0x6a, 0x41, 0x38, 0xe5, 0x38, 0xed, 0x1b, 0xd8, 0xef, 0x86, 0xd4, 0x89, 0xe8, 0x67, 0x24, 0xc2, - 0x18, 0x4a, 0x43, 0xe7, 0x86, 0xc6, 0x81, 0xc4, 0x37, 0x4f, 0xbe, 0x19, 0x60, 0x4b, 0x72, 0x65, - 0x4b, 0x72, 0x13, 0x9a, 0x17, 0x34, 0x1a, 0xfb, 0x0b, 0x77, 0xe6, 0x52, 0xc6, 0xf3, 0x7e, 0x86, - 0x17, 0x7e, 0x08, 0x95, 0x4e, 0xe8, 0x78, 0xb3, 0xf7, 0x71, 0x1d, 0x31, 0xd2, 0x7a, 0xb0, 0x97, - 0x8b, 0xc6, 0x02, 0xfc, 0x15, 0x54, 0x13, 0xac, 0x2a, 0xc7, 0xc5, 0x93, 0xdd, 0xd6, 0x83, 0xb3, - 0x7c, 0xf7, 0x85, 0x79, 0x45, 0x52, 0x99, 0xf6, 0x67, 0x01, 0x1a, 0x72, 0x41, 0xd6, 0xcc, 0xf1, - 0xfe, 0x63, 0x4d, 0xbc, 0x63, 0x13, 0x46, 0x43, 0xb5, 0x28, 0x3b, 0xc6, 0xbf, 0xb9, 0xd6, 0x5a, - 0xb1, 0x88, 0xde, 0xa8, 0x25, 0xa9, 0x95, 0x88, 0xf3, 0x5d, 0xff, 0xe6, 0xc6, 0x8d, 0xd4, 0xb2, - 0xe4, 0x25, 0xc2, 0xcf, 0x60, 0x87, 0x50, 0xb6, 0x5c, 0x44, 0x4c, 0xdd, 0xd9, 0xba, 0x06, 0x69, - 0x25, 0x89, 0x0a, 0xbf, 0x84, 0x92, 0xed, 0x5c, 0x33, 0xb5, 0x2a, 0xd4, 0x5f, 0xac, 0xa9, 0x73, - 0x8b, 0x3b, 0xe3, 0x42, 0xdd, 0x8b, 0xc2, 0x15, 0x11, 0x3e, 0xf8, 0x5b, 0xd8, 0xb5, 0x43, 0xf7, - 0xfa, 0x9a, 0x86, 0x74, 0xde, 0x59, 0xa9, 0xb5, 0x63, 0xe5, 0xa4, 0xd9, 0x3a, 0x5a, 0x0b, 0x91, - 0x51, 0xe8, 0xde, 0xf2, 0x86, 0x64, 0x5d, 0x0e, 0x9f, 0x43, 0x2d, 0x0d, 0x8a, 0x11, 0x14, 0x3f, - 0xd0, 0x55, 0xdc, 0x32, 0xfe, 0xc9, 0x27, 0xeb, 0xd6, 0x59, 0x2c, 0x93, 0x21, 0x92, 0xe0, 0x65, - 0xe1, 0x85, 0xa2, 0x9d, 0x40, 0x33, 0x5b, 0x1b, 0x0b, 0x44, 0xa7, 0x66, 0x8e, 0x97, 0xf6, 0x3c, - 0x46, 0xda, 0xaf, 0x0a, 0x54, 0xe4, 0xc6, 0xe1, 0xc3, 0x78, 0x87, 0xef, 0x36, 0x26, 0xc5, 0xdc, - 0xa6, 0x7b, 0xef, 0xfc, 0x70, 0x46, 0xe7, 0x22, 0x5b, 0x95, 0xa4, 0x18, 0xbf, 0x80, 0x6a, 0xd7, - 0xf7, 0xa2, 0xd0, 0x5f, 0x30, 0xb5, 0x28, 0xfa, 0xf4, 0x64, 0xeb, 0x64, 0xc4, 0x22, 0x92, 0xaa, - 0xf1, 0xd7, 0x00, 0xd2, 0x64, 0xaf, 0x02, 0x2a, 0xb6, 0xb0, 0xd9, 0x7a, 0xba, 0xd5, 0x97, 0x0b, - 0x44, 0x7f, 0x32, 0x0e, 0xda, 0xcf, 0x0a, 0x34, 0x72, 0xa1, 0xc5, 0x12, 0x42, 0xff, 0xd6, 0x9d, - 0xd3, 0x30, 0x5d, 0x42, 0x8c, 0xb1, 0x0a, 0x3b, 0x16, 0x0d, 0x6f, 0xdd, 0x59, 0xd2, 0xaf, 0x04, - 0xf2, 0xde, 0xb4, 0xa7, 0x3d, 0xa3, 0x27, 0xcb, 0xaf, 0x91, 0x18, 0xe1, 0xe7, 0x50, 0xb5, 0xe8, - 0x2d, 0xe5, 0x65, 0xc4, 0xc5, 0x3d, 0x5e, 0x2b, 0x2e, 0x31, 0x8b, 0xd2, 0x52, 0xb1, 0x76, 0x0b, - 0xf5, 0xf8, 0x30, 0x88, 0x31, 0xfa, 0xd7, 0x9d, 0x7d, 0x08, 0x95, 0xbe, 0xe3, 0x2e, 0xe8, 0x5c, - 0x0c, 0x7d, 0x95, 0xc4, 0x88, 0xf3, 0x84, 0x3a, 0xcc, 0xf7, 0x92, 0xb1, 0x97, 0x48, 0xfb, 0xa3, - 0xc2, 0x0d, 0x22, 0xe5, 0x01, 0x94, 0xc5, 0x2a, 0x92, 0x5b, 0x47, 0x00, 0xde, 0x83, 0x01, 0x65, - 0xcc, 0xb9, 0x4e, 0x7b, 0x10, 0x43, 0xdc, 0x82, 0x52, 0x66, 0x13, 0x8e, 0xb6, 0x1e, 0x8b, 0xb3, - 0x74, 0x17, 0x84, 0x36, 0xd7, 0x9f, 0xf2, 0x3f, 0xe8, 0x0f, 0x2f, 0xce, 0x76, 0xa3, 0x05, 0x55, - 0x2b, 0xb2, 0x38, 0x01, 0x78, 0x27, 0xfa, 0xee, 0x82, 0x7a, 0xfc, 0x5a, 0xdc, 0x91, 0x5d, 0x4a, - 0x30, 0x7e, 0x02, 0x35, 0x2b, 0x72, 0xc2, 0xc8, 0x74, 0x3d, 0xaa, 0x56, 0x8f, 0x95, 0x93, 0x32, - 0xb9, 0x23, 0xf8, 0xb2, 0x74, 0x6f, 0x2e, 0x6c, 0x35, 0x61, 0x4b, 0x20, 0x8f, 0x49, 0x28, 0xf3, - 0x97, 0xe1, 0x8c, 0xaa, 0x20, 0x63, 0x26, 0x18, 0xb7, 0x93, 0xe9, 0x49, 0xae, 0x84, 0x5d, 0x31, - 0xbc, 0x8f, 0xb7, 0x5f, 0x6b, 0xf2, 0x62, 0xc8, 0x7b, 0xf0, 0xc4, 0xe3, 0x0f, 0xd7, 0xe2, 0x22, - 0xaf, 0xcb, 0x7e, 0xc6, 0x10, 0x9f, 0x02, 0x32, 0x3c, 0x16, 0x39, 0x8b, 0x05, 0x9d, 0x4f, 0x69, - 0xc8, 0x5c, 0xdf, 0x53, 0x1b, 0x42, 0xb2, 0xc1, 0xf3, 0x5b, 0xb1, 0xef, 0xfe, 0x78, 0xa7, 0x6b, - 0xca, 0x5b, 0x31, 0xcb, 0xe1, 0x23, 0x80, 0x9e, 0x13, 0x39, 0x96, 0x5c, 0xca, 0x9e, 0x50, 0x64, - 0x18, 0xdc, 0x81, 0xc6, 0x94, 0x7a, 0x73, 0x3f, 0xb4, 0x66, 0x7e, 0xe8, 0x7a, 0xd7, 0x2a, 0xda, - 0x7a, 0x12, 0x73, 0x1a, 0x92, 0x77, 0xc1, 0xff, 0x87, 0x06, 0x5b, 0x06, 0x41, 0x48, 0x19, 0x4f, - 0x69, 0xf4, 0xd4, 0xfb, 0x22, 0x4d, 0x9e, 0xe4, 0xaa, 0xf1, 0xf2, 0xed, 0xc2, 0x65, 0xef, 0xe9, - 0xbc, 0xe7, 0x44, 0x54, 0xc5, 0xc7, 0xca, 0x49, 0x91, 0xe4, 0x49, 0xbe, 0x26, 0xd3, 0x61, 0xd1, - 0xc0, 0x9f, 0xbb, 0xef, 0x5c, 0x3a, 0x57, 0xf7, 0x85, 0x28, 0xc7, 0x69, 0xbf, 0x29, 0x50, 0x4d, - 0x46, 0x0a, 0x23, 0xa8, 0xdb, 0x57, 0x63, 0xfd, 0xcd, 0x64, 0xf8, 0x6a, 0x38, 0x7a, 0x3d, 0x44, - 0xf7, 0x30, 0x86, 0xa6, 0x60, 0x6c, 0x9d, 0x90, 0x76, 0x7f, 0x44, 0x06, 0x48, 0xc1, 0x8f, 0x60, - 0x5f, 0x70, 0x5d, 0x73, 0x34, 0xe9, 0x71, 0xae, 0x6d, 0x1b, 0xa3, 0x21, 0x2a, 0xe0, 0x7d, 0xd8, - 0x13, 0x86, 0xde, 0xa8, 0xfb, 0x4a, 0x27, 0x7d, 0xc3, 0xd4, 0x51, 0x31, 0x25, 0x5f, 0x4d, 0x3a, - 0x3a, 0x19, 0xea, 0xb6, 0x6e, 0xa1, 0x12, 0x6e, 0x40, 0x4d, 0x90, 0x57, 0xed, 0x81, 0x89, 0xca, - 0xb8, 0x0e, 0x55, 0x01, 0x2f, 0xbb, 0x26, 0xaa, 0x60, 0x15, 0x0e, 0x04, 0x9a, 0x4e, 0xcc, 0xa1, - 0x4e, 0xda, 0x1d, 0xc3, 0x34, 0x6c, 0x43, 0xb7, 0xd0, 0x4e, 0x5a, 0x9f, 0xa5, 0x77, 0x89, 0x6e, - 0x5b, 0xa8, 0xaa, 0xfd, 0xa2, 0xac, 0xf5, 0x9c, 0x6f, 0xd2, 0xad, 0x20, 0xc4, 0x44, 0xc8, 0x93, - 0x97, 0x61, 0xf8, 0xb8, 0x4c, 0x5b, 0x5c, 0x2c, 0x8f, 0x5f, 0x81, 0x24, 0x90, 0xcf, 0xe9, 0xb4, - 0x35, 0xa5, 0xb3, 0xc8, 0x4f, 0x7e, 0x70, 0x29, 0x16, 0x5e, 0xe7, 0xd2, 0xab, 0x14, 0x7b, 0x9d, - 0xdf, 0x79, 0x9d, 0xc7, 0x5e, 0xe5, 0xd8, 0x2b, 0xc6, 0xa7, 0x1f, 0x61, 0x6f, 0xed, 0xdf, 0x22, - 0x16, 0x47, 0x8c, 0x8b, 0x0b, 0x9d, 0xe8, 0xbd, 0x37, 0x9d, 0xab, 0x4c, 0xab, 0x1f, 0xc0, 0xfd, - 0x9c, 0x65, 0x3c, 0xb1, 0x2e, 0x91, 0x22, 0xfa, 0x97, 0xa3, 0x09, 0x2a, 0x6c, 0x44, 0x19, 0xf5, - 0xfb, 0xa6, 0x31, 0xd4, 0x51, 0xf1, 0xf4, 0x27, 0x05, 0xea, 0xd9, 0x13, 0x8f, 0x0f, 0x00, 0x59, - 0xfa, 0x54, 0x27, 0x86, 0x9d, 0x4d, 0x86, 0xa0, 0x9e, 0xb2, 0xe6, 0xe8, 0xb5, 0xcc, 0x93, 0x32, - 0x03, 0xbd, 0x67, 0x4c, 0x06, 0xa8, 0x80, 0xef, 0x43, 0x23, 0x25, 0x2f, 0x8d, 0x8b, 0x4b, 0x54, - 0xe4, 0x65, 0xa6, 0x54, 0x97, 0x18, 0xb6, 0xd1, 0x6d, 0x9b, 0xa8, 0x94, 0x0b, 0x38, 0x68, 0x7f, - 0x87, 0xca, 0xa7, 0x3a, 0x34, 0xf3, 0xff, 0x0d, 0xfc, 0x10, 0xf0, 0x78, 0x64, 0x1a, 0xdd, 0xab, - 0x37, 0x62, 0x17, 0xe5, 0x37, 0xba, 0x87, 0x1f, 0xc3, 0xa3, 0x2c, 0x6f, 0x4d, 0xc6, 0x63, 0xa2, - 0x5b, 0x16, 0x1f, 0x2a, 0xa5, 0xf5, 0x7b, 0x01, 0x1a, 0x1d, 0x7e, 0x7e, 0xac, 0xf8, 0xfc, 0xe0, - 0x1f, 0x00, 0xad, 0xbf, 0x0f, 0xb1, 0xb6, 0x76, 0xc6, 0xb6, 0xbc, 0x36, 0x0f, 0xff, 0xf7, 0xb7, - 0x1a, 0x16, 0xf0, 0xe0, 0xeb, 0xef, 0xbf, 0x8d, 0xe0, 0x5b, 0x5e, 0x98, 0x1b, 0xc1, 0xb7, 0x3e, - 0x22, 0x4d, 0xd8, 0xcd, 0x3c, 0xe9, 0xf0, 0xfa, 0x6f, 0x36, 0xff, 0x78, 0x3c, 0x3c, 0xfa, 0x94, - 0x99, 0x05, 0xd8, 0x00, 0xb8, 0x7b, 0x60, 0xe0, 0x27, 0x9f, 0x7a, 0x17, 0x1d, 0x3e, 0xfd, 0x84, - 0x95, 0x05, 0x1d, 0xf4, 0x7d, 0xf3, 0x59, 0x4e, 0xf0, 0xb6, 0x22, 0xde, 0xf1, 0xe7, 0x7f, 0x05, - 0x00, 0x00, 0xff, 0xff, 0x05, 0x01, 0x18, 0x61, 0xde, 0x0b, 0x00, 0x00, + 0x14, 0x86, 0x0b, 0x38, 0xa8, 0xbc, 0x48, 0x10, 0xa0, 0x68, 0x25, 0x91, 0xb2, 0x89, 0x50, 0x17, + 0x0c, 0x25, 0xa5, 0x6e, 0x17, 0x01, 0x23, 0x4d, 0x1c, 0x22, 0x32, 0xc9, 0x70, 0x28, 0xa3, 0x7a, + 0x82, 0xbe, 0x41, 0x37, 0x5d, 0xf6, 0x29, 0x0a, 0xf4, 0x69, 0xba, 0xed, 0x4b, 0x14, 0x33, 0x43, + 0xd2, 0xa4, 0x24, 0xa4, 0x69, 0xbb, 0xe3, 0xf7, 0x9d, 0xef, 0xcc, 0xb9, 0xcc, 0x99, 0xe1, 0xc0, + 0xfe, 0xdb, 0xa5, 0xbb, 0x98, 0x33, 0x3a, 0x5b, 0x86, 0x6e, 0xb4, 0x3a, 0x0b, 0x42, 0x3f, 0xf2, + 0x71, 0x23, 0x47, 0x6a, 0x5f, 0xc2, 0xbe, 0xe5, 0xfb, 0x1f, 0x96, 0x01, 0xa1, 0x81, 0xcf, 0xdc, + 0xc8, 0x0f, 0x57, 0x84, 0x7e, 0xc4, 0x07, 0x50, 0xb6, 0xbb, 0x7d, 0x53, 0x57, 0x95, 0x63, 0xe5, + 0xa4, 0x46, 0x24, 0xd0, 0x5e, 0xc2, 0xc1, 0xa6, 0x98, 0x05, 0x58, 0x83, 0xfa, 0x1d, 0x63, 0xea, + 0x6a, 0x41, 0x38, 0xe5, 0x38, 0xed, 0x1b, 0xd8, 0xef, 0x86, 0xd4, 0x89, 0xe8, 0x67, 0x04, 0xc2, + 0x18, 0x4a, 0x03, 0xe7, 0x86, 0xc6, 0x0b, 0x89, 0x6f, 0x1e, 0x7c, 0x73, 0x81, 0x2d, 0xc1, 0x95, + 0x2d, 0xc1, 0x2d, 0x68, 0x5e, 0xd0, 0x68, 0xe4, 0x2f, 0xdc, 0x99, 0x4b, 0x19, 0x8f, 0xfb, 0x19, + 0x5e, 0xf8, 0x21, 0x54, 0x3a, 0xa1, 0xe3, 0xcd, 0xde, 0xc7, 0x79, 0xc4, 0x48, 0xd3, 0x61, 0x2f, + 0xb7, 0x1a, 0x0b, 0xf0, 0x57, 0x50, 0x4d, 0xb0, 0xaa, 0x1c, 0x17, 0x4f, 0x76, 0x5b, 0x0f, 0xce, + 0xf2, 0xdd, 0x17, 0xe6, 0x15, 0x49, 0x65, 0xda, 0xaf, 0x45, 0x68, 0xc8, 0x82, 0xec, 0x99, 0xe3, + 0xfd, 0xc7, 0x9c, 0x78, 0xc7, 0x26, 0x8c, 0x86, 0x6a, 0x51, 0x76, 0x8c, 0x7f, 0x73, 0xad, 0xbd, + 0x62, 0x11, 0xbd, 0x51, 0x4b, 0x52, 0x2b, 0x11, 0xe7, 0xbb, 0xfe, 0xcd, 0x8d, 0x1b, 0xa9, 0x65, + 0xc9, 0x4b, 0x84, 0x9f, 0xc1, 0x0e, 0xa1, 0x6c, 0xb9, 0x88, 0x98, 0xba, 0xb3, 0xb5, 0x06, 0x69, + 0x25, 0x89, 0x0a, 0xbf, 0x84, 0xd2, 0xd8, 0xb9, 0x66, 0x6a, 0x55, 0xa8, 0xbf, 0x58, 0x53, 0xe7, + 0x8a, 0x3b, 0xe3, 0x42, 0xc3, 0x8b, 0xc2, 0x15, 0x11, 0x3e, 0xf8, 0x5b, 0xd8, 0x1d, 0x87, 0xee, + 0xf5, 0x35, 0x0d, 0xe9, 0xbc, 0xb3, 0x52, 0x6b, 0xc7, 0xca, 0x49, 0xb3, 0x75, 0xb4, 0xb6, 0x44, + 0x46, 0x61, 0x78, 0xcb, 0x1b, 0x92, 0x75, 0xc1, 0x08, 0x8a, 0x64, 0xe9, 0xa9, 0x20, 0x6a, 0xe0, + 0x9f, 0x58, 0x85, 0x9d, 0x0e, 0xf7, 0x37, 0x75, 0x75, 0x57, 0xb0, 0x09, 0x3c, 0x7c, 0x0e, 0xb5, + 0x34, 0x01, 0xee, 0xf8, 0x81, 0xae, 0xe2, 0xf6, 0xf2, 0x4f, 0x3e, 0x85, 0xb7, 0xce, 0x62, 0x99, + 0x0c, 0x9c, 0x04, 0x2f, 0x0b, 0x2f, 0x14, 0xed, 0x04, 0x9a, 0xd9, 0x3a, 0x58, 0x20, 0xba, 0x3a, + 0x73, 0xbc, 0x74, 0x7f, 0x62, 0xa4, 0xfd, 0xa6, 0x40, 0x45, 0x6e, 0x32, 0x3e, 0x8c, 0xa7, 0xe1, + 0x6e, 0x13, 0x53, 0xcc, 0x6d, 0x86, 0xf7, 0xce, 0x0f, 0x67, 0x74, 0x2e, 0xa2, 0x55, 0x49, 0x8a, + 0xf1, 0x0b, 0xa8, 0x76, 0x7d, 0x2f, 0x0a, 0xfd, 0x05, 0x53, 0x8b, 0xa2, 0xa7, 0x4f, 0xb6, 0x4e, + 0x51, 0x2c, 0x22, 0xa9, 0x1a, 0x7f, 0x0d, 0x20, 0x4d, 0xe3, 0x55, 0x40, 0xc5, 0x76, 0x37, 0x5b, + 0x4f, 0xb7, 0xfa, 0x72, 0x81, 0xe8, 0x65, 0xc6, 0x41, 0xfb, 0x59, 0x81, 0x46, 0x6e, 0x69, 0x51, + 0x42, 0xe8, 0xdf, 0xba, 0x73, 0x1a, 0xa6, 0x25, 0xc4, 0x98, 0xb7, 0xd9, 0xa6, 0xe1, 0xad, 0x3b, + 0x4b, 0xfa, 0x95, 0x40, 0xde, 0x9b, 0xf6, 0x54, 0x37, 0x75, 0x99, 0x7e, 0x8d, 0xc4, 0x08, 0x3f, + 0x87, 0xaa, 0x4d, 0x6f, 0x29, 0x4f, 0x23, 0x4e, 0xee, 0xf1, 0x5a, 0x72, 0x89, 0x59, 0xa4, 0x96, + 0x8a, 0xb5, 0x5b, 0xa8, 0xc7, 0x07, 0x47, 0x8c, 0xdc, 0xbf, 0xee, 0xec, 0x43, 0xa8, 0xf4, 0x1c, + 0x77, 0x41, 0xe7, 0xe2, 0x80, 0x54, 0x49, 0x8c, 0x38, 0x4f, 0xa8, 0xc3, 0x7c, 0x2f, 0x39, 0x22, + 0x12, 0x69, 0x7f, 0x56, 0xb8, 0x41, 0x84, 0x3c, 0x80, 0xb2, 0xa8, 0x22, 0xb9, 0xa1, 0x04, 0xe0, + 0x3d, 0xe8, 0x53, 0xc6, 0x9c, 0xeb, 0xb4, 0x07, 0x31, 0xc4, 0x2d, 0x28, 0x65, 0x36, 0xe1, 0x68, + 0xeb, 0x11, 0x3a, 0x4b, 0x77, 0x41, 0x68, 0x73, 0xfd, 0x29, 0xff, 0x83, 0xfe, 0xf0, 0xe4, 0xc6, + 0x6e, 0xb4, 0xa0, 0x6a, 0x45, 0x26, 0x27, 0x00, 0xef, 0x44, 0xcf, 0x5d, 0x50, 0x8f, 0x5f, 0xa1, + 0x3b, 0xb2, 0x4b, 0x09, 0xc6, 0x4f, 0xa0, 0x66, 0x47, 0x4e, 0x18, 0x59, 0xae, 0x47, 0xd5, 0xea, + 0xb1, 0x72, 0x52, 0x26, 0x77, 0x04, 0x2f, 0xcb, 0xf0, 0xe6, 0xc2, 0x56, 0x13, 0xb6, 0x04, 0xf2, + 0x35, 0x09, 0x65, 0xfe, 0x32, 0x9c, 0xd1, 0xf8, 0xc8, 0xa5, 0x18, 0xb7, 0x93, 0xe9, 0x49, 0xae, + 0x8f, 0x5d, 0x31, 0xbc, 0x8f, 0xb7, 0x5f, 0x81, 0xf2, 0x12, 0xc9, 0x7b, 0xf0, 0xc0, 0xa3, 0x0f, + 0xd7, 0xe2, 0xd2, 0xaf, 0xcb, 0x7e, 0xc6, 0x10, 0x9f, 0x02, 0x32, 0x3d, 0x16, 0x39, 0x8b, 0x05, + 0x9d, 0x4f, 0x69, 0xc8, 0x5c, 0xdf, 0x53, 0x1b, 0x42, 0xb2, 0xc1, 0xf3, 0x1b, 0xb4, 0xe7, 0xfe, + 0x78, 0xa7, 0x6b, 0xca, 0x1b, 0x34, 0xcb, 0xe1, 0x23, 0x00, 0xdd, 0x89, 0x1c, 0x5b, 0x96, 0xb2, + 0x27, 0x14, 0x19, 0x06, 0x77, 0xa0, 0x31, 0xa5, 0xde, 0xdc, 0x0f, 0xed, 0x99, 0x1f, 0xba, 0xde, + 0xb5, 0x8a, 0xb6, 0x9e, 0xc4, 0x9c, 0x86, 0xe4, 0x5d, 0xf0, 0xff, 0xa1, 0xc1, 0x96, 0x41, 0x10, + 0x52, 0xc6, 0x43, 0x9a, 0xba, 0x7a, 0x5f, 0x84, 0xc9, 0x93, 0x5c, 0x35, 0x5a, 0xbe, 0x5d, 0xb8, + 0xec, 0x3d, 0x9d, 0xeb, 0x4e, 0x44, 0x55, 0x7c, 0xac, 0x9c, 0x14, 0x49, 0x9e, 0xe4, 0x35, 0x59, + 0x0e, 0x8b, 0xfa, 0xfe, 0xdc, 0x7d, 0xe7, 0xd2, 0xb9, 0xba, 0x2f, 0x44, 0x39, 0x4e, 0xfb, 0x5d, + 0x81, 0x6a, 0x32, 0x52, 0x18, 0x41, 0x7d, 0x7c, 0x35, 0x32, 0xde, 0x4c, 0x06, 0xaf, 0x06, 0xc3, + 0xd7, 0x03, 0x74, 0x0f, 0x63, 0x68, 0x0a, 0x66, 0x6c, 0x10, 0xd2, 0xee, 0x0d, 0x49, 0x1f, 0x29, + 0xf8, 0x11, 0xec, 0x0b, 0xae, 0x6b, 0x0d, 0x27, 0x3a, 0xe7, 0xda, 0x63, 0x73, 0x38, 0x40, 0x05, + 0xbc, 0x0f, 0x7b, 0xc2, 0xa0, 0x0f, 0xbb, 0xaf, 0x0c, 0xd2, 0x33, 0x2d, 0x03, 0x15, 0x53, 0xf2, + 0xd5, 0xa4, 0x63, 0x90, 0x81, 0x31, 0x36, 0x6c, 0x54, 0xc2, 0x0d, 0xa8, 0x09, 0xf2, 0xaa, 0xdd, + 0xb7, 0x50, 0x19, 0xd7, 0xa1, 0x2a, 0xe0, 0x65, 0xd7, 0x42, 0x15, 0xac, 0xc2, 0x81, 0x40, 0xd3, + 0x89, 0x35, 0x30, 0x48, 0xbb, 0x63, 0x5a, 0xe6, 0xd8, 0x34, 0x6c, 0xb4, 0x93, 0xe6, 0x67, 0x1b, + 0x5d, 0x62, 0x8c, 0x6d, 0x54, 0xd5, 0x7e, 0x51, 0xd6, 0x7a, 0xce, 0x37, 0xe9, 0x56, 0x10, 0x62, + 0x22, 0xe4, 0xc9, 0xcb, 0x30, 0x7c, 0x5c, 0xa6, 0x2d, 0x2e, 0x96, 0xc7, 0xaf, 0x40, 0x12, 0xc8, + 0xe7, 0x74, 0xda, 0x9a, 0xd2, 0x59, 0xe4, 0x27, 0x3f, 0xc3, 0x14, 0x0b, 0xaf, 0x73, 0xe9, 0x55, + 0x8a, 0xbd, 0xce, 0xef, 0xbc, 0xce, 0x63, 0xaf, 0x72, 0xec, 0x15, 0xe3, 0xd3, 0x8f, 0xb0, 0xb7, + 0xf6, 0x1f, 0x12, 0xc5, 0x11, 0xf3, 0xe2, 0xc2, 0x20, 0x86, 0xfe, 0xa6, 0x73, 0x95, 0x69, 0xf5, + 0x03, 0xb8, 0x9f, 0xb3, 0x8c, 0x26, 0xf6, 0x25, 0x52, 0x44, 0xff, 0x72, 0x34, 0x41, 0x85, 0x8d, + 0x55, 0x86, 0xbd, 0x9e, 0x65, 0x0e, 0x0c, 0x54, 0x3c, 0xfd, 0x49, 0x81, 0x7a, 0xf6, 0xc4, 0xe3, + 0x03, 0x40, 0xb6, 0x31, 0x35, 0x88, 0x39, 0xce, 0x06, 0x43, 0x50, 0x4f, 0x59, 0x6b, 0xf8, 0x5a, + 0xc6, 0x49, 0x99, 0xbe, 0xa1, 0x9b, 0x93, 0x3e, 0x2a, 0xe0, 0xfb, 0xd0, 0x48, 0xc9, 0x4b, 0xf3, + 0xe2, 0x12, 0x15, 0x79, 0x9a, 0x29, 0xd5, 0x25, 0xe6, 0xd8, 0xec, 0xb6, 0x2d, 0x54, 0xca, 0x2d, + 0xd8, 0x6f, 0x7f, 0x87, 0xca, 0xa7, 0x06, 0x34, 0xf3, 0xff, 0x0d, 0xfc, 0x10, 0xf0, 0x68, 0x68, + 0x99, 0xdd, 0xab, 0x37, 0x62, 0x17, 0xe5, 0x37, 0xba, 0x87, 0x1f, 0xc3, 0xa3, 0x2c, 0x6f, 0x4f, + 0x46, 0x23, 0x62, 0xd8, 0x36, 0x1f, 0x2a, 0xa5, 0xf5, 0x47, 0x01, 0x1a, 0xe2, 0x5f, 0x6c, 0xc7, + 0xe7, 0x07, 0xff, 0x00, 0x68, 0xfd, 0x2d, 0x89, 0xb5, 0xb5, 0x33, 0xb6, 0xe5, 0x65, 0x7a, 0xf8, + 0xbf, 0xbf, 0xd5, 0xb0, 0x80, 0x2f, 0xbe, 0xfe, 0x56, 0xdc, 0x58, 0x7c, 0xcb, 0x6b, 0x74, 0x63, + 0xf1, 0xad, 0x0f, 0x4e, 0x0b, 0x76, 0x33, 0xcf, 0x3f, 0xbc, 0xfe, 0x9b, 0xcd, 0x3f, 0x34, 0x0f, + 0x8f, 0x3e, 0x65, 0x66, 0x01, 0x36, 0x01, 0xee, 0x1e, 0x18, 0xf8, 0xc9, 0xa7, 0xde, 0x50, 0x87, + 0x4f, 0x3f, 0x61, 0x65, 0x41, 0x07, 0x7d, 0xdf, 0x7c, 0x96, 0x13, 0xbc, 0xad, 0x88, 0x37, 0xff, + 0xf9, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x19, 0x84, 0xfb, 0x0a, 0x0c, 0x00, 0x00, } diff --git a/pkg/scanner/diff.go b/pkg/scanner/diff.go index 63a2ca4d..38f5ed70 100644 --- a/pkg/scanner/diff.go +++ b/pkg/scanner/diff.go @@ -48,15 +48,11 @@ func writeFile(path, content string) error { // Create folders with head and base for diff scanning func createDiffScanFs() error { var fileName string - err := os.MkdirAll(aquaPath, os.ModePerm) - if err != nil { - return errors.Wrap(err, "failed create aqua tmp dir") - } // In GitHub we need fetch the remote branch first if os.Getenv("GITHUB_BASE_REF") != "" { // In GitHub trivy action container we need safe directory to run git fetch - _, err = gitExec("config", "--global", "--add", "safe.directory", "/github/workspace") + _, err := gitExec("config", "--global", "--add", "safe.directory", "/github/workspace") if err != nil { return errors.Wrap(err, "failed git fetch ref") } diff --git a/pkg/scanner/scanner.go b/pkg/scanner/scanner.go index 85ef8c0c..3de61d41 100644 --- a/pkg/scanner/scanner.go +++ b/pkg/scanner/scanner.go @@ -38,6 +38,10 @@ var secretsConfig string func Scan(c *cli.Context, path string) (trivyTypes.Results, error) { var initializeScanner artifact.InitializeScanner + err := os.MkdirAll(aquaPath, os.ModePerm) + if err != nil { + return nil, errors.Wrap(err, "failed create aqua tmp dir") + } switch c.Command.Name { case "image": initializeScanner = imageScanner(path) @@ -58,10 +62,6 @@ func Scan(c *cli.Context, path string) (trivyTypes.Results, error) { } if hasSecurityCheck(opt.SecurityChecks, trivyTypes.SecurityCheckSecret) { - err := os.MkdirAll(aquaPath, os.ModePerm) - if err != nil { - return nil, errors.Wrap(err, "failed create aqua tmp dir") - } configPath := filepath.Join(aquaPath, "trivy-secret.yaml") err = writeFile(configPath, secretsConfig) if err != nil {