diff options
authorJenkins <>2016-11-14 23:51:23 +0000
committerGerrit Code Review <>2016-11-14 23:51:23 +0000
commitad691505e10610a1848af545c950528dbb7ec467 (patch)
parent66c784eb77a60ef7a170928e254854e8292daa07 (diff)
parent2c7a59a9c63d2abee0ca3833334c3e17183abb01 (diff)
Merge "Add dict mapping for searching for things"HEADmaster
2 files changed, 34 insertions, 21 deletions
diff --git a/oaktreemodel/common.pb.go b/oaktreemodel/common.pb.go
index ae5e3c9..dfd3f74 100644
--- a/oaktreemodel/common.pb.go
+++ b/oaktreemodel/common.pb.go
@@ -240,9 +240,10 @@ func (m *Location) GetProject() *Project {
240} 240}
241 241
242type Filter struct { 242type Filter struct {
243 Location *Location `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"` 243 Location *Location `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"`
244 NameOrId string `protobuf:"bytes,2,opt,name=name_or_id,json=nameOrId" json:"name_or_id,omitempty"` 244 NameOrId string `protobuf:"bytes,2,opt,name=name_or_id,json=nameOrId" json:"name_or_id,omitempty"`
245 Jmespath string `protobuf:"bytes,3,opt,name=jmespath" json:"jmespath,omitempty"` 245 Jmespath string `protobuf:"bytes,3,opt,name=jmespath" json:"jmespath,omitempty"`
246 Filter map[string]string `protobuf:"bytes,4,rep,name=filter" json:"filter,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
246} 247}
247 248
248func (m *Filter) Reset() { *m = Filter{} } 249func (m *Filter) Reset() { *m = Filter{} }
@@ -257,6 +258,13 @@ func (m *Filter) GetLocation() *Location {
257 return nil 258 return nil
258} 259}
259 260
261func (m *Filter) GetFilter() map[string]string {
262 if m != nil {
263 return m.Filter
264 }
265 return nil
260func init() { 268func init() {
261 proto.RegisterType((*Project)(nil), "oaktree.Project") 269 proto.RegisterType((*Project)(nil), "oaktree.Project")
262 proto.RegisterType((*Location)(nil), "oaktree.Location") 270 proto.RegisterType((*Location)(nil), "oaktree.Location")
@@ -266,22 +274,26 @@ func init() {
266func init() { proto.RegisterFile("common.proto", fileDescriptor0) } 274func init() { proto.RegisterFile("common.proto", fileDescriptor0) }
267 275
268var fileDescriptor0 = []byte{ 276var fileDescriptor0 = []byte{
269 // 269 bytes of a gzipped FileDescriptorProto 277 // 326 bytes of a gzipped FileDescriptorProto
270 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x3c, 0x91, 0xc1, 0x4a, 0xc4, 0x30, 278 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x91, 0xc1, 0x4e, 0xf3, 0x30,
271 0x10, 0x86, 0xed, 0x5a, 0xdb, 0x74, 0xea, 0x61, 0x1d, 0x44, 0x16, 0x51, 0xd0, 0x9e, 0x44, 0xb0, 279 0x0c, 0xc7, 0xbf, 0x6e, 0xfb, 0xba, 0xce, 0xe5, 0x30, 0x2c, 0x84, 0xa6, 0x01, 0x12, 0xec, 0x84,
272 0x87, 0xf5, 0x0d, 0xf6, 0x20, 0x0a, 0xa2, 0x92, 0x17, 0x58, 0x62, 0x1b, 0xb4, 0x6b, 0x93, 0xa9, 280 0x90, 0xd8, 0x61, 0xbb, 0x00, 0xc7, 0x49, 0x20, 0x90, 0x10, 0xa0, 0xbc, 0xc0, 0x14, 0xba, 0x00,
273 0x31, 0x82, 0xf8, 0x04, 0x3e, 0xb6, 0x69, 0x92, 0xf6, 0x96, 0xf9, 0xff, 0x3f, 0xfc, 0xdf, 0x24, 281 0xdd, 0xda, 0xb8, 0x0a, 0x19, 0x62, 0x3c, 0x01, 0xaf, 0xc9, 0x9b, 0x90, 0x26, 0x5e, 0xc5, 0x29,
274 0x70, 0xd8, 0x90, 0x52, 0xa4, 0xeb, 0xc1, 0x90, 0x25, 0xcc, 0x49, 0x7c, 0x58, 0x23, 0x65, 0xf5, 282 0xf6, 0xdf, 0x8e, 0xfe, 0x3f, 0xdb, 0xb0, 0x93, 0x51, 0x59, 0x92, 0x1e, 0x57, 0x86, 0x2c, 0x61,
275 0x97, 0x40, 0xfe, 0x62, 0x68, 0x27, 0x1b, 0x8b, 0x4b, 0x58, 0x74, 0xed, 0x2a, 0xb9, 0x48, 0xae, 283 0x97, 0xe4, 0xca, 0x1a, 0xa5, 0x46, 0xdf, 0x11, 0x74, 0x9f, 0x0c, 0x2d, 0x55, 0x66, 0xb1, 0x0f,
276 0x8a, 0xfb, 0x3d, 0xee, 0xce, 0x78, 0x0c, 0xa9, 0x16, 0x4a, 0xae, 0x16, 0x51, 0xf3, 0x13, 0x9e, 284 0xad, 0x7c, 0x31, 0x88, 0x8e, 0xa3, 0xd3, 0xde, 0xed, 0x3f, 0xe1, 0x62, 0xdc, 0x83, 0x8e, 0x96,
277 0x43, 0xd1, 0x92, 0x12, 0x9d, 0xde, 0xba, 0xf8, 0xbe, 0xb7, 0x12, 0xce, 0x82, 0xf4, 0xd0, 0xe2, 285 0xa5, 0x1a, 0xb4, 0x58, 0xf3, 0x19, 0x1e, 0x41, 0x6f, 0x41, 0xa5, 0xcc, 0xf5, 0xdc, 0xb5, 0xb7,
278 0x25, 0x94, 0xd1, 0xf6, 0x77, 0xd3, 0x18, 0x80, 0x20, 0x3e, 0x39, 0x6d, 0x53, 0x40, 0x3e, 0x84, 286 0x7d, 0x29, 0x12, 0x49, 0x90, 0xee, 0x16, 0x78, 0x02, 0x29, 0x97, 0xfd, 0xdf, 0x0e, 0x37, 0x40,
279 0xd2, 0x0d, 0x83, 0x2c, 0x18, 0xd5, 0x0f, 0xb0, 0x47, 0x6a, 0x84, 0xed, 0x48, 0xbb, 0xe2, 0x83, 287 0x10, 0x1f, 0x9c, 0x36, 0xeb, 0x41, 0xb7, 0x0a, 0xa6, 0xb3, 0x04, 0xe2, 0x50, 0x18, 0x7d, 0x42,
280 0xa6, 0xa7, 0xef, 0x48, 0xc3, 0xc3, 0x80, 0x27, 0x90, 0x19, 0xf9, 0xe6, 0xfc, 0x00, 0xc4, 0xe3, 288 0x72, 0x4f, 0x99, 0xb4, 0x39, 0x69, 0x67, 0xfc, 0x3f, 0x2b, 0x68, 0xcd, 0x34, 0x22, 0x24, 0xb8,
281 0x84, 0x08, 0xe9, 0x2f, 0x69, 0x19, 0x58, 0xb8, 0x3f, 0xe3, 0xf5, 0x5c, 0xe1, 0x09, 0xca, 0xf5, 289 0x0f, 0xb1, 0x51, 0xaf, 0xae, 0x1e, 0x80, 0x04, 0x67, 0x88, 0xd0, 0xf9, 0x22, 0xad, 0x02, 0x8b,
282 0xb2, 0x8e, 0x3b, 0xd7, 0x71, 0x5f, 0x3e, 0x05, 0xaa, 0x4f, 0xc8, 0xee, 0xba, 0xde, 0x4a, 0x83, 290 0xf0, 0x31, 0x9e, 0x35, 0x16, 0x9e, 0x20, 0x9d, 0xf4, 0xc7, 0x3c, 0xf3, 0x98, 0xe7, 0x15, 0xdb,
283 0x37, 0xc0, 0xfa, 0xc8, 0xe0, 0xab, 0xcb, 0xf5, 0xd1, 0x7c, 0x6d, 0x82, 0xe3, 0x73, 0x04, 0xcf, 291 0x86, 0xd1, 0x4f, 0x04, 0xf1, 0x4d, 0x5e, 0x58, 0x65, 0xf0, 0x1c, 0x92, 0x82, 0x21, 0xbc, 0x77,
284 0x00, 0xc6, 0x1d, 0xb7, 0x64, 0xc6, 0xa7, 0x08, 0x50, 0x6c, 0x54, 0x9e, 0x8d, 0x7b, 0x88, 0x53, 292 0x3a, 0xd9, 0x6d, 0xfe, 0x6d, 0xe9, 0x44, 0xd3, 0x82, 0x87, 0x00, 0xf5, 0x90, 0x73, 0x32, 0xf5,
285 0x60, 0x3b, 0x25, 0xbf, 0x06, 0x61, 0xdf, 0x23, 0xda, 0x3c, 0xbf, 0x66, 0xfe, 0x1f, 0x6e, 0xff, 293 0x2e, 0x02, 0x55, 0x52, 0x2b, 0x8f, 0xc6, 0x6d, 0x62, 0x08, 0xc9, 0xb2, 0x54, 0xef, 0x95, 0xb4,
286 0x03, 0x00, 0x00, 0xff, 0xff, 0x85, 0x77, 0xbb, 0x07, 0x97, 0x01, 0x00, 0x00, 294 0x6f, 0xcc, 0xd6, 0xe4, 0x38, 0x85, 0xf8, 0xc5, 0x5b, 0x3a, 0xbc, 0xb6, 0xb3, 0x39, 0x68, 0x6c,
295 0x02, 0x09, 0x3f, 0xd7, 0xda, 0x9a, 0x8d, 0xe0, 0xd6, 0xe1, 0x25, 0xa4, 0x7f, 0x64, 0x77, 0xb0,
296 0xf6, 0x4a, 0x6d, 0x78, 0x47, 0x75, 0x58, 0xef, 0xed, 0x43, 0x16, 0x6b, 0xbe, 0x98, 0x08, 0xc9,
297 0x55, 0xeb, 0x22, 0x7a, 0x8e, 0xfd, 0xe1, 0xa7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x07, 0x5f,
298 0x60, 0xca, 0x08, 0x02, 0x00, 0x00,
287} 299}
diff --git a/oaktreemodel/common.proto b/oaktreemodel/common.proto
index 1c51b0f..b3d17a0 100644
--- a/oaktreemodel/common.proto
+++ b/oaktreemodel/common.proto
@@ -39,5 +39,6 @@ message Filter {
39 Location location = 1; 39 Location location = 1;
40 string name_or_id = 2; 40 string name_or_id = 2;
41 string jmespath = 3; 41 string jmespath = 3;
42 map<string, string> filter = 4;
42} 43}
43 44