From 6e6651c8787cbf14e9fa5105d77afb9d8794d528 Mon Sep 17 00:00:00 2001 From: Alex Snast Date: Sun, 29 Mar 2020 18:11:13 +0300 Subject: [PATCH] Query policy (#411) * entc/gen: drop xerrors package usage * all: bump dependencies version * entc/gen: adding query privacy policy support --- ent.go | 4 +- entc/gen/internal/bindata.go | 20 +-- entc/gen/template/base.tmpl | 9 +- entc/gen/template/builder/query.tmpl | 6 +- entc/gen/template/import.tmpl | 1 - entc/gen/template/meta.tmpl | 3 + entc/gen/template/runtime.tmpl | 4 +- entc/integration/config/ent/ent.go | 11 +- entc/integration/config/ent/user_query.go | 1 - entc/integration/customid/ent/blob_query.go | 1 - entc/integration/customid/ent/car_query.go | 1 - entc/integration/customid/ent/ent.go | 11 +- entc/integration/customid/ent/group_query.go | 1 - entc/integration/customid/ent/pet_query.go | 1 - entc/integration/customid/ent/user_query.go | 1 - entc/integration/ent/card_query.go | 1 - entc/integration/ent/comment_query.go | 1 - entc/integration/ent/ent.go | 11 +- entc/integration/ent/fieldtype_query.go | 1 - entc/integration/ent/file_query.go | 1 - entc/integration/ent/filetype_query.go | 1 - entc/integration/ent/group_query.go | 1 - entc/integration/ent/groupinfo_query.go | 1 - entc/integration/ent/item_query.go | 1 - entc/integration/ent/node_query.go | 1 - entc/integration/ent/pet_query.go | 1 - entc/integration/ent/spec_query.go | 1 - entc/integration/ent/user_query.go | 1 - entc/integration/gremlin/ent/card_query.go | 1 - entc/integration/gremlin/ent/comment_query.go | 1 - entc/integration/gremlin/ent/ent.go | 11 +- .../gremlin/ent/fieldtype_query.go | 1 - entc/integration/gremlin/ent/file_query.go | 1 - .../integration/gremlin/ent/filetype_query.go | 1 - entc/integration/gremlin/ent/group_query.go | 1 - .../gremlin/ent/groupinfo_query.go | 1 - entc/integration/gremlin/ent/item_query.go | 1 - entc/integration/gremlin/ent/node_query.go | 1 - entc/integration/gremlin/ent/pet_query.go | 1 - entc/integration/gremlin/ent/spec_query.go | 1 - entc/integration/gremlin/ent/user_query.go | 1 - entc/integration/hooks/ent/card_query.go | 1 - entc/integration/hooks/ent/ent.go | 11 +- entc/integration/hooks/ent/user_query.go | 1 - entc/integration/idtype/ent/ent.go | 11 +- entc/integration/idtype/ent/user_query.go | 1 - entc/integration/json/ent/ent.go | 11 +- entc/integration/json/ent/user_query.go | 1 - entc/integration/migrate/entv1/car_query.go | 1 - entc/integration/migrate/entv1/ent.go | 11 +- entc/integration/migrate/entv1/user_query.go | 1 - entc/integration/migrate/entv2/car_query.go | 1 - entc/integration/migrate/entv2/ent.go | 11 +- entc/integration/migrate/entv2/group_query.go | 1 - entc/integration/migrate/entv2/pet_query.go | 1 - entc/integration/migrate/entv2/user_query.go | 1 - entc/integration/privacy/ent/ent.go | 11 +- entc/integration/privacy/ent/planet/planet.go | 3 +- entc/integration/privacy/ent/planet_query.go | 4 +- .../privacy/ent/runtime/runtime.go | 4 +- entc/integration/privacy/ent/schema/planet.go | 1 + entc/integration/privacy/privacy_test.go | 8 +- entc/integration/privacy/rule/rule.go | 13 +- entc/integration/template/ent/ent.go | 11 +- entc/integration/template/ent/group_query.go | 1 - entc/integration/template/ent/pet_query.go | 1 - entc/integration/template/ent/user_query.go | 1 - examples/edgeindex/ent/city_query.go | 1 - examples/edgeindex/ent/ent.go | 11 +- examples/edgeindex/ent/street_query.go | 1 - examples/entcpkg/ent/ent.go | 11 +- examples/entcpkg/ent/user_query.go | 1 - examples/m2m2types/ent/ent.go | 11 +- examples/m2m2types/ent/group_query.go | 1 - examples/m2m2types/ent/user_query.go | 1 - examples/m2mbidi/ent/ent.go | 11 +- examples/m2mbidi/ent/user_query.go | 1 - examples/m2mrecur/ent/ent.go | 11 +- examples/m2mrecur/ent/user_query.go | 1 - examples/o2m2types/ent/ent.go | 11 +- examples/o2m2types/ent/pet_query.go | 1 - examples/o2m2types/ent/user_query.go | 1 - examples/o2mrecur/ent/ent.go | 11 +- examples/o2mrecur/ent/node_query.go | 1 - examples/o2o2types/ent/card_query.go | 1 - examples/o2o2types/ent/ent.go | 11 +- examples/o2o2types/ent/user_query.go | 1 - examples/o2obidi/ent/ent.go | 11 +- examples/o2obidi/ent/user_query.go | 1 - examples/o2orecur/ent/ent.go | 11 +- examples/o2orecur/ent/node_query.go | 1 - examples/start/ent/car_query.go | 1 - examples/start/ent/ent.go | 11 +- examples/start/ent/group_query.go | 1 - examples/start/ent/user_query.go | 1 - examples/traversal/ent/ent.go | 11 +- examples/traversal/ent/group_query.go | 1 - examples/traversal/ent/pet_query.go | 1 - examples/traversal/ent/user_query.go | 1 - go.mod | 30 ++-- go.sum | 158 +++++++++++++++--- 101 files changed, 335 insertions(+), 249 deletions(-) diff --git a/ent.go b/ent.go index 59390c3e8..36e68fe6c 100644 --- a/ent.go +++ b/ent.go @@ -157,9 +157,7 @@ type ( // Policy interface { EvalMutation(context.Context, Mutation) error - // Note that the query policy is under development - // and is currently disabled. - // EvalQuery(context.Context, Query) error + EvalQuery(context.Context, Query) error } // Schema is the default implementation for the schema Interface. diff --git a/entc/gen/internal/bindata.go b/entc/gen/internal/bindata.go index 4d2c7881a..00a231488 100644 --- a/entc/gen/internal/bindata.go +++ b/entc/gen/internal/bindata.go @@ -124,7 +124,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _templateBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\xdf\x6f\xdc\xbe\x0d\x7f\x3e\xff\x15\x84\x71\xfb\xce\x4e\x2f\x76\x9a\xb7\x15\xc8\x43\x9a\x35\x5b\x80\x36\xdd\x90\x6e\x7d\x28\x8a\x41\xb1\x69\x9f\x10\x59\x72\x24\x39\xc9\xc1\xf0\xff\x3e\x50\xf2\xaf\xbb\x5c\x93\xb4\xe9\xb7\x0f\xc5\x99\x94\xc8\x0f\xc9\x0f\x69\x3a\x6d\x9b\x1e\x04\x67\xaa\xde\x68\x5e\xae\x2d\x1c\x1f\xbd\xfd\xdb\x61\xad\xd1\xa0\xb4\x70\xce\x32\xbc\x56\xea\x06\x2e\x64\x96\xc0\xa9\x10\xe0\x0e\x19\x20\xbd\xbe\xc3\x3c\x09\xbe\xac\xb9\x01\xa3\x1a\x9d\x21\x64\x2a\x47\xe0\x06\x04\xcf\x50\x1a\xcc\xa1\x91\x39\x6a\xb0\x6b\x84\xd3\x9a\x65\x6b\x84\xe3\xe4\x68\xd0\x42\xa1\x1a\x99\x07\x5c\x3a\xfd\xc7\x8b\xb3\x0f\x97\x57\x1f\xa0\xe0\x02\xa1\x97\x69\xa5\x2c\xe4\x5c\x63\x66\x95\xde\x80\x2a\xc0\xce\x9c\x59\x8d\x98\x04\x07\x69\xd7\x05\x41\xdb\x42\x8e\x05\x97\x08\xe1\x35\x33\x18\x42\x2f\x5c\xd6\x37\x25\xbc\x3b\x01\x12\xc2\x32\x39\x53\xb2\xe0\x65\xf2\x2f\x96\xdd\xb0\x12\xe9\x50\xdb\x82\xc5\xaa\x16\xcc\x22\x84\x6b\x64\x39\xea\x10\x96\xc3\xf5\x49\xc5\xab\x5a\x69\x3b\xa8\xd2\x14\x28\x3b\x4c\x70\x66\xd0\x80\x55\xc0\xee\x14\xcf\xc1\x9f\x82\x4c\xc9\x42\xf0\xcc\x52\x1c\x8d\x41\xfd\x57\xe3\x32\x93\x04\x76\x53\x23\x44\xc1\xe2\x73\x0d\xc3\xbf\x13\xb2\x94\x7c\xae\x83\xc5\x3f\x29\xcf\x73\x21\x09\x82\xc5\x7f\x99\x68\x70\x2e\x76\x82\x60\xf1\xef\x06\xf5\x66\x2e\x77\x82\x60\xf1\xa9\xb1\xcc\x2a\x3d\xc9\x7b\x41\xaf\xe1\x4a\x6e\x6b\xb8\x92\xbd\x0a\xcf\x1b\x99\xcd\x55\x4e\x10\xc4\x2e\xde\xcf\x9a\x2a\xc9\xea\x5a\x70\x34\xc0\x24\x28\x12\x70\x59\x82\x92\x80\xdc\xae\x51\x43\xa9\x59\xbd\x06\xab\xd9\x1d\x6a\xc3\x04\x28\x0d\xe6\x56\x80\x41\xe1\x2a\xd8\xc7\xef\x2d\x15\x8d\xcc\x22\xaa\x50\x72\x65\x95\x66\x25\x26\xef\x1b\x2e\x48\xd3\x75\xb1\x4b\xbe\x66\xb2\x44\x58\x16\x2b\x58\x3a\x5f\x54\x47\xff\xa3\xeb\x82\x05\x5d\x2d\xe0\x04\x6a\x66\x32\x26\xe8\x37\x49\xd3\x14\xbc\xa2\xeb\x46\xac\xc4\xa4\x92\xdf\xa1\x84\x82\xa3\xc8\x0d\x55\xa5\x6d\xa1\xa9\x6b\xd4\xfd\x51\x67\x36\x09\x16\x04\x6a\x34\x10\xf5\xc7\x93\x24\x31\x96\x22\x8d\x7b\xe8\x6d\xb0\x58\xb4\xed\x21\xdc\x73\xbb\x06\x7c\xb0\x28\x73\x88\xb8\xcc\xf1\x01\x96\xc9\xa5\xca\xd1\xc0\x51\x0c\x21\x25\x2f\x24\x53\xa1\xbb\x16\x0e\x61\x1c\x12\xd0\x85\x0b\xc0\x56\xb5\xa0\xb0\x6a\xcd\xa5\x2d\x20\xcc\x39\xa3\x54\xa5\x7f\x31\xa9\xea\xef\x0c\xe9\x01\x7f\x4b\xa3\x6d\xb4\xc3\xff\x30\x92\xd3\x9b\x49\xfc\x89\xb6\x05\xc2\xe3\x9c\x38\x7a\xd3\xd3\xd0\x0d\x4f\xf8\x2b\xb5\x6a\xea\xd4\xf0\x52\x32\xdb\x68\xdc\xf1\x9c\xa6\x70\x5a\x96\x1a\x4b\xf2\x37\x23\x01\xeb\x85\xc4\x2a\x63\xb1\x26\x32\xb8\x7c\x93\xb5\xc3\xeb\xcd\x44\x86\x74\x62\xc1\x8f\xc0\x3b\x9e\x9d\x1a\x1a\x20\x0c\x6a\x83\x4d\xae\xb6\x1c\x50\x75\xfc\x0f\xa5\x41\xa3\x64\x15\xd1\x8f\x49\xe5\xc8\xe7\xff\x1f\xce\x18\x5f\x9d\xac\x31\x56\x55\x20\x59\x85\x26\x81\x73\xa5\x01\x1f\x58\x55\x0b\x7c\x17\xa4\x69\x90\xa6\x8b\x7f\x10\xd0\xf7\x1b\x5f\xeb\xb7\x2b\x4f\x91\xe3\x38\x21\xdd\x18\x71\x34\x4c\x92\xae\x4b\x4e\xcd\xfc\xe9\xaa\xa9\xfa\xab\xf1\x0a\x42\xd3\x54\xff\xf3\x4f\x61\xbc\x82\x17\xdc\x3a\xde\xba\x75\x1c\xc6\xde\xf1\x55\xc6\x64\x94\xd9\x87\x15\xfc\x71\x17\x13\x50\xc7\xcb\x53\x13\x15\x72\x2a\xc3\xca\x55\x76\x60\xe6\x54\x9d\x36\x70\xe4\xf4\x79\x7d\xa2\xd4\xcc\xec\xb2\xeb\x19\x6e\x75\xf3\xae\xa4\x8c\xae\x60\x49\x49\x3e\x27\xec\xc4\x2a\x36\x62\x18\x1b\x54\x3a\xb6\xf5\x2d\x4a\x77\x46\xd5\xb3\x54\xcc\x94\x34\x76\x17\x62\xdb\x02\x2f\x60\xcd\xcc\x97\x6d\x80\x03\xf5\x9f\x69\xc9\x4b\x56\x11\xb3\x1d\x90\xb1\x3f\xe5\xac\x23\x9f\x6e\xaa\x1e\xc1\xd0\x51\xe3\xb4\x91\xbb\xe3\xa6\x6d\xe1\xb6\x51\x16\xc7\x98\xf7\xf3\x58\xb9\x64\xf3\x62\x9e\xc7\xae\xdb\x99\x57\xf4\xda\x1b\x9d\x22\xcb\xd6\xbe\xb9\xb6\xa6\x15\x01\x88\xf6\x98\xf2\x06\x3c\x47\x46\x1b\x3b\x64\xf9\x99\x51\x26\x21\xfc\x3a\x98\x0f\xe7\xae\x5e\x36\xd3\x7c\x61\x0b\x6f\xec\xb7\x0d\xb6\x34\x85\x4b\x65\xcf\x69\x99\xf8\xa0\xb5\x1b\x0d\x64\xca\xc0\xfd\x1a\x25\x58\xbd\xa1\x29\x61\x15\x14\x68\xb3\x35\x30\x30\x35\x66\xbc\xe0\x19\xbd\xe7\xb8\xdd\x00\x93\x39\x70\x0b\xf7\xcc\x80\x54\xd6\x6f\x25\xc3\x06\x92\x33\xcb\x68\x77\xe8\x5f\x5d\xdb\x7e\x8c\xd5\x4d\x66\x29\x87\x82\x5d\xa3\xe8\xf3\x1c\x78\x48\xfe\x08\xa7\x59\x53\xa1\xb4\x9e\x17\xe8\x85\xd2\xa2\x2e\x58\x86\x89\x6f\xec\x08\xe1\x60\xcb\x72\xec\x6f\x47\x71\x6f\x92\x5c\xf4\xf9\x09\xa7\x31\xf2\x0e\x42\x78\x03\x98\x78\xe7\x6f\x20\x9c\xe0\x87\x3d\x88\x0b\x33\xd8\x1d\x93\xc2\xe0\x5a\x29\x81\x4c\x02\x97\x39\xcf\x98\x25\xfb\xf7\x6b\x74\xd3\x73\x86\x91\x4e\x4e\xe9\x70\xc2\x1e\xee\x64\x34\x42\xad\xbd\x2a\x76\x56\x09\x27\x2f\x48\x02\x27\x27\x20\xb9\x13\x0c\xc8\x0b\x26\x0c\x52\xe9\x16\x77\x4c\xc3\x6e\xc8\x63\x80\x0f\xce\x9e\xa1\x89\x89\x5a\xaf\xe0\x0f\x8c\xfb\x60\x3e\x31\x73\x33\x86\x53\x31\x73\x43\xf5\xd2\x7b\x00\xce\x0f\xce\x21\xfa\xc8\x3c\xc6\xed\x20\xe2\x39\x50\xc9\x85\x83\xd9\x3f\xa2\xd6\xc1\xc8\xb2\x2b\x2e\xcb\x46\x30\xfd\x32\xa2\xf5\x87\xe7\x44\xab\x94\x46\x4a\x33\x35\x3f\x3a\xce\x3d\xc3\xb7\x6d\x8f\xbf\x99\x72\x5b\xc6\x5f\xc3\xba\x21\xd4\x2d\xe2\x0d\xd6\x7f\x99\x7b\x53\x02\x77\xe9\x37\x98\x7e\x35\x03\xb7\x32\xf0\x02\x12\x5e\x2a\xfb\x51\xb1\x1c\x9f\x1e\x35\x25\x5a\x17\x42\x4e\xb5\x66\xd3\x6c\x11\xee\x2a\xd0\x5e\xb4\x46\xb8\xa5\x85\x7d\xaa\xf4\xdc\xee\x54\x67\xcc\x4b\x7c\x6d\x99\x67\x96\x7f\xae\xc8\xce\x39\xd5\xd8\xfd\xd8\x8e\x62\xab\xd4\xde\xc3\x2f\x17\xba\xcf\xcb\xa3\x32\x7b\xb3\xaf\x2e\xf2\x2c\xfe\x17\x94\xf8\x8c\x16\x0f\xcd\xb8\xb4\x4f\xd6\x38\xd3\xc8\x2c\xa6\x4d\x9d\xd3\xab\x8a\xba\x59\x69\xdf\xde\xae\xdd\xfd\x82\x9c\x93\xc1\xb9\xce\x7d\xc3\x22\xd7\x90\x8d\x5e\x0c\x14\x8c\x0b\xcc\xb7\xf6\xd3\x15\xdc\x71\x25\xfc\xbe\xa0\x0a\x9f\x7f\xa5\xc9\x9a\x7f\xa7\x37\x92\xdf\x36\x28\xd1\x98\x9e\x40\xbb\xa8\x27\x06\x55\xa6\x1c\x08\xb4\xb8\xd7\xac\xf6\xa9\xfc\x25\x32\xed\x38\x79\x29\x99\xa6\x58\xfb\x50\x07\x7e\x55\x66\x20\xf5\x7f\xa4\x83\xb6\x0f\x88\x49\xbe\x6a\xe6\x3e\xd6\xf6\xd1\xfb\x11\x24\x6f\x29\x9a\x8d\xfb\x61\x90\x27\xa4\x18\x59\xfb\xa3\x32\xff\x0c\x77\x77\x02\x6b\x34\x8e\xec\xdd\x31\xff\x3a\x0e\xef\x18\x7b\x8e\xc4\x6d\x9b\x1e\x00\x3e\xd4\x6c\x78\x31\x02\x51\xc4\xf1\x11\x4a\xa1\xae\x99\x80\x35\x8a\x1a\xb5\x49\xc0\xfd\xfd\x64\xdc\xdb\xf6\xae\x6d\xde\xc9\xce\xca\xf6\xd4\x26\xbe\x67\x89\x5b\xf6\x77\x1e\x7d\x8d\xee\x5f\x14\x1d\xc8\x3f\xc1\x25\x77\x1f\x2a\x8f\x36\xdc\xe4\xe2\xef\xc9\x17\xea\x22\xff\xa9\x7b\x83\x1b\x33\xf2\x81\x4a\x4e\x82\x94\xe7\x06\x0a\xad\x2a\x4f\x02\x6a\xc8\x8a\xd5\x7d\xbd\xe9\x40\x54\x91\xe0\x5b\xef\xa6\xeb\xbe\xfb\x16\x6c\xbb\x18\xbe\x7d\x1f\xa5\x54\x67\x43\x20\x2a\x76\x83\xd1\x4c\xb1\x82\xa3\x15\x08\x94\x51\x15\xc7\xc1\x82\x3e\x71\x3d\x58\xff\xc1\x55\x39\x7e\x18\x38\xa1\xef\x0c\x94\x79\x64\x56\xc0\xf3\x78\xbe\xa8\x98\x60\x1e\xee\xff\x03\x00\x00\xff\xff\xf5\x58\xa4\x2b\xd6\x13\x00\x00") +var _templateBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\xdf\x6f\xdc\xbe\x0d\x7f\x3e\xff\x15\x84\x71\xfb\xce\xce\xf7\x62\xa7\x79\x5b\x81\x3c\xa4\x59\xb3\x05\x68\xd3\x0e\xe9\xd6\x87\xa2\x18\x14\x9b\xf6\x09\x91\x25\x47\x92\x93\x1c\x0c\xff\xef\x03\x25\xff\xba\xcb\x35\x49\x9b\xae\x0f\x85\x8f\x94\xc8\x0f\xc9\x0f\x69\x3a\x6d\x9b\x1e\x04\x67\xaa\xde\x68\x5e\xae\x2d\x1c\x1f\xbd\xf9\xdb\x61\xad\xd1\xa0\xb4\x70\xce\x32\xbc\x56\xea\x06\x2e\x64\x96\xc0\xa9\x10\xe0\x0e\x19\x20\xbd\xbe\xc3\x3c\x09\xbe\xac\xb9\x01\xa3\x1a\x9d\x21\x64\x2a\x47\xe0\x06\x04\xcf\x50\x1a\xcc\xa1\x91\x39\x6a\xb0\x6b\x84\xd3\x9a\x65\x6b\x84\xe3\xe4\x68\xd0\x42\xa1\x1a\x99\x07\x5c\x3a\xfd\x87\x8b\xb3\xf7\x97\x57\xef\xa1\xe0\x02\xa1\x97\x69\xa5\x2c\xe4\x5c\x63\x66\x95\xde\x80\x2a\xc0\xce\x9c\x59\x8d\x98\x04\x07\x69\xd7\x05\x41\xdb\x42\x8e\x05\x97\x08\xe1\x35\x33\x18\x42\x2f\x5c\xd6\x37\x25\xbc\x3d\x01\x12\xc2\x32\x39\x53\xb2\xe0\x65\xf2\x99\x65\x37\xac\x44\x3a\xd4\xb6\x60\xb1\xaa\x05\xb3\x08\xe1\x1a\x59\x8e\x3a\x84\xe5\x70\x7d\x52\xf1\xaa\x56\xda\x0e\xaa\x34\x05\xca\x0e\x13\x9c\x19\x34\x60\x15\xb0\x3b\xc5\x73\xf0\xa7\x20\x53\xb2\x10\x3c\xb3\x14\x47\x63\x50\xff\xd5\xb8\xcc\x24\x81\xdd\xd4\x08\x51\xb0\xf8\x54\xc3\xf0\xef\x84\x2c\x25\x9f\xea\x60\xf1\x4f\xca\xf3\x5c\x48\x82\x60\xf1\x1f\x26\x1a\x9c\x8b\x9d\x20\x58\xfc\xab\x41\xbd\x99\xcb\x9d\x20\x58\x7c\x56\x82\x67\x9b\x99\xdc\x0b\x82\xc5\xc7\xc6\x32\xab\xf4\xa4\xe8\x05\xbd\x86\x2b\xb9\xad\xe1\x4a\xf6\x2a\x3c\x6f\x64\x36\x57\x39\x41\x10\xbb\x44\x7c\xd2\x54\x62\x56\xd7\x82\xa3\x01\x26\x41\x91\x80\xcb\x12\x94\x04\xe4\x76\x8d\x1a\x4a\xcd\xea\x35\x58\xcd\xee\x50\x1b\x26\x40\x69\x30\xb7\x02\x0c\x0a\x57\xda\x3e\x31\xde\x52\xd1\xc8\x2c\xa2\xd2\x25\x57\x56\x69\x56\x62\xf2\xae\xe1\x82\x34\x5d\x17\xbb\xaa\x68\x26\x4b\x84\x65\xb1\x82\xa5\xf3\x45\x05\xf6\x0f\x5d\x17\x2c\xe8\x6a\x01\x27\x50\x33\x93\x31\x41\xcf\x24\x4d\x53\xf0\x8a\xae\x1b\xb1\x12\xc5\x4a\x7e\x87\x12\x0a\x8e\x22\x37\x54\xae\xb6\x85\xa6\xae\x51\xf7\x47\x9d\xd9\x24\x58\x10\xa8\xd1\x40\xd4\x1f\x4f\x92\xc4\x58\x8a\x34\xee\xa1\xb7\xc1\x62\xd1\xb6\x87\x70\xcf\xed\x1a\xf0\xc1\xa2\xcc\x21\xe2\x32\xc7\x07\x58\x26\x97\x2a\x47\x03\x47\x31\x84\x94\xbc\x90\x4c\x85\xee\x5a\x38\x84\x71\x48\x40\x17\x2e\x00\x5b\xd5\x82\xc2\xaa\x35\x97\xb6\x80\x30\xe7\x8c\x52\x95\xfe\xc5\xa4\xaa\xbf\x33\xa4\x07\xfc\x2d\x8d\xb6\xd1\x0e\xff\xc3\xc8\x5a\x6f\x26\xf1\x27\xda\x16\x08\x8f\x73\xe2\x78\x4f\xbf\x86\x36\x79\xc2\x5f\xa9\x55\x53\xa7\x86\x97\x92\xd9\x46\xe3\x8e\xe7\x34\x85\xd3\xb2\xd4\x58\x92\xbf\x19\x09\x58\x2f\x24\x56\x19\x8b\x35\x91\xc1\xe5\x9b\xac\x1d\x5e\x6f\x26\x32\xa4\x13\x0b\x7e\x04\xde\xf1\xec\xd4\xd0\x64\x61\x50\x1b\x6c\x72\xb5\xe5\x80\xaa\xe3\x1f\x94\x06\x8d\x92\x55\x44\x3f\x26\x95\x23\x9f\xff\x7f\x38\x63\x7c\x75\xb2\xc6\x58\x55\x81\x64\x15\x9a\x04\xce\x95\x06\x7c\x60\x55\x2d\xf0\x6d\x90\xa6\x41\x9a\x2e\xfe\x41\x40\xdf\x6d\x7c\xad\xdf\xac\x3c\x45\x8e\xe3\x84\x74\x63\xc4\xd1\x30\x62\xba\x2e\x39\x35\xf3\x5f\x57\x4d\xd5\x5f\x8d\x57\x10\x9a\xa6\xfa\xaf\xff\x15\xc6\x2b\x78\xc1\xad\xe3\xad\x5b\xc7\x61\xec\x1d\x5f\x65\x4c\x46\x99\x7d\x58\xc1\x1f\x77\x31\x01\x75\xbc\x3c\x35\x51\x21\xa7\x32\xac\x5c\x65\x07\x66\x4e\xd5\x69\x03\x47\x4e\x9f\xd7\x27\x4a\xcd\xcc\x2e\xbb\x9e\xe1\x56\x37\xef\x4a\xca\xe8\x0a\x96\x94\xe4\x73\xc2\x4e\xac\x62\x23\x86\xb1\x41\xa5\x63\x5b\xdf\xa2\x74\x67\x54\x3d\x4b\xc5\x4c\x49\x63\x77\x21\xb6\x2d\xf0\x02\xd6\xcc\x7c\xd9\x06\x38\x50\xff\x99\x96\xbc\x64\x15\x31\xdb\x01\x19\xfb\x53\xce\x3a\xf2\xe9\xa6\xea\x11\x0c\x1d\x35\x4e\x1b\xb9\x3b\x6e\xda\x16\x6e\x1b\x65\x71\x8c\x79\x3f\x8f\x95\x4b\x36\x2f\xe6\x79\xec\xba\x9d\x79\x45\xef\xc3\xd1\x29\xb2\x6c\xed\x9b\x6b\x6b\x5a\x11\x80\x68\x8f\x29\x6f\xc0\x73\x64\xb4\xb1\x43\x96\x9f\x19\x65\x12\xc2\xaf\x83\xf9\x70\xee\xea\x65\x33\xcd\x17\xb6\xf0\xc6\x7e\xdb\x60\x4b\x53\xb8\x54\xf6\x9c\xb6\x8c\xf7\x5a\xbb\xd1\x40\xa6\x0c\xdc\xaf\x51\x82\xd5\x1b\x9a\x12\x56\x41\x81\x36\x5b\x03\x03\x53\x63\xc6\x0b\x9e\xd1\x7b\x8e\xdb\x0d\x30\x99\x03\xb7\x70\xcf\x0c\x48\x65\xfd\xba\x32\xac\x26\x39\xb3\x8c\x96\x8a\xfe\xd5\xb5\xed\xc7\x58\xdd\x64\x96\x72\x28\xd8\x35\x8a\x3e\xcf\x81\x87\xe4\x8f\x70\x9a\x35\x15\x4a\xeb\x79\x81\x5e\x28\x2d\xea\x82\x65\x98\xf8\xc6\x8e\x10\x0e\xb6\x2c\xc7\xfe\x76\x14\xf7\x26\xc9\x45\x9f\x9f\x70\x1a\x23\x6f\x21\x84\x3f\x01\x13\xef\xfc\x4f\x08\x27\xf8\x61\x0f\xe2\xc2\x0c\x76\xc7\xa4\x30\xb8\x56\x4a\x20\x93\xc0\x65\xce\x33\x66\xc9\xfe\xfd\x1a\xdd\xf4\x9c\x61\xa4\x93\x53\x3a\x9c\xb0\x87\x3b\x19\x8d\x50\x6b\xaf\x8a\x9d\x55\xc2\xc9\x0b\x92\xc0\xc9\x09\x48\xee\x04\x03\xf2\x82\x09\x83\x54\xba\xc5\x1d\xd3\xb0\x1b\xf2\x18\xa0\x33\x67\x68\x60\xa2\xd6\x2b\xf8\x03\xe3\x3e\x96\x8f\xcc\xdc\x8c\xd1\x54\xcc\xdc\x50\xb9\xf4\x1e\x7c\xf3\x83\x73\x84\x3e\x30\x0f\x71\x3b\x86\x78\x8e\x53\x72\xe1\x50\x4e\x78\x82\x91\x64\x57\x5c\x96\x8d\x60\xfa\x65\x3c\xeb\x0f\xcf\x79\x56\x29\x8d\x94\x65\xea\x7d\x74\x94\x7b\x86\x6e\xdb\x1e\x7f\x33\xe3\xb6\x8c\xbf\x86\x74\x43\xa8\x5b\xbc\x1b\xac\xff\x32\xf5\xa6\x04\xee\xb2\x6f\x30\xfd\x6a\x02\x6e\x65\xe0\x79\x0e\x5e\x2a\xfb\x41\xb1\x1c\x9f\x1e\x34\x25\x5a\x17\x41\x4e\xa5\x66\xd3\x64\x11\xee\x2a\xd0\x56\xb4\x46\xb8\xa5\x3d\x7e\x2a\xf4\xdc\xee\x54\x66\xcc\x4b\x7c\x6d\x95\x67\x96\x7f\xae\xc6\xce\x39\x95\xd8\x3d\x6c\x47\xb1\x55\x69\xef\xe1\x97\xeb\xdc\xe7\xe5\x51\x95\xbd\xd9\x57\xd7\x78\x16\xff\xf3\x15\x3e\xa3\xad\x43\x33\x2e\xed\x93\x25\xce\x34\x32\x8b\x69\x53\xe7\xf4\x9e\xa2\x5e\x56\xda\x37\xb7\x6b\x76\xbf\x1d\xe7\x64\x70\xae\x73\x5f\xb6\xc8\x35\x64\xa3\x17\x03\x05\xe3\x02\xf3\xad\xe5\x74\x05\x77\x5c\x09\xbf\x2c\xa8\xc2\xa7\x5f\x69\xb2\xe6\x5f\xe8\x8d\xe4\xb7\x0d\x4a\x34\xa6\xe7\xcf\x2e\xea\x89\x40\x95\x29\x07\xfe\x2c\xee\x35\xab\x7d\xe4\xbf\xc4\xa5\x1d\x27\x2f\xe5\xd2\x14\x6b\x1f\xea\x40\xaf\xca\x0c\x9c\xfe\xb7\x74\xd0\xf6\x01\x31\xc9\x57\xcd\xdc\x97\xda\x3e\x76\x3f\x82\xe4\x2d\x45\xb3\x61\x3f\x14\x3c\x21\xc5\x48\xda\x1f\x95\xf9\x67\xa8\xbb\x13\x58\xa3\x71\x24\xef\x8e\xf9\xd7\x51\x78\xc7\xd8\x33\x1c\x6e\xdb\xf4\x00\xf0\xa1\x66\xc3\x5b\x11\x88\x21\x8e\x8e\x50\x0a\x75\xcd\x04\xac\x51\xd4\xa8\x4d\x02\xee\x8f\x2a\xe3\xce\xb6\x77\x65\xf3\x4e\x76\xd6\xb5\xa7\xb6\xf0\x3d\x0b\xdc\xb2\xbf\xf3\xe8\x4b\x74\xff\x92\xe8\x40\xfe\x1f\x5c\x72\xf7\x91\xf2\x68\xbb\x4d\x2e\xfe\x9e\x7c\xa1\x26\xf2\x9f\xb9\x37\xb8\x31\x23\x1d\xa8\xe2\x24\x48\x79\x6e\xa0\xd0\xaa\xf2\x1c\xa0\x7e\xac\x58\xdd\x97\x9b\x0e\x44\x15\x09\xbe\xf5\x6e\xba\xee\xbb\xef\xc0\xb6\x8b\xe1\xdb\xf7\x51\x4a\x65\x36\x04\xa2\x62\x37\x18\xcd\x14\x2b\x38\x5a\x81\x40\x19\x55\x71\x1c\x2c\xe8\xf3\xd6\x83\xf5\x1f\x5b\x95\xa3\x87\x81\x13\xfa\xc6\x40\x99\x47\x66\x05\x3c\x8f\xe7\x5b\x8a\x09\xe6\xe1\xfe\x2f\x00\x00\xff\xff\x0a\x40\xf0\xe3\xeb\x13\x00\x00") func templateBaseTmplBytes() ([]byte, error) { return bindataRead( @@ -139,7 +139,7 @@ func templateBaseTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/base.tmpl", size: 5078, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/base.tmpl", size: 5099, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -204,7 +204,7 @@ func templateBuilderMutationTmpl() (*asset, error) { return a, nil } -var _templateBuilderQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x5a\x6f\x6f\xdb\x38\xd2\x7f\x6d\x7f\x8a\x59\x23\x1b\xd8\x81\x2b\xb7\x7d\xf7\xe4\x41\x0e\xc8\x36\xed\xc1\xc0\xa2\xbb\xdb\xf6\xb0\x0b\x14\xc5\x2e\x23\x8d\x6c\x6e\x65\x52\x4b\x52\x4e\x82\x9c\xbf\xfb\x81\x43\x52\x92\xf5\x27\x96\x93\x60\xaf\xb8\x57\xb6\x24\x72\x48\xce\xfc\xe6\x37\x43\x0e\xef\xef\x17\x67\xe3\x37\x32\xbf\x53\x7c\xb5\x36\xf0\xfa\xe5\xab\xff\x7b\x91\x2b\xd4\x28\x0c\xbc\x63\x31\x5e\x4b\xf9\x15\x96\x22\x8e\xe0\x32\xcb\x80\x1a\x69\xb0\xdf\xd5\x16\x93\x68\xfc\x69\xcd\x35\x68\x59\xa8\x18\x21\x96\x09\x02\xd7\x90\xf1\x18\x85\xc6\x04\x0a\x91\xa0\x02\xb3\x46\xb8\xcc\x59\xbc\x46\x78\x1d\xbd\x0c\x5f\x21\x95\x85\x48\xc6\x5c\xd0\xf7\x1f\x97\x6f\xde\xbe\xff\xf8\x16\x52\x9e\x21\xf8\x77\x4a\x4a\x03\x09\x57\x18\x1b\xa9\xee\x40\xa6\x60\x6a\x83\x19\x85\x18\x8d\xcf\x16\xbb\xdd\x78\x7c\x7f\x0f\x09\xa6\x5c\x20\x4c\xfe\x2a\x50\xdd\x4d\x60\xb7\xb3\x2f\x4f\xf2\xaf\x2b\x38\xbf\x80\x6b\xa6\x11\x4e\xa2\x37\x52\xa4\x7c\x15\xfd\xcc\xe2\xaf\x6c\x85\xe0\x7b\x1a\xdc\xe4\x19\x33\x08\x93\x35\xb2\x04\xd5\x04\x4e\xda\x9f\xf8\x26\x97\xca\x84\x4f\xee\x09\xa6\xe3\xd1\xfd\xfd\x0b\x50\x4c\xac\x10\x4e\x72\x66\xd6\x76\xb0\x93\xe8\x23\xbf\xce\xb8\x58\x2d\xa9\x95\xb6\x3d\x46\xa3\x09\x4d\xc7\x36\xd9\xed\x26\xae\x1f\x8a\xc4\x7e\x9b\x8d\x69\xac\x93\xeb\x82\x67\x56\x5d\x24\xe2\x17\xbb\x8c\xf7\x6c\x83\x61\x25\x0a\x63\xe4\x5b\xf7\xb9\xfc\x5f\xf6\xb1\x93\x5a\x2c\xa0\x2e\x66\xb7\xb3\xa6\xb0\x7a\x0c\x6f\x52\xa9\x80\xd4\xc3\xc5\xca\x36\xcd\x99\x8e\x59\x06\x27\x91\x1f\x07\x50\x18\x6e\x38\xea\x68\x6c\xee\x72\x6c\x4a\xd3\x46\x15\xb1\x81\xfb\xf1\x28\x26\x3d\x8e\x47\x19\xdf\x70\x33\x1a\x9d\x71\x61\xc6\x23\x99\xa6\x1a\xab\x27\x95\xa0\x1a\x8d\x3e\x7f\xf9\xc9\xfe\x19\x8f\x0a\xc1\xff\x2a\xd0\xbe\xd0\x46\x71\xb1\x1a\x8f\x72\x85\x09\x8f\x99\x41\x0d\xa3\xcf\x5f\xca\xa7\xc8\x8e\x1a\x66\xe4\xf4\x74\xc3\xcd\x1a\x4e\xa2\xb7\xc9\x0a\xbd\x32\x17\x0b\x40\xb6\x42\xf5\x22\x93\x2c\xb1\xab\x41\xfb\x2d\x1a\x8f\xea\xf6\x40\xab\xaa\xc8\x75\x18\x59\x19\xb5\x25\x63\xb9\xe6\x33\x3b\x1e\x46\x9f\xee\x72\xdc\x57\xfa\xa8\x6e\xa3\xd6\xff\xc5\x19\x5c\x26\x09\x37\x5c\x0a\x96\x41\xca\x31\x4b\x34\x18\x09\x2c\x49\xec\x4f\x4d\xed\x11\x10\x46\xa9\xd7\x89\xd9\xe4\x99\x9d\x56\xae\xb8\x30\x29\x4c\x12\xce\x32\x8c\xcd\xe2\x7b\xbd\x20\xcb\x2c\x9c\xa4\x89\x05\x91\x91\xca\xa3\x94\xfa\xf2\x14\xd6\x4c\x7f\x0a\x88\x74\xa2\xca\x79\xde\x9a\xfd\x0f\x51\x6b\xd6\x8b\x05\x70\x61\x50\x6d\x30\xe1\xb6\x1d\x8d\x07\x53\x1e\x61\x04\x46\xb1\x2d\x2a\xcd\x32\xb0\x08\x9d\x45\xb6\xe7\xde\x14\xa0\xfe\x1c\xfd\x50\xa1\x6e\x44\x90\x4e\x0b\x11\x4f\x63\x29\x0c\xde\x1a\xeb\x65\xf6\x77\x06\xd3\x9e\x4e\x73\x40\xa5\xa4\x9a\x8d\x1d\x68\x7f\x5d\xa3\x42\xab\x38\x0d\x0c\x04\xde\x40\x89\x05\x42\x6c\x5d\x95\x63\x3b\x90\x93\x5b\xfa\x40\xb0\x61\x85\xd4\x99\x13\x39\xcd\x35\x44\x51\xd4\x8d\xac\x59\xb3\x93\xc5\x75\x5d\xee\x6e\x17\xd5\x10\x7a\x01\x2c\xcf\x51\x24\xcd\xa1\x6b\x6d\xe6\x90\xeb\x28\x8a\x66\xe3\x91\x42\x53\x28\x01\x8d\xa6\x7e\xb5\x3f\x5a\x9f\x09\xab\x25\x07\x02\x6d\x30\x0f\xa0\x21\xab\x0c\x5e\x27\x09\x9b\x3a\x29\x5c\x98\x83\x8b\xb2\x33\x76\xad\x2f\xe0\x94\xfe\x1c\x98\xed\x4f\xe4\xd4\x7e\xba\x02\x9c\x8f\x3f\x61\xc2\x4e\xde\xd4\xcb\x19\x3a\x65\xdf\xfc\x02\x4e\xdd\xbf\x43\x93\xb6\x94\x53\xcd\x99\x9e\x9e\x30\x65\xdb\x7f\x2a\x2d\x94\xe8\xef\xb0\x19\xd3\xa0\xbd\xa8\xa1\xcf\x73\x90\x87\xf0\x62\x63\xb3\x0b\x7a\x14\x5a\xd7\x4c\x83\xe6\x1b\x9e\x31\xc5\xcd\x9d\xe3\x45\xcb\x7c\xb4\x22\x8e\xda\x06\xce\x38\xe3\x28\x4c\x44\x24\x40\xc4\x73\x7f\x1f\x08\xf1\xf7\xb9\x27\xc5\x3a\x97\x12\xfd\x25\x2b\xfc\xbd\x16\x7e\x88\x9d\x60\x5a\x91\x25\xb1\xa3\xf5\x9c\x19\x4c\x7e\x29\x03\xac\xa5\x14\x7a\xea\x24\xd6\x78\xcd\xb8\x70\x01\x28\x2e\x94\xb2\xe9\x84\xa3\x1c\xe9\xa2\xbb\xe3\xdd\x32\xf4\x24\x2b\x8c\xc6\xa3\x81\x36\xe9\x1d\x75\xea\xad\xb3\xb7\x22\x67\xa2\x91\x1b\xfd\xfc\x02\x4e\x3b\x5a\xdc\xbb\x98\x76\xde\xb4\x42\xe4\xde\xef\x42\xff\x88\xf8\xee\xc2\x33\x9e\xb9\x85\x36\xeb\xa5\x4a\x6e\xfe\xd5\x47\x98\xc4\x7d\x9e\xff\x68\x56\x23\x9e\xd2\xab\xf3\x8b\xd6\xd0\xb9\xc2\x9c\x29\xa4\xc5\xda\xb1\x66\xff\x4f\x2d\xbf\xbb\x00\xc1\x33\xd7\x39\x60\x47\xf0\x8c\x24\xdb\x77\x14\xef\xca\xb8\x89\xb7\xc6\x46\x80\x13\x98\x7c\xf0\xa2\x27\xb5\x51\x26\x16\x08\x13\x0b\x8b\xc9\x32\x41\x61\x26\x30\xa1\xe9\x4f\xe0\x85\x8b\x9b\x84\x8f\x83\x51\xcb\x2a\xa5\x19\xb3\x46\x0f\x05\xa6\x2a\xb8\xfa\x71\xfc\x3a\x68\xf0\xb9\x5d\xce\xd8\x2d\xc4\xbf\xa7\x61\xc6\x23\x42\xb3\x0f\x68\xd6\xd3\xdf\x71\xa5\x0d\xb8\x36\x0e\x6a\x29\xbd\xa9\x33\xbd\xcb\x6a\xee\x42\x52\xe9\xac\x08\x1f\x7c\x9f\xb3\xf7\xd2\xbc\xb3\x89\xe8\x5b\x6b\x12\xb8\x59\xa3\x00\x21\xad\x80\x4c\xde\xd8\x0c\xab\x14\x73\xc3\xb4\x4b\x59\x07\x33\x07\xcd\xae\x07\x24\x67\xf5\x29\xce\x6b\x80\xb0\xa8\xce\x0a\x45\x79\xd9\x87\x4a\xfa\xbc\x0f\x24\x2e\x04\xbc\x9a\x45\x97\x59\x46\x20\x19\x07\x44\xd5\x70\xd2\x42\xc9\x8e\x5a\x65\x28\xa6\x3d\xe3\xcd\xe0\xe2\x02\x5e\xb6\x3a\x9f\xee\xa9\xeb\xde\x29\xba\xca\xa7\xa3\x1f\xd9\x35\x66\x3b\x92\x5f\xb1\x5a\x97\xfc\xcf\x2f\xbf\x38\x33\xd7\x0c\xf9\x9b\xdb\x3b\x7c\x45\xf7\x38\x87\xeb\xc2\x40\xce\x04\x8f\xb5\xcd\x7e\x98\x70\x6a\x02\x19\xc7\x85\xd2\xc7\x99\xe1\xb7\x6e\x3b\xec\x99\x21\x10\xf9\x20\xbd\x97\xc6\x6d\x29\xfc\xf4\x14\xbe\x5b\xea\xa0\xa8\x29\x2a\xef\xe9\xb4\x12\x7a\x6c\xe8\x67\x6f\xc0\xba\x42\x96\x57\x87\xb0\xcd\x93\xe3\x70\xcd\x93\xc7\xe2\x78\x79\xd5\x83\x64\x9e\xb8\x29\x2d\xaf\x28\x4c\x74\x70\xdc\x96\x29\xe0\x89\x86\xcf\x5f\x1a\x0d\x49\x73\x3c\xd1\xae\xc3\x03\xd8\x5e\x5e\xe9\x6e\x02\x74\xea\xa9\xe3\x99\x27\xba\x86\x5d\x27\x77\x28\x6a\xeb\xe2\xbc\x79\x78\xa2\x3b\xa1\xba\xbc\xda\x07\xeb\xf2\xea\x79\xe1\xda\xa7\xee\x86\x06\xed\x22\x79\xf2\x30\x48\x9d\xa8\x27\xc2\x94\x27\x21\xb9\x12\xd9\xdd\x1e\x2a\xa5\x7d\x71\x88\x70\xe7\x65\x97\x52\x2d\x3c\x05\x21\x0d\xe0\x2d\x8b\x4d\x66\xb3\x02\x0c\x1d\x2d\x42\x5d\x73\x1c\x0e\x52\x3b\xaf\xbf\x87\x6b\x5f\x1f\xcf\xb5\xfa\x86\x9b\x78\xfd\x30\xdf\xda\x7d\x35\xd3\x08\xaf\xce\x2b\x21\x87\xc8\xd3\xf5\x78\x79\xfe\x48\x96\x4e\x30\x65\x45\x66\xba\xba\x7f\xe4\x62\x55\x64\x4c\x1d\xe4\xf9\x0a\x15\x15\x7d\xdb\xa7\xe7\x72\x07\x92\xfc\xdc\xe4\x1d\xc0\xd2\x69\xc0\xa3\x78\xda\x4a\x6a\xd0\x74\xdb\x21\x1a\x2c\x3d\xcc\x19\x3c\x55\x3f\xca\x11\xfe\x7b\x64\xfd\x7a\x18\x59\xd7\x1c\x82\x08\x7b\x0f\xfc\x3c\x81\x0b\x4f\xbc\x75\x84\x1f\xc7\xe5\x35\x6c\x57\x1d\x07\xa3\x3a\xcc\xb5\x86\xee\x1a\xe3\x3b\x15\x3f\x2b\xc2\x9f\x87\xef\x2b\xdb\x1f\x81\xec\x92\xda\x2f\xb3\x0c\xf0\x16\xe3\xc2\xa0\xae\xd0\x0a\x4c\x24\x15\x60\x21\xe3\xda\x80\x4c\xf7\xa8\xc9\xe3\x7c\xf0\x8a\x3d\x7d\x76\xe0\xf3\xf3\x97\x5e\xb2\x7e\xca\x3e\xa9\x8b\x93\xbb\x77\xdd\x51\xe3\xe0\xab\x64\xfa\x52\x45\x15\xcd\x5d\x66\xd9\x73\x61\xc0\xca\xed\x56\x49\x43\x23\x8f\x09\x5b\x0f\x45\xab\x5e\xb2\xeb\x1a\xc1\x2b\x61\x79\xa5\x8f\xc2\x49\x9d\x08\x87\xab\xc4\xd3\x48\x27\x48\xba\x38\x6c\x10\x7f\xf5\x68\xe8\x23\xda\xfd\xec\xb4\xc9\x07\xef\x38\x66\xc9\xf2\x6a\x16\x7d\x8c\x99\xb0\x93\x99\xc3\xa9\xa5\xab\x63\xf0\x45\x8c\x59\x65\x8f\xcb\x2b\x5d\x01\x68\x79\xa5\x9f\x0b\x40\x56\x6e\x1f\x80\x3a\x39\x44\xf7\xc2\x25\xf0\xf7\x31\x0c\xa2\xfd\xf2\xde\xc8\x42\xec\x6f\xc8\x63\x7a\x43\xb5\x1b\x84\x15\xdf\xa2\x38\xf2\xfc\x8d\x44\xf6\x85\x33\x61\x9e\x99\x22\x5e\x1e\x4b\x10\xe5\xf4\x66\x75\x15\x54\x36\xa6\xc7\xe7\xb2\xb2\x93\xdd\xad\x0c\x2e\x7c\x6d\xa6\xf0\x4a\xe9\xd2\x43\x6d\xb6\x83\xad\x4b\x12\xfd\xe2\xde\xde\xf2\xfa\x81\x8b\x2a\xd0\x2e\xa7\xe2\x80\x35\xd3\x80\x19\x6e\x50\x18\x1d\x72\x9e\x95\x62\xf9\x7a\xf0\x12\x69\x84\x1e\x73\x5f\x4b\x99\x3d\xb3\xbd\x53\x96\x69\x3c\xd6\xe6\xe5\x1c\x67\x75\xb5\x54\x36\xa7\xc7\xe7\xb2\xb9\x93\xdd\xad\x11\xab\x10\xbb\x1a\x74\x03\xf6\x28\xa3\x36\xdd\xc1\x46\x27\x89\x01\xd1\x99\xcd\x47\x2b\x6a\x4f\x8a\x3c\x73\xf5\x19\x59\xb7\xbd\x9f\xf4\x1c\xb8\x88\xb3\x82\xca\x72\x2c\xcb\x80\x69\x2d\x63\xce\x0c\x26\x74\x08\xaf\x23\x58\x1a\x88\x99\x80\x6b\xb4\xc2\x0b\x8d\x54\x31\xf3\x16\x83\x58\x6e\x36\x52\xec\x8b\xd4\x14\x5b\x0a\x8d\x76\xb4\x0d\x24\x3c\x4d\x51\xa1\xb0\x99\x32\x4b\x8d\xaf\x30\xc7\x34\x4b\xae\x61\xc3\x12\x1c\xee\x51\xb6\xd7\xb4\xf3\x4c\xdf\x6b\xe2\x74\xff\x8b\x55\x59\x38\x2b\x6e\x1d\xfb\xbb\x0f\xf3\xf1\xc8\x95\x46\xcf\x61\xd4\x5d\x7e\xb1\x2d\x5c\x29\xa3\x43\x88\xfb\x40\x4d\x54\x82\xca\x0a\xf1\x65\x04\x5f\x4d\xbd\xdf\xcd\x5b\x36\xa6\xa6\x51\x14\xcd\x6c\x3f\x57\x6c\x3d\x87\xaa\x9f\x2b\xba\x76\x75\x74\x6d\x43\xcf\xaa\x9c\x75\x0e\x65\xe7\xee\x0a\x5a\x97\xb0\xaa\x7b\x10\xb8\x58\x04\xc3\xb4\x6a\x8f\xae\x5c\xbb\xe7\x58\xed\xe3\xf7\x46\x83\xc8\xdb\x8b\xe6\xca\xcc\xba\xdd\xc1\xbe\x9d\xfb\x8d\x69\xb3\x18\xdc\xaa\x7b\xd4\x4b\xee\x9d\x35\xe0\xc5\x02\xe0\xd7\xbe\xd2\xb1\xc1\x2c\xab\x25\x40\x2f\x82\x34\x23\x6b\xd5\x69\xd7\x40\xc8\x84\x72\x25\x66\xc0\x81\x5c\x08\x8c\x0d\x21\x9f\x06\xb1\x6d\x26\x7b\x15\x91\x89\x2b\x89\xc0\x27\xbb\xa3\xcc\x7d\x9d\x99\xa9\x55\xe1\xb8\x35\xb8\x8d\x43\x5c\xa1\xb0\xed\x88\xc1\x3b\x8f\x2b\xad\xf4\xad\x76\x2a\x73\x43\xf5\x54\xaa\x7c\x9c\xed\xa9\x6f\xb7\x9b\x75\x7a\x50\xb3\xe4\x72\x54\xb9\x25\x95\x0a\x7e\x9f\xdb\xb5\xd3\x95\x07\x32\x23\xcd\x81\x0a\x1f\x32\x37\x53\x92\x3e\xf3\x85\x82\xa6\xa0\xde\x82\xff\x45\x28\x26\xf4\xd5\xdd\xa8\xca\x50\xd6\xcd\xe9\xf2\xc5\x4a\xc9\x22\xff\xa1\x56\x20\xdb\xbb\x39\xf1\xef\xb2\x30\xf2\xbd\xfe\x27\xb5\x74\xf5\x31\x4b\x6f\xfe\xb9\xb4\x17\x49\x82\x2d\x2a\xc3\x63\xd4\x70\xed\xf6\xfa\x52\xc1\x46\x2a\xf4\xf7\x08\x16\xb1\xcc\x8a\x8d\xd0\x11\x25\x8c\xc6\x72\x9a\x4c\x0d\x0a\x27\x84\xaa\x3a\x6c\xb5\x52\xb8\xa2\x12\x79\x21\x62\x8b\x0e\x3d\xa7\xd8\x43\x1a\xfd\x53\x72\x01\xd3\xaf\x78\xa7\xab\x86\x33\x98\xcc\x61\x42\xbb\xb4\xb2\x36\x94\xa1\x80\x13\x97\xe5\x6a\x77\xcf\xe4\x05\x9c\xa4\x76\x81\x5c\x24\x78\x5b\x7d\x7b\x69\xbf\x2e\x16\x2e\xd4\xb1\x4d\x9e\xe1\xb9\x7b\xa4\x74\x7b\x0b\x44\x30\xee\x72\xc8\x62\xe1\x6c\x91\x46\x1f\xe9\x15\x49\x08\x37\x08\xd2\x32\x07\xfd\xa3\xde\xe6\x13\x5b\xc1\x6e\xf7\x07\xf5\x75\x19\xa4\x4d\x66\xfe\xf8\x53\x4b\x71\x3e\x71\x09\x8d\xdc\x70\x83\x9b\xdc\xdc\x4d\xa8\x99\x9f\xcd\xc8\x57\x3b\x3b\x2e\xb3\x38\x47\x9e\xce\x22\x92\xea\xcd\xd0\xca\xf0\xdd\x2c\xde\x48\xa1\x0d\x13\xc6\x02\xd9\xb5\xbf\x0c\x6a\xa3\x1e\xf9\xd7\x55\x95\x3c\xcd\x7c\x93\xda\x9e\x60\x3b\xb3\xd3\xa9\x81\x66\xa0\xaf\x85\x59\x91\xd9\xc1\x71\xf4\x3c\x5c\x26\x89\xa2\xc8\xbd\xf1\xae\xb5\x87\x41\xe7\x5f\x0e\x4c\xc1\xbd\x1a\x0d\x0e\xbb\x18\x75\x88\xfc\x70\x17\xd0\x0c\x16\xf4\x61\x17\xe6\xe3\x4a\xd5\xae\xcb\xe1\x1a\x68\xae\x70\x3b\xb8\x04\xfa\xa4\x0a\x68\xbb\x00\xba\xeb\x75\xed\x66\x34\xf1\x10\xf1\x67\xa9\x55\xf2\x43\xab\x1c\x7b\xdf\xd7\xb4\x37\x1c\xe4\xfc\x6e\x1b\x59\xfa\xbe\x7b\xec\x70\x70\x2a\x73\xb6\x37\x44\xdf\xb2\x5f\x1e\xeb\x70\x3d\x3b\xea\x3e\x7f\x7b\x06\x67\xf2\x23\x0e\xf2\xa5\x7d\x9b\x3a\x67\x72\xef\xa4\x2a\xfd\xa9\xd9\xe8\xb0\x43\x05\x11\xc7\xf9\x54\xd9\xeb\x7f\xdd\xad\xc2\x42\xad\x67\x0d\x34\x6a\x73\xa6\x6d\x9d\xb8\x3d\x95\xdb\x0c\x76\xe5\x82\x7b\x5b\x1d\x85\xdb\xde\x5d\x92\x6d\xec\x37\x49\x1d\xbb\xa4\x72\x5f\x54\xea\xe2\x80\x12\xe0\xc2\x4e\x7e\x4b\xeb\x5f\x2c\xe0\x67\xc5\xb7\x2c\x76\x87\x64\x2e\x2b\x8a\xd7\x18\x7f\xd5\xb0\x92\xb0\x46\x65\x13\xb4\x4a\xe5\x9e\x7a\x1a\xf7\x37\xbc\xa9\x27\x95\x86\x26\xde\xb3\x26\x21\x44\x8d\x07\x5d\xd7\x68\xdf\x2e\xec\xbe\xa5\x51\xbb\x6b\x41\x17\x91\x88\x16\xaf\xab\xfc\xb2\xbc\x7b\xeb\x42\xcf\x87\xce\x1b\xaa\x8d\xa8\x54\x5e\x53\x6d\x86\xb3\x8e\xbb\xaa\xd4\xe4\xc5\xf5\xdd\xd0\xbb\xaa\x4d\x91\xed\x0b\xab\xde\x2f\xab\x4b\xa8\xa9\xd0\x00\x00\x9f\xbf\x94\x01\xff\x1b\xbe\x28\x59\xce\xd1\xdd\x6d\xab\xe2\x47\x48\xf2\xb8\x14\x55\x3e\x18\x6e\xbb\x95\x5a\x6c\x1d\xbb\xed\x5b\x2d\xb8\x5f\x43\x8b\xb3\x6a\xd8\xa9\xd5\x56\x14\x45\x97\x55\x4e\xd9\x97\x99\x74\x89\x8f\x6c\xf7\xbd\x2b\x71\x5d\x2d\xe6\x90\x8a\xf6\x3d\xca\x66\x4b\xaf\x11\x1b\x36\xac\xc0\x8c\xfb\x93\xe8\xfd\xc5\x92\xb7\x69\xdb\x86\xae\x93\xa3\x2e\x32\x4a\x2d\x65\x4d\x77\x5b\x96\x15\xf8\x08\xad\x84\x88\xd5\x64\xa4\x39\x6c\x1d\x7c\x52\x16\xe3\xfd\xae\x46\x50\xbe\xf6\x57\xa3\x9f\xd6\xfa\x6b\x1c\xd4\x5b\x58\x0e\x47\x55\x9d\x02\xda\x24\xe4\x37\x3b\x0f\xe8\xb2\xd9\xa9\x8a\xc5\xdb\x59\x4d\xcf\xd5\xf1\x96\x7d\x3a\xe2\x74\xeb\x08\x85\x76\x1e\x73\xb5\x34\xda\x3a\xf9\x6b\xad\xa8\xbe\x84\x56\x6c\xdb\x3f\xf0\x72\x0c\x56\xbb\x21\x69\x3c\x75\x6e\xb8\xe1\xdb\xda\x61\x41\x5a\xcf\xfd\x8c\xcd\xfb\x5c\x85\xc4\x1f\x13\xb8\x26\xbb\x5d\x79\x4e\xd6\x51\x28\xb3\x09\x8f\xcb\xfd\x02\x4e\xa3\xb0\xbf\x13\xd9\x1d\xb0\x2c\x93\x37\x76\x87\xb7\x0e\x39\x21\x17\xab\x0a\xd2\x14\x0e\x6c\x32\x49\x2c\xb6\xb7\xa3\x1f\xa8\xe2\x30\xc7\x07\xeb\x2a\xa6\x51\x50\xa9\x5d\x14\xeb\x70\x58\x22\xd4\x19\xfc\x03\x5e\x75\xe6\x0d\x52\xe9\xe8\x3d\xde\x4c\x27\xd5\x36\xea\xbc\x8b\xab\xa3\x52\x7d\x5c\x53\x25\x9c\xc5\x6b\x8e\x5b\x76\x9d\xa1\x53\x07\xb5\xb7\xea\xa0\x34\xda\xac\x99\x80\x57\x4e\x11\x93\x70\x02\x10\x52\xde\xb0\x88\x56\x0a\xf4\x00\x4c\x4e\x3b\x70\xf2\x70\x0e\xb4\x2d\xd3\x9b\x3d\xf3\x57\x5e\x12\xde\x1c\xf4\x94\xc7\xdb\xf1\xc1\x8a\x8f\x09\x87\x30\xdb\x87\x39\xa7\x0e\x8a\x9e\xdc\xa7\xee\x31\x7b\x3a\x68\xdc\xc8\x7c\x28\x67\x69\xe6\x01\x87\x32\x15\x6a\xff\xd8\x4c\xc5\x65\x9a\x1d\x89\x8a\xfb\xd0\x9d\xa9\x34\xf3\xfd\x32\x55\x69\xed\x16\x3a\x72\x15\x3f\xa2\x4f\x30\xbc\xdb\x0f\xc8\x59\x5a\xb2\x07\x24\x2d\xdf\x66\x82\xd2\x19\x8f\xcb\x4d\xd5\xe3\xe3\x71\xc3\x64\xc1\x29\x9a\x8a\x7b\x9e\x88\xdc\x1a\xec\xe8\x90\xdc\x96\x30\x24\x26\x1f\xec\xf5\xdc\x41\xf9\x28\xad\x3e\x32\x2c\xb7\x17\xf5\xcd\xc7\xe5\x72\x2f\xde\x1b\x97\x5d\x0b\x1b\x89\xba\x43\xf1\x60\xc5\x3e\x39\x18\xb7\xd5\xfb\xe8\x68\xdc\x9c\xdd\xc1\x70\x5c\x69\xe1\x09\xf1\xf8\x21\x7c\x7c\x23\x01\xf9\x68\x6b\x3e\x26\x24\x77\x3b\xff\xdf\x10\x93\x5b\x11\xef\x50\x50\xd6\xfe\x80\xf3\x11\x51\x39\xfc\xfd\x4f\x00\x00\x00\xff\xff\x01\x3a\x11\x79\x6f\x3c\x00\x00") +var _templateBuilderQueryTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x5a\x5f\x6f\xdb\xb8\xb2\x7f\xb6\x3f\xc5\xac\x91\x0d\xec\xc0\x95\xdb\xbe\xdd\x5c\xe4\x02\xd9\xa6\xbd\xc7\xc0\xa2\xbb\xdb\xf6\x60\x17\x28\x8a\x5d\x46\x1a\xd9\xdc\xca\xa4\x96\xa4\x9c\x04\x39\xfe\xee\x07\x1c\x52\x12\xad\x3f\xb1\x9c\x04\x7b\x8a\xf3\x64\x4b\x22\x87\xe4\xcc\x6f\x7e\x33\xe4\xf0\xfe\x7e\x71\x36\x7e\x23\xf3\x3b\xc5\x57\x6b\x03\xaf\x5f\xbe\xfa\x9f\x17\xb9\x42\x8d\xc2\xc0\x3b\x16\xe3\xb5\x94\x5f\x61\x29\xe2\x08\x2e\xb3\x0c\xa8\x91\x06\xfb\x5d\x6d\x31\x89\xc6\x9f\xd6\x5c\x83\x96\x85\x8a\x11\x62\x99\x20\x70\x0d\x19\x8f\x51\x68\x4c\xa0\x10\x09\x2a\x30\x6b\x84\xcb\x9c\xc5\x6b\x84\xd7\xd1\xcb\xf2\x2b\xa4\xb2\x10\xc9\x98\x0b\xfa\xfe\xe3\xf2\xcd\xdb\xf7\x1f\xdf\x42\xca\x33\x04\xff\x4e\x49\x69\x20\xe1\x0a\x63\x23\xd5\x1d\xc8\x14\x4c\x30\x98\x51\x88\xd1\xf8\x6c\xb1\xdb\x8d\xc7\xf7\xf7\x90\x60\xca\x05\xc2\xe4\xaf\x02\xd5\xdd\x04\x76\x3b\xfb\xf2\x24\xff\xba\x82\xf3\x0b\xb8\x66\x1a\xe1\x24\x7a\x23\x45\xca\x57\xd1\xcf\x2c\xfe\xca\x56\x08\xbe\xa7\xc1\x4d\x9e\x31\x83\x30\x59\x23\x4b\x50\x4d\xe0\xa4\xfd\x89\x6f\x72\xa9\x4c\xf9\xc9\x3d\xc1\x74\x3c\xba\xbf\x7f\x01\x8a\x89\x15\xc2\x49\xce\xcc\xda\x0e\x76\x12\x7d\xe4\xd7\x19\x17\xab\x25\xb5\xd2\xb6\xc7\x68\x34\xa1\xe9\xd8\x26\xbb\xdd\xc4\xf5\x43\x91\xd8\x6f\xb3\x31\x8d\x75\x72\x5d\xf0\xcc\xaa\x8b\x44\xfc\x62\x97\xf1\x9e\x6d\xb0\x5c\x89\xc2\x18\xf9\xd6\x7d\xae\xfe\x57\x7d\xec\xa4\x16\x0b\x08\xc5\xec\x76\xd6\x14\x56\x8f\xe5\x9b\x54\x2a\x20\xf5\x70\xb1\xb2\x4d\x73\xa6\x63\x96\xc1\x49\xe4\xc7\x01\x14\x86\x1b\x8e\x3a\x1a\x9b\xbb\x1c\x9b\xd2\xb4\x51\x45\x6c\xe0\x7e\x3c\x8a\x49\x8f\xe3\x51\xc6\x37\xdc\x8c\x46\x67\x5c\x98\xf1\x48\xa6\xa9\xc6\xfa\x49\x25\xa8\x46\xa3\xcf\x5f\x7e\xb2\x7f\xc6\xa3\x42\xf0\xbf\x0a\xb4\x2f\xb4\x51\x5c\xac\xc6\xa3\x5c\x61\xc2\x63\x66\x50\xc3\xe8\xf3\x97\xea\x29\xb2\xa3\x96\x33\x72\x7a\xba\xe1\x66\x0d\x27\xd1\xdb\x64\x85\x5e\x99\x8b\x05\x20\x5b\xa1\x7a\x91\x49\x96\xd8\xd5\xa0\xfd\x16\x8d\x47\xa1\x3d\xd0\xaa\x2a\x72\x1d\x46\x56\x46\xb0\x64\xac\xd6\x7c\x66\xc7\xc3\xe8\xd3\x5d\x8e\xfb\x4a\x1f\x85\x36\x6a\xfd\x5f\x9c\xc1\x65\x92\x70\xc3\xa5\x60\x19\xa4\x1c\xb3\x44\x83\x91\xc0\x92\xc4\xfe\x04\x6a\x8f\x80\x30\x4a\xbd\x4e\xcc\x26\xcf\xec\xb4\x72\xc5\x85\x49\x61\x92\x70\x96\x61\x6c\x16\xdf\xeb\x05\x59\x66\xe1\x24\x4d\x2c\x88\x8c\x54\x1e\xa5\xd4\x97\xa7\xb0\x66\xfa\x53\x89\x48\x27\xaa\x9a\xe7\xad\xd9\xff\x10\xb5\x66\xbd\x58\x00\x17\x06\xd5\x06\x13\x6e\xdb\xd1\x78\x30\xe5\x11\x46\x60\x14\xdb\xa2\xd2\x2c\x03\x8b\xd0\x59\x64\x7b\xee\x4d\x01\xc2\xe7\xe8\x87\x1a\x75\x23\x82\x74\x5a\x88\x78\x1a\x4b\x61\xf0\xd6\x58\x2f\xb3\xbf\x33\x98\xf6\x74\x9a\x03\x2a\x25\xd5\x6c\xec\x40\xfb\xeb\x1a\x15\x5a\xc5\x69\x60\x20\xf0\x06\x2a\x2c\x10\x62\x43\x55\x8e\xed\x40\x4e\x6e\xe5\x03\xa5\x0d\x6b\xa4\xce\x9c\xc8\x69\xae\x21\x8a\xa2\x6e\x64\xcd\x9a\x9d\x2c\xae\x43\xb9\xbb\x5d\x14\x20\xf4\x02\x58\x9e\xa3\x48\x9a\x43\x07\x6d\xe6\x90\xeb\x28\x8a\x66\xe3\x91\x42\x53\x28\x01\x8d\xa6\x7e\xb5\x3f\x5a\x9f\x29\x57\x4b\x0e\x04\xda\x60\x5e\x82\x86\xac\x32\x78\x9d\x24\x6c\xea\xa4\x70\x61\x0e\x2e\xca\xce\xd8\xb5\xbe\x80\x53\xfa\x73\x60\xb6\x3f\x91\x53\xfb\xe9\x0a\x70\x3e\xfe\x84\x09\x3b\x79\x53\x2f\x67\xe8\x94\x7d\xf3\x0b\x38\x75\xff\x0e\x4d\xda\x52\x4e\x3d\x67\x7a\x7a\xc2\x94\x6d\xff\xa9\xb4\x50\xa2\xbf\xc3\x66\x4c\x83\xf6\xa2\x86\x3e\xcf\x41\x1e\xc2\x8b\x8d\xcd\x2e\xe8\x51\x68\x5d\x33\x0d\x9a\x6f\x78\xc6\x14\x37\x77\x8e\x17\x2d\xf3\xd1\x8a\x38\x6a\x1b\x38\xe3\x8c\xa3\x30\x11\x91\x00\x11\xcf\xfd\x7d\x49\x88\xbf\xcf\x3d\x29\x86\x5c\x4a\xf4\x97\xac\xf0\xf7\x20\xfc\x10\x3b\xc1\xb4\x26\x4b\x62\x47\xeb\x39\x33\x98\xfc\x52\x05\x58\x4b\x29\xf4\xd4\x49\xac\xf1\x9a\x71\xe1\x02\x50\x5c\x28\x65\xd3\x09\x47\x39\xd2\x45\x77\xc7\xbb\x55\xe8\x49\x56\x18\x8d\x47\x03\x6d\xd2\x3b\xea\xd4\x5b\x67\x6f\x45\xce\x44\x23\x37\xfa\xf9\x05\x9c\x76\xb4\xb8\x77\x31\xed\xbc\x69\x85\xc8\xbd\xdf\x95\xfd\x23\xe2\xbb\x0b\xcf\x78\xe6\x16\xda\xac\x97\x2a\xb9\xf9\x67\x1f\x61\x12\xf7\x79\xfe\xa3\x59\x8d\x78\x4a\xaf\xce\x2f\x5a\x43\xe7\x0a\x73\xa6\x90\x16\x6b\xc7\x9a\xfd\x2f\xb5\xfc\xee\x02\x04\xcf\x5c\xe7\x12\x3b\x82\x67\x24\xd9\xbe\xa3\x78\x57\xc5\x4d\xbc\x35\x36\x02\x9c\xc0\xe4\x83\x17\x3d\x09\x46\x99\x58\x20\x4c\x2c\x2c\x26\xcb\x04\x85\x99\xc0\x84\xa6\x3f\x81\x17\x2e\x6e\x12\x3e\x0e\x46\x2d\xab\x94\x66\xcc\x1a\x3d\x14\x98\xea\xe0\xea\xc7\xf1\xeb\xa0\xc1\xe7\x76\x39\x63\xb7\x10\xff\x9e\x86\x19\x8f\x08\xcd\x3e\xa0\x59\x4f\x7f\xc7\x95\x36\xe0\xda\x38\xa8\xa5\xf4\x26\x64\x7a\x97\xd5\xdc\x95\x49\xa5\xb3\x22\x7c\xf0\x7d\xce\xde\x4b\xf3\xce\x26\xa2\x6f\xad\x49\xe0\x66\x8d\x02\x84\xb4\x02\x32\x79\x63\x33\xac\x4a\xcc\x0d\xd3\x2e\x65\x1d\xcc\x1c\x34\xbb\x1e\x90\x9c\x85\x53\x9c\x07\x80\xb0\xa8\xce\x0a\x45\x79\xd9\x87\x5a\xfa\xbc\x0f\x24\x2e\x04\xbc\x9a\x45\x97\x59\x46\x20\x19\x97\x88\x0a\x70\xd2\x42\xc9\x8e\x5a\x65\x28\xa6\x3d\xe3\xcd\xe0\xe2\x02\x5e\xb6\x3a\x9f\xee\xa9\xeb\xde\x29\xba\xce\xa7\xa3\x1f\xd9\x35\x66\x3b\x92\x5f\xb3\x5a\x97\xfc\xcf\x2f\xbf\x38\x33\x07\x86\xfc\xcd\xed\x1d\xbe\xa2\x7b\x9c\xc3\x75\x61\x20\x67\x82\xc7\xda\x66\x3f\x4c\x38\x35\x81\x8c\xe3\x42\xe9\xe3\xcc\xf0\x5b\xb7\x1d\xf6\xcc\x50\x12\xf9\x20\xbd\x57\xc6\x6d\x29\xfc\xf4\x14\xbe\x5b\xea\x52\x51\x53\x54\xde\xd3\x69\x25\xf4\xd8\xd0\xcf\xde\x80\xa1\x42\x96\x57\x87\xb0\xcd\x93\xe3\x70\xcd\x93\xc7\xe2\x78\x79\xd5\x83\x64\x9e\xb8\x29\x2d\xaf\x28\x4c\x74\x70\xdc\x96\x29\xe0\x89\x86\xcf\x5f\x1a\x0d\x49\x73\x3c\xd1\xae\xc3\x03\xd8\x5e\x5e\xe9\x6e\x02\x74\xea\x09\xf1\xcc\x13\x1d\x60\xd7\xc9\x1d\x8a\xda\x50\x9c\x37\x0f\x4f\x74\x27\x54\x97\x57\xfb\x60\x5d\x5e\x3d\x2f\x5c\xfb\xd4\xdd\xd0\xa0\x5d\x24\x4f\x1e\x06\xa9\x13\xf5\x44\x98\xf2\xa4\x4c\xae\x44\x76\xb7\x87\x4a\x69\x5f\x1c\x22\xdc\x79\xd5\xa5\x52\x0b\x4f\x41\x48\x03\x78\xcb\x62\x93\xd9\xac\x00\xcb\x8e\x16\xa1\xae\x39\x0e\x07\xa9\x9d\xd7\xdf\xc3\xb5\xaf\x8f\xe7\x5a\x7d\xc3\x4d\xbc\x7e\x98\x6f\xed\xbe\x9a\x69\x84\x57\xe7\xb5\x90\x43\xe4\xe9\x7a\xbc\x3c\x7f\x24\x4b\x27\x98\xb2\x22\x33\x5d\xdd\x3f\x72\xb1\x2a\x32\xa6\x0e\xf2\x7c\x8d\x8a\x9a\xbe\xed\xd3\x73\xb9\x03\x49\x7e\x6e\xf2\x2e\xc1\xd2\x69\xc0\xa3\x78\xda\x4a\x6a\xd0\x74\xdb\x21\x1a\x2c\x3d\xcc\x19\x3c\x55\x3f\xca\x11\xfe\x73\x64\xfd\x7a\x18\x59\x07\x0e\x41\x84\xbd\x07\x7e\x9e\xc0\x85\x27\xde\x10\xe1\xc7\x71\x79\x80\xed\xba\xe3\x60\x54\x97\x73\x0d\xd0\x1d\x30\xbe\x53\xf1\xb3\x22\xfc\x79\xf8\xbe\xb6\xfd\x11\xc8\xae\xa8\xfd\x32\xcb\x00\x6f\x31\x2e\x0c\xea\x1a\xad\xc0\x44\x52\x03\x16\x32\xae\x0d\xc8\x74\x8f\x9a\x3c\xce\x07\xaf\xd8\xd3\x67\x07\x3e\x3f\x7f\xe9\x25\xeb\xa7\xec\x93\xba\x38\xb9\x7b\xd7\x1d\x35\x0e\xbe\x2a\xa6\xaf\x54\x54\xd3\xdc\x65\x96\x3d\x17\x06\xac\xdc\x6e\x95\x34\x34\xf2\x98\xb0\xf5\x50\xb4\xea\x25\xbb\xae\x11\xbc\x12\x96\x57\xfa\x28\x9c\x84\x44\x38\x5c\x25\x9e\x46\x3a\x41\xd2\xc5\x61\x83\xf8\xab\x47\x43\x1f\xd1\xee\x67\xa7\x4d\x3e\x78\xc7\x31\x4b\x96\x57\xb3\xe8\x63\xcc\x84\x9d\xcc\x1c\x4e\x2d\x5d\x1d\x83\x2f\x62\xcc\x3a\x7b\x5c\x5e\xe9\x1a\x40\xcb\x2b\xfd\x5c\x00\xb2\x72\xfb\x00\xd4\xc9\x21\xba\x17\x2e\x25\x7f\x1f\xc3\x20\xda\x2f\xef\x8d\x2c\xc4\xfe\x86\x3c\xa6\x37\x54\xbb\x41\x58\xf1\x2d\x8a\x23\xcf\xdf\x48\x64\x5f\x38\x13\xe6\x99\x29\xe2\xe5\xb1\x04\x51\x4d\x6f\x16\xaa\xa0\xb6\x31\x3d\x3e\x97\x95\x9d\xec\x6e\x65\x70\xe1\x6b\x33\x85\x57\x4a\x97\x1e\x82\xd9\x0e\xb6\x2e\x49\xf4\x8b\x7b\x7b\xcb\xc3\x03\x17\x55\xa0\x5d\x4e\xcd\x01\x6b\xa6\x01\x33\xdc\xa0\x30\xba\xcc\x79\x56\x8a\xe5\xeb\xc1\x4b\xa4\x11\x7a\xcc\x7d\x2d\x65\xf6\xcc\xf6\x4e\x59\xa6\xf1\x58\x9b\x57\x73\x9c\x85\x6a\xa9\x6d\x4e\x8f\xcf\x65\x73\x27\xbb\x5b\x23\x56\x21\x76\x35\xe8\x06\xec\x51\x46\x30\xdd\xc1\x46\x27\x89\x25\xa2\x33\x9b\x8f\xd6\xd4\x9e\x14\x79\xe6\xea\x33\x32\xb4\xbd\x9f\xf4\x1c\xb8\x88\xb3\x82\xca\x72\x2c\xcb\x80\x69\x2d\x63\xce\x0c\x26\x74\x08\xaf\x23\x58\x1a\x88\x99\x80\x6b\xb4\xc2\x0b\x8d\x54\x31\xf3\x16\x83\x58\x6e\x36\x52\xec\x8b\xd4\x14\x5b\x0a\x8d\x76\xb4\x0d\x24\x3c\x4d\x51\xa1\xb0\x99\x32\x4b\x8d\xaf\x30\xc7\x34\x4b\xae\x61\xc3\x12\x1c\xee\x51\xb6\xd7\xb4\xf3\x4c\xdf\x6b\xe2\x74\xff\x8b\x55\x59\x79\x56\xdc\x3a\xf6\x77\x1f\xe6\xe3\x91\x2b\x8d\x9e\xc3\xa8\xbb\xfc\x62\x5b\xb8\x52\x46\x87\x10\xf7\x81\x9a\xa8\x04\x95\x15\xe2\xcb\x08\xbe\x9a\x7a\xbf\x9b\xb7\x6c\x4c\x4d\xa3\x28\x9a\xd9\x7e\xae\xd8\x7a\x0e\x75\x3f\x57\x74\xed\xea\xe8\xda\x96\x3d\xeb\x72\xd6\x39\x54\x9d\xbb\x2b\x68\x5d\xc2\xea\xee\xa5\xc0\xc5\xa2\x34\x4c\xab\xf6\xe8\xca\xb5\x7b\x8e\xd5\x3e\x7e\x6f\x34\x88\xbc\xbd\x68\xae\xcc\xac\xdb\x1d\xec\xdb\xb9\xdf\x98\x36\x8b\xc1\xad\xba\x47\x58\x72\xef\xac\x01\x2f\x16\x00\xbf\xf6\x95\x8e\x0d\x66\x59\x90\x00\xbd\x28\xa5\x19\x19\x54\xa7\x5d\x03\x21\x13\xca\x95\x98\x01\x07\x72\x21\x30\x36\x84\x7c\x1a\xc4\xb6\x99\xec\x55\x44\x26\xae\x24\x02\x9f\xec\x8e\x32\xf7\x75\x66\xa6\x56\x85\xe3\xd6\xd2\x6d\x1c\xe2\x0a\x85\x6d\x47\x2c\xbd\xf3\xb8\xd2\x4a\xdf\x6a\xa7\x32\x37\x54\x4f\xa5\xca\xc7\xd9\x9e\xfa\x76\xbb\x59\xa7\x07\x35\x4b\x2e\x47\x95\x5b\x52\xa9\xe0\xf7\xb9\x5d\x3b\x5d\x79\x20\x33\xd2\x1c\xa8\xf0\x21\x73\x33\x25\xe9\x33\x5f\x28\x68\x0a\xea\x2d\xf8\x5f\x94\xc5\x84\xbe\xba\x1b\x55\x19\xaa\xba\x39\x5d\xbe\x58\x29\x59\xe4\x3f\x04\x05\xb2\xbd\x9b\x13\xff\xaa\x0a\x23\xdf\xeb\xff\xa7\x96\xae\x3e\x66\xe9\xcd\x3f\x57\xf6\x22\x49\xb0\x45\x65\x78\x8c\x1a\xae\xdd\x5e\x5f\x2a\xd8\x48\x85\xfe\x1e\xc1\x22\x96\x59\xb1\x11\x3a\xa2\x84\xd1\x58\x4e\x93\xa9\x41\xe1\x84\x50\x55\x87\xad\x56\x0a\x57\x54\x22\x2f\x44\x6c\xd1\xa1\xe7\x14\x7b\x48\xa3\x7f\x4a\x2e\x60\xfa\x15\xef\x74\xdd\x70\x06\x93\x39\x4c\x68\x97\x56\xd5\x86\x32\x14\x70\xe2\xb2\x5c\xed\xee\x99\xbc\x80\x93\xd4\x2e\x90\x8b\x04\x6f\xeb\x6f\x2f\xed\xd7\xc5\xc2\x85\x3a\xb6\xc9\x33\x3c\x77\x8f\x94\x6e\x6f\x81\x08\xc6\x5d\x0e\x59\x2c\x9c\x2d\xd2\xe8\x23\xbd\x22\x09\xe5\x0d\x82\xb4\xca\x41\xff\x08\xdb\x7c\x62\x2b\xd8\xed\xfe\xa0\xbe\x2e\x83\xb4\xc9\xcc\x1f\x7f\x6a\x29\xce\x27\x2e\xa1\x91\x1b\x6e\x70\x93\x9b\xbb\x09\x35\xf3\xb3\x19\xf9\x6a\x67\xc7\x65\x16\xe7\xc8\xd3\x59\x44\x52\xbd\x19\x5a\x19\xbe\x9b\xc5\x1b\x29\xb4\x61\xc2\x58\x20\xbb\xf6\x97\xa5\xda\xa8\x47\xfe\x75\x55\x27\x4f\x33\xdf\x24\xd8\x13\x6c\x67\x76\x3a\x01\x68\x06\xfa\x5a\x39\x2b\x32\x3b\x38\x8e\x9e\x97\x97\x49\xa2\x28\x72\x6f\xbc\x6b\xed\x61\xd0\xf9\x97\x03\x53\xe9\x5e\x8d\x06\x87\x5d\x8c\x3a\x44\x7e\xb8\x0b\x68\x06\x0b\xfa\xb0\x2b\xe7\xe3\x4a\xd5\xae\xcb\xe1\x1a\x68\xae\x70\x3b\xb8\x04\xfa\xa4\x0a\x68\xbb\x00\xba\xeb\x75\xed\x66\x34\xf1\x10\xf1\x67\xa9\x75\xf2\x43\xab\x1c\x7b\xdf\xd7\xb4\x37\x1c\xe4\xfc\x6e\x1b\x59\xf9\xbe\x7b\xec\x70\x70\x2a\x73\xb6\x37\x44\xdf\xb2\x5f\x1e\xeb\x70\x3d\x3b\xea\x3e\x7f\x7b\x06\x67\xf2\x23\x0e\xf2\xa5\x7d\x9b\x3a\x67\x72\xef\xa4\xaa\xfc\xa9\xd9\xe8\xb0\x43\x95\x22\x8e\xf3\xa9\xaa\xd7\x7f\xbb\x5b\x95\x0b\xb5\x9e\x35\xd0\xa8\xcd\x99\xb6\x75\xe2\xf6\x54\x6e\x33\xd8\x95\x0b\xee\x6d\x75\x14\x6e\x7b\x77\x49\xb6\xb1\xdf\x24\x75\xec\x92\xaa\x7d\x51\xa5\x8b\x03\x4a\x80\x0b\x3b\xf9\x2d\xad\xdf\x5f\xdf\x3b\x89\xfe\xc1\xf4\xcf\x32\xe3\xf1\x9d\xbb\x04\xb1\x6f\xa1\xd0\x4f\x5c\xab\xe8\xed\x96\x65\xd5\xda\x5b\xe9\x76\xbf\xd9\xaa\x59\x86\x17\x00\x6b\x93\x7a\x6a\x6b\xdc\x0f\xf1\x50\x9a\xd4\x16\x98\xf8\x19\x4d\xca\x10\x38\x1e\x74\x1d\xa4\x7d\x7b\xb1\xfb\x16\x48\x70\x97\x83\x2e\x3a\x11\xed\x5e\xd7\xf9\x6b\x75\xb7\xd7\x85\xb6\x0f\x9d\x37\x60\x1b\x51\xaf\xba\x06\xdb\x0c\x97\x1d\x77\x61\xa9\xc9\x8b\xeb\xbb\xa1\x77\x61\x9b\x22\xdb\x17\x62\xbd\xdf\xd7\x97\x5c\x53\xa1\x01\x00\x3e\x7f\xa9\x12\x8a\x6f\xf8\x22\x66\x35\x47\x77\x77\xae\x8e\x4f\x65\x12\xc9\xa5\xa8\xf3\xcd\xf2\x36\x5d\xa5\xc5\xd6\xb1\xde\xbe\xd5\x4a\xf7\x6e\x68\x71\x56\x0f\x3b\xb5\xda\x8a\xa2\xe8\xb2\xce\x59\xfb\x32\x9f\x2e\xf1\x91\xed\xbe\x77\xe5\xae\xab\xc5\x1c\x52\xd1\xbe\xa7\xd9\x6c\xe9\x35\x62\xc3\x92\x15\x98\x71\x7f\xd2\xbd\xbf\x58\x3a\x96\xd0\xb6\x0d\x5d\x57\x47\x5d\x64\x94\xba\xca\x40\x77\x5b\x96\x15\xf8\x08\xad\x94\x11\xb1\xc9\x78\x73\xd8\x3a\xf8\xa4\x2c\xc6\xfb\x5d\x40\x80\xbe\xb6\x18\x30\x4a\x6b\xfd\x01\xc7\xf5\x16\xae\xcb\xa3\xb0\x4e\x01\x6d\x92\xf3\x9b\xa9\x07\x74\xd9\xec\x54\xc7\xfa\xed\x2c\xd0\x73\x7d\x7c\x66\x9f\x8e\x38\x3d\x3b\x42\xa1\x9d\xc7\x68\x2d\x8d\xb6\x4e\x16\x5b\x2b\x0a\x97\xd0\x22\xe1\xfd\x03\x35\xc7\x60\xc1\x0d\x4c\xe3\xa9\x73\xc3\x0d\xdf\x06\x87\x11\x69\x98\x5b\x1a\x9b\x57\xba\x0a\x8c\x3f\x86\x70\x4d\x76\xbb\xea\x1c\xae\xa3\x10\x67\x13\x2a\x97\x5b\x96\x38\x8d\xca\xfd\xa3\xc8\xee\x80\x65\x99\xbc\xb1\x3b\xc8\x75\x99\x73\x72\xb1\xaa\x21\x4d\xe1\xc0\x26\xab\xc4\x62\x7b\x27\x06\x03\x55\x5c\xce\xf1\xc1\xba\x8d\x69\x14\x6c\x82\x8b\x68\x1d\x0e\x4b\x84\x3a\x83\xff\x83\x57\x9d\x79\x89\x54\x3a\x7a\x8f\x37\xd3\x49\xbd\x4d\x3b\xef\xe2\xea\xa8\x52\x1f\xd7\x54\x69\x67\xf1\x9a\xe3\x96\x5d\x67\xe8\xd4\x41\xed\xad\x3a\x28\x4d\x37\x6b\x26\xe0\x95\x53\xc4\xa4\x3c\x61\x28\x53\xea\x72\x11\xad\x00\xfe\x00\x4c\x4e\x3b\x70\xf2\x70\x8e\xb5\xad\xd2\xa7\x3d\xf3\xd7\x5e\x52\xbe\x39\xe8\x29\x8f\xb7\xe3\x83\x15\x25\x53\x1e\xf2\x6c\x1f\xe6\x9c\x10\x14\x3d\xb9\x55\xe8\x31\x7b\x3a\x68\xdc\xf8\x7c\x28\x67\x69\xe6\x01\x87\x32\x15\x6a\xff\xd8\x4c\xc5\x65\xb2\x1d\x89\x8a\xfb\xd0\x9d\xa9\x34\xf7\x13\x55\xaa\xd2\xda\x8d\x74\xe4\x2a\x7e\x44\x9f\x60\x78\xb7\x1f\x90\xb3\xb4\x64\x0f\x48\x5a\xbe\xcd\x04\xa5\x33\x1e\x57\x9b\xb6\xc7\xc7\xe3\x86\xc9\x4a\xa7\x68\x2a\xee\x79\x22\x72\x6b\xb0\xa3\x43\x72\x5b\xc2\x90\x98\x7c\xb0\xd7\x73\x07\xe5\xa3\xb4\xfa\xc8\xb0\xdc\x5e\xd4\x37\x1f\x97\xab\xbd\x7e\x6f\x5c\x76\x2d\x6c\x24\xea\x0e\xc5\x83\x15\xfb\xe4\x60\xdc\x56\xef\xa3\xa3\x71\x73\x76\x07\xc3\x71\xad\x85\x27\xc4\xe3\x87\xf0\xf1\x8d\x04\xe4\xa3\xad\xf9\x98\x90\xdc\xed\xfc\x7f\x43\x4c\x6e\x45\xbc\x43\x41\x59\xfb\x03\xd4\x47\x44\xe5\xf2\xef\xbf\x03\x00\x00\xff\xff\x95\x46\xdc\x23\xcf\x3c\x00\x00") func templateBuilderQueryTmplBytes() ([]byte, error) { return bindataRead( @@ -219,7 +219,7 @@ func templateBuilderQueryTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/builder/query.tmpl", size: 15471, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/builder/query.tmpl", size: 15567, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -904,7 +904,7 @@ func templateHookTmpl() (*asset, error) { return a, nil } -var _templateImportTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x53\xdd\x4a\xe4\x4c\x10\xbd\x9e\x3c\xc5\x21\xcc\x85\x0a\x76\xfc\xbc\xfb\x04\x2f\x44\x14\x84\x65\x11\xf4\x05\x7a\xba\x2b\x49\x61\xd2\x95\xed\xae\x71\x95\x90\x77\x5f\xd2\xc9\xe8\x88\x2c\x7b\x95\x93\x3e\xa7\xfe\xba\x4e\x8f\x63\x75\x56\xdc\xca\xf0\x1e\xb9\x69\x15\x97\x17\xff\xfd\x7f\x3e\x44\x4a\x14\x14\xf7\xd6\xd1\x4e\xe4\x05\x0f\xc1\x19\xdc\x74\x1d\xb2\x28\x61\xe6\xe3\x2b\x79\x53\x3c\xb7\x9c\x90\x64\x1f\x1d\xc1\x89\x27\x70\x42\xc7\x8e\x42\x22\x8f\x7d\xf0\x14\xa1\x2d\xe1\x66\xb0\xae\x25\x5c\x9a\x8b\x03\x8b\x5a\xf6\xc1\x17\x1c\x32\xff\xe3\xe1\xf6\xee\xe7\xd3\x1d\x6a\xee\x08\xeb\x59\x14\x51\x78\x8e\xe4\x54\xe2\x3b\xa4\x86\x1e\x15\xd3\x48\x64\x8a\xb3\x6a\x9a\x8a\x62\x1c\xe1\xa9\xe6\x40\x28\xb9\x1f\x24\x6a\x89\x69\x2a\x16\x88\x93\x62\x53\xd6\xbd\x96\xc5\xa6\x74\x12\x94\xde\x32\xa4\x18\x25\xa6\x19\xf5\x56\xdb\xf9\x9b\x34\x72\x68\xf2\x91\x72\x4f\x65\xb1\x19\xc7\x73\x54\x67\xe0\x26\x48\x24\x34\x14\x28\x2a\x87\x06\x12\xd0\x44\x3b\xb4\x48\x03\x39\xae\xb9\x76\x50\xea\x87\xce\x2a\x25\xe4\x8e\x72\x28\xd7\x08\xa2\x38\xa1\x5f\xd8\x9a\x5b\x09\x35\x37\xe6\xd1\xba\x17\xdb\x10\xb6\x07\x74\x3a\x77\xba\xd9\x94\xe3\xf8\x5d\x34\x4d\xd5\x10\xc9\xb3\xb3\x3a\xb7\x93\x93\x46\x1b\xe6\xf0\x1a\x57\xd7\xd8\x9a\x7b\xa6\xce\xa7\x25\x45\xa6\x7f\xb3\xb6\xd8\xd6\xe6\xf9\x7d\x20\xf3\xf8\xd2\x3c\x5a\x6d\x57\x3a\xd7\x30\x98\xa6\xf2\x20\xa6\xe0\x17\xee\xf8\xe7\x18\x97\x0d\x6b\xbb\xdf\x19\x27\x7d\x55\xaf\x5e\xe0\xe0\xf6\x3b\xab\x12\x2b\x0a\xf9\x26\xff\xa5\xa9\x3c\xdb\x8e\xdc\xa2\x95\xce\x86\xc6\x48\x6c\xaa\xb7\xea\xed\x63\x07\x9f\x9d\x9b\x27\x95\xb8\xcc\xfe\x75\xe0\x75\x99\x57\xd7\x30\x0f\x19\x1e\xa6\xce\x37\xb7\xb2\xcb\x6c\x7f\x9b\x66\x1c\x3f\xd6\x74\xf0\x49\xaa\xac\xf7\xac\x2c\xc1\x76\x25\xb6\xb3\xec\x74\x76\xd3\x1a\x52\xcc\x8f\x03\x37\x9f\x61\xda\x5a\x85\xb3\x01\x3b\x82\xbc\x52\x8c\xec\xc9\xcf\x7e\x95\x98\x9d\x2e\xb0\xde\xe3\x33\x27\xd6\x32\x33\x33\x2c\x5b\x4d\x26\x3b\xe4\x9b\x65\xbf\xb6\x32\x4d\xe3\x48\xc1\x4f\x53\xf1\x27\x00\x00\xff\xff\x15\x28\x37\x15\xa0\x03\x00\x00") +var _templateImportTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x53\xdd\x4a\xe4\x4c\x10\xbd\x9e\x3c\xc5\x21\xcc\x85\x0a\x76\xfc\xbc\xfb\x04\x2f\x44\x14\x84\x65\x11\xf4\x05\x7a\xba\x2b\x49\x61\xa6\x3b\x5b\x5d\xe3\xae\x84\x7e\xf7\x25\x9d\xcc\xaa\xc8\xb2\x57\x73\xa6\x4f\xfd\x9c\xaa\x3a\x99\xa6\xe6\xac\xba\x8d\xe3\x9b\x70\xd7\x2b\x2e\x2f\xfe\xfb\xff\x7c\x14\x4a\x14\x14\xf7\xd6\xd1\x2e\xc6\x17\x3c\x04\x67\x70\x33\x0c\x28\x41\x09\x33\x2f\xaf\xe4\x4d\xf5\xdc\x73\x42\x8a\x07\x71\x04\x17\x3d\x81\x13\x06\x76\x14\x12\x79\x1c\x82\x27\x81\xf6\x84\x9b\xd1\xba\x9e\x70\x69\x2e\x8e\x2c\xda\x78\x08\xbe\xe2\x50\xf8\x6f\x0f\xb7\x77\xdf\x9f\xee\xd0\xf2\x40\x58\xdf\x24\x46\x85\x67\x21\xa7\x51\xde\x10\x5b\xe8\x87\x66\x2a\x44\xa6\x3a\x6b\x72\xae\xaa\x69\x82\xa7\x96\x03\xa1\xe6\xfd\x18\x45\x6b\xe4\x5c\x2d\x10\x27\xd5\xa6\x6e\xf7\x5a\x57\x9b\xda\xc5\xa0\xf4\xab\x40\x12\x89\x92\x66\xb4\xb7\xda\xcf\xbf\x49\x85\x43\x57\x9e\x94\xf7\x54\x57\x9b\x69\x3a\x47\x73\x06\xee\x42\x14\x42\x47\x81\x44\x39\x74\x88\x01\x9d\xd8\xb1\x47\x1a\xc9\x71\xcb\xad\x83\xd2\x7e\x1c\xac\x52\x42\x51\x54\x52\xb9\x45\x88\x8a\x13\xfa\x81\xad\xb9\x8d\xa1\xe5\xce\x3c\x5a\xf7\x62\x3b\xc2\xf6\x88\x4e\x67\xa5\x9b\x4d\x3d\x4d\x5f\x83\x72\x6e\x46\x21\xcf\xce\xea\x2c\xa7\x14\x15\x1b\xe6\xf4\x16\x57\xd7\xd8\x9a\x7b\xa6\xc1\xa7\xa5\x44\xa1\x7f\xb2\xf6\xd8\xb6\xe6\xf9\x6d\x24\xf3\xf8\xd2\x3d\x5a\xed\x57\xba\xf4\x30\xc8\xb9\x3e\x06\x53\xf0\x0b\xf7\xf1\xcf\x47\x5c\x77\xac\xfd\x61\x67\x5c\xdc\x37\xed\xea\x05\x0e\xee\xb0\xb3\x1a\xa5\xa1\x50\x36\xf9\xaf\x98\xc6\xb3\x1d\xc8\xe9\xba\xd0\x45\xa1\x79\xd2\x28\xcb\x8c\x9f\x07\x5b\x8f\x76\x75\x0d\xf3\x50\xe0\x71\xba\xb2\xa1\x95\x5d\x66\xf8\x9b\xea\x69\xfa\x73\x8e\xa3\x1f\x52\x63\xbd\x67\xe5\x18\xec\x50\x63\x3b\x87\x9d\xce\xae\x59\x53\xaa\xf9\x23\xc0\xcd\x7b\x9a\xf6\x56\xe1\x6c\xc0\x8e\x10\x5f\x49\x84\x3d\xf9\xd9\x97\x51\x8a\xa3\x23\xac\xf7\x78\xaf\x89\xb5\xcd\xcc\x8c\xcb\xf5\x92\x29\x4e\xf8\x62\xcd\xcf\x52\x72\x9e\x26\x0a\x3e\xe7\xea\x77\x00\x00\x00\xff\xff\x22\x7f\xe2\x89\x88\x03\x00\x00") func templateImportTmplBytes() ([]byte, error) { return bindataRead( @@ -919,12 +919,12 @@ func templateImportTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/import.tmpl", size: 928, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/import.tmpl", size: 904, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _templateMetaTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x57\x41\x6f\xdb\xb8\x12\x3e\x5b\xbf\x62\x20\xb8\x80\x1d\x24\x72\xdb\xdb\x0b\x90\x43\x5f\x92\xa2\xc1\x2b\x8a\x02\x49\x7b\x79\x58\x14\xb4\x38\xb2\x89\x52\xa4\x4a\x52\x4e\xb3\x82\xfe\xfb\x82\x43\x4a\xa2\x12\x7b\x77\xdb\x8b\x61\x92\xc3\x6f\x66\x3e\xce\x7c\xa4\xba\x6e\x73\x96\x5d\xeb\xe6\xc9\x88\xdd\xde\xc1\xdb\xd7\x6f\xfe\x73\xd1\x18\xb4\xa8\x1c\xbc\x67\x25\x6e\xb5\xfe\x0e\x77\xaa\x2c\xe0\x9d\x94\x40\x46\x16\xfc\xba\x39\x20\x2f\xb2\x87\xbd\xb0\x60\x75\x6b\x4a\x84\x52\x73\x04\x61\x41\x8a\x12\x95\x45\x0e\xad\xe2\x68\xc0\xed\x11\xde\x35\xac\xdc\x23\xbc\x2d\x5e\x0f\xab\x50\xe9\x56\xf1\x4c\x28\x5a\xff\x78\x77\x7d\xfb\xe9\xfe\x16\x2a\x21\x11\xe2\x9c\xd1\xda\x01\x17\x06\x4b\xa7\xcd\x13\xe8\x0a\x5c\xe2\xcc\x19\xc4\x22\x3b\xdb\xf4\x7d\x96\x75\x1d\x70\xac\x84\x42\xc8\x6b\x74\x2c\x87\x30\x79\x01\x8f\xc2\xed\x01\x7f\x3a\x54\x1c\x96\x90\x7f\x66\xe5\x77\xb6\xc3\x1c\x96\x45\xfc\x0b\x17\x7d\x9f\x2d\xba\x0e\x1c\xd6\x8d\x64\x0e\x21\xdf\x23\xe3\x68\x72\x28\x3c\x4a\xd7\x81\xdf\x1b\x9d\x4c\x46\xa2\x6e\xb4\x71\x39\x2c\x69\xa9\xd4\xca\x3a\x58\x65\x8b\xcd\x06\x3e\xb2\x2d\x4a\xd8\x6b\xc9\x2d\x65\x61\x9d\x11\x6a\x07\x92\xa6\x39\x2a\xed\xfc\xd0\xaf\x74\x1d\x48\xfd\x88\x06\x96\xc5\x27\x56\x23\xf4\x3d\xb8\xa7\x66\x4c\x9f\x33\xc7\xb6\xcc\x62\x91\x2d\x02\xe6\x15\xe4\x5d\x07\xcb\x22\x8c\xfa\x3e\x27\x7f\x34\x75\x77\x53\x5c\xfb\x18\x98\x72\x1e\xe6\x85\xf7\x99\x5f\xc1\xa1\x12\x28\xf9\x11\x47\xc7\xc0\x06\xb7\x77\x37\xc5\xbd\xd3\x86\xed\xf0\x7f\xf8\x14\xdc\x7b\x8a\x0d\x53\x3b\x84\x65\x05\x97\x57\xb0\x2c\xde\x7b\x60\xeb\x59\xf5\x7b\x82\x1b\xbf\x50\x4d\x90\xc4\xf8\x10\x79\xb0\xf8\xc7\x90\x27\xaa\xaa\x91\xab\x03\x1a\x87\x3f\xa1\x31\xba\x41\xe3\x9e\x8e\x64\xb3\x98\x79\x88\x79\x54\x47\xb3\x18\x0e\xd9\x6f\x89\x19\x61\xc8\xe8\x96\xef\xd0\x02\xc5\xec\x0d\x97\xc8\x77\x61\x05\x53\x96\xa6\x8c\x68\xfd\x17\x12\xc2\x31\x21\xda\xa9\xfc\x40\x28\xa8\x5b\xc7\x9c\xd0\xca\x0e\x79\x0c\xb8\x31\x8d\x71\xdb\x91\x04\x96\xae\x6e\xa4\x8f\xb1\x31\x42\xb9\x0a\x72\x2e\x98\xc4\xd2\x6d\x5e\xd9\x8d\xef\x8f\x4d\x19\x03\xb7\xbe\x13\x22\x1d\x10\x1b\xe1\xe7\x58\xe4\x01\x86\x2a\x7c\x4d\xe5\x1f\x26\x4e\xc3\x1e\x98\x11\x6c\x2b\xf1\x39\x6c\xd7\x81\xa8\x60\xcf\xec\xc3\x1c\xfa\xef\x3c\xce\x1b\x4f\x54\xa0\x7d\x9f\x7c\x60\xf6\x06\x2b\xd6\x4a\x17\x06\x5f\x99\x14\x9c\x39\x6d\xac\x6f\xa2\xb6\xfe\xa0\xf5\x77\x1b\x96\x3e\x6b\x29\x4a\x7f\xc2\x19\x00\x00\x1d\x9d\x1a\x0c\xe8\x60\x47\xf3\xc4\x44\x54\xc7\x36\xbf\x04\xb8\x02\xc6\x79\x32\x7e\x93\x82\xc4\xb8\x17\x03\xa0\x4a\x1c\x51\x99\x7c\xd2\x0e\xc1\xed\x99\xa3\x52\x18\x59\x83\x2d\x4a\xfd\x08\xcc\xf8\x02\x10\x4e\x30\x29\xfe\x44\x0e\xdb\xa7\xa0\x86\xad\x72\xa2\xc6\x80\xd0\x44\xf5\xd2\xa1\xe6\x47\x73\x2a\x99\xa0\x94\x08\xac\x69\xa4\x28\x69\xaa\x80\x87\x3d\x1a\xac\xb4\xc1\xf3\x80\x20\x1c\xd8\xbd\x6e\x25\x87\x2d\x42\x50\x33\x1c\x15\xa1\x66\x42\x01\xb3\x50\x69\x29\xf5\xa3\xbd\xa4\x2d\xf4\xb3\x08\xa6\xf0\x2d\x8a\xc2\xb5\x56\x95\xd8\x8d\x6a\xda\xf7\x9b\x18\x67\x1e\xf7\xa4\x84\x1c\x98\xf1\x22\x79\x82\x98\x45\xf8\xff\x7f\x8f\x9b\xac\xfc\x81\xca\x15\x7e\x10\x37\x0e\x60\xa7\xc5\x27\xa0\x45\x27\xcc\x2b\x7f\x55\x0c\x55\xb3\x52\xda\xf9\xf1\x9d\xbd\x55\x6d\xbd\x8e\xb6\xa1\xb3\x79\xb4\x09\x7a\x15\x77\xc4\x2e\x23\xab\xd8\xe1\x83\xdd\xac\xc9\x87\xc9\x03\x93\x2d\x9d\x4b\x69\x30\x9c\x46\xa5\xcd\xd0\xf2\x89\x7a\x91\x2c\x15\xd1\xf9\x0c\x73\x2a\x77\x1f\xe6\x83\xa8\x31\xfc\xfb\xf2\xe5\xee\x06\xfa\xbe\x6a\x55\xb9\x5a\xc3\xd8\x1f\x01\xf6\xc1\x5f\x1c\x53\xe2\x23\x49\x23\xd7\x55\xf1\xa5\xe1\xcc\xe1\xcd\xe8\xe8\x54\xe2\x33\xbb\xdf\x4e\xbf\x25\x94\xdf\x4c\x7e\xca\xfc\xb7\xf2\xa5\x5b\x7f\x59\x15\x89\x3a\xa4\xe9\x92\xc4\x86\x5c\x47\x8b\x99\x01\xdd\xc2\x97\x57\x30\x0a\x9d\x8f\x01\x56\xaf\xec\x1a\xd0\x18\x6d\xf2\x67\x11\x0c\xcc\xa8\x98\x9e\xb0\xc0\x3c\x13\x11\x7a\xe0\x20\x9f\x91\x90\x47\x16\xe0\xce\xf9\x0d\x25\x93\x72\x6a\xf6\x6d\x2b\x24\x47\xe3\x25\xc1\xf7\x2c\x58\x76\xc0\x89\xaf\xc1\x0f\x49\xf2\x09\x22\xd2\xc1\x7a\xae\xa6\x9b\xb3\xe1\xb5\x54\xb6\xd6\xe9\x3a\xbc\x3a\x7c\x94\xa8\xda\x3a\x84\x65\x81\x5e\x56\xd3\x6d\xf8\xed\xfc\xc8\x1d\x4f\xf2\x3d\x9c\x97\x6f\xa8\xc1\xf7\xe6\x0c\x74\x2d\x82\xbe\x0d\x5a\x45\x51\x57\xc6\xfb\xdb\x23\xf9\x2c\x82\x93\x78\xbf\xf9\xed\x97\x57\xe0\x8c\xa8\x07\x39\x89\x34\x17\xf7\xe1\x06\x5d\x26\x3a\x93\x5c\xb8\xc1\x6f\xcc\xc9\x8e\xe8\x27\x6a\x6f\xca\xd1\x13\x4a\x86\x29\x4a\xb8\xac\xb3\x2c\xed\x9c\x79\xcf\xf8\xf9\xcd\x19\x40\x25\x14\x27\x7c\xda\x4a\x72\x7e\xa2\x1f\x7c\x9e\xf1\xd9\x93\xaa\x96\xa7\x74\x28\x44\x4f\xde\xac\x4a\x45\x05\xf8\xc3\xaf\x4f\xfe\xbf\x52\x6f\x45\x9b\x17\xa5\xec\x11\x28\xc7\xe5\x64\xf3\xb2\x2e\xd3\xd8\x92\xb4\x43\x6d\x2d\xc2\x3b\x36\xf0\x35\x17\x00\xb8\x4a\x91\xc6\x28\xe7\x7d\x77\xac\xf8\x5e\x9e\x13\x51\x42\xcf\x9a\xf1\xd9\xfc\x6f\x69\x79\x99\xe7\x0c\x79\x78\x1a\x85\x57\x51\x00\x9d\x82\x5a\xfb\x58\x42\x27\xdb\x74\xdb\x1a\x42\x79\xad\xd6\xc3\x4b\xad\xf3\x9b\x0d\xba\xd6\xa8\x38\xb5\xb2\xeb\x6c\xb1\xe8\xb3\x2c\x69\xc0\xe7\x0a\x72\x31\x96\x32\x33\x3b\xbf\x6a\xb0\x44\x71\x08\x8f\xd6\xff\x86\x86\x7e\x1f\x1f\xa3\xd9\x2f\x69\x86\xc7\x1b\x05\x23\x94\x5b\x24\xf1\x97\xc4\x83\x72\x4f\x7c\xae\x26\xec\x39\x1f\x24\x72\x81\x05\xfb\x28\x5c\xb9\x87\xd4\x92\xce\xa2\x64\x96\xfa\x26\x9e\x99\x38\x72\x66\x41\x1a\x94\x5f\x85\xd7\xd0\xf7\xe7\xcf\x24\xfc\xde\x99\xb6\x74\x03\x23\x5d\x07\x0d\xb3\x25\x93\xe1\xfc\x46\xdb\xcb\x50\x99\xf1\x34\x94\x90\x34\x8e\x25\x3c\x5f\xac\x6a\x57\xdc\xfa\xd0\xab\x55\x78\x9c\x4c\x6a\x71\x09\x42\x11\xb9\x09\x7b\xc4\xf1\x91\x7b\xe9\x12\x5e\xfd\xc8\xcf\x93\x94\xfd\xd1\x2f\x7a\x3a\xff\xc5\x24\xa4\xa7\xbe\x0c\xe9\x25\xcc\x38\x17\xfe\xf2\x67\x72\xf8\x44\x7c\xae\xc0\xef\xa6\x2d\x24\x1d\x25\x53\xfe\x25\xa6\x0f\x68\x8c\xe0\xe1\x29\xa6\x0d\x7d\x3e\x6b\x7a\x6c\x4e\x90\xe1\x3b\x7b\xa8\x10\x52\xb0\xa8\xb1\xc5\xa8\xda\xe9\xe7\xf0\x2c\x9a\x84\xda\xec\xaf\x00\x00\x00\xff\xff\x9e\x2c\x22\x88\xfb\x0f\x00\x00") +var _templateMetaTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x57\xdd\x6e\xdb\xb8\x12\xbe\x96\x9e\x62\x20\xb8\x80\x1d\x24\x72\xdb\xbb\x63\x20\x17\x3d\x49\x8a\x1a\xa7\x28\x0a\x24\xed\xcd\xc1\xa2\xa0\xc5\x91\x4d\x94\x22\x55\x92\x72\x9a\x15\xf4\xee\x8b\x21\xa9\xbf\xc4\xde\xdd\xf6\xc6\x30\xc9\xf9\xfd\x38\xf3\x71\xd4\xb6\xeb\x8b\xf4\x46\xd7\x4f\x46\xec\x0f\x0e\xde\xbe\x7e\xf3\x9f\xab\xda\xa0\x45\xe5\xe0\x3d\x2b\x70\xa7\xf5\x77\xd8\xaa\x22\x87\x77\x52\x82\x17\xb2\x40\xe7\xe6\x88\x3c\x4f\x1f\x0e\xc2\x82\xd5\x8d\x29\x10\x0a\xcd\x11\x84\x05\x29\x0a\x54\x16\x39\x34\x8a\xa3\x01\x77\x40\x78\x57\xb3\xe2\x80\xf0\x36\x7f\xdd\x9f\x42\xa9\x1b\xc5\x53\xa1\xfc\xf9\xc7\xed\xcd\xdd\xa7\xfb\x3b\x28\x85\x44\x88\x7b\x46\x6b\x07\x5c\x18\x2c\x9c\x36\x4f\xa0\x4b\x70\x13\x67\xce\x20\xe6\xe9\xc5\xba\xeb\xd2\xb4\x6d\x81\x63\x29\x14\x42\x56\xa1\x63\x19\x84\xcd\x2b\x78\x14\xee\x00\xf8\xd3\xa1\xe2\xb0\x80\xec\x33\x2b\xbe\xb3\x3d\x66\xb0\xc8\xe3\x5f\xb8\xea\xba\x34\x69\x5b\x70\x58\xd5\x92\x39\x84\xec\x80\x8c\xa3\xc9\x20\x27\x2b\x6d\x0b\xa4\x1b\x9d\x8c\x42\xa2\xaa\xb5\x71\x19\x2c\xfc\x51\xa1\x95\x75\xb0\x4c\x93\xf5\x1a\x3e\xb2\x1d\x4a\x38\x68\xc9\xad\xcf\xc2\x3a\x23\xd4\x1e\xa4\xdf\xe6\xa8\xb4\xa3\x25\x9d\xb4\x2d\x48\xfd\x88\x06\x16\xf9\x27\x56\x21\x74\x1d\xb8\xa7\x7a\x48\x9f\x33\xc7\x76\xcc\x62\x9e\x26\xc1\xe6\x35\x64\x6d\x0b\x8b\x3c\xac\xba\x2e\xf3\xfe\xfc\xd6\xf6\x36\xbf\xa1\x18\x98\x72\x64\xe6\x85\xf7\x99\x5f\xc1\xa1\x14\x28\xf9\x09\x47\xa7\x8c\xf5\x6e\xb7\xb7\xf9\xbd\xd3\x86\xed\xf1\x7f\xf8\x14\xdc\x13\xc4\x86\xa9\x3d\xc2\xa2\x84\xcd\x35\x2c\xf2\xf7\x64\xd8\x12\xaa\xa4\x13\xdc\xd0\x41\x39\x9a\xf4\x88\xf7\x91\x07\x89\x7f\x0c\x79\x84\xaa\x1c\xb0\x3a\xa2\x71\xf8\x13\x6a\xa3\x6b\x34\xee\xe9\x44\x36\xc9\xcc\x43\xcc\xa3\x3c\x99\x45\x7f\xc9\xa4\x12\x33\xc2\x90\xd1\x1d\xdf\xa3\x05\x1f\x33\x09\x2e\x90\xef\xc3\x09\x4e\x51\x1a\x33\xf2\xe7\xbf\x90\x10\x0e\x09\x79\x4d\x45\x0b\xa1\xa0\x6a\x1c\x73\x42\x2b\xdb\xe7\xd1\xdb\x8d\x69\x0c\x6a\x27\x12\x58\xb8\xaa\x96\x14\x63\x6d\x84\x72\x25\x64\x5c\x30\x89\x85\x5b\xbf\xb2\x6b\xea\x8f\x75\x11\x03\xb7\xd4\x09\x11\x0e\x88\x8d\xf0\x73\x28\xf2\x60\xc6\x57\xf8\xca\x97\x7f\xd8\x38\x6f\xf6\xc8\x8c\x60\x3b\x89\xcf\xcd\xb6\x2d\x88\x12\x0e\xcc\x3e\xcc\x4d\xff\x9d\xc7\x79\xe3\x89\x12\x34\xf5\xc9\x07\x66\x6f\xb1\x64\x8d\x74\x61\xf1\x95\x49\xc1\x99\xd3\xc6\x52\x13\x35\xd5\x07\xad\xbf\xdb\x70\xf4\x59\x4b\x51\xd0\x0d\xa7\x00\x00\xfe\xea\x54\x2f\xe0\x2f\x76\x10\x9f\x88\x88\xf2\x94\xf2\x4b\x03\xd7\xc0\x38\x9f\xac\xdf\x4c\x8d\xc4\xb8\x93\xde\xa0\x9a\x38\xf2\x65\xf2\x49\x3b\x04\x77\x60\xce\x97\xc2\x80\x1a\xec\x50\xea\x47\x60\x86\x0a\x40\x38\xc1\xa4\xf8\x13\x39\xec\x9e\x02\x1b\x36\xca\x89\x0a\x83\x85\x3a\xb2\x97\x0e\x35\x3f\x88\xfb\x92\x09\x4c\x89\xc0\xea\x5a\x8a\xc2\x6f\xe5\xf0\x70\x40\x83\xa5\x36\x78\x19\x2c\x08\x07\xf6\xa0\x1b\xc9\x61\x87\x10\xd8\x0c\x07\x46\xa8\x98\x50\xc0\x2c\x94\x5a\x4a\xfd\x68\x37\x5e\xc5\xff\x24\x41\x14\xbe\x45\x52\xb8\xd1\xaa\x14\xfb\x81\x4d\xbb\x6e\x1d\xe3\xcc\xa2\xce\x14\x90\x23\x33\x44\x92\x67\x80\x49\xc2\xff\xff\x93\xdd\xc9\xc9\x1f\xa8\x5c\x4e\x8b\xa8\xd8\x1b\x4b\x4e\xdf\x57\x92\x24\x71\x41\x7a\xe1\xef\x29\xcd\x93\xb4\x15\xf4\xa3\x61\x46\x6f\x46\x99\xf7\xf5\xb6\x54\xda\xd1\x7a\x6b\xef\x54\x53\xad\xa2\x6c\xe0\x04\x1e\x65\x02\xd3\x45\x8d\xd8\x9f\x5e\x2a\x72\x43\x2f\x37\xa3\x87\x7e\xf3\xc8\x64\xe3\x6f\xb4\x30\x18\xee\xb1\xd4\xa6\x27\x8b\x09\xef\x79\x42\xcb\xa3\xf3\x99\xcd\xb1\x51\x28\xcc\x07\x51\x61\xf8\xf7\xe5\xcb\xf6\x16\xba\xae\x6c\x54\xb1\x5c\xc1\xd0\x59\xc1\xec\x03\x3d\x39\x63\xe2\x03\x48\x03\xbe\x65\xfe\xa5\xe6\xcc\xe1\xed\xe0\xe8\x5c\xe2\x33\xb9\xdf\x4e\xbf\xf1\x56\x7e\x33\xf9\x31\xf3\xdf\xca\xd7\xcf\x0b\x8b\x32\x9f\xf0\xca\x34\x5d\x4f\xce\x21\xd7\x41\x62\x26\xe0\xdf\xef\xcd\x35\x0c\x14\x49\x31\xc0\xf2\x95\x5d\x01\x1a\xa3\x4d\xf6\x2c\x82\x1e\x19\x15\xd3\x13\x16\x18\x21\x11\x4d\xf7\x18\x64\x33\x10\xb2\x88\x02\x6c\x1d\x29\x14\x4c\xca\x91\x26\x76\x8d\x90\x1c\x0d\x91\x09\x75\x3b\x58\x76\xc4\x11\xaf\xde\x8f\x27\xf3\x33\x40\x4c\x17\xab\x39\x0f\xaf\x2f\xfa\x39\xab\x68\xac\xd3\x55\x98\x57\x28\x4a\x54\x4d\x15\xc2\xb2\xe0\x67\xb2\xf1\x1d\xfd\x76\x79\x62\x3a\xf0\xc4\xdf\xdf\x17\x35\x54\xef\x7b\x7d\x01\xba\x12\x81\x19\x7b\x96\xf3\x51\x97\x86\xfc\x1d\xd0\xfb\xcc\x83\x93\xf8\x32\x92\xfa\xe6\x1a\x9c\x11\x55\x4f\x44\x11\xe6\xfc\x3e\xbc\xbd\x8b\x09\x43\x4d\x9e\xea\xe0\x37\xe6\x64\x07\xeb\x67\x6a\x6f\xcc\x91\x00\xf5\x82\x53\x2b\xe1\x99\x4f\xd3\x69\xe7\xcc\x7b\x86\xf6\xd7\x17\x00\xa5\x50\xdc\xdb\xf7\xaa\xfe\x21\x38\xd3\x0f\x94\x67\x1c\x98\xa6\xac\x45\x90\xf6\x85\x48\xe0\xcd\xaa\x54\x94\x80\x3f\xe8\x7c\xf4\xff\xd5\xf7\x56\x94\x79\x51\xca\x64\xc1\xe7\xb8\x18\x65\x5e\xd6\xe5\x34\xb6\x49\xda\xa1\xb6\x92\x30\x01\x07\xbc\xe6\x04\x00\xd7\x53\x4b\x43\x94\xf3\xbe\x3b\x55\x7c\x2f\xef\xc9\x43\xe2\x07\xa2\x61\xe0\xfe\xb7\xb0\xbc\xcc\x73\x66\xb9\x1f\xaa\xc2\x3c\x15\x8c\x8e\x41\xad\x28\x96\xd0\xc9\x76\xaa\xb6\x82\x50\x5e\xcb\x55\x3f\xe3\xb5\xa4\x6c\xd0\x35\x46\xc5\xad\xa5\x5d\xa5\x49\xd2\xa5\xe9\xa4\x01\x9f\x33\xc8\xd5\x50\xca\xcc\xec\xe9\xd4\x60\x81\xe2\x18\xc6\xdd\xff\x86\x86\x7e\x1f\xc7\xd8\xf4\x97\x38\x83\xec\x0d\x84\x11\xca\x2d\x82\xf8\x4b\xe4\xe1\x73\x9f\xf8\x5c\x8e\xb6\xe7\x78\x78\x92\x0b\x28\xd8\x47\xe1\x8a\x03\x4c\x25\xfd\x5d\x14\xcc\xfa\xbe\x89\x77\x26\x4e\xdc\x59\xa0\x06\x45\xa7\xf0\x1a\xba\xee\xf2\x19\x85\xdf\x3b\xd3\x14\xae\x47\xa4\x6d\xa1\x66\xb6\x60\x32\xdc\xdf\x20\xbb\x09\x95\x19\x6f\x43\x09\xe9\xd7\xb1\x84\xe7\x87\x65\xe5\xf2\x3b\x0a\xbd\x5c\x86\xb1\x66\x64\x8b\x0d\x08\xe5\xc1\x9d\xa0\xe7\x31\x3e\xf1\x2e\x6d\xe0\xd5\x8f\xec\x72\x92\x32\x5d\x7d\xd2\xf9\xfb\x4f\x46\x22\x3d\xf7\x4d\xe9\x67\x68\xc6\xb9\xa0\xc7\x9f\xc9\xfe\xe3\xf2\x39\x03\xbf\x1b\x55\x3c\x75\x14\x4c\xd1\x0c\xa7\x8f\x68\x8c\xe0\x61\x88\xd3\xc6\x7f\x78\x6b\x3f\xa6\x8e\x26\xc3\x17\x7a\x5f\x21\x9e\xc1\x22\xc7\xe6\x03\x6b\x4f\x3f\xa4\x67\xd1\x4c\xa0\x4d\xff\x0a\x00\x00\xff\xff\x63\x70\x08\x4f\x35\x10\x00\x00") func templateMetaTmplBytes() ([]byte, error) { return bindataRead( @@ -939,7 +939,7 @@ func templateMetaTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/meta.tmpl", size: 4091, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/meta.tmpl", size: 4149, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1024,7 +1024,7 @@ func templatePrivacyTmpl() (*asset, error) { return a, nil } -var _templateRuntimeTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x58\x5b\x6f\x1b\xbb\xf1\x7f\xd6\x7e\x8a\xf9\x0b\xfa\x03\x52\x2a\x53\x76\xde\xea\x42\x0f\x69\x2e\x38\x06\x9a\x34\x80\x93\xf4\xc1\x08\x02\x6a\x77\x56\xcb\xe3\x15\xb9\x25\xb9\x8e\x05\x61\xbf\x7b\x31\xbc\xec\x72\x75\x71\x8a\x53\x14\xe8\x8b\xb5\x24\x67\x86\x33\xbf\xb9\xd2\x87\xc3\xea\x55\xf6\x56\x35\x7b\x2d\xb6\x95\x85\xd7\xd7\x37\x7f\xbe\x6a\x34\x1a\x94\x16\x3e\xf0\x1c\x37\x4a\x3d\xc2\x9d\xcc\x19\xbc\xa9\x6b\x70\x44\x06\xe8\x5c\x3f\x61\xc1\xb2\x2f\x95\x30\x60\x54\xab\x73\x84\x5c\x15\x08\xc2\x40\x2d\x72\x94\x06\x0b\x68\x65\x81\x1a\x6c\x85\xf0\xa6\xe1\x79\x85\xf0\x9a\x5d\xc7\x53\x28\x55\x2b\x8b\x4c\x48\x77\xfe\xb7\xbb\xb7\xef\x3f\xdd\xbf\x87\x52\xd4\x08\x61\x4f\x2b\x65\xa1\x10\x1a\x73\xab\xf4\x1e\x54\x09\x36\xb9\xcc\x6a\x44\x96\xbd\x5a\x75\x5d\x96\x39\x1b\xbe\x10\x4b\x2b\xad\xd8\x21\x58\xdc\x35\x35\xb7\x08\x5b\x94\xa8\xb9\x45\xe3\x24\x9a\xbc\xc2\x1d\xbf\x32\x56\xd8\xbc\x12\x72\x0b\xb5\xda\x8a\x1c\xb8\x2c\xa0\x52\x75\xe1\x88\xb2\x9d\x2a\xda\x1a\xe1\x09\xb5\x11\x8a\x34\xe1\x16\x7e\x72\x03\x2d\x59\x64\x55\x2f\xd2\x49\xe4\xc6\xa0\x35\x2c\xcb\xee\x2c\x54\xdc\xc0\x6b\x28\x95\xde\x71\x6b\x18\xbc\x81\x69\x50\x67\x0a\x0d\xcf\x1f\xf9\x16\xbd\x30\x53\xa9\xb6\x2e\x60\x83\x80\xbb\xc6\xee\xaf\xc4\xae\x51\xda\x62\x11\xec\xce\x76\x5c\xc8\x9e\xa3\x54\x3a\xa8\x6d\xe0\xa7\xb0\x15\x54\x4a\x3d\x1a\x50\x1a\x1a\x55\x8b\x5c\xa0\x81\x79\xa3\x2c\x4a\x2b\x78\x0d\xf9\x3e\xaf\x45\x1e\x24\x2e\x98\xc3\xc4\x60\xae\x64\x11\xf4\x22\xf7\x44\x03\x52\xff\x4c\x51\xda\x5e\xcd\xa5\x43\x24\x55\x0e\x84\xc9\xa4\xb2\x20\x31\x47\x63\xb8\xde\xc3\x5c\x2a\x50\x8d\x25\x84\x48\xc5\xa3\x8b\xe1\xf4\xe2\x08\xdf\x23\x62\x93\x6d\x78\xfe\xf8\x93\xeb\xc2\x5c\xe5\x6a\xd7\x70\x2b\x36\xa2\x16\x76\xef\x2d\x6c\x34\x3e\x09\xd5\x9a\xe8\x02\x43\xae\x47\x69\x07\x6f\x43\x81\xa5\x90\xd8\x03\xbc\x72\xda\x77\x5d\x06\x00\x70\x38\x0c\xee\x1f\x3c\x30\xa3\xe3\xc3\x01\x50\x16\x70\x41\x48\xf3\xb8\x4d\x85\x38\x5d\xf0\xd9\x12\xc7\x0c\xa6\x9f\x3d\x36\xd3\x44\x66\xa0\xbd\x7c\x29\x4b\xc4\x85\x8b\x27\x87\x03\xcc\x42\x88\xdd\xae\x61\xc6\x3e\xba\xef\x3b\x59\xaa\x78\x2c\x4a\x72\x6f\x20\x62\xdf\x42\x1c\xc6\xf5\x7d\xbb\x73\x84\xb9\x92\xc6\xc2\x3c\x9b\x4c\x0e\x87\x2b\xaf\xec\x31\x0b\x91\x4d\x26\x71\xb5\x86\xe9\xe1\xe0\x54\x9a\xc2\x6a\x05\x71\xdb\x63\xeb\x72\x77\x8b\x92\x05\x79\x51\xdb\x53\xe1\xf1\xfe\xc9\x84\xbe\x8e\x84\xd2\xd6\xcb\x02\x17\xce\xc4\xb0\x7a\xd1\x1f\xd3\xb8\x3f\x00\x5b\x21\x2f\x50\x07\x5c\xe9\x68\xe6\xb3\xe1\x76\x0d\xd7\x41\x9e\xe6\x72\x8b\x30\x93\x1e\xdc\x4f\xaa\x40\xd3\xc3\x2e\xdb\xdd\x6f\x91\x7e\x26\xd9\xa7\xb8\xec\x3a\x8f\xfa\x4c\xb2\xdf\xb8\xf9\x4c\x79\xb5\xf7\x9b\x03\xcb\x1a\x78\x51\x24\xeb\x1b\x4f\x90\x7a\xb5\x4a\x09\xfd\x62\xa0\x1f\x59\x4b\xd4\xda\x36\x8f\x5b\xd2\xa4\xe4\xb5\xc1\x5e\x87\x8a\x9b\x0f\x02\x6b\x17\x72\xf7\xb9\x6a\x1c\x0c\x03\xfd\x1a\xf0\x9f\x30\x63\xee\x84\x85\x90\x1c\x21\x36\x86\x94\x8c\xf2\x8c\x5d\x07\x54\x25\xe1\xc6\xd8\x98\x91\x57\xb1\x5c\xae\xc2\x2f\xdb\x2a\x70\x29\x16\xa2\x30\x18\x11\x83\x78\x72\x2e\xc8\x57\x1a\xb7\xc2\x58\xf2\xca\x2c\x22\x81\xde\xa0\x6c\x32\x59\xad\x7c\x25\x38\x5f\x77\x47\xb5\x48\x48\xca\x92\x19\x7b\xab\x64\x29\xb6\xbd\x6d\x5d\x97\x68\x77\x1c\x3b\x11\xb8\xd5\x2b\x78\x3d\x54\x1a\x0a\x36\x7b\xc9\x26\xaa\x62\xff\x5b\x76\xbd\x60\xdf\x49\x96\xb8\x4e\x07\x51\xb5\x70\x3f\x54\x5c\x16\x35\x6a\x43\xe5\xd5\xee\x1b\x8c\x75\xdc\x78\xcb\xcf\x94\xba\xc1\xb8\xae\xcb\x42\x89\x9f\x67\x49\xb2\x47\x75\xef\xfd\x0d\xce\xe8\x3e\xd3\xb3\x51\x46\xd3\xf7\xa5\xac\x73\x3c\xe7\x6c\x77\xb9\x95\x6c\x8c\x65\x66\x93\xe9\x56\xd8\xaa\xdd\xb0\x5c\xed\x56\x65\x98\x42\x84\xcc\xdb\x0d\xb7\x4a\xbb\x72\x9f\x2d\xb2\x2c\x0b\x7e\x10\x52\x58\x28\x5b\x99\xbb\x7e\xa4\x91\x17\x06\x78\x5d\x47\x7c\x0a\x34\xb9\x16\x8d\x55\x3a\xf4\xd0\x00\x03\xb1\xbb\x99\x65\x5e\x60\xc9\xdb\xda\xc2\x13\xaf\x5b\x34\x4b\xfa\x15\x05\x77\x0c\x4a\xfb\x96\xbb\x70\x4d\xd1\xbb\x1a\x0d\x08\x4b\xdc\x04\x78\x85\x42\xf7\xed\xfa\x89\x6b\xc1\x37\x35\x1a\x96\x91\x3e\x4e\xb3\xf9\x02\x0e\xd9\x4b\x28\xd1\xd9\x2c\x54\x83\x31\x2c\xe1\x2c\xd8\x71\xbb\x86\x0d\x37\x78\xd6\x3b\x44\x77\x5a\xc2\xb2\xc9\xa4\xf1\xdf\xb7\x6b\x17\x86\x26\x72\x30\xef\x81\x4f\x7c\xe7\x52\xa8\x63\x9e\x67\xbe\x70\xf5\x1a\x1a\x2d\xa4\xf5\x4a\x4d\x99\xab\x60\x14\x2a\x0f\xd7\xdf\x61\xed\x80\x9e\x4b\x7c\xb6\xae\x29\x7f\x6c\x2d\x01\xb5\x48\x17\x70\xa0\xfe\xa0\xd1\xb6\x5a\x0e\xfb\xf8\x81\x18\x1d\x77\x6e\x9f\x21\x57\xd2\xe2\xb3\x25\x5b\xe8\x77\x09\xbb\x81\x54\x28\xb9\x80\x39\x2d\xbf\x91\x47\x96\x80\x5a\xd3\x1d\x4e\xee\x44\x94\xb4\x26\x93\xbc\x71\xec\xfd\x13\xaf\x23\x1f\xc9\x5e\xc2\x6e\xf1\x17\x47\xf3\x7f\x6b\x90\xa2\x0e\x7c\x51\x23\x29\x6a\x27\xd1\x6d\xba\x56\xd6\x9f\x90\x42\x5e\xd9\x28\x87\x8e\x3b\xfa\xdb\x9d\x86\xbd\x07\x3c\xe9\x23\xa7\xe0\xf5\xd8\xfd\xda\x03\x8e\xd4\x39\x80\x26\x2a\xb1\x84\x8a\x78\x7c\xd0\x5c\x94\xea\x2c\xbb\xec\x30\x71\xb6\xb3\xfd\xe9\xa6\xaf\x29\xe4\xd0\xea\xa2\x75\x34\x87\x38\xd6\x77\x21\x41\xfc\xea\xdb\x90\x1e\x47\x43\x82\x64\x1f\xc5\x33\x16\x77\xf2\x1f\xc2\x56\x81\xe9\xef\xba\xa7\x0f\x93\x03\x59\xee\x9b\xd2\x47\xf1\x2c\xe4\xaf\xa1\x71\x64\x0e\x9a\x63\x5e\xd7\x2c\x5d\x47\x7f\x60\x8c\x7d\x7f\xf8\x4e\x41\xe3\x36\xbd\xcf\x93\xbc\x13\x4b\x98\xfd\x20\xca\xe7\x98\x88\xe4\x3a\xaf\x81\xd7\xeb\x44\xfa\x03\xad\x05\xc1\xe4\x65\x9a\xf9\x62\xd9\x8b\xed\x67\xa4\x49\x77\x79\x6a\x92\x81\xf1\xc4\xf2\x41\xf1\x97\x4d\x8f\xf7\x12\xf7\x0f\xf0\xd4\xa9\x84\x73\x57\x27\x06\x97\x61\xd8\x39\xd2\xe2\x0a\x66\x54\x15\x5d\x0e\x25\x91\xf3\x0e\x4d\x3e\x85\x59\xc9\xee\xad\x6e\x73\xeb\x27\x91\x81\x67\xf5\x0a\x50\xb6\x3b\x18\x97\xcb\xd0\x7f\x0a\x90\xc8\x75\xa8\x87\x05\xe6\x35\xd7\x2e\x21\x0d\xcc\xe9\x61\x93\xf4\xa5\x05\x0b\x2d\x79\x92\xc4\xd9\x9c\xca\xeb\xac\x64\x31\xd2\xe6\xae\x53\x97\xec\xce\xbc\x97\xed\x6e\xb1\xa0\xef\xaf\x4d\xc1\x2d\xf6\xb1\x58\xb2\xe3\x40\xec\x05\xce\x4a\xf6\x59\x19\x41\xf7\xc7\x88\xec\x7d\xbc\x5a\x39\x10\x9d\xfd\x5d\x47\xdd\x7a\x78\x1b\x26\xbd\xc2\xbd\x6b\x88\xb0\x8c\xde\x80\x92\xf0\x60\x43\xa4\x44\x11\xb7\xa9\x5b\x92\xb0\x7c\xf0\xec\xa9\x26\x42\xde\xc9\x02\x9f\x29\xa4\x8e\x4f\xfb\x03\xf6\xae\x57\xc2\xfb\xdd\x7b\xb8\x9f\x3e\xfe\xfb\x36\x9c\x57\xff\x57\x0a\xca\x34\x56\x46\x01\x29\x4a\x78\xd9\xbd\xe3\xc0\xf4\x24\x47\xb1\xc9\xa6\x09\x7f\xb0\x26\x4b\xa1\xf0\x5c\x5d\x37\xbc\xe5\xc7\x81\x0a\x4a\x42\xae\x91\xf7\x8f\x56\xa2\xb8\x04\xce\x91\xc8\x75\x0a\x77\x54\x82\xcd\x87\xd7\x1a\x59\xf2\x45\xec\xd0\x7f\x7d\xfd\x7a\xf7\x0e\xba\xce\xf5\xba\xc5\xf0\xfa\xf3\x97\x7d\xa1\x54\xe8\xba\xc5\xb9\xcc\xf5\xa1\x3b\x8e\xf3\x7f\x17\x9a\x11\xd7\x1f\x05\xa8\x75\x42\xfe\x33\x78\x46\x8a\x44\x90\x06\x84\xfe\x08\x2e\xbe\x98\x9e\x49\x78\x07\x8b\x24\xfd\xce\x62\x72\xda\x79\xae\x60\xe6\x6a\x11\xcd\x5a\x8e\xbe\x84\xa9\x1b\xd5\xe6\xff\x6f\x16\x7e\xce\x98\x26\xda\x24\x00\xca\x80\x82\x30\xc0\x87\x09\xb1\x87\x6a\x3a\xc2\x6a\x1a\xc0\x82\x3b\xf7\x3f\x97\x9c\xd7\x54\x21\x37\x7b\x47\xba\x69\x45\x5d\xd0\xc0\xbe\xc1\x52\x69\x04\xc3\x9f\x90\x25\xe5\x90\xde\x78\x23\x5b\x6f\x86\xf2\x36\xe8\x31\x06\x7d\xa0\x7e\xb8\xfe\xee\x40\xf7\x76\x7a\x40\x4f\x2a\xc8\x58\xd0\xe0\x90\xc8\x14\x47\xa6\x64\x12\xbe\xbd\x74\xa1\xa7\x2c\xe5\xd0\x86\x9d\xbc\xb1\x57\x3d\xb4\x51\x6c\xda\xa6\x7e\x5f\x86\x99\x38\xf6\xe5\x73\x75\x7d\xa4\x8a\x2b\x4c\xbf\xbb\x4a\x34\xbf\x78\x55\xe8\xd4\xc7\xb5\x29\x4e\x7c\x71\xe4\x4b\xf8\xff\xea\xdd\x12\xbb\x1e\xbc\x68\x00\xb9\xfd\xc7\x12\x4a\x39\x0c\x69\x84\x40\x3c\x4e\x86\xd4\x52\x9e\x97\x7f\x76\x44\x4d\xe6\xe6\x30\xa0\x0e\x1a\xf7\xbf\xc3\x1c\x9b\x5a\xd4\xcd\x17\x67\x8b\x6f\x3a\xd3\xf5\x4f\xca\x73\x9f\xfe\x7f\x06\x61\xf1\xaf\x00\x00\x00\xff\xff\xf2\xa3\x07\xce\x18\x16\x00\x00") +var _templateRuntimeTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x58\x4b\x6f\xdb\xca\x15\x5e\x8b\xbf\xe2\x54\x50\x01\x29\x95\x47\x76\x76\x75\xa1\x45\x9a\x07\xae\x81\x26\x0d\xe0\x24\x5d\x18\x41\x30\x22\x0f\xc5\xb9\xa6\x66\xd8\x99\xa1\x63\x41\xe0\x7f\x2f\xce\x3c\xc8\xa1\x1e\xbe\xc5\x2d\x0a\xdc\x8d\xc5\xe1\x9c\xe7\x77\x9e\xf4\xe1\xb0\x7a\x95\xbd\x55\xcd\x5e\x8b\x6d\x65\xe1\xf5\xf5\xcd\x5f\xaf\x1a\x8d\x06\xa5\x85\x0f\x3c\xc7\x8d\x52\x8f\x70\x27\x73\x06\x6f\xea\x1a\x1c\x91\x01\xba\xd7\x4f\x58\xb0\xec\x4b\x25\x0c\x18\xd5\xea\x1c\x21\x57\x05\x82\x30\x50\x8b\x1c\xa5\xc1\x02\x5a\x59\xa0\x06\x5b\x21\xbc\x69\x78\x5e\x21\xbc\x66\xd7\xf1\x16\x4a\xd5\xca\x22\x13\xd2\xdd\xff\xe3\xee\xed\xfb\x4f\xf7\xef\xa1\x14\x35\x42\x78\xa7\x95\xb2\x50\x08\x8d\xb9\x55\x7a\x0f\xaa\x04\x9b\x28\xb3\x1a\x91\x65\xaf\x56\x5d\x97\x65\xce\x87\x2f\xc4\xd2\x4a\x2b\x76\x08\x16\x77\x4d\xcd\x2d\xc2\x16\x25\x6a\x6e\xd1\x38\x89\x26\xaf\x70\xc7\xaf\x8c\x15\x36\xaf\x84\xdc\x42\xad\xb6\x22\x07\x2e\x0b\xa8\x54\x5d\x38\xa2\x6c\xa7\x8a\xb6\x46\x78\x42\x6d\x84\x22\x4b\xb8\x85\x9f\xdc\x40\x4b\x1e\x59\xd5\x8b\x74\x12\xb9\x31\x68\x0d\xcb\xb2\x3b\x0b\x15\x37\xf0\x1a\x4a\xa5\x77\xdc\x1a\x06\x6f\x60\x1a\xcc\x99\x42\xc3\xf3\x47\xbe\x45\x2f\xcc\x54\xaa\xad\x0b\xd8\x20\xe0\xae\xb1\xfb\x2b\xb1\x6b\x94\xb6\x58\x04\xbf\xb3\x1d\x17\xb2\xe7\x28\x95\x0e\x66\x1b\xf8\x29\x6c\x05\x95\x52\x8f\x06\x94\x86\x46\xd5\x22\x17\x68\x60\xde\x28\x8b\xd2\x0a\x5e\x43\xbe\xcf\x6b\x91\x07\x89\x0b\xe6\x30\x31\x98\x2b\x59\x04\xbb\x28\x3c\xd1\x81\x34\x3e\x53\x94\xb6\x37\x73\xe9\x10\x49\x8d\x03\x61\x32\xa9\x2c\x48\xcc\xd1\x18\xae\xf7\x30\x97\x0a\x54\x63\x09\x21\x32\xf1\x48\x31\x9c\x2a\x8e\xf0\x3d\x22\x36\xd9\x86\xe7\x8f\x3f\xb9\x2e\xcc\x55\xae\x76\x0d\xb7\x62\x23\x6a\x61\xf7\xde\xc3\x46\xe3\x93\x50\xad\x89\x21\x30\x14\x7a\x94\x76\x88\x36\x14\x58\x0a\x89\x3d\xc0\x2b\x67\x7d\xd7\x65\x00\x00\x87\xc3\x10\xfe\x21\x02\x33\xba\x3e\x1c\x00\x65\x01\x17\x84\x34\x8f\xdb\x54\x88\xb3\x05\x9f\x2d\x71\xcc\x60\xfa\xd9\x63\x33\x4d\x64\x06\xda\xcb\x4a\x59\x22\x2e\x28\x9e\x1c\x0e\x30\x0b\x29\x76\xbb\x86\x19\xfb\xe8\x9e\xef\x64\xa9\xe2\xb5\x28\x29\xbc\x81\x88\x7d\x0b\x79\x18\xcf\xf7\xed\xce\x11\xe6\x4a\x1a\x0b\xf3\x6c\x32\x39\x1c\xae\xbc\xb1\xc7\x2c\x44\x36\x99\xc4\xd3\x1a\xa6\x87\x83\x33\x69\x0a\xab\x15\xc4\xd7\x1e\x5b\x57\xbb\x5b\x94\x2c\xc8\x8b\xd6\x9e\x0a\x8f\xfa\x27\x13\x7a\x3a\x12\x4a\xaf\x5e\x16\xb8\x70\x2e\x86\xd3\x8b\xf1\x98\xc6\xf7\x03\xb0\x15\xf2\x02\x75\xc0\x95\xae\x66\xbe\x1a\x6e\xd7\x70\x1d\xe4\x69\x2e\xb7\x08\x33\xe9\xc1\xfd\xa4\x0a\x34\x3d\xec\xb2\xdd\xfd\x12\xe9\x67\x92\x7d\x8a\xc7\xae\xf3\xa8\xcf\x24\xfb\x85\x9b\xcf\x54\x57\x7b\xff\x72\x60\x59\x03\x2f\x8a\xe4\x7c\xe3\x09\xd2\xa8\x56\x29\xa1\x3f\x0c\xf4\x23\x6f\x89\x5a\xdb\xe6\x71\x4b\x96\x94\xbc\x36\xd8\xdb\x50\x71\xf3\x41\x60\xed\x52\xee\x3e\x57\x8d\x83\x61\xa0\x5f\x03\xfe\x1b\x66\xcc\xdd\xb0\x90\x92\x23\xc4\xc6\x90\x92\x53\x9e\xb1\xeb\x80\xba\x24\xdc\x18\x1b\x2b\xf2\x2a\xb6\xcb\x55\xf8\x65\x5b\x05\xae\xc4\x42\x16\x06\x27\x62\x12\x4f\xce\x25\xf9\x4a\xe3\x56\x18\x4b\x51\x99\x45\x24\xd0\x3b\x94\x4d\x26\xab\x95\xef\x04\xe7\xfb\xee\xa8\x17\x09\x49\x55\x32\x63\x6f\x95\x2c\xc5\xb6\xf7\xad\xeb\x12\xeb\x8e\x73\x27\x02\xb7\x7a\x05\xaf\x87\x4e\x43\xc9\x66\x2f\xf9\x44\x5d\xec\x8f\xe5\xd7\x0b\xfe\x9d\x54\x89\x9b\x74\x10\x4d\x0b\xfa\xa1\xe2\xb2\xa8\x51\x1b\x6a\xaf\x76\xdf\x60\xec\xe3\xc6\x7b\x7e\xa6\xd5\x0d\xce\x75\x5d\x16\x5a\xfc\x3c\x4b\x8a\x3d\x9a\x7b\xef\x35\x38\xa7\xfb\x4a\xcf\x46\x15\x4d\xcf\x97\xaa\xce\xf1\x9c\xf3\xdd\xd5\x56\xf2\x62\x2c\x33\x9b\x4c\xb7\xc2\x56\xed\x86\xe5\x6a\xb7\x2a\xc3\x16\x22\x64\xde\x6e\xb8\x55\xda\xb5\xfb\x6c\x91\x65\x59\x88\x83\x90\xc2\x42\xd9\xca\xdc\xcd\x23\x8d\xbc\x30\xc0\xeb\x3a\xe2\x53\xa0\xc9\xb5\x68\xac\xd2\x61\x86\x06\x18\x88\xdd\xed\x2c\xf3\x02\x4b\xde\xd6\x16\x9e\x78\xdd\xa2\x59\xd2\xaf\x28\xb8\x63\x50\xda\x8f\xdc\x85\x1b\x8a\x3e\xd4\x68\x40\x58\xe2\x26\xc0\x2b\x14\xba\x1f\xd7\x4f\x5c\x0b\xbe\xa9\xd1\xb0\x8c\xec\x71\x96\xcd\x17\x70\xc8\x5e\x42\x89\xee\x66\xa1\x1b\x8c\x61\x09\x77\xc1\x8f\xdb\x35\x6c\xb8\xc1\xb3\xd1\x21\xba\xd3\x16\xe6\x9a\x2f\x34\x5a\x48\xeb\x35\x4c\x99\xbf\xa3\xc0\xc3\xda\x65\xa6\x89\x42\x98\x0f\xca\x27\xbe\x73\x55\xd5\x05\xd2\xf9\xe2\x8c\x14\xd7\xd4\x48\xc8\xc3\xf5\x77\x58\x3b\xec\xe7\x12\x9f\xad\x9b\xd3\x1f\x5b\x4b\xd8\x2d\xd2\x03\x1c\x68\x64\x68\xb4\xad\x96\xc3\x7b\xfc\x40\x8c\x8e\x3b\xb7\xcf\x90\x2b\x69\xf1\xd9\x92\x7b\xf4\xbb\x84\xdd\x40\x2a\x94\x5c\xc0\x9c\x8e\xdf\x28\x48\x4b\x40\xad\x49\x87\x93\x3b\x11\x25\x9d\x09\xa1\xcb\xfe\xb2\xf7\x4f\xbc\x8e\xb2\x48\xdf\x12\x76\x8b\xbf\x39\xbe\x3f\xad\x41\x8a\x3a\xc8\x8a\x56\x4a\x51\x3b\x2d\xee\xa5\x9b\x78\xfd\x0d\x19\xe9\x1d\x88\x72\xe8\xba\xa3\xbf\xdd\x69\x75\xf8\xb8\x24\xe3\xe6\x14\xd0\x1e\xcf\xe0\xc2\x0b\x51\x71\xa4\x2e\x28\xb4\x78\x89\x25\x54\xc4\xe3\x73\xeb\xa2\x54\xe7\xd9\xe5\x20\x8a\xb3\x03\xf0\x2f\x37\x7d\xeb\xa1\x20\x57\x17\xbd\xa3\x75\xc5\xb1\xbe\x0b\x75\xe4\x4f\xdf\x86\x2a\x3a\xda\x25\x24\xfb\x28\x9e\xb1\xb8\x93\xff\x12\xb6\x0a\x4c\xff\xd4\x3d\x7d\x58\x30\xc8\x73\x3f\xbb\x3e\x8a\x67\x21\x7f\x1b\x1a\x47\xe6\xa0\x39\xe6\x75\x33\xd5\x0d\xfe\x07\xc6\xd8\xf7\x87\xef\x94\x48\xee\xa5\x8f\x79\x52\x9e\x62\x09\xb3\x1f\x44\xf9\x1c\xeb\x95\x42\xe7\x2d\xf0\x76\x9d\x48\x7f\xa0\xb3\x20\x98\xbc\x4c\x33\x5f\x2c\x7b\xb1\xfd\x2a\x35\xe9\x2e\x2f\x57\x32\x30\x9e\x78\x3e\x18\xfe\xb2\xeb\x51\x2f\x71\xff\x08\x95\x9d\x4a\x38\xa7\x3a\x71\xb8\x0c\x3b\xd1\x91\x15\x57\x30\xa3\xe6\x49\x97\x69\xe6\xbc\x43\x93\x4f\x61\x56\xb2\x7b\xab\xdb\xdc\xfa\x85\x65\xe0\x59\xbd\x02\x94\xed\x0e\xc6\x5d\x35\x8c\xa9\x02\x24\x72\x1d\xda\x66\x81\x79\xcd\xb5\x2b\x48\x03\x73\xfa\xfe\x49\xc6\xd7\x82\x85\xc9\x3d\x49\xf2\x6c\x4e\x5d\x78\x56\xb2\x98\x69\x73\x37\xd0\x4b\x76\x67\xde\xcb\x76\xb7\x58\xd0\xf3\xd7\xa6\xe0\x16\xfb\x5c\x2c\xd9\x71\x22\xf6\x02\x67\x25\xfb\xac\x8c\x20\xfd\x31\x23\xfb\x18\xaf\x56\x0e\x44\xe7\x7f\xd7\xd1\x50\x1f\x3e\x21\x93\x91\xe2\x3e\x7f\x88\xb0\x8c\xd1\x80\x92\xf0\x60\x43\xa6\x44\x11\xb7\x69\x58\x92\xb4\x7c\xf0\xec\xa9\x25\x42\xde\xc9\x02\x9f\x29\xa5\x8e\x6f\xfb\x0b\xf6\xae\x37\xc2\xc7\xdd\x47\xb8\x5f\x52\xfe\xff\x3e\x9c\x37\xff\xb7\x0c\x94\x69\xae\x8c\x12\x52\x94\xf0\x72\x78\xc7\x89\xe9\x49\x8e\x72\x93\x4d\x13\xfe\xe0\x4d\x96\x42\xe1\xb9\xba\x6e\xf8\xe4\x1f\x27\x2a\x28\x09\xb9\x46\xde\x7f\xdb\x12\xc5\x25\x70\x8e\x44\xae\x53\xb8\xa3\x11\x6c\x3e\x7c\xd4\x91\x27\x5f\xc4\x0e\xfd\xd3\xd7\xaf\x77\xef\xa0\xeb\xdc\xfc\x5b\x0c\x1f\x89\x5e\xd9\x17\x2a\x85\xae\x5b\x9c\xab\x5c\x9f\xba\xe3\x3c\xff\x6f\xa1\x19\x71\xfd\x5e\x80\x5a\x27\xe4\x7f\x83\x67\x64\x48\x04\x69\x40\xe8\xf7\xe0\xe2\x9b\xe9\x99\x82\x77\xb0\x48\xb2\xef\x2c\x26\xa7\x93\xe7\x0a\x66\xae\x17\xd1\x4a\xe6\xe8\x4b\x98\xba\x8d\x6e\xfe\x67\xb3\xf0\xbb\xc7\x34\xb1\x26\x01\x50\x06\x14\x84\x01\x3e\x2c\x92\x3d\x54\xd3\x11\x56\xd3\x00\x16\xdc\xb9\x7f\xcd\xe4\xbc\xa6\x0e\xb9\xd9\x3b\xd2\x4d\x2b\xea\x82\xf6\xfa\x0d\x96\x4a\x23\x18\xfe\x84\x2c\x69\x87\xf4\x29\x38\xf2\xf5\x66\x68\x6f\x83\x1d\x63\xd0\x07\xea\x87\xeb\xef\x0e\x74\xef\xa7\x07\xf4\xa4\x83\x8c\x05\x0d\x01\x89\x4c\x71\x65\x4a\x16\xe6\xdb\x4b\x0a\x3d\x65\x29\x87\x31\xec\xe4\x8d\xa3\xea\xa1\x8d\x62\xd3\x31\xf5\xeb\x32\xac\xce\x71\x2e\x9f\xeb\xeb\x23\x53\x5c\x63\xfa\xd5\x75\xa2\xf9\x45\x55\x61\x52\x1f\xf7\xa6\xb8\xf1\xc5\x95\x2f\xe1\xff\xbb\x0f\x4b\x9c\x7a\xf0\xa2\x03\x14\xf6\x1f\x4b\x28\xe5\xb0\xa4\x11\x02\xf1\x3a\x59\x5c\x4b\x79\x5e\xfe\xd9\x15\x35\xd9\xa5\xc3\x82\x3a\x58\xdc\xff\x0e\x7b\x6c\xea\x51\x37\x5f\x9c\x6d\xbe\xe9\x4e\xd7\x7f\x79\x9e\x7b\xf4\xff\x5a\x08\x87\xff\x04\x00\x00\xff\xff\x81\x3a\x42\x8c\x3f\x16\x00\x00") func templateRuntimeTmplBytes() ([]byte, error) { return bindataRead( @@ -1039,7 +1039,7 @@ func templateRuntimeTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "template/runtime.tmpl", size: 5656, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "template/runtime.tmpl", size: 5695, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/entc/gen/template/base.tmpl b/entc/gen/template/base.tmpl index 30483d8f3..8b822121f 100644 --- a/entc/gen/template/base.tmpl +++ b/entc/gen/template/base.tmpl @@ -17,6 +17,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -86,7 +87,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -113,7 +114,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -132,7 +133,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -159,7 +160,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } {{/* expand error types and global helpers. */}} diff --git a/entc/gen/template/builder/query.tmpl b/entc/gen/template/builder/query.tmpl index f62ed2ab2..41521a2ca 100644 --- a/entc/gen/template/builder/query.tmpl +++ b/entc/gen/template/builder/query.tmpl @@ -351,7 +351,11 @@ func ({{ $receiver }} *{{ $builder }}) prepareQuery(ctx context.Context) error { } {{ $receiver }}.{{ $.Storage }} = prev } - // Privacy and query checks go here. + {{- if $.HasPolicy }} + if err := {{ $.Package }}.Policy.EvalQuery(ctx, {{ $receiver }}); err != nil { + return err + } + {{- end }} return nil } diff --git a/entc/gen/template/import.tmpl b/entc/gen/template/import.tmpl index a0c677637..649dc5f37 100644 --- a/entc/gen/template/import.tmpl +++ b/entc/gen/template/import.tmpl @@ -23,7 +23,6 @@ import ( {{- end }} "github.com/facebookincubator/ent" "github.com/facebookincubator/ent/dialect" - "golang.org/x/xerrors" {{- with $.Storage }} {{- range $import := .Imports }} "{{ $import }}" diff --git a/entc/gen/template/meta.tmpl b/entc/gen/template/meta.tmpl index 738c7935e..5e7c5eeff 100644 --- a/entc/gen/template/meta.tmpl +++ b/entc/gen/template/meta.tmpl @@ -54,6 +54,9 @@ const ( {{- if $numHooks }} Hooks [{{ $numHooks }}]ent.Hook {{- end }} + {{- if $.HasPolicy }} + Policy ent.Policy + {{- end }} {{- range $f := $.Fields }} {{- if and $f.Default (not $f.IsEnum) }} {{- $default := $f.DefaultName }} diff --git a/entc/gen/template/runtime.tmpl b/entc/gen/template/runtime.tmpl index 3ffa22e51..45225f6a7 100644 --- a/entc/gen/template/runtime.tmpl +++ b/entc/gen/template/runtime.tmpl @@ -85,10 +85,10 @@ func init() { {{- $pkg := $n.Package }} {{- $schema := base $.Config.Schema }} {{- if $n.HasPolicy }} - policy := {{ $schema }}.{{ $n.Name }}{}.Policy() + {{ print $pkg ".Policy" }} = {{ $schema }}.{{ $n.Name }}{}.Policy() {{ print $pkg ".Hooks" }}[0] = func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { - if err := policy.EvalMutation(ctx, m); err != nil { + if err := {{ print $pkg ".Policy" }}.EvalMutation(ctx, m); err != nil { return nil, err } return next.Mutate(ctx, m) diff --git a/entc/integration/config/ent/ent.go b/entc/integration/config/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/entc/integration/config/ent/ent.go +++ b/entc/integration/config/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/config/ent/user_query.go b/entc/integration/config/ent/user_query.go index 06c902c84..87c067458 100644 --- a/entc/integration/config/ent/user_query.go +++ b/entc/integration/config/ent/user_query.go @@ -270,7 +270,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/customid/ent/blob_query.go b/entc/integration/customid/ent/blob_query.go index 92f51d712..62032ab4f 100644 --- a/entc/integration/customid/ent/blob_query.go +++ b/entc/integration/customid/ent/blob_query.go @@ -358,7 +358,6 @@ func (bq *BlobQuery) prepareQuery(ctx context.Context) error { } bq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/customid/ent/car_query.go b/entc/integration/customid/ent/car_query.go index 2f8e82dbf..c69b74362 100644 --- a/entc/integration/customid/ent/car_query.go +++ b/entc/integration/customid/ent/car_query.go @@ -327,7 +327,6 @@ func (cq *CarQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/customid/ent/ent.go b/entc/integration/customid/ent/ent.go index 25b1a88b2..73b6169fc 100644 --- a/entc/integration/customid/ent/ent.go +++ b/entc/integration/customid/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -16,7 +17,6 @@ import ( "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" "github.com/google/uuid" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -25,6 +25,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -117,7 +118,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -144,7 +145,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -163,7 +164,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -190,7 +191,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/customid/ent/group_query.go b/entc/integration/customid/ent/group_query.go index 8c9b2db2d..e338ce324 100644 --- a/entc/integration/customid/ent/group_query.go +++ b/entc/integration/customid/ent/group_query.go @@ -303,7 +303,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/customid/ent/pet_query.go b/entc/integration/customid/ent/pet_query.go index 242139204..22602e275 100644 --- a/entc/integration/customid/ent/pet_query.go +++ b/entc/integration/customid/ent/pet_query.go @@ -395,7 +395,6 @@ func (pq *PetQuery) prepareQuery(ctx context.Context) error { } pq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/customid/ent/user_query.go b/entc/integration/customid/ent/user_query.go index 5f59f2cfb..4b641f011 100644 --- a/entc/integration/customid/ent/user_query.go +++ b/entc/integration/customid/ent/user_query.go @@ -395,7 +395,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/card_query.go b/entc/integration/ent/card_query.go index 3d31ee93e..116885498 100644 --- a/entc/integration/ent/card_query.go +++ b/entc/integration/ent/card_query.go @@ -359,7 +359,6 @@ func (cq *CardQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/comment_query.go b/entc/integration/ent/comment_query.go index 60321b8b7..ffe478353 100644 --- a/entc/integration/ent/comment_query.go +++ b/entc/integration/ent/comment_query.go @@ -294,7 +294,6 @@ func (cq *CommentQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/ent.go b/entc/integration/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/entc/integration/ent/ent.go +++ b/entc/integration/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/ent/fieldtype_query.go b/entc/integration/ent/fieldtype_query.go index 56db00607..1a39f696e 100644 --- a/entc/integration/ent/fieldtype_query.go +++ b/entc/integration/ent/fieldtype_query.go @@ -294,7 +294,6 @@ func (ftq *FieldTypeQuery) prepareQuery(ctx context.Context) error { } ftq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/file_query.go b/entc/integration/ent/file_query.go index 2428981b8..5386e940a 100644 --- a/entc/integration/ent/file_query.go +++ b/entc/integration/ent/file_query.go @@ -358,7 +358,6 @@ func (fq *FileQuery) prepareQuery(ctx context.Context) error { } fq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/filetype_query.go b/entc/integration/ent/filetype_query.go index c11e7ead1..3508e5665 100644 --- a/entc/integration/ent/filetype_query.go +++ b/entc/integration/ent/filetype_query.go @@ -327,7 +327,6 @@ func (ftq *FileTypeQuery) prepareQuery(ctx context.Context) error { } ftq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/group_query.go b/entc/integration/ent/group_query.go index 5672119d1..4fe8f3221 100644 --- a/entc/integration/ent/group_query.go +++ b/entc/integration/ent/group_query.go @@ -420,7 +420,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/groupinfo_query.go b/entc/integration/ent/groupinfo_query.go index 6ac2022d3..65a109052 100644 --- a/entc/integration/ent/groupinfo_query.go +++ b/entc/integration/ent/groupinfo_query.go @@ -327,7 +327,6 @@ func (giq *GroupInfoQuery) prepareQuery(ctx context.Context) error { } giq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/item_query.go b/entc/integration/ent/item_query.go index 8d97fe745..f849d72ba 100644 --- a/entc/integration/ent/item_query.go +++ b/entc/integration/ent/item_query.go @@ -270,7 +270,6 @@ func (iq *ItemQuery) prepareQuery(ctx context.Context) error { } iq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/node_query.go b/entc/integration/ent/node_query.go index 9427aba1d..1d0e12805 100644 --- a/entc/integration/ent/node_query.go +++ b/entc/integration/ent/node_query.go @@ -357,7 +357,6 @@ func (nq *NodeQuery) prepareQuery(ctx context.Context) error { } nq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/pet_query.go b/entc/integration/ent/pet_query.go index f3d786389..78a9b5919 100644 --- a/entc/integration/ent/pet_query.go +++ b/entc/integration/ent/pet_query.go @@ -357,7 +357,6 @@ func (pq *PetQuery) prepareQuery(ctx context.Context) error { } pq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/spec_query.go b/entc/integration/ent/spec_query.go index 3cfadfffe..979297907 100644 --- a/entc/integration/ent/spec_query.go +++ b/entc/integration/ent/spec_query.go @@ -303,7 +303,6 @@ func (sq *SpecQuery) prepareQuery(ctx context.Context) error { } sq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/ent/user_query.go b/entc/integration/ent/user_query.go index 9d7dcfb9b..1fd65e20e 100644 --- a/entc/integration/ent/user_query.go +++ b/entc/integration/ent/user_query.go @@ -631,7 +631,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/card_query.go b/entc/integration/gremlin/ent/card_query.go index d3f308d13..a73e6b2db 100644 --- a/entc/integration/gremlin/ent/card_query.go +++ b/entc/integration/gremlin/ent/card_query.go @@ -349,7 +349,6 @@ func (cq *CardQuery) prepareQuery(ctx context.Context) error { } cq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/comment_query.go b/entc/integration/gremlin/ent/comment_query.go index e56a09afd..d7f032e96 100644 --- a/entc/integration/gremlin/ent/comment_query.go +++ b/entc/integration/gremlin/ent/comment_query.go @@ -294,7 +294,6 @@ func (cq *CommentQuery) prepareQuery(ctx context.Context) error { } cq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/ent.go b/entc/integration/gremlin/ent/ent.go index ebe1836c5..deef1cf2e 100644 --- a/entc/integration/gremlin/ent/ent.go +++ b/entc/integration/gremlin/ent/ent.go @@ -7,6 +7,7 @@ package ent import ( + "errors" "fmt" "strconv" "strings" @@ -16,7 +17,6 @@ import ( "github.com/facebookincubator/ent/dialect/gremlin/encoding/graphson" "github.com/facebookincubator/ent/dialect/gremlin/graph/dsl" "github.com/facebookincubator/ent/dialect/gremlin/graph/dsl/__" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -25,6 +25,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -164,7 +165,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -191,7 +192,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -210,7 +211,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -237,7 +238,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } // Code implements the dsl.Node interface. diff --git a/entc/integration/gremlin/ent/fieldtype_query.go b/entc/integration/gremlin/ent/fieldtype_query.go index 14710e055..5f19f4a3a 100644 --- a/entc/integration/gremlin/ent/fieldtype_query.go +++ b/entc/integration/gremlin/ent/fieldtype_query.go @@ -294,7 +294,6 @@ func (ftq *FieldTypeQuery) prepareQuery(ctx context.Context) error { } ftq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/file_query.go b/entc/integration/gremlin/ent/file_query.go index 862ce929e..a04ef1bff 100644 --- a/entc/integration/gremlin/ent/file_query.go +++ b/entc/integration/gremlin/ent/file_query.go @@ -349,7 +349,6 @@ func (fq *FileQuery) prepareQuery(ctx context.Context) error { } fq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/filetype_query.go b/entc/integration/gremlin/ent/filetype_query.go index c15ddd03e..05693b443 100644 --- a/entc/integration/gremlin/ent/filetype_query.go +++ b/entc/integration/gremlin/ent/filetype_query.go @@ -321,7 +321,6 @@ func (ftq *FileTypeQuery) prepareQuery(ctx context.Context) error { } ftq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/group_query.go b/entc/integration/gremlin/ent/group_query.go index fccebbba4..7adaef725 100644 --- a/entc/integration/gremlin/ent/group_query.go +++ b/entc/integration/gremlin/ent/group_query.go @@ -400,7 +400,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/groupinfo_query.go b/entc/integration/gremlin/ent/groupinfo_query.go index d0e08d55a..edc9aecc8 100644 --- a/entc/integration/gremlin/ent/groupinfo_query.go +++ b/entc/integration/gremlin/ent/groupinfo_query.go @@ -322,7 +322,6 @@ func (giq *GroupInfoQuery) prepareQuery(ctx context.Context) error { } giq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/item_query.go b/entc/integration/gremlin/ent/item_query.go index 399ed4f4a..de067419c 100644 --- a/entc/integration/gremlin/ent/item_query.go +++ b/entc/integration/gremlin/ent/item_query.go @@ -270,7 +270,6 @@ func (iq *ItemQuery) prepareQuery(ctx context.Context) error { } iq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/node_query.go b/entc/integration/gremlin/ent/node_query.go index 38b0d441d..8ad8d9619 100644 --- a/entc/integration/gremlin/ent/node_query.go +++ b/entc/integration/gremlin/ent/node_query.go @@ -347,7 +347,6 @@ func (nq *NodeQuery) prepareQuery(ctx context.Context) error { } nq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/pet_query.go b/entc/integration/gremlin/ent/pet_query.go index 5743c83b0..ab6266aaf 100644 --- a/entc/integration/gremlin/ent/pet_query.go +++ b/entc/integration/gremlin/ent/pet_query.go @@ -348,7 +348,6 @@ func (pq *PetQuery) prepareQuery(ctx context.Context) error { } pq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/spec_query.go b/entc/integration/gremlin/ent/spec_query.go index 946b9cd9d..b3ada9d40 100644 --- a/entc/integration/gremlin/ent/spec_query.go +++ b/entc/integration/gremlin/ent/spec_query.go @@ -297,7 +297,6 @@ func (sq *SpecQuery) prepareQuery(ctx context.Context) error { } sq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/gremlin/ent/user_query.go b/entc/integration/gremlin/ent/user_query.go index bd8a3d4eb..86e8d63c2 100644 --- a/entc/integration/gremlin/ent/user_query.go +++ b/entc/integration/gremlin/ent/user_query.go @@ -581,7 +581,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.gremlin = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/hooks/ent/card_query.go b/entc/integration/hooks/ent/card_query.go index b0d46d6b2..cc2d363ec 100644 --- a/entc/integration/hooks/ent/card_query.go +++ b/entc/integration/hooks/ent/card_query.go @@ -327,7 +327,6 @@ func (cq *CardQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/hooks/ent/ent.go b/entc/integration/hooks/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/entc/integration/hooks/ent/ent.go +++ b/entc/integration/hooks/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/hooks/ent/user_query.go b/entc/integration/hooks/ent/user_query.go index 52564bb24..082b491ca 100644 --- a/entc/integration/hooks/ent/user_query.go +++ b/entc/integration/hooks/ent/user_query.go @@ -388,7 +388,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/idtype/ent/ent.go b/entc/integration/idtype/ent/ent.go index 504229256..420b33866 100644 --- a/entc/integration/idtype/ent/ent.go +++ b/entc/integration/idtype/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/idtype/ent/user_query.go b/entc/integration/idtype/ent/user_query.go index a79757878..32310ff5f 100644 --- a/entc/integration/idtype/ent/user_query.go +++ b/entc/integration/idtype/ent/user_query.go @@ -387,7 +387,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/json/ent/ent.go b/entc/integration/json/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/entc/integration/json/ent/ent.go +++ b/entc/integration/json/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/json/ent/user_query.go b/entc/integration/json/ent/user_query.go index 7f5b0bf62..dc9c785ea 100644 --- a/entc/integration/json/ent/user_query.go +++ b/entc/integration/json/ent/user_query.go @@ -294,7 +294,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/migrate/entv1/car_query.go b/entc/integration/migrate/entv1/car_query.go index 24ea02dca..da28d3482 100644 --- a/entc/integration/migrate/entv1/car_query.go +++ b/entc/integration/migrate/entv1/car_query.go @@ -303,7 +303,6 @@ func (cq *CarQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/migrate/entv1/ent.go b/entc/integration/migrate/entv1/ent.go index a7763fa36..ee3712502 100644 --- a/entc/integration/migrate/entv1/ent.go +++ b/entc/integration/migrate/entv1/ent.go @@ -8,6 +8,7 @@ package entv1 import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/migrate/entv1/user_query.go b/entc/integration/migrate/entv1/user_query.go index 81730be4a..55e3fdf8e 100644 --- a/entc/integration/migrate/entv1/user_query.go +++ b/entc/integration/migrate/entv1/user_query.go @@ -418,7 +418,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/migrate/entv2/car_query.go b/entc/integration/migrate/entv2/car_query.go index 1b19e65f3..fc12776c8 100644 --- a/entc/integration/migrate/entv2/car_query.go +++ b/entc/integration/migrate/entv2/car_query.go @@ -303,7 +303,6 @@ func (cq *CarQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/migrate/entv2/ent.go b/entc/integration/migrate/entv2/ent.go index 0de600894..c37a24284 100644 --- a/entc/integration/migrate/entv2/ent.go +++ b/entc/integration/migrate/entv2/ent.go @@ -8,6 +8,7 @@ package entv2 import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/migrate/entv2/group_query.go b/entc/integration/migrate/entv2/group_query.go index 55edb5317..d7c856257 100644 --- a/entc/integration/migrate/entv2/group_query.go +++ b/entc/integration/migrate/entv2/group_query.go @@ -270,7 +270,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/migrate/entv2/pet_query.go b/entc/integration/migrate/entv2/pet_query.go index 8d4b6a415..f595a3740 100644 --- a/entc/integration/migrate/entv2/pet_query.go +++ b/entc/integration/migrate/entv2/pet_query.go @@ -270,7 +270,6 @@ func (pq *PetQuery) prepareQuery(ctx context.Context) error { } pq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/migrate/entv2/user_query.go b/entc/integration/migrate/entv2/user_query.go index 66eea79f1..fa69a034f 100644 --- a/entc/integration/migrate/entv2/user_query.go +++ b/entc/integration/migrate/entv2/user_query.go @@ -359,7 +359,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/privacy/ent/ent.go b/entc/integration/privacy/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/entc/integration/privacy/ent/ent.go +++ b/entc/integration/privacy/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/privacy/ent/planet/planet.go b/entc/integration/privacy/ent/planet/planet.go index a1334a6bd..8064fba26 100644 --- a/entc/integration/privacy/ent/planet/planet.go +++ b/entc/integration/privacy/ent/planet/planet.go @@ -47,7 +47,8 @@ var ( // import _ "github.com/facebookincubator/ent/entc/integration/privacy/ent/runtime" // var ( - Hooks [2]ent.Hook + Hooks [2]ent.Hook + Policy ent.Policy // NameValidator is a validator for the "name" field. It is called by the builders before save. NameValidator func(string) error ) diff --git a/entc/integration/privacy/ent/planet_query.go b/entc/integration/privacy/ent/planet_query.go index 26d00f4ff..5787cc0fa 100644 --- a/entc/integration/privacy/ent/planet_query.go +++ b/entc/integration/privacy/ent/planet_query.go @@ -326,7 +326,9 @@ func (pq *PlanetQuery) prepareQuery(ctx context.Context) error { } pq.sql = prev } - // Privacy and query checks go here. + if err := planet.Policy.EvalQuery(ctx, pq); err != nil { + return err + } return nil } diff --git a/entc/integration/privacy/ent/runtime/runtime.go b/entc/integration/privacy/ent/runtime/runtime.go index fec443953..a80124848 100644 --- a/entc/integration/privacy/ent/runtime/runtime.go +++ b/entc/integration/privacy/ent/runtime/runtime.go @@ -19,10 +19,10 @@ import ( // code (default values, validators or hooks) and stitches it // to their package variables. func init() { - policy := schema.Planet{}.Policy() + planet.Policy = schema.Planet{}.Policy() planet.Hooks[0] = func(next ent.Mutator) ent.Mutator { return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { - if err := policy.EvalMutation(ctx, m); err != nil { + if err := planet.Policy.EvalMutation(ctx, m); err != nil { return nil, err } return next.Mutate(ctx, m) diff --git a/entc/integration/privacy/ent/schema/planet.go b/entc/integration/privacy/ent/schema/planet.go index 8ceddffb8..8b5f22de0 100644 --- a/entc/integration/privacy/ent/schema/planet.go +++ b/entc/integration/privacy/ent/schema/planet.go @@ -44,6 +44,7 @@ func (Planet) Policy() ent.Policy { privacy.AlwaysAllowRule(), }, Query: privacy.QueryPolicy{ + rule.FilterZeroAgePlanetRule(), privacy.AlwaysAllowRule(), }, } diff --git a/entc/integration/privacy/privacy_test.go b/entc/integration/privacy/privacy_test.go index 461dea782..58bd7b4cc 100644 --- a/entc/integration/privacy/privacy_test.go +++ b/entc/integration/privacy/privacy_test.go @@ -33,9 +33,15 @@ func TestPrivacyRules(t *testing.T) { logf = rule.SetMutationLogFunc(func(string, ...interface{}) { require.FailNow(t, "hook called on privacy deny") }) - defer rule.SetMutationLogFunc(logf) err = client.Planet.Update().Where(planet.ID(earth.ID)).SetAge(4_600_000_000).Exec(ctx) require.True(t, errors.Is(err, privacy.Deny)) err = earth.Update().AddNeighbors(earth).Exec(ctx) require.True(t, errors.Is(err, privacy.Deny)) + rule.SetMutationLogFunc(logf) + + count := client.Planet.Query().CountX(ctx) + require.Equal(t, 1, count) + mars.Update().SetAge(6_000_000_000).ExecX(ctx) + count = client.Planet.Query().CountX(ctx) + require.Equal(t, 2, count) } diff --git a/entc/integration/privacy/rule/rule.go b/entc/integration/privacy/rule/rule.go index c6aa7e18a..3c10f5801 100644 --- a/entc/integration/privacy/rule/rule.go +++ b/entc/integration/privacy/rule/rule.go @@ -6,10 +6,11 @@ import ( "github.com/facebookincubator/ent/entc/integration/privacy/ent" "github.com/facebookincubator/ent/entc/integration/privacy/ent/hook" + "github.com/facebookincubator/ent/entc/integration/privacy/ent/planet" "github.com/facebookincubator/ent/entc/integration/privacy/ent/privacy" ) -// DenyUpdateRule is a write rule rule that denies update many operations. +// DenyUpdateRule is a mutation rule that denies update many operations. func DenyUpdateRule() privacy.MutationRule { return privacy.MutationRuleFunc(func(_ context.Context, m ent.Mutation) error { if m.Op() == ent.OpUpdate { @@ -19,7 +20,7 @@ func DenyUpdateRule() privacy.MutationRule { }) } -// DenyPlanetSelfLinkRule is a write rule rule that prevents rule self link via neighbor edge. +// DenyPlanetSelfLinkRule is a mutation rule rule that prevents rule self link via neighbor edge. func DenyPlanetSelfLinkRule() privacy.MutationRule { return privacy.PlanetMutationRuleFunc(func(ctx context.Context, m *ent.PlanetMutation) error { if !m.Op().Is(ent.OpUpdateOne) { @@ -38,6 +39,14 @@ func DenyPlanetSelfLinkRule() privacy.MutationRule { }) } +// FilterZeroPlanetAgeRule is a query rule that filters out planet with age equal to zero. +func FilterZeroAgePlanetRule() privacy.QueryRule { + return privacy.PlanetQueryRuleFunc(func(ctx context.Context, q *ent.PlanetQuery) error { + q.Where(planet.AgeNEQ(0)) + return privacy.Skip + }) +} + var logger = struct { logf func(string, ...interface{}) sync.RWMutex diff --git a/entc/integration/template/ent/ent.go b/entc/integration/template/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/entc/integration/template/ent/ent.go +++ b/entc/integration/template/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/entc/integration/template/ent/group_query.go b/entc/integration/template/ent/group_query.go index ae98d7417..ead49e796 100644 --- a/entc/integration/template/ent/group_query.go +++ b/entc/integration/template/ent/group_query.go @@ -294,7 +294,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/template/ent/pet_query.go b/entc/integration/template/ent/pet_query.go index 9e050f333..3755d6ab6 100644 --- a/entc/integration/template/ent/pet_query.go +++ b/entc/integration/template/ent/pet_query.go @@ -327,7 +327,6 @@ func (pq *PetQuery) prepareQuery(ctx context.Context) error { } pq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/entc/integration/template/ent/user_query.go b/entc/integration/template/ent/user_query.go index c60579f7d..fdc0988ea 100644 --- a/entc/integration/template/ent/user_query.go +++ b/entc/integration/template/ent/user_query.go @@ -357,7 +357,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/edgeindex/ent/city_query.go b/examples/edgeindex/ent/city_query.go index c90aa068e..fd6c02383 100644 --- a/examples/edgeindex/ent/city_query.go +++ b/examples/edgeindex/ent/city_query.go @@ -327,7 +327,6 @@ func (cq *CityQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/edgeindex/ent/ent.go b/examples/edgeindex/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/edgeindex/ent/ent.go +++ b/examples/edgeindex/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/edgeindex/ent/street_query.go b/examples/edgeindex/ent/street_query.go index f9ad968e9..fbd81ebc7 100644 --- a/examples/edgeindex/ent/street_query.go +++ b/examples/edgeindex/ent/street_query.go @@ -327,7 +327,6 @@ func (sq *StreetQuery) prepareQuery(ctx context.Context) error { } sq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/entcpkg/ent/ent.go b/examples/entcpkg/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/entcpkg/ent/ent.go +++ b/examples/entcpkg/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/entcpkg/ent/user_query.go b/examples/entcpkg/ent/user_query.go index c2f470964..be0fa9779 100644 --- a/examples/entcpkg/ent/user_query.go +++ b/examples/entcpkg/ent/user_query.go @@ -270,7 +270,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/m2m2types/ent/ent.go b/examples/m2m2types/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/m2m2types/ent/ent.go +++ b/examples/m2m2types/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/m2m2types/ent/group_query.go b/examples/m2m2types/ent/group_query.go index 2fcdf3e69..c3364f2de 100644 --- a/examples/m2m2types/ent/group_query.go +++ b/examples/m2m2types/ent/group_query.go @@ -327,7 +327,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/m2m2types/ent/user_query.go b/examples/m2m2types/ent/user_query.go index 05d8b728e..bb66a1997 100644 --- a/examples/m2m2types/ent/user_query.go +++ b/examples/m2m2types/ent/user_query.go @@ -327,7 +327,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/m2mbidi/ent/ent.go b/examples/m2mbidi/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/m2mbidi/ent/ent.go +++ b/examples/m2mbidi/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/m2mbidi/ent/user_query.go b/examples/m2mbidi/ent/user_query.go index c23ba7221..852e53a22 100644 --- a/examples/m2mbidi/ent/user_query.go +++ b/examples/m2mbidi/ent/user_query.go @@ -326,7 +326,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/m2mrecur/ent/ent.go b/examples/m2mrecur/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/m2mrecur/ent/ent.go +++ b/examples/m2mrecur/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/m2mrecur/ent/user_query.go b/examples/m2mrecur/ent/user_query.go index 4d8e5b91a..1e126d30d 100644 --- a/examples/m2mrecur/ent/user_query.go +++ b/examples/m2mrecur/ent/user_query.go @@ -356,7 +356,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/o2m2types/ent/ent.go b/examples/o2m2types/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/o2m2types/ent/ent.go +++ b/examples/o2m2types/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/o2m2types/ent/pet_query.go b/examples/o2m2types/ent/pet_query.go index 8ec6f48b1..969aa4171 100644 --- a/examples/o2m2types/ent/pet_query.go +++ b/examples/o2m2types/ent/pet_query.go @@ -327,7 +327,6 @@ func (pq *PetQuery) prepareQuery(ctx context.Context) error { } pq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/o2m2types/ent/user_query.go b/examples/o2m2types/ent/user_query.go index 494d4e240..9e4e12e30 100644 --- a/examples/o2m2types/ent/user_query.go +++ b/examples/o2m2types/ent/user_query.go @@ -327,7 +327,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/o2mrecur/ent/ent.go b/examples/o2mrecur/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/o2mrecur/ent/ent.go +++ b/examples/o2mrecur/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/o2mrecur/ent/node_query.go b/examples/o2mrecur/ent/node_query.go index 00ace4711..0761b91f6 100644 --- a/examples/o2mrecur/ent/node_query.go +++ b/examples/o2mrecur/ent/node_query.go @@ -357,7 +357,6 @@ func (nq *NodeQuery) prepareQuery(ctx context.Context) error { } nq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/o2o2types/ent/card_query.go b/examples/o2o2types/ent/card_query.go index 93c28259d..f17336b8d 100644 --- a/examples/o2o2types/ent/card_query.go +++ b/examples/o2o2types/ent/card_query.go @@ -327,7 +327,6 @@ func (cq *CardQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/o2o2types/ent/ent.go b/examples/o2o2types/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/o2o2types/ent/ent.go +++ b/examples/o2o2types/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/o2o2types/ent/user_query.go b/examples/o2o2types/ent/user_query.go index 33ed15e96..56da32b8f 100644 --- a/examples/o2o2types/ent/user_query.go +++ b/examples/o2o2types/ent/user_query.go @@ -327,7 +327,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/o2obidi/ent/ent.go b/examples/o2obidi/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/o2obidi/ent/ent.go +++ b/examples/o2obidi/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/o2obidi/ent/user_query.go b/examples/o2obidi/ent/user_query.go index 3a90b98ae..71725f959 100644 --- a/examples/o2obidi/ent/user_query.go +++ b/examples/o2obidi/ent/user_query.go @@ -326,7 +326,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/o2orecur/ent/ent.go b/examples/o2orecur/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/o2orecur/ent/ent.go +++ b/examples/o2orecur/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/o2orecur/ent/node_query.go b/examples/o2orecur/ent/node_query.go index 4da4805ab..e789cc3b1 100644 --- a/examples/o2orecur/ent/node_query.go +++ b/examples/o2orecur/ent/node_query.go @@ -357,7 +357,6 @@ func (nq *NodeQuery) prepareQuery(ctx context.Context) error { } nq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/start/ent/car_query.go b/examples/start/ent/car_query.go index f2e27b251..246b1dea7 100644 --- a/examples/start/ent/car_query.go +++ b/examples/start/ent/car_query.go @@ -327,7 +327,6 @@ func (cq *CarQuery) prepareQuery(ctx context.Context) error { } cq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/start/ent/ent.go b/examples/start/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/start/ent/ent.go +++ b/examples/start/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/start/ent/group_query.go b/examples/start/ent/group_query.go index c89857dd8..075eaf537 100644 --- a/examples/start/ent/group_query.go +++ b/examples/start/ent/group_query.go @@ -327,7 +327,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/start/ent/user_query.go b/examples/start/ent/user_query.go index 1133eed26..6e143492a 100644 --- a/examples/start/ent/user_query.go +++ b/examples/start/ent/user_query.go @@ -358,7 +358,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/traversal/ent/ent.go b/examples/traversal/ent/ent.go index 7c2204a88..d382e19a3 100644 --- a/examples/traversal/ent/ent.go +++ b/examples/traversal/ent/ent.go @@ -8,6 +8,7 @@ package ent import ( "context" + "errors" "fmt" "strings" @@ -15,7 +16,6 @@ import ( "github.com/facebookincubator/ent/dialect" "github.com/facebookincubator/ent/dialect/sql" "github.com/facebookincubator/ent/dialect/sql/sqlgraph" - "golang.org/x/xerrors" ) // ent aliases to avoid import conflict in user's code. @@ -24,6 +24,7 @@ type ( Hook = ent.Hook Value = ent.Value Query = ent.Query + Policy = ent.Policy Mutator = ent.Mutator Mutation = ent.Mutation MutateFunc = ent.MutateFunc @@ -116,7 +117,7 @@ func IsNotFound(err error) bool { return false } var e *NotFoundError - return xerrors.As(err, &e) + return errors.As(err, &e) } // MaskNotFound masks nor found error. @@ -143,7 +144,7 @@ func IsNotSingular(err error) bool { return false } var e *NotSingularError - return xerrors.As(err, &e) + return errors.As(err, &e) } // NotLoadedError returns when trying to get a node that was not loaded by the query. @@ -162,7 +163,7 @@ func IsNotLoaded(err error) bool { return false } var e *NotLoadedError - return xerrors.As(err, &e) + return errors.As(err, &e) } // ConstraintError returns when trying to create/update one or more entities and @@ -189,7 +190,7 @@ func IsConstraintError(err error) bool { return false } var e *ConstraintError - return xerrors.As(err, &e) + return errors.As(err, &e) } func isSQLConstraintError(err error) (*ConstraintError, bool) { diff --git a/examples/traversal/ent/group_query.go b/examples/traversal/ent/group_query.go index 542291ae5..725012cc0 100644 --- a/examples/traversal/ent/group_query.go +++ b/examples/traversal/ent/group_query.go @@ -358,7 +358,6 @@ func (gq *GroupQuery) prepareQuery(ctx context.Context) error { } gq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/traversal/ent/pet_query.go b/examples/traversal/ent/pet_query.go index ede4b0aec..043f5b267 100644 --- a/examples/traversal/ent/pet_query.go +++ b/examples/traversal/ent/pet_query.go @@ -358,7 +358,6 @@ func (pq *PetQuery) prepareQuery(ctx context.Context) error { } pq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/examples/traversal/ent/user_query.go b/examples/traversal/ent/user_query.go index 400938a62..9fe1eb37a 100644 --- a/examples/traversal/ent/user_query.go +++ b/examples/traversal/ent/user_query.go @@ -418,7 +418,6 @@ func (uq *UserQuery) prepareQuery(ctx context.Context) error { } uq.sql = prev } - // Privacy and query checks go here. return nil } diff --git a/go.mod b/go.mod index 5db3c9c0b..44ba5f7da 100644 --- a/go.mod +++ b/go.mod @@ -5,28 +5,26 @@ go 1.14 require ( github.com/DATA-DOG/go-sqlmock v1.3.3 github.com/go-bindata/go-bindata v1.0.1-0.20190711162640-ee3c2418e368 - github.com/go-openapi/inflect v0.18.0 + github.com/go-openapi/inflect v0.19.0 github.com/go-sql-driver/mysql v1.5.1-0.20200311113236-681ffa848bae + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/google/uuid v1.1.1 - github.com/gorilla/websocket v1.4.0 - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/gorilla/websocket v1.4.2 github.com/jessevdk/go-flags v1.4.0 - github.com/json-iterator/go v1.1.6 + github.com/json-iterator/go v1.1.9 github.com/lib/pq v1.2.0 - github.com/mattn/go-runewidth v0.0.4 // indirect - github.com/mattn/go-sqlite3 v1.11.0 - github.com/mitchellh/mapstructure v1.1.2 + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/mattn/go-sqlite3 v1.13.0 + github.com/mitchellh/mapstructure v1.2.2 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 - github.com/olekukonko/tablewriter v0.0.1 - github.com/pkg/errors v0.8.1 - github.com/spf13/cobra v0.0.3 - github.com/spf13/pflag v1.0.3 // indirect + github.com/olekukonko/tablewriter v0.0.4 + github.com/pkg/errors v0.9.1 + github.com/spf13/cobra v0.0.7 + github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.4.0 - go.opencensus.io v0.22.0 - golang.org/x/mod v0.2.0 // indirect - golang.org/x/sync v0.0.0-20190423024810-112230192c58 - golang.org/x/tools v0.0.0-20200221224223-e1da425f72fd - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 + go.opencensus.io v0.22.3 + golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a + golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65 ) diff --git a/go.sum b/go.sum index b2021ddd4..4120f6e03 100644 --- a/go.sum +++ b/go.sum @@ -2,67 +2,156 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-bindata/go-bindata v1.0.1-0.20190711162640-ee3c2418e368 h1:WNHfSP1q2vuAa9vF54RrhCl4nqxCjVcXhlbsRXbGOSY= github.com/go-bindata/go-bindata v1.0.1-0.20190711162640-ee3c2418e368/go.mod h1:7xCgX1lzlrXPHkfvn3EhumqHkmSlzt8at9q7v0ax19c= -github.com/go-openapi/inflect v0.18.0 h1:4TMtuIyNxWl29TYpb1grUCuNy+koT0oN5ZXHb6wrZ3E= -github.com/go-openapi/inflect v0.18.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= -github.com/go-sql-driver/mysql v1.4.1-0.20190510102335-877a9775f068 h1:q2kwd9Bcgl2QpSi/Wjcx9jzwyICt3EWTP5to43QhwaA= -github.com/go-sql-driver/mysql v1.4.1-0.20190510102335-877a9775f068/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= +github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= github.com/go-sql-driver/mysql v1.5.1-0.20200311113236-681ffa848bae h1:L6V0ANsMIMdLgXly241UXhXNFWYgXbgjHupTAAURrV0= github.com/go-sql-driver/mysql v1.5.1-0.20200311113236-681ffa848bae/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q= -github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c= +github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4= +github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88= -github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8= +github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU= +github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -70,39 +159,47 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee h1:WG0RUwxtNT4qqaXX3DPA8zHFNm/D9xaBpxzHt1WcA/E= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a h1:TwMENskLwU2NnWBzrJGEWHqSiGUkO/B4rfyhwqDxDYQ= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200221224223-e1da425f72fd h1:hHkvGJK23seRCflePJnVa9IMv8fsuavSCWKd11kDQFs= -golang.org/x/tools v0.0.0-20200221224223-e1da425f72fd/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65 h1:1KSbntBked74wYsKq0jzXYy7ZwcjAUtrl7EmPE97Iiw= +golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA= @@ -116,8 +213,15 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=