From 892a4ee7580dbb27c1af6b13841b7ddf012ac951 Mon Sep 17 00:00:00 2001 From: Kelly Date: Tue, 14 Apr 2020 14:18:25 -0400 Subject: [PATCH 01/31] added endpoints for crud operations --- go.mod | 9 +- go.sum | 33 ++- http-server/http-server.go | 39 +++ protos/hardware/hardware.pb.gw.go | 211 ++++++++++++++++ protos/hardware/hardware.proto | 15 +- protos/protoc.sh | 2 +- protos/target/target.pb.gw.go | 407 ++++++++++++++++++++++++++++++ protos/template/template.pb.go | 53 ++-- protos/template/template.pb.gw.go | 407 ++++++++++++++++++++++++++++++ protos/template/template.proto | 26 +- protos/workflow/workflow.pb.go | 163 ++++++------ protos/workflow/workflow.pb.gw.go | 407 ++++++++++++++++++++++++++++++ protos/workflow/workflow.proto | 26 +- 13 files changed, 1667 insertions(+), 131 deletions(-) create mode 100644 protos/hardware/hardware.pb.gw.go create mode 100644 protos/target/target.pb.gw.go create mode 100644 protos/template/template.pb.gw.go create mode 100644 protos/workflow/workflow.pb.gw.go diff --git a/go.mod b/go.mod index 9a2e26d1e..7bc4b2776 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/gorilla/mux v1.6.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36 + github.com/grpc-ecosystem/grpc-gateway v1.14.6 github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jedib0t/go-pretty v4.3.0+incompatible @@ -45,13 +46,13 @@ require ( go.uber.org/atomic v1.2.0 // indirect go.uber.org/multierr v1.1.0 // indirect go.uber.org/zap v1.7.1 // indirect - golang.org/x/net v0.0.0-20200528225125-3c3fba18258b // indirect - golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect + golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect + golang.org/x/sys v0.0.0-20200331124033-c3d80250170d // indirect golang.org/x/text v0.3.2 // indirect golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect - google.golang.org/genproto v0.0.0-20200601130524-0f60399e6634 // indirect + google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 google.golang.org/grpc v1.29.1 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect - gopkg.in/yaml.v2 v2.2.2 + gopkg.in/yaml.v2 v2.2.3 gotest.tools v2.2.0+incompatible // indirect ) diff --git a/go.sum b/go.sum index 59782ecb6..9c35bc82d 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= @@ -9,6 +10,7 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5Vpd github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= @@ -35,6 +37,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= 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-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= @@ -58,7 +62,6 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -77,6 +80,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmo github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36 h1:cwTrrTEhz13khQS3/UZMLFWwiqlcsdp/2sxFmSjAWeQ= github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o= +github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce h1:xdsDDbiBDQTKASoGEZ+pEmF1OnWuu8AQ9I8iNbHNeno= github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -132,6 +137,7 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 h1:/K3IL0Z1quvmJ7X0A1AwNEK7CRkVK3YwfOU/QAL4WGg= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rollbar/rollbar-go v1.0.2 h1:uA3+z0jq6ka9WUUt9VX/xuiQZXZyWRoeKvkhVvLO9Jc= github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= @@ -180,12 +186,15 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl 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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/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-20200528225125-3c3fba18258b h1:IYiJPiJfzktmDAO1HQiwjMjwjlYKHAL7KzeD544RJPs= -golang.org/x/net v0.0.0-20200528225125-3c3fba18258b/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= 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= @@ -197,8 +206,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -218,9 +227,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200601130524-0f60399e6634 h1:yUEnIJPm1I2GGauN1xOkwj6gXw/3t1R+HA1r/cdnkHE= -google.golang.org/genproto v0.0.0-20200601130524-0f60399e6634/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -232,11 +240,8 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -244,8 +249,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= 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= +gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/http-server/http-server.go b/http-server/http-server.go index f5cb6a92a..635318ffd 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -3,19 +3,28 @@ package httpserver import ( "bytes" "context" + "crypto/x509" "encoding/json" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" "net/http" "runtime" "time" + grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/packethost/pkg/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/tinkerbell/tink/protos/hardware" + "github.com/tinkerbell/tink/protos/target" + "github.com/tinkerbell/tink/protos/template" + "github.com/tinkerbell/tink/protos/workflow" ) var ( gitRev = "unknown" gitRevJSON []byte + grpcListenAddr = "localhost:42113" httpListenAddr = ":42114" startTime = time.Now() logger log.Logger @@ -24,6 +33,35 @@ var ( // SetupHTTP setup and return an HTTP server func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time.Time, errCh chan<- error) { logger = lg + + cp := x509.NewCertPool() + ok := cp.AppendCertsFromPEM(certPEM) + if !ok { + logger.Error(errors.New("parse cert")) + } + + creds := credentials.NewClientTLSFromCert(cp, "") + + mux := grpcRuntime.NewServeMux() + + dialOpts := []grpc.DialOption{grpc.WithTransportCredentials(creds)} + err := hardware.RegisterHardwareServiceHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) + if err != nil { + logger.Error(err) + } + err = target.RegisterTargetHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) + if err != nil { + logger.Error(err) + } + err = template.RegisterTemplateHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) + if err != nil { + logger.Error(err) + } + err = workflow.RegisterWorkflowSvcHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) + if err != nil { + logger.Error(err) + } + http.HandleFunc("/cert", func(w http.ResponseWriter, r *http.Request) { http.ServeContent(w, r, "server.pem", modTime, bytes.NewReader(certPEM)) }) @@ -31,6 +69,7 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time. setupGitRevJSON() http.HandleFunc("/version", versionHandler) http.HandleFunc("/_packet/healthcheck", healthCheckHandler) + http.Handle("/", mux) srv := &http.Server{ Addr: httpListenAddr, diff --git a/protos/hardware/hardware.pb.gw.go b/protos/hardware/hardware.pb.gw.go new file mode 100644 index 000000000..17c068a01 --- /dev/null +++ b/protos/hardware/hardware.pb.gw.go @@ -0,0 +1,211 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: hardware/hardware.proto + +/* +Package hardware is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package hardware + +import ( + "context" + "io" + "net/http" + + "github.com/golang/protobuf/descriptor" + "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/status" +) + +// Suppress "imported and not used" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage + +func request_HardwareService_Push_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq PushRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.Push(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_HardwareService_Push_0(ctx context.Context, marshaler runtime.Marshaler, server HardwareServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq PushRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Push(ctx, &protoReq) + return msg, metadata, err + +} + +func request_HardwareService_All_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (HardwareService_AllClient, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + stream, err := client.All(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + +} + +// RegisterHardwareServiceHandlerServer registers the http handlers for service HardwareService to "mux". +// UnaryRPC :call HardwareServiceServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterHardwareServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server HardwareServiceServer) error { + + mux.Handle("POST", pattern_HardwareService_Push_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_HardwareService_Push_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_Push_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_HardwareService_All_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + + return nil +} + +// RegisterHardwareServiceHandlerFromEndpoint is same as RegisterHardwareServiceHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterHardwareServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterHardwareServiceHandler(ctx, mux, conn) +} + +// RegisterHardwareServiceHandler registers the http handlers for service HardwareService to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterHardwareServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterHardwareServiceHandlerClient(ctx, mux, NewHardwareServiceClient(conn)) +} + +// RegisterHardwareServiceHandlerClient registers the http handlers for service HardwareService +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "HardwareServiceClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "HardwareServiceClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "HardwareServiceClient" to call the correct interceptors. +func RegisterHardwareServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client HardwareServiceClient) error { + + mux.Handle("POST", pattern_HardwareService_Push_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_HardwareService_Push_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_Push_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_HardwareService_All_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_HardwareService_All_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_All_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_HardwareService_Push_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "hardware"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_HardwareService_All_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "hardware"}, "", runtime.AssumeColonVerbOpt(true))) +) + +var ( + forward_HardwareService_Push_0 = runtime.ForwardResponseMessage + + forward_HardwareService_All_0 = runtime.ForwardResponseStream +) diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index d8c63076f..ccaef127a 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -4,12 +4,23 @@ option go_package = "hardware"; package github.aaakk.us.kg.tinkerbell.tink.protos.hardware; +import "google/api/annotations.proto"; + service HardwareService { - rpc Push (PushRequest) returns (Empty); + rpc Push (PushRequest) returns (Empty) { + option (google.api.http) = { + post: "/v1/hardware" + body: "*" + }; + }; rpc ByMAC(GetRequest) returns (Hardware); rpc ByIP(GetRequest) returns (Hardware); rpc ByID(GetRequest) returns (Hardware); - rpc All(Empty) returns (stream Hardware); + rpc All(Empty) returns (stream Hardware) { + option (google.api.http) = { + get: "/v1/hardware" + }; + }; rpc Ingest(Empty) returns (Empty); rpc Watch(GetRequest) returns (stream Hardware); rpc Delete(DeleteRequest) returns (Empty); diff --git a/protos/protoc.sh b/protos/protoc.sh index fa8429298..90ff775c7 100755 --- a/protos/protoc.sh +++ b/protos/protoc.sh @@ -4,5 +4,5 @@ set -e for proto in hardware template workflow; do echo "Generating ${proto}.pb.go..." - protoc -I ./ -I ./common/ "${proto}/${proto}.proto" --go_out=plugins=grpc:./ + protoc -I ./ -I ./common/ -I $GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis "${proto}/${proto}.proto" --go_out=plugins=grpc:./ --grpc-gateway_out=logtostderr=true:. done diff --git a/protos/target/target.pb.gw.go b/protos/target/target.pb.gw.go new file mode 100644 index 000000000..bdf2b73f1 --- /dev/null +++ b/protos/target/target.pb.gw.go @@ -0,0 +1,407 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: target/target.proto + +/* +Package target is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package target + +import ( + "context" + "io" + "net/http" + + "github.com/golang/protobuf/descriptor" + "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/status" +) + +// Suppress "imported and not used" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage + +func request_Target_CreateTargets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq PushRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.CreateTargets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Target_CreateTargets_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq PushRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.CreateTargets(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Target_TargetByID_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["ID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") + } + + protoReq.ID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) + } + + msg, err := client.TargetByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Target_TargetByID_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["ID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") + } + + protoReq.ID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) + } + + msg, err := server.TargetByID(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Target_DeleteTargetByID_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["ID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") + } + + protoReq.ID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) + } + + msg, err := client.DeleteTargetByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Target_DeleteTargetByID_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["ID"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") + } + + protoReq.ID, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) + } + + msg, err := server.DeleteTargetByID(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Target_ListTargets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (Target_ListTargetsClient, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + stream, err := client.ListTargets(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + +} + +// RegisterTargetHandlerServer registers the http handlers for service Target to "mux". +// UnaryRPC :call TargetServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterTargetHandlerServer(ctx context.Context, mux *runtime.ServeMux, server TargetServer) error { + + mux.Handle("POST", pattern_Target_CreateTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Target_CreateTargets_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Target_CreateTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Target_TargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Target_TargetByID_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Target_TargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("DELETE", pattern_Target_DeleteTargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Target_DeleteTargetByID_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Target_DeleteTargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + + return nil +} + +// RegisterTargetHandlerFromEndpoint is same as RegisterTargetHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterTargetHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterTargetHandler(ctx, mux, conn) +} + +// RegisterTargetHandler registers the http handlers for service Target to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterTargetHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterTargetHandlerClient(ctx, mux, NewTargetClient(conn)) +} + +// RegisterTargetHandlerClient registers the http handlers for service Target +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "TargetClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "TargetClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "TargetClient" to call the correct interceptors. +func RegisterTargetHandlerClient(ctx context.Context, mux *runtime.ServeMux, client TargetClient) error { + + mux.Handle("POST", pattern_Target_CreateTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Target_CreateTargets_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Target_CreateTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Target_TargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Target_TargetByID_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Target_TargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("DELETE", pattern_Target_DeleteTargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Target_DeleteTargetByID_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Target_DeleteTargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Target_ListTargets_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Target_ListTargets_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_Target_CreateTargets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "target"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Target_TargetByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "targets", "ID"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Target_DeleteTargetByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "targets", "ID"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Target_ListTargets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "targets"}, "", runtime.AssumeColonVerbOpt(true))) +) + +var ( + forward_Target_CreateTargets_0 = runtime.ForwardResponseMessage + + forward_Target_TargetByID_0 = runtime.ForwardResponseMessage + + forward_Target_DeleteTargetByID_0 = runtime.ForwardResponseMessage + + forward_Target_ListTargets_0 = runtime.ForwardResponseStream +) diff --git a/protos/template/template.pb.go b/protos/template/template.pb.go index 20f4fa3ed..0e327d6c0 100644 --- a/protos/template/template.pb.go +++ b/protos/template/template.pb.go @@ -10,6 +10,7 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -224,30 +225,34 @@ func init() { func init() { proto.RegisterFile("template/template.proto", fileDescriptor_dca67df6b60706ce) } var fileDescriptor_dca67df6b60706ce = []byte{ - // 353 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x4f, 0x4b, 0xf3, 0x40, - 0x10, 0xc6, 0xd9, 0xbe, 0x6d, 0xdf, 0x76, 0xaa, 0x51, 0xf6, 0x62, 0x08, 0x1e, 0x42, 0x4e, 0xc5, - 0xc3, 0xaa, 0x15, 0x44, 0xc4, 0x8b, 0xff, 0xe8, 0xc5, 0x53, 0xa8, 0x08, 0xde, 0x92, 0x66, 0x5a, - 0x43, 0x93, 0x6e, 0xcc, 0x4e, 0x10, 0xf1, 0xa4, 0xde, 0xfc, 0x1a, 0x7e, 0x49, 0x8f, 0xd2, 0x6d, - 0x93, 0x42, 0x3d, 0xd4, 0x10, 0x6f, 0xc3, 0xec, 0xf3, 0x1b, 0x9e, 0x67, 0x76, 0x60, 0x87, 0x30, - 0x4e, 0x22, 0x8f, 0x70, 0x3f, 0x2f, 0x44, 0x92, 0x4a, 0x92, 0x7c, 0x6f, 0x1c, 0xd2, 0x43, 0xe6, - 0x8b, 0xa1, 0x8c, 0x05, 0x85, 0xd3, 0x09, 0xa6, 0x3e, 0x46, 0x91, 0x2e, 0xe7, 0x0a, 0x25, 0x72, - 0xc2, 0xda, 0xa2, 0x30, 0x46, 0x45, 0x5e, 0x9c, 0xcc, 0x9f, 0x9c, 0xff, 0xd0, 0xb8, 0x8e, 0x13, - 0x7a, 0x76, 0xbe, 0x18, 0x6c, 0xdf, 0xc9, 0x74, 0x32, 0x8a, 0xe4, 0xd3, 0x60, 0x21, 0xe7, 0x06, - 0xd4, 0xc2, 0xc0, 0x64, 0x36, 0xeb, 0xb6, 0xdd, 0x5a, 0x18, 0x70, 0x0e, 0xf5, 0xa9, 0x17, 0xa3, - 0x59, 0xd3, 0x1d, 0x5d, 0xcf, 0x7a, 0x81, 0x47, 0x9e, 0xf9, 0xcf, 0x66, 0xdd, 0x0d, 0x57, 0xd7, - 0xfc, 0x04, 0xda, 0xc3, 0x14, 0x3d, 0xc2, 0xe0, 0x9c, 0xcc, 0xba, 0xcd, 0xba, 0x9d, 0x9e, 0x25, - 0xc6, 0x52, 0x8e, 0xa3, 0x85, 0x69, 0x3f, 0x1b, 0x89, 0x41, 0x6e, 0xc5, 0x5d, 0x8a, 0x67, 0x64, - 0x96, 0x04, 0x0b, 0xb2, 0xb1, 0x9e, 0x2c, 0xc4, 0x33, 0x32, 0xc0, 0x08, 0xe7, 0x64, 0x73, 0x3d, - 0x59, 0x88, 0x1d, 0x1b, 0x8c, 0x4b, 0x6d, 0xc0, 0x45, 0x95, 0xc8, 0xa9, 0xfa, 0x91, 0xdb, 0xd9, - 0x05, 0xe8, 0x23, 0xb9, 0xf8, 0x98, 0xa1, 0xa2, 0xd5, 0xd7, 0xde, 0x67, 0x03, 0x5a, 0xc5, 0xca, - 0x3e, 0x58, 0x3e, 0xad, 0x68, 0x9d, 0x89, 0xdf, 0xff, 0x90, 0x58, 0xfd, 0x03, 0xeb, 0xb4, 0x0c, - 0xbd, 0x92, 0xe3, 0x9d, 0x41, 0xa7, 0x8f, 0x54, 0x38, 0x39, 0x2e, 0x33, 0x6b, 0x99, 0xd8, 0xaa, - 0x94, 0x80, 0xbf, 0x80, 0x71, 0xa5, 0x97, 0x5d, 0xd9, 0xc7, 0x61, 0x19, 0x4e, 0xdf, 0x35, 0x7f, - 0x63, 0xb0, 0x79, 0x13, 0xaa, 0x62, 0x07, 0x8a, 0x97, 0x1f, 0x52, 0x2d, 0xff, 0x01, 0xe3, 0xaf, - 0x0c, 0x8c, 0x5b, 0x7d, 0xa9, 0x7f, 0x74, 0x14, 0xe5, 0x33, 0x5c, 0xc0, 0x7d, 0x2b, 0xef, 0xf8, - 0x4d, 0x2d, 0x39, 0xfa, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x72, 0xba, 0x4c, 0x77, 0x54, 0x04, 0x00, - 0x00, + // 428 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xbf, 0x8e, 0xd3, 0x40, + 0x10, 0xc6, 0xb5, 0xe6, 0x2e, 0xdc, 0xed, 0xdd, 0xf9, 0x60, 0x05, 0x8a, 0x65, 0xa5, 0xb0, 0x5c, + 0x45, 0x29, 0xd6, 0x24, 0x48, 0x08, 0x45, 0x34, 0xfc, 0x53, 0x1a, 0x2a, 0x2b, 0x08, 0x89, 0x6e, + 0x1d, 0x4f, 0xc2, 0x2a, 0xb6, 0xd7, 0x78, 0xc7, 0x20, 0x84, 0x28, 0xa0, 0xa6, 0xa3, 0x40, 0x54, + 0x14, 0x3c, 0x12, 0xaf, 0xc0, 0x43, 0x50, 0xa2, 0xac, 0x63, 0x87, 0x04, 0xa4, 0x60, 0x85, 0x6e, + 0x34, 0xfb, 0x7d, 0x3b, 0xbf, 0x99, 0xd9, 0xa5, 0x5d, 0x84, 0x34, 0x4f, 0x04, 0x42, 0x50, 0x07, + 0x3c, 0x2f, 0x14, 0x2a, 0x36, 0x58, 0x48, 0x7c, 0x51, 0x46, 0x7c, 0xa6, 0x52, 0x8e, 0x32, 0x5b, + 0x42, 0x11, 0x41, 0x92, 0x98, 0xb0, 0x52, 0x68, 0x5e, 0x3b, 0xdc, 0xde, 0x42, 0xa9, 0x45, 0x02, + 0x81, 0xc8, 0x65, 0x20, 0xb2, 0x4c, 0xa1, 0x40, 0xa9, 0x32, 0x5d, 0xe9, 0xdc, 0x4b, 0x94, 0x29, + 0x68, 0x14, 0x69, 0x5e, 0x25, 0xfc, 0xab, 0xf4, 0xf8, 0x71, 0x9a, 0xe3, 0x1b, 0xff, 0x27, 0xa1, + 0xd7, 0x9e, 0xa9, 0x62, 0x39, 0x4f, 0xd4, 0xeb, 0xe9, 0xfa, 0x32, 0x66, 0x53, 0x4b, 0xc6, 0x0e, + 0xf1, 0x48, 0xff, 0x34, 0xb4, 0x64, 0xcc, 0x18, 0x3d, 0xca, 0x44, 0x0a, 0x8e, 0x65, 0x32, 0x26, + 0x5e, 0xe5, 0x62, 0x81, 0xc2, 0xb9, 0xe2, 0x91, 0xfe, 0x79, 0x68, 0x62, 0x76, 0x97, 0x9e, 0xce, + 0x0a, 0x10, 0x08, 0xf1, 0x7d, 0x74, 0x8e, 0x3c, 0xd2, 0x3f, 0x1b, 0xb9, 0xbc, 0x02, 0xab, 0xea, + 0x46, 0xe5, 0x9c, 0x4f, 0x6b, 0x94, 0x70, 0x23, 0x5e, 0x39, 0xcb, 0x3c, 0x5e, 0x3b, 0x8f, 0xf7, + 0x3b, 0x1b, 0xf1, 0xca, 0x19, 0x43, 0x02, 0x95, 0xb3, 0xb3, 0xdf, 0xd9, 0x88, 0x7d, 0x8f, 0xda, + 0x0f, 0x0d, 0x40, 0x08, 0x3a, 0x57, 0x99, 0xfe, 0xa3, 0x6f, 0xbf, 0x47, 0xe9, 0x04, 0x30, 0x84, + 0x97, 0x25, 0x68, 0xdc, 0x3d, 0x1d, 0x7d, 0xec, 0xd0, 0x93, 0x66, 0x64, 0xdf, 0x48, 0x7d, 0x5b, + 0x93, 0xba, 0xc7, 0xff, 0x7d, 0x7f, 0x7c, 0x77, 0x07, 0xee, 0xb8, 0x8d, 0x7b, 0xbb, 0x0f, 0xbf, + 0xfb, 0xe1, 0xfb, 0x8f, 0x4f, 0xd6, 0x75, 0xff, 0x3c, 0x78, 0x35, 0x6c, 0x1e, 0xd5, 0x98, 0x0c, + 0xd8, 0x57, 0x42, 0xcf, 0x26, 0x80, 0x0d, 0xe2, 0x9d, 0x36, 0x45, 0x36, 0xa3, 0x70, 0x0f, 0x6a, + 0xcd, 0x77, 0x0d, 0xde, 0x0d, 0xc6, 0x7e, 0xc7, 0xd3, 0xc1, 0x5b, 0x19, 0xbf, 0x63, 0x9f, 0x09, + 0xb5, 0x1f, 0x99, 0x15, 0x1d, 0x0c, 0x39, 0x6c, 0xe3, 0xab, 0x7e, 0xc3, 0x9a, 0x6c, 0xf0, 0x37, + 0xb2, 0x2f, 0x84, 0x5e, 0x3c, 0x91, 0xba, 0x19, 0x9e, 0x66, 0xed, 0x0b, 0x1c, 0x38, 0xb8, 0x9b, + 0x06, 0xef, 0x92, 0x5d, 0x6c, 0xe1, 0xdd, 0x22, 0xec, 0x3d, 0xa1, 0xf6, 0x53, 0xf3, 0x25, 0xfe, + 0xd3, 0xeb, 0x6b, 0xdf, 0xda, 0x03, 0xfa, 0xfc, 0xa4, 0xce, 0x44, 0x1d, 0x23, 0xb9, 0xfd, 0x2b, + 0x00, 0x00, 0xff, 0xff, 0x99, 0x5b, 0x18, 0x57, 0xdb, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/template/template.pb.gw.go b/protos/template/template.pb.gw.go new file mode 100644 index 000000000..9d499a177 --- /dev/null +++ b/protos/template/template.pb.gw.go @@ -0,0 +1,407 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: template/template.proto + +/* +Package template is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package template + +import ( + "context" + "io" + "net/http" + + "github.com/golang/protobuf/descriptor" + "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/status" +) + +// Suppress "imported and not used" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage + +func request_Template_CreateTemplate_0(ctx context.Context, marshaler runtime.Marshaler, client TemplateClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq WorkflowTemplate + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.CreateTemplate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Template_CreateTemplate_0(ctx context.Context, marshaler runtime.Marshaler, server TemplateServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq WorkflowTemplate + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.CreateTemplate(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Template_GetTemplate_0(ctx context.Context, marshaler runtime.Marshaler, client TemplateClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.GetTemplate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Template_GetTemplate_0(ctx context.Context, marshaler runtime.Marshaler, server TemplateServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.GetTemplate(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Template_DeleteTemplate_0(ctx context.Context, marshaler runtime.Marshaler, client TemplateClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.DeleteTemplate(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Template_DeleteTemplate_0(ctx context.Context, marshaler runtime.Marshaler, server TemplateServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.DeleteTemplate(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Template_ListTemplates_0(ctx context.Context, marshaler runtime.Marshaler, client TemplateClient, req *http.Request, pathParams map[string]string) (Template_ListTemplatesClient, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + stream, err := client.ListTemplates(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + +} + +// RegisterTemplateHandlerServer registers the http handlers for service Template to "mux". +// UnaryRPC :call TemplateServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterTemplateHandlerServer(ctx context.Context, mux *runtime.ServeMux, server TemplateServer) error { + + mux.Handle("POST", pattern_Template_CreateTemplate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Template_CreateTemplate_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Template_CreateTemplate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Template_GetTemplate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Template_GetTemplate_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Template_GetTemplate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("DELETE", pattern_Template_DeleteTemplate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Template_DeleteTemplate_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Template_DeleteTemplate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Template_ListTemplates_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + + return nil +} + +// RegisterTemplateHandlerFromEndpoint is same as RegisterTemplateHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterTemplateHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterTemplateHandler(ctx, mux, conn) +} + +// RegisterTemplateHandler registers the http handlers for service Template to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterTemplateHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterTemplateHandlerClient(ctx, mux, NewTemplateClient(conn)) +} + +// RegisterTemplateHandlerClient registers the http handlers for service Template +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "TemplateClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "TemplateClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "TemplateClient" to call the correct interceptors. +func RegisterTemplateHandlerClient(ctx context.Context, mux *runtime.ServeMux, client TemplateClient) error { + + mux.Handle("POST", pattern_Template_CreateTemplate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Template_CreateTemplate_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Template_CreateTemplate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Template_GetTemplate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Template_GetTemplate_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Template_GetTemplate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("DELETE", pattern_Template_DeleteTemplate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Template_DeleteTemplate_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Template_DeleteTemplate_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Template_ListTemplates_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Template_ListTemplates_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Template_ListTemplates_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_Template_CreateTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "template"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Template_GetTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "templates", "id"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Template_DeleteTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "templates", "id"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Template_ListTemplates_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "templates"}, "", runtime.AssumeColonVerbOpt(true))) +) + +var ( + forward_Template_CreateTemplate_0 = runtime.ForwardResponseMessage + + forward_Template_GetTemplate_0 = runtime.ForwardResponseMessage + + forward_Template_DeleteTemplate_0 = runtime.ForwardResponseMessage + + forward_Template_ListTemplates_0 = runtime.ForwardResponseStream +) diff --git a/protos/template/template.proto b/protos/template/template.proto index 7712e4900..8513ac0c6 100644 --- a/protos/template/template.proto +++ b/protos/template/template.proto @@ -4,13 +4,31 @@ option go_package = "template"; package github.aaakk.us.kg.tinkerbell.tink.protos.template; +import "google/api/annotations.proto"; import "timestamp.proto"; service Template { - rpc CreateTemplate(WorkflowTemplate) returns (CreateResponse); - rpc GetTemplate(GetRequest) returns (WorkflowTemplate); - rpc DeleteTemplate(GetRequest) returns (Empty); - rpc ListTemplates(Empty) returns (stream WorkflowTemplate); + rpc CreateTemplate(WorkflowTemplate) returns (CreateResponse) { + option (google.api.http) = { + post: "/v1/template" + body: "*" + }; + }; + rpc GetTemplate(GetRequest) returns (WorkflowTemplate) { + option (google.api.http) = { + get: "/v1/templates/{id}" + }; + }; + rpc DeleteTemplate(GetRequest) returns (Empty) { + option (google.api.http) = { + delete: "/v1/templates/{id}" + }; + }; + rpc ListTemplates(Empty) returns (stream WorkflowTemplate) { + option (google.api.http) = { + get: "/v1/templates" + }; + }; rpc UpdateTemplate(WorkflowTemplate) returns (Empty); } diff --git a/protos/workflow/workflow.pb.go b/protos/workflow/workflow.pb.go index f402e115d..401a457b8 100644 --- a/protos/workflow/workflow.pb.go +++ b/protos/workflow/workflow.pb.go @@ -10,6 +10,7 @@ import ( proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -963,92 +964,98 @@ func init() { proto.RegisterType((*UpdateWorkflowDataRequest)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.workflow.UpdateWorkflowDataRequest") } -func init() { proto.RegisterFile("workflow/workflow.proto", fileDescriptor_87aff9429097fa52) } +func init() { + proto.RegisterFile("workflow/workflow.proto", fileDescriptor_87aff9429097fa52) +} var fileDescriptor_87aff9429097fa52 = []byte{ - // 1164 bytes of a gzipped FileDescriptorProto + // 1232 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xae, 0xe3, 0xd8, 0x7e, 0x6e, 0x9c, 0x74, 0x1a, 0x25, 0x8b, 0x0b, 0xc2, 0xac, 0x84, - 0x14, 0xe5, 0x60, 0x42, 0xa0, 0x40, 0x8b, 0x04, 0xa4, 0xb6, 0x6b, 0x59, 0x6a, 0x9d, 0x6a, 0xed, - 0x50, 0x09, 0x90, 0xac, 0x8d, 0x77, 0x92, 0xac, 0xb2, 0xbb, 0xe3, 0xee, 0xcc, 0x26, 0x85, 0x1e, - 0x38, 0x22, 0xc4, 0x85, 0x33, 0xe2, 0x80, 0xe0, 0x73, 0xc1, 0x77, 0xe0, 0xc4, 0x15, 0xcd, 0x3f, - 0xdb, 0x6b, 0x97, 0x04, 0xaf, 0x2f, 0xbd, 0xed, 0xfb, 0xf3, 0x7b, 0xf3, 0xf6, 0xbd, 0xdf, 0xcc, - 0x7b, 0xb0, 0x73, 0x45, 0xe2, 0x8b, 0xd3, 0x80, 0x5c, 0xbd, 0xa7, 0x3f, 0xea, 0xa3, 0x98, 0x30, - 0x82, 0xf6, 0xce, 0x7c, 0x76, 0x9e, 0x9c, 0xd4, 0x87, 0x24, 0xac, 0x33, 0x3f, 0xba, 0xc0, 0xf1, - 0x09, 0x0e, 0x02, 0xf1, 0x29, 0x3d, 0x68, 0x5d, 0x23, 0xaa, 0x1b, 0xcc, 0x0f, 0x31, 0x65, 0x6e, - 0x38, 0x92, 0x26, 0xbb, 0x00, 0xf9, 0x56, 0x38, 0x62, 0xdf, 0xda, 0x7f, 0x9a, 0x50, 0x7c, 0xa6, - 0xdc, 0x50, 0x05, 0x4c, 0xdf, 0xb3, 0x8c, 0x9a, 0xb1, 0x5b, 0x72, 0x4c, 0xdf, 0x43, 0x55, 0x28, - 0x32, 0x1c, 0x8e, 0x02, 0x97, 0x61, 0xcb, 0x14, 0xda, 0xb1, 0xcc, 0x6d, 0xe7, 0x6e, 0xec, 0x5d, - 0xb9, 0x31, 0xb6, 0x72, 0xd2, 0xa6, 0x65, 0xd4, 0x86, 0x3c, 0x65, 0x1c, 0xb4, 0x5a, 0x33, 0x76, - 0x2b, 0x07, 0xef, 0xd7, 0xff, 0x7f, 0xaa, 0xf5, 0x1e, 0x07, 0x3a, 0x12, 0x8f, 0x3e, 0x81, 0xd2, - 0x30, 0xc6, 0x2e, 0xc3, 0xde, 0x21, 0xb3, 0xf2, 0x35, 0x63, 0xb7, 0x7c, 0x50, 0xad, 0x9f, 0x11, - 0x72, 0x16, 0x60, 0x09, 0x3c, 0x49, 0x4e, 0xeb, 0x7d, 0xfd, 0x6f, 0xce, 0xc4, 0x99, 0x23, 0x93, - 0x91, 0xa7, 0x90, 0x6b, 0x37, 0x23, 0xc7, 0xce, 0x1c, 0xe9, 0xe1, 0x00, 0x4b, 0x64, 0xe1, 0x66, - 0xe4, 0xd8, 0x19, 0x21, 0x58, 0xf5, 0x5c, 0xe6, 0x5a, 0x45, 0x51, 0x0e, 0xf1, 0x6d, 0xb7, 0x61, - 0xbd, 0x21, 0x92, 0x72, 0xf0, 0xf3, 0x04, 0x53, 0x96, 0xaa, 0xa9, 0x71, 0x4d, 0x4d, 0xcd, 0x74, - 0x4d, 0xed, 0x1a, 0x54, 0x74, 0x20, 0x3a, 0x22, 0x11, 0xc5, 0xb3, 0xdd, 0xb2, 0xdf, 0x04, 0x68, - 0x63, 0xa6, 0xcf, 0x99, 0xb5, 0xfe, 0x63, 0xc2, 0x86, 0x6e, 0x74, 0x83, 0x44, 0x0c, 0xbf, 0x60, - 0xe8, 0x6d, 0x28, 0xeb, 0xba, 0x0f, 0xc6, 0xce, 0xa0, 0x55, 0x1d, 0x0f, 0xbd, 0x0b, 0x95, 0x61, - 0x12, 0xc7, 0x38, 0x62, 0x03, 0xae, 0xc5, 0xb1, 0x4a, 0x6b, 0x5d, 0x69, 0x9f, 0x09, 0x25, 0x7a, - 0x07, 0x6e, 0x69, 0x37, 0xe6, 0xd2, 0x0b, 0xc5, 0x87, 0xb2, 0xd2, 0xf5, 0x5d, 0x7a, 0x31, 0x1d, - 0xc9, 0x1d, 0x32, 0x9f, 0x44, 0x82, 0x1b, 0x93, 0x48, 0x87, 0x42, 0x89, 0xf6, 0x61, 0x2b, 0xed, - 0x36, 0xf0, 0x23, 0x0f, 0xbf, 0x10, 0xbd, 0xcf, 0x39, 0x28, 0xe5, 0xdc, 0xe1, 0x16, 0xe4, 0xcf, - 0x21, 0x24, 0xf5, 0xd6, 0x04, 0xf5, 0x3e, 0x5e, 0x84, 0x7a, 0x32, 0xac, 0x24, 0x60, 0xfa, 0x28, - 0xa1, 0x43, 0xf7, 0x60, 0x87, 0x11, 0xe6, 0x06, 0x83, 0x28, 0x09, 0x4f, 0x70, 0x3c, 0x20, 0xa7, - 0xea, 0x48, 0x2a, 0x78, 0x92, 0x73, 0xb6, 0x84, 0xb9, 0x2b, 0xac, 0x47, 0xa7, 0x12, 0x4a, 0xed, - 0xbf, 0x4c, 0xd8, 0xd2, 0x95, 0x9f, 0x84, 0x4b, 0xe8, 0xcd, 0xe5, 0xbf, 0x0b, 0x25, 0x5e, 0xcf, - 0x41, 0xe4, 0x86, 0x93, 0x0b, 0xe8, 0xd2, 0x8b, 0xae, 0x1b, 0x62, 0x8e, 0x56, 0x3f, 0x2c, 0xcc, - 0xb2, 0xe6, 0x20, 0x55, 0xc2, 0xe1, 0x1b, 0x58, 0x9f, 0xaa, 0x48, 0x42, 0xd5, 0x6d, 0xcc, 0x5c, - 0x92, 0x5b, 0xee, 0x74, 0xf2, 0x16, 0x14, 0x28, 0x1e, 0x92, 0xc8, 0xa3, 0xaa, 0x39, 0x5a, 0xe4, - 0x96, 0x10, 0x53, 0xea, 0x9e, 0xc9, 0x26, 0x94, 0x1c, 0x2d, 0xa6, 0xaf, 0x73, 0x61, 0x91, 0xeb, - 0x7c, 0x17, 0x4a, 0x92, 0x80, 0xbc, 0x50, 0xf2, 0x7e, 0x15, 0xa5, 0xa2, 0xe3, 0xd9, 0xf7, 0x60, - 0x7b, 0x86, 0xd9, 0xfa, 0x12, 0xa4, 0x60, 0xc6, 0x0c, 0xec, 0x7b, 0xb8, 0x33, 0x03, 0x7b, 0xec, - 0x53, 0x86, 0xce, 0xe1, 0xf6, 0xb8, 0x2b, 0x43, 0xa9, 0xa7, 0x96, 0x51, 0xcb, 0xed, 0x96, 0x0f, - 0x3e, 0x5d, 0xa4, 0x74, 0xb3, 0x29, 0x6d, 0x5e, 0xa5, 0x15, 0xd4, 0xbe, 0x3f, 0xc9, 0x5b, 0x71, - 0x45, 0xe7, 0x7d, 0x13, 0x33, 0xec, 0xdf, 0x4d, 0xa8, 0xa4, 0xb1, 0x69, 0xb2, 0x18, 0x33, 0x64, - 0x41, 0xb0, 0x3a, 0x45, 0x22, 0xf1, 0x8d, 0xb6, 0x20, 0xef, 0x87, 0xbc, 0x4b, 0x92, 0x3a, 0x52, - 0xe0, 0xdd, 0xe3, 0xc3, 0x82, 0x24, 0x4c, 0xf0, 0x25, 0xe7, 0x68, 0x91, 0x5b, 0x86, 0x24, 0x0c, - 0xdd, 0xc8, 0xb3, 0xf2, 0xb5, 0x1c, 0xef, 0xab, 0x12, 0xd1, 0x5b, 0x00, 0x24, 0x1a, 0x68, 0xd8, - 0x9a, 0x30, 0x96, 0x48, 0xd4, 0x57, 0x40, 0x69, 0x3e, 0x75, 0xfd, 0x20, 0x89, 0xb1, 0x55, 0xd0, - 0xe6, 0x47, 0x52, 0x71, 0x6d, 0x6f, 0xf9, 0xa1, 0x97, 0x24, 0x48, 0x42, 0x4c, 0xad, 0x92, 0x3c, - 0x54, 0x89, 0xa8, 0x06, 0x65, 0x1c, 0x5d, 0xfa, 0x31, 0x89, 0x42, 0x1c, 0x31, 0x0b, 0x84, 0x75, - 0x5a, 0x65, 0x3f, 0x07, 0x94, 0xae, 0x91, 0xe8, 0xef, 0xd7, 0xe3, 0x7b, 0x13, 0xf8, 0x94, 0xa9, - 0xce, 0x3e, 0xc8, 0xd2, 0x59, 0x19, 0x54, 0xdf, 0x39, 0x1e, 0xdc, 0xee, 0xc1, 0x76, 0x1b, 0x33, - 0xed, 0xd0, 0x74, 0x99, 0xfb, 0xca, 0x96, 0x36, 0xe7, 0x5a, 0xda, 0x14, 0x7f, 0x8a, 0x63, 0xca, - 0x9f, 0x46, 0xde, 0xa5, 0xbc, 0xa3, 0x45, 0xbb, 0x0d, 0x3b, 0x73, 0x41, 0xd5, 0x0c, 0xd0, 0x23, - 0x87, 0x87, 0xbb, 0x25, 0x47, 0xce, 0x35, 0x81, 0x02, 0x78, 0xe3, 0x58, 0xcc, 0xb9, 0x4c, 0x09, - 0x56, 0xa1, 0x18, 0x62, 0xe6, 0x8a, 0xf3, 0x4c, 0x71, 0xde, 0x58, 0x1e, 0xe7, 0x91, 0x9b, 0xe4, - 0xb1, 0xd7, 0x86, 0xbc, 0x7c, 0x37, 0xcb, 0x50, 0x78, 0xda, 0xea, 0x36, 0x3b, 0xdd, 0xf6, 0xe6, - 0x0a, 0x17, 0x9c, 0xe3, 0x6e, 0x97, 0x0b, 0x06, 0x02, 0x58, 0x7b, 0x74, 0xd8, 0x79, 0xdc, 0x6a, - 0x6e, 0x9a, 0xdc, 0xd0, 0xef, 0x3c, 0x69, 0x1d, 0x1d, 0xf7, 0x37, 0x73, 0x5c, 0xe8, 0x1d, 0x37, - 0x1a, 0xad, 0x5e, 0x6f, 0x73, 0x75, 0x8f, 0x41, 0x79, 0xfa, 0x19, 0x46, 0x50, 0x39, 0x6c, 0xf4, - 0x3b, 0x47, 0xdd, 0xc1, 0x24, 0xea, 0x36, 0x20, 0xa5, 0xeb, 0x74, 0x07, 0x4f, 0x9d, 0xa3, 0xb6, - 0xc3, 0xa1, 0xc6, 0x94, 0xaf, 0x0e, 0x67, 0xa2, 0xdb, 0xb0, 0xae, 0x74, 0xea, 0xec, 0xdc, 0x94, - 0x9b, 0x4e, 0x61, 0xf5, 0xe0, 0xef, 0x0a, 0x94, 0x75, 0x9d, 0x7a, 0x97, 0x43, 0xf4, 0x83, 0xa1, - 0x27, 0xf0, 0x78, 0x5f, 0xba, 0xbf, 0x08, 0x6b, 0x52, 0x6b, 0x40, 0xf5, 0x41, 0x16, 0xa8, 0x6a, - 0xfa, 0x4b, 0x28, 0x4f, 0xf1, 0x01, 0x7d, 0xb4, 0x48, 0xa8, 0xc9, 0x86, 0x50, 0xfd, 0x30, 0x0b, - 0xe7, 0xd1, 0x4b, 0xa8, 0x34, 0xc5, 0xc6, 0xb3, 0xf4, 0xf9, 0x0b, 0xad, 0x85, 0x62, 0x5b, 0x45, - 0xdf, 0xc1, 0x3a, 0xbf, 0x66, 0xfa, 0x68, 0x8a, 0x16, 0x8f, 0x91, 0xed, 0xb7, 0xf7, 0x0d, 0xf4, - 0xa3, 0x01, 0x68, 0xaa, 0xec, 0x7a, 0x87, 0xca, 0xfa, 0xf7, 0xcb, 0xcc, 0x12, 0xf4, 0xb3, 0x01, - 0xa8, 0x77, 0x4e, 0xae, 0xb4, 0xbe, 0x75, 0x89, 0x23, 0x46, 0x33, 0xe7, 0xf2, 0x45, 0xf6, 0xd7, - 0x4f, 0x6e, 0x03, 0xfb, 0x06, 0xfa, 0xd5, 0x80, 0x3b, 0xf3, 0xe5, 0xa1, 0xe8, 0xe1, 0x32, 0x33, - 0x53, 0xe5, 0xf7, 0xf9, 0x12, 0x31, 0xc4, 0xb3, 0xbc, 0x82, 0x7e, 0x49, 0x77, 0x4f, 0xcd, 0xdb, - 0x6c, 0xd9, 0xa5, 0x87, 0x75, 0xf5, 0xb3, 0xec, 0x31, 0x54, 0x72, 0x3f, 0x19, 0x80, 0x1c, 0x3c, - 0x22, 0x31, 0x4b, 0xed, 0x87, 0x4b, 0xb7, 0x25, 0xc3, 0x15, 0xb3, 0x57, 0x78, 0x27, 0x37, 0x66, - 0xe6, 0xcd, 0x62, 0x75, 0x7a, 0xf5, 0x04, 0xac, 0x36, 0x96, 0x8a, 0x21, 0xdf, 0x3e, 0x7b, 0x05, - 0xfd, 0x96, 0x26, 0xda, 0x13, 0x3d, 0x82, 0x5e, 0xa3, 0x14, 0xff, 0x30, 0xe6, 0xd6, 0x80, 0x2f, - 0xe5, 0x08, 0x7e, 0x9d, 0xb2, 0xe4, 0x8f, 0xc8, 0xfc, 0x3a, 0x80, 0x5a, 0x8b, 0x44, 0xff, 0xcf, - 0x75, 0x22, 0x13, 0xf5, 0x1e, 0xc2, 0x57, 0x45, 0xad, 0x3b, 0x59, 0x13, 0x4e, 0x1f, 0xfc, 0x1b, - 0x00, 0x00, 0xff, 0xff, 0x77, 0x2d, 0xf7, 0x8b, 0x01, 0x11, 0x00, 0x00, + 0x14, 0xcf, 0xae, 0xe3, 0xd8, 0x7e, 0x8e, 0x9d, 0x74, 0x1a, 0x1a, 0xe3, 0x16, 0x61, 0x56, 0x42, + 0x8a, 0x72, 0x70, 0xda, 0x40, 0x81, 0x06, 0x09, 0x48, 0x6d, 0xd7, 0xb2, 0xd4, 0x3a, 0xd5, 0xda, + 0xa1, 0x12, 0x20, 0x59, 0x13, 0xef, 0x24, 0x59, 0xc5, 0xbb, 0xeb, 0xee, 0x8c, 0x93, 0x22, 0x84, + 0x90, 0xb8, 0x21, 0x2e, 0x20, 0x0e, 0x48, 0x88, 0x03, 0x82, 0x8f, 0xc4, 0x15, 0x38, 0xf1, 0x1d, + 0xb8, 0xa2, 0xf9, 0x67, 0xef, 0xda, 0x21, 0xc1, 0xeb, 0x4b, 0x6f, 0xfb, 0xfe, 0xfc, 0xde, 0xfc, + 0xf6, 0xbd, 0x37, 0xf3, 0x1e, 0x6c, 0x5e, 0x04, 0xe1, 0xd9, 0xf1, 0x20, 0xb8, 0xd8, 0xd1, 0x1f, + 0xd5, 0x61, 0x18, 0xb0, 0x00, 0x6d, 0x9f, 0xb8, 0xec, 0x74, 0x74, 0x54, 0xed, 0x07, 0x5e, 0x95, + 0xb9, 0xfe, 0x19, 0x09, 0x8f, 0xc8, 0x60, 0x20, 0x3e, 0xa5, 0x07, 0xad, 0x6a, 0x44, 0xf9, 0xce, + 0x49, 0x10, 0x9c, 0x0c, 0xc8, 0x0e, 0x1e, 0xba, 0x3b, 0xd8, 0xf7, 0x03, 0x86, 0x99, 0x1b, 0xf8, + 0x54, 0xfa, 0x95, 0xd7, 0x98, 0xeb, 0x11, 0xca, 0xb0, 0x37, 0x94, 0x0a, 0x2b, 0x03, 0xe9, 0x86, + 0x37, 0x64, 0x9f, 0x5b, 0x7f, 0x9a, 0x90, 0x7d, 0xa6, 0x82, 0xa0, 0x22, 0x98, 0xae, 0x53, 0x32, + 0x2a, 0xc6, 0x56, 0xce, 0x36, 0x5d, 0x07, 0x95, 0x21, 0xcb, 0x88, 0x37, 0x1c, 0x60, 0x46, 0x4a, + 0xa6, 0xd0, 0x8e, 0x65, 0x6e, 0x3b, 0xc5, 0xa1, 0x73, 0x81, 0x43, 0x52, 0x4a, 0x49, 0x9b, 0x96, + 0x51, 0x13, 0xd2, 0x94, 0x71, 0xd0, 0x72, 0xc5, 0xd8, 0x2a, 0xee, 0xde, 0xab, 0xfe, 0xff, 0x1f, + 0xa9, 0x76, 0x38, 0xd0, 0x96, 0x78, 0xf4, 0x1e, 0xe4, 0xfa, 0x21, 0xc1, 0x8c, 0x38, 0xfb, 0xac, + 0x94, 0xae, 0x18, 0x5b, 0xf9, 0xdd, 0x72, 0x55, 0xfe, 0xa9, 0x04, 0x1e, 0x8d, 0x8e, 0xab, 0x5d, + 0xfd, 0x6f, 0xf6, 0xc4, 0x99, 0x23, 0x47, 0x43, 0x47, 0x21, 0x57, 0xae, 0x47, 0x8e, 0x9d, 0x39, + 0xd2, 0x21, 0x03, 0x22, 0x91, 0x99, 0xeb, 0x91, 0x63, 0x67, 0x84, 0x60, 0xd9, 0xc1, 0x0c, 0x97, + 0xb2, 0x22, 0x1d, 0xe2, 0xdb, 0x6a, 0x42, 0xa1, 0x26, 0x48, 0xd9, 0xe4, 0xf9, 0x88, 0x50, 0x16, + 0xcb, 0xa9, 0x71, 0x45, 0x4e, 0xcd, 0x78, 0x4e, 0xad, 0x0a, 0x14, 0x75, 0x20, 0x3a, 0x0c, 0x7c, + 0x4a, 0xa6, 0xab, 0x65, 0xdd, 0x01, 0x68, 0x12, 0xa6, 0xcf, 0x99, 0xb6, 0xfe, 0x63, 0xc2, 0x9a, + 0x2e, 0x74, 0x2d, 0xf0, 0x19, 0x79, 0xc1, 0xd0, 0xeb, 0x90, 0xd7, 0x79, 0xef, 0x8d, 0x9d, 0x41, + 0xab, 0x5a, 0x0e, 0x7a, 0x13, 0x8a, 0xfd, 0x51, 0x18, 0x12, 0x9f, 0xf5, 0xb8, 0x96, 0x84, 0x8a, + 0x56, 0x41, 0x69, 0x9f, 0x09, 0x25, 0x7a, 0x03, 0x56, 0xb5, 0x1b, 0xc3, 0xf4, 0x4c, 0xf5, 0x43, + 0x5e, 0xe9, 0xba, 0x98, 0x9e, 0x45, 0x23, 0xe1, 0x3e, 0x6f, 0x4d, 0xd1, 0x1b, 0x93, 0x48, 0xfb, + 0x42, 0x89, 0xee, 0xc2, 0x46, 0xdc, 0xad, 0xe7, 0xfa, 0x0e, 0x79, 0x21, 0x6a, 0x9f, 0xb2, 0x51, + 0xcc, 0xb9, 0xc5, 0x2d, 0xc8, 0x9d, 0x41, 0xc8, 0xd6, 0x5b, 0x11, 0xad, 0xf7, 0xee, 0x3c, 0xad, + 0x27, 0xc3, 0xca, 0x06, 0x8c, 0x1f, 0x25, 0x74, 0xe8, 0x3e, 0x6c, 0xb2, 0x80, 0xe1, 0x41, 0xcf, + 0x1f, 0x79, 0x47, 0x24, 0xec, 0x05, 0xc7, 0xea, 0x48, 0x2a, 0xfa, 0x24, 0x65, 0x6f, 0x08, 0x73, + 0x5b, 0x58, 0x0f, 0x8e, 0x25, 0x94, 0x5a, 0x7f, 0x99, 0xb0, 0xa1, 0x33, 0x3f, 0x09, 0x37, 0xa2, + 0xd7, 0xa7, 0xff, 0x36, 0xe4, 0x78, 0x3e, 0x7b, 0x3e, 0xf6, 0x26, 0x17, 0x10, 0xd3, 0xb3, 0x36, + 0xf6, 0x08, 0x47, 0xab, 0x1f, 0x16, 0x66, 0x99, 0x73, 0x90, 0x2a, 0xe1, 0xf0, 0x19, 0x14, 0x22, + 0x19, 0x19, 0x51, 0x75, 0x1b, 0x13, 0xa7, 0x64, 0x15, 0x47, 0xc9, 0x97, 0x20, 0x43, 0x49, 0x3f, + 0xf0, 0x1d, 0xaa, 0x8a, 0xa3, 0x45, 0x6e, 0xf1, 0x08, 0xa5, 0xf8, 0x44, 0x16, 0x21, 0x67, 0x6b, + 0x31, 0x7e, 0x9d, 0x33, 0xf3, 0x5c, 0xe7, 0xdb, 0x90, 0x93, 0x0d, 0xc8, 0x13, 0x25, 0xef, 0x57, + 0x56, 0x2a, 0x5a, 0x8e, 0x75, 0x1f, 0x6e, 0x4d, 0x75, 0xb6, 0xbe, 0x04, 0x31, 0x98, 0x31, 0x05, + 0xfb, 0x0a, 0x6e, 0x4e, 0xc1, 0x1e, 0xbb, 0x94, 0xa1, 0x53, 0xb8, 0x31, 0xae, 0x4a, 0x5f, 0xea, + 0x69, 0xc9, 0xa8, 0xa4, 0xb6, 0xf2, 0xbb, 0xef, 0xcf, 0x93, 0xba, 0x69, 0x4a, 0xeb, 0x17, 0x71, + 0x05, 0xb5, 0x1e, 0x4c, 0x78, 0xab, 0x5e, 0xd1, 0xbc, 0xaf, 0xeb, 0x0c, 0xeb, 0x57, 0x13, 0x8a, + 0x71, 0x6c, 0xbc, 0x59, 0x8c, 0xa9, 0x66, 0x41, 0xb0, 0x1c, 0x69, 0x22, 0xf1, 0x8d, 0x36, 0x20, + 0xed, 0x7a, 0xbc, 0x4a, 0xb2, 0x75, 0xa4, 0xc0, 0xab, 0xc7, 0x87, 0x45, 0x30, 0x62, 0xa2, 0x5f, + 0x52, 0xb6, 0x16, 0xb9, 0xa5, 0x1f, 0x78, 0x1e, 0xf6, 0x9d, 0x52, 0xba, 0x92, 0xe2, 0x75, 0x55, + 0x22, 0x7a, 0x0d, 0x20, 0xf0, 0x7b, 0x1a, 0xb6, 0x22, 0x8c, 0xb9, 0xc0, 0xef, 0x2a, 0xa0, 0x34, + 0x1f, 0x63, 0x77, 0x30, 0x0a, 0x49, 0x29, 0xa3, 0xcd, 0x8f, 0xa4, 0xe2, 0xca, 0xda, 0xf2, 0x43, + 0xcf, 0x83, 0xc1, 0xc8, 0x23, 0xb4, 0x94, 0x93, 0x87, 0x2a, 0x11, 0x55, 0x20, 0x4f, 0xfc, 0x73, + 0x37, 0x0c, 0x7c, 0x8f, 0xf8, 0xac, 0x04, 0xc2, 0x1a, 0x55, 0x59, 0xcf, 0x01, 0xc5, 0x73, 0x24, + 0xea, 0xfb, 0xe9, 0xf8, 0xde, 0x0c, 0x5c, 0xca, 0x54, 0x65, 0xf7, 0x92, 0x54, 0x56, 0x06, 0xd5, + 0x77, 0x8e, 0x07, 0xb7, 0x3a, 0x70, 0xab, 0x49, 0x98, 0x76, 0xa8, 0x63, 0x86, 0x2f, 0x2d, 0x69, + 0x7d, 0xa6, 0xa4, 0x75, 0xf1, 0xa7, 0x24, 0xa4, 0xfc, 0x69, 0xe4, 0x55, 0x4a, 0xdb, 0x5a, 0xb4, + 0x9a, 0xb0, 0x39, 0x13, 0x54, 0xcd, 0x00, 0x3d, 0x72, 0x78, 0xb8, 0x55, 0x39, 0x72, 0xae, 0x08, + 0x34, 0x80, 0x57, 0x0f, 0xc5, 0x9c, 0x4b, 0x44, 0xb0, 0x0c, 0x59, 0x8f, 0x30, 0x2c, 0xce, 0x33, + 0xc5, 0x79, 0x63, 0x79, 0xcc, 0x23, 0x35, 0xe1, 0xb1, 0xdd, 0x84, 0xb4, 0x7c, 0x37, 0xf3, 0x90, + 0x79, 0xda, 0x68, 0xd7, 0x5b, 0xed, 0xe6, 0xfa, 0x12, 0x17, 0xec, 0xc3, 0x76, 0x9b, 0x0b, 0x06, + 0x02, 0x58, 0x79, 0xb4, 0xdf, 0x7a, 0xdc, 0xa8, 0xaf, 0x9b, 0xdc, 0xd0, 0x6d, 0x3d, 0x69, 0x1c, + 0x1c, 0x76, 0xd7, 0x53, 0x5c, 0xe8, 0x1c, 0xd6, 0x6a, 0x8d, 0x4e, 0x67, 0x7d, 0x79, 0x9b, 0x41, + 0x3e, 0xfa, 0x0c, 0x23, 0x28, 0xee, 0xd7, 0xba, 0xad, 0x83, 0x76, 0x6f, 0x12, 0xf5, 0x16, 0x20, + 0xa5, 0x6b, 0xb5, 0x7b, 0x4f, 0xed, 0x83, 0xa6, 0xcd, 0xa1, 0x46, 0xc4, 0x57, 0x87, 0x33, 0xd1, + 0x0d, 0x28, 0x28, 0x9d, 0x3a, 0x3b, 0x15, 0x71, 0xd3, 0x14, 0x96, 0x77, 0xff, 0x58, 0x83, 0xbc, + 0xce, 0x53, 0xe7, 0xbc, 0x8f, 0x7e, 0x31, 0xf4, 0x04, 0x1e, 0xef, 0x4b, 0x0f, 0xe6, 0xe9, 0x9a, + 0xd8, 0x1a, 0x50, 0xde, 0x4b, 0x02, 0x95, 0x45, 0xb7, 0x36, 0xbf, 0xfe, 0xfd, 0xef, 0x1f, 0xcc, + 0x1b, 0xd6, 0xea, 0xce, 0xf9, 0xbd, 0xf1, 0xce, 0xb8, 0x67, 0x6c, 0xa3, 0x1f, 0x0d, 0xc8, 0x47, + 0x3a, 0x05, 0xbd, 0x33, 0xcf, 0x21, 0x93, 0xdd, 0xa1, 0xfc, 0x76, 0x92, 0xdb, 0x60, 0x95, 0x05, + 0xad, 0x0d, 0x84, 0xa2, 0xb4, 0xe8, 0xce, 0x17, 0xae, 0xf3, 0x25, 0x67, 0x56, 0xac, 0x8b, 0x45, + 0x69, 0x61, 0x72, 0x73, 0x6d, 0x93, 0x72, 0xc9, 0x55, 0xcc, 0xb6, 0x2f, 0x63, 0xf6, 0xbd, 0x01, + 0x05, 0x7e, 0x75, 0x35, 0x2f, 0x8a, 0xe6, 0x3f, 0x20, 0x61, 0xc2, 0x5e, 0x11, 0xb4, 0xd6, 0x50, + 0x21, 0x46, 0xeb, 0xae, 0x81, 0xbe, 0x31, 0x00, 0x45, 0xea, 0xa8, 0xd7, 0xb5, 0xa4, 0x19, 0x5b, + 0x64, 0x6c, 0xa1, 0xef, 0x0c, 0x40, 0x9d, 0xd3, 0xe0, 0x42, 0xeb, 0x1b, 0xe7, 0xc4, 0x67, 0x34, + 0x31, 0x97, 0x8f, 0x92, 0x3f, 0xb4, 0x72, 0xf1, 0xb8, 0x6b, 0xa0, 0x9f, 0x0d, 0xb8, 0x39, 0x9b, + 0x1e, 0x8a, 0x1e, 0x2e, 0x32, 0x9e, 0x15, 0xbf, 0x0f, 0x17, 0x88, 0x21, 0x26, 0xc0, 0x12, 0xfa, + 0x29, 0x5e, 0x3d, 0x35, 0xda, 0x93, 0xb1, 0x8b, 0xef, 0x05, 0xe5, 0x0f, 0x92, 0xc7, 0x50, 0xe4, + 0xbe, 0x35, 0x00, 0xd9, 0x64, 0x18, 0x84, 0x2c, 0xb6, 0x8a, 0x2e, 0x5c, 0x96, 0x24, 0xd7, 0x72, + 0x89, 0x57, 0x72, 0x6d, 0x6a, 0xb4, 0xcd, 0x97, 0xa7, 0xcb, 0x87, 0x6d, 0xb9, 0xb6, 0x50, 0x0c, + 0xf5, 0xcc, 0x2e, 0xf1, 0x27, 0x3f, 0xda, 0x68, 0x4f, 0xf4, 0xb4, 0x7b, 0x89, 0x28, 0xfe, 0x66, + 0xcc, 0x6c, 0x1c, 0x1f, 0xcb, 0x69, 0xff, 0x32, 0xb1, 0xe4, 0x8f, 0xc8, 0xec, 0xe6, 0x81, 0x1a, + 0xf3, 0x44, 0xff, 0xcf, 0xcd, 0x25, 0x51, 0xeb, 0x3d, 0x84, 0x4f, 0xb2, 0x5a, 0x77, 0xb4, 0x22, + 0x9c, 0xde, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xca, 0x86, 0x66, 0x7c, 0x8a, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // WorkflowSvcClient is the client API for WorkflowSvc service. // @@ -1070,10 +1077,10 @@ type WorkflowSvcClient interface { } type workflowSvcClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewWorkflowSvcClient(cc *grpc.ClientConn) WorkflowSvcClient { +func NewWorkflowSvcClient(cc grpc.ClientConnInterface) WorkflowSvcClient { return &workflowSvcClient{cc} } diff --git a/protos/workflow/workflow.pb.gw.go b/protos/workflow/workflow.pb.gw.go new file mode 100644 index 000000000..a9aa4412e --- /dev/null +++ b/protos/workflow/workflow.pb.gw.go @@ -0,0 +1,407 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: workflow/workflow.proto + +/* +Package workflow is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package workflow + +import ( + "context" + "io" + "net/http" + + "github.com/golang/protobuf/descriptor" + "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/status" +) + +// Suppress "imported and not used" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage + +func request_WorkflowSvc_CreateWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowSvcClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq CreateRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.CreateWorkflow(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_WorkflowSvc_CreateWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, server WorkflowSvcServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq CreateRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.CreateWorkflow(ctx, &protoReq) + return msg, metadata, err + +} + +func request_WorkflowSvc_GetWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowSvcClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.GetWorkflow(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_WorkflowSvc_GetWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, server WorkflowSvcServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.GetWorkflow(ctx, &protoReq) + return msg, metadata, err + +} + +func request_WorkflowSvc_DeleteWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowSvcClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.DeleteWorkflow(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_WorkflowSvc_DeleteWorkflow_0(ctx context.Context, marshaler runtime.Marshaler, server WorkflowSvcServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.DeleteWorkflow(ctx, &protoReq) + return msg, metadata, err + +} + +func request_WorkflowSvc_ListWorkflows_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowSvcClient, req *http.Request, pathParams map[string]string) (WorkflowSvc_ListWorkflowsClient, runtime.ServerMetadata, error) { + var protoReq Empty + var metadata runtime.ServerMetadata + + stream, err := client.ListWorkflows(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + +} + +// RegisterWorkflowSvcHandlerServer registers the http handlers for service WorkflowSvc to "mux". +// UnaryRPC :call WorkflowSvcServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +func RegisterWorkflowSvcHandlerServer(ctx context.Context, mux *runtime.ServeMux, server WorkflowSvcServer) error { + + mux.Handle("POST", pattern_WorkflowSvc_CreateWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_WorkflowSvc_CreateWorkflow_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_CreateWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_WorkflowSvc_GetWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_WorkflowSvc_GetWorkflow_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_GetWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("DELETE", pattern_WorkflowSvc_DeleteWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_WorkflowSvc_DeleteWorkflow_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_DeleteWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_WorkflowSvc_ListWorkflows_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + + return nil +} + +// RegisterWorkflowSvcHandlerFromEndpoint is same as RegisterWorkflowSvcHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterWorkflowSvcHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterWorkflowSvcHandler(ctx, mux, conn) +} + +// RegisterWorkflowSvcHandler registers the http handlers for service WorkflowSvc to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterWorkflowSvcHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterWorkflowSvcHandlerClient(ctx, mux, NewWorkflowSvcClient(conn)) +} + +// RegisterWorkflowSvcHandlerClient registers the http handlers for service WorkflowSvc +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "WorkflowSvcClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "WorkflowSvcClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "WorkflowSvcClient" to call the correct interceptors. +func RegisterWorkflowSvcHandlerClient(ctx context.Context, mux *runtime.ServeMux, client WorkflowSvcClient) error { + + mux.Handle("POST", pattern_WorkflowSvc_CreateWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_WorkflowSvc_CreateWorkflow_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_CreateWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_WorkflowSvc_GetWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_WorkflowSvc_GetWorkflow_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_GetWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("DELETE", pattern_WorkflowSvc_DeleteWorkflow_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_WorkflowSvc_DeleteWorkflow_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_DeleteWorkflow_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_WorkflowSvc_ListWorkflows_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_WorkflowSvc_ListWorkflows_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_ListWorkflows_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_WorkflowSvc_CreateWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "workflow"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_WorkflowSvc_GetWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "workflows", "id"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_WorkflowSvc_DeleteWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "workflows", "id"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_WorkflowSvc_ListWorkflows_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "workflows"}, "", runtime.AssumeColonVerbOpt(true))) +) + +var ( + forward_WorkflowSvc_CreateWorkflow_0 = runtime.ForwardResponseMessage + + forward_WorkflowSvc_GetWorkflow_0 = runtime.ForwardResponseMessage + + forward_WorkflowSvc_DeleteWorkflow_0 = runtime.ForwardResponseMessage + + forward_WorkflowSvc_ListWorkflows_0 = runtime.ForwardResponseStream +) diff --git a/protos/workflow/workflow.proto b/protos/workflow/workflow.proto index 992106580..e724f1800 100644 --- a/protos/workflow/workflow.proto +++ b/protos/workflow/workflow.proto @@ -4,13 +4,31 @@ option go_package = "workflow"; package github.aaakk.us.kg.tinkerbell.tink.protos.workflow; +import "google/api/annotations.proto"; import "timestamp.proto"; service WorkflowSvc { - rpc CreateWorkflow(CreateRequest) returns (CreateResponse); - rpc GetWorkflow(GetRequest) returns (Workflow); - rpc DeleteWorkflow(GetRequest) returns (Empty); - rpc ListWorkflows(Empty) returns (stream Workflow); + rpc CreateWorkflow(CreateRequest) returns (CreateResponse) { + option (google.api.http) = { + post: "/v1/workflow" + body: "*" + }; + }; + rpc GetWorkflow(GetRequest) returns (Workflow) { + option (google.api.http) = { + get: "/v1/workflows/{id}" + }; + }; + rpc DeleteWorkflow(GetRequest) returns (Empty) { + option (google.api.http) = { + delete: "/v1/workflows/{id}" + }; + }; + rpc ListWorkflows(Empty) returns (stream Workflow) { + option (google.api.http) = { + get: "/v1/workflows" + }; + }; rpc GetWorkflowContext(GetRequest) returns (WorkflowContext); rpc ShowWorkflowEvents(GetRequest) returns (stream WorkflowActionStatus); rpc GetWorkflowContexts(WorkflowContextRequest) returns (WorkflowContextList) {} From d5a80653a393996b85759aeffe0beb920cb57ffb Mon Sep 17 00:00:00 2001 From: Kelly Date: Sun, 19 Apr 2020 01:58:52 -0400 Subject: [PATCH 02/31] changed template data to be type string instead of bytes --- db/template.go | 21 ++++++------ grpc-server/template.go | 6 ++-- grpc-server/workflow.go | 2 +- protos/target/target.pb.gw.go | 4 +-- protos/template/template.pb.go | 60 +++++++++++++++++----------------- protos/template/template.proto | 2 +- 6 files changed, 48 insertions(+), 47 deletions(-) diff --git a/db/template.go b/db/template.go index f288629ef..3c0ead76d 100644 --- a/db/template.go +++ b/db/template.go @@ -12,7 +12,7 @@ import ( ) // CreateTemplate creates a new workflow template -func CreateTemplate(ctx context.Context, db *sql.DB, name string, data []byte, id uuid.UUID) error { +func CreateTemplate(ctx context.Context, db *sql.DB, name string, data string, id uuid.UUID) error { tx, err := db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelSerializable}) if err != nil { return errors.Wrap(err, "BEGIN transaction") @@ -40,9 +40,9 @@ func CreateTemplate(ctx context.Context, db *sql.DB, name string, data []byte, i } // GetTemplate returns a workflow template -func GetTemplate(ctx context.Context, db *sql.DB, id string) ([]byte, error) { +func GetTemplate(ctx context.Context, db *sql.DB, id string) (string, string, error) { query := ` - SELECT data + SELECT name, data FROM template WHERE id = $1 @@ -50,10 +50,11 @@ func GetTemplate(ctx context.Context, db *sql.DB, id string) ([]byte, error) { deleted_at IS NULL ` row := db.QueryRowContext(ctx, query, id) - buf := []byte{} - err := row.Scan(&buf) + name := []byte{} + data := []byte{} + err := row.Scan(&name, &data) if err == nil { - return buf, nil + return string(name), string(data), nil } if err != sql.ErrNoRows { @@ -63,7 +64,7 @@ func GetTemplate(ctx context.Context, db *sql.DB, id string) ([]byte, error) { err = nil } - return []byte{}, nil + return "", "", nil } // DeleteTemplate deletes a workflow template @@ -136,20 +137,20 @@ func ListTemplates(db *sql.DB, fn func(id, n string, in, del *timestamp.Timestam } // UpdateTemplate update a given template -func UpdateTemplate(ctx context.Context, db *sql.DB, name string, data []byte, id uuid.UUID) error { +func UpdateTemplate(ctx context.Context, db *sql.DB, name string, data string, id uuid.UUID) error { tx, err := db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelSerializable}) if err != nil { return errors.Wrap(err, "BEGIN transaction") } - if data == nil && name != "" { + if data == "" && name != "" { _, err = tx.Exec(` UPDATE template SET updated_at = NOW(), name = $2 WHERE id = $1;`, id, name) - } else if data != nil && name == "" { + } else if data != "" && name == "" { _, err = tx.Exec(` UPDATE template SET diff --git a/grpc-server/template.go b/grpc-server/template.go index 6b166fab3..0d2cce57e 100644 --- a/grpc-server/template.go +++ b/grpc-server/template.go @@ -55,13 +55,13 @@ func (s *server) GetTemplate(ctx context.Context, in *template.GetRequest) (*tem labels["op"] = "get" msg = "getting a template" - fn := func() ([]byte, error) { return db.GetTemplate(ctx, s.db, in.Id) } + fn := func() (string, string, error) { return db.GetTemplate(ctx, s.db, in.Id) } metrics.CacheTotals.With(labels).Inc() timer := prometheus.NewTimer(metrics.CacheDuration.With(labels)) defer timer.ObserveDuration() logger.Info(msg) - d, err := fn() + n, d, err := fn() logger.Info("done " + msg) if err != nil { metrics.CacheErrors.With(labels).Inc() @@ -71,7 +71,7 @@ func (s *server) GetTemplate(ctx context.Context, in *template.GetRequest) (*tem } l.Error(err) } - return &template.WorkflowTemplate{Id: in.Id, Data: d}, err + return &template.WorkflowTemplate{Id: in.Id, Name: n, Data: d}, err } // DeleteTemplate implements template.DeleteTemplate diff --git a/grpc-server/workflow.go b/grpc-server/workflow.go index 27ca68192..211e16f09 100644 --- a/grpc-server/workflow.go +++ b/grpc-server/workflow.go @@ -264,7 +264,7 @@ func (s *server) ShowWorkflowEvents(req *workflow.GetRequest, stream workflow.Wo } func createYaml(ctx context.Context, sqlDB *sql.DB, temp string, devices string) (string, error) { - tempData, err := db.GetTemplate(ctx, sqlDB, temp) + _, tempData, err := db.GetTemplate(ctx, sqlDB, temp) if err != nil { return "", err } diff --git a/protos/target/target.pb.gw.go b/protos/target/target.pb.gw.go index bdf2b73f1..1cffab129 100644 --- a/protos/target/target.pb.gw.go +++ b/protos/target/target.pb.gw.go @@ -255,7 +255,7 @@ func RegisterTargetHandlerServer(ctx context.Context, mux *runtime.ServeMux, ser }) - mux.Handle("POST", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -363,7 +363,7 @@ func RegisterTargetHandlerClient(ctx context.Context, mux *runtime.ServeMux, cli }) - mux.Handle("POST", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) diff --git a/protos/template/template.pb.go b/protos/template/template.pb.go index 0e327d6c0..cd6643d32 100644 --- a/protos/template/template.pb.go +++ b/protos/template/template.pb.go @@ -61,7 +61,7 @@ var xxx_messageInfo_Empty proto.InternalMessageInfo type WorkflowTemplate struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` CreatedAt *timestamp.Timestamp `protobuf:"bytes,4,opt,name=createdAt,proto3" json:"createdAt,omitempty"` UpdatedAt *timestamp.Timestamp `protobuf:"bytes,5,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` DeletedAt *timestamp.Timestamp `protobuf:"bytes,6,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` @@ -109,11 +109,11 @@ func (m *WorkflowTemplate) GetName() string { return "" } -func (m *WorkflowTemplate) GetData() []byte { +func (m *WorkflowTemplate) GetData() string { if m != nil { return m.Data } - return nil + return "" } func (m *WorkflowTemplate) GetCreatedAt() *timestamp.Timestamp { @@ -225,34 +225,34 @@ func init() { func init() { proto.RegisterFile("template/template.proto", fileDescriptor_dca67df6b60706ce) } var fileDescriptor_dca67df6b60706ce = []byte{ - // 428 bytes of a gzipped FileDescriptorProto + // 427 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xbf, 0x8e, 0xd3, 0x40, - 0x10, 0xc6, 0xb5, 0xe6, 0x2e, 0xdc, 0xed, 0xdd, 0xf9, 0x60, 0x05, 0x8a, 0x65, 0xa5, 0xb0, 0x5c, - 0x45, 0x29, 0xd6, 0x24, 0x48, 0x08, 0x45, 0x34, 0xfc, 0x53, 0x1a, 0x2a, 0x2b, 0x08, 0x89, 0x6e, - 0x1d, 0x4f, 0xc2, 0x2a, 0xb6, 0xd7, 0x78, 0xc7, 0x20, 0x84, 0x28, 0xa0, 0xa6, 0xa3, 0x40, 0x54, - 0x14, 0x3c, 0x12, 0xaf, 0xc0, 0x43, 0x50, 0xa2, 0xac, 0x63, 0x87, 0x04, 0xa4, 0x60, 0x85, 0x6e, - 0x34, 0xfb, 0x7d, 0x3b, 0xbf, 0x99, 0xd9, 0xa5, 0x5d, 0x84, 0x34, 0x4f, 0x04, 0x42, 0x50, 0x07, - 0x3c, 0x2f, 0x14, 0x2a, 0x36, 0x58, 0x48, 0x7c, 0x51, 0x46, 0x7c, 0xa6, 0x52, 0x8e, 0x32, 0x5b, - 0x42, 0x11, 0x41, 0x92, 0x98, 0xb0, 0x52, 0x68, 0x5e, 0x3b, 0xdc, 0xde, 0x42, 0xa9, 0x45, 0x02, - 0x81, 0xc8, 0x65, 0x20, 0xb2, 0x4c, 0xa1, 0x40, 0xa9, 0x32, 0x5d, 0xe9, 0xdc, 0x4b, 0x94, 0x29, - 0x68, 0x14, 0x69, 0x5e, 0x25, 0xfc, 0xab, 0xf4, 0xf8, 0x71, 0x9a, 0xe3, 0x1b, 0xff, 0x27, 0xa1, - 0xd7, 0x9e, 0xa9, 0x62, 0x39, 0x4f, 0xd4, 0xeb, 0xe9, 0xfa, 0x32, 0x66, 0x53, 0x4b, 0xc6, 0x0e, - 0xf1, 0x48, 0xff, 0x34, 0xb4, 0x64, 0xcc, 0x18, 0x3d, 0xca, 0x44, 0x0a, 0x8e, 0x65, 0x32, 0x26, - 0x5e, 0xe5, 0x62, 0x81, 0xc2, 0xb9, 0xe2, 0x91, 0xfe, 0x79, 0x68, 0x62, 0x76, 0x97, 0x9e, 0xce, - 0x0a, 0x10, 0x08, 0xf1, 0x7d, 0x74, 0x8e, 0x3c, 0xd2, 0x3f, 0x1b, 0xb9, 0xbc, 0x02, 0xab, 0xea, - 0x46, 0xe5, 0x9c, 0x4f, 0x6b, 0x94, 0x70, 0x23, 0x5e, 0x39, 0xcb, 0x3c, 0x5e, 0x3b, 0x8f, 0xf7, - 0x3b, 0x1b, 0xf1, 0xca, 0x19, 0x43, 0x02, 0x95, 0xb3, 0xb3, 0xdf, 0xd9, 0x88, 0x7d, 0x8f, 0xda, - 0x0f, 0x0d, 0x40, 0x08, 0x3a, 0x57, 0x99, 0xfe, 0xa3, 0x6f, 0xbf, 0x47, 0xe9, 0x04, 0x30, 0x84, - 0x97, 0x25, 0x68, 0xdc, 0x3d, 0x1d, 0x7d, 0xec, 0xd0, 0x93, 0x66, 0x64, 0xdf, 0x48, 0x7d, 0x5b, - 0x93, 0xba, 0xc7, 0xff, 0x7d, 0x7f, 0x7c, 0x77, 0x07, 0xee, 0xb8, 0x8d, 0x7b, 0xbb, 0x0f, 0xbf, - 0xfb, 0xe1, 0xfb, 0x8f, 0x4f, 0xd6, 0x75, 0xff, 0x3c, 0x78, 0x35, 0x6c, 0x1e, 0xd5, 0x98, 0x0c, - 0xd8, 0x57, 0x42, 0xcf, 0x26, 0x80, 0x0d, 0xe2, 0x9d, 0x36, 0x45, 0x36, 0xa3, 0x70, 0x0f, 0x6a, - 0xcd, 0x77, 0x0d, 0xde, 0x0d, 0xc6, 0x7e, 0xc7, 0xd3, 0xc1, 0x5b, 0x19, 0xbf, 0x63, 0x9f, 0x09, - 0xb5, 0x1f, 0x99, 0x15, 0x1d, 0x0c, 0x39, 0x6c, 0xe3, 0xab, 0x7e, 0xc3, 0x9a, 0x6c, 0xf0, 0x37, - 0xb2, 0x2f, 0x84, 0x5e, 0x3c, 0x91, 0xba, 0x19, 0x9e, 0x66, 0xed, 0x0b, 0x1c, 0x38, 0xb8, 0x9b, - 0x06, 0xef, 0x92, 0x5d, 0x6c, 0xe1, 0xdd, 0x22, 0xec, 0x3d, 0xa1, 0xf6, 0x53, 0xf3, 0x25, 0xfe, - 0xd3, 0xeb, 0x6b, 0xdf, 0xda, 0x03, 0xfa, 0xfc, 0xa4, 0xce, 0x44, 0x1d, 0x23, 0xb9, 0xfd, 0x2b, - 0x00, 0x00, 0xff, 0xff, 0x99, 0x5b, 0x18, 0x57, 0xdb, 0x04, 0x00, 0x00, + 0x10, 0xc6, 0xb5, 0xe6, 0x2e, 0xdc, 0xed, 0x71, 0x3e, 0x58, 0x81, 0xce, 0xb2, 0xae, 0x88, 0x5c, + 0x9d, 0x52, 0xac, 0xb9, 0x20, 0x21, 0x14, 0xd1, 0xf0, 0x4f, 0x69, 0xa8, 0xac, 0x20, 0x24, 0xba, + 0x75, 0x3c, 0x09, 0xab, 0xd8, 0x5e, 0xe3, 0x1d, 0x83, 0x10, 0xa2, 0x80, 0x9a, 0x8e, 0x02, 0x51, + 0x51, 0xf0, 0x48, 0xbc, 0x02, 0x0f, 0x41, 0x89, 0xbc, 0x1b, 0x3b, 0x24, 0x20, 0x05, 0x2b, 0xd7, + 0x8d, 0x3e, 0x7f, 0x9f, 0xf7, 0x37, 0x33, 0xbb, 0xf4, 0x14, 0x21, 0x2b, 0x52, 0x81, 0x10, 0x36, + 0x05, 0x2f, 0x4a, 0x85, 0x8a, 0x0d, 0xe6, 0x12, 0x5f, 0x56, 0x31, 0x9f, 0xaa, 0x8c, 0xa3, 0xcc, + 0x17, 0x50, 0xc6, 0x90, 0xa6, 0xa6, 0xb4, 0x0e, 0xcd, 0x9b, 0x84, 0x7f, 0x36, 0x57, 0x6a, 0x9e, + 0x42, 0x28, 0x0a, 0x19, 0x8a, 0x3c, 0x57, 0x28, 0x50, 0xaa, 0x5c, 0x5b, 0x9f, 0x7f, 0x82, 0x32, + 0x03, 0x8d, 0x22, 0x2b, 0xac, 0x10, 0x5c, 0xa5, 0xfb, 0x4f, 0xb2, 0x02, 0xdf, 0x06, 0xbf, 0x08, + 0xbd, 0xfe, 0x5c, 0x95, 0x8b, 0x59, 0xaa, 0xde, 0x4c, 0x96, 0x3f, 0x63, 0x2e, 0x75, 0x64, 0xe2, + 0x91, 0x3e, 0x39, 0x3f, 0x8c, 0x1c, 0x99, 0x30, 0x46, 0xf7, 0x72, 0x91, 0x81, 0xe7, 0x18, 0xc5, + 0xd4, 0xb5, 0x96, 0x08, 0x14, 0xde, 0x15, 0xab, 0xd5, 0x35, 0xbb, 0x47, 0x0f, 0xa7, 0x25, 0x08, + 0x84, 0xe4, 0x01, 0x7a, 0x7b, 0x7d, 0x72, 0x7e, 0x34, 0xf4, 0xb9, 0x05, 0xb3, 0xe7, 0xc6, 0xd5, + 0x8c, 0x4f, 0x1a, 0x94, 0x68, 0x65, 0xae, 0x93, 0x55, 0x91, 0x2c, 0x93, 0xfb, 0xdb, 0x93, 0xad, + 0xb9, 0x4e, 0x26, 0x90, 0x82, 0x4d, 0xf6, 0xb6, 0x27, 0x5b, 0x73, 0xd0, 0xa7, 0xee, 0x23, 0x03, + 0x10, 0x81, 0x2e, 0x54, 0xae, 0xff, 0xea, 0x3b, 0x38, 0xa3, 0x74, 0x0c, 0x18, 0xc1, 0xab, 0x0a, + 0x34, 0x6e, 0x7e, 0x1d, 0x7e, 0xea, 0xd1, 0x83, 0x76, 0x64, 0xdf, 0x49, 0xf3, 0xb7, 0x56, 0xba, + 0xcf, 0xff, 0x7f, 0x7f, 0x7c, 0x73, 0x07, 0xfe, 0xa8, 0x4b, 0x7a, 0xbd, 0x8f, 0xe0, 0xf4, 0xe3, + 0x8f, 0x9f, 0x9f, 0x9d, 0x1b, 0xc1, 0xb5, 0xf0, 0xf5, 0x45, 0x7b, 0xa9, 0x46, 0x64, 0xc0, 0xbe, + 0x11, 0x7a, 0x34, 0x06, 0x6c, 0x11, 0xef, 0x76, 0x39, 0x64, 0x35, 0x0a, 0x7f, 0xa7, 0xd6, 0x02, + 0xdf, 0xe0, 0xdd, 0x64, 0xec, 0x4f, 0x3c, 0x1d, 0xbe, 0x93, 0xc9, 0x7b, 0xf6, 0x85, 0x50, 0xf7, + 0xb1, 0x59, 0xd1, 0xce, 0x90, 0x17, 0x5d, 0x72, 0xf6, 0x35, 0x2c, 0xc9, 0x06, 0xff, 0x22, 0xfb, + 0x4a, 0xe8, 0xf1, 0x53, 0xa9, 0xdb, 0xe1, 0x69, 0xd6, 0xfd, 0x80, 0x1d, 0x07, 0x77, 0xcb, 0xe0, + 0x9d, 0xb0, 0xe3, 0x35, 0xbc, 0xdb, 0x84, 0x7d, 0x20, 0xd4, 0x7d, 0x66, 0x9e, 0xc4, 0x25, 0xdd, + 0xbe, 0xee, 0xad, 0x3d, 0xa4, 0x2f, 0x0e, 0x1a, 0x25, 0xee, 0x19, 0xcb, 0x9d, 0xdf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xf0, 0x8c, 0x1d, 0x63, 0xdb, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/template/template.proto b/protos/template/template.proto index 8513ac0c6..3270f901b 100644 --- a/protos/template/template.proto +++ b/protos/template/template.proto @@ -38,7 +38,7 @@ message Empty { message WorkflowTemplate { string id = 1; string name = 2; - bytes data = 3; + string data = 3; google.protobuf.Timestamp createdAt = 4; google.protobuf.Timestamp updatedAt = 5; google.protobuf.Timestamp deletedAt = 6; From dd81468d170d3bccc5687bbac3fa3bddc21e9fdb Mon Sep 17 00:00:00 2001 From: Kelly Date: Tue, 21 Apr 2020 13:26:14 -0400 Subject: [PATCH 03/31] update hardware struct --- cmd/tink-cli/cmd/hardware/all.go | 7 +- cmd/tink-cli/cmd/hardware/id.go | 9 +- cmd/tink-cli/cmd/hardware/ip.go | 9 +- cmd/tink-cli/cmd/hardware/mac.go | 9 +- cmd/tink-cli/cmd/hardware/watch.go | 9 +- cmd/tink-cli/cmd/template/update.go | 2 +- db/hardware.go | 4 +- grpc-server/hardware.go | 26 +- protos/hardware/hardware.pb.go | 1111 ++++++++++++++++++++++++++- protos/hardware/hardware.proto | 108 ++- test/framework/template.go | 2 +- 11 files changed, 1226 insertions(+), 70 deletions(-) diff --git a/cmd/tink-cli/cmd/hardware/all.go b/cmd/tink-cli/cmd/hardware/all.go index 84c25e3e8..90910a812 100644 --- a/cmd/tink-cli/cmd/hardware/all.go +++ b/cmd/tink-cli/cmd/hardware/all.go @@ -2,6 +2,7 @@ package hardware import ( "context" + "encoding/json" "fmt" "io" "log" @@ -24,7 +25,11 @@ var allCmd = &cobra.Command{ var hw *hardware.Hardware err = nil for hw, err = alls.Recv(); err == nil && hw != nil; hw, err = alls.Recv() { - fmt.Println(hw.JSON) + b, err := json.Marshal(hw) + if err != nil { + log.Fatal(err) + } + fmt.Println(string(b)) } if err != nil && err != io.EOF { log.Fatal(err) diff --git a/cmd/tink-cli/cmd/hardware/id.go b/cmd/tink-cli/cmd/hardware/id.go index 2bb0cff5f..f2400bf8d 100644 --- a/cmd/tink-cli/cmd/hardware/id.go +++ b/cmd/tink-cli/cmd/hardware/id.go @@ -4,6 +4,7 @@ package hardware import ( "context" + "encoding/json" "fmt" "log" @@ -22,11 +23,15 @@ var idCmd = &cobra.Command{ }, Run: func(cmd *cobra.Command, args []string) { for _, id := range args { - hw, err := client.HardwareClient.ByID(context.Background(), &hardware.GetRequest{ID: id}) + hw, err := client.HardwareClient.ByID(context.Background(), &hardware.GetRequest{Id: id}) if err != nil { log.Fatal(err) } - fmt.Println(hw.JSON) + b, err := json.Marshal(hw) + if err != nil { + log.Fatal(err) + } + fmt.Println(string(b)) } }, } diff --git a/cmd/tink-cli/cmd/hardware/ip.go b/cmd/tink-cli/cmd/hardware/ip.go index fc6727a4a..a63afbd4f 100644 --- a/cmd/tink-cli/cmd/hardware/ip.go +++ b/cmd/tink-cli/cmd/hardware/ip.go @@ -4,6 +4,7 @@ package hardware import ( "context" + "encoding/json" "fmt" "log" "net" @@ -28,11 +29,15 @@ var ipCmd = &cobra.Command{ }, Run: func(cmd *cobra.Command, args []string) { for _, ip := range args { - hw, err := client.HardwareClient.ByIP(context.Background(), &hardware.GetRequest{IP: ip}) + hw, err := client.HardwareClient.ByIP(context.Background(), &hardware.GetRequest{Ip: ip}) if err != nil { log.Fatal(err) } - fmt.Println(hw.JSON) + b, err := json.Marshal(hw) + if err != nil { + log.Fatal(err) + } + fmt.Println(string(b)) } }, } diff --git a/cmd/tink-cli/cmd/hardware/mac.go b/cmd/tink-cli/cmd/hardware/mac.go index 794798b0c..43c6ee317 100644 --- a/cmd/tink-cli/cmd/hardware/mac.go +++ b/cmd/tink-cli/cmd/hardware/mac.go @@ -4,6 +4,7 @@ package hardware import ( "context" + "encoding/json" "fmt" "log" "net" @@ -28,11 +29,15 @@ var macCmd = &cobra.Command{ }, Run: func(cmd *cobra.Command, args []string) { for _, mac := range args { - hw, err := client.HardwareClient.ByMAC(context.Background(), &hardware.GetRequest{MAC: mac}) + hw, err := client.HardwareClient.ByMAC(context.Background(), &hardware.GetRequest{Mac: mac}) if err != nil { log.Fatal(err) } - fmt.Println(hw.JSON) + b, err := json.Marshal(hw) + if err != nil { + log.Fatal(err) + } + fmt.Println(string(b)) } }, } diff --git a/cmd/tink-cli/cmd/hardware/watch.go b/cmd/tink-cli/cmd/hardware/watch.go index ebef8dfbd..6f9bb73bc 100644 --- a/cmd/tink-cli/cmd/hardware/watch.go +++ b/cmd/tink-cli/cmd/hardware/watch.go @@ -4,6 +4,7 @@ package hardware import ( "context" + "encoding/json" "fmt" "io" "log" @@ -26,7 +27,7 @@ var watchCmd = &cobra.Command{ stdoutLock := sync.Mutex{} for _, id := range args { go func(id string) { - stream, err := client.HardwareClient.Watch(context.Background(), &hardware.GetRequest{ID: id}) + stream, err := client.HardwareClient.Watch(context.Background(), &hardware.GetRequest{Id: id}) if err != nil { log.Fatal(err) } @@ -35,7 +36,11 @@ var watchCmd = &cobra.Command{ err = nil for hw, err = stream.Recv(); err == nil && hw != nil; hw, err = stream.Recv() { stdoutLock.Lock() - fmt.Println(hw.JSON) + b, err := json.Marshal(hw) + if err != nil { + log.Fatal(err) + } + fmt.Println(string(b)) stdoutLock.Unlock() } if err != nil && err != io.EOF { diff --git a/cmd/tink-cli/cmd/template/update.go b/cmd/tink-cli/cmd/template/update.go index 805d03334..8730a3fba 100644 --- a/cmd/tink-cli/cmd/template/update.go +++ b/cmd/tink-cli/cmd/template/update.go @@ -59,7 +59,7 @@ func updateTemplate(id string) { } } else { req.Name = templateName - req.Data = readTemplateData() + req.Data = string(readTemplateData()) } _, err := client.TemplateClient.UpdateTemplate(context.Background(), &req) diff --git a/db/hardware.go b/db/hardware.go index 05ee294cb..a0e8f84f5 100644 --- a/db/hardware.go +++ b/db/hardware.go @@ -141,7 +141,7 @@ func GetByID(ctx context.Context, db *sql.DB, id string) (string, error) { } // GetAll : get data for all machine -func GetAll(db *sql.DB, fn func(string) error) error { +func GetAll(db *sql.DB, fn func([]byte) error) error { rows, err := db.Query(` SELECT data FROM hardware @@ -163,7 +163,7 @@ func GetAll(db *sql.DB, fn func(string) error) error { return err } - err = fn(string(buf)) + err = fn(buf) if err != nil { return err } diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go index f461f0ee2..6ddd4c8cb 100644 --- a/grpc-server/hardware.go +++ b/grpc-server/hardware.go @@ -125,25 +125,27 @@ func (s *server) by(method string, fn func() (string, error)) (*hardware.Hardwar } metrics.CacheHits.With(labels).Inc() - return &hardware.Hardware{JSON: j}, nil + hw := &hardware.Hardware{} + json.Unmarshal([]byte(j), hw) + return hw, nil } func (s *server) ByMAC(ctx context.Context, in *hardware.GetRequest) (*hardware.Hardware, error) { return s.by("ByMAC", func() (string, error) { - return db.GetByMAC(ctx, s.db, in.MAC) + return db.GetByMAC(ctx, s.db, in.Mac) }) } func (s *server) ByIP(ctx context.Context, in *hardware.GetRequest) (*hardware.Hardware, error) { return s.by("ByIP", func() (string, error) { - return db.GetByIP(ctx, s.db, in.IP) + return db.GetByIP(ctx, s.db, in.Ip) }) } // ByID implements hardware.ByID func (s *server) ByID(ctx context.Context, in *hardware.GetRequest) (*hardware.Hardware, error) { return s.by("ByID", func() (string, error) { - return db.GetByID(ctx, s.db, in.ID) + return db.GetByID(ctx, s.db, in.Id) }) } @@ -165,8 +167,10 @@ func (s *server) All(_ *hardware.Empty, stream hardware.HardwareService_AllServe timer := prometheus.NewTimer(metrics.CacheDuration.With(labels)) defer timer.ObserveDuration() - err := db.GetAll(s.db, func(j string) error { - return stream.Send(&hardware.Hardware{JSON: j}) + err := db.GetAll(s.db, func(j []byte) error { + hw := &hardware.Hardware{} + json.Unmarshal(j, hw) + return stream.Send(hw) }) if err != nil { metrics.CacheErrors.With(labels).Inc() @@ -178,16 +182,16 @@ func (s *server) All(_ *hardware.Empty, stream hardware.HardwareService_AllServe } func (s *server) Watch(in *hardware.GetRequest, stream hardware.HardwareService_WatchServer) error { - l := logger.With("id", in.ID) + l := logger.With("id", in.Id) ch := make(chan string, 1) s.watchLock.Lock() - old, ok := s.watch[in.ID] + old, ok := s.watch[in.Id] if ok { l.Info("evicting old watch") close(old) } - s.watch[in.ID] = ch + s.watch[in.Id] = ch s.watchLock.Unlock() labels := prometheus.Labels{"method": "Watch", "op": "push"} @@ -200,7 +204,7 @@ func (s *server) Watch(in *hardware.GetRequest, stream hardware.HardwareService_ return } s.watchLock.Lock() - delete(s.watch, in.ID) + delete(s.watch, in.Id) s.watchLock.Unlock() close(ch) }() @@ -223,7 +227,7 @@ func (s *server) Watch(in *hardware.GetRequest, stream hardware.HardwareService_ } hw.Reset() - hw.JSON = j + json.Unmarshal([]byte(j), hw) err := stream.Send(hw) if err != nil { metrics.CacheErrors.With(labels).Inc() diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 64b0cf966..41b9eb40c 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -9,6 +9,7 @@ import ( math "math" proto "github.com/golang/protobuf/proto" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -96,9 +97,9 @@ func (m *Empty) XXX_DiscardUnknown() { var xxx_messageInfo_Empty proto.InternalMessageInfo type GetRequest struct { - MAC string `protobuf:"bytes,1,opt,name=MAC,proto3" json:"MAC,omitempty"` - IP string `protobuf:"bytes,2,opt,name=IP,proto3" json:"IP,omitempty"` - ID string `protobuf:"bytes,3,opt,name=ID,proto3" json:"ID,omitempty"` + Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` + Ip string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` + Id string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -129,32 +130,36 @@ func (m *GetRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetRequest proto.InternalMessageInfo -func (m *GetRequest) GetMAC() string { +func (m *GetRequest) GetMac() string { if m != nil { - return m.MAC + return m.Mac } return "" } -func (m *GetRequest) GetIP() string { +func (m *GetRequest) GetIp() string { if m != nil { - return m.IP + return m.Ip } return "" } -func (m *GetRequest) GetID() string { +func (m *GetRequest) GetId() string { if m != nil { - return m.ID + return m.Id } return "" } type Hardware struct { - JSON string `protobuf:"bytes,1,opt,name=JSON,proto3" json:"JSON,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Dhcp *Hardware_DHCP `protobuf:"bytes,2,opt,name=dhcp,proto3" json:"dhcp,omitempty"` + Netboot *Hardware_Netboot `protobuf:"bytes,3,opt,name=netboot,proto3" json:"netboot,omitempty"` + Network []*Hardware_Network `protobuf:"bytes,4,rep,name=network,proto3" json:"network,omitempty"` + Metadata *Hardware_Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware) Reset() { *m = Hardware{} } @@ -182,9 +187,948 @@ func (m *Hardware) XXX_DiscardUnknown() { var xxx_messageInfo_Hardware proto.InternalMessageInfo -func (m *Hardware) GetJSON() string { +func (m *Hardware) GetId() string { + if m != nil { + return m.Id + } + return "" +} + +func (m *Hardware) GetDhcp() *Hardware_DHCP { + if m != nil { + return m.Dhcp + } + return nil +} + +func (m *Hardware) GetNetboot() *Hardware_Netboot { + if m != nil { + return m.Netboot + } + return nil +} + +func (m *Hardware) GetNetwork() []*Hardware_Network { + if m != nil { + return m.Network + } + return nil +} + +func (m *Hardware) GetMetadata() *Hardware_Metadata { + if m != nil { + return m.Metadata + } + return nil +} + +type Hardware_DHCP struct { + Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` + Ip string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` + Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` + LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` + NameServers []string `protobuf:"bytes,5,rep,name=name_servers,json=nameServers,proto3" json:"name_servers,omitempty"` + TimeServers []string `protobuf:"bytes,6,rep,name=time_servers,json=timeServers,proto3" json:"time_servers,omitempty"` + Gateway string `protobuf:"bytes,7,opt,name=gateway,proto3" json:"gateway,omitempty"` + Arch string `protobuf:"bytes,8,opt,name=arch,proto3" json:"arch,omitempty"` + Uefi bool `protobuf:"varint,9,opt,name=uefi,proto3" json:"uefi,omitempty"` + IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_DHCP) Reset() { *m = Hardware_DHCP{} } +func (m *Hardware_DHCP) String() string { return proto.CompactTextString(m) } +func (*Hardware_DHCP) ProtoMessage() {} +func (*Hardware_DHCP) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 0} +} + +func (m *Hardware_DHCP) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_DHCP.Unmarshal(m, b) +} +func (m *Hardware_DHCP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_DHCP.Marshal(b, m, deterministic) +} +func (m *Hardware_DHCP) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_DHCP.Merge(m, src) +} +func (m *Hardware_DHCP) XXX_Size() int { + return xxx_messageInfo_Hardware_DHCP.Size(m) +} +func (m *Hardware_DHCP) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_DHCP.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_DHCP proto.InternalMessageInfo + +func (m *Hardware_DHCP) GetMac() string { + if m != nil { + return m.Mac + } + return "" +} + +func (m *Hardware_DHCP) GetIp() string { + if m != nil { + return m.Ip + } + return "" +} + +func (m *Hardware_DHCP) GetHostname() string { + if m != nil { + return m.Hostname + } + return "" +} + +func (m *Hardware_DHCP) GetLeaseTime() int64 { + if m != nil { + return m.LeaseTime + } + return 0 +} + +func (m *Hardware_DHCP) GetNameServers() []string { + if m != nil { + return m.NameServers + } + return nil +} + +func (m *Hardware_DHCP) GetTimeServers() []string { + if m != nil { + return m.TimeServers + } + return nil +} + +func (m *Hardware_DHCP) GetGateway() string { + if m != nil { + return m.Gateway + } + return "" +} + +func (m *Hardware_DHCP) GetArch() string { + if m != nil { + return m.Arch + } + return "" +} + +func (m *Hardware_DHCP) GetUefi() bool { + if m != nil { + return m.Uefi + } + return false +} + +func (m *Hardware_DHCP) GetIfaceName() string { + if m != nil { + return m.IfaceName + } + return "" +} + +type Hardware_Netboot struct { + AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` + AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` + Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` + Bootstrapper *Hardware_Netboot_Bootstrapper `protobuf:"bytes,4,opt,name=bootstrapper,proto3" json:"bootstrapper,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Netboot) Reset() { *m = Hardware_Netboot{} } +func (m *Hardware_Netboot) String() string { return proto.CompactTextString(m) } +func (*Hardware_Netboot) ProtoMessage() {} +func (*Hardware_Netboot) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 1} +} + +func (m *Hardware_Netboot) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Netboot.Unmarshal(m, b) +} +func (m *Hardware_Netboot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Netboot.Marshal(b, m, deterministic) +} +func (m *Hardware_Netboot) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Netboot.Merge(m, src) +} +func (m *Hardware_Netboot) XXX_Size() int { + return xxx_messageInfo_Hardware_Netboot.Size(m) +} +func (m *Hardware_Netboot) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Netboot.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Netboot proto.InternalMessageInfo + +func (m *Hardware_Netboot) GetAllowPxe() bool { + if m != nil { + return m.AllowPxe + } + return false +} + +func (m *Hardware_Netboot) GetAllowWorkflow() bool { + if m != nil { + return m.AllowWorkflow + } + return false +} + +func (m *Hardware_Netboot) GetIpxe() *Hardware_Netboot_IPXE { + if m != nil { + return m.Ipxe + } + return nil +} + +func (m *Hardware_Netboot) GetBootstrapper() *Hardware_Netboot_Bootstrapper { + if m != nil { + return m.Bootstrapper + } + return nil +} + +type Hardware_Netboot_IPXE struct { + Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` + Contents string `protobuf:"bytes,2,opt,name=contents,proto3" json:"contents,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Netboot_IPXE) Reset() { *m = Hardware_Netboot_IPXE{} } +func (m *Hardware_Netboot_IPXE) String() string { return proto.CompactTextString(m) } +func (*Hardware_Netboot_IPXE) ProtoMessage() {} +func (*Hardware_Netboot_IPXE) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 1, 0} +} + +func (m *Hardware_Netboot_IPXE) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Netboot_IPXE.Unmarshal(m, b) +} +func (m *Hardware_Netboot_IPXE) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Netboot_IPXE.Marshal(b, m, deterministic) +} +func (m *Hardware_Netboot_IPXE) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Netboot_IPXE.Merge(m, src) +} +func (m *Hardware_Netboot_IPXE) XXX_Size() int { + return xxx_messageInfo_Hardware_Netboot_IPXE.Size(m) +} +func (m *Hardware_Netboot_IPXE) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Netboot_IPXE.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Netboot_IPXE proto.InternalMessageInfo + +func (m *Hardware_Netboot_IPXE) GetUrl() string { + if m != nil { + return m.Url + } + return "" +} + +func (m *Hardware_Netboot_IPXE) GetContents() string { + if m != nil { + return m.Contents + } + return "" +} + +type Hardware_Netboot_Bootstrapper struct { + Kernel string `protobuf:"bytes,1,opt,name=kernel,proto3" json:"kernel,omitempty"` + Initrd string `protobuf:"bytes,2,opt,name=initrd,proto3" json:"initrd,omitempty"` + Os string `protobuf:"bytes,3,opt,name=os,proto3" json:"os,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Netboot_Bootstrapper) Reset() { *m = Hardware_Netboot_Bootstrapper{} } +func (m *Hardware_Netboot_Bootstrapper) String() string { return proto.CompactTextString(m) } +func (*Hardware_Netboot_Bootstrapper) ProtoMessage() {} +func (*Hardware_Netboot_Bootstrapper) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 1, 1} +} + +func (m *Hardware_Netboot_Bootstrapper) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Unmarshal(m, b) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Marshal(b, m, deterministic) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Netboot_Bootstrapper.Merge(m, src) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_Size() int { + return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Size(m) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Netboot_Bootstrapper.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Netboot_Bootstrapper proto.InternalMessageInfo + +func (m *Hardware_Netboot_Bootstrapper) GetKernel() string { + if m != nil { + return m.Kernel + } + return "" +} + +func (m *Hardware_Netboot_Bootstrapper) GetInitrd() string { + if m != nil { + return m.Initrd + } + return "" +} + +func (m *Hardware_Netboot_Bootstrapper) GetOs() string { + if m != nil { + return m.Os + } + return "" +} + +type Hardware_Network struct { + Dhcp *Hardware_DHCP `protobuf:"bytes,1,opt,name=dhcp,proto3" json:"dhcp,omitempty"` + Netboot *Hardware_Netboot `protobuf:"bytes,2,opt,name=netboot,proto3" json:"netboot,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Network) Reset() { *m = Hardware_Network{} } +func (m *Hardware_Network) String() string { return proto.CompactTextString(m) } +func (*Hardware_Network) ProtoMessage() {} +func (*Hardware_Network) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 2} +} + +func (m *Hardware_Network) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Network.Unmarshal(m, b) +} +func (m *Hardware_Network) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Network.Marshal(b, m, deterministic) +} +func (m *Hardware_Network) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Network.Merge(m, src) +} +func (m *Hardware_Network) XXX_Size() int { + return xxx_messageInfo_Hardware_Network.Size(m) +} +func (m *Hardware_Network) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Network.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Network proto.InternalMessageInfo + +func (m *Hardware_Network) GetDhcp() *Hardware_DHCP { + if m != nil { + return m.Dhcp + } + return nil +} + +func (m *Hardware_Network) GetNetboot() *Hardware_Netboot { + if m != nil { + return m.Netboot + } + return nil +} + +type Hardware_Metadata struct { + State string `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"` + BondingMode int64 `protobuf:"varint,2,opt,name=bonding_mode,json=bondingMode,proto3" json:"bonding_mode,omitempty"` + Manufacturer *Hardware_Metadata_Manufacturer `protobuf:"bytes,3,opt,name=manufacturer,proto3" json:"manufacturer,omitempty"` + Instance *Hardware_Metadata_Instance `protobuf:"bytes,4,opt,name=instance,proto3" json:"instance,omitempty"` + Custom *Hardware_Metadata_Custom `protobuf:"bytes,5,opt,name=custom,proto3" json:"custom,omitempty"` + Facility *Hardware_Metadata_Facility `protobuf:"bytes,6,opt,name=facility,proto3" json:"facility,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata) Reset() { *m = Hardware_Metadata{} } +func (m *Hardware_Metadata) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata) ProtoMessage() {} +func (*Hardware_Metadata) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3} +} + +func (m *Hardware_Metadata) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata.Unmarshal(m, b) +} +func (m *Hardware_Metadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata.Merge(m, src) +} +func (m *Hardware_Metadata) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata.Size(m) +} +func (m *Hardware_Metadata) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata proto.InternalMessageInfo + +func (m *Hardware_Metadata) GetState() string { + if m != nil { + return m.State + } + return "" +} + +func (m *Hardware_Metadata) GetBondingMode() int64 { + if m != nil { + return m.BondingMode + } + return 0 +} + +func (m *Hardware_Metadata) GetManufacturer() *Hardware_Metadata_Manufacturer { + if m != nil { + return m.Manufacturer + } + return nil +} + +func (m *Hardware_Metadata) GetInstance() *Hardware_Metadata_Instance { + if m != nil { + return m.Instance + } + return nil +} + +func (m *Hardware_Metadata) GetCustom() *Hardware_Metadata_Custom { + if m != nil { + return m.Custom + } + return nil +} + +func (m *Hardware_Metadata) GetFacility() *Hardware_Metadata_Facility { + if m != nil { + return m.Facility + } + return nil +} + +type Hardware_Metadata_Manufacturer struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Slug string `protobuf:"bytes,2,opt,name=slug,proto3" json:"slug,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Manufacturer) Reset() { *m = Hardware_Metadata_Manufacturer{} } +func (m *Hardware_Metadata_Manufacturer) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Manufacturer) ProtoMessage() {} +func (*Hardware_Metadata_Manufacturer) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 0} +} + +func (m *Hardware_Metadata_Manufacturer) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Manufacturer.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Manufacturer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Manufacturer.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Manufacturer) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Manufacturer.Merge(m, src) +} +func (m *Hardware_Metadata_Manufacturer) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Manufacturer.Size(m) +} +func (m *Hardware_Metadata_Manufacturer) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Manufacturer.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Manufacturer proto.InternalMessageInfo + +func (m *Hardware_Metadata_Manufacturer) GetId() string { + if m != nil { + return m.Id + } + return "" +} + +func (m *Hardware_Metadata_Manufacturer) GetSlug() string { + if m != nil { + return m.Slug + } + return "" +} + +type Hardware_Metadata_Instance struct { + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + State string `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` + Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` + AllowPxe bool `protobuf:"varint,4,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` + Rescue bool `protobuf:"varint,5,opt,name=rescue,proto3" json:"rescue,omitempty"` + OS *Hardware_Metadata_Instance_OperatingSystem `protobuf:"bytes,6,opt,name=OS,proto3" json:"OS,omitempty"` + AlwaysPxe bool `protobuf:"varint,7,opt,name=always_pxe,json=alwaysPxe,proto3" json:"always_pxe,omitempty"` + IpxeScriptUrl string `protobuf:"bytes,8,opt,name=ipxe_script_url,json=ipxeScriptUrl,proto3" json:"ipxe_script_url,omitempty"` + Ips []*Hardware_Metadata_Instance_IP `protobuf:"bytes,9,rep,name=ips,proto3" json:"ips,omitempty"` + Userdata string `protobuf:"bytes,10,opt,name=userdata,proto3" json:"userdata,omitempty"` + CryptedRootPassword string `protobuf:"bytes,11,opt,name=crypted_root_password,json=cryptedRootPassword,proto3" json:"crypted_root_password,omitempty"` + Tags []string `protobuf:"bytes,12,rep,name=tags,proto3" json:"tags,omitempty"` + Storage *Hardware_Metadata_Instance_Storage `protobuf:"bytes,13,opt,name=storage,proto3" json:"storage,omitempty"` + SshKeys []string `protobuf:"bytes,14,rep,name=ssh_keys,json=sshKeys,proto3" json:"ssh_keys,omitempty"` + NetworkReady bool `protobuf:"varint,15,opt,name=network_ready,json=networkReady,proto3" json:"network_ready,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance) Reset() { *m = Hardware_Metadata_Instance{} } +func (m *Hardware_Metadata_Instance) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Instance) ProtoMessage() {} +func (*Hardware_Metadata_Instance) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1} +} + +func (m *Hardware_Metadata_Instance) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance.Merge(m, src) +} +func (m *Hardware_Metadata_Instance) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance.Size(m) +} +func (m *Hardware_Metadata_Instance) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance) GetId() string { + if m != nil { + return m.Id + } + return "" +} + +func (m *Hardware_Metadata_Instance) GetState() string { + if m != nil { + return m.State + } + return "" +} + +func (m *Hardware_Metadata_Instance) GetHostname() string { + if m != nil { + return m.Hostname + } + return "" +} + +func (m *Hardware_Metadata_Instance) GetAllowPxe() bool { + if m != nil { + return m.AllowPxe + } + return false +} + +func (m *Hardware_Metadata_Instance) GetRescue() bool { + if m != nil { + return m.Rescue + } + return false +} + +func (m *Hardware_Metadata_Instance) GetOS() *Hardware_Metadata_Instance_OperatingSystem { + if m != nil { + return m.OS + } + return nil +} + +func (m *Hardware_Metadata_Instance) GetAlwaysPxe() bool { + if m != nil { + return m.AlwaysPxe + } + return false +} + +func (m *Hardware_Metadata_Instance) GetIpxeScriptUrl() string { + if m != nil { + return m.IpxeScriptUrl + } + return "" +} + +func (m *Hardware_Metadata_Instance) GetIps() []*Hardware_Metadata_Instance_IP { + if m != nil { + return m.Ips + } + return nil +} + +func (m *Hardware_Metadata_Instance) GetUserdata() string { + if m != nil { + return m.Userdata + } + return "" +} + +func (m *Hardware_Metadata_Instance) GetCryptedRootPassword() string { + if m != nil { + return m.CryptedRootPassword + } + return "" +} + +func (m *Hardware_Metadata_Instance) GetTags() []string { + if m != nil { + return m.Tags + } + return nil +} + +func (m *Hardware_Metadata_Instance) GetStorage() *Hardware_Metadata_Instance_Storage { + if m != nil { + return m.Storage + } + return nil +} + +func (m *Hardware_Metadata_Instance) GetSshKeys() []string { + if m != nil { + return m.SshKeys + } + return nil +} + +func (m *Hardware_Metadata_Instance) GetNetworkReady() bool { + if m != nil { + return m.NetworkReady + } + return false +} + +type Hardware_Metadata_Instance_OperatingSystem struct { + Slug string `protobuf:"bytes,1,opt,name=slug,proto3" json:"slug,omitempty"` + Distro string `protobuf:"bytes,2,opt,name=distro,proto3" json:"distro,omitempty"` + Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` + ImageTag string `protobuf:"bytes,4,opt,name=image_tag,json=imageTag,proto3" json:"image_tag,omitempty"` + OsSlug string `protobuf:"bytes,5,opt,name=os_slug,json=osSlug,proto3" json:"os_slug,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_OperatingSystem) Reset() { + *m = Hardware_Metadata_Instance_OperatingSystem{} +} +func (m *Hardware_Metadata_Instance_OperatingSystem) String() string { + return proto.CompactTextString(m) +} +func (*Hardware_Metadata_Instance_OperatingSystem) ProtoMessage() {} +func (*Hardware_Metadata_Instance_OperatingSystem) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 0} +} + +func (m *Hardware_Metadata_Instance_OperatingSystem) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_OperatingSystem.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_OperatingSystem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_OperatingSystem.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_OperatingSystem) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_OperatingSystem.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_OperatingSystem) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_OperatingSystem.Size(m) +} +func (m *Hardware_Metadata_Instance_OperatingSystem) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_OperatingSystem.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_OperatingSystem proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_OperatingSystem) GetSlug() string { + if m != nil { + return m.Slug + } + return "" +} + +func (m *Hardware_Metadata_Instance_OperatingSystem) GetDistro() string { + if m != nil { + return m.Distro + } + return "" +} + +func (m *Hardware_Metadata_Instance_OperatingSystem) GetVersion() string { + if m != nil { + return m.Version + } + return "" +} + +func (m *Hardware_Metadata_Instance_OperatingSystem) GetImageTag() string { + if m != nil { + return m.ImageTag + } + return "" +} + +func (m *Hardware_Metadata_Instance_OperatingSystem) GetOsSlug() string { + if m != nil { + return m.OsSlug + } + return "" +} + +type Hardware_Metadata_Instance_IP struct { + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Netmask string `protobuf:"bytes,2,opt,name=netmask,proto3" json:"netmask,omitempty"` + Gateway string `protobuf:"bytes,3,opt,name=gateway,proto3" json:"gateway,omitempty"` + Family int64 `protobuf:"varint,4,opt,name=family,proto3" json:"family,omitempty"` + Public bool `protobuf:"varint,5,opt,name=public,proto3" json:"public,omitempty"` + Management bool `protobuf:"varint,6,opt,name=management,proto3" json:"management,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_IP) Reset() { *m = Hardware_Metadata_Instance_IP{} } +func (m *Hardware_Metadata_Instance_IP) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Instance_IP) ProtoMessage() {} +func (*Hardware_Metadata_Instance_IP) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 1} +} + +func (m *Hardware_Metadata_Instance_IP) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_IP.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_IP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_IP.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_IP) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_IP.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_IP) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_IP.Size(m) +} +func (m *Hardware_Metadata_Instance_IP) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_IP.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_IP proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_IP) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *Hardware_Metadata_Instance_IP) GetNetmask() string { + if m != nil { + return m.Netmask + } + return "" +} + +func (m *Hardware_Metadata_Instance_IP) GetGateway() string { + if m != nil { + return m.Gateway + } + return "" +} + +func (m *Hardware_Metadata_Instance_IP) GetFamily() int64 { + if m != nil { + return m.Family + } + return 0 +} + +func (m *Hardware_Metadata_Instance_IP) GetPublic() bool { + if m != nil { + return m.Public + } + return false +} + +func (m *Hardware_Metadata_Instance_IP) GetManagement() bool { + if m != nil { + return m.Management + } + return false +} + +type Hardware_Metadata_Instance_Storage struct { + Disks []string `protobuf:"bytes,1,rep,name=disks,proto3" json:"disks,omitempty"` + Raid []string `protobuf:"bytes,2,rep,name=raid,proto3" json:"raid,omitempty"` + Filesystems []string `protobuf:"bytes,3,rep,name=filesystems,proto3" json:"filesystems,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage) Reset() { *m = Hardware_Metadata_Instance_Storage{} } +func (m *Hardware_Metadata_Instance_Storage) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Instance_Storage) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2} +} + +func (m *Hardware_Metadata_Instance_Storage) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage) GetDisks() []string { + if m != nil { + return m.Disks + } + return nil +} + +func (m *Hardware_Metadata_Instance_Storage) GetRaid() []string { + if m != nil { + return m.Raid + } + return nil +} + +func (m *Hardware_Metadata_Instance_Storage) GetFilesystems() []string { + if m != nil { + return m.Filesystems + } + return nil +} + +type Hardware_Metadata_Custom struct { + PreinstalledOs *Hardware_Metadata_Instance_OperatingSystem `protobuf:"bytes,1,opt,name=preinstalled_os,json=preinstalledOs,proto3" json:"preinstalled_os,omitempty"` + PrivateSubnets []string `protobuf:"bytes,2,rep,name=private_subnets,json=privateSubnets,proto3" json:"private_subnets,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Custom) Reset() { *m = Hardware_Metadata_Custom{} } +func (m *Hardware_Metadata_Custom) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Custom) ProtoMessage() {} +func (*Hardware_Metadata_Custom) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 2} +} + +func (m *Hardware_Metadata_Custom) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Custom.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Custom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Custom.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Custom) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Custom.Merge(m, src) +} +func (m *Hardware_Metadata_Custom) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Custom.Size(m) +} +func (m *Hardware_Metadata_Custom) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Custom.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Custom proto.InternalMessageInfo + +func (m *Hardware_Metadata_Custom) GetPreinstalledOs() *Hardware_Metadata_Instance_OperatingSystem { if m != nil { - return m.JSON + return m.PreinstalledOs + } + return nil +} + +func (m *Hardware_Metadata_Custom) GetPrivateSubnets() []string { + if m != nil { + return m.PrivateSubnets + } + return nil +} + +type Hardware_Metadata_Facility struct { + PlanSlug string `protobuf:"bytes,1,opt,name=plan_slug,json=planSlug,proto3" json:"plan_slug,omitempty"` + PlanVersionSlug string `protobuf:"bytes,2,opt,name=plan_version_slug,json=planVersionSlug,proto3" json:"plan_version_slug,omitempty"` + FacilityCode string `protobuf:"bytes,3,opt,name=facility_code,json=facilityCode,proto3" json:"facility_code,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Facility) Reset() { *m = Hardware_Metadata_Facility{} } +func (m *Hardware_Metadata_Facility) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Facility) ProtoMessage() {} +func (*Hardware_Metadata_Facility) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 3} +} + +func (m *Hardware_Metadata_Facility) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Facility.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Facility) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Facility.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Facility) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Facility.Merge(m, src) +} +func (m *Hardware_Metadata_Facility) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Facility.Size(m) +} +func (m *Hardware_Metadata_Facility) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Facility.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Facility proto.InternalMessageInfo + +func (m *Hardware_Metadata_Facility) GetPlanSlug() string { + if m != nil { + return m.PlanSlug + } + return "" +} + +func (m *Hardware_Metadata_Facility) GetPlanVersionSlug() string { + if m != nil { + return m.PlanVersionSlug + } + return "" +} + +func (m *Hardware_Metadata_Facility) GetFacilityCode() string { + if m != nil { + return m.FacilityCode } return "" } @@ -233,43 +1177,126 @@ func init() { proto.RegisterType((*Empty)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Empty") proto.RegisterType((*GetRequest)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.GetRequest") proto.RegisterType((*Hardware)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware") + proto.RegisterType((*Hardware_DHCP)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.DHCP") + proto.RegisterType((*Hardware_Netboot)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot") + proto.RegisterType((*Hardware_Netboot_IPXE)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.IPXE") + proto.RegisterType((*Hardware_Netboot_Bootstrapper)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Bootstrapper") + proto.RegisterType((*Hardware_Network)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Network") + proto.RegisterType((*Hardware_Metadata)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata") + proto.RegisterType((*Hardware_Metadata_Manufacturer)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Manufacturer") + proto.RegisterType((*Hardware_Metadata_Instance)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance") + proto.RegisterType((*Hardware_Metadata_Instance_OperatingSystem)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.OperatingSystem") + proto.RegisterType((*Hardware_Metadata_Instance_IP)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.IP") + proto.RegisterType((*Hardware_Metadata_Instance_Storage)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage") + proto.RegisterType((*Hardware_Metadata_Custom)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Custom") + proto.RegisterType((*Hardware_Metadata_Facility)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Facility") proto.RegisterType((*DeleteRequest)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.DeleteRequest") } -func init() { proto.RegisterFile("hardware/hardware.proto", fileDescriptor_61ac56d7fc2e671f) } +func init() { + proto.RegisterFile("hardware/hardware.proto", fileDescriptor_61ac56d7fc2e671f) +} var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x93, 0x4b, 0x4f, 0x83, 0x40, - 0x14, 0x85, 0x43, 0x0b, 0xb4, 0x5e, 0xe3, 0x23, 0xb3, 0x91, 0x74, 0xe1, 0x83, 0x95, 0x71, 0x31, - 0xd6, 0x47, 0x34, 0x6e, 0x4c, 0x8a, 0x18, 0xc5, 0x44, 0x25, 0xed, 0xc2, 0xc4, 0x1d, 0xd0, 0x49, - 0x21, 0x52, 0xc0, 0x61, 0x68, 0xc3, 0x6f, 0xf3, 0xcf, 0x99, 0x19, 0x18, 0x1f, 0x3b, 0x61, 0x51, - 0x77, 0x67, 0x26, 0xf7, 0xde, 0x2f, 0xe7, 0xcc, 0x5c, 0xd8, 0x09, 0x3d, 0x3a, 0x5d, 0x7a, 0x94, - 0x1c, 0x4b, 0x81, 0x33, 0x9a, 0xb2, 0x14, 0x1d, 0xcd, 0x22, 0x16, 0x16, 0x3e, 0x0e, 0xd2, 0x39, - 0x66, 0x51, 0xf2, 0x46, 0xa8, 0x4f, 0xe2, 0x58, 0xc8, 0xaa, 0x22, 0xc7, 0xb2, 0xc3, 0x3c, 0x80, - 0x75, 0xb7, 0xc8, 0xc3, 0x31, 0x79, 0x2f, 0x48, 0xce, 0x10, 0x02, 0x75, 0xea, 0x31, 0xcf, 0x50, - 0xf6, 0x95, 0xc3, 0xb5, 0xb1, 0xd0, 0x66, 0x0f, 0xb4, 0xdb, 0x79, 0xc6, 0x4a, 0xf3, 0x1a, 0xe0, - 0x8e, 0x30, 0x59, 0xba, 0x0d, 0xdd, 0xc7, 0xd1, 0x4d, 0x5d, 0xc9, 0x25, 0xda, 0x84, 0x8e, 0xe3, - 0x1a, 0x1d, 0x71, 0xd1, 0x71, 0x5c, 0x71, 0xb6, 0x8d, 0x6e, 0x7d, 0xb6, 0xcd, 0x5d, 0xe8, 0xdf, - 0xd7, 0x5c, 0x0e, 0x7a, 0x98, 0x3c, 0x3f, 0x49, 0x10, 0xd7, 0xe6, 0x1e, 0x6c, 0xd8, 0x24, 0x26, - 0x8c, 0x48, 0x44, 0x35, 0x40, 0x91, 0x03, 0x4e, 0x3f, 0x7a, 0xb0, 0x25, 0x27, 0x4c, 0x08, 0x5d, - 0x44, 0x01, 0x41, 0x14, 0x54, 0x6e, 0x00, 0x5d, 0xe2, 0xbf, 0xbb, 0xc6, 0x3f, 0x2c, 0x0f, 0x4e, - 0x9a, 0x34, 0x8a, 0x20, 0x50, 0x01, 0x9a, 0x55, 0x72, 0xc7, 0x17, 0x4d, 0x7a, 0xbf, 0xb3, 0x1b, - 0x9c, 0x37, 0xe9, 0xfb, 0xca, 0x8c, 0x81, 0x6a, 0x95, 0x8e, 0xfb, 0x2f, 0x54, 0x7b, 0xc5, 0xd4, - 0x0c, 0xba, 0xa3, 0x38, 0x46, 0xcd, 0x1f, 0xa7, 0x1d, 0x6f, 0xa8, 0xa0, 0x04, 0x74, 0x27, 0x99, - 0xf1, 0x6f, 0xd7, 0x02, 0xda, 0xe2, 0x13, 0x2d, 0x41, 0x7b, 0xf1, 0x58, 0x10, 0xae, 0x36, 0xd8, - 0xa1, 0x82, 0x16, 0xa0, 0x57, 0x6b, 0x86, 0xae, 0x9a, 0x4c, 0xf8, 0xb5, 0x9a, 0x2d, 0x0c, 0x5b, - 0xf0, 0xda, 0x97, 0x37, 0xbe, 0x2e, 0x4a, 0xce, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xaf, - 0xef, 0x64, 0xc4, 0x04, 0x00, 0x00, + // 1409 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4b, 0x8f, 0x1b, 0xc5, + 0x16, 0x56, 0xdb, 0x1e, 0xbb, 0x7d, 0xec, 0xf1, 0xdc, 0xd4, 0xcd, 0x4d, 0xfa, 0x36, 0xaf, 0x89, + 0x23, 0x60, 0x94, 0x85, 0x27, 0x19, 0x22, 0x10, 0x08, 0x90, 0x32, 0x33, 0x09, 0x31, 0x68, 0x66, + 0xac, 0x76, 0x1e, 0xbc, 0xa4, 0x56, 0xb9, 0xbb, 0x6c, 0x97, 0xa6, 0xbb, 0xab, 0xa9, 0xaa, 0x1e, + 0xc7, 0x2b, 0x24, 0x16, 0x2c, 0x40, 0xac, 0x58, 0xb1, 0x65, 0xc3, 0x16, 0xb1, 0xe3, 0x77, 0xf0, + 0x17, 0x10, 0x2b, 0x7e, 0x04, 0xaa, 0xea, 0x2a, 0xc7, 0x93, 0x48, 0x28, 0xf3, 0x20, 0xec, 0xea, + 0x7c, 0x75, 0xfa, 0xab, 0x53, 0xe7, 0x7c, 0x75, 0xaa, 0x1a, 0x2e, 0x4f, 0x31, 0x8f, 0x67, 0x98, + 0x93, 0x4d, 0x3b, 0xe8, 0xe5, 0x9c, 0x49, 0x86, 0xae, 0x4d, 0xa8, 0x9c, 0x16, 0xa3, 0x5e, 0xc4, + 0xd2, 0x9e, 0xa4, 0xd9, 0x21, 0xe1, 0x23, 0x92, 0x24, 0x7a, 0x58, 0x7a, 0x88, 0x9e, 0xfd, 0xc2, + 0x7f, 0x71, 0xc2, 0xd8, 0x24, 0x21, 0x9b, 0x38, 0xa7, 0x9b, 0x38, 0xcb, 0x98, 0xc4, 0x92, 0xb2, + 0x4c, 0x94, 0x7e, 0xdd, 0x2b, 0xd0, 0x1a, 0x14, 0x62, 0x1a, 0x90, 0x2f, 0x0a, 0x22, 0x24, 0x42, + 0x50, 0x8b, 0xb1, 0xc4, 0x9e, 0xb3, 0xee, 0x6c, 0x34, 0x03, 0x3d, 0xee, 0x36, 0x60, 0xe5, 0x76, + 0x9a, 0xcb, 0x79, 0xf7, 0x7d, 0x80, 0x0f, 0x88, 0xb4, 0xae, 0xff, 0x81, 0x6a, 0x8a, 0x23, 0xe3, + 0xa9, 0x86, 0xa8, 0x03, 0x15, 0x9a, 0x7b, 0x15, 0x0d, 0x54, 0x68, 0xae, 0xed, 0xd8, 0xab, 0x1a, + 0x3b, 0xee, 0xfe, 0xea, 0x81, 0x7b, 0xd7, 0x84, 0x65, 0x26, 0x1d, 0x3b, 0x89, 0xf6, 0xa0, 0x16, + 0x4f, 0xa3, 0xf2, 0xf3, 0xd6, 0xd6, 0xdb, 0xbd, 0x67, 0xdf, 0x61, 0xcf, 0x72, 0xf6, 0x76, 0xef, + 0xee, 0x0c, 0x02, 0x4d, 0x83, 0x1e, 0x40, 0x23, 0x23, 0x72, 0xc4, 0x98, 0xd4, 0x01, 0xb4, 0xb6, + 0xde, 0x3d, 0x15, 0xe3, 0x7e, 0xc9, 0x11, 0x58, 0x32, 0xc3, 0x3b, 0x63, 0xfc, 0xd0, 0xab, 0xad, + 0x57, 0xcf, 0xc2, 0xab, 0x38, 0x02, 0x4b, 0x86, 0x3e, 0x01, 0x37, 0x25, 0x12, 0xeb, 0xe4, 0xaf, + 0xe8, 0x80, 0xdf, 0x3b, 0x15, 0xf1, 0x9e, 0x21, 0x09, 0x16, 0x74, 0xfe, 0x37, 0x15, 0xa8, 0xa9, + 0xcc, 0x3c, 0x43, 0xc5, 0x7c, 0x70, 0xa7, 0x4c, 0xc8, 0x0c, 0xa7, 0xc4, 0xd4, 0x6d, 0x61, 0xa3, + 0x97, 0x00, 0x12, 0x82, 0x05, 0x09, 0x25, 0x4d, 0x89, 0x57, 0x5b, 0x77, 0x36, 0xaa, 0x41, 0x53, + 0x23, 0xf7, 0x68, 0x4a, 0xd0, 0x15, 0x68, 0x2b, 0xb7, 0x50, 0x10, 0x7e, 0x44, 0xb8, 0xf0, 0x56, + 0xd6, 0xab, 0x1b, 0xcd, 0xa0, 0xa5, 0xb0, 0x61, 0x09, 0x29, 0x17, 0xf5, 0xed, 0xc2, 0xa5, 0x5e, + 0xba, 0x28, 0xcc, 0xba, 0x78, 0xd0, 0x98, 0x60, 0x49, 0x66, 0x78, 0xee, 0x35, 0xf4, 0xfa, 0xd6, + 0x54, 0xca, 0xc4, 0x3c, 0x9a, 0x7a, 0x6e, 0xa9, 0x4c, 0x35, 0x56, 0x58, 0x41, 0xc6, 0xd4, 0x6b, + 0xae, 0x3b, 0x1b, 0x6e, 0xa0, 0xc7, 0x2a, 0x4c, 0x3a, 0xc6, 0x11, 0x09, 0xf5, 0x26, 0x40, 0x7b, + 0x37, 0x35, 0xb2, 0x8f, 0x53, 0xe2, 0xff, 0x50, 0x85, 0x86, 0x29, 0x2a, 0x7a, 0x01, 0x9a, 0x38, + 0x49, 0xd8, 0x2c, 0xcc, 0x1f, 0x11, 0x9d, 0x15, 0x37, 0x70, 0x35, 0x30, 0x78, 0x44, 0xd0, 0xab, + 0xd0, 0x29, 0x27, 0x55, 0x79, 0xc6, 0x09, 0x9b, 0xe9, 0x34, 0xb9, 0xc1, 0xaa, 0x46, 0x1f, 0x1a, + 0x10, 0xdd, 0x87, 0x1a, 0x55, 0x9f, 0x97, 0x22, 0xbb, 0x75, 0x16, 0x91, 0xf5, 0xfa, 0x83, 0x8f, + 0x6f, 0x07, 0x9a, 0x0e, 0xa5, 0xd0, 0x56, 0x90, 0x90, 0x1c, 0xe7, 0x39, 0xe1, 0x3a, 0xdd, 0xad, + 0xad, 0xfe, 0x99, 0xe8, 0xb7, 0x97, 0x08, 0x83, 0x63, 0xf4, 0xfe, 0x4d, 0xa8, 0xa9, 0xc5, 0x95, + 0x42, 0x0a, 0x9e, 0x58, 0x85, 0x14, 0x3c, 0x51, 0x8a, 0x88, 0x58, 0x26, 0x49, 0x26, 0x85, 0xd1, + 0xc9, 0xc2, 0xf6, 0xf7, 0xa1, 0xbd, 0xcc, 0x89, 0x2e, 0x41, 0xfd, 0x90, 0xf0, 0x8c, 0x58, 0x02, + 0x63, 0x29, 0x9c, 0x66, 0x54, 0xf2, 0xd8, 0x30, 0x18, 0x4b, 0xa9, 0x8f, 0x09, 0xdb, 0x1f, 0x98, + 0xf0, 0x7f, 0x76, 0x74, 0x6d, 0xf4, 0x79, 0xb0, 0xed, 0xc0, 0x39, 0xf7, 0x76, 0x50, 0x39, 0xc7, + 0x76, 0xe0, 0xff, 0xd1, 0x01, 0xd7, 0x1e, 0x39, 0x74, 0x11, 0x56, 0x84, 0xc4, 0x92, 0x98, 0xed, + 0x97, 0x86, 0x52, 0xfd, 0x88, 0x65, 0x31, 0xcd, 0x26, 0x61, 0xca, 0x62, 0xa2, 0xd7, 0xaf, 0x06, + 0x2d, 0x83, 0xed, 0xb1, 0x98, 0xa0, 0x0c, 0xda, 0x29, 0xce, 0x8a, 0x31, 0x8e, 0x64, 0xc1, 0x09, + 0x37, 0x62, 0xfa, 0xf0, 0x4c, 0x0d, 0xa0, 0xb7, 0xb7, 0xc4, 0x18, 0x1c, 0xe3, 0x47, 0x23, 0x70, + 0x69, 0x26, 0x24, 0xce, 0x22, 0x62, 0x94, 0x75, 0xe7, 0x6c, 0x6b, 0xf5, 0x0d, 0x5b, 0xb0, 0xe0, + 0x45, 0x9f, 0x43, 0x3d, 0x2a, 0x84, 0x64, 0xa9, 0x69, 0x67, 0xbb, 0x67, 0x5b, 0x61, 0x47, 0x73, + 0x05, 0x86, 0x53, 0xed, 0x60, 0x8c, 0x23, 0x9a, 0x50, 0x39, 0xf7, 0xea, 0xe7, 0xb1, 0x83, 0x3b, + 0x86, 0x2d, 0x58, 0xf0, 0xfa, 0x5b, 0xd0, 0x5e, 0xce, 0xe1, 0x53, 0x37, 0x16, 0x82, 0x9a, 0x48, + 0x8a, 0x89, 0x11, 0xb5, 0x1e, 0xfb, 0x3f, 0xb9, 0xe0, 0xda, 0x64, 0x3c, 0xf5, 0xc1, 0x42, 0x1f, + 0x95, 0x65, 0x7d, 0xfc, 0x5d, 0xcf, 0x3d, 0xd6, 0xa1, 0x6a, 0x4f, 0x74, 0xa8, 0x4b, 0x50, 0xe7, + 0x44, 0x44, 0x05, 0xd1, 0x19, 0x76, 0x03, 0x63, 0xa1, 0x31, 0x54, 0x0e, 0x86, 0x26, 0x2b, 0x0f, + 0xce, 0xa7, 0xae, 0xbd, 0x83, 0x9c, 0x70, 0x2c, 0x69, 0x36, 0x19, 0xce, 0x85, 0x24, 0x69, 0x50, + 0x39, 0x18, 0xaa, 0x4e, 0x8b, 0x93, 0x19, 0x9e, 0x0b, 0x1d, 0x5d, 0x43, 0xc7, 0xd0, 0x2c, 0x11, + 0x15, 0xde, 0x6b, 0xb0, 0xa6, 0x5a, 0x59, 0x28, 0x22, 0x4e, 0x73, 0x19, 0xaa, 0xbe, 0x52, 0xf6, + 0xee, 0x55, 0x05, 0x0f, 0x35, 0x7a, 0x9f, 0x27, 0xe8, 0x33, 0xa8, 0xd2, 0x5c, 0x78, 0x4d, 0x7d, + 0x9b, 0xf6, 0xcf, 0x29, 0xde, 0xfe, 0x20, 0x50, 0xac, 0x2a, 0xb9, 0x85, 0x20, 0x5c, 0x5f, 0xab, + 0xe5, 0x5d, 0xb0, 0xb0, 0xd1, 0x16, 0xfc, 0x2f, 0xe2, 0xf3, 0x5c, 0x92, 0x38, 0xe4, 0x8c, 0xc9, + 0x30, 0xc7, 0x42, 0xcc, 0x18, 0x8f, 0xbd, 0x96, 0x76, 0xfc, 0xaf, 0x99, 0x0c, 0x18, 0x93, 0x03, + 0x33, 0xa5, 0x6a, 0x2e, 0xf1, 0x44, 0x78, 0x6d, 0x7d, 0x75, 0xe9, 0x31, 0x9a, 0x42, 0x43, 0x48, + 0xc6, 0xf1, 0x84, 0x78, 0xab, 0x3a, 0xe9, 0xfb, 0xe7, 0xb4, 0x89, 0x61, 0xc9, 0x1a, 0x58, 0x7a, + 0xf4, 0x7f, 0x70, 0x85, 0x98, 0x86, 0x87, 0x64, 0x2e, 0xbc, 0x8e, 0x8e, 0xa0, 0x21, 0xc4, 0xf4, + 0x23, 0x32, 0x17, 0xe8, 0x2a, 0xac, 0x9a, 0xa7, 0x44, 0xc8, 0x09, 0x8e, 0xe7, 0xde, 0x9a, 0xae, + 0x47, 0xdb, 0x80, 0x81, 0xc2, 0xfc, 0xef, 0x1c, 0x58, 0x7b, 0xa2, 0x92, 0x0b, 0x15, 0x3b, 0x8f, + 0x55, 0xac, 0x94, 0x15, 0x53, 0x21, 0x39, 0xb3, 0x0d, 0xbb, 0xb4, 0xd4, 0xed, 0xac, 0x6e, 0x69, + 0xca, 0x32, 0xa3, 0x54, 0x6b, 0x2a, 0xa1, 0xd2, 0x14, 0x4f, 0x48, 0x28, 0xf1, 0x44, 0x0b, 0xb5, + 0x19, 0xb8, 0x1a, 0xb8, 0x87, 0x27, 0xe8, 0x32, 0x34, 0x98, 0x08, 0xf5, 0x2a, 0x2b, 0x25, 0x1f, + 0x13, 0x43, 0x75, 0x5a, 0x7e, 0x74, 0xa0, 0xd2, 0x1f, 0x28, 0x5a, 0x1c, 0xc7, 0x9c, 0x08, 0x61, + 0xa2, 0xb0, 0xa6, 0x9a, 0xc9, 0x88, 0x4c, 0xb1, 0x38, 0x34, 0x91, 0x58, 0x73, 0xf9, 0xa1, 0x50, + 0x3d, 0xfe, 0x50, 0xb8, 0x04, 0xf5, 0x31, 0x4e, 0x69, 0x32, 0x37, 0x6f, 0x14, 0x63, 0x29, 0x3c, + 0x2f, 0x46, 0x09, 0x8d, 0xec, 0x71, 0x29, 0x2d, 0xf4, 0x32, 0x40, 0x8a, 0x33, 0x3c, 0x21, 0x29, + 0xc9, 0xa4, 0x3e, 0x36, 0x6e, 0xb0, 0x84, 0xf8, 0xf7, 0xa1, 0x61, 0x0a, 0xa1, 0x0e, 0x70, 0x4c, + 0xc5, 0xa1, 0x0a, 0x53, 0x25, 0xbf, 0x34, 0x54, 0x06, 0x39, 0xa6, 0xea, 0x72, 0xd3, 0x9a, 0x50, + 0x63, 0xb4, 0x0e, 0xad, 0x31, 0x4d, 0x88, 0xd0, 0x39, 0x56, 0x77, 0x9c, 0x7e, 0xe9, 0x2c, 0x41, + 0xfe, 0x2f, 0x0e, 0xd4, 0xcb, 0xa6, 0x86, 0xbe, 0x84, 0xb5, 0x9c, 0x13, 0xdd, 0x39, 0x93, 0x84, + 0xc4, 0x21, 0x13, 0xe6, 0xda, 0xfb, 0xa7, 0x4e, 0x6f, 0x67, 0x79, 0xb9, 0x03, 0x81, 0x5e, 0x57, + 0x01, 0xd0, 0x23, 0x2c, 0x49, 0x28, 0x8a, 0x51, 0x46, 0xf4, 0x5d, 0xaf, 0x22, 0xee, 0x18, 0x78, + 0x58, 0xa2, 0xfe, 0x23, 0x70, 0x6d, 0xa3, 0x54, 0x25, 0xcf, 0x13, 0x9c, 0x85, 0x4b, 0xea, 0x71, + 0x15, 0xa0, 0x2a, 0x8b, 0xae, 0xc1, 0x05, 0x3d, 0x69, 0xf4, 0x11, 0x2e, 0x35, 0xca, 0x35, 0x35, + 0xf1, 0xa0, 0xc4, 0xb5, 0xef, 0x55, 0x58, 0xb5, 0x3d, 0x37, 0x8c, 0xd4, 0x0d, 0x59, 0x16, 0xb4, + 0x6d, 0xc1, 0x1d, 0x16, 0x93, 0xee, 0x2b, 0xb0, 0xba, 0x4b, 0x12, 0x22, 0x89, 0xfd, 0xfd, 0xe8, + 0x40, 0xa5, 0xbf, 0x6b, 0x9b, 0x6b, 0x7f, 0x77, 0xeb, 0xcf, 0x06, 0xac, 0xd9, 0x14, 0xa8, 0xd7, + 0x24, 0x8d, 0x08, 0xfa, 0xd6, 0x81, 0x9a, 0xfa, 0xbb, 0x41, 0x6f, 0x9d, 0x24, 0x91, 0x4b, 0xff, + 0x43, 0xfe, 0x8d, 0x93, 0x7c, 0x58, 0xfe, 0x25, 0x5d, 0xfe, 0xea, 0xb7, 0xdf, 0xbf, 0xaf, 0x5c, + 0xe8, 0xb6, 0x37, 0x8f, 0x6e, 0x2c, 0xfe, 0xdb, 0xde, 0x71, 0xae, 0xa1, 0x02, 0x56, 0xb6, 0xe7, + 0x7b, 0xb7, 0x76, 0xd0, 0x9b, 0x27, 0x21, 0x7d, 0xfc, 0xc7, 0xe5, 0xdf, 0x3c, 0x8d, 0x1c, 0x90, + 0x84, 0xda, 0xf6, 0xbc, 0x3f, 0xf8, 0x57, 0x56, 0xdd, 0x7d, 0xce, 0xab, 0x7e, 0xed, 0x40, 0xf5, + 0x56, 0x92, 0xa0, 0x93, 0x97, 0xed, 0x74, 0x0b, 0x76, 0x2f, 0xea, 0x62, 0x77, 0xd0, 0xb1, 0x62, + 0x5f, 0x77, 0x50, 0x06, 0xf5, 0x7e, 0x36, 0x51, 0x3a, 0x3d, 0x45, 0x28, 0x27, 0xff, 0x04, 0xcd, + 0x60, 0xe5, 0x21, 0x96, 0xd1, 0xf4, 0xf9, 0xe6, 0xfb, 0xba, 0x83, 0x8e, 0xa0, 0x5e, 0x9e, 0x4b, + 0x74, 0xa2, 0x37, 0xfa, 0xb1, 0xb3, 0x7c, 0x8a, 0x0d, 0x6f, 0xc3, 0xa7, 0xae, 0x45, 0x46, 0x75, + 0xed, 0xf2, 0xc6, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x20, 0xa7, 0x5d, 0xf2, 0x2f, 0x11, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // HardwareServiceClient is the client API for HardwareService service. // @@ -286,10 +1313,10 @@ type HardwareServiceClient interface { } type hardwareServiceClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewHardwareServiceClient(cc *grpc.ClientConn) HardwareServiceClient { +func NewHardwareServiceClient(cc grpc.ClientConnInterface) HardwareServiceClient { return &hardwareServiceClient{cc} } diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index ccaef127a..5e2cdd5e1 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -34,13 +34,113 @@ message Empty { } message GetRequest { - string MAC = 1; - string IP = 2; - string ID = 3; + string mac = 1; + string ip = 2; + string id = 3; } message Hardware { - string JSON = 1; + message DHCP { + string mac = 1; + string ip = 2; + string hostname = 3; + int64 lease_time = 4; + repeated string name_servers = 5; + repeated string time_servers = 6; + string gateway = 7; + string arch = 8; + bool uefi = 9; + string iface_name = 10; + } + message Netboot { + message IPXE { + string url = 1; + string contents = 2; + } + message Bootstrapper { + string kernel = 1; + string initrd = 2; + string os = 3; + } + + bool allow_pxe = 1; + bool allow_workflow = 2; + IPXE ipxe = 3; + Bootstrapper bootstrapper = 4; + } + message Network { + DHCP dhcp = 1; + Netboot netboot = 2; + } + message Metadata { + message Manufacturer { + string id = 1; + string slug = 2; + } + message Instance { + message OperatingSystem { + string slug = 1; + string distro = 2; + string version = 3; + string image_tag = 4; + string os_slug = 5; + } + message IP { + string address = 1; + string netmask = 2; + string gateway = 3; + int64 family = 4; + bool public = 5; + bool management = 6; + } + message Storage { + repeated string disks = 1; + repeated string raid = 2; + repeated string filesystems = 3; + } + + string id = 1; + string state = 2; + string hostname = 3; + bool allow_pxe = 4; + bool rescue = 5; + + OperatingSystem OS = 6; + bool always_pxe = 7; + string ipxe_script_url = 8; + repeated IP ips = 9; + string userdata = 10; + + string crypted_root_password = 11; + + repeated string tags = 12; + Storage storage = 13; + repeated string ssh_keys = 14; + bool network_ready = 15; + } + message Custom { + Instance.OperatingSystem preinstalled_os = 1; + repeated string private_subnets = 2; + } + message Facility { + string plan_slug = 1; + string plan_version_slug = 2; + string facility_code = 3; + } + + string state = 1; + int64 bonding_mode = 2; + Manufacturer manufacturer = 3; + Instance instance = 4; + Custom custom = 5; + Facility facility = 6; + } + + string id = 1; + DHCP dhcp = 2; + Netboot netboot = 3; + repeated Network network = 4; + Metadata metadata = 5; } message DeleteRequest { diff --git a/test/framework/template.go b/test/framework/template.go index 1a010d974..631c379b4 100644 --- a/test/framework/template.go +++ b/test/framework/template.go @@ -28,7 +28,7 @@ func CreateTemplate(tmpl string) (string, error) { filePath := "data/template/" + tmpl // Read Content of template data, err := readTemplateData(filePath) - req := template.WorkflowTemplate{Name: ("test_" + tmpl), Data: data} + req := template.WorkflowTemplate{Name: ("test_" + tmpl), Data: string(data)} res, err := client.TemplateClient.CreateTemplate(context.Background(), &req) if err != nil { return "", err From 7337c308d54c90dab94e0d785dab44cc965bc870 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Mon, 27 Apr 2020 01:15:56 -0400 Subject: [PATCH 04/31] changed hardware push request data to be type *Hardware --- cmd/tink-cli/cmd/hardware/push.go | 8 +- grpc-server/hardware.go | 36 +++--- protos/hardware/hardware.pb.go | 195 +++++++++++++++--------------- protos/hardware/hardware.proto | 2 +- test/framework/hardware.go | 13 +- 5 files changed, 127 insertions(+), 127 deletions(-) diff --git a/cmd/tink-cli/cmd/hardware/push.go b/cmd/tink-cli/cmd/hardware/push.go index dc26d2864..4d70bfd75 100644 --- a/cmd/tink-cli/cmd/hardware/push.go +++ b/cmd/tink-cli/cmd/hardware/push.go @@ -51,7 +51,13 @@ tink hardware push --file /tmp/data.json`, } else if s.ID == "" { log.Fatalf("invalid json, ID is required: %s", data) } - if _, err := client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: data}); err != nil { + + hw := hardware.Hardware{} + err := json.Unmarshal([]byte(data), &hw) + if err != nil { + log.Fatal(err) + } + if _, err := client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: &hw}); err != nil { log.Fatal(err) } log.Println("Hardware data pushed successfully") diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go index 6ddd4c8cb..6c0a14396 100644 --- a/grpc-server/hardware.go +++ b/grpc-server/hardware.go @@ -23,39 +23,31 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware. // must be a copy so deferred cacheInFlight.Dec matches the Inc labels = prometheus.Labels{"method": "Push", "op": ""} - var h struct { - ID string - State string - } - err := json.Unmarshal([]byte(in.Data), &h) - if err != nil { - metrics.CacheTotals.With(labels).Inc() - metrics.CacheErrors.With(labels).Inc() - err = errors.Wrap(err, "unmarshal json") - logger.Error(err) - return &hardware.Empty{}, err - } - - if h.ID == "" { + hw := in.Data + if hw.Id == "" { metrics.CacheTotals.With(labels).Inc() metrics.CacheErrors.With(labels).Inc() - err = errors.New("id must be set to a UUID") + err := errors.New("id must be set to a UUID") logger.Error(err) return &hardware.Empty{}, err } - logger.With("id", h.ID).Info("data pushed") + logger.With("id", hw.Id).Info("data pushed") var fn func() error msg := "" - if h.State != "deleted" { + data, err := json.Marshal(hw) + if err != nil { + logger.Error(err) + } + if hw.Metadata.State != "deleted" { labels["op"] = "insert" msg = "inserting into DB" - fn = func() error { return db.InsertIntoDB(ctx, s.db, in.Data) } + fn = func() error { return db.InsertIntoDB(ctx, s.db, string(data)) } } else { msg = "deleting from DB" labels["op"] = "delete" - fn = func() error { return db.DeleteFromDB(ctx, s.db, h.ID) } + fn = func() error { return db.DeleteFromDB(ctx, s.db, hw.Id) } } metrics.CacheTotals.With(labels).Inc() @@ -75,12 +67,12 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware. } s.watchLock.RLock() - if ch := s.watch[h.ID]; ch != nil { + if ch := s.watch[hw.Id]; ch != nil { select { - case ch <- in.Data: + case ch <- string(data): default: metrics.WatchMissTotal.Inc() - logger.With("id", h.ID).Info("skipping blocked watcher") + logger.With("id", hw.Id ).Info("skipping blocked watcher") } } s.watchLock.RUnlock() diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 41b9eb40c..12faf0a19 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -6,13 +6,12 @@ package hardware import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -27,10 +26,10 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type PushRequest struct { - Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Data *Hardware `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PushRequest) Reset() { *m = PushRequest{} } @@ -58,11 +57,11 @@ func (m *PushRequest) XXX_DiscardUnknown() { var xxx_messageInfo_PushRequest proto.InternalMessageInfo -func (m *PushRequest) GetData() string { +func (m *PushRequest) GetData() *Hardware { if m != nil { return m.Data } - return "" + return nil } type Empty struct { @@ -1198,96 +1197,96 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1409 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4b, 0x8f, 0x1b, 0xc5, - 0x16, 0x56, 0xdb, 0x1e, 0xbb, 0x7d, 0xec, 0xf1, 0xdc, 0xd4, 0xcd, 0x4d, 0xfa, 0x36, 0xaf, 0x89, - 0x23, 0x60, 0x94, 0x85, 0x27, 0x19, 0x22, 0x10, 0x08, 0x90, 0x32, 0x33, 0x09, 0x31, 0x68, 0x66, - 0xac, 0x76, 0x1e, 0xbc, 0xa4, 0x56, 0xb9, 0xbb, 0x6c, 0x97, 0xa6, 0xbb, 0xab, 0xa9, 0xaa, 0x1e, - 0xc7, 0x2b, 0x24, 0x16, 0x2c, 0x40, 0xac, 0x58, 0xb1, 0x65, 0xc3, 0x16, 0xb1, 0xe3, 0x77, 0xf0, - 0x17, 0x10, 0x2b, 0x7e, 0x04, 0xaa, 0xea, 0x2a, 0xc7, 0x93, 0x48, 0x28, 0xf3, 0x20, 0xec, 0xea, - 0x7c, 0x75, 0xfa, 0xab, 0x53, 0xe7, 0x7c, 0x75, 0xaa, 0x1a, 0x2e, 0x4f, 0x31, 0x8f, 0x67, 0x98, - 0x93, 0x4d, 0x3b, 0xe8, 0xe5, 0x9c, 0x49, 0x86, 0xae, 0x4d, 0xa8, 0x9c, 0x16, 0xa3, 0x5e, 0xc4, - 0xd2, 0x9e, 0xa4, 0xd9, 0x21, 0xe1, 0x23, 0x92, 0x24, 0x7a, 0x58, 0x7a, 0x88, 0x9e, 0xfd, 0xc2, - 0x7f, 0x71, 0xc2, 0xd8, 0x24, 0x21, 0x9b, 0x38, 0xa7, 0x9b, 0x38, 0xcb, 0x98, 0xc4, 0x92, 0xb2, - 0x4c, 0x94, 0x7e, 0xdd, 0x2b, 0xd0, 0x1a, 0x14, 0x62, 0x1a, 0x90, 0x2f, 0x0a, 0x22, 0x24, 0x42, - 0x50, 0x8b, 0xb1, 0xc4, 0x9e, 0xb3, 0xee, 0x6c, 0x34, 0x03, 0x3d, 0xee, 0x36, 0x60, 0xe5, 0x76, - 0x9a, 0xcb, 0x79, 0xf7, 0x7d, 0x80, 0x0f, 0x88, 0xb4, 0xae, 0xff, 0x81, 0x6a, 0x8a, 0x23, 0xe3, - 0xa9, 0x86, 0xa8, 0x03, 0x15, 0x9a, 0x7b, 0x15, 0x0d, 0x54, 0x68, 0xae, 0xed, 0xd8, 0xab, 0x1a, - 0x3b, 0xee, 0xfe, 0xea, 0x81, 0x7b, 0xd7, 0x84, 0x65, 0x26, 0x1d, 0x3b, 0x89, 0xf6, 0xa0, 0x16, - 0x4f, 0xa3, 0xf2, 0xf3, 0xd6, 0xd6, 0xdb, 0xbd, 0x67, 0xdf, 0x61, 0xcf, 0x72, 0xf6, 0x76, 0xef, - 0xee, 0x0c, 0x02, 0x4d, 0x83, 0x1e, 0x40, 0x23, 0x23, 0x72, 0xc4, 0x98, 0xd4, 0x01, 0xb4, 0xb6, - 0xde, 0x3d, 0x15, 0xe3, 0x7e, 0xc9, 0x11, 0x58, 0x32, 0xc3, 0x3b, 0x63, 0xfc, 0xd0, 0xab, 0xad, - 0x57, 0xcf, 0xc2, 0xab, 0x38, 0x02, 0x4b, 0x86, 0x3e, 0x01, 0x37, 0x25, 0x12, 0xeb, 0xe4, 0xaf, - 0xe8, 0x80, 0xdf, 0x3b, 0x15, 0xf1, 0x9e, 0x21, 0x09, 0x16, 0x74, 0xfe, 0x37, 0x15, 0xa8, 0xa9, - 0xcc, 0x3c, 0x43, 0xc5, 0x7c, 0x70, 0xa7, 0x4c, 0xc8, 0x0c, 0xa7, 0xc4, 0xd4, 0x6d, 0x61, 0xa3, - 0x97, 0x00, 0x12, 0x82, 0x05, 0x09, 0x25, 0x4d, 0x89, 0x57, 0x5b, 0x77, 0x36, 0xaa, 0x41, 0x53, - 0x23, 0xf7, 0x68, 0x4a, 0xd0, 0x15, 0x68, 0x2b, 0xb7, 0x50, 0x10, 0x7e, 0x44, 0xb8, 0xf0, 0x56, - 0xd6, 0xab, 0x1b, 0xcd, 0xa0, 0xa5, 0xb0, 0x61, 0x09, 0x29, 0x17, 0xf5, 0xed, 0xc2, 0xa5, 0x5e, - 0xba, 0x28, 0xcc, 0xba, 0x78, 0xd0, 0x98, 0x60, 0x49, 0x66, 0x78, 0xee, 0x35, 0xf4, 0xfa, 0xd6, - 0x54, 0xca, 0xc4, 0x3c, 0x9a, 0x7a, 0x6e, 0xa9, 0x4c, 0x35, 0x56, 0x58, 0x41, 0xc6, 0xd4, 0x6b, - 0xae, 0x3b, 0x1b, 0x6e, 0xa0, 0xc7, 0x2a, 0x4c, 0x3a, 0xc6, 0x11, 0x09, 0xf5, 0x26, 0x40, 0x7b, - 0x37, 0x35, 0xb2, 0x8f, 0x53, 0xe2, 0xff, 0x50, 0x85, 0x86, 0x29, 0x2a, 0x7a, 0x01, 0x9a, 0x38, - 0x49, 0xd8, 0x2c, 0xcc, 0x1f, 0x11, 0x9d, 0x15, 0x37, 0x70, 0x35, 0x30, 0x78, 0x44, 0xd0, 0xab, - 0xd0, 0x29, 0x27, 0x55, 0x79, 0xc6, 0x09, 0x9b, 0xe9, 0x34, 0xb9, 0xc1, 0xaa, 0x46, 0x1f, 0x1a, - 0x10, 0xdd, 0x87, 0x1a, 0x55, 0x9f, 0x97, 0x22, 0xbb, 0x75, 0x16, 0x91, 0xf5, 0xfa, 0x83, 0x8f, - 0x6f, 0x07, 0x9a, 0x0e, 0xa5, 0xd0, 0x56, 0x90, 0x90, 0x1c, 0xe7, 0x39, 0xe1, 0x3a, 0xdd, 0xad, - 0xad, 0xfe, 0x99, 0xe8, 0xb7, 0x97, 0x08, 0x83, 0x63, 0xf4, 0xfe, 0x4d, 0xa8, 0xa9, 0xc5, 0x95, - 0x42, 0x0a, 0x9e, 0x58, 0x85, 0x14, 0x3c, 0x51, 0x8a, 0x88, 0x58, 0x26, 0x49, 0x26, 0x85, 0xd1, - 0xc9, 0xc2, 0xf6, 0xf7, 0xa1, 0xbd, 0xcc, 0x89, 0x2e, 0x41, 0xfd, 0x90, 0xf0, 0x8c, 0x58, 0x02, - 0x63, 0x29, 0x9c, 0x66, 0x54, 0xf2, 0xd8, 0x30, 0x18, 0x4b, 0xa9, 0x8f, 0x09, 0xdb, 0x1f, 0x98, - 0xf0, 0x7f, 0x76, 0x74, 0x6d, 0xf4, 0x79, 0xb0, 0xed, 0xc0, 0x39, 0xf7, 0x76, 0x50, 0x39, 0xc7, - 0x76, 0xe0, 0xff, 0xd1, 0x01, 0xd7, 0x1e, 0x39, 0x74, 0x11, 0x56, 0x84, 0xc4, 0x92, 0x98, 0xed, - 0x97, 0x86, 0x52, 0xfd, 0x88, 0x65, 0x31, 0xcd, 0x26, 0x61, 0xca, 0x62, 0xa2, 0xd7, 0xaf, 0x06, - 0x2d, 0x83, 0xed, 0xb1, 0x98, 0xa0, 0x0c, 0xda, 0x29, 0xce, 0x8a, 0x31, 0x8e, 0x64, 0xc1, 0x09, - 0x37, 0x62, 0xfa, 0xf0, 0x4c, 0x0d, 0xa0, 0xb7, 0xb7, 0xc4, 0x18, 0x1c, 0xe3, 0x47, 0x23, 0x70, - 0x69, 0x26, 0x24, 0xce, 0x22, 0x62, 0x94, 0x75, 0xe7, 0x6c, 0x6b, 0xf5, 0x0d, 0x5b, 0xb0, 0xe0, - 0x45, 0x9f, 0x43, 0x3d, 0x2a, 0x84, 0x64, 0xa9, 0x69, 0x67, 0xbb, 0x67, 0x5b, 0x61, 0x47, 0x73, - 0x05, 0x86, 0x53, 0xed, 0x60, 0x8c, 0x23, 0x9a, 0x50, 0x39, 0xf7, 0xea, 0xe7, 0xb1, 0x83, 0x3b, - 0x86, 0x2d, 0x58, 0xf0, 0xfa, 0x5b, 0xd0, 0x5e, 0xce, 0xe1, 0x53, 0x37, 0x16, 0x82, 0x9a, 0x48, - 0x8a, 0x89, 0x11, 0xb5, 0x1e, 0xfb, 0x3f, 0xb9, 0xe0, 0xda, 0x64, 0x3c, 0xf5, 0xc1, 0x42, 0x1f, - 0x95, 0x65, 0x7d, 0xfc, 0x5d, 0xcf, 0x3d, 0xd6, 0xa1, 0x6a, 0x4f, 0x74, 0xa8, 0x4b, 0x50, 0xe7, - 0x44, 0x44, 0x05, 0xd1, 0x19, 0x76, 0x03, 0x63, 0xa1, 0x31, 0x54, 0x0e, 0x86, 0x26, 0x2b, 0x0f, - 0xce, 0xa7, 0xae, 0xbd, 0x83, 0x9c, 0x70, 0x2c, 0x69, 0x36, 0x19, 0xce, 0x85, 0x24, 0x69, 0x50, - 0x39, 0x18, 0xaa, 0x4e, 0x8b, 0x93, 0x19, 0x9e, 0x0b, 0x1d, 0x5d, 0x43, 0xc7, 0xd0, 0x2c, 0x11, - 0x15, 0xde, 0x6b, 0xb0, 0xa6, 0x5a, 0x59, 0x28, 0x22, 0x4e, 0x73, 0x19, 0xaa, 0xbe, 0x52, 0xf6, - 0xee, 0x55, 0x05, 0x0f, 0x35, 0x7a, 0x9f, 0x27, 0xe8, 0x33, 0xa8, 0xd2, 0x5c, 0x78, 0x4d, 0x7d, - 0x9b, 0xf6, 0xcf, 0x29, 0xde, 0xfe, 0x20, 0x50, 0xac, 0x2a, 0xb9, 0x85, 0x20, 0x5c, 0x5f, 0xab, - 0xe5, 0x5d, 0xb0, 0xb0, 0xd1, 0x16, 0xfc, 0x2f, 0xe2, 0xf3, 0x5c, 0x92, 0x38, 0xe4, 0x8c, 0xc9, - 0x30, 0xc7, 0x42, 0xcc, 0x18, 0x8f, 0xbd, 0x96, 0x76, 0xfc, 0xaf, 0x99, 0x0c, 0x18, 0x93, 0x03, - 0x33, 0xa5, 0x6a, 0x2e, 0xf1, 0x44, 0x78, 0x6d, 0x7d, 0x75, 0xe9, 0x31, 0x9a, 0x42, 0x43, 0x48, - 0xc6, 0xf1, 0x84, 0x78, 0xab, 0x3a, 0xe9, 0xfb, 0xe7, 0xb4, 0x89, 0x61, 0xc9, 0x1a, 0x58, 0x7a, - 0xf4, 0x7f, 0x70, 0x85, 0x98, 0x86, 0x87, 0x64, 0x2e, 0xbc, 0x8e, 0x8e, 0xa0, 0x21, 0xc4, 0xf4, - 0x23, 0x32, 0x17, 0xe8, 0x2a, 0xac, 0x9a, 0xa7, 0x44, 0xc8, 0x09, 0x8e, 0xe7, 0xde, 0x9a, 0xae, - 0x47, 0xdb, 0x80, 0x81, 0xc2, 0xfc, 0xef, 0x1c, 0x58, 0x7b, 0xa2, 0x92, 0x0b, 0x15, 0x3b, 0x8f, - 0x55, 0xac, 0x94, 0x15, 0x53, 0x21, 0x39, 0xb3, 0x0d, 0xbb, 0xb4, 0xd4, 0xed, 0xac, 0x6e, 0x69, - 0xca, 0x32, 0xa3, 0x54, 0x6b, 0x2a, 0xa1, 0xd2, 0x14, 0x4f, 0x48, 0x28, 0xf1, 0x44, 0x0b, 0xb5, - 0x19, 0xb8, 0x1a, 0xb8, 0x87, 0x27, 0xe8, 0x32, 0x34, 0x98, 0x08, 0xf5, 0x2a, 0x2b, 0x25, 0x1f, - 0x13, 0x43, 0x75, 0x5a, 0x7e, 0x74, 0xa0, 0xd2, 0x1f, 0x28, 0x5a, 0x1c, 0xc7, 0x9c, 0x08, 0x61, - 0xa2, 0xb0, 0xa6, 0x9a, 0xc9, 0x88, 0x4c, 0xb1, 0x38, 0x34, 0x91, 0x58, 0x73, 0xf9, 0xa1, 0x50, - 0x3d, 0xfe, 0x50, 0xb8, 0x04, 0xf5, 0x31, 0x4e, 0x69, 0x32, 0x37, 0x6f, 0x14, 0x63, 0x29, 0x3c, - 0x2f, 0x46, 0x09, 0x8d, 0xec, 0x71, 0x29, 0x2d, 0xf4, 0x32, 0x40, 0x8a, 0x33, 0x3c, 0x21, 0x29, - 0xc9, 0xa4, 0x3e, 0x36, 0x6e, 0xb0, 0x84, 0xf8, 0xf7, 0xa1, 0x61, 0x0a, 0xa1, 0x0e, 0x70, 0x4c, - 0xc5, 0xa1, 0x0a, 0x53, 0x25, 0xbf, 0x34, 0x54, 0x06, 0x39, 0xa6, 0xea, 0x72, 0xd3, 0x9a, 0x50, - 0x63, 0xb4, 0x0e, 0xad, 0x31, 0x4d, 0x88, 0xd0, 0x39, 0x56, 0x77, 0x9c, 0x7e, 0xe9, 0x2c, 0x41, - 0xfe, 0x2f, 0x0e, 0xd4, 0xcb, 0xa6, 0x86, 0xbe, 0x84, 0xb5, 0x9c, 0x13, 0xdd, 0x39, 0x93, 0x84, - 0xc4, 0x21, 0x13, 0xe6, 0xda, 0xfb, 0xa7, 0x4e, 0x6f, 0x67, 0x79, 0xb9, 0x03, 0x81, 0x5e, 0x57, - 0x01, 0xd0, 0x23, 0x2c, 0x49, 0x28, 0x8a, 0x51, 0x46, 0xf4, 0x5d, 0xaf, 0x22, 0xee, 0x18, 0x78, - 0x58, 0xa2, 0xfe, 0x23, 0x70, 0x6d, 0xa3, 0x54, 0x25, 0xcf, 0x13, 0x9c, 0x85, 0x4b, 0xea, 0x71, - 0x15, 0xa0, 0x2a, 0x8b, 0xae, 0xc1, 0x05, 0x3d, 0x69, 0xf4, 0x11, 0x2e, 0x35, 0xca, 0x35, 0x35, - 0xf1, 0xa0, 0xc4, 0xb5, 0xef, 0x55, 0x58, 0xb5, 0x3d, 0x37, 0x8c, 0xd4, 0x0d, 0x59, 0x16, 0xb4, - 0x6d, 0xc1, 0x1d, 0x16, 0x93, 0xee, 0x2b, 0xb0, 0xba, 0x4b, 0x12, 0x22, 0x89, 0xfd, 0xfd, 0xe8, - 0x40, 0xa5, 0xbf, 0x6b, 0x9b, 0x6b, 0x7f, 0x77, 0xeb, 0xcf, 0x06, 0xac, 0xd9, 0x14, 0xa8, 0xd7, - 0x24, 0x8d, 0x08, 0xfa, 0xd6, 0x81, 0x9a, 0xfa, 0xbb, 0x41, 0x6f, 0x9d, 0x24, 0x91, 0x4b, 0xff, - 0x43, 0xfe, 0x8d, 0x93, 0x7c, 0x58, 0xfe, 0x25, 0x5d, 0xfe, 0xea, 0xb7, 0xdf, 0xbf, 0xaf, 0x5c, - 0xe8, 0xb6, 0x37, 0x8f, 0x6e, 0x2c, 0xfe, 0xdb, 0xde, 0x71, 0xae, 0xa1, 0x02, 0x56, 0xb6, 0xe7, - 0x7b, 0xb7, 0x76, 0xd0, 0x9b, 0x27, 0x21, 0x7d, 0xfc, 0xc7, 0xe5, 0xdf, 0x3c, 0x8d, 0x1c, 0x90, - 0x84, 0xda, 0xf6, 0xbc, 0x3f, 0xf8, 0x57, 0x56, 0xdd, 0x7d, 0xce, 0xab, 0x7e, 0xed, 0x40, 0xf5, - 0x56, 0x92, 0xa0, 0x93, 0x97, 0xed, 0x74, 0x0b, 0x76, 0x2f, 0xea, 0x62, 0x77, 0xd0, 0xb1, 0x62, - 0x5f, 0x77, 0x50, 0x06, 0xf5, 0x7e, 0x36, 0x51, 0x3a, 0x3d, 0x45, 0x28, 0x27, 0xff, 0x04, 0xcd, - 0x60, 0xe5, 0x21, 0x96, 0xd1, 0xf4, 0xf9, 0xe6, 0xfb, 0xba, 0x83, 0x8e, 0xa0, 0x5e, 0x9e, 0x4b, - 0x74, 0xa2, 0x37, 0xfa, 0xb1, 0xb3, 0x7c, 0x8a, 0x0d, 0x6f, 0xc3, 0xa7, 0xae, 0x45, 0x46, 0x75, - 0xed, 0xf2, 0xc6, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x20, 0xa7, 0x5d, 0xf2, 0x2f, 0x11, 0x00, - 0x00, + // 1413 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xd7, 0xda, 0x8e, 0xbd, 0x7e, 0x76, 0x9c, 0x6f, 0xe7, 0x5b, 0xda, 0x65, 0xf9, 0x15, 0x52, + 0x01, 0x51, 0x0f, 0x4e, 0x1b, 0x2a, 0x10, 0x08, 0x90, 0x9a, 0xa4, 0xa5, 0x06, 0x25, 0xb1, 0xd6, + 0xfd, 0xc1, 0x2f, 0x69, 0x35, 0xde, 0x1d, 0xdb, 0xa3, 0xec, 0xee, 0x2c, 0x33, 0xb3, 0x71, 0x7d, + 0x42, 0xe2, 0xc0, 0x01, 0xc4, 0x89, 0x13, 0x57, 0x2e, 0x5c, 0x11, 0x37, 0xfe, 0x0e, 0xfe, 0x05, + 0xc4, 0x89, 0x3f, 0x02, 0xcd, 0xec, 0x8c, 0xeb, 0xb4, 0x12, 0x6a, 0x9c, 0x50, 0x6e, 0xf3, 0x3e, + 0x33, 0xf3, 0x79, 0x6f, 0xde, 0x7b, 0xf3, 0xde, 0x0c, 0x5c, 0x9e, 0x60, 0x1e, 0x4f, 0x31, 0x27, + 0x5b, 0x76, 0xd0, 0xcd, 0x39, 0x93, 0x0c, 0x5d, 0x1d, 0x53, 0x39, 0x29, 0x86, 0xdd, 0x88, 0xa5, + 0x5d, 0x49, 0xb3, 0x23, 0xc2, 0x87, 0x24, 0x49, 0xf4, 0xb0, 0x5c, 0x21, 0xba, 0x76, 0x87, 0xff, + 0xe2, 0x98, 0xb1, 0x71, 0x42, 0xb6, 0x70, 0x4e, 0xb7, 0x70, 0x96, 0x31, 0x89, 0x25, 0x65, 0x99, + 0x28, 0xd7, 0x6d, 0x3c, 0x80, 0x56, 0xbf, 0x10, 0x93, 0x80, 0x7c, 0x59, 0x10, 0x21, 0xd1, 0x1d, + 0xa8, 0xc5, 0x58, 0x62, 0xcf, 0x59, 0x77, 0x36, 0x5b, 0xdb, 0x37, 0xba, 0x4f, 0xaf, 0xa7, 0x7b, + 0xc7, 0x0c, 0x02, 0xcd, 0xb0, 0xd1, 0x80, 0x95, 0x5b, 0x69, 0x2e, 0x67, 0x1b, 0x1f, 0x00, 0x7c, + 0x48, 0xa4, 0x55, 0xf0, 0x3f, 0xa8, 0xa6, 0x38, 0xd2, 0xfc, 0xcd, 0x40, 0x0d, 0x51, 0x07, 0x2a, + 0x34, 0xf7, 0x2a, 0x1a, 0xa8, 0xd0, 0x5c, 0xcb, 0xb1, 0x57, 0x35, 0x72, 0xbc, 0xf1, 0x9b, 0x07, + 0xae, 0xe5, 0x36, 0x93, 0x8e, 0x9d, 0x44, 0xfb, 0x50, 0x8b, 0x27, 0x51, 0xb9, 0xbd, 0xb5, 0xfd, + 0xce, 0x32, 0xf6, 0x76, 0xf7, 0xee, 0xec, 0xf6, 0x03, 0x4d, 0x83, 0xee, 0x43, 0x23, 0x23, 0x72, + 0xc8, 0x98, 0xd4, 0x06, 0xb4, 0xb6, 0xdf, 0x5b, 0x8a, 0xf1, 0xa0, 0xe4, 0x08, 0x2c, 0x99, 0xe1, + 0x9d, 0x32, 0x7e, 0xe4, 0xd5, 0xd6, 0xab, 0x67, 0xe1, 0x55, 0x1c, 0x81, 0x25, 0x43, 0x9f, 0x82, + 0x9b, 0x12, 0x89, 0x75, 0xc8, 0x56, 0xb4, 0xc1, 0xef, 0x2f, 0x45, 0xbc, 0x6f, 0x48, 0x82, 0x39, + 0x9d, 0xff, 0x6d, 0x05, 0x6a, 0xca, 0x33, 0x4f, 0x11, 0x31, 0x1f, 0xdc, 0x09, 0x13, 0x32, 0xc3, + 0x29, 0x31, 0x71, 0x9b, 0xcb, 0xe8, 0x25, 0x80, 0x84, 0x60, 0x41, 0x42, 0x49, 0x53, 0xe2, 0xd5, + 0xd6, 0x9d, 0xcd, 0x6a, 0xd0, 0xd4, 0xc8, 0x5d, 0x9a, 0x12, 0xf4, 0x2a, 0xb4, 0xd5, 0xb2, 0x50, + 0x10, 0x7e, 0x4c, 0xb8, 0xf0, 0x56, 0xd6, 0xab, 0x9b, 0xcd, 0xa0, 0xa5, 0xb0, 0x41, 0x09, 0xa9, + 0x25, 0x6a, 0xef, 0x7c, 0x49, 0xbd, 0x5c, 0xa2, 0x30, 0xbb, 0xc4, 0x83, 0xc6, 0x18, 0x4b, 0x32, + 0xc5, 0x33, 0xaf, 0xa1, 0xf5, 0x5b, 0x11, 0x21, 0xa8, 0x61, 0x1e, 0x4d, 0x3c, 0x57, 0xc3, 0x7a, + 0xac, 0xb0, 0x82, 0x8c, 0xa8, 0xd7, 0x5c, 0x77, 0x36, 0xdd, 0x40, 0x8f, 0x95, 0x99, 0x74, 0x84, + 0x23, 0x12, 0xea, 0x43, 0x80, 0x5e, 0xdd, 0xd4, 0xc8, 0x01, 0x4e, 0x89, 0xff, 0x63, 0x15, 0x1a, + 0x26, 0xa8, 0xe8, 0x05, 0x68, 0xe2, 0x24, 0x61, 0xd3, 0x30, 0x7f, 0x48, 0xb4, 0x57, 0xdc, 0xc0, + 0xd5, 0x40, 0xff, 0x21, 0x41, 0xaf, 0x41, 0xa7, 0x9c, 0x54, 0xe1, 0x19, 0x25, 0x6c, 0xaa, 0xdd, + 0xe4, 0x06, 0xab, 0x1a, 0x7d, 0x60, 0x40, 0x74, 0x0f, 0x6a, 0x54, 0x6d, 0x2f, 0x93, 0xec, 0xe6, + 0x59, 0x92, 0xac, 0xdb, 0xeb, 0x7f, 0x72, 0x2b, 0xd0, 0x74, 0x28, 0x85, 0xb6, 0x82, 0x84, 0xe4, + 0x38, 0xcf, 0x09, 0xd7, 0xee, 0x6e, 0x6d, 0xf7, 0xce, 0x44, 0xbf, 0xb3, 0x40, 0x18, 0x9c, 0xa0, + 0xf7, 0x6f, 0x40, 0x4d, 0x29, 0x57, 0x19, 0x52, 0xf0, 0xc4, 0x66, 0x48, 0xc1, 0x13, 0x95, 0x11, + 0x11, 0xcb, 0x24, 0xc9, 0xa4, 0x30, 0x79, 0x32, 0x97, 0xfd, 0x03, 0x68, 0x2f, 0x72, 0xa2, 0x4b, + 0x50, 0x3f, 0x22, 0x3c, 0x23, 0x96, 0xc0, 0x48, 0x0a, 0xa7, 0x19, 0x95, 0x3c, 0x36, 0x0c, 0x46, + 0x52, 0xd9, 0xc7, 0x84, 0xad, 0x0f, 0x4c, 0xf8, 0xbf, 0x38, 0x3a, 0x36, 0xfa, 0x3e, 0xd8, 0x72, + 0xe0, 0x9c, 0x7b, 0x39, 0xa8, 0x9c, 0x63, 0x39, 0xf0, 0xff, 0xec, 0x80, 0x6b, 0xaf, 0x1c, 0xba, + 0x08, 0x2b, 0x42, 0x62, 0x49, 0xcc, 0xf1, 0x4b, 0x41, 0x65, 0xfd, 0x90, 0x65, 0x31, 0xcd, 0xc6, + 0x61, 0xca, 0x62, 0xa2, 0xf5, 0x57, 0x83, 0x96, 0xc1, 0xf6, 0x59, 0x4c, 0x50, 0x06, 0xed, 0x14, + 0x67, 0xc5, 0x08, 0x47, 0xb2, 0xe0, 0x84, 0x9b, 0x64, 0xfa, 0xe8, 0x4c, 0x05, 0xa0, 0xbb, 0xbf, + 0xc0, 0x18, 0x9c, 0xe0, 0x47, 0x43, 0x70, 0x69, 0x26, 0x24, 0xce, 0x22, 0x62, 0x32, 0xeb, 0xf6, + 0xd9, 0x74, 0xf5, 0x0c, 0x5b, 0x30, 0xe7, 0x45, 0x5f, 0x40, 0x3d, 0x2a, 0x84, 0x64, 0xa9, 0x29, + 0x67, 0x7b, 0x67, 0xd3, 0xb0, 0xab, 0xb9, 0x02, 0xc3, 0xa9, 0x4e, 0x30, 0xc2, 0x11, 0x4d, 0xa8, + 0x9c, 0x79, 0xf5, 0xf3, 0x38, 0xc1, 0x6d, 0xc3, 0x16, 0xcc, 0x79, 0xfd, 0x6d, 0x68, 0x2f, 0xfa, + 0xf0, 0x89, 0x8e, 0x85, 0xa0, 0x26, 0x92, 0x62, 0x6c, 0x92, 0x5a, 0x8f, 0xfd, 0x9f, 0x5d, 0x70, + 0xad, 0x33, 0x9e, 0xd8, 0x30, 0xcf, 0x8f, 0xca, 0x62, 0x7e, 0xfc, 0x53, 0xcd, 0x3d, 0x51, 0xa1, + 0x6a, 0x8f, 0x55, 0xa8, 0x4b, 0x50, 0xe7, 0x44, 0x44, 0x05, 0xd1, 0x1e, 0x76, 0x03, 0x23, 0xa1, + 0x11, 0x54, 0x0e, 0x07, 0xc6, 0x2b, 0xf7, 0xcf, 0x27, 0xae, 0xdd, 0xc3, 0x9c, 0x70, 0x2c, 0x69, + 0x36, 0x1e, 0xcc, 0x84, 0x24, 0x69, 0x50, 0x39, 0x1c, 0xa8, 0x4a, 0x8b, 0x93, 0x29, 0x9e, 0x09, + 0x6d, 0x5d, 0x43, 0xdb, 0xd0, 0x2c, 0x11, 0x65, 0xde, 0xeb, 0xb0, 0xa6, 0x4a, 0x59, 0x28, 0x22, + 0x4e, 0x73, 0x19, 0xaa, 0xba, 0x52, 0xd6, 0xee, 0x55, 0x05, 0x0f, 0x34, 0x7a, 0x8f, 0x27, 0xe8, + 0x73, 0xa8, 0xd2, 0x5c, 0x78, 0x4d, 0xdd, 0x4d, 0x7b, 0xe7, 0x64, 0x6f, 0xaf, 0x1f, 0x28, 0x56, + 0xe5, 0xdc, 0x42, 0x10, 0xae, 0xdb, 0x6a, 0xd9, 0x0b, 0xe6, 0x32, 0xda, 0x86, 0xe7, 0x22, 0x3e, + 0xcb, 0x25, 0x89, 0x43, 0xce, 0x98, 0x0c, 0x73, 0x2c, 0xc4, 0x94, 0xf1, 0xd8, 0x6b, 0xe9, 0x85, + 0xff, 0x37, 0x93, 0x01, 0x63, 0xb2, 0x6f, 0xa6, 0x54, 0xcc, 0x25, 0x1e, 0x0b, 0xaf, 0xad, 0x5b, + 0x97, 0x1e, 0xa3, 0x09, 0x34, 0x84, 0x64, 0x1c, 0x8f, 0x89, 0xb7, 0xaa, 0x9d, 0x7e, 0x70, 0x4e, + 0x87, 0x18, 0x94, 0xac, 0x81, 0xa5, 0x47, 0xcf, 0x83, 0x2b, 0xc4, 0x24, 0x3c, 0x22, 0x33, 0xe1, + 0x75, 0xb4, 0x05, 0x0d, 0x21, 0x26, 0x1f, 0x93, 0x99, 0x40, 0x57, 0x60, 0xd5, 0x3c, 0x25, 0x42, + 0x4e, 0x70, 0x3c, 0xf3, 0xd6, 0x74, 0x3c, 0xda, 0x06, 0x0c, 0x14, 0xe6, 0x7f, 0xef, 0xc0, 0xda, + 0x63, 0x91, 0x9c, 0x67, 0xb1, 0xf3, 0x28, 0x8b, 0x55, 0x66, 0xc5, 0x54, 0x48, 0xce, 0x6c, 0xc1, + 0x2e, 0x25, 0xd5, 0x9d, 0x55, 0x97, 0xa6, 0x2c, 0x33, 0x99, 0x6a, 0x45, 0x95, 0xa8, 0x34, 0xc5, + 0x63, 0x12, 0x4a, 0x3c, 0xd6, 0x89, 0xda, 0x0c, 0x5c, 0x0d, 0xdc, 0xc5, 0x63, 0x74, 0x19, 0x1a, + 0x4c, 0x84, 0x5a, 0xcb, 0x4a, 0xc9, 0xc7, 0xc4, 0x40, 0xdd, 0x96, 0x9f, 0x1c, 0xa8, 0xf4, 0xfa, + 0x8a, 0x16, 0xc7, 0x31, 0x27, 0x42, 0x18, 0x2b, 0xac, 0xa8, 0x66, 0x32, 0x22, 0x53, 0x2c, 0x8e, + 0x8c, 0x25, 0x56, 0x5c, 0x7c, 0x28, 0x54, 0x4f, 0x3e, 0x14, 0x2e, 0x41, 0x7d, 0x84, 0x53, 0x9a, + 0xcc, 0xcc, 0x1b, 0xc5, 0x48, 0x0a, 0xcf, 0x8b, 0x61, 0x42, 0x23, 0x7b, 0x5d, 0x4a, 0x09, 0xbd, + 0x0c, 0x90, 0xe2, 0x0c, 0x8f, 0x49, 0x4a, 0x32, 0xa9, 0xaf, 0x8d, 0x1b, 0x2c, 0x20, 0xfe, 0x3d, + 0x68, 0x98, 0x40, 0xa8, 0x0b, 0x1c, 0x53, 0x71, 0xa4, 0xcc, 0x54, 0xce, 0x2f, 0x05, 0xe5, 0x41, + 0x8e, 0xa9, 0x6a, 0x6e, 0x3a, 0x27, 0xd4, 0x18, 0xad, 0x43, 0x6b, 0x44, 0x13, 0x22, 0xb4, 0x8f, + 0x55, 0x8f, 0xd3, 0x2f, 0x9d, 0x05, 0xc8, 0xff, 0xd5, 0x81, 0x7a, 0x59, 0xd4, 0xd0, 0x57, 0xb0, + 0x96, 0x73, 0xa2, 0x2b, 0x67, 0x92, 0x90, 0x38, 0x64, 0xc2, 0xb4, 0xbd, 0x7f, 0xeb, 0xf6, 0x76, + 0x16, 0xd5, 0x1d, 0x0a, 0xf4, 0x86, 0x32, 0x80, 0x1e, 0x63, 0x49, 0x42, 0x51, 0x0c, 0x33, 0xa2, + 0x7b, 0xbd, 0xb2, 0xb8, 0x63, 0xe0, 0x41, 0x89, 0xfa, 0x0f, 0xc1, 0xb5, 0x85, 0x52, 0x85, 0x3c, + 0x4f, 0x70, 0x16, 0x2e, 0x64, 0x8f, 0xab, 0x00, 0x15, 0x59, 0x74, 0x15, 0x2e, 0xe8, 0x49, 0x93, + 0x1f, 0xe1, 0x42, 0xa1, 0x5c, 0x53, 0x13, 0xf7, 0x4b, 0x5c, 0xaf, 0xbd, 0x02, 0xab, 0xb6, 0xe6, + 0x86, 0x91, 0xea, 0x90, 0x65, 0x40, 0xdb, 0x16, 0xdc, 0x65, 0x31, 0xd9, 0x78, 0x05, 0x56, 0xf7, + 0x48, 0x42, 0x24, 0xb1, 0xdf, 0x8f, 0x0e, 0x54, 0x7a, 0x7b, 0xb6, 0xb8, 0xf6, 0xf6, 0xb6, 0xff, + 0x6a, 0xc0, 0x9a, 0x75, 0x81, 0x7a, 0x4d, 0xd2, 0x88, 0xa0, 0xef, 0x1c, 0xa8, 0xa9, 0x3f, 0x11, + 0x7a, 0xfb, 0x34, 0x8e, 0x5c, 0xf8, 0x45, 0xf9, 0xd7, 0x4f, 0xb3, 0xb1, 0xfc, 0x25, 0x5d, 0xfe, + 0xfa, 0xf7, 0x3f, 0x7e, 0xa8, 0x5c, 0xd8, 0x68, 0x6f, 0x1d, 0x5f, 0x9f, 0xff, 0xf6, 0xde, 0x75, + 0xae, 0xa2, 0x02, 0x56, 0x76, 0x66, 0xfb, 0x37, 0x77, 0xd1, 0x5b, 0xa7, 0x21, 0x7d, 0xf4, 0xe3, + 0xf2, 0x97, 0xfa, 0xc4, 0x21, 0x09, 0xb5, 0x9d, 0x59, 0xaf, 0xff, 0x9f, 0x68, 0xdd, 0x7b, 0xc6, + 0x5a, 0xbf, 0x71, 0xa0, 0x7a, 0x33, 0x49, 0xd0, 0xe9, 0xc3, 0xb6, 0x9c, 0xc2, 0x8d, 0x8b, 0x3a, + 0xd8, 0x1d, 0x74, 0x22, 0xd8, 0xd7, 0x1c, 0x94, 0x41, 0xbd, 0x97, 0x8d, 0x55, 0x9e, 0x2e, 0x61, + 0xca, 0xe9, 0xb7, 0xa0, 0x29, 0xac, 0x3c, 0xc0, 0x32, 0x9a, 0x3c, 0x5b, 0x7f, 0x5f, 0x73, 0xd0, + 0x31, 0xd4, 0xcb, 0x7b, 0x89, 0x4e, 0xf5, 0x46, 0x3f, 0x71, 0x97, 0x97, 0x38, 0xf0, 0x0e, 0x7c, + 0xe6, 0x5a, 0x64, 0x58, 0xd7, 0x4b, 0xde, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x73, 0x98, 0xd6, + 0xbf, 0x65, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 5e2cdd5e1..cf4f3e491 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -27,7 +27,7 @@ service HardwareService { } message PushRequest { - string data = 1; + Hardware data = 1; } message Empty { diff --git a/test/framework/hardware.go b/test/framework/hardware.go index 5b8f77aab..cc5c87b9e 100644 --- a/test/framework/hardware.go +++ b/test/framework/hardware.go @@ -2,6 +2,7 @@ package framework import ( "context" + "encoding/json" "io/ioutil" "os" @@ -9,18 +10,18 @@ import ( "github.com/tinkerbell/tink/protos/hardware" ) -func readHwData(file string) (string, error) { +func readHwData(file string) ([]byte, error) { f, err := os.Open(file) if err != nil { - return "", err + return []byte(""), err } defer f.Close() data, err := ioutil.ReadAll(f) if err != nil { - return "", err + return []byte(""), err } - return string(data), nil + return data, nil } // PushHardwareData : push hardware data @@ -31,7 +32,9 @@ func PushHardwareData(hwDataFiles []string) error { if err != nil { return err } - _, err = client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: data}) + hw := hardware.Hardware{} + err = json.Unmarshal(data, &hw) + _, err = client.HardwareClient.Push(context.Background(), &hardware.PushRequest{Data: &hw}) if err != nil { return err } From c0e731cebd2f0d3e3a19c74e772f00949213e092 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Mon, 27 Apr 2020 15:11:40 -0400 Subject: [PATCH 05/31] changed readTemplateData to return and tryParseTemplate to accept string instead of byte --- cmd/tink-cli/cmd/template/create.go | 8 ++++---- cmd/tink-cli/cmd/template/update.go | 8 ++++---- test/framework/template.go | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmd/tink-cli/cmd/template/create.go b/cmd/tink-cli/cmd/template/create.go index 79657563f..6659b30cb 100644 --- a/cmd/tink-cli/cmd/template/create.go +++ b/cmd/tink-cli/cmd/template/create.go @@ -50,7 +50,7 @@ cat /tmp/example.tmpl | tink template create -n example`, data := readAll(reader) if data != nil { - if err := tryParseTemplate(data); err != nil { + if err := tryParseTemplate(string(data)); err != nil { log.Println(err) return } @@ -74,16 +74,16 @@ func addFlags() { createCmd.MarkPersistentFlagRequired(fName) } -func tryParseTemplate(data []byte) error { +func tryParseTemplate(data string) error { tmpl := *tt.New("") - if _, err := tmpl.Parse(string(data)); err != nil { + if _, err := tmpl.Parse(data); err != nil { return err } return nil } func createTemplate(data []byte) { - req := template.WorkflowTemplate{Name: templateName, Data: data} + req := template.WorkflowTemplate{Name: templateName, Data: string(data)} res, err := client.TemplateClient.CreateTemplate(context.Background(), &req) if err != nil { log.Println(err) diff --git a/cmd/tink-cli/cmd/template/update.go b/cmd/tink-cli/cmd/template/update.go index 8730a3fba..32689de41 100644 --- a/cmd/tink-cli/cmd/template/update.go +++ b/cmd/tink-cli/cmd/template/update.go @@ -50,7 +50,7 @@ func updateTemplate(id string) { req.Name = templateName } else if filePath != "" && templateName == "" { data := readTemplateData() - if data != nil { + if data != "" { if err := tryParseTemplate(data); err != nil { log.Println(err) return @@ -59,7 +59,7 @@ func updateTemplate(id string) { } } else { req.Name = templateName - req.Data = string(readTemplateData()) + req.Data = readTemplateData() } _, err := client.TemplateClient.UpdateTemplate(context.Background(), &req) @@ -69,7 +69,7 @@ func updateTemplate(id string) { fmt.Println("Updated Template: ", id) } -func readTemplateData() []byte { +func readTemplateData() string { f, err := os.Open(filePath) if err != nil { log.Println(err) @@ -80,7 +80,7 @@ func readTemplateData() []byte { if err != nil { log.Println(err) } - return data + return string(data) } func init() { diff --git a/test/framework/template.go b/test/framework/template.go index 631c379b4..6148c2ce5 100644 --- a/test/framework/template.go +++ b/test/framework/template.go @@ -9,18 +9,18 @@ import ( "github.com/tinkerbell/tink/protos/template" ) -func readTemplateData(file string) ([]byte, error) { +func readTemplateData(file string) (string, error) { f, err := os.Open(file) if err != nil { - return []byte(""), err + return "", err } defer f.Close() data, err := ioutil.ReadAll(f) if err != nil { - return []byte(""), err + return "", err } - return data, nil + return string(data), nil } // CreateTemplate : create template in the database @@ -28,7 +28,7 @@ func CreateTemplate(tmpl string) (string, error) { filePath := "data/template/" + tmpl // Read Content of template data, err := readTemplateData(filePath) - req := template.WorkflowTemplate{Name: ("test_" + tmpl), Data: string(data)} + req := template.WorkflowTemplate{Name: ("test_" + tmpl), Data: data} res, err := client.TemplateClient.CreateTemplate(context.Background(), &req) if err != nil { return "", err From 9c991e762d29b4337df49fb6b92e404d31ac1fb3 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Wed, 29 Apr 2020 19:56:35 -0400 Subject: [PATCH 06/31] added basic auth to proto endpoints --- deploy/docker-compose.yml | 2 ++ http-server/http-server.go | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index caf2b005d..61388aaf8 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -15,6 +15,8 @@ services: PGPORT: 5432 PGSSLMODE: disable PGUSER: tinkerbell + TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME:-admin} + TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD:-admin} depends_on: db: condition: service_healthy diff --git a/http-server/http-server.go b/http-server/http-server.go index 635318ffd..dbfdedb56 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -3,11 +3,13 @@ package httpserver import ( "bytes" "context" + "crypto/subtle" "crypto/x509" "encoding/json" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "net/http" + "os" "runtime" "time" @@ -26,6 +28,8 @@ var ( gitRevJSON []byte grpcListenAddr = "localhost:42113" httpListenAddr = ":42114" + authUsername = os.Getenv("TINK_AUTH_USERNAME") + authPassword = os.Getenv("TINK_AUTH_PASSWORD") startTime = time.Now() logger log.Logger ) @@ -69,7 +73,7 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time. setupGitRevJSON() http.HandleFunc("/version", versionHandler) http.HandleFunc("/_packet/healthcheck", healthCheckHandler) - http.Handle("/", mux) + http.Handle("/", BasicAuth(mux)) srv := &http.Server{ Addr: httpListenAddr, @@ -129,3 +133,17 @@ func setupGitRevJSON() { } gitRevJSON = b } + +func BasicAuth(handler http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + user, pass, ok := r.BasicAuth() + if !ok || subtle.ConstantTimeCompare([]byte(user), []byte(authUsername)) != 1 || + subtle.ConstantTimeCompare([]byte(pass), []byte(authPassword)) != 1 { + w.Header().Set("WWW-Authenticate", `Basic realm="Tink Realm"`) + w.WriteHeader(401) + w.Write([]byte("401 Unauthorized\n")) + return + } + handler.ServeHTTP(w, r) + }) +} \ No newline at end of file From 02957ab7e1bea979a84434f4d35cb01df4f4e96d Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 30 Apr 2020 14:56:06 -0400 Subject: [PATCH 07/31] removed ingest method from hardware --- cmd/tink-cli/cmd/hardware/ingest.go | 32 ----- grpc-server/hardware.go | 11 -- protos/hardware/hardware.pb.go | 215 ++++++++++++---------------- protos/hardware/hardware.proto | 1 - 4 files changed, 89 insertions(+), 170 deletions(-) delete mode 100644 cmd/tink-cli/cmd/hardware/ingest.go diff --git a/cmd/tink-cli/cmd/hardware/ingest.go b/cmd/tink-cli/cmd/hardware/ingest.go deleted file mode 100644 index 98965dd1d..000000000 --- a/cmd/tink-cli/cmd/hardware/ingest.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright © 2018 packet.net - -package hardware - -import ( - "context" - "fmt" - "log" - - "github.com/spf13/cobra" - "github.com/tinkerbell/tink/client" - "github.com/tinkerbell/tink/protos/hardware" -) - -// ingestCmd represents the ingest command -var ingestCmd = &cobra.Command{ - Use: "ingest", - Short: "Trigger tinkerbell to ingest", - Long: "This command only signals tinkerbell to ingest if it has not already done so.", - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("ingest called") - _, err := client.HardwareClient.Ingest(context.Background(), &hardware.Empty{}) - if err != nil { - log.Fatal(err) - } - }, -} - -func init() { - SubCommands = append(SubCommands, ingestCmd) - -} diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go index 6c0a14396..6c7d0c01b 100644 --- a/grpc-server/hardware.go +++ b/grpc-server/hardware.go @@ -80,17 +80,6 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware. return &hardware.Empty{}, err } -func (s *server) Ingest(ctx context.Context, in *hardware.Empty) (*hardware.Empty, error) { - logger.Info("ingest") - labels := prometheus.Labels{"method": "Ingest", "op": ""} - metrics.CacheInFlight.With(labels).Inc() - defer metrics.CacheInFlight.With(labels).Dec() - - logger.Info("Ingest called but is deprecated") - - return &hardware.Empty{}, nil -} - func (s *server) by(method string, fn func() (string, error)) (*hardware.Hardware, error) { labels := prometheus.Labels{"method": method, "op": "get"} diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 12faf0a19..fdc466dc0 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -1197,96 +1197,95 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1413 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xd7, 0xda, 0x8e, 0xbd, 0x7e, 0x76, 0x9c, 0x6f, 0xe7, 0x5b, 0xda, 0x65, 0xf9, 0x15, 0x52, - 0x01, 0x51, 0x0f, 0x4e, 0x1b, 0x2a, 0x10, 0x08, 0x90, 0x9a, 0xa4, 0xa5, 0x06, 0x25, 0xb1, 0xd6, - 0xfd, 0xc1, 0x2f, 0x69, 0x35, 0xde, 0x1d, 0xdb, 0xa3, 0xec, 0xee, 0x2c, 0x33, 0xb3, 0x71, 0x7d, - 0x42, 0xe2, 0xc0, 0x01, 0xc4, 0x89, 0x13, 0x57, 0x2e, 0x5c, 0x11, 0x37, 0xfe, 0x0e, 0xfe, 0x05, - 0xc4, 0x89, 0x3f, 0x02, 0xcd, 0xec, 0x8c, 0xeb, 0xb4, 0x12, 0x6a, 0x9c, 0x50, 0x6e, 0xf3, 0x3e, - 0x33, 0xf3, 0x79, 0x6f, 0xde, 0x7b, 0xf3, 0xde, 0x0c, 0x5c, 0x9e, 0x60, 0x1e, 0x4f, 0x31, 0x27, - 0x5b, 0x76, 0xd0, 0xcd, 0x39, 0x93, 0x0c, 0x5d, 0x1d, 0x53, 0x39, 0x29, 0x86, 0xdd, 0x88, 0xa5, - 0x5d, 0x49, 0xb3, 0x23, 0xc2, 0x87, 0x24, 0x49, 0xf4, 0xb0, 0x5c, 0x21, 0xba, 0x76, 0x87, 0xff, - 0xe2, 0x98, 0xb1, 0x71, 0x42, 0xb6, 0x70, 0x4e, 0xb7, 0x70, 0x96, 0x31, 0x89, 0x25, 0x65, 0x99, - 0x28, 0xd7, 0x6d, 0x3c, 0x80, 0x56, 0xbf, 0x10, 0x93, 0x80, 0x7c, 0x59, 0x10, 0x21, 0xd1, 0x1d, - 0xa8, 0xc5, 0x58, 0x62, 0xcf, 0x59, 0x77, 0x36, 0x5b, 0xdb, 0x37, 0xba, 0x4f, 0xaf, 0xa7, 0x7b, - 0xc7, 0x0c, 0x02, 0xcd, 0xb0, 0xd1, 0x80, 0x95, 0x5b, 0x69, 0x2e, 0x67, 0x1b, 0x1f, 0x00, 0x7c, - 0x48, 0xa4, 0x55, 0xf0, 0x3f, 0xa8, 0xa6, 0x38, 0xd2, 0xfc, 0xcd, 0x40, 0x0d, 0x51, 0x07, 0x2a, - 0x34, 0xf7, 0x2a, 0x1a, 0xa8, 0xd0, 0x5c, 0xcb, 0xb1, 0x57, 0x35, 0x72, 0xbc, 0xf1, 0x9b, 0x07, - 0xae, 0xe5, 0x36, 0x93, 0x8e, 0x9d, 0x44, 0xfb, 0x50, 0x8b, 0x27, 0x51, 0xb9, 0xbd, 0xb5, 0xfd, - 0xce, 0x32, 0xf6, 0x76, 0xf7, 0xee, 0xec, 0xf6, 0x03, 0x4d, 0x83, 0xee, 0x43, 0x23, 0x23, 0x72, - 0xc8, 0x98, 0xd4, 0x06, 0xb4, 0xb6, 0xdf, 0x5b, 0x8a, 0xf1, 0xa0, 0xe4, 0x08, 0x2c, 0x99, 0xe1, - 0x9d, 0x32, 0x7e, 0xe4, 0xd5, 0xd6, 0xab, 0x67, 0xe1, 0x55, 0x1c, 0x81, 0x25, 0x43, 0x9f, 0x82, - 0x9b, 0x12, 0x89, 0x75, 0xc8, 0x56, 0xb4, 0xc1, 0xef, 0x2f, 0x45, 0xbc, 0x6f, 0x48, 0x82, 0x39, - 0x9d, 0xff, 0x6d, 0x05, 0x6a, 0xca, 0x33, 0x4f, 0x11, 0x31, 0x1f, 0xdc, 0x09, 0x13, 0x32, 0xc3, - 0x29, 0x31, 0x71, 0x9b, 0xcb, 0xe8, 0x25, 0x80, 0x84, 0x60, 0x41, 0x42, 0x49, 0x53, 0xe2, 0xd5, - 0xd6, 0x9d, 0xcd, 0x6a, 0xd0, 0xd4, 0xc8, 0x5d, 0x9a, 0x12, 0xf4, 0x2a, 0xb4, 0xd5, 0xb2, 0x50, - 0x10, 0x7e, 0x4c, 0xb8, 0xf0, 0x56, 0xd6, 0xab, 0x9b, 0xcd, 0xa0, 0xa5, 0xb0, 0x41, 0x09, 0xa9, - 0x25, 0x6a, 0xef, 0x7c, 0x49, 0xbd, 0x5c, 0xa2, 0x30, 0xbb, 0xc4, 0x83, 0xc6, 0x18, 0x4b, 0x32, - 0xc5, 0x33, 0xaf, 0xa1, 0xf5, 0x5b, 0x11, 0x21, 0xa8, 0x61, 0x1e, 0x4d, 0x3c, 0x57, 0xc3, 0x7a, - 0xac, 0xb0, 0x82, 0x8c, 0xa8, 0xd7, 0x5c, 0x77, 0x36, 0xdd, 0x40, 0x8f, 0x95, 0x99, 0x74, 0x84, - 0x23, 0x12, 0xea, 0x43, 0x80, 0x5e, 0xdd, 0xd4, 0xc8, 0x01, 0x4e, 0x89, 0xff, 0x63, 0x15, 0x1a, - 0x26, 0xa8, 0xe8, 0x05, 0x68, 0xe2, 0x24, 0x61, 0xd3, 0x30, 0x7f, 0x48, 0xb4, 0x57, 0xdc, 0xc0, - 0xd5, 0x40, 0xff, 0x21, 0x41, 0xaf, 0x41, 0xa7, 0x9c, 0x54, 0xe1, 0x19, 0x25, 0x6c, 0xaa, 0xdd, - 0xe4, 0x06, 0xab, 0x1a, 0x7d, 0x60, 0x40, 0x74, 0x0f, 0x6a, 0x54, 0x6d, 0x2f, 0x93, 0xec, 0xe6, - 0x59, 0x92, 0xac, 0xdb, 0xeb, 0x7f, 0x72, 0x2b, 0xd0, 0x74, 0x28, 0x85, 0xb6, 0x82, 0x84, 0xe4, - 0x38, 0xcf, 0x09, 0xd7, 0xee, 0x6e, 0x6d, 0xf7, 0xce, 0x44, 0xbf, 0xb3, 0x40, 0x18, 0x9c, 0xa0, - 0xf7, 0x6f, 0x40, 0x4d, 0x29, 0x57, 0x19, 0x52, 0xf0, 0xc4, 0x66, 0x48, 0xc1, 0x13, 0x95, 0x11, - 0x11, 0xcb, 0x24, 0xc9, 0xa4, 0x30, 0x79, 0x32, 0x97, 0xfd, 0x03, 0x68, 0x2f, 0x72, 0xa2, 0x4b, - 0x50, 0x3f, 0x22, 0x3c, 0x23, 0x96, 0xc0, 0x48, 0x0a, 0xa7, 0x19, 0x95, 0x3c, 0x36, 0x0c, 0x46, - 0x52, 0xd9, 0xc7, 0x84, 0xad, 0x0f, 0x4c, 0xf8, 0xbf, 0x38, 0x3a, 0x36, 0xfa, 0x3e, 0xd8, 0x72, - 0xe0, 0x9c, 0x7b, 0x39, 0xa8, 0x9c, 0x63, 0x39, 0xf0, 0xff, 0xec, 0x80, 0x6b, 0xaf, 0x1c, 0xba, - 0x08, 0x2b, 0x42, 0x62, 0x49, 0xcc, 0xf1, 0x4b, 0x41, 0x65, 0xfd, 0x90, 0x65, 0x31, 0xcd, 0xc6, - 0x61, 0xca, 0x62, 0xa2, 0xf5, 0x57, 0x83, 0x96, 0xc1, 0xf6, 0x59, 0x4c, 0x50, 0x06, 0xed, 0x14, - 0x67, 0xc5, 0x08, 0x47, 0xb2, 0xe0, 0x84, 0x9b, 0x64, 0xfa, 0xe8, 0x4c, 0x05, 0xa0, 0xbb, 0xbf, - 0xc0, 0x18, 0x9c, 0xe0, 0x47, 0x43, 0x70, 0x69, 0x26, 0x24, 0xce, 0x22, 0x62, 0x32, 0xeb, 0xf6, - 0xd9, 0x74, 0xf5, 0x0c, 0x5b, 0x30, 0xe7, 0x45, 0x5f, 0x40, 0x3d, 0x2a, 0x84, 0x64, 0xa9, 0x29, - 0x67, 0x7b, 0x67, 0xd3, 0xb0, 0xab, 0xb9, 0x02, 0xc3, 0xa9, 0x4e, 0x30, 0xc2, 0x11, 0x4d, 0xa8, - 0x9c, 0x79, 0xf5, 0xf3, 0x38, 0xc1, 0x6d, 0xc3, 0x16, 0xcc, 0x79, 0xfd, 0x6d, 0x68, 0x2f, 0xfa, - 0xf0, 0x89, 0x8e, 0x85, 0xa0, 0x26, 0x92, 0x62, 0x6c, 0x92, 0x5a, 0x8f, 0xfd, 0x9f, 0x5d, 0x70, - 0xad, 0x33, 0x9e, 0xd8, 0x30, 0xcf, 0x8f, 0xca, 0x62, 0x7e, 0xfc, 0x53, 0xcd, 0x3d, 0x51, 0xa1, - 0x6a, 0x8f, 0x55, 0xa8, 0x4b, 0x50, 0xe7, 0x44, 0x44, 0x05, 0xd1, 0x1e, 0x76, 0x03, 0x23, 0xa1, - 0x11, 0x54, 0x0e, 0x07, 0xc6, 0x2b, 0xf7, 0xcf, 0x27, 0xae, 0xdd, 0xc3, 0x9c, 0x70, 0x2c, 0x69, - 0x36, 0x1e, 0xcc, 0x84, 0x24, 0x69, 0x50, 0x39, 0x1c, 0xa8, 0x4a, 0x8b, 0x93, 0x29, 0x9e, 0x09, - 0x6d, 0x5d, 0x43, 0xdb, 0xd0, 0x2c, 0x11, 0x65, 0xde, 0xeb, 0xb0, 0xa6, 0x4a, 0x59, 0x28, 0x22, - 0x4e, 0x73, 0x19, 0xaa, 0xba, 0x52, 0xd6, 0xee, 0x55, 0x05, 0x0f, 0x34, 0x7a, 0x8f, 0x27, 0xe8, - 0x73, 0xa8, 0xd2, 0x5c, 0x78, 0x4d, 0xdd, 0x4d, 0x7b, 0xe7, 0x64, 0x6f, 0xaf, 0x1f, 0x28, 0x56, - 0xe5, 0xdc, 0x42, 0x10, 0xae, 0xdb, 0x6a, 0xd9, 0x0b, 0xe6, 0x32, 0xda, 0x86, 0xe7, 0x22, 0x3e, - 0xcb, 0x25, 0x89, 0x43, 0xce, 0x98, 0x0c, 0x73, 0x2c, 0xc4, 0x94, 0xf1, 0xd8, 0x6b, 0xe9, 0x85, - 0xff, 0x37, 0x93, 0x01, 0x63, 0xb2, 0x6f, 0xa6, 0x54, 0xcc, 0x25, 0x1e, 0x0b, 0xaf, 0xad, 0x5b, - 0x97, 0x1e, 0xa3, 0x09, 0x34, 0x84, 0x64, 0x1c, 0x8f, 0x89, 0xb7, 0xaa, 0x9d, 0x7e, 0x70, 0x4e, - 0x87, 0x18, 0x94, 0xac, 0x81, 0xa5, 0x47, 0xcf, 0x83, 0x2b, 0xc4, 0x24, 0x3c, 0x22, 0x33, 0xe1, - 0x75, 0xb4, 0x05, 0x0d, 0x21, 0x26, 0x1f, 0x93, 0x99, 0x40, 0x57, 0x60, 0xd5, 0x3c, 0x25, 0x42, - 0x4e, 0x70, 0x3c, 0xf3, 0xd6, 0x74, 0x3c, 0xda, 0x06, 0x0c, 0x14, 0xe6, 0x7f, 0xef, 0xc0, 0xda, - 0x63, 0x91, 0x9c, 0x67, 0xb1, 0xf3, 0x28, 0x8b, 0x55, 0x66, 0xc5, 0x54, 0x48, 0xce, 0x6c, 0xc1, - 0x2e, 0x25, 0xd5, 0x9d, 0x55, 0x97, 0xa6, 0x2c, 0x33, 0x99, 0x6a, 0x45, 0x95, 0xa8, 0x34, 0xc5, - 0x63, 0x12, 0x4a, 0x3c, 0xd6, 0x89, 0xda, 0x0c, 0x5c, 0x0d, 0xdc, 0xc5, 0x63, 0x74, 0x19, 0x1a, - 0x4c, 0x84, 0x5a, 0xcb, 0x4a, 0xc9, 0xc7, 0xc4, 0x40, 0xdd, 0x96, 0x9f, 0x1c, 0xa8, 0xf4, 0xfa, - 0x8a, 0x16, 0xc7, 0x31, 0x27, 0x42, 0x18, 0x2b, 0xac, 0xa8, 0x66, 0x32, 0x22, 0x53, 0x2c, 0x8e, - 0x8c, 0x25, 0x56, 0x5c, 0x7c, 0x28, 0x54, 0x4f, 0x3e, 0x14, 0x2e, 0x41, 0x7d, 0x84, 0x53, 0x9a, - 0xcc, 0xcc, 0x1b, 0xc5, 0x48, 0x0a, 0xcf, 0x8b, 0x61, 0x42, 0x23, 0x7b, 0x5d, 0x4a, 0x09, 0xbd, - 0x0c, 0x90, 0xe2, 0x0c, 0x8f, 0x49, 0x4a, 0x32, 0xa9, 0xaf, 0x8d, 0x1b, 0x2c, 0x20, 0xfe, 0x3d, - 0x68, 0x98, 0x40, 0xa8, 0x0b, 0x1c, 0x53, 0x71, 0xa4, 0xcc, 0x54, 0xce, 0x2f, 0x05, 0xe5, 0x41, - 0x8e, 0xa9, 0x6a, 0x6e, 0x3a, 0x27, 0xd4, 0x18, 0xad, 0x43, 0x6b, 0x44, 0x13, 0x22, 0xb4, 0x8f, - 0x55, 0x8f, 0xd3, 0x2f, 0x9d, 0x05, 0xc8, 0xff, 0xd5, 0x81, 0x7a, 0x59, 0xd4, 0xd0, 0x57, 0xb0, - 0x96, 0x73, 0xa2, 0x2b, 0x67, 0x92, 0x90, 0x38, 0x64, 0xc2, 0xb4, 0xbd, 0x7f, 0xeb, 0xf6, 0x76, - 0x16, 0xd5, 0x1d, 0x0a, 0xf4, 0x86, 0x32, 0x80, 0x1e, 0x63, 0x49, 0x42, 0x51, 0x0c, 0x33, 0xa2, - 0x7b, 0xbd, 0xb2, 0xb8, 0x63, 0xe0, 0x41, 0x89, 0xfa, 0x0f, 0xc1, 0xb5, 0x85, 0x52, 0x85, 0x3c, - 0x4f, 0x70, 0x16, 0x2e, 0x64, 0x8f, 0xab, 0x00, 0x15, 0x59, 0x74, 0x15, 0x2e, 0xe8, 0x49, 0x93, - 0x1f, 0xe1, 0x42, 0xa1, 0x5c, 0x53, 0x13, 0xf7, 0x4b, 0x5c, 0xaf, 0xbd, 0x02, 0xab, 0xb6, 0xe6, - 0x86, 0x91, 0xea, 0x90, 0x65, 0x40, 0xdb, 0x16, 0xdc, 0x65, 0x31, 0xd9, 0x78, 0x05, 0x56, 0xf7, - 0x48, 0x42, 0x24, 0xb1, 0xdf, 0x8f, 0x0e, 0x54, 0x7a, 0x7b, 0xb6, 0xb8, 0xf6, 0xf6, 0xb6, 0xff, - 0x6a, 0xc0, 0x9a, 0x75, 0x81, 0x7a, 0x4d, 0xd2, 0x88, 0xa0, 0xef, 0x1c, 0xa8, 0xa9, 0x3f, 0x11, - 0x7a, 0xfb, 0x34, 0x8e, 0x5c, 0xf8, 0x45, 0xf9, 0xd7, 0x4f, 0xb3, 0xb1, 0xfc, 0x25, 0x5d, 0xfe, - 0xfa, 0xf7, 0x3f, 0x7e, 0xa8, 0x5c, 0xd8, 0x68, 0x6f, 0x1d, 0x5f, 0x9f, 0xff, 0xf6, 0xde, 0x75, - 0xae, 0xa2, 0x02, 0x56, 0x76, 0x66, 0xfb, 0x37, 0x77, 0xd1, 0x5b, 0xa7, 0x21, 0x7d, 0xf4, 0xe3, - 0xf2, 0x97, 0xfa, 0xc4, 0x21, 0x09, 0xb5, 0x9d, 0x59, 0xaf, 0xff, 0x9f, 0x68, 0xdd, 0x7b, 0xc6, - 0x5a, 0xbf, 0x71, 0xa0, 0x7a, 0x33, 0x49, 0xd0, 0xe9, 0xc3, 0xb6, 0x9c, 0xc2, 0x8d, 0x8b, 0x3a, - 0xd8, 0x1d, 0x74, 0x22, 0xd8, 0xd7, 0x1c, 0x94, 0x41, 0xbd, 0x97, 0x8d, 0x55, 0x9e, 0x2e, 0x61, - 0xca, 0xe9, 0xb7, 0xa0, 0x29, 0xac, 0x3c, 0xc0, 0x32, 0x9a, 0x3c, 0x5b, 0x7f, 0x5f, 0x73, 0xd0, - 0x31, 0xd4, 0xcb, 0x7b, 0x89, 0x4e, 0xf5, 0x46, 0x3f, 0x71, 0x97, 0x97, 0x38, 0xf0, 0x0e, 0x7c, - 0xe6, 0x5a, 0x64, 0x58, 0xd7, 0x4b, 0xde, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x73, 0x98, 0xd6, - 0xbf, 0x65, 0x11, 0x00, 0x00, + // 1401 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x8f, 0x1b, 0xb5, + 0x17, 0xd7, 0x24, 0xd9, 0x64, 0xf2, 0x92, 0xcd, 0x7e, 0xeb, 0x6f, 0x69, 0x87, 0xe1, 0xd7, 0xb2, + 0x15, 0xb0, 0xea, 0x21, 0xdb, 0x86, 0x0a, 0x04, 0x02, 0xa4, 0xee, 0x6e, 0x4b, 0x03, 0xda, 0xdd, + 0x68, 0xd2, 0x1f, 0xfc, 0x92, 0x46, 0xce, 0x8c, 0x93, 0x58, 0x3b, 0x33, 0x1e, 0x6c, 0xcf, 0xa6, + 0x39, 0x21, 0x71, 0xe0, 0x00, 0xe2, 0xc4, 0x89, 0x2b, 0x17, 0xae, 0x88, 0x1b, 0x7f, 0x07, 0xff, + 0x02, 0xe2, 0xaf, 0xe0, 0x80, 0xec, 0xb1, 0xd3, 0x6c, 0x2b, 0xa1, 0xee, 0x0f, 0xca, 0xcd, 0xef, + 0x63, 0xfb, 0xf3, 0x9e, 0xdf, 0x7b, 0x7e, 0xcf, 0x86, 0xcb, 0x53, 0xcc, 0xe3, 0x19, 0xe6, 0x64, + 0xcb, 0x0e, 0xba, 0x39, 0x67, 0x92, 0xa1, 0xab, 0x13, 0x2a, 0xa7, 0xc5, 0xa8, 0x1b, 0xb1, 0xb4, + 0x2b, 0x69, 0x76, 0x48, 0xf8, 0x88, 0x24, 0x89, 0x1e, 0x96, 0x2b, 0x44, 0xd7, 0xee, 0xf0, 0x5f, + 0x9c, 0x30, 0x36, 0x49, 0xc8, 0x16, 0xce, 0xe9, 0x16, 0xce, 0x32, 0x26, 0xb1, 0xa4, 0x2c, 0x13, + 0xe5, 0xba, 0x8d, 0x07, 0xd0, 0x1a, 0x14, 0x62, 0x1a, 0x90, 0x2f, 0x0b, 0x22, 0x24, 0xba, 0x03, + 0xb5, 0x18, 0x4b, 0xec, 0x39, 0xeb, 0xce, 0x66, 0xab, 0x77, 0xa3, 0xfb, 0xf4, 0x7a, 0xba, 0x77, + 0xcc, 0x20, 0xd0, 0x0c, 0x1b, 0x0d, 0x58, 0xb9, 0x95, 0xe6, 0x72, 0xbe, 0xf1, 0x01, 0xc0, 0x87, + 0x44, 0x5a, 0x05, 0xff, 0x83, 0x6a, 0x8a, 0x23, 0xcd, 0xdf, 0x0c, 0xd4, 0x10, 0x75, 0xa0, 0x42, + 0x73, 0xaf, 0xa2, 0x81, 0x0a, 0xcd, 0xb5, 0x1c, 0x7b, 0x55, 0x23, 0xc7, 0x1b, 0xbf, 0x79, 0xe0, + 0x5a, 0x6e, 0x33, 0xe9, 0xd8, 0x49, 0xb4, 0x07, 0xb5, 0x78, 0x1a, 0x95, 0xdb, 0x5b, 0xbd, 0x77, + 0x4e, 0x63, 0x6f, 0x77, 0xf7, 0xce, 0xce, 0x20, 0xd0, 0x34, 0xe8, 0x3e, 0x34, 0x32, 0x22, 0x47, + 0x8c, 0x49, 0x6d, 0x40, 0xab, 0xf7, 0xde, 0xa9, 0x18, 0xf7, 0x4b, 0x8e, 0xc0, 0x92, 0x19, 0xde, + 0x19, 0xe3, 0x87, 0x5e, 0x6d, 0xbd, 0x7a, 0x16, 0x5e, 0xc5, 0x11, 0x58, 0x32, 0xf4, 0x29, 0xb8, + 0x29, 0x91, 0x58, 0x87, 0x6c, 0x45, 0x1b, 0xfc, 0xfe, 0xa9, 0x88, 0xf7, 0x0c, 0x49, 0xb0, 0xa0, + 0xf3, 0xbf, 0xad, 0x40, 0x4d, 0x79, 0xe6, 0x29, 0x22, 0xe6, 0x83, 0x3b, 0x65, 0x42, 0x66, 0x38, + 0x25, 0x26, 0x6e, 0x0b, 0x19, 0xbd, 0x04, 0x90, 0x10, 0x2c, 0x48, 0x28, 0x69, 0x4a, 0xbc, 0xda, + 0xba, 0xb3, 0x59, 0x0d, 0x9a, 0x1a, 0xb9, 0x4b, 0x53, 0x82, 0x5e, 0x85, 0xb6, 0x5a, 0x16, 0x0a, + 0xc2, 0x8f, 0x08, 0x17, 0xde, 0xca, 0x7a, 0x75, 0xb3, 0x19, 0xb4, 0x14, 0x36, 0x2c, 0x21, 0xb5, + 0x44, 0xed, 0x5d, 0x2c, 0xa9, 0x97, 0x4b, 0x14, 0x66, 0x97, 0x78, 0xd0, 0x98, 0x60, 0x49, 0x66, + 0x78, 0xee, 0x35, 0xb4, 0x7e, 0x2b, 0x22, 0x04, 0x35, 0xcc, 0xa3, 0xa9, 0xe7, 0x6a, 0x58, 0x8f, + 0x15, 0x56, 0x90, 0x31, 0xf5, 0x9a, 0xeb, 0xce, 0xa6, 0x1b, 0xe8, 0xb1, 0x32, 0x93, 0x8e, 0x71, + 0x44, 0x42, 0x7d, 0x08, 0xd0, 0xab, 0x9b, 0x1a, 0xd9, 0xc7, 0x29, 0xf1, 0x7f, 0xac, 0x42, 0xc3, + 0x04, 0x15, 0xbd, 0x00, 0x4d, 0x9c, 0x24, 0x6c, 0x16, 0xe6, 0x0f, 0x89, 0xf6, 0x8a, 0x1b, 0xb8, + 0x1a, 0x18, 0x3c, 0x24, 0xe8, 0x35, 0xe8, 0x94, 0x93, 0x2a, 0x3c, 0xe3, 0x84, 0xcd, 0xb4, 0x9b, + 0xdc, 0x60, 0x55, 0xa3, 0x0f, 0x0c, 0x88, 0xee, 0x41, 0x8d, 0xaa, 0xed, 0x65, 0x92, 0xdd, 0x3c, + 0x4b, 0x92, 0x75, 0xfb, 0x83, 0x4f, 0x6e, 0x05, 0x9a, 0x0e, 0xa5, 0xd0, 0x56, 0x90, 0x90, 0x1c, + 0xe7, 0x39, 0xe1, 0xda, 0xdd, 0xad, 0x5e, 0xff, 0x4c, 0xf4, 0xdb, 0x4b, 0x84, 0xc1, 0x31, 0x7a, + 0xff, 0x06, 0xd4, 0x94, 0x72, 0x95, 0x21, 0x05, 0x4f, 0x6c, 0x86, 0x14, 0x3c, 0x51, 0x19, 0x11, + 0xb1, 0x4c, 0x92, 0x4c, 0x0a, 0x93, 0x27, 0x0b, 0xd9, 0xdf, 0x87, 0xf6, 0x32, 0x27, 0xba, 0x04, + 0xf5, 0x43, 0xc2, 0x33, 0x62, 0x09, 0x8c, 0xa4, 0x70, 0x9a, 0x51, 0xc9, 0x63, 0xc3, 0x60, 0x24, + 0x95, 0x7d, 0x4c, 0xd8, 0xfa, 0xc0, 0x84, 0xff, 0x8b, 0xa3, 0x63, 0xa3, 0xef, 0x83, 0x2d, 0x07, + 0xce, 0xb9, 0x97, 0x83, 0xca, 0x39, 0x96, 0x03, 0xff, 0xcf, 0x0e, 0xb8, 0xf6, 0xca, 0xa1, 0x8b, + 0xb0, 0x22, 0x24, 0x96, 0xc4, 0x1c, 0xbf, 0x14, 0x54, 0xd6, 0x8f, 0x58, 0x16, 0xd3, 0x6c, 0x12, + 0xa6, 0x2c, 0x26, 0x5a, 0x7f, 0x35, 0x68, 0x19, 0x6c, 0x8f, 0xc5, 0x04, 0x65, 0xd0, 0x4e, 0x71, + 0x56, 0x8c, 0x71, 0x24, 0x0b, 0x4e, 0xb8, 0x49, 0xa6, 0x8f, 0xce, 0x54, 0x00, 0xba, 0x7b, 0x4b, + 0x8c, 0xc1, 0x31, 0x7e, 0x34, 0x02, 0x97, 0x66, 0x42, 0xe2, 0x2c, 0x22, 0x26, 0xb3, 0x6e, 0x9f, + 0x4d, 0x57, 0xdf, 0xb0, 0x05, 0x0b, 0x5e, 0xf4, 0x05, 0xd4, 0xa3, 0x42, 0x48, 0x96, 0x9a, 0x72, + 0xb6, 0x7b, 0x36, 0x0d, 0x3b, 0x9a, 0x2b, 0x30, 0x9c, 0xea, 0x04, 0x63, 0x1c, 0xd1, 0x84, 0xca, + 0xb9, 0x57, 0x3f, 0x8f, 0x13, 0xdc, 0x36, 0x6c, 0xc1, 0x82, 0xd7, 0xef, 0x41, 0x7b, 0xd9, 0x87, + 0x4f, 0x74, 0x2c, 0x04, 0x35, 0x91, 0x14, 0x13, 0x93, 0xd4, 0x7a, 0xec, 0xff, 0xec, 0x82, 0x6b, + 0x9d, 0xf1, 0xc4, 0x86, 0x45, 0x7e, 0x54, 0x96, 0xf3, 0xe3, 0x9f, 0x6a, 0xee, 0xb1, 0x0a, 0x55, + 0x7b, 0xac, 0x42, 0x5d, 0x82, 0x3a, 0x27, 0x22, 0x2a, 0x88, 0xf6, 0xb0, 0x1b, 0x18, 0x09, 0x8d, + 0xa1, 0x72, 0x30, 0x34, 0x5e, 0xb9, 0x7f, 0x3e, 0x71, 0xed, 0x1e, 0xe4, 0x84, 0x63, 0x49, 0xb3, + 0xc9, 0x70, 0x2e, 0x24, 0x49, 0x83, 0xca, 0xc1, 0x50, 0x55, 0x5a, 0x9c, 0xcc, 0xf0, 0x5c, 0x68, + 0xeb, 0x1a, 0xda, 0x86, 0x66, 0x89, 0x28, 0xf3, 0x5e, 0x87, 0x35, 0x55, 0xca, 0x42, 0x11, 0x71, + 0x9a, 0xcb, 0x50, 0xd5, 0x95, 0xb2, 0x76, 0xaf, 0x2a, 0x78, 0xa8, 0xd1, 0x7b, 0x3c, 0x41, 0x9f, + 0x43, 0x95, 0xe6, 0xc2, 0x6b, 0xea, 0x6e, 0xda, 0x3f, 0x27, 0x7b, 0xfb, 0x83, 0x40, 0xb1, 0x2a, + 0xe7, 0x16, 0x82, 0x70, 0xdd, 0x56, 0xcb, 0x5e, 0xb0, 0x90, 0x51, 0x0f, 0x9e, 0x8b, 0xf8, 0x3c, + 0x97, 0x24, 0x0e, 0x39, 0x63, 0x32, 0xcc, 0xb1, 0x10, 0x33, 0xc6, 0x63, 0xaf, 0xa5, 0x17, 0xfe, + 0xdf, 0x4c, 0x06, 0x8c, 0xc9, 0x81, 0x99, 0x52, 0x31, 0x97, 0x78, 0x22, 0xbc, 0xb6, 0x6e, 0x5d, + 0x7a, 0x8c, 0xa6, 0xd0, 0x10, 0x92, 0x71, 0x3c, 0x21, 0xde, 0xaa, 0x76, 0xfa, 0xfe, 0x39, 0x1d, + 0x62, 0x58, 0xb2, 0x06, 0x96, 0x1e, 0x3d, 0x0f, 0xae, 0x10, 0xd3, 0xf0, 0x90, 0xcc, 0x85, 0xd7, + 0xd1, 0x16, 0x34, 0x84, 0x98, 0x7e, 0x4c, 0xe6, 0x02, 0x5d, 0x81, 0x55, 0xf3, 0x94, 0x08, 0x39, + 0xc1, 0xf1, 0xdc, 0x5b, 0xd3, 0xf1, 0x68, 0x1b, 0x30, 0x50, 0x98, 0xff, 0xbd, 0x03, 0x6b, 0x8f, + 0x45, 0x72, 0x91, 0xc5, 0xce, 0xa3, 0x2c, 0x56, 0x99, 0x15, 0x53, 0x21, 0x39, 0xb3, 0x05, 0xbb, + 0x94, 0x54, 0x77, 0x56, 0x5d, 0x9a, 0xb2, 0xcc, 0x64, 0xaa, 0x15, 0x55, 0xa2, 0xd2, 0x14, 0x4f, + 0x48, 0x28, 0xf1, 0x44, 0x27, 0x6a, 0x33, 0x70, 0x35, 0x70, 0x17, 0x4f, 0xd0, 0x65, 0x68, 0x30, + 0x11, 0x6a, 0x2d, 0x2b, 0x25, 0x1f, 0x13, 0x43, 0x75, 0x5b, 0x7e, 0x72, 0xa0, 0xd2, 0x1f, 0x28, + 0x5a, 0x1c, 0xc7, 0x9c, 0x08, 0x61, 0xac, 0xb0, 0xa2, 0x9a, 0xc9, 0x88, 0x4c, 0xb1, 0x38, 0x34, + 0x96, 0x58, 0x71, 0xf9, 0xa1, 0x50, 0x3d, 0xfe, 0x50, 0xb8, 0x04, 0xf5, 0x31, 0x4e, 0x69, 0x32, + 0x37, 0x6f, 0x14, 0x23, 0x29, 0x3c, 0x2f, 0x46, 0x09, 0x8d, 0xec, 0x75, 0x29, 0x25, 0xf4, 0x32, + 0x40, 0x8a, 0x33, 0x3c, 0x21, 0x29, 0xc9, 0xa4, 0xbe, 0x36, 0x6e, 0xb0, 0x84, 0xf8, 0xf7, 0xa0, + 0x61, 0x02, 0xa1, 0x2e, 0x70, 0x4c, 0xc5, 0xa1, 0x32, 0x53, 0x39, 0xbf, 0x14, 0x94, 0x07, 0x39, + 0xa6, 0xaa, 0xb9, 0xe9, 0x9c, 0x50, 0x63, 0xb4, 0x0e, 0xad, 0x31, 0x4d, 0x88, 0xd0, 0x3e, 0x56, + 0x3d, 0x4e, 0xbf, 0x74, 0x96, 0x20, 0xff, 0x57, 0x07, 0xea, 0x65, 0x51, 0x43, 0x5f, 0xc1, 0x5a, + 0xce, 0x89, 0xae, 0x9c, 0x49, 0x42, 0xe2, 0x90, 0x09, 0xd3, 0xf6, 0xfe, 0xad, 0xdb, 0xdb, 0x59, + 0x56, 0x77, 0x20, 0xd0, 0x1b, 0xca, 0x00, 0x7a, 0x84, 0x25, 0x09, 0x45, 0x31, 0xca, 0x88, 0xee, + 0xf5, 0xca, 0xe2, 0x8e, 0x81, 0x87, 0x25, 0xea, 0x3f, 0x04, 0xd7, 0x16, 0x4a, 0x15, 0xf2, 0x3c, + 0xc1, 0x59, 0xb8, 0x94, 0x3d, 0xae, 0x02, 0x54, 0x64, 0xd1, 0x55, 0xb8, 0xa0, 0x27, 0x4d, 0x7e, + 0x84, 0x4b, 0x85, 0x72, 0x4d, 0x4d, 0xdc, 0x2f, 0x71, 0xbd, 0xf6, 0x0a, 0xac, 0xda, 0x9a, 0x1b, + 0x46, 0xaa, 0x43, 0x96, 0x01, 0x6d, 0x5b, 0x70, 0x87, 0xc5, 0x64, 0xe3, 0x15, 0x58, 0xdd, 0x25, + 0x09, 0x91, 0xc4, 0x7e, 0x3f, 0x3a, 0x50, 0xe9, 0xef, 0xda, 0xe2, 0xda, 0xdf, 0xed, 0xfd, 0x55, + 0x87, 0x35, 0xeb, 0x02, 0xf5, 0x9a, 0xa4, 0x11, 0x41, 0xdf, 0x39, 0x50, 0x53, 0x7f, 0x22, 0xf4, + 0xf6, 0x49, 0x1c, 0xb9, 0xf4, 0x8b, 0xf2, 0xaf, 0x9f, 0x64, 0x63, 0xf9, 0x4b, 0xba, 0xfc, 0xf5, + 0xef, 0x7f, 0xfc, 0x50, 0xb9, 0xb0, 0xd1, 0xde, 0x3a, 0xba, 0xbe, 0xf8, 0xed, 0xbd, 0xeb, 0x5c, + 0x45, 0x05, 0xac, 0x6c, 0xcf, 0xf7, 0x6e, 0xee, 0xa0, 0xb7, 0x4e, 0x42, 0xfa, 0xe8, 0xc7, 0xe5, + 0x9f, 0xea, 0x13, 0x87, 0x24, 0xd4, 0xb6, 0xe7, 0xfd, 0xc1, 0x7f, 0xa2, 0x75, 0xf7, 0x19, 0x6b, + 0xfd, 0xc6, 0x81, 0xea, 0xcd, 0x24, 0x41, 0x27, 0x0f, 0xdb, 0xe9, 0x14, 0x6e, 0x5c, 0xd4, 0xc1, + 0xee, 0xa0, 0x63, 0xc1, 0xbe, 0xe6, 0xa0, 0x19, 0xac, 0x3c, 0xc0, 0x32, 0x9a, 0x3e, 0xdb, 0xf3, + 0x5f, 0x73, 0xd0, 0x11, 0xd4, 0xcb, 0x7b, 0x82, 0x4e, 0xf4, 0x66, 0x3e, 0x76, 0xb7, 0x4e, 0x91, + 0xf5, 0xdb, 0xf0, 0x99, 0x6b, 0x91, 0x51, 0x5d, 0x2f, 0x79, 0xf3, 0xef, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x89, 0x02, 0x16, 0x45, 0xf5, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1306,7 +1305,6 @@ type HardwareServiceClient interface { ByIP(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) ByID(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*Hardware, error) All(ctx context.Context, in *Empty, opts ...grpc.CallOption) (HardwareService_AllClient, error) - Ingest(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) Watch(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (HardwareService_WatchClient, error) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*Empty, error) } @@ -1387,15 +1385,6 @@ func (x *hardwareServiceAllClient) Recv() (*Hardware, error) { return m, nil } -func (c *hardwareServiceClient) Ingest(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) { - out := new(Empty) - err := c.cc.Invoke(ctx, "/github.aaakk.us.kg.tinkerbell.tink.protos.hardware.HardwareService/Ingest", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *hardwareServiceClient) Watch(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (HardwareService_WatchClient, error) { stream, err := c.cc.NewStream(ctx, &_HardwareService_serviceDesc.Streams[1], "/github.aaakk.us.kg.tinkerbell.tink.protos.hardware.HardwareService/Watch", opts...) if err != nil { @@ -1444,7 +1433,6 @@ type HardwareServiceServer interface { ByIP(context.Context, *GetRequest) (*Hardware, error) ByID(context.Context, *GetRequest) (*Hardware, error) All(*Empty, HardwareService_AllServer) error - Ingest(context.Context, *Empty) (*Empty, error) Watch(*GetRequest, HardwareService_WatchServer) error Delete(context.Context, *DeleteRequest) (*Empty, error) } @@ -1468,9 +1456,6 @@ func (*UnimplementedHardwareServiceServer) ByID(ctx context.Context, req *GetReq func (*UnimplementedHardwareServiceServer) All(req *Empty, srv HardwareService_AllServer) error { return status.Errorf(codes.Unimplemented, "method All not implemented") } -func (*UnimplementedHardwareServiceServer) Ingest(ctx context.Context, req *Empty) (*Empty, error) { - return nil, status.Errorf(codes.Unimplemented, "method Ingest not implemented") -} func (*UnimplementedHardwareServiceServer) Watch(req *GetRequest, srv HardwareService_WatchServer) error { return status.Errorf(codes.Unimplemented, "method Watch not implemented") } @@ -1575,24 +1560,6 @@ func (x *hardwareServiceAllServer) Send(m *Hardware) error { return x.ServerStream.SendMsg(m) } -func _HardwareService_Ingest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(Empty) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(HardwareServiceServer).Ingest(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/github.aaakk.us.kg.tinkerbell.tink.protos.hardware.HardwareService/Ingest", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(HardwareServiceServer).Ingest(ctx, req.(*Empty)) - } - return interceptor(ctx, in, info, handler) -} - func _HardwareService_Watch_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(GetRequest) if err := stream.RecvMsg(m); err != nil { @@ -1652,10 +1619,6 @@ var _HardwareService_serviceDesc = grpc.ServiceDesc{ MethodName: "ByID", Handler: _HardwareService_ByID_Handler, }, - { - MethodName: "Ingest", - Handler: _HardwareService_Ingest_Handler, - }, { MethodName: "Delete", Handler: _HardwareService_Delete_Handler, diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index cf4f3e491..2ad9caedd 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -21,7 +21,6 @@ service HardwareService { get: "/v1/hardware" }; }; - rpc Ingest(Empty) returns (Empty); rpc Watch(GetRequest) returns (stream Hardware); rpc Delete(DeleteRequest) returns (Empty); } From 6fa5a8ff29a7ab4ee73244abfb0863b2635c6c8f Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 7 May 2020 13:55:22 -0400 Subject: [PATCH 08/31] updated netboot struct --- db/hardware.go | 16 +-- db/workflow.go | 10 +- protos/hardware/hardware.pb.go | 249 +++++++++++++++++---------------- protos/hardware/hardware.proto | 11 +- 4 files changed, 140 insertions(+), 146 deletions(-) diff --git a/db/hardware.go b/db/hardware.go index a0e8f84f5..f2847af61 100644 --- a/db/hardware.go +++ b/db/hardware.go @@ -66,13 +66,9 @@ func InsertIntoDB(ctx context.Context, db *sql.DB, data string) error { func GetByMAC(ctx context.Context, db *sql.DB, mac string) (string, error) { arg := ` { - "network_ports": [ - { - "data": { + "dhcp": { "mac": "` + mac + `" - } - } - ] + } } ` query := ` @@ -102,11 +98,9 @@ func GetByIP(ctx context.Context, db *sql.DB, ip string) (string, error) { ` hardwareOrManagement := ` { - "ip_addresses": [ - { - "address": "` + ip + `" - } - ] + "dhcp": { + "ip": "` + ip + `" + } } ` diff --git a/db/workflow.go b/db/workflow.go index 2a81c84c2..7e0dbded8 100644 --- a/db/workflow.go +++ b/db/workflow.go @@ -759,12 +759,10 @@ func getWorkerIDbyIP(ctx context.Context, db *sql.DB, ip string) (string, error) ` hardwareOrManagement := ` { - "ip_addresses": [ - { - "address": "` + ip + `" - } - ] - } + "dhcp": { + "ip": "` + ip + `" + } + } ` query := ` diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index fdc466dc0..3e40e6a5c 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -333,13 +333,14 @@ func (m *Hardware_DHCP) GetIfaceName() string { } type Hardware_Netboot struct { - AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` - AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` - Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` - Bootstrapper *Hardware_Netboot_Bootstrapper `protobuf:"bytes,4,opt,name=bootstrapper,proto3" json:"bootstrapper,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` + AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` + Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` + // Bootstrapper bootstrapper = 4; + Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware_Netboot) Reset() { *m = Hardware_Netboot{} } @@ -388,9 +389,9 @@ func (m *Hardware_Netboot) GetIpxe() *Hardware_Netboot_IPXE { return nil } -func (m *Hardware_Netboot) GetBootstrapper() *Hardware_Netboot_Bootstrapper { +func (m *Hardware_Netboot) GetOsie() *Hardware_Netboot_Osie { if m != nil { - return m.Bootstrapper + return m.Osie } return nil } @@ -442,57 +443,57 @@ func (m *Hardware_Netboot_IPXE) GetContents() string { return "" } -type Hardware_Netboot_Bootstrapper struct { - Kernel string `protobuf:"bytes,1,opt,name=kernel,proto3" json:"kernel,omitempty"` - Initrd string `protobuf:"bytes,2,opt,name=initrd,proto3" json:"initrd,omitempty"` - Os string `protobuf:"bytes,3,opt,name=os,proto3" json:"os,omitempty"` +type Hardware_Netboot_Osie struct { + BaseUrl string `protobuf:"bytes,1,opt,name=base_url,json=baseUrl,proto3" json:"base_url,omitempty"` + Kernel string `protobuf:"bytes,2,opt,name=kernel,proto3" json:"kernel,omitempty"` + Initrd string `protobuf:"bytes,3,opt,name=initrd,proto3" json:"initrd,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *Hardware_Netboot_Bootstrapper) Reset() { *m = Hardware_Netboot_Bootstrapper{} } -func (m *Hardware_Netboot_Bootstrapper) String() string { return proto.CompactTextString(m) } -func (*Hardware_Netboot_Bootstrapper) ProtoMessage() {} -func (*Hardware_Netboot_Bootstrapper) Descriptor() ([]byte, []int) { +func (m *Hardware_Netboot_Osie) Reset() { *m = Hardware_Netboot_Osie{} } +func (m *Hardware_Netboot_Osie) String() string { return proto.CompactTextString(m) } +func (*Hardware_Netboot_Osie) ProtoMessage() {} +func (*Hardware_Netboot_Osie) Descriptor() ([]byte, []int) { return fileDescriptor_61ac56d7fc2e671f, []int{3, 1, 1} } -func (m *Hardware_Netboot_Bootstrapper) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Unmarshal(m, b) +func (m *Hardware_Netboot_Osie) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Netboot_Osie.Unmarshal(m, b) } -func (m *Hardware_Netboot_Bootstrapper) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Marshal(b, m, deterministic) +func (m *Hardware_Netboot_Osie) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Netboot_Osie.Marshal(b, m, deterministic) } -func (m *Hardware_Netboot_Bootstrapper) XXX_Merge(src proto.Message) { - xxx_messageInfo_Hardware_Netboot_Bootstrapper.Merge(m, src) +func (m *Hardware_Netboot_Osie) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Netboot_Osie.Merge(m, src) } -func (m *Hardware_Netboot_Bootstrapper) XXX_Size() int { - return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Size(m) +func (m *Hardware_Netboot_Osie) XXX_Size() int { + return xxx_messageInfo_Hardware_Netboot_Osie.Size(m) } -func (m *Hardware_Netboot_Bootstrapper) XXX_DiscardUnknown() { - xxx_messageInfo_Hardware_Netboot_Bootstrapper.DiscardUnknown(m) +func (m *Hardware_Netboot_Osie) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Netboot_Osie.DiscardUnknown(m) } -var xxx_messageInfo_Hardware_Netboot_Bootstrapper proto.InternalMessageInfo +var xxx_messageInfo_Hardware_Netboot_Osie proto.InternalMessageInfo -func (m *Hardware_Netboot_Bootstrapper) GetKernel() string { +func (m *Hardware_Netboot_Osie) GetBaseUrl() string { if m != nil { - return m.Kernel + return m.BaseUrl } return "" } -func (m *Hardware_Netboot_Bootstrapper) GetInitrd() string { +func (m *Hardware_Netboot_Osie) GetKernel() string { if m != nil { - return m.Initrd + return m.Kernel } return "" } -func (m *Hardware_Netboot_Bootstrapper) GetOs() string { +func (m *Hardware_Netboot_Osie) GetInitrd() string { if m != nil { - return m.Os + return m.Initrd } return "" } @@ -1179,7 +1180,7 @@ func init() { proto.RegisterType((*Hardware_DHCP)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.DHCP") proto.RegisterType((*Hardware_Netboot)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot") proto.RegisterType((*Hardware_Netboot_IPXE)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.IPXE") - proto.RegisterType((*Hardware_Netboot_Bootstrapper)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Bootstrapper") + proto.RegisterType((*Hardware_Netboot_Osie)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Osie") proto.RegisterType((*Hardware_Network)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Network") proto.RegisterType((*Hardware_Metadata)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata") proto.RegisterType((*Hardware_Metadata_Manufacturer)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Manufacturer") @@ -1197,95 +1198,95 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1401 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x8f, 0x1b, 0xb5, - 0x17, 0xd7, 0x24, 0xd9, 0x64, 0xf2, 0x92, 0xcd, 0x7e, 0xeb, 0x6f, 0x69, 0x87, 0xe1, 0xd7, 0xb2, - 0x15, 0xb0, 0xea, 0x21, 0xdb, 0x86, 0x0a, 0x04, 0x02, 0xa4, 0xee, 0x6e, 0x4b, 0x03, 0xda, 0xdd, - 0x68, 0xd2, 0x1f, 0xfc, 0x92, 0x46, 0xce, 0x8c, 0x93, 0x58, 0x3b, 0x33, 0x1e, 0x6c, 0xcf, 0xa6, - 0x39, 0x21, 0x71, 0xe0, 0x00, 0xe2, 0xc4, 0x89, 0x2b, 0x17, 0xae, 0x88, 0x1b, 0x7f, 0x07, 0xff, - 0x02, 0xe2, 0xaf, 0xe0, 0x80, 0xec, 0xb1, 0xd3, 0x6c, 0x2b, 0xa1, 0xee, 0x0f, 0xca, 0xcd, 0xef, - 0x63, 0xfb, 0xf3, 0x9e, 0xdf, 0x7b, 0x7e, 0xcf, 0x86, 0xcb, 0x53, 0xcc, 0xe3, 0x19, 0xe6, 0x64, - 0xcb, 0x0e, 0xba, 0x39, 0x67, 0x92, 0xa1, 0xab, 0x13, 0x2a, 0xa7, 0xc5, 0xa8, 0x1b, 0xb1, 0xb4, - 0x2b, 0x69, 0x76, 0x48, 0xf8, 0x88, 0x24, 0x89, 0x1e, 0x96, 0x2b, 0x44, 0xd7, 0xee, 0xf0, 0x5f, - 0x9c, 0x30, 0x36, 0x49, 0xc8, 0x16, 0xce, 0xe9, 0x16, 0xce, 0x32, 0x26, 0xb1, 0xa4, 0x2c, 0x13, - 0xe5, 0xba, 0x8d, 0x07, 0xd0, 0x1a, 0x14, 0x62, 0x1a, 0x90, 0x2f, 0x0b, 0x22, 0x24, 0xba, 0x03, - 0xb5, 0x18, 0x4b, 0xec, 0x39, 0xeb, 0xce, 0x66, 0xab, 0x77, 0xa3, 0xfb, 0xf4, 0x7a, 0xba, 0x77, - 0xcc, 0x20, 0xd0, 0x0c, 0x1b, 0x0d, 0x58, 0xb9, 0x95, 0xe6, 0x72, 0xbe, 0xf1, 0x01, 0xc0, 0x87, - 0x44, 0x5a, 0x05, 0xff, 0x83, 0x6a, 0x8a, 0x23, 0xcd, 0xdf, 0x0c, 0xd4, 0x10, 0x75, 0xa0, 0x42, - 0x73, 0xaf, 0xa2, 0x81, 0x0a, 0xcd, 0xb5, 0x1c, 0x7b, 0x55, 0x23, 0xc7, 0x1b, 0xbf, 0x79, 0xe0, - 0x5a, 0x6e, 0x33, 0xe9, 0xd8, 0x49, 0xb4, 0x07, 0xb5, 0x78, 0x1a, 0x95, 0xdb, 0x5b, 0xbd, 0x77, - 0x4e, 0x63, 0x6f, 0x77, 0xf7, 0xce, 0xce, 0x20, 0xd0, 0x34, 0xe8, 0x3e, 0x34, 0x32, 0x22, 0x47, - 0x8c, 0x49, 0x6d, 0x40, 0xab, 0xf7, 0xde, 0xa9, 0x18, 0xf7, 0x4b, 0x8e, 0xc0, 0x92, 0x19, 0xde, - 0x19, 0xe3, 0x87, 0x5e, 0x6d, 0xbd, 0x7a, 0x16, 0x5e, 0xc5, 0x11, 0x58, 0x32, 0xf4, 0x29, 0xb8, - 0x29, 0x91, 0x58, 0x87, 0x6c, 0x45, 0x1b, 0xfc, 0xfe, 0xa9, 0x88, 0xf7, 0x0c, 0x49, 0xb0, 0xa0, - 0xf3, 0xbf, 0xad, 0x40, 0x4d, 0x79, 0xe6, 0x29, 0x22, 0xe6, 0x83, 0x3b, 0x65, 0x42, 0x66, 0x38, - 0x25, 0x26, 0x6e, 0x0b, 0x19, 0xbd, 0x04, 0x90, 0x10, 0x2c, 0x48, 0x28, 0x69, 0x4a, 0xbc, 0xda, - 0xba, 0xb3, 0x59, 0x0d, 0x9a, 0x1a, 0xb9, 0x4b, 0x53, 0x82, 0x5e, 0x85, 0xb6, 0x5a, 0x16, 0x0a, - 0xc2, 0x8f, 0x08, 0x17, 0xde, 0xca, 0x7a, 0x75, 0xb3, 0x19, 0xb4, 0x14, 0x36, 0x2c, 0x21, 0xb5, - 0x44, 0xed, 0x5d, 0x2c, 0xa9, 0x97, 0x4b, 0x14, 0x66, 0x97, 0x78, 0xd0, 0x98, 0x60, 0x49, 0x66, - 0x78, 0xee, 0x35, 0xb4, 0x7e, 0x2b, 0x22, 0x04, 0x35, 0xcc, 0xa3, 0xa9, 0xe7, 0x6a, 0x58, 0x8f, - 0x15, 0x56, 0x90, 0x31, 0xf5, 0x9a, 0xeb, 0xce, 0xa6, 0x1b, 0xe8, 0xb1, 0x32, 0x93, 0x8e, 0x71, - 0x44, 0x42, 0x7d, 0x08, 0xd0, 0xab, 0x9b, 0x1a, 0xd9, 0xc7, 0x29, 0xf1, 0x7f, 0xac, 0x42, 0xc3, - 0x04, 0x15, 0xbd, 0x00, 0x4d, 0x9c, 0x24, 0x6c, 0x16, 0xe6, 0x0f, 0x89, 0xf6, 0x8a, 0x1b, 0xb8, - 0x1a, 0x18, 0x3c, 0x24, 0xe8, 0x35, 0xe8, 0x94, 0x93, 0x2a, 0x3c, 0xe3, 0x84, 0xcd, 0xb4, 0x9b, - 0xdc, 0x60, 0x55, 0xa3, 0x0f, 0x0c, 0x88, 0xee, 0x41, 0x8d, 0xaa, 0xed, 0x65, 0x92, 0xdd, 0x3c, - 0x4b, 0x92, 0x75, 0xfb, 0x83, 0x4f, 0x6e, 0x05, 0x9a, 0x0e, 0xa5, 0xd0, 0x56, 0x90, 0x90, 0x1c, - 0xe7, 0x39, 0xe1, 0xda, 0xdd, 0xad, 0x5e, 0xff, 0x4c, 0xf4, 0xdb, 0x4b, 0x84, 0xc1, 0x31, 0x7a, - 0xff, 0x06, 0xd4, 0x94, 0x72, 0x95, 0x21, 0x05, 0x4f, 0x6c, 0x86, 0x14, 0x3c, 0x51, 0x19, 0x11, - 0xb1, 0x4c, 0x92, 0x4c, 0x0a, 0x93, 0x27, 0x0b, 0xd9, 0xdf, 0x87, 0xf6, 0x32, 0x27, 0xba, 0x04, - 0xf5, 0x43, 0xc2, 0x33, 0x62, 0x09, 0x8c, 0xa4, 0x70, 0x9a, 0x51, 0xc9, 0x63, 0xc3, 0x60, 0x24, - 0x95, 0x7d, 0x4c, 0xd8, 0xfa, 0xc0, 0x84, 0xff, 0x8b, 0xa3, 0x63, 0xa3, 0xef, 0x83, 0x2d, 0x07, - 0xce, 0xb9, 0x97, 0x83, 0xca, 0x39, 0x96, 0x03, 0xff, 0xcf, 0x0e, 0xb8, 0xf6, 0xca, 0xa1, 0x8b, - 0xb0, 0x22, 0x24, 0x96, 0xc4, 0x1c, 0xbf, 0x14, 0x54, 0xd6, 0x8f, 0x58, 0x16, 0xd3, 0x6c, 0x12, - 0xa6, 0x2c, 0x26, 0x5a, 0x7f, 0x35, 0x68, 0x19, 0x6c, 0x8f, 0xc5, 0x04, 0x65, 0xd0, 0x4e, 0x71, - 0x56, 0x8c, 0x71, 0x24, 0x0b, 0x4e, 0xb8, 0x49, 0xa6, 0x8f, 0xce, 0x54, 0x00, 0xba, 0x7b, 0x4b, - 0x8c, 0xc1, 0x31, 0x7e, 0x34, 0x02, 0x97, 0x66, 0x42, 0xe2, 0x2c, 0x22, 0x26, 0xb3, 0x6e, 0x9f, - 0x4d, 0x57, 0xdf, 0xb0, 0x05, 0x0b, 0x5e, 0xf4, 0x05, 0xd4, 0xa3, 0x42, 0x48, 0x96, 0x9a, 0x72, - 0xb6, 0x7b, 0x36, 0x0d, 0x3b, 0x9a, 0x2b, 0x30, 0x9c, 0xea, 0x04, 0x63, 0x1c, 0xd1, 0x84, 0xca, - 0xb9, 0x57, 0x3f, 0x8f, 0x13, 0xdc, 0x36, 0x6c, 0xc1, 0x82, 0xd7, 0xef, 0x41, 0x7b, 0xd9, 0x87, - 0x4f, 0x74, 0x2c, 0x04, 0x35, 0x91, 0x14, 0x13, 0x93, 0xd4, 0x7a, 0xec, 0xff, 0xec, 0x82, 0x6b, - 0x9d, 0xf1, 0xc4, 0x86, 0x45, 0x7e, 0x54, 0x96, 0xf3, 0xe3, 0x9f, 0x6a, 0xee, 0xb1, 0x0a, 0x55, - 0x7b, 0xac, 0x42, 0x5d, 0x82, 0x3a, 0x27, 0x22, 0x2a, 0x88, 0xf6, 0xb0, 0x1b, 0x18, 0x09, 0x8d, - 0xa1, 0x72, 0x30, 0x34, 0x5e, 0xb9, 0x7f, 0x3e, 0x71, 0xed, 0x1e, 0xe4, 0x84, 0x63, 0x49, 0xb3, - 0xc9, 0x70, 0x2e, 0x24, 0x49, 0x83, 0xca, 0xc1, 0x50, 0x55, 0x5a, 0x9c, 0xcc, 0xf0, 0x5c, 0x68, - 0xeb, 0x1a, 0xda, 0x86, 0x66, 0x89, 0x28, 0xf3, 0x5e, 0x87, 0x35, 0x55, 0xca, 0x42, 0x11, 0x71, - 0x9a, 0xcb, 0x50, 0xd5, 0x95, 0xb2, 0x76, 0xaf, 0x2a, 0x78, 0xa8, 0xd1, 0x7b, 0x3c, 0x41, 0x9f, - 0x43, 0x95, 0xe6, 0xc2, 0x6b, 0xea, 0x6e, 0xda, 0x3f, 0x27, 0x7b, 0xfb, 0x83, 0x40, 0xb1, 0x2a, - 0xe7, 0x16, 0x82, 0x70, 0xdd, 0x56, 0xcb, 0x5e, 0xb0, 0x90, 0x51, 0x0f, 0x9e, 0x8b, 0xf8, 0x3c, - 0x97, 0x24, 0x0e, 0x39, 0x63, 0x32, 0xcc, 0xb1, 0x10, 0x33, 0xc6, 0x63, 0xaf, 0xa5, 0x17, 0xfe, - 0xdf, 0x4c, 0x06, 0x8c, 0xc9, 0x81, 0x99, 0x52, 0x31, 0x97, 0x78, 0x22, 0xbc, 0xb6, 0x6e, 0x5d, - 0x7a, 0x8c, 0xa6, 0xd0, 0x10, 0x92, 0x71, 0x3c, 0x21, 0xde, 0xaa, 0x76, 0xfa, 0xfe, 0x39, 0x1d, - 0x62, 0x58, 0xb2, 0x06, 0x96, 0x1e, 0x3d, 0x0f, 0xae, 0x10, 0xd3, 0xf0, 0x90, 0xcc, 0x85, 0xd7, - 0xd1, 0x16, 0x34, 0x84, 0x98, 0x7e, 0x4c, 0xe6, 0x02, 0x5d, 0x81, 0x55, 0xf3, 0x94, 0x08, 0x39, - 0xc1, 0xf1, 0xdc, 0x5b, 0xd3, 0xf1, 0x68, 0x1b, 0x30, 0x50, 0x98, 0xff, 0xbd, 0x03, 0x6b, 0x8f, - 0x45, 0x72, 0x91, 0xc5, 0xce, 0xa3, 0x2c, 0x56, 0x99, 0x15, 0x53, 0x21, 0x39, 0xb3, 0x05, 0xbb, - 0x94, 0x54, 0x77, 0x56, 0x5d, 0x9a, 0xb2, 0xcc, 0x64, 0xaa, 0x15, 0x55, 0xa2, 0xd2, 0x14, 0x4f, - 0x48, 0x28, 0xf1, 0x44, 0x27, 0x6a, 0x33, 0x70, 0x35, 0x70, 0x17, 0x4f, 0xd0, 0x65, 0x68, 0x30, - 0x11, 0x6a, 0x2d, 0x2b, 0x25, 0x1f, 0x13, 0x43, 0x75, 0x5b, 0x7e, 0x72, 0xa0, 0xd2, 0x1f, 0x28, - 0x5a, 0x1c, 0xc7, 0x9c, 0x08, 0x61, 0xac, 0xb0, 0xa2, 0x9a, 0xc9, 0x88, 0x4c, 0xb1, 0x38, 0x34, - 0x96, 0x58, 0x71, 0xf9, 0xa1, 0x50, 0x3d, 0xfe, 0x50, 0xb8, 0x04, 0xf5, 0x31, 0x4e, 0x69, 0x32, - 0x37, 0x6f, 0x14, 0x23, 0x29, 0x3c, 0x2f, 0x46, 0x09, 0x8d, 0xec, 0x75, 0x29, 0x25, 0xf4, 0x32, - 0x40, 0x8a, 0x33, 0x3c, 0x21, 0x29, 0xc9, 0xa4, 0xbe, 0x36, 0x6e, 0xb0, 0x84, 0xf8, 0xf7, 0xa0, - 0x61, 0x02, 0xa1, 0x2e, 0x70, 0x4c, 0xc5, 0xa1, 0x32, 0x53, 0x39, 0xbf, 0x14, 0x94, 0x07, 0x39, - 0xa6, 0xaa, 0xb9, 0xe9, 0x9c, 0x50, 0x63, 0xb4, 0x0e, 0xad, 0x31, 0x4d, 0x88, 0xd0, 0x3e, 0x56, - 0x3d, 0x4e, 0xbf, 0x74, 0x96, 0x20, 0xff, 0x57, 0x07, 0xea, 0x65, 0x51, 0x43, 0x5f, 0xc1, 0x5a, - 0xce, 0x89, 0xae, 0x9c, 0x49, 0x42, 0xe2, 0x90, 0x09, 0xd3, 0xf6, 0xfe, 0xad, 0xdb, 0xdb, 0x59, - 0x56, 0x77, 0x20, 0xd0, 0x1b, 0xca, 0x00, 0x7a, 0x84, 0x25, 0x09, 0x45, 0x31, 0xca, 0x88, 0xee, - 0xf5, 0xca, 0xe2, 0x8e, 0x81, 0x87, 0x25, 0xea, 0x3f, 0x04, 0xd7, 0x16, 0x4a, 0x15, 0xf2, 0x3c, - 0xc1, 0x59, 0xb8, 0x94, 0x3d, 0xae, 0x02, 0x54, 0x64, 0xd1, 0x55, 0xb8, 0xa0, 0x27, 0x4d, 0x7e, - 0x84, 0x4b, 0x85, 0x72, 0x4d, 0x4d, 0xdc, 0x2f, 0x71, 0xbd, 0xf6, 0x0a, 0xac, 0xda, 0x9a, 0x1b, - 0x46, 0xaa, 0x43, 0x96, 0x01, 0x6d, 0x5b, 0x70, 0x87, 0xc5, 0x64, 0xe3, 0x15, 0x58, 0xdd, 0x25, - 0x09, 0x91, 0xc4, 0x7e, 0x3f, 0x3a, 0x50, 0xe9, 0xef, 0xda, 0xe2, 0xda, 0xdf, 0xed, 0xfd, 0x55, - 0x87, 0x35, 0xeb, 0x02, 0xf5, 0x9a, 0xa4, 0x11, 0x41, 0xdf, 0x39, 0x50, 0x53, 0x7f, 0x22, 0xf4, - 0xf6, 0x49, 0x1c, 0xb9, 0xf4, 0x8b, 0xf2, 0xaf, 0x9f, 0x64, 0x63, 0xf9, 0x4b, 0xba, 0xfc, 0xf5, - 0xef, 0x7f, 0xfc, 0x50, 0xb9, 0xb0, 0xd1, 0xde, 0x3a, 0xba, 0xbe, 0xf8, 0xed, 0xbd, 0xeb, 0x5c, - 0x45, 0x05, 0xac, 0x6c, 0xcf, 0xf7, 0x6e, 0xee, 0xa0, 0xb7, 0x4e, 0x42, 0xfa, 0xe8, 0xc7, 0xe5, - 0x9f, 0xea, 0x13, 0x87, 0x24, 0xd4, 0xb6, 0xe7, 0xfd, 0xc1, 0x7f, 0xa2, 0x75, 0xf7, 0x19, 0x6b, - 0xfd, 0xc6, 0x81, 0xea, 0xcd, 0x24, 0x41, 0x27, 0x0f, 0xdb, 0xe9, 0x14, 0x6e, 0x5c, 0xd4, 0xc1, - 0xee, 0xa0, 0x63, 0xc1, 0xbe, 0xe6, 0xa0, 0x19, 0xac, 0x3c, 0xc0, 0x32, 0x9a, 0x3e, 0xdb, 0xf3, - 0x5f, 0x73, 0xd0, 0x11, 0xd4, 0xcb, 0x7b, 0x82, 0x4e, 0xf4, 0x66, 0x3e, 0x76, 0xb7, 0x4e, 0x91, - 0xf5, 0xdb, 0xf0, 0x99, 0x6b, 0x91, 0x51, 0x5d, 0x2f, 0x79, 0xf3, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x89, 0x02, 0x16, 0x45, 0xf5, 0x10, 0x00, 0x00, + // 1398 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x5d, 0x8f, 0x1b, 0x35, + 0x17, 0xd6, 0x24, 0xd9, 0x64, 0x72, 0xb2, 0x9b, 0x7d, 0xeb, 0xb7, 0x6f, 0x3b, 0xef, 0xf0, 0xb5, + 0x6c, 0x05, 0xac, 0x7a, 0x91, 0x6d, 0x43, 0x05, 0x02, 0x01, 0x52, 0xbb, 0xdb, 0xd2, 0x80, 0xb6, + 0x1b, 0x26, 0xfd, 0xe0, 0x4b, 0x1a, 0x39, 0x33, 0x27, 0x89, 0xb5, 0x33, 0xe3, 0x60, 0x7b, 0x36, + 0xcd, 0x15, 0x12, 0x42, 0x5c, 0x80, 0xb8, 0xe2, 0x1f, 0x20, 0x24, 0x6e, 0x11, 0x7f, 0x85, 0xbf, + 0x80, 0xf8, 0x15, 0x5c, 0x20, 0x7b, 0x3c, 0x69, 0xb6, 0x95, 0x50, 0xf7, 0x83, 0x72, 0xe7, 0xf3, + 0xd8, 0x7e, 0x7c, 0xe6, 0x9c, 0xe7, 0x1c, 0x8f, 0xe1, 0xe2, 0x84, 0x8a, 0x78, 0x46, 0x05, 0x6e, + 0x97, 0x83, 0xce, 0x54, 0x70, 0xc5, 0xc9, 0xe5, 0x31, 0x53, 0x93, 0x7c, 0xd8, 0x89, 0x78, 0xda, + 0x51, 0x2c, 0x3b, 0x40, 0x31, 0xc4, 0x24, 0x31, 0xc3, 0x62, 0x85, 0xec, 0x94, 0x3b, 0xfc, 0xe7, + 0xc7, 0x9c, 0x8f, 0x13, 0xdc, 0xa6, 0x53, 0xb6, 0x4d, 0xb3, 0x8c, 0x2b, 0xaa, 0x18, 0xcf, 0x64, + 0xb1, 0x6e, 0xf3, 0x01, 0xb4, 0xfa, 0xb9, 0x9c, 0x04, 0xf8, 0x45, 0x8e, 0x52, 0x91, 0xdb, 0x50, + 0x8b, 0xa9, 0xa2, 0x9e, 0xb3, 0xe1, 0x6c, 0xb5, 0xba, 0xd7, 0x3a, 0x4f, 0x7f, 0x4e, 0xe7, 0xb6, + 0x1d, 0x04, 0x86, 0x61, 0xb3, 0x01, 0x2b, 0x37, 0xd3, 0xa9, 0x9a, 0x6f, 0xbe, 0x07, 0xf0, 0x3e, + 0xaa, 0xf2, 0x80, 0xff, 0x40, 0x35, 0xa5, 0x91, 0xe1, 0x6f, 0x06, 0x7a, 0x48, 0xda, 0x50, 0x61, + 0x53, 0xaf, 0x62, 0x80, 0x0a, 0x9b, 0x1a, 0x3b, 0xf6, 0xaa, 0xd6, 0x8e, 0x37, 0x7f, 0xf2, 0xc0, + 0x2d, 0xb9, 0xed, 0xa4, 0x53, 0x4e, 0x92, 0x3d, 0xa8, 0xc5, 0x93, 0xa8, 0xd8, 0xde, 0xea, 0xbe, + 0x75, 0x12, 0x7f, 0x3b, 0xbb, 0xb7, 0x77, 0xfa, 0x81, 0xa1, 0x21, 0xf7, 0xa1, 0x91, 0xa1, 0x1a, + 0x72, 0xae, 0x8c, 0x03, 0xad, 0xee, 0x3b, 0x27, 0x62, 0xbc, 0x53, 0x70, 0x04, 0x25, 0x99, 0xe5, + 0x9d, 0x71, 0x71, 0xe0, 0xd5, 0x36, 0xaa, 0xa7, 0xe1, 0xd5, 0x1c, 0x41, 0x49, 0x46, 0x3e, 0x01, + 0x37, 0x45, 0x45, 0x4d, 0xca, 0x56, 0x8c, 0xc3, 0xef, 0x9e, 0x88, 0x78, 0xcf, 0x92, 0x04, 0x0b, + 0x3a, 0xff, 0xdb, 0x0a, 0xd4, 0x74, 0x64, 0x9e, 0x22, 0x63, 0x3e, 0xb8, 0x13, 0x2e, 0x55, 0x46, + 0x53, 0xb4, 0x79, 0x5b, 0xd8, 0xe4, 0x05, 0x80, 0x04, 0xa9, 0xc4, 0x50, 0xb1, 0x14, 0xbd, 0xda, + 0x86, 0xb3, 0x55, 0x0d, 0x9a, 0x06, 0xb9, 0xcb, 0x52, 0x24, 0x2f, 0xc3, 0xaa, 0x5e, 0x16, 0x4a, + 0x14, 0x87, 0x28, 0xa4, 0xb7, 0xb2, 0x51, 0xdd, 0x6a, 0x06, 0x2d, 0x8d, 0x0d, 0x0a, 0x48, 0x2f, + 0xd1, 0x7b, 0x17, 0x4b, 0xea, 0xc5, 0x12, 0x8d, 0x95, 0x4b, 0x3c, 0x68, 0x8c, 0xa9, 0xc2, 0x19, + 0x9d, 0x7b, 0x0d, 0x73, 0x7e, 0x69, 0x12, 0x02, 0x35, 0x2a, 0xa2, 0x89, 0xe7, 0x1a, 0xd8, 0x8c, + 0x35, 0x96, 0xe3, 0x88, 0x79, 0xcd, 0x0d, 0x67, 0xcb, 0x0d, 0xcc, 0x58, 0xbb, 0xc9, 0x46, 0x34, + 0xc2, 0xd0, 0x7c, 0x04, 0x98, 0xd5, 0x4d, 0x83, 0xdc, 0xa1, 0x29, 0xfa, 0x5f, 0x57, 0xa1, 0x61, + 0x93, 0x4a, 0x9e, 0x83, 0x26, 0x4d, 0x12, 0x3e, 0x0b, 0xa7, 0x0f, 0xd1, 0x44, 0xc5, 0x0d, 0x5c, + 0x03, 0xf4, 0x1f, 0x22, 0x79, 0x05, 0xda, 0xc5, 0xa4, 0x4e, 0xcf, 0x28, 0xe1, 0x33, 0x13, 0x26, + 0x37, 0x58, 0x33, 0xe8, 0x03, 0x0b, 0x92, 0x7b, 0x50, 0x63, 0x7a, 0x7b, 0x21, 0xb2, 0xeb, 0xa7, + 0x11, 0x59, 0xa7, 0xd7, 0xff, 0xf8, 0x66, 0x60, 0xe8, 0x34, 0x2d, 0x97, 0x0c, 0xad, 0x14, 0x4e, + 0x47, 0xbb, 0x2f, 0x19, 0x06, 0x86, 0xce, 0xbf, 0x06, 0x35, 0x7d, 0x88, 0x56, 0x42, 0x2e, 0x92, + 0x52, 0x09, 0xb9, 0x48, 0x74, 0xe6, 0x23, 0x9e, 0x29, 0xcc, 0x94, 0xb4, 0x7a, 0x58, 0xd8, 0xfe, + 0x47, 0x50, 0xd3, 0x1c, 0xe4, 0xff, 0xe0, 0x0e, 0xb5, 0x00, 0x1e, 0x6d, 0x6d, 0x68, 0xfb, 0x9e, + 0x48, 0xc8, 0x05, 0xa8, 0x1f, 0xa0, 0xc8, 0x30, 0xb1, 0x9b, 0xad, 0xa5, 0x71, 0x96, 0x31, 0x25, + 0xca, 0x36, 0x60, 0x2d, 0xff, 0x17, 0xc7, 0xa4, 0xc1, 0x48, 0xbf, 0xac, 0x7c, 0xe7, 0xcc, 0x2b, + 0xbf, 0x72, 0x86, 0x95, 0xef, 0xff, 0xd1, 0x06, 0xb7, 0xac, 0x2e, 0x72, 0x1e, 0x56, 0xa4, 0xa2, + 0x0a, 0x6d, 0x1c, 0x0a, 0x43, 0x0b, 0x7c, 0xc8, 0xb3, 0x98, 0x65, 0xe3, 0x30, 0xe5, 0x31, 0x9a, + 0xf3, 0xab, 0x41, 0xcb, 0x62, 0x7b, 0x3c, 0x46, 0x92, 0xc1, 0x6a, 0x4a, 0xb3, 0x7c, 0x44, 0x23, + 0x95, 0x0b, 0x14, 0x56, 0x37, 0x1f, 0x9c, 0xaa, 0xd6, 0x3b, 0x7b, 0x4b, 0x8c, 0xc1, 0x11, 0x7e, + 0x32, 0x04, 0x97, 0x65, 0x52, 0xd1, 0x2c, 0x2a, 0x6a, 0xb6, 0xd5, 0xbd, 0x75, 0xba, 0xb3, 0x7a, + 0x96, 0x2d, 0x58, 0xf0, 0x92, 0xcf, 0xa1, 0x1e, 0xe5, 0x52, 0xf1, 0xd4, 0xca, 0x75, 0xf7, 0x74, + 0x27, 0xec, 0x18, 0xae, 0xc0, 0x72, 0xea, 0x2f, 0x18, 0xd1, 0x88, 0x25, 0x4c, 0xcd, 0xbd, 0xfa, + 0x59, 0x7c, 0xc1, 0x2d, 0xcb, 0x16, 0x2c, 0x78, 0xfd, 0x2e, 0xac, 0x2e, 0xc7, 0xf0, 0x89, 0xcb, + 0x89, 0x40, 0x4d, 0x26, 0xf9, 0xd8, 0x8a, 0xdb, 0x8c, 0xfd, 0x9f, 0x5d, 0x70, 0xcb, 0x60, 0x3c, + 0xb1, 0x61, 0xa1, 0x8f, 0xca, 0xb2, 0x3e, 0xfe, 0xae, 0xbd, 0x1e, 0x69, 0x46, 0xb5, 0xc7, 0x9a, + 0xd1, 0x05, 0xa8, 0x0b, 0x94, 0x51, 0x5e, 0x34, 0x04, 0x37, 0xb0, 0x16, 0x19, 0x41, 0x65, 0x7f, + 0x60, 0xa3, 0x72, 0xff, 0x6c, 0xf2, 0xda, 0xd9, 0x9f, 0xa2, 0xa0, 0x8a, 0x65, 0xe3, 0xc1, 0x5c, + 0x2a, 0x4c, 0x83, 0xca, 0xfe, 0x40, 0x37, 0x55, 0x9a, 0xcc, 0xe8, 0x5c, 0x1a, 0xef, 0x1a, 0xc6, + 0x87, 0x66, 0x81, 0x68, 0xf7, 0x5e, 0x85, 0x75, 0xdd, 0xb5, 0x42, 0x19, 0x09, 0x36, 0x55, 0xa6, + 0x3f, 0x14, 0x6d, 0x7a, 0x4d, 0xc3, 0x03, 0x83, 0xea, 0x2e, 0xf1, 0x19, 0x54, 0xd9, 0x54, 0x7a, + 0x4d, 0x73, 0x71, 0xf6, 0xce, 0xc8, 0xdf, 0x5e, 0x3f, 0xd0, 0xac, 0x3a, 0xb8, 0xb9, 0x44, 0x61, + 0x6e, 0xd0, 0xa2, 0xed, 0x2f, 0x6c, 0xd2, 0x85, 0xff, 0x45, 0x62, 0x3e, 0x55, 0x18, 0x87, 0x82, + 0x73, 0x15, 0x4e, 0xa9, 0x94, 0x33, 0x2e, 0x62, 0xaf, 0x65, 0x16, 0xfe, 0xd7, 0x4e, 0x06, 0x9c, + 0xab, 0xbe, 0x9d, 0xd2, 0x39, 0x57, 0x74, 0x2c, 0xbd, 0x55, 0x73, 0x4b, 0x99, 0x31, 0x99, 0x40, + 0x43, 0x2a, 0x2e, 0xe8, 0x18, 0xbd, 0x35, 0x13, 0xf4, 0x3b, 0x67, 0xf4, 0x11, 0x83, 0x82, 0x35, + 0x28, 0xe9, 0x75, 0xaf, 0x95, 0x72, 0x12, 0x1e, 0xe0, 0x5c, 0x7a, 0x6d, 0xe3, 0x41, 0x43, 0xca, + 0xc9, 0x87, 0x38, 0x97, 0xe4, 0x12, 0xac, 0xd9, 0xbf, 0x86, 0x50, 0x20, 0x8d, 0xe7, 0xde, 0xba, + 0xc9, 0xc7, 0xaa, 0x05, 0x03, 0x8d, 0xf9, 0xdf, 0x3b, 0xb0, 0xfe, 0x58, 0x26, 0x17, 0x2a, 0x76, + 0x1e, 0xa9, 0x58, 0x2b, 0x2b, 0x66, 0x52, 0x09, 0x5e, 0x36, 0xee, 0xc2, 0xd2, 0x17, 0xb1, 0xbe, + 0x90, 0x19, 0xcf, 0xac, 0x52, 0x4b, 0x53, 0x0b, 0x95, 0xa5, 0x74, 0x8c, 0xa1, 0xa2, 0x63, 0x23, + 0xd4, 0x66, 0xe0, 0x1a, 0xe0, 0x2e, 0x1d, 0x93, 0x8b, 0xd0, 0xe0, 0x32, 0x34, 0xa7, 0xac, 0x14, + 0x7c, 0x5c, 0x0e, 0x74, 0xb5, 0xfc, 0xe8, 0x40, 0xa5, 0xd7, 0xd7, 0xb4, 0x34, 0x8e, 0x05, 0x4a, + 0x59, 0xde, 0x20, 0xd6, 0xd4, 0x33, 0x19, 0xaa, 0x94, 0xca, 0x03, 0xeb, 0x49, 0x69, 0x2e, 0xff, + 0x13, 0x54, 0x8f, 0xfe, 0x13, 0x5c, 0x80, 0xfa, 0x88, 0xa6, 0x2c, 0x99, 0xdb, 0xdf, 0x11, 0x6b, + 0x69, 0x7c, 0x9a, 0x0f, 0x13, 0x16, 0x95, 0xe5, 0x52, 0x58, 0xe4, 0x45, 0x80, 0x94, 0x66, 0x74, + 0x8c, 0x29, 0x66, 0xca, 0x94, 0x8d, 0x1b, 0x2c, 0x21, 0xfe, 0x3d, 0x68, 0xd8, 0x44, 0xe8, 0x02, + 0x8e, 0x99, 0x3c, 0xd0, 0x6e, 0xea, 0xe0, 0x17, 0x86, 0x8e, 0xa0, 0xa0, 0x2c, 0xf6, 0x2a, 0x85, + 0x26, 0xf4, 0x98, 0x6c, 0x40, 0x6b, 0xc4, 0x12, 0x94, 0x26, 0xc6, 0xd2, 0xab, 0x16, 0x3f, 0x35, + 0x4b, 0x90, 0xff, 0xab, 0x03, 0xf5, 0xa2, 0xa9, 0x91, 0x2f, 0x61, 0x7d, 0x2a, 0xd0, 0x74, 0xce, + 0x24, 0xc1, 0x38, 0xe4, 0xd2, 0x5e, 0x7b, 0xff, 0x54, 0xf5, 0xb6, 0x97, 0x8f, 0xdb, 0x97, 0xe4, + 0x35, 0xed, 0x00, 0x3b, 0xa4, 0x0a, 0x43, 0x99, 0x0f, 0x33, 0x34, 0xd7, 0xbd, 0xf6, 0xb8, 0x6d, + 0xe1, 0x41, 0x81, 0xfa, 0x0f, 0xc1, 0x2d, 0x1b, 0xa5, 0x4e, 0xf9, 0x34, 0xa1, 0x59, 0xb8, 0xa4, + 0x1e, 0x57, 0x03, 0x3a, 0xb3, 0xe4, 0x32, 0x9c, 0x33, 0x93, 0x56, 0x1f, 0xe1, 0x52, 0xa3, 0x5c, + 0xd7, 0x13, 0xf7, 0x0b, 0xdc, 0xac, 0xbd, 0x04, 0x6b, 0x65, 0xcf, 0x0d, 0x23, 0x7d, 0x43, 0x16, + 0x09, 0x5d, 0x2d, 0xc1, 0x1d, 0x1e, 0xe3, 0xe6, 0x4b, 0xb0, 0xb6, 0x8b, 0x09, 0x2a, 0x2c, 0x5f, + 0x1a, 0x6d, 0xa8, 0xf4, 0x76, 0xcb, 0xe6, 0xda, 0xdb, 0xed, 0xfe, 0x59, 0x87, 0xf5, 0x32, 0x04, + 0xfa, 0xc7, 0x91, 0x45, 0x48, 0xbe, 0x73, 0xa0, 0xa6, 0x9f, 0x3f, 0xe4, 0xcd, 0xe3, 0x04, 0x72, + 0xe9, 0xc1, 0xe4, 0x5f, 0x3d, 0xce, 0xc6, 0xe2, 0x41, 0x74, 0xf1, 0xab, 0xdf, 0x7e, 0xff, 0xa1, + 0x72, 0x6e, 0x73, 0x75, 0xfb, 0xf0, 0xea, 0xe2, 0x61, 0xf7, 0xb6, 0x73, 0x99, 0xe4, 0xb0, 0x72, + 0x63, 0xbe, 0x77, 0x7d, 0x87, 0xbc, 0x71, 0x1c, 0xd2, 0x47, 0x8f, 0x2b, 0xff, 0x44, 0xef, 0x35, + 0xa2, 0xa0, 0x76, 0x63, 0xde, 0xeb, 0xff, 0x2b, 0xa7, 0xee, 0x3e, 0xe3, 0x53, 0xbf, 0x71, 0xa0, + 0x7a, 0x3d, 0x49, 0xc8, 0xf1, 0xd3, 0x76, 0xb2, 0x03, 0x37, 0xcf, 0x9b, 0x64, 0xb7, 0xc9, 0x91, + 0x64, 0x5f, 0x71, 0xc8, 0x0c, 0x56, 0x1e, 0x50, 0x15, 0x4d, 0x9e, 0xed, 0xf7, 0x5f, 0x71, 0xc8, + 0x21, 0xd4, 0x8b, 0x3a, 0x21, 0xc7, 0xfa, 0x67, 0x3e, 0x52, 0x5b, 0x27, 0x50, 0xfd, 0x0d, 0xf8, + 0xd4, 0x2d, 0x91, 0x61, 0xdd, 0x2c, 0x79, 0xfd, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xf1, + 0x1f, 0x5b, 0xe0, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 2ad9caedd..a98d98e74 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -56,16 +56,17 @@ message Hardware { string url = 1; string contents = 2; } - message Bootstrapper { - string kernel = 1; - string initrd = 2; - string os = 3; + message Osie { + string base_url = 1; + string kernel = 2; + string initrd = 3; } bool allow_pxe = 1; bool allow_workflow = 2; IPXE ipxe = 3; - Bootstrapper bootstrapper = 4; +// Bootstrapper bootstrapper = 4; + Osie osie = 5; } message Network { DHCP dhcp = 1; From 0b144c105d38881bd9a4111b22c5d5b82d22b1ba Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 7 May 2020 15:21:20 -0400 Subject: [PATCH 09/31] readded bootstrapper struct --- .gitignore | 1 + Makefile | 2 +- protos/hardware/hardware.pb.go | 235 +++++++++++++++++++-------------- protos/hardware/hardware.proto | 5 +- 4 files changed, 144 insertions(+), 99 deletions(-) diff --git a/.gitignore b/.gitignore index 528a0a3d0..178015abb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ certs/ cmd/tink-cli/tink-cli cmd/tink-server/tink-server cmd/tink-worker/tink-worker +.idea # Terraform .terraform diff --git a/Makefile b/Makefile index bfb5b0052..0a1b79aa4 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ cli: ${cli} worker : ${worker} ${server} ${cli} ${worker}: - CGO_ENABLED=0 go build -o $@ ./$@ + CGO_ENABLED=0 GOOS=$$GOOS go build -o $@ ./$@ run: ${binaries} docker-compose up -d --build db diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 3e40e6a5c..d8c215fb6 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -333,14 +333,14 @@ func (m *Hardware_DHCP) GetIfaceName() string { } type Hardware_Netboot struct { - AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` - AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` - Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` - // Bootstrapper bootstrapper = 4; - Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` + AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` + Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` + Bootstrapper *Hardware_Netboot_Bootstrapper `protobuf:"bytes,4,opt,name=bootstrapper,proto3" json:"bootstrapper,omitempty"` + Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware_Netboot) Reset() { *m = Hardware_Netboot{} } @@ -389,6 +389,13 @@ func (m *Hardware_Netboot) GetIpxe() *Hardware_Netboot_IPXE { return nil } +func (m *Hardware_Netboot) GetBootstrapper() *Hardware_Netboot_Bootstrapper { + if m != nil { + return m.Bootstrapper + } + return nil +} + func (m *Hardware_Netboot) GetOsie() *Hardware_Netboot_Osie { if m != nil { return m.Osie @@ -443,6 +450,37 @@ func (m *Hardware_Netboot_IPXE) GetContents() string { return "" } +type Hardware_Netboot_Bootstrapper struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Netboot_Bootstrapper) Reset() { *m = Hardware_Netboot_Bootstrapper{} } +func (m *Hardware_Netboot_Bootstrapper) String() string { return proto.CompactTextString(m) } +func (*Hardware_Netboot_Bootstrapper) ProtoMessage() {} +func (*Hardware_Netboot_Bootstrapper) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 1, 1} +} + +func (m *Hardware_Netboot_Bootstrapper) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Unmarshal(m, b) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Marshal(b, m, deterministic) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Netboot_Bootstrapper.Merge(m, src) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_Size() int { + return xxx_messageInfo_Hardware_Netboot_Bootstrapper.Size(m) +} +func (m *Hardware_Netboot_Bootstrapper) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Netboot_Bootstrapper.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Netboot_Bootstrapper proto.InternalMessageInfo + type Hardware_Netboot_Osie struct { BaseUrl string `protobuf:"bytes,1,opt,name=base_url,json=baseUrl,proto3" json:"base_url,omitempty"` Kernel string `protobuf:"bytes,2,opt,name=kernel,proto3" json:"kernel,omitempty"` @@ -456,7 +494,7 @@ func (m *Hardware_Netboot_Osie) Reset() { *m = Hardware_Netboot_Osie{} } func (m *Hardware_Netboot_Osie) String() string { return proto.CompactTextString(m) } func (*Hardware_Netboot_Osie) ProtoMessage() {} func (*Hardware_Netboot_Osie) Descriptor() ([]byte, []int) { - return fileDescriptor_61ac56d7fc2e671f, []int{3, 1, 1} + return fileDescriptor_61ac56d7fc2e671f, []int{3, 1, 2} } func (m *Hardware_Netboot_Osie) XXX_Unmarshal(b []byte) error { @@ -1180,6 +1218,7 @@ func init() { proto.RegisterType((*Hardware_DHCP)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.DHCP") proto.RegisterType((*Hardware_Netboot)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot") proto.RegisterType((*Hardware_Netboot_IPXE)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.IPXE") + proto.RegisterType((*Hardware_Netboot_Bootstrapper)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Bootstrapper") proto.RegisterType((*Hardware_Netboot_Osie)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Osie") proto.RegisterType((*Hardware_Network)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Network") proto.RegisterType((*Hardware_Metadata)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata") @@ -1198,95 +1237,97 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1398 bytes of a gzipped FileDescriptorProto + // 1425 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x5d, 0x8f, 0x1b, 0x35, - 0x17, 0xd6, 0x24, 0xd9, 0x64, 0x72, 0xb2, 0x9b, 0x7d, 0xeb, 0xb7, 0x6f, 0x3b, 0xef, 0xf0, 0xb5, - 0x6c, 0x05, 0xac, 0x7a, 0x91, 0x6d, 0x43, 0x05, 0x02, 0x01, 0x52, 0xbb, 0xdb, 0xd2, 0x80, 0xb6, - 0x1b, 0x26, 0xfd, 0xe0, 0x4b, 0x1a, 0x39, 0x33, 0x27, 0x89, 0xb5, 0x33, 0xe3, 0x60, 0x7b, 0x36, - 0xcd, 0x15, 0x12, 0x42, 0x5c, 0x80, 0xb8, 0xe2, 0x1f, 0x20, 0x24, 0x6e, 0x11, 0x7f, 0x85, 0xbf, - 0x80, 0xf8, 0x15, 0x5c, 0x20, 0x7b, 0x3c, 0x69, 0xb6, 0x95, 0x50, 0xf7, 0x83, 0x72, 0xe7, 0xf3, - 0xd8, 0x7e, 0x7c, 0xe6, 0x9c, 0xe7, 0x1c, 0x8f, 0xe1, 0xe2, 0x84, 0x8a, 0x78, 0x46, 0x05, 0x6e, - 0x97, 0x83, 0xce, 0x54, 0x70, 0xc5, 0xc9, 0xe5, 0x31, 0x53, 0x93, 0x7c, 0xd8, 0x89, 0x78, 0xda, - 0x51, 0x2c, 0x3b, 0x40, 0x31, 0xc4, 0x24, 0x31, 0xc3, 0x62, 0x85, 0xec, 0x94, 0x3b, 0xfc, 0xe7, - 0xc7, 0x9c, 0x8f, 0x13, 0xdc, 0xa6, 0x53, 0xb6, 0x4d, 0xb3, 0x8c, 0x2b, 0xaa, 0x18, 0xcf, 0x64, - 0xb1, 0x6e, 0xf3, 0x01, 0xb4, 0xfa, 0xb9, 0x9c, 0x04, 0xf8, 0x45, 0x8e, 0x52, 0x91, 0xdb, 0x50, - 0x8b, 0xa9, 0xa2, 0x9e, 0xb3, 0xe1, 0x6c, 0xb5, 0xba, 0xd7, 0x3a, 0x4f, 0x7f, 0x4e, 0xe7, 0xb6, - 0x1d, 0x04, 0x86, 0x61, 0xb3, 0x01, 0x2b, 0x37, 0xd3, 0xa9, 0x9a, 0x6f, 0xbe, 0x07, 0xf0, 0x3e, - 0xaa, 0xf2, 0x80, 0xff, 0x40, 0x35, 0xa5, 0x91, 0xe1, 0x6f, 0x06, 0x7a, 0x48, 0xda, 0x50, 0x61, - 0x53, 0xaf, 0x62, 0x80, 0x0a, 0x9b, 0x1a, 0x3b, 0xf6, 0xaa, 0xd6, 0x8e, 0x37, 0x7f, 0xf2, 0xc0, - 0x2d, 0xb9, 0xed, 0xa4, 0x53, 0x4e, 0x92, 0x3d, 0xa8, 0xc5, 0x93, 0xa8, 0xd8, 0xde, 0xea, 0xbe, - 0x75, 0x12, 0x7f, 0x3b, 0xbb, 0xb7, 0x77, 0xfa, 0x81, 0xa1, 0x21, 0xf7, 0xa1, 0x91, 0xa1, 0x1a, - 0x72, 0xae, 0x8c, 0x03, 0xad, 0xee, 0x3b, 0x27, 0x62, 0xbc, 0x53, 0x70, 0x04, 0x25, 0x99, 0xe5, - 0x9d, 0x71, 0x71, 0xe0, 0xd5, 0x36, 0xaa, 0xa7, 0xe1, 0xd5, 0x1c, 0x41, 0x49, 0x46, 0x3e, 0x01, - 0x37, 0x45, 0x45, 0x4d, 0xca, 0x56, 0x8c, 0xc3, 0xef, 0x9e, 0x88, 0x78, 0xcf, 0x92, 0x04, 0x0b, - 0x3a, 0xff, 0xdb, 0x0a, 0xd4, 0x74, 0x64, 0x9e, 0x22, 0x63, 0x3e, 0xb8, 0x13, 0x2e, 0x55, 0x46, - 0x53, 0xb4, 0x79, 0x5b, 0xd8, 0xe4, 0x05, 0x80, 0x04, 0xa9, 0xc4, 0x50, 0xb1, 0x14, 0xbd, 0xda, - 0x86, 0xb3, 0x55, 0x0d, 0x9a, 0x06, 0xb9, 0xcb, 0x52, 0x24, 0x2f, 0xc3, 0xaa, 0x5e, 0x16, 0x4a, - 0x14, 0x87, 0x28, 0xa4, 0xb7, 0xb2, 0x51, 0xdd, 0x6a, 0x06, 0x2d, 0x8d, 0x0d, 0x0a, 0x48, 0x2f, - 0xd1, 0x7b, 0x17, 0x4b, 0xea, 0xc5, 0x12, 0x8d, 0x95, 0x4b, 0x3c, 0x68, 0x8c, 0xa9, 0xc2, 0x19, - 0x9d, 0x7b, 0x0d, 0x73, 0x7e, 0x69, 0x12, 0x02, 0x35, 0x2a, 0xa2, 0x89, 0xe7, 0x1a, 0xd8, 0x8c, - 0x35, 0x96, 0xe3, 0x88, 0x79, 0xcd, 0x0d, 0x67, 0xcb, 0x0d, 0xcc, 0x58, 0xbb, 0xc9, 0x46, 0x34, - 0xc2, 0xd0, 0x7c, 0x04, 0x98, 0xd5, 0x4d, 0x83, 0xdc, 0xa1, 0x29, 0xfa, 0x5f, 0x57, 0xa1, 0x61, - 0x93, 0x4a, 0x9e, 0x83, 0x26, 0x4d, 0x12, 0x3e, 0x0b, 0xa7, 0x0f, 0xd1, 0x44, 0xc5, 0x0d, 0x5c, - 0x03, 0xf4, 0x1f, 0x22, 0x79, 0x05, 0xda, 0xc5, 0xa4, 0x4e, 0xcf, 0x28, 0xe1, 0x33, 0x13, 0x26, - 0x37, 0x58, 0x33, 0xe8, 0x03, 0x0b, 0x92, 0x7b, 0x50, 0x63, 0x7a, 0x7b, 0x21, 0xb2, 0xeb, 0xa7, - 0x11, 0x59, 0xa7, 0xd7, 0xff, 0xf8, 0x66, 0x60, 0xe8, 0x34, 0x2d, 0x97, 0x0c, 0xad, 0x14, 0x4e, - 0x47, 0xbb, 0x2f, 0x19, 0x06, 0x86, 0xce, 0xbf, 0x06, 0x35, 0x7d, 0x88, 0x56, 0x42, 0x2e, 0x92, - 0x52, 0x09, 0xb9, 0x48, 0x74, 0xe6, 0x23, 0x9e, 0x29, 0xcc, 0x94, 0xb4, 0x7a, 0x58, 0xd8, 0xfe, - 0x47, 0x50, 0xd3, 0x1c, 0xe4, 0xff, 0xe0, 0x0e, 0xb5, 0x00, 0x1e, 0x6d, 0x6d, 0x68, 0xfb, 0x9e, - 0x48, 0xc8, 0x05, 0xa8, 0x1f, 0xa0, 0xc8, 0x30, 0xb1, 0x9b, 0xad, 0xa5, 0x71, 0x96, 0x31, 0x25, - 0xca, 0x36, 0x60, 0x2d, 0xff, 0x17, 0xc7, 0xa4, 0xc1, 0x48, 0xbf, 0xac, 0x7c, 0xe7, 0xcc, 0x2b, - 0xbf, 0x72, 0x86, 0x95, 0xef, 0xff, 0xd1, 0x06, 0xb7, 0xac, 0x2e, 0x72, 0x1e, 0x56, 0xa4, 0xa2, - 0x0a, 0x6d, 0x1c, 0x0a, 0x43, 0x0b, 0x7c, 0xc8, 0xb3, 0x98, 0x65, 0xe3, 0x30, 0xe5, 0x31, 0x9a, - 0xf3, 0xab, 0x41, 0xcb, 0x62, 0x7b, 0x3c, 0x46, 0x92, 0xc1, 0x6a, 0x4a, 0xb3, 0x7c, 0x44, 0x23, - 0x95, 0x0b, 0x14, 0x56, 0x37, 0x1f, 0x9c, 0xaa, 0xd6, 0x3b, 0x7b, 0x4b, 0x8c, 0xc1, 0x11, 0x7e, - 0x32, 0x04, 0x97, 0x65, 0x52, 0xd1, 0x2c, 0x2a, 0x6a, 0xb6, 0xd5, 0xbd, 0x75, 0xba, 0xb3, 0x7a, - 0x96, 0x2d, 0x58, 0xf0, 0x92, 0xcf, 0xa1, 0x1e, 0xe5, 0x52, 0xf1, 0xd4, 0xca, 0x75, 0xf7, 0x74, - 0x27, 0xec, 0x18, 0xae, 0xc0, 0x72, 0xea, 0x2f, 0x18, 0xd1, 0x88, 0x25, 0x4c, 0xcd, 0xbd, 0xfa, - 0x59, 0x7c, 0xc1, 0x2d, 0xcb, 0x16, 0x2c, 0x78, 0xfd, 0x2e, 0xac, 0x2e, 0xc7, 0xf0, 0x89, 0xcb, - 0x89, 0x40, 0x4d, 0x26, 0xf9, 0xd8, 0x8a, 0xdb, 0x8c, 0xfd, 0x9f, 0x5d, 0x70, 0xcb, 0x60, 0x3c, - 0xb1, 0x61, 0xa1, 0x8f, 0xca, 0xb2, 0x3e, 0xfe, 0xae, 0xbd, 0x1e, 0x69, 0x46, 0xb5, 0xc7, 0x9a, - 0xd1, 0x05, 0xa8, 0x0b, 0x94, 0x51, 0x5e, 0x34, 0x04, 0x37, 0xb0, 0x16, 0x19, 0x41, 0x65, 0x7f, - 0x60, 0xa3, 0x72, 0xff, 0x6c, 0xf2, 0xda, 0xd9, 0x9f, 0xa2, 0xa0, 0x8a, 0x65, 0xe3, 0xc1, 0x5c, - 0x2a, 0x4c, 0x83, 0xca, 0xfe, 0x40, 0x37, 0x55, 0x9a, 0xcc, 0xe8, 0x5c, 0x1a, 0xef, 0x1a, 0xc6, - 0x87, 0x66, 0x81, 0x68, 0xf7, 0x5e, 0x85, 0x75, 0xdd, 0xb5, 0x42, 0x19, 0x09, 0x36, 0x55, 0xa6, - 0x3f, 0x14, 0x6d, 0x7a, 0x4d, 0xc3, 0x03, 0x83, 0xea, 0x2e, 0xf1, 0x19, 0x54, 0xd9, 0x54, 0x7a, - 0x4d, 0x73, 0x71, 0xf6, 0xce, 0xc8, 0xdf, 0x5e, 0x3f, 0xd0, 0xac, 0x3a, 0xb8, 0xb9, 0x44, 0x61, - 0x6e, 0xd0, 0xa2, 0xed, 0x2f, 0x6c, 0xd2, 0x85, 0xff, 0x45, 0x62, 0x3e, 0x55, 0x18, 0x87, 0x82, - 0x73, 0x15, 0x4e, 0xa9, 0x94, 0x33, 0x2e, 0x62, 0xaf, 0x65, 0x16, 0xfe, 0xd7, 0x4e, 0x06, 0x9c, - 0xab, 0xbe, 0x9d, 0xd2, 0x39, 0x57, 0x74, 0x2c, 0xbd, 0x55, 0x73, 0x4b, 0x99, 0x31, 0x99, 0x40, - 0x43, 0x2a, 0x2e, 0xe8, 0x18, 0xbd, 0x35, 0x13, 0xf4, 0x3b, 0x67, 0xf4, 0x11, 0x83, 0x82, 0x35, - 0x28, 0xe9, 0x75, 0xaf, 0x95, 0x72, 0x12, 0x1e, 0xe0, 0x5c, 0x7a, 0x6d, 0xe3, 0x41, 0x43, 0xca, - 0xc9, 0x87, 0x38, 0x97, 0xe4, 0x12, 0xac, 0xd9, 0xbf, 0x86, 0x50, 0x20, 0x8d, 0xe7, 0xde, 0xba, - 0xc9, 0xc7, 0xaa, 0x05, 0x03, 0x8d, 0xf9, 0xdf, 0x3b, 0xb0, 0xfe, 0x58, 0x26, 0x17, 0x2a, 0x76, - 0x1e, 0xa9, 0x58, 0x2b, 0x2b, 0x66, 0x52, 0x09, 0x5e, 0x36, 0xee, 0xc2, 0xd2, 0x17, 0xb1, 0xbe, - 0x90, 0x19, 0xcf, 0xac, 0x52, 0x4b, 0x53, 0x0b, 0x95, 0xa5, 0x74, 0x8c, 0xa1, 0xa2, 0x63, 0x23, - 0xd4, 0x66, 0xe0, 0x1a, 0xe0, 0x2e, 0x1d, 0x93, 0x8b, 0xd0, 0xe0, 0x32, 0x34, 0xa7, 0xac, 0x14, - 0x7c, 0x5c, 0x0e, 0x74, 0xb5, 0xfc, 0xe8, 0x40, 0xa5, 0xd7, 0xd7, 0xb4, 0x34, 0x8e, 0x05, 0x4a, - 0x59, 0xde, 0x20, 0xd6, 0xd4, 0x33, 0x19, 0xaa, 0x94, 0xca, 0x03, 0xeb, 0x49, 0x69, 0x2e, 0xff, - 0x13, 0x54, 0x8f, 0xfe, 0x13, 0x5c, 0x80, 0xfa, 0x88, 0xa6, 0x2c, 0x99, 0xdb, 0xdf, 0x11, 0x6b, - 0x69, 0x7c, 0x9a, 0x0f, 0x13, 0x16, 0x95, 0xe5, 0x52, 0x58, 0xe4, 0x45, 0x80, 0x94, 0x66, 0x74, - 0x8c, 0x29, 0x66, 0xca, 0x94, 0x8d, 0x1b, 0x2c, 0x21, 0xfe, 0x3d, 0x68, 0xd8, 0x44, 0xe8, 0x02, - 0x8e, 0x99, 0x3c, 0xd0, 0x6e, 0xea, 0xe0, 0x17, 0x86, 0x8e, 0xa0, 0xa0, 0x2c, 0xf6, 0x2a, 0x85, - 0x26, 0xf4, 0x98, 0x6c, 0x40, 0x6b, 0xc4, 0x12, 0x94, 0x26, 0xc6, 0xd2, 0xab, 0x16, 0x3f, 0x35, - 0x4b, 0x90, 0xff, 0xab, 0x03, 0xf5, 0xa2, 0xa9, 0x91, 0x2f, 0x61, 0x7d, 0x2a, 0xd0, 0x74, 0xce, - 0x24, 0xc1, 0x38, 0xe4, 0xd2, 0x5e, 0x7b, 0xff, 0x54, 0xf5, 0xb6, 0x97, 0x8f, 0xdb, 0x97, 0xe4, - 0x35, 0xed, 0x00, 0x3b, 0xa4, 0x0a, 0x43, 0x99, 0x0f, 0x33, 0x34, 0xd7, 0xbd, 0xf6, 0xb8, 0x6d, - 0xe1, 0x41, 0x81, 0xfa, 0x0f, 0xc1, 0x2d, 0x1b, 0xa5, 0x4e, 0xf9, 0x34, 0xa1, 0x59, 0xb8, 0xa4, - 0x1e, 0x57, 0x03, 0x3a, 0xb3, 0xe4, 0x32, 0x9c, 0x33, 0x93, 0x56, 0x1f, 0xe1, 0x52, 0xa3, 0x5c, - 0xd7, 0x13, 0xf7, 0x0b, 0xdc, 0xac, 0xbd, 0x04, 0x6b, 0x65, 0xcf, 0x0d, 0x23, 0x7d, 0x43, 0x16, - 0x09, 0x5d, 0x2d, 0xc1, 0x1d, 0x1e, 0xe3, 0xe6, 0x4b, 0xb0, 0xb6, 0x8b, 0x09, 0x2a, 0x2c, 0x5f, - 0x1a, 0x6d, 0xa8, 0xf4, 0x76, 0xcb, 0xe6, 0xda, 0xdb, 0xed, 0xfe, 0x59, 0x87, 0xf5, 0x32, 0x04, - 0xfa, 0xc7, 0x91, 0x45, 0x48, 0xbe, 0x73, 0xa0, 0xa6, 0x9f, 0x3f, 0xe4, 0xcd, 0xe3, 0x04, 0x72, - 0xe9, 0xc1, 0xe4, 0x5f, 0x3d, 0xce, 0xc6, 0xe2, 0x41, 0x74, 0xf1, 0xab, 0xdf, 0x7e, 0xff, 0xa1, - 0x72, 0x6e, 0x73, 0x75, 0xfb, 0xf0, 0xea, 0xe2, 0x61, 0xf7, 0xb6, 0x73, 0x99, 0xe4, 0xb0, 0x72, - 0x63, 0xbe, 0x77, 0x7d, 0x87, 0xbc, 0x71, 0x1c, 0xd2, 0x47, 0x8f, 0x2b, 0xff, 0x44, 0xef, 0x35, - 0xa2, 0xa0, 0x76, 0x63, 0xde, 0xeb, 0xff, 0x2b, 0xa7, 0xee, 0x3e, 0xe3, 0x53, 0xbf, 0x71, 0xa0, - 0x7a, 0x3d, 0x49, 0xc8, 0xf1, 0xd3, 0x76, 0xb2, 0x03, 0x37, 0xcf, 0x9b, 0x64, 0xb7, 0xc9, 0x91, - 0x64, 0x5f, 0x71, 0xc8, 0x0c, 0x56, 0x1e, 0x50, 0x15, 0x4d, 0x9e, 0xed, 0xf7, 0x5f, 0x71, 0xc8, - 0x21, 0xd4, 0x8b, 0x3a, 0x21, 0xc7, 0xfa, 0x67, 0x3e, 0x52, 0x5b, 0x27, 0x50, 0xfd, 0x0d, 0xf8, - 0xd4, 0x2d, 0x91, 0x61, 0xdd, 0x2c, 0x79, 0xfd, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xf1, - 0x1f, 0x5b, 0xe0, 0x10, 0x00, 0x00, + 0x17, 0xd6, 0x24, 0xd9, 0x64, 0x72, 0x92, 0xcd, 0xbe, 0xf5, 0x5b, 0xda, 0xe9, 0xf0, 0xb5, 0x6c, + 0x05, 0xac, 0x7a, 0x91, 0x6d, 0x97, 0x0a, 0x04, 0x02, 0xa4, 0xee, 0x6e, 0x4b, 0x03, 0xda, 0x6e, + 0x70, 0xfa, 0xc1, 0x97, 0x34, 0x72, 0x66, 0x9c, 0xc4, 0xda, 0x99, 0xf1, 0x60, 0x7b, 0x36, 0xcd, + 0x15, 0x12, 0x48, 0x5c, 0x80, 0xb8, 0xe2, 0x1f, 0xc0, 0x05, 0xb7, 0x88, 0xbf, 0xc2, 0x5f, 0x40, + 0xfc, 0x0a, 0x2e, 0x90, 0x3d, 0x9e, 0x34, 0xdb, 0x4a, 0xa8, 0xbb, 0x59, 0xca, 0x9d, 0xcf, 0x63, + 0xfb, 0xf1, 0xf1, 0x39, 0x8f, 0x8f, 0x6d, 0xb8, 0x38, 0x21, 0x22, 0x9a, 0x12, 0x41, 0xb7, 0xca, + 0x46, 0x37, 0x13, 0x5c, 0x71, 0x74, 0x65, 0xcc, 0xd4, 0x24, 0x1f, 0x76, 0x43, 0x9e, 0x74, 0x15, + 0x4b, 0x0f, 0xa9, 0x18, 0xd2, 0x38, 0x36, 0xcd, 0x62, 0x84, 0xec, 0x96, 0x33, 0xfc, 0x17, 0xc6, + 0x9c, 0x8f, 0x63, 0xba, 0x45, 0x32, 0xb6, 0x45, 0xd2, 0x94, 0x2b, 0xa2, 0x18, 0x4f, 0x65, 0x31, + 0x6e, 0xe3, 0x01, 0xb4, 0xfa, 0xb9, 0x9c, 0x60, 0xfa, 0x65, 0x4e, 0xa5, 0x42, 0xb7, 0xa1, 0x16, + 0x11, 0x45, 0x3c, 0x67, 0xdd, 0xd9, 0x6c, 0x6d, 0x5f, 0xef, 0x3e, 0xfd, 0x3a, 0xdd, 0xdb, 0xb6, + 0x81, 0x0d, 0xc3, 0x46, 0x03, 0x56, 0x6e, 0x26, 0x99, 0x9a, 0x6d, 0xbc, 0x0f, 0xf0, 0x01, 0x55, + 0xe5, 0x02, 0xff, 0x83, 0x6a, 0x42, 0x42, 0xc3, 0xdf, 0xc4, 0xba, 0x89, 0x3a, 0x50, 0x61, 0x99, + 0x57, 0x31, 0x40, 0x85, 0x65, 0xc6, 0x8e, 0xbc, 0xaa, 0xb5, 0xa3, 0x8d, 0x9f, 0x2f, 0x81, 0x5b, + 0x72, 0xdb, 0x4e, 0xa7, 0xec, 0x44, 0xfb, 0x50, 0x8b, 0x26, 0x61, 0x31, 0xbd, 0xb5, 0xfd, 0xf6, + 0x69, 0xfc, 0xed, 0xee, 0xdd, 0xde, 0xed, 0x63, 0x43, 0x83, 0xee, 0x43, 0x23, 0xa5, 0x6a, 0xc8, + 0xb9, 0x32, 0x0e, 0xb4, 0xb6, 0xdf, 0x3d, 0x15, 0xe3, 0x9d, 0x82, 0x03, 0x97, 0x64, 0x96, 0x77, + 0xca, 0xc5, 0xa1, 0x57, 0x5b, 0xaf, 0x2e, 0xc3, 0xab, 0x39, 0x70, 0x49, 0x86, 0x3e, 0x05, 0x37, + 0xa1, 0x8a, 0x98, 0x94, 0xad, 0x18, 0x87, 0xdf, 0x3b, 0x15, 0xf1, 0xbe, 0x25, 0xc1, 0x73, 0x3a, + 0xff, 0xbb, 0x0a, 0xd4, 0x74, 0x64, 0x9e, 0x22, 0x63, 0x3e, 0xb8, 0x13, 0x2e, 0x55, 0x4a, 0x12, + 0x6a, 0xf3, 0x36, 0xb7, 0xd1, 0x8b, 0x00, 0x31, 0x25, 0x92, 0x06, 0x8a, 0x25, 0xd4, 0xab, 0xad, + 0x3b, 0x9b, 0x55, 0xdc, 0x34, 0xc8, 0x5d, 0x96, 0x50, 0xf4, 0x0a, 0xb4, 0xf5, 0xb0, 0x40, 0x52, + 0x71, 0x44, 0x85, 0xf4, 0x56, 0xd6, 0xab, 0x9b, 0x4d, 0xdc, 0xd2, 0xd8, 0xa0, 0x80, 0xf4, 0x10, + 0x3d, 0x77, 0x3e, 0xa4, 0x5e, 0x0c, 0xd1, 0x58, 0x39, 0xc4, 0x83, 0xc6, 0x98, 0x28, 0x3a, 0x25, + 0x33, 0xaf, 0x61, 0xd6, 0x2f, 0x4d, 0x84, 0xa0, 0x46, 0x44, 0x38, 0xf1, 0x5c, 0x03, 0x9b, 0xb6, + 0xc6, 0x72, 0x3a, 0x62, 0x5e, 0x73, 0xdd, 0xd9, 0x74, 0xb1, 0x69, 0x6b, 0x37, 0xd9, 0x88, 0x84, + 0x34, 0x30, 0x9b, 0x00, 0x33, 0xba, 0x69, 0x90, 0x3b, 0x24, 0xa1, 0xfe, 0x37, 0x35, 0x68, 0xd8, + 0xa4, 0xa2, 0xe7, 0xa1, 0x49, 0xe2, 0x98, 0x4f, 0x83, 0xec, 0x21, 0x35, 0x51, 0x71, 0xb1, 0x6b, + 0x80, 0xfe, 0x43, 0x8a, 0x5e, 0x85, 0x4e, 0xd1, 0xa9, 0xd3, 0x33, 0x8a, 0xf9, 0xd4, 0x84, 0xc9, + 0xc5, 0xab, 0x06, 0x7d, 0x60, 0x41, 0x74, 0x0f, 0x6a, 0x4c, 0x4f, 0x2f, 0x44, 0x76, 0x63, 0x19, + 0x91, 0x75, 0x7b, 0xfd, 0x4f, 0x6e, 0x62, 0x43, 0x87, 0x12, 0x68, 0x6b, 0x48, 0x2a, 0x41, 0xb2, + 0x8c, 0x0a, 0x13, 0xee, 0xd6, 0x76, 0x6f, 0x29, 0xfa, 0x9d, 0x05, 0x42, 0x7c, 0x8c, 0x5e, 0xef, + 0x82, 0x4b, 0x46, 0xad, 0xf2, 0x96, 0xdb, 0xc5, 0x81, 0x64, 0x14, 0x1b, 0x3a, 0xff, 0x3a, 0xd4, + 0xf4, 0x9e, 0xb4, 0xf0, 0x72, 0x11, 0x97, 0xc2, 0xcb, 0x45, 0xac, 0x85, 0x16, 0xf2, 0x54, 0xd1, + 0x54, 0x49, 0x2b, 0xbf, 0xb9, 0xed, 0x77, 0xa0, 0xbd, 0xe8, 0xaa, 0xff, 0x31, 0xd4, 0x34, 0x27, + 0xba, 0x04, 0xee, 0x50, 0xeb, 0xef, 0x11, 0x55, 0x43, 0xdb, 0xf7, 0x44, 0x8c, 0x2e, 0x40, 0xfd, + 0x90, 0x8a, 0x94, 0xc6, 0x96, 0xcc, 0x5a, 0x1a, 0x67, 0x29, 0x53, 0xa2, 0xac, 0x42, 0xd6, 0xf2, + 0x7f, 0x75, 0x8c, 0x0a, 0xcc, 0xc9, 0x2b, 0x0b, 0x8f, 0x73, 0xe6, 0x85, 0xa7, 0x72, 0x86, 0x85, + 0xc7, 0xff, 0xb3, 0x03, 0x6e, 0x79, 0xb8, 0xd1, 0x79, 0x58, 0x91, 0x8a, 0x28, 0x6a, 0xe3, 0x50, + 0x18, 0xfa, 0x7c, 0x0d, 0x79, 0x1a, 0xb1, 0x74, 0x1c, 0x24, 0x3c, 0xa2, 0x66, 0xfd, 0x2a, 0x6e, + 0x59, 0x6c, 0x9f, 0x47, 0x14, 0xa5, 0xd0, 0x4e, 0x48, 0x9a, 0x8f, 0x48, 0xa8, 0x72, 0x41, 0x85, + 0x95, 0xed, 0x87, 0x4b, 0x95, 0x9a, 0xee, 0xfe, 0x02, 0x23, 0x3e, 0xc6, 0x8f, 0x86, 0xe0, 0xb2, + 0x54, 0x2a, 0x92, 0x86, 0xd4, 0x6a, 0xf8, 0xd6, 0x72, 0x6b, 0xf5, 0x2c, 0x1b, 0x9e, 0xf3, 0xa2, + 0x2f, 0xa0, 0x1e, 0xe6, 0x52, 0xf1, 0xc4, 0xca, 0x77, 0x6f, 0xb9, 0x15, 0x76, 0x0d, 0x17, 0xb6, + 0x9c, 0x7a, 0x07, 0x23, 0x12, 0xb2, 0x98, 0xa9, 0x99, 0x57, 0x3f, 0x8b, 0x1d, 0xdc, 0xb2, 0x6c, + 0x78, 0xce, 0xeb, 0x6f, 0x43, 0x7b, 0x31, 0x86, 0x4f, 0xdc, 0x8d, 0x08, 0x6a, 0x32, 0xce, 0xc7, + 0x56, 0xdc, 0xa6, 0xed, 0xff, 0xe2, 0x82, 0x5b, 0x06, 0xe3, 0x89, 0x09, 0x73, 0x7d, 0x54, 0x16, + 0xf5, 0xf1, 0x4f, 0xd5, 0xfd, 0x58, 0x2d, 0xac, 0x3d, 0x56, 0x0b, 0x2f, 0x40, 0x5d, 0x50, 0x19, + 0xe6, 0x45, 0x81, 0x70, 0xb1, 0xb5, 0xd0, 0x08, 0x2a, 0x07, 0x03, 0x1b, 0x95, 0xfb, 0x67, 0x93, + 0xd7, 0xee, 0x41, 0x46, 0x05, 0x51, 0x2c, 0x1d, 0x0f, 0x66, 0x52, 0xd1, 0x04, 0x57, 0x0e, 0x06, + 0xba, 0xa6, 0x93, 0x78, 0x4a, 0x66, 0xd2, 0x78, 0xd7, 0x30, 0x3e, 0x34, 0x0b, 0x44, 0xbb, 0xf7, + 0x1a, 0xac, 0xe9, 0xa2, 0x19, 0xc8, 0x50, 0xb0, 0x4c, 0x99, 0xfa, 0x50, 0xdc, 0x12, 0xab, 0x1a, + 0x1e, 0x18, 0x54, 0x57, 0x89, 0xcf, 0xa1, 0xca, 0x32, 0xe9, 0x35, 0xcd, 0xbd, 0xdd, 0x3b, 0x23, + 0x7f, 0x7b, 0x7d, 0xac, 0x59, 0x75, 0x70, 0x73, 0x49, 0x85, 0xb9, 0xc0, 0x8b, 0x5b, 0x67, 0x6e, + 0xa3, 0x6d, 0x78, 0x2e, 0x14, 0xb3, 0x4c, 0xd1, 0x28, 0x10, 0x9c, 0xab, 0x20, 0x23, 0x52, 0x4e, + 0xb9, 0x88, 0xbc, 0x96, 0x19, 0xf8, 0x7f, 0xdb, 0x89, 0x39, 0x57, 0x7d, 0xdb, 0xa5, 0x73, 0xae, + 0xc8, 0x58, 0x7a, 0x6d, 0x73, 0x49, 0x9a, 0x36, 0x9a, 0x40, 0x43, 0x2a, 0x2e, 0xc8, 0x98, 0x7a, + 0xab, 0x26, 0xe8, 0x77, 0xce, 0x68, 0x13, 0x83, 0x82, 0x15, 0x97, 0xf4, 0xba, 0xd6, 0x4a, 0x39, + 0x09, 0x0e, 0xe9, 0x4c, 0x7a, 0x1d, 0xe3, 0x41, 0x43, 0xca, 0xc9, 0x47, 0x74, 0x26, 0xd1, 0x65, + 0x58, 0xb5, 0x8f, 0x96, 0x40, 0x50, 0x12, 0xcd, 0xbc, 0x35, 0x93, 0x8f, 0xb6, 0x05, 0xb1, 0xc6, + 0xfc, 0x1f, 0x1c, 0x58, 0x7b, 0x2c, 0x93, 0x73, 0x15, 0x3b, 0x8f, 0x54, 0xac, 0x95, 0x15, 0x31, + 0xa9, 0x04, 0x2f, 0x0b, 0x77, 0x61, 0xe9, 0x77, 0x80, 0x7e, 0x0f, 0x30, 0x9e, 0x5a, 0xa5, 0x96, + 0xa6, 0x16, 0x2a, 0x4b, 0xc8, 0x98, 0x06, 0x8a, 0x8c, 0x8d, 0x50, 0x9b, 0xd8, 0x35, 0xc0, 0x5d, + 0x32, 0x46, 0x17, 0xa1, 0xc1, 0x65, 0x60, 0x56, 0x59, 0x29, 0xf8, 0xb8, 0x1c, 0xe8, 0xd3, 0xf2, + 0x93, 0x03, 0x95, 0x5e, 0x5f, 0xd3, 0x92, 0x28, 0x12, 0x54, 0xca, 0xf2, 0x06, 0xb1, 0xa6, 0xee, + 0x49, 0xa9, 0x4a, 0x88, 0x3c, 0xb4, 0x9e, 0x94, 0xe6, 0xe2, 0x93, 0xa4, 0x7a, 0xfc, 0x49, 0x72, + 0x01, 0xea, 0x23, 0x92, 0xb0, 0x78, 0x66, 0x5f, 0x43, 0xd6, 0xd2, 0x78, 0x96, 0x0f, 0x63, 0x16, + 0x96, 0xc7, 0xa5, 0xb0, 0xd0, 0x4b, 0x00, 0x09, 0x49, 0xc9, 0x98, 0x26, 0x34, 0x55, 0xe6, 0xd8, + 0xb8, 0x78, 0x01, 0xf1, 0xef, 0x41, 0xc3, 0x26, 0x42, 0x1f, 0xe0, 0x88, 0xc9, 0x43, 0xed, 0xa6, + 0x0e, 0x7e, 0x61, 0xe8, 0x08, 0x0a, 0xc2, 0x22, 0xaf, 0x52, 0x68, 0x42, 0xb7, 0xd1, 0x3a, 0xb4, + 0x46, 0x2c, 0xa6, 0xd2, 0xc4, 0x58, 0x7a, 0xd5, 0xe2, 0x4d, 0xb5, 0x00, 0xf9, 0xbf, 0x39, 0x50, + 0x2f, 0x8a, 0x1a, 0xfa, 0x0a, 0xd6, 0x32, 0x41, 0x4d, 0xe5, 0x8c, 0x63, 0x1a, 0x05, 0x5c, 0xda, + 0x6b, 0xef, 0xdf, 0x3a, 0xbd, 0x9d, 0xc5, 0xe5, 0x0e, 0x24, 0x7a, 0x5d, 0x3b, 0xc0, 0x8e, 0x88, + 0xa2, 0x81, 0xcc, 0x87, 0x29, 0x35, 0xd7, 0xbf, 0xf6, 0xb8, 0x63, 0xe1, 0x41, 0x81, 0xfa, 0x0f, + 0xc1, 0x2d, 0x0b, 0xa5, 0x4e, 0x79, 0x16, 0x93, 0x34, 0x58, 0x50, 0x8f, 0xab, 0x01, 0x9d, 0x59, + 0x74, 0x05, 0xce, 0x99, 0x4e, 0xab, 0x8f, 0x60, 0xa1, 0x50, 0xae, 0xe9, 0x8e, 0xfb, 0x05, 0x6e, + 0xc6, 0x5e, 0x86, 0xd5, 0xb2, 0xe6, 0x06, 0xa1, 0xbe, 0x21, 0x8b, 0x84, 0xb6, 0x4b, 0x70, 0x97, + 0x47, 0x74, 0xe3, 0x65, 0x58, 0xdd, 0xa3, 0x31, 0x55, 0xb4, 0xfc, 0xe8, 0x74, 0xa0, 0xd2, 0xdb, + 0x2b, 0x8b, 0x6b, 0x6f, 0x6f, 0xfb, 0xaf, 0x3a, 0xac, 0x95, 0x21, 0xd0, 0xef, 0x56, 0x16, 0x52, + 0xf4, 0xbd, 0x03, 0x35, 0xfd, 0xfb, 0x42, 0x6f, 0x9d, 0x24, 0x90, 0x0b, 0xff, 0x35, 0xff, 0xda, + 0x49, 0x26, 0x16, 0xff, 0xb1, 0x8b, 0x5f, 0xff, 0xfe, 0xc7, 0x8f, 0x95, 0x73, 0x1b, 0xed, 0xad, + 0xa3, 0x6b, 0xf3, 0x7f, 0xe5, 0x3b, 0xce, 0x15, 0x94, 0xc3, 0xca, 0xce, 0x6c, 0xff, 0xc6, 0x2e, + 0x7a, 0xf3, 0x24, 0xa4, 0x8f, 0xfe, 0x76, 0xfe, 0xa9, 0xbe, 0x8b, 0x48, 0x41, 0x6d, 0x67, 0xd6, + 0xeb, 0xff, 0x27, 0xab, 0xee, 0x3d, 0xe3, 0x55, 0xbf, 0x75, 0xa0, 0x7a, 0x23, 0x8e, 0xd1, 0xc9, + 0xd3, 0x76, 0xba, 0x05, 0x37, 0xce, 0x9b, 0x64, 0x77, 0xd0, 0xb1, 0x64, 0x5f, 0x75, 0xd0, 0x14, + 0x56, 0x1e, 0x10, 0x15, 0x4e, 0x9e, 0xed, 0xfe, 0xaf, 0x3a, 0xe8, 0x08, 0xea, 0xc5, 0x39, 0x41, + 0x27, 0x7a, 0x33, 0x1f, 0x3b, 0x5b, 0xa7, 0x50, 0xfd, 0x0e, 0x7c, 0xe6, 0x96, 0xc8, 0xb0, 0x6e, + 0x86, 0xbc, 0xf1, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0xb5, 0x43, 0x43, 0x5f, 0x11, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index a98d98e74..e59010fc8 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -55,6 +55,9 @@ message Hardware { message IPXE { string url = 1; string contents = 2; + } + message Bootstrapper { + } message Osie { string base_url = 1; @@ -65,7 +68,7 @@ message Hardware { bool allow_pxe = 1; bool allow_workflow = 2; IPXE ipxe = 3; -// Bootstrapper bootstrapper = 4; + Bootstrapper bootstrapper = 4; Osie osie = 5; } message Network { From c6388e536bd865c69eb5af392d7a0343843af08e Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 8 May 2020 14:46:33 -0400 Subject: [PATCH 10/31] update dhcp ip --- db/hardware.go | 6 +- db/workflow.go | 4 +- protos/hardware/hardware.pb.go | 259 +++++++++++++++++++++------------ protos/hardware/hardware.proto | 16 +- 4 files changed, 180 insertions(+), 105 deletions(-) diff --git a/db/hardware.go b/db/hardware.go index f2847af61..4abe51366 100644 --- a/db/hardware.go +++ b/db/hardware.go @@ -90,7 +90,7 @@ func GetByIP(ctx context.Context, db *sql.DB, ip string) (string, error) { "instance": { "ip_addresses": [ { - "address": "` + ip + `" + "address": "` + ip + `" } ] } @@ -99,7 +99,9 @@ func GetByIP(ctx context.Context, db *sql.DB, ip string) (string, error) { hardwareOrManagement := ` { "dhcp": { - "ip": "` + ip + `" + "ip": { + "address": "` + ip + `" + } } } ` diff --git a/db/workflow.go b/db/workflow.go index 7e0dbded8..ed8ae46a6 100644 --- a/db/workflow.go +++ b/db/workflow.go @@ -760,7 +760,9 @@ func getWorkerIDbyIP(ctx context.Context, db *sql.DB, ip string) (string, error) hardwareOrManagement := ` { "dhcp": { - "ip": "` + ip + `" + "ip": { + "address": "` + ip + `" + } } } ` diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index d8c215fb6..61ce5b793 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -228,7 +228,7 @@ type Hardware_DHCP struct { LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` NameServers []string `protobuf:"bytes,5,rep,name=name_servers,json=nameServers,proto3" json:"name_servers,omitempty"` TimeServers []string `protobuf:"bytes,6,rep,name=time_servers,json=timeServers,proto3" json:"time_servers,omitempty"` - Gateway string `protobuf:"bytes,7,opt,name=gateway,proto3" json:"gateway,omitempty"` + OBSOLETEGateway string `protobuf:"bytes,7,opt,name=OBSOLETE_gateway,json=OBSOLETEGateway,proto3" json:"OBSOLETE_gateway,omitempty"` Arch string `protobuf:"bytes,8,opt,name=arch,proto3" json:"arch,omitempty"` Uefi bool `protobuf:"varint,9,opt,name=uefi,proto3" json:"uefi,omitempty"` IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` @@ -304,9 +304,9 @@ func (m *Hardware_DHCP) GetTimeServers() []string { return nil } -func (m *Hardware_DHCP) GetGateway() string { +func (m *Hardware_DHCP) GetOBSOLETEGateway() string { if m != nil { - return m.Gateway + return m.OBSOLETEGateway } return "" } @@ -332,11 +332,74 @@ func (m *Hardware_DHCP) GetIfaceName() string { return "" } +type Hardware_DHCP_IP struct { + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Netmask string `protobuf:"bytes,2,opt,name=netmask,proto3" json:"netmask,omitempty"` + Gateway string `protobuf:"bytes,3,opt,name=gateway,proto3" json:"gateway,omitempty"` + Family int64 `protobuf:"varint,4,opt,name=family,proto3" json:"family,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_DHCP_IP) Reset() { *m = Hardware_DHCP_IP{} } +func (m *Hardware_DHCP_IP) String() string { return proto.CompactTextString(m) } +func (*Hardware_DHCP_IP) ProtoMessage() {} +func (*Hardware_DHCP_IP) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 0, 0} +} + +func (m *Hardware_DHCP_IP) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_DHCP_IP.Unmarshal(m, b) +} +func (m *Hardware_DHCP_IP) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_DHCP_IP.Marshal(b, m, deterministic) +} +func (m *Hardware_DHCP_IP) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_DHCP_IP.Merge(m, src) +} +func (m *Hardware_DHCP_IP) XXX_Size() int { + return xxx_messageInfo_Hardware_DHCP_IP.Size(m) +} +func (m *Hardware_DHCP_IP) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_DHCP_IP.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_DHCP_IP proto.InternalMessageInfo + +func (m *Hardware_DHCP_IP) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *Hardware_DHCP_IP) GetNetmask() string { + if m != nil { + return m.Netmask + } + return "" +} + +func (m *Hardware_DHCP_IP) GetGateway() string { + if m != nil { + return m.Gateway + } + return "" +} + +func (m *Hardware_DHCP_IP) GetFamily() int64 { + if m != nil { + return m.Family + } + return 0 +} + type Hardware_Netboot struct { AllowPxe bool `protobuf:"varint,1,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` AllowWorkflow bool `protobuf:"varint,2,opt,name=allow_workflow,json=allowWorkflow,proto3" json:"allow_workflow,omitempty"` Ipxe *Hardware_Netboot_IPXE `protobuf:"bytes,3,opt,name=ipxe,proto3" json:"ipxe,omitempty"` - Bootstrapper *Hardware_Netboot_Bootstrapper `protobuf:"bytes,4,opt,name=bootstrapper,proto3" json:"bootstrapper,omitempty"` + OBSOLETEBootstrapper *Hardware_Netboot_Bootstrapper `protobuf:"bytes,4,opt,name=OBSOLETE_bootstrapper,json=OBSOLETEBootstrapper,proto3" json:"OBSOLETE_bootstrapper,omitempty"` Osie *Hardware_Netboot_Osie `protobuf:"bytes,5,opt,name=osie,proto3" json:"osie,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -389,9 +452,9 @@ func (m *Hardware_Netboot) GetIpxe() *Hardware_Netboot_IPXE { return nil } -func (m *Hardware_Netboot) GetBootstrapper() *Hardware_Netboot_Bootstrapper { +func (m *Hardware_Netboot) GetOBSOLETEBootstrapper() *Hardware_Netboot_Bootstrapper { if m != nil { - return m.Bootstrapper + return m.OBSOLETEBootstrapper } return nil } @@ -1216,6 +1279,7 @@ func init() { proto.RegisterType((*GetRequest)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.GetRequest") proto.RegisterType((*Hardware)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware") proto.RegisterType((*Hardware_DHCP)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.DHCP") + proto.RegisterType((*Hardware_DHCP_IP)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.DHCP.IP") proto.RegisterType((*Hardware_Netboot)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot") proto.RegisterType((*Hardware_Netboot_IPXE)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.IPXE") proto.RegisterType((*Hardware_Netboot_Bootstrapper)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Bootstrapper") @@ -1237,97 +1301,98 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1425 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x5d, 0x8f, 0x1b, 0x35, - 0x17, 0xd6, 0x24, 0xd9, 0x64, 0x72, 0x92, 0xcd, 0xbe, 0xf5, 0x5b, 0xda, 0xe9, 0xf0, 0xb5, 0x6c, - 0x05, 0xac, 0x7a, 0x91, 0x6d, 0x97, 0x0a, 0x04, 0x02, 0xa4, 0xee, 0x6e, 0x4b, 0x03, 0xda, 0x6e, - 0x70, 0xfa, 0xc1, 0x97, 0x34, 0x72, 0x66, 0x9c, 0xc4, 0xda, 0x99, 0xf1, 0x60, 0x7b, 0x36, 0xcd, - 0x15, 0x12, 0x48, 0x5c, 0x80, 0xb8, 0xe2, 0x1f, 0xc0, 0x05, 0xb7, 0x88, 0xbf, 0xc2, 0x5f, 0x40, - 0xfc, 0x0a, 0x2e, 0x90, 0x3d, 0x9e, 0x34, 0xdb, 0x4a, 0xa8, 0xbb, 0x59, 0xca, 0x9d, 0xcf, 0x63, - 0xfb, 0xf1, 0xf1, 0x39, 0x8f, 0x8f, 0x6d, 0xb8, 0x38, 0x21, 0x22, 0x9a, 0x12, 0x41, 0xb7, 0xca, - 0x46, 0x37, 0x13, 0x5c, 0x71, 0x74, 0x65, 0xcc, 0xd4, 0x24, 0x1f, 0x76, 0x43, 0x9e, 0x74, 0x15, - 0x4b, 0x0f, 0xa9, 0x18, 0xd2, 0x38, 0x36, 0xcd, 0x62, 0x84, 0xec, 0x96, 0x33, 0xfc, 0x17, 0xc6, - 0x9c, 0x8f, 0x63, 0xba, 0x45, 0x32, 0xb6, 0x45, 0xd2, 0x94, 0x2b, 0xa2, 0x18, 0x4f, 0x65, 0x31, - 0x6e, 0xe3, 0x01, 0xb4, 0xfa, 0xb9, 0x9c, 0x60, 0xfa, 0x65, 0x4e, 0xa5, 0x42, 0xb7, 0xa1, 0x16, - 0x11, 0x45, 0x3c, 0x67, 0xdd, 0xd9, 0x6c, 0x6d, 0x5f, 0xef, 0x3e, 0xfd, 0x3a, 0xdd, 0xdb, 0xb6, - 0x81, 0x0d, 0xc3, 0x46, 0x03, 0x56, 0x6e, 0x26, 0x99, 0x9a, 0x6d, 0xbc, 0x0f, 0xf0, 0x01, 0x55, - 0xe5, 0x02, 0xff, 0x83, 0x6a, 0x42, 0x42, 0xc3, 0xdf, 0xc4, 0xba, 0x89, 0x3a, 0x50, 0x61, 0x99, - 0x57, 0x31, 0x40, 0x85, 0x65, 0xc6, 0x8e, 0xbc, 0xaa, 0xb5, 0xa3, 0x8d, 0x9f, 0x2f, 0x81, 0x5b, - 0x72, 0xdb, 0x4e, 0xa7, 0xec, 0x44, 0xfb, 0x50, 0x8b, 0x26, 0x61, 0x31, 0xbd, 0xb5, 0xfd, 0xf6, - 0x69, 0xfc, 0xed, 0xee, 0xdd, 0xde, 0xed, 0x63, 0x43, 0x83, 0xee, 0x43, 0x23, 0xa5, 0x6a, 0xc8, - 0xb9, 0x32, 0x0e, 0xb4, 0xb6, 0xdf, 0x3d, 0x15, 0xe3, 0x9d, 0x82, 0x03, 0x97, 0x64, 0x96, 0x77, - 0xca, 0xc5, 0xa1, 0x57, 0x5b, 0xaf, 0x2e, 0xc3, 0xab, 0x39, 0x70, 0x49, 0x86, 0x3e, 0x05, 0x37, - 0xa1, 0x8a, 0x98, 0x94, 0xad, 0x18, 0x87, 0xdf, 0x3b, 0x15, 0xf1, 0xbe, 0x25, 0xc1, 0x73, 0x3a, - 0xff, 0xbb, 0x0a, 0xd4, 0x74, 0x64, 0x9e, 0x22, 0x63, 0x3e, 0xb8, 0x13, 0x2e, 0x55, 0x4a, 0x12, - 0x6a, 0xf3, 0x36, 0xb7, 0xd1, 0x8b, 0x00, 0x31, 0x25, 0x92, 0x06, 0x8a, 0x25, 0xd4, 0xab, 0xad, - 0x3b, 0x9b, 0x55, 0xdc, 0x34, 0xc8, 0x5d, 0x96, 0x50, 0xf4, 0x0a, 0xb4, 0xf5, 0xb0, 0x40, 0x52, - 0x71, 0x44, 0x85, 0xf4, 0x56, 0xd6, 0xab, 0x9b, 0x4d, 0xdc, 0xd2, 0xd8, 0xa0, 0x80, 0xf4, 0x10, - 0x3d, 0x77, 0x3e, 0xa4, 0x5e, 0x0c, 0xd1, 0x58, 0x39, 0xc4, 0x83, 0xc6, 0x98, 0x28, 0x3a, 0x25, - 0x33, 0xaf, 0x61, 0xd6, 0x2f, 0x4d, 0x84, 0xa0, 0x46, 0x44, 0x38, 0xf1, 0x5c, 0x03, 0x9b, 0xb6, - 0xc6, 0x72, 0x3a, 0x62, 0x5e, 0x73, 0xdd, 0xd9, 0x74, 0xb1, 0x69, 0x6b, 0x37, 0xd9, 0x88, 0x84, - 0x34, 0x30, 0x9b, 0x00, 0x33, 0xba, 0x69, 0x90, 0x3b, 0x24, 0xa1, 0xfe, 0x37, 0x35, 0x68, 0xd8, - 0xa4, 0xa2, 0xe7, 0xa1, 0x49, 0xe2, 0x98, 0x4f, 0x83, 0xec, 0x21, 0x35, 0x51, 0x71, 0xb1, 0x6b, - 0x80, 0xfe, 0x43, 0x8a, 0x5e, 0x85, 0x4e, 0xd1, 0xa9, 0xd3, 0x33, 0x8a, 0xf9, 0xd4, 0x84, 0xc9, - 0xc5, 0xab, 0x06, 0x7d, 0x60, 0x41, 0x74, 0x0f, 0x6a, 0x4c, 0x4f, 0x2f, 0x44, 0x76, 0x63, 0x19, - 0x91, 0x75, 0x7b, 0xfd, 0x4f, 0x6e, 0x62, 0x43, 0x87, 0x12, 0x68, 0x6b, 0x48, 0x2a, 0x41, 0xb2, - 0x8c, 0x0a, 0x13, 0xee, 0xd6, 0x76, 0x6f, 0x29, 0xfa, 0x9d, 0x05, 0x42, 0x7c, 0x8c, 0x5e, 0xef, - 0x82, 0x4b, 0x46, 0xad, 0xf2, 0x96, 0xdb, 0xc5, 0x81, 0x64, 0x14, 0x1b, 0x3a, 0xff, 0x3a, 0xd4, - 0xf4, 0x9e, 0xb4, 0xf0, 0x72, 0x11, 0x97, 0xc2, 0xcb, 0x45, 0xac, 0x85, 0x16, 0xf2, 0x54, 0xd1, - 0x54, 0x49, 0x2b, 0xbf, 0xb9, 0xed, 0x77, 0xa0, 0xbd, 0xe8, 0xaa, 0xff, 0x31, 0xd4, 0x34, 0x27, - 0xba, 0x04, 0xee, 0x50, 0xeb, 0xef, 0x11, 0x55, 0x43, 0xdb, 0xf7, 0x44, 0x8c, 0x2e, 0x40, 0xfd, - 0x90, 0x8a, 0x94, 0xc6, 0x96, 0xcc, 0x5a, 0x1a, 0x67, 0x29, 0x53, 0xa2, 0xac, 0x42, 0xd6, 0xf2, - 0x7f, 0x75, 0x8c, 0x0a, 0xcc, 0xc9, 0x2b, 0x0b, 0x8f, 0x73, 0xe6, 0x85, 0xa7, 0x72, 0x86, 0x85, - 0xc7, 0xff, 0xb3, 0x03, 0x6e, 0x79, 0xb8, 0xd1, 0x79, 0x58, 0x91, 0x8a, 0x28, 0x6a, 0xe3, 0x50, - 0x18, 0xfa, 0x7c, 0x0d, 0x79, 0x1a, 0xb1, 0x74, 0x1c, 0x24, 0x3c, 0xa2, 0x66, 0xfd, 0x2a, 0x6e, - 0x59, 0x6c, 0x9f, 0x47, 0x14, 0xa5, 0xd0, 0x4e, 0x48, 0x9a, 0x8f, 0x48, 0xa8, 0x72, 0x41, 0x85, - 0x95, 0xed, 0x87, 0x4b, 0x95, 0x9a, 0xee, 0xfe, 0x02, 0x23, 0x3e, 0xc6, 0x8f, 0x86, 0xe0, 0xb2, - 0x54, 0x2a, 0x92, 0x86, 0xd4, 0x6a, 0xf8, 0xd6, 0x72, 0x6b, 0xf5, 0x2c, 0x1b, 0x9e, 0xf3, 0xa2, - 0x2f, 0xa0, 0x1e, 0xe6, 0x52, 0xf1, 0xc4, 0xca, 0x77, 0x6f, 0xb9, 0x15, 0x76, 0x0d, 0x17, 0xb6, - 0x9c, 0x7a, 0x07, 0x23, 0x12, 0xb2, 0x98, 0xa9, 0x99, 0x57, 0x3f, 0x8b, 0x1d, 0xdc, 0xb2, 0x6c, - 0x78, 0xce, 0xeb, 0x6f, 0x43, 0x7b, 0x31, 0x86, 0x4f, 0xdc, 0x8d, 0x08, 0x6a, 0x32, 0xce, 0xc7, - 0x56, 0xdc, 0xa6, 0xed, 0xff, 0xe2, 0x82, 0x5b, 0x06, 0xe3, 0x89, 0x09, 0x73, 0x7d, 0x54, 0x16, - 0xf5, 0xf1, 0x4f, 0xd5, 0xfd, 0x58, 0x2d, 0xac, 0x3d, 0x56, 0x0b, 0x2f, 0x40, 0x5d, 0x50, 0x19, - 0xe6, 0x45, 0x81, 0x70, 0xb1, 0xb5, 0xd0, 0x08, 0x2a, 0x07, 0x03, 0x1b, 0x95, 0xfb, 0x67, 0x93, - 0xd7, 0xee, 0x41, 0x46, 0x05, 0x51, 0x2c, 0x1d, 0x0f, 0x66, 0x52, 0xd1, 0x04, 0x57, 0x0e, 0x06, - 0xba, 0xa6, 0x93, 0x78, 0x4a, 0x66, 0xd2, 0x78, 0xd7, 0x30, 0x3e, 0x34, 0x0b, 0x44, 0xbb, 0xf7, - 0x1a, 0xac, 0xe9, 0xa2, 0x19, 0xc8, 0x50, 0xb0, 0x4c, 0x99, 0xfa, 0x50, 0xdc, 0x12, 0xab, 0x1a, - 0x1e, 0x18, 0x54, 0x57, 0x89, 0xcf, 0xa1, 0xca, 0x32, 0xe9, 0x35, 0xcd, 0xbd, 0xdd, 0x3b, 0x23, - 0x7f, 0x7b, 0x7d, 0xac, 0x59, 0x75, 0x70, 0x73, 0x49, 0x85, 0xb9, 0xc0, 0x8b, 0x5b, 0x67, 0x6e, - 0xa3, 0x6d, 0x78, 0x2e, 0x14, 0xb3, 0x4c, 0xd1, 0x28, 0x10, 0x9c, 0xab, 0x20, 0x23, 0x52, 0x4e, - 0xb9, 0x88, 0xbc, 0x96, 0x19, 0xf8, 0x7f, 0xdb, 0x89, 0x39, 0x57, 0x7d, 0xdb, 0xa5, 0x73, 0xae, - 0xc8, 0x58, 0x7a, 0x6d, 0x73, 0x49, 0x9a, 0x36, 0x9a, 0x40, 0x43, 0x2a, 0x2e, 0xc8, 0x98, 0x7a, - 0xab, 0x26, 0xe8, 0x77, 0xce, 0x68, 0x13, 0x83, 0x82, 0x15, 0x97, 0xf4, 0xba, 0xd6, 0x4a, 0x39, - 0x09, 0x0e, 0xe9, 0x4c, 0x7a, 0x1d, 0xe3, 0x41, 0x43, 0xca, 0xc9, 0x47, 0x74, 0x26, 0xd1, 0x65, - 0x58, 0xb5, 0x8f, 0x96, 0x40, 0x50, 0x12, 0xcd, 0xbc, 0x35, 0x93, 0x8f, 0xb6, 0x05, 0xb1, 0xc6, - 0xfc, 0x1f, 0x1c, 0x58, 0x7b, 0x2c, 0x93, 0x73, 0x15, 0x3b, 0x8f, 0x54, 0xac, 0x95, 0x15, 0x31, - 0xa9, 0x04, 0x2f, 0x0b, 0x77, 0x61, 0xe9, 0x77, 0x80, 0x7e, 0x0f, 0x30, 0x9e, 0x5a, 0xa5, 0x96, - 0xa6, 0x16, 0x2a, 0x4b, 0xc8, 0x98, 0x06, 0x8a, 0x8c, 0x8d, 0x50, 0x9b, 0xd8, 0x35, 0xc0, 0x5d, - 0x32, 0x46, 0x17, 0xa1, 0xc1, 0x65, 0x60, 0x56, 0x59, 0x29, 0xf8, 0xb8, 0x1c, 0xe8, 0xd3, 0xf2, - 0x93, 0x03, 0x95, 0x5e, 0x5f, 0xd3, 0x92, 0x28, 0x12, 0x54, 0xca, 0xf2, 0x06, 0xb1, 0xa6, 0xee, - 0x49, 0xa9, 0x4a, 0x88, 0x3c, 0xb4, 0x9e, 0x94, 0xe6, 0xe2, 0x93, 0xa4, 0x7a, 0xfc, 0x49, 0x72, - 0x01, 0xea, 0x23, 0x92, 0xb0, 0x78, 0x66, 0x5f, 0x43, 0xd6, 0xd2, 0x78, 0x96, 0x0f, 0x63, 0x16, - 0x96, 0xc7, 0xa5, 0xb0, 0xd0, 0x4b, 0x00, 0x09, 0x49, 0xc9, 0x98, 0x26, 0x34, 0x55, 0xe6, 0xd8, - 0xb8, 0x78, 0x01, 0xf1, 0xef, 0x41, 0xc3, 0x26, 0x42, 0x1f, 0xe0, 0x88, 0xc9, 0x43, 0xed, 0xa6, - 0x0e, 0x7e, 0x61, 0xe8, 0x08, 0x0a, 0xc2, 0x22, 0xaf, 0x52, 0x68, 0x42, 0xb7, 0xd1, 0x3a, 0xb4, - 0x46, 0x2c, 0xa6, 0xd2, 0xc4, 0x58, 0x7a, 0xd5, 0xe2, 0x4d, 0xb5, 0x00, 0xf9, 0xbf, 0x39, 0x50, - 0x2f, 0x8a, 0x1a, 0xfa, 0x0a, 0xd6, 0x32, 0x41, 0x4d, 0xe5, 0x8c, 0x63, 0x1a, 0x05, 0x5c, 0xda, - 0x6b, 0xef, 0xdf, 0x3a, 0xbd, 0x9d, 0xc5, 0xe5, 0x0e, 0x24, 0x7a, 0x5d, 0x3b, 0xc0, 0x8e, 0x88, - 0xa2, 0x81, 0xcc, 0x87, 0x29, 0x35, 0xd7, 0xbf, 0xf6, 0xb8, 0x63, 0xe1, 0x41, 0x81, 0xfa, 0x0f, - 0xc1, 0x2d, 0x0b, 0xa5, 0x4e, 0x79, 0x16, 0x93, 0x34, 0x58, 0x50, 0x8f, 0xab, 0x01, 0x9d, 0x59, - 0x74, 0x05, 0xce, 0x99, 0x4e, 0xab, 0x8f, 0x60, 0xa1, 0x50, 0xae, 0xe9, 0x8e, 0xfb, 0x05, 0x6e, - 0xc6, 0x5e, 0x86, 0xd5, 0xb2, 0xe6, 0x06, 0xa1, 0xbe, 0x21, 0x8b, 0x84, 0xb6, 0x4b, 0x70, 0x97, - 0x47, 0x74, 0xe3, 0x65, 0x58, 0xdd, 0xa3, 0x31, 0x55, 0xb4, 0xfc, 0xe8, 0x74, 0xa0, 0xd2, 0xdb, - 0x2b, 0x8b, 0x6b, 0x6f, 0x6f, 0xfb, 0xaf, 0x3a, 0xac, 0x95, 0x21, 0xd0, 0xef, 0x56, 0x16, 0x52, - 0xf4, 0xbd, 0x03, 0x35, 0xfd, 0xfb, 0x42, 0x6f, 0x9d, 0x24, 0x90, 0x0b, 0xff, 0x35, 0xff, 0xda, - 0x49, 0x26, 0x16, 0xff, 0xb1, 0x8b, 0x5f, 0xff, 0xfe, 0xc7, 0x8f, 0x95, 0x73, 0x1b, 0xed, 0xad, - 0xa3, 0x6b, 0xf3, 0x7f, 0xe5, 0x3b, 0xce, 0x15, 0x94, 0xc3, 0xca, 0xce, 0x6c, 0xff, 0xc6, 0x2e, - 0x7a, 0xf3, 0x24, 0xa4, 0x8f, 0xfe, 0x76, 0xfe, 0xa9, 0xbe, 0x8b, 0x48, 0x41, 0x6d, 0x67, 0xd6, - 0xeb, 0xff, 0x27, 0xab, 0xee, 0x3d, 0xe3, 0x55, 0xbf, 0x75, 0xa0, 0x7a, 0x23, 0x8e, 0xd1, 0xc9, - 0xd3, 0x76, 0xba, 0x05, 0x37, 0xce, 0x9b, 0x64, 0x77, 0xd0, 0xb1, 0x64, 0x5f, 0x75, 0xd0, 0x14, - 0x56, 0x1e, 0x10, 0x15, 0x4e, 0x9e, 0xed, 0xfe, 0xaf, 0x3a, 0xe8, 0x08, 0xea, 0xc5, 0x39, 0x41, - 0x27, 0x7a, 0x33, 0x1f, 0x3b, 0x5b, 0xa7, 0x50, 0xfd, 0x0e, 0x7c, 0xe6, 0x96, 0xc8, 0xb0, 0x6e, - 0x86, 0xbc, 0xf1, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0xb5, 0x43, 0x43, 0x5f, 0x11, 0x00, - 0x00, + // 1451 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4b, 0x93, 0x1b, 0xb5, + 0x16, 0xae, 0xb6, 0x3d, 0x76, 0xfb, 0xd8, 0xe3, 0x49, 0x74, 0xf3, 0xe8, 0xdb, 0xf7, 0x35, 0x77, + 0x52, 0xf7, 0x32, 0x64, 0xe1, 0x49, 0x86, 0x14, 0x14, 0x14, 0x50, 0x95, 0x79, 0x24, 0x31, 0x30, + 0x19, 0xd3, 0xce, 0x83, 0x57, 0x55, 0x97, 0xdc, 0x2d, 0xdb, 0x62, 0xba, 0x5b, 0x8d, 0xa4, 0x1e, + 0xc7, 0x1b, 0xa8, 0x62, 0x01, 0x0b, 0x8a, 0x15, 0xfc, 0x02, 0x36, 0x6c, 0x81, 0xbf, 0xc2, 0x5f, + 0xa0, 0xf8, 0x15, 0x2c, 0x28, 0xa9, 0x25, 0xc7, 0x93, 0x54, 0x51, 0x99, 0x07, 0x61, 0xa7, 0xf3, + 0x49, 0xfa, 0xce, 0xd1, 0x79, 0x49, 0x82, 0xcb, 0x13, 0xcc, 0xe3, 0x29, 0xe6, 0x64, 0xc3, 0x0e, + 0xba, 0x39, 0x67, 0x92, 0xa1, 0xab, 0x63, 0x2a, 0x27, 0xc5, 0xb0, 0x1b, 0xb1, 0xb4, 0x2b, 0x69, + 0x76, 0x40, 0xf8, 0x90, 0x24, 0x89, 0x1e, 0x96, 0x2b, 0x44, 0xd7, 0xee, 0xf0, 0xff, 0x39, 0x66, + 0x6c, 0x9c, 0x90, 0x0d, 0x9c, 0xd3, 0x0d, 0x9c, 0x65, 0x4c, 0x62, 0x49, 0x59, 0x26, 0xca, 0x75, + 0x6b, 0x0f, 0xa1, 0xd5, 0x2f, 0xc4, 0x24, 0x20, 0x9f, 0x14, 0x44, 0x48, 0x74, 0x07, 0x6a, 0x31, + 0x96, 0xd8, 0x73, 0x56, 0x9d, 0xf5, 0xd6, 0xe6, 0x8d, 0xee, 0xb3, 0xeb, 0xe9, 0xde, 0x31, 0x83, + 0x40, 0x33, 0xac, 0x35, 0x60, 0x69, 0x37, 0xcd, 0xe5, 0x6c, 0xed, 0x4d, 0x80, 0xdb, 0x44, 0x5a, + 0x05, 0xe7, 0xa0, 0x9a, 0xe2, 0x48, 0xf3, 0x37, 0x03, 0x35, 0x44, 0x1d, 0xa8, 0xd0, 0xdc, 0xab, + 0x68, 0xa0, 0x42, 0x73, 0x2d, 0xc7, 0x5e, 0xd5, 0xc8, 0xf1, 0xda, 0x8f, 0x3e, 0xb8, 0x96, 0xdb, + 0x4c, 0x3a, 0x76, 0x12, 0xed, 0x41, 0x2d, 0x9e, 0x44, 0xe5, 0xf6, 0xd6, 0xe6, 0xab, 0x27, 0xb1, + 0xb7, 0xbb, 0x73, 0x67, 0xbb, 0x1f, 0x68, 0x1a, 0xf4, 0x00, 0x1a, 0x19, 0x91, 0x43, 0xc6, 0xa4, + 0x36, 0xa0, 0xb5, 0xf9, 0xfa, 0x89, 0x18, 0xef, 0x96, 0x1c, 0x81, 0x25, 0x33, 0xbc, 0x53, 0xc6, + 0x0f, 0xbc, 0xda, 0x6a, 0xf5, 0x34, 0xbc, 0x8a, 0x23, 0xb0, 0x64, 0xe8, 0x7d, 0x70, 0x53, 0x22, + 0xb1, 0x0e, 0xd9, 0x92, 0x36, 0xf8, 0x8d, 0x13, 0x11, 0xef, 0x19, 0x92, 0x60, 0x4e, 0xe7, 0x7f, + 0x59, 0x85, 0x9a, 0xf2, 0xcc, 0x33, 0x44, 0xcc, 0x07, 0x77, 0xc2, 0x84, 0xcc, 0x70, 0x4a, 0x4c, + 0xdc, 0xe6, 0x32, 0xfa, 0x17, 0x40, 0x42, 0xb0, 0x20, 0xa1, 0xa4, 0x29, 0xf1, 0x6a, 0xab, 0xce, + 0x7a, 0x35, 0x68, 0x6a, 0xe4, 0x1e, 0x4d, 0x09, 0xfa, 0x2f, 0xb4, 0xd5, 0xb2, 0x50, 0x10, 0x7e, + 0x48, 0xb8, 0xf0, 0x96, 0x56, 0xab, 0xeb, 0xcd, 0xa0, 0xa5, 0xb0, 0x41, 0x09, 0xa9, 0x25, 0x6a, + 0xef, 0x7c, 0x49, 0xbd, 0x5c, 0xa2, 0x30, 0xbb, 0xe4, 0x45, 0x38, 0xb7, 0xbf, 0x35, 0xd8, 0x7f, + 0x67, 0xf7, 0xde, 0x6e, 0x38, 0xc6, 0x92, 0x4c, 0xf1, 0xcc, 0x6b, 0x68, 0x43, 0x56, 0x2c, 0x7e, + 0xbb, 0x84, 0x11, 0x82, 0x1a, 0xe6, 0xd1, 0xc4, 0x73, 0xf5, 0xb4, 0x1e, 0x2b, 0xac, 0x20, 0x23, + 0xea, 0x35, 0x57, 0x9d, 0x75, 0x37, 0xd0, 0x63, 0x65, 0x37, 0x1d, 0xe1, 0x88, 0x84, 0xfa, 0x54, + 0xa0, 0x57, 0x37, 0x35, 0x72, 0x17, 0xa7, 0xc4, 0xff, 0x18, 0x2a, 0xbd, 0x3e, 0xf2, 0xa0, 0x81, + 0xe3, 0x98, 0x13, 0x21, 0x8c, 0x7b, 0xac, 0xa8, 0x66, 0x32, 0x22, 0x53, 0x2c, 0x0e, 0x8c, 0x9f, + 0xac, 0xa8, 0x66, 0xac, 0x89, 0xa5, 0xaf, 0xac, 0x88, 0x2e, 0x41, 0x7d, 0x84, 0x53, 0x9a, 0xcc, + 0x8c, 0x9b, 0x8c, 0xe4, 0x7f, 0x5b, 0x83, 0x86, 0xc9, 0x28, 0xf4, 0x0f, 0x68, 0xe2, 0x24, 0x61, + 0xd3, 0x30, 0x7f, 0x44, 0xb4, 0x4e, 0x37, 0x70, 0x35, 0xd0, 0x7f, 0x44, 0xd0, 0xff, 0xa0, 0x53, + 0x4e, 0xaa, 0xdc, 0x18, 0x25, 0x6c, 0xaa, 0x75, 0xbb, 0xc1, 0xb2, 0x46, 0x1f, 0x1a, 0x10, 0xdd, + 0x87, 0x1a, 0x55, 0xdb, 0xcb, 0x0c, 0xbf, 0x79, 0x9a, 0x0c, 0xef, 0xf6, 0xfa, 0xef, 0xed, 0x06, + 0x9a, 0x0e, 0x7d, 0x0a, 0x17, 0xe7, 0x41, 0x50, 0x73, 0x42, 0x72, 0x9c, 0xe7, 0x84, 0xeb, 0xd3, + 0xb4, 0x36, 0x7b, 0xa7, 0xd2, 0xb3, 0xb5, 0x40, 0x18, 0x5c, 0xb0, 0x7a, 0x16, 0x51, 0x75, 0x2c, + 0x26, 0x28, 0x31, 0x75, 0x70, 0xba, 0x63, 0xed, 0x0b, 0x4a, 0x02, 0x4d, 0xe7, 0xdf, 0x80, 0x9a, + 0x3a, 0xa4, 0x2a, 0x83, 0x82, 0x27, 0xb6, 0x0c, 0x0a, 0x9e, 0xa8, 0xb4, 0x8f, 0x58, 0x26, 0x49, + 0x26, 0x85, 0x09, 0xf2, 0x5c, 0xf6, 0x3b, 0xd0, 0x5e, 0x34, 0xce, 0x7f, 0x17, 0x6a, 0x8a, 0x13, + 0xfd, 0x1d, 0xdc, 0xa1, 0xaa, 0x86, 0xc7, 0x54, 0x0d, 0x25, 0xdf, 0xe7, 0x89, 0x0a, 0xff, 0x01, + 0xe1, 0x19, 0x49, 0x0c, 0x99, 0x91, 0x14, 0x4e, 0x33, 0x2a, 0xb9, 0xed, 0x89, 0x46, 0xf2, 0x7f, + 0x70, 0x74, 0x5a, 0xe8, 0x3e, 0x60, 0xdb, 0xa0, 0x73, 0xe6, 0x6d, 0xb0, 0x72, 0x86, 0x6d, 0xd0, + 0xff, 0xb5, 0x03, 0xae, 0x6d, 0x35, 0xe8, 0x02, 0x2c, 0x09, 0x89, 0x25, 0x31, 0x7e, 0x28, 0x05, + 0x55, 0xed, 0x43, 0x96, 0xc5, 0x34, 0x1b, 0x87, 0x29, 0x8b, 0x89, 0xd6, 0x5f, 0x0d, 0x5a, 0x06, + 0xdb, 0x63, 0x31, 0x41, 0x19, 0xb4, 0x53, 0x9c, 0x15, 0x23, 0x1c, 0xc9, 0x82, 0x13, 0x6e, 0xf2, + 0xf8, 0xad, 0x53, 0x35, 0xbe, 0xee, 0xde, 0x02, 0x63, 0x70, 0x84, 0x1f, 0x0d, 0xc1, 0xa5, 0x99, + 0x90, 0x38, 0x8b, 0x88, 0xc9, 0xe5, 0x5b, 0xa7, 0xd3, 0xd5, 0x33, 0x6c, 0xc1, 0x9c, 0x17, 0x7d, + 0x04, 0xf5, 0xa8, 0x10, 0x92, 0xa5, 0x26, 0x7d, 0x77, 0x4e, 0xa7, 0x61, 0x5b, 0x73, 0x05, 0x86, + 0x53, 0x9d, 0x60, 0x84, 0x23, 0x9a, 0x50, 0x39, 0xf3, 0xea, 0x67, 0x71, 0x82, 0x5b, 0x86, 0x2d, + 0x98, 0xf3, 0xfa, 0x9b, 0xd0, 0x5e, 0xf4, 0xe1, 0x53, 0x37, 0x35, 0x82, 0x9a, 0x48, 0x8a, 0xb1, + 0x49, 0x6e, 0x3d, 0xf6, 0xbf, 0x77, 0xc1, 0xb5, 0xce, 0x78, 0x6a, 0xc3, 0x3c, 0x3f, 0x2a, 0x8b, + 0xf9, 0xf1, 0x47, 0x77, 0xcd, 0x91, 0xe6, 0x58, 0x7b, 0xa2, 0x39, 0x5e, 0x82, 0x3a, 0x27, 0x22, + 0x2a, 0xca, 0x06, 0xe1, 0x06, 0x46, 0x42, 0x23, 0xa8, 0xec, 0x0f, 0x8c, 0x57, 0x1e, 0x9c, 0x4d, + 0x5c, 0xbb, 0xfb, 0x39, 0xe1, 0x58, 0xd2, 0x6c, 0x3c, 0x98, 0x09, 0x49, 0xd2, 0xa0, 0xb2, 0x3f, + 0x50, 0x17, 0x0a, 0x4e, 0xa6, 0x78, 0x26, 0xb4, 0x75, 0x0d, 0x6d, 0x43, 0xb3, 0x44, 0x94, 0x79, + 0xff, 0x87, 0x15, 0xd5, 0x45, 0x43, 0x11, 0x71, 0x9a, 0x4b, 0xdd, 0x1f, 0xca, 0x2b, 0x6a, 0x59, + 0xc1, 0x03, 0x8d, 0xaa, 0x2e, 0xf1, 0x21, 0x54, 0x69, 0x2e, 0xbc, 0xa6, 0x7e, 0x45, 0xf4, 0xce, + 0xc8, 0xde, 0x5e, 0x3f, 0x50, 0xac, 0xca, 0xb9, 0x85, 0x20, 0x5c, 0x3f, 0x27, 0xca, 0x2b, 0x6f, + 0x2e, 0xa3, 0x4d, 0xb8, 0x18, 0xf1, 0x59, 0x2e, 0x49, 0x1c, 0x72, 0xc6, 0x64, 0x98, 0x63, 0x21, + 0xa6, 0x8c, 0xc7, 0x5e, 0x4b, 0x2f, 0xfc, 0x9b, 0x99, 0x0c, 0x18, 0x93, 0x7d, 0x33, 0xa5, 0x62, + 0x2e, 0xf1, 0x58, 0x78, 0x6d, 0x7d, 0x65, 0xeb, 0x31, 0x9a, 0x40, 0x43, 0x48, 0xc6, 0xf1, 0x98, + 0x78, 0xcb, 0xda, 0xe9, 0x77, 0xcf, 0xe8, 0x10, 0x83, 0x92, 0x35, 0xb0, 0xf4, 0xaa, 0xd7, 0x0a, + 0x31, 0x09, 0x0f, 0xc8, 0x4c, 0x78, 0x1d, 0x6d, 0x41, 0x43, 0x88, 0xc9, 0xdb, 0x64, 0x26, 0xd0, + 0x15, 0x58, 0x36, 0x4f, 0xa8, 0x90, 0x13, 0x1c, 0xcf, 0xbc, 0x15, 0x1d, 0x8f, 0xb6, 0x01, 0x03, + 0x85, 0xf9, 0x5f, 0x3b, 0xb0, 0xf2, 0x44, 0x24, 0xe7, 0x59, 0xec, 0x3c, 0xce, 0x62, 0x95, 0x59, + 0x31, 0x15, 0x92, 0x33, 0xdb, 0xb8, 0x4b, 0x49, 0xdd, 0xf4, 0xea, 0x75, 0x42, 0x59, 0x66, 0x6f, + 0x7a, 0x23, 0xaa, 0x44, 0xa5, 0x29, 0x1e, 0x93, 0x50, 0xe2, 0xb1, 0x4e, 0xd4, 0x66, 0xe0, 0x6a, + 0xe0, 0x1e, 0x1e, 0xa3, 0xcb, 0xd0, 0x60, 0x22, 0xd4, 0x5a, 0x96, 0x4a, 0x3e, 0x26, 0x06, 0xaa, + 0x5a, 0xbe, 0x73, 0x9e, 0xdf, 0xa3, 0x43, 0xe1, 0x79, 0x31, 0x4c, 0x68, 0x64, 0xcb, 0xa5, 0x94, + 0xd0, 0xbf, 0x01, 0x52, 0x9c, 0xe1, 0x31, 0x49, 0x49, 0x26, 0x75, 0xd9, 0xb8, 0xc1, 0x02, 0xe2, + 0xdf, 0x87, 0x86, 0x09, 0x84, 0x2a, 0xe0, 0x98, 0x8a, 0x03, 0x65, 0xa6, 0x72, 0x7e, 0x29, 0x28, + 0x0f, 0x72, 0x4c, 0x63, 0xaf, 0x52, 0xe6, 0x84, 0x1a, 0xa3, 0x55, 0x68, 0x8d, 0x68, 0x42, 0x84, + 0xf6, 0xb1, 0xf0, 0xaa, 0xe5, 0x0b, 0x6f, 0x01, 0xf2, 0x7f, 0x72, 0xa0, 0x5e, 0x36, 0x35, 0xf4, + 0x19, 0xac, 0xe4, 0x9c, 0xe8, 0xce, 0x99, 0x24, 0x24, 0x0e, 0x99, 0x30, 0xd7, 0xde, 0x9f, 0x55, + 0xbd, 0x9d, 0x45, 0x75, 0xfb, 0x02, 0xbd, 0xa0, 0x0c, 0xa0, 0x87, 0x58, 0x92, 0x50, 0x14, 0xc3, + 0x8c, 0xe8, 0xeb, 0x5f, 0x59, 0xdc, 0x31, 0xf0, 0xa0, 0x44, 0xfd, 0x47, 0xe0, 0xda, 0x46, 0xa9, + 0x42, 0x9e, 0x27, 0x38, 0x0b, 0x17, 0xb2, 0xc7, 0x55, 0x80, 0x8a, 0x2c, 0xba, 0x0a, 0xe7, 0xf5, + 0xa4, 0xc9, 0x8f, 0x70, 0xa1, 0x51, 0xae, 0xa8, 0x89, 0x07, 0x25, 0xae, 0xd7, 0x5e, 0x81, 0x65, + 0xdb, 0x73, 0xc3, 0x48, 0xdd, 0x90, 0x65, 0x40, 0xdb, 0x16, 0xdc, 0x66, 0x31, 0x59, 0xfb, 0x0f, + 0x2c, 0xef, 0x90, 0x84, 0x48, 0x62, 0xbf, 0x5d, 0x1d, 0xa8, 0xf4, 0x76, 0x6c, 0x73, 0xed, 0xed, + 0x6c, 0xfe, 0x56, 0x87, 0x15, 0xeb, 0x02, 0xf5, 0x8a, 0xa6, 0x11, 0x41, 0x5f, 0x39, 0x50, 0x53, + 0x7f, 0x41, 0xf4, 0xca, 0x71, 0x1c, 0xb9, 0xf0, 0x7b, 0xf4, 0xaf, 0x1f, 0x67, 0x63, 0xf9, 0x3b, + 0xbc, 0xfc, 0xf9, 0xcf, 0xbf, 0x7c, 0x53, 0x39, 0xbf, 0xd6, 0xde, 0x38, 0xbc, 0x3e, 0xff, 0xe5, + 0xbe, 0xe6, 0x5c, 0x45, 0x05, 0x2c, 0x6d, 0xcd, 0xf6, 0x6e, 0x6e, 0xa3, 0x97, 0x8f, 0x43, 0xfa, + 0xf8, 0xa7, 0xe9, 0x9f, 0xe8, 0xf3, 0x8a, 0x24, 0xd4, 0xb6, 0x66, 0xbd, 0xfe, 0x5f, 0xa2, 0x75, + 0xe7, 0x39, 0x6b, 0xfd, 0xc2, 0x81, 0xea, 0xcd, 0x24, 0x41, 0xc7, 0x0f, 0xdb, 0xc9, 0x14, 0xae, + 0x5d, 0xd0, 0xc1, 0xee, 0xa0, 0x23, 0xc1, 0xbe, 0xe6, 0xa0, 0x29, 0x2c, 0x3d, 0xc4, 0x32, 0x9a, + 0x3c, 0xdf, 0xf3, 0x5f, 0x73, 0xd0, 0x21, 0xd4, 0xcb, 0x3a, 0x41, 0xc7, 0x7a, 0x33, 0x1f, 0xa9, + 0xad, 0x13, 0x64, 0xfd, 0x16, 0x7c, 0xe0, 0x5a, 0x64, 0x58, 0xd7, 0x4b, 0x5e, 0xfa, 0x3d, 0x00, + 0x00, 0xff, 0xff, 0x69, 0xa3, 0xa3, 0x27, 0xed, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index e59010fc8..07338b1be 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -40,24 +40,30 @@ message GetRequest { message Hardware { message DHCP { + message IP { + string address = 1; + string netmask = 2; + string gateway = 3; + int64 family = 4; + } string mac = 1; - string ip = 2; + string OBSOLETE_ip = 2; string hostname = 3; int64 lease_time = 4; repeated string name_servers = 5; repeated string time_servers = 6; - string gateway = 7; + string OBSOLETE_gateway = 7; string arch = 8; bool uefi = 9; string iface_name = 10; + IP ip = 11; } message Netboot { message IPXE { string url = 1; string contents = 2; } - message Bootstrapper { - + message Bootstrapper { // obsolete } message Osie { string base_url = 1; @@ -68,7 +74,7 @@ message Hardware { bool allow_pxe = 1; bool allow_workflow = 2; IPXE ipxe = 3; - Bootstrapper bootstrapper = 4; + Bootstrapper OBSOLETE_bootstrapper = 4; Osie osie = 5; } message Network { From 7f09fbc2cabd905f9d2d8f638b3c913f6fd12280 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Wed, 13 May 2020 16:27:19 -0400 Subject: [PATCH 11/31] update hardware proto --- db/hardware.go | 26 ++- db/workflow.go | 35 ++-- protos/hardware/hardware.pb.go | 333 +++++++++++++++++++++------------ protos/hardware/hardware.proto | 24 ++- 4 files changed, 267 insertions(+), 151 deletions(-) diff --git a/db/hardware.go b/db/hardware.go index 4abe51366..779b6d383 100644 --- a/db/hardware.go +++ b/db/hardware.go @@ -66,9 +66,15 @@ func InsertIntoDB(ctx context.Context, db *sql.DB, data string) error { func GetByMAC(ctx context.Context, db *sql.DB, mac string) (string, error) { arg := ` { - "dhcp": { - "mac": "` + mac + `" - } + "network": { + "interfaces": [ + { + "dhcp": { + "mac": "` + mac + `" + } + } + ] + } } ` query := ` @@ -98,10 +104,16 @@ func GetByIP(ctx context.Context, db *sql.DB, ip string) (string, error) { ` hardwareOrManagement := ` { - "dhcp": { - "ip": { - "address": "` + ip + `" - } + "network": { + "interfaces": [ + { + "dhcp": { + "ip": { + "address": "` + ip + `" + } + } + } + ] } } ` diff --git a/db/workflow.go b/db/workflow.go index ed8ae46a6..7b1fadfe1 100644 --- a/db/workflow.go +++ b/db/workflow.go @@ -724,13 +724,15 @@ func parseYaml(ymlContent []byte) (*wfYamlstruct, error) { func getWorkerIDbyMac(ctx context.Context, db *sql.DB, mac string) (string, error) { arg := ` { - "network_ports": [ - { - "data": { - "mac": "` + mac + `" - } - } - ] + "network": { + "interfaces": [ + { + "dhcp": { + "mac": "` + mac + `" + } + } + ] + } } ` query := ` @@ -746,6 +748,7 @@ func getWorkerIDbyMac(ctx context.Context, db *sql.DB, mac string) (string, erro } func getWorkerIDbyIP(ctx context.Context, db *sql.DB, ip string) (string, error) { + // update for instance (under metadata) instance := ` { "instance": { @@ -758,14 +761,20 @@ func getWorkerIDbyIP(ctx context.Context, db *sql.DB, ip string) (string, error) } ` hardwareOrManagement := ` - { - "dhcp": { - "ip": { - "address": "` + ip + `" + { + "network": { + "interfaces": [ + { + "dhcp": { + "ip": { + "address": "` + ip + `" + } + } } - } + ] } - ` + } + ` query := ` SELECT id diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 61ce5b793..8d942292b 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -152,10 +152,11 @@ func (m *GetRequest) GetId() string { type Hardware struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Dhcp *Hardware_DHCP `protobuf:"bytes,2,opt,name=dhcp,proto3" json:"dhcp,omitempty"` - Netboot *Hardware_Netboot `protobuf:"bytes,3,opt,name=netboot,proto3" json:"netboot,omitempty"` - Network []*Hardware_Network `protobuf:"bytes,4,rep,name=network,proto3" json:"network,omitempty"` + OBSOLETEDhcp *Hardware_DHCP `protobuf:"bytes,2,opt,name=OBSOLETE_dhcp,json=OBSOLETEDhcp,proto3" json:"OBSOLETE_dhcp,omitempty"` + OBSOLETENetboot *Hardware_Netboot `protobuf:"bytes,3,opt,name=OBSOLETE_netboot,json=OBSOLETENetboot,proto3" json:"OBSOLETE_netboot,omitempty"` + OBSOLETENetwork []*Hardware_Network `protobuf:"bytes,4,rep,name=OBSOLETE_network,json=OBSOLETENetwork,proto3" json:"OBSOLETE_network,omitempty"` Metadata *Hardware_Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"` + Network *Hardware_Network `protobuf:"bytes,6,opt,name=network,proto3" json:"network,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -193,23 +194,23 @@ func (m *Hardware) GetId() string { return "" } -func (m *Hardware) GetDhcp() *Hardware_DHCP { +func (m *Hardware) GetOBSOLETEDhcp() *Hardware_DHCP { if m != nil { - return m.Dhcp + return m.OBSOLETEDhcp } return nil } -func (m *Hardware) GetNetboot() *Hardware_Netboot { +func (m *Hardware) GetOBSOLETENetboot() *Hardware_Netboot { if m != nil { - return m.Netboot + return m.OBSOLETENetboot } return nil } -func (m *Hardware) GetNetwork() []*Hardware_Network { +func (m *Hardware) GetOBSOLETENetwork() []*Hardware_Network { if m != nil { - return m.Network + return m.OBSOLETENetwork } return nil } @@ -221,20 +222,28 @@ func (m *Hardware) GetMetadata() *Hardware_Metadata { return nil } +func (m *Hardware) GetNetwork() *Hardware_Network { + if m != nil { + return m.Network + } + return nil +} + type Hardware_DHCP struct { - Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` - Ip string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` - Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` - LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` - NameServers []string `protobuf:"bytes,5,rep,name=name_servers,json=nameServers,proto3" json:"name_servers,omitempty"` - TimeServers []string `protobuf:"bytes,6,rep,name=time_servers,json=timeServers,proto3" json:"time_servers,omitempty"` - OBSOLETEGateway string `protobuf:"bytes,7,opt,name=OBSOLETE_gateway,json=OBSOLETEGateway,proto3" json:"OBSOLETE_gateway,omitempty"` - Arch string `protobuf:"bytes,8,opt,name=arch,proto3" json:"arch,omitempty"` - Uefi bool `protobuf:"varint,9,opt,name=uefi,proto3" json:"uefi,omitempty"` - IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` + OBSOLETEIp string `protobuf:"bytes,2,opt,name=OBSOLETE_ip,json=OBSOLETEIp,proto3" json:"OBSOLETE_ip,omitempty"` + Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` + LeaseTime int64 `protobuf:"varint,4,opt,name=lease_time,json=leaseTime,proto3" json:"lease_time,omitempty"` + NameServers []string `protobuf:"bytes,5,rep,name=name_servers,json=nameServers,proto3" json:"name_servers,omitempty"` + TimeServers []string `protobuf:"bytes,6,rep,name=time_servers,json=timeServers,proto3" json:"time_servers,omitempty"` + OBSOLETEGateway string `protobuf:"bytes,7,opt,name=OBSOLETE_gateway,json=OBSOLETEGateway,proto3" json:"OBSOLETE_gateway,omitempty"` + Arch string `protobuf:"bytes,8,opt,name=arch,proto3" json:"arch,omitempty"` + Uefi bool `protobuf:"varint,9,opt,name=uefi,proto3" json:"uefi,omitempty"` + IfaceName string `protobuf:"bytes,10,opt,name=iface_name,json=ifaceName,proto3" json:"iface_name,omitempty"` + Ip *Hardware_DHCP_IP `protobuf:"bytes,11,opt,name=ip,proto3" json:"ip,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware_DHCP) Reset() { *m = Hardware_DHCP{} } @@ -269,9 +278,9 @@ func (m *Hardware_DHCP) GetMac() string { return "" } -func (m *Hardware_DHCP) GetIp() string { +func (m *Hardware_DHCP) GetOBSOLETEIp() string { if m != nil { - return m.Ip + return m.OBSOLETEIp } return "" } @@ -332,6 +341,13 @@ func (m *Hardware_DHCP) GetIfaceName() string { return "" } +func (m *Hardware_DHCP) GetIp() *Hardware_DHCP_IP { + if m != nil { + return m.Ip + } + return nil +} + type Hardware_DHCP_IP struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` Netmask string `protobuf:"bytes,2,opt,name=netmask,proto3" json:"netmask,omitempty"` @@ -600,11 +616,13 @@ func (m *Hardware_Netboot_Osie) GetInitrd() string { } type Hardware_Network struct { - Dhcp *Hardware_DHCP `protobuf:"bytes,1,opt,name=dhcp,proto3" json:"dhcp,omitempty"` - Netboot *Hardware_Netboot `protobuf:"bytes,2,opt,name=netboot,proto3" json:"netboot,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OBSOLETEDhcp *Hardware_DHCP `protobuf:"bytes,1,opt,name=OBSOLETE_dhcp,json=OBSOLETEDhcp,proto3" json:"OBSOLETE_dhcp,omitempty"` + OBSOLETENetboot *Hardware_Netboot `protobuf:"bytes,2,opt,name=OBSOLETE_netboot,json=OBSOLETENetboot,proto3" json:"OBSOLETE_netboot,omitempty"` + Interfaces []*Hardware_Network_Interface `protobuf:"bytes,3,rep,name=interfaces,proto3" json:"interfaces,omitempty"` + Default *Hardware_Network_Interface `protobuf:"bytes,4,opt,name=default,proto3" json:"default,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware_Network) Reset() { *m = Hardware_Network{} } @@ -632,14 +650,75 @@ func (m *Hardware_Network) XXX_DiscardUnknown() { var xxx_messageInfo_Hardware_Network proto.InternalMessageInfo -func (m *Hardware_Network) GetDhcp() *Hardware_DHCP { +func (m *Hardware_Network) GetOBSOLETEDhcp() *Hardware_DHCP { + if m != nil { + return m.OBSOLETEDhcp + } + return nil +} + +func (m *Hardware_Network) GetOBSOLETENetboot() *Hardware_Netboot { + if m != nil { + return m.OBSOLETENetboot + } + return nil +} + +func (m *Hardware_Network) GetInterfaces() []*Hardware_Network_Interface { + if m != nil { + return m.Interfaces + } + return nil +} + +func (m *Hardware_Network) GetDefault() *Hardware_Network_Interface { + if m != nil { + return m.Default + } + return nil +} + +type Hardware_Network_Interface struct { + Dhcp *Hardware_DHCP `protobuf:"bytes,1,opt,name=dhcp,proto3" json:"dhcp,omitempty"` + Netboot *Hardware_Netboot `protobuf:"bytes,2,opt,name=netboot,proto3" json:"netboot,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Network_Interface) Reset() { *m = Hardware_Network_Interface{} } +func (m *Hardware_Network_Interface) String() string { return proto.CompactTextString(m) } +func (*Hardware_Network_Interface) ProtoMessage() {} +func (*Hardware_Network_Interface) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 2, 0} +} + +func (m *Hardware_Network_Interface) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Network_Interface.Unmarshal(m, b) +} +func (m *Hardware_Network_Interface) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Network_Interface.Marshal(b, m, deterministic) +} +func (m *Hardware_Network_Interface) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Network_Interface.Merge(m, src) +} +func (m *Hardware_Network_Interface) XXX_Size() int { + return xxx_messageInfo_Hardware_Network_Interface.Size(m) +} +func (m *Hardware_Network_Interface) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Network_Interface.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Network_Interface proto.InternalMessageInfo + +func (m *Hardware_Network_Interface) GetDhcp() *Hardware_DHCP { if m != nil { return m.Dhcp } return nil } -func (m *Hardware_Network) GetNetboot() *Hardware_Netboot { +func (m *Hardware_Network_Interface) GetNetboot() *Hardware_Netboot { if m != nil { return m.Netboot } @@ -1285,6 +1364,7 @@ func init() { proto.RegisterType((*Hardware_Netboot_Bootstrapper)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Bootstrapper") proto.RegisterType((*Hardware_Netboot_Osie)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Netboot.Osie") proto.RegisterType((*Hardware_Network)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Network") + proto.RegisterType((*Hardware_Network_Interface)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Network.Interface") proto.RegisterType((*Hardware_Metadata)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata") proto.RegisterType((*Hardware_Metadata_Manufacturer)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Manufacturer") proto.RegisterType((*Hardware_Metadata_Instance)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance") @@ -1301,98 +1381,105 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1451 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4b, 0x93, 0x1b, 0xb5, - 0x16, 0xae, 0xb6, 0x3d, 0x76, 0xfb, 0xd8, 0xe3, 0x49, 0x74, 0xf3, 0xe8, 0xdb, 0xf7, 0x35, 0x77, - 0x52, 0xf7, 0x32, 0x64, 0xe1, 0x49, 0x86, 0x14, 0x14, 0x14, 0x50, 0x95, 0x79, 0x24, 0x31, 0x30, - 0x19, 0xd3, 0xce, 0x83, 0x57, 0x55, 0x97, 0xdc, 0x2d, 0xdb, 0x62, 0xba, 0x5b, 0x8d, 0xa4, 0x1e, - 0xc7, 0x1b, 0xa8, 0x62, 0x01, 0x0b, 0x8a, 0x15, 0xfc, 0x02, 0x36, 0x6c, 0x81, 0xbf, 0xc2, 0x5f, - 0xa0, 0xf8, 0x15, 0x2c, 0x28, 0xa9, 0x25, 0xc7, 0x93, 0x54, 0x51, 0x99, 0x07, 0x61, 0xa7, 0xf3, - 0x49, 0xfa, 0xce, 0xd1, 0x79, 0x49, 0x82, 0xcb, 0x13, 0xcc, 0xe3, 0x29, 0xe6, 0x64, 0xc3, 0x0e, - 0xba, 0x39, 0x67, 0x92, 0xa1, 0xab, 0x63, 0x2a, 0x27, 0xc5, 0xb0, 0x1b, 0xb1, 0xb4, 0x2b, 0x69, - 0x76, 0x40, 0xf8, 0x90, 0x24, 0x89, 0x1e, 0x96, 0x2b, 0x44, 0xd7, 0xee, 0xf0, 0xff, 0x39, 0x66, - 0x6c, 0x9c, 0x90, 0x0d, 0x9c, 0xd3, 0x0d, 0x9c, 0x65, 0x4c, 0x62, 0x49, 0x59, 0x26, 0xca, 0x75, - 0x6b, 0x0f, 0xa1, 0xd5, 0x2f, 0xc4, 0x24, 0x20, 0x9f, 0x14, 0x44, 0x48, 0x74, 0x07, 0x6a, 0x31, - 0x96, 0xd8, 0x73, 0x56, 0x9d, 0xf5, 0xd6, 0xe6, 0x8d, 0xee, 0xb3, 0xeb, 0xe9, 0xde, 0x31, 0x83, - 0x40, 0x33, 0xac, 0x35, 0x60, 0x69, 0x37, 0xcd, 0xe5, 0x6c, 0xed, 0x4d, 0x80, 0xdb, 0x44, 0x5a, - 0x05, 0xe7, 0xa0, 0x9a, 0xe2, 0x48, 0xf3, 0x37, 0x03, 0x35, 0x44, 0x1d, 0xa8, 0xd0, 0xdc, 0xab, - 0x68, 0xa0, 0x42, 0x73, 0x2d, 0xc7, 0x5e, 0xd5, 0xc8, 0xf1, 0xda, 0x8f, 0x3e, 0xb8, 0x96, 0xdb, - 0x4c, 0x3a, 0x76, 0x12, 0xed, 0x41, 0x2d, 0x9e, 0x44, 0xe5, 0xf6, 0xd6, 0xe6, 0xab, 0x27, 0xb1, - 0xb7, 0xbb, 0x73, 0x67, 0xbb, 0x1f, 0x68, 0x1a, 0xf4, 0x00, 0x1a, 0x19, 0x91, 0x43, 0xc6, 0xa4, - 0x36, 0xa0, 0xb5, 0xf9, 0xfa, 0x89, 0x18, 0xef, 0x96, 0x1c, 0x81, 0x25, 0x33, 0xbc, 0x53, 0xc6, - 0x0f, 0xbc, 0xda, 0x6a, 0xf5, 0x34, 0xbc, 0x8a, 0x23, 0xb0, 0x64, 0xe8, 0x7d, 0x70, 0x53, 0x22, - 0xb1, 0x0e, 0xd9, 0x92, 0x36, 0xf8, 0x8d, 0x13, 0x11, 0xef, 0x19, 0x92, 0x60, 0x4e, 0xe7, 0x7f, - 0x59, 0x85, 0x9a, 0xf2, 0xcc, 0x33, 0x44, 0xcc, 0x07, 0x77, 0xc2, 0x84, 0xcc, 0x70, 0x4a, 0x4c, - 0xdc, 0xe6, 0x32, 0xfa, 0x17, 0x40, 0x42, 0xb0, 0x20, 0xa1, 0xa4, 0x29, 0xf1, 0x6a, 0xab, 0xce, - 0x7a, 0x35, 0x68, 0x6a, 0xe4, 0x1e, 0x4d, 0x09, 0xfa, 0x2f, 0xb4, 0xd5, 0xb2, 0x50, 0x10, 0x7e, - 0x48, 0xb8, 0xf0, 0x96, 0x56, 0xab, 0xeb, 0xcd, 0xa0, 0xa5, 0xb0, 0x41, 0x09, 0xa9, 0x25, 0x6a, - 0xef, 0x7c, 0x49, 0xbd, 0x5c, 0xa2, 0x30, 0xbb, 0xe4, 0x45, 0x38, 0xb7, 0xbf, 0x35, 0xd8, 0x7f, - 0x67, 0xf7, 0xde, 0x6e, 0x38, 0xc6, 0x92, 0x4c, 0xf1, 0xcc, 0x6b, 0x68, 0x43, 0x56, 0x2c, 0x7e, - 0xbb, 0x84, 0x11, 0x82, 0x1a, 0xe6, 0xd1, 0xc4, 0x73, 0xf5, 0xb4, 0x1e, 0x2b, 0xac, 0x20, 0x23, - 0xea, 0x35, 0x57, 0x9d, 0x75, 0x37, 0xd0, 0x63, 0x65, 0x37, 0x1d, 0xe1, 0x88, 0x84, 0xfa, 0x54, - 0xa0, 0x57, 0x37, 0x35, 0x72, 0x17, 0xa7, 0xc4, 0xff, 0x18, 0x2a, 0xbd, 0x3e, 0xf2, 0xa0, 0x81, - 0xe3, 0x98, 0x13, 0x21, 0x8c, 0x7b, 0xac, 0xa8, 0x66, 0x32, 0x22, 0x53, 0x2c, 0x0e, 0x8c, 0x9f, - 0xac, 0xa8, 0x66, 0xac, 0x89, 0xa5, 0xaf, 0xac, 0x88, 0x2e, 0x41, 0x7d, 0x84, 0x53, 0x9a, 0xcc, - 0x8c, 0x9b, 0x8c, 0xe4, 0x7f, 0x5b, 0x83, 0x86, 0xc9, 0x28, 0xf4, 0x0f, 0x68, 0xe2, 0x24, 0x61, - 0xd3, 0x30, 0x7f, 0x44, 0xb4, 0x4e, 0x37, 0x70, 0x35, 0xd0, 0x7f, 0x44, 0xd0, 0xff, 0xa0, 0x53, - 0x4e, 0xaa, 0xdc, 0x18, 0x25, 0x6c, 0xaa, 0x75, 0xbb, 0xc1, 0xb2, 0x46, 0x1f, 0x1a, 0x10, 0xdd, - 0x87, 0x1a, 0x55, 0xdb, 0xcb, 0x0c, 0xbf, 0x79, 0x9a, 0x0c, 0xef, 0xf6, 0xfa, 0xef, 0xed, 0x06, - 0x9a, 0x0e, 0x7d, 0x0a, 0x17, 0xe7, 0x41, 0x50, 0x73, 0x42, 0x72, 0x9c, 0xe7, 0x84, 0xeb, 0xd3, - 0xb4, 0x36, 0x7b, 0xa7, 0xd2, 0xb3, 0xb5, 0x40, 0x18, 0x5c, 0xb0, 0x7a, 0x16, 0x51, 0x75, 0x2c, - 0x26, 0x28, 0x31, 0x75, 0x70, 0xba, 0x63, 0xed, 0x0b, 0x4a, 0x02, 0x4d, 0xe7, 0xdf, 0x80, 0x9a, - 0x3a, 0xa4, 0x2a, 0x83, 0x82, 0x27, 0xb6, 0x0c, 0x0a, 0x9e, 0xa8, 0xb4, 0x8f, 0x58, 0x26, 0x49, - 0x26, 0x85, 0x09, 0xf2, 0x5c, 0xf6, 0x3b, 0xd0, 0x5e, 0x34, 0xce, 0x7f, 0x17, 0x6a, 0x8a, 0x13, - 0xfd, 0x1d, 0xdc, 0xa1, 0xaa, 0x86, 0xc7, 0x54, 0x0d, 0x25, 0xdf, 0xe7, 0x89, 0x0a, 0xff, 0x01, - 0xe1, 0x19, 0x49, 0x0c, 0x99, 0x91, 0x14, 0x4e, 0x33, 0x2a, 0xb9, 0xed, 0x89, 0x46, 0xf2, 0x7f, - 0x70, 0x74, 0x5a, 0xe8, 0x3e, 0x60, 0xdb, 0xa0, 0x73, 0xe6, 0x6d, 0xb0, 0x72, 0x86, 0x6d, 0xd0, - 0xff, 0xb5, 0x03, 0xae, 0x6d, 0x35, 0xe8, 0x02, 0x2c, 0x09, 0x89, 0x25, 0x31, 0x7e, 0x28, 0x05, - 0x55, 0xed, 0x43, 0x96, 0xc5, 0x34, 0x1b, 0x87, 0x29, 0x8b, 0x89, 0xd6, 0x5f, 0x0d, 0x5a, 0x06, - 0xdb, 0x63, 0x31, 0x41, 0x19, 0xb4, 0x53, 0x9c, 0x15, 0x23, 0x1c, 0xc9, 0x82, 0x13, 0x6e, 0xf2, - 0xf8, 0xad, 0x53, 0x35, 0xbe, 0xee, 0xde, 0x02, 0x63, 0x70, 0x84, 0x1f, 0x0d, 0xc1, 0xa5, 0x99, - 0x90, 0x38, 0x8b, 0x88, 0xc9, 0xe5, 0x5b, 0xa7, 0xd3, 0xd5, 0x33, 0x6c, 0xc1, 0x9c, 0x17, 0x7d, - 0x04, 0xf5, 0xa8, 0x10, 0x92, 0xa5, 0x26, 0x7d, 0x77, 0x4e, 0xa7, 0x61, 0x5b, 0x73, 0x05, 0x86, - 0x53, 0x9d, 0x60, 0x84, 0x23, 0x9a, 0x50, 0x39, 0xf3, 0xea, 0x67, 0x71, 0x82, 0x5b, 0x86, 0x2d, - 0x98, 0xf3, 0xfa, 0x9b, 0xd0, 0x5e, 0xf4, 0xe1, 0x53, 0x37, 0x35, 0x82, 0x9a, 0x48, 0x8a, 0xb1, - 0x49, 0x6e, 0x3d, 0xf6, 0xbf, 0x77, 0xc1, 0xb5, 0xce, 0x78, 0x6a, 0xc3, 0x3c, 0x3f, 0x2a, 0x8b, - 0xf9, 0xf1, 0x47, 0x77, 0xcd, 0x91, 0xe6, 0x58, 0x7b, 0xa2, 0x39, 0x5e, 0x82, 0x3a, 0x27, 0x22, - 0x2a, 0xca, 0x06, 0xe1, 0x06, 0x46, 0x42, 0x23, 0xa8, 0xec, 0x0f, 0x8c, 0x57, 0x1e, 0x9c, 0x4d, - 0x5c, 0xbb, 0xfb, 0x39, 0xe1, 0x58, 0xd2, 0x6c, 0x3c, 0x98, 0x09, 0x49, 0xd2, 0xa0, 0xb2, 0x3f, - 0x50, 0x17, 0x0a, 0x4e, 0xa6, 0x78, 0x26, 0xb4, 0x75, 0x0d, 0x6d, 0x43, 0xb3, 0x44, 0x94, 0x79, - 0xff, 0x87, 0x15, 0xd5, 0x45, 0x43, 0x11, 0x71, 0x9a, 0x4b, 0xdd, 0x1f, 0xca, 0x2b, 0x6a, 0x59, - 0xc1, 0x03, 0x8d, 0xaa, 0x2e, 0xf1, 0x21, 0x54, 0x69, 0x2e, 0xbc, 0xa6, 0x7e, 0x45, 0xf4, 0xce, - 0xc8, 0xde, 0x5e, 0x3f, 0x50, 0xac, 0xca, 0xb9, 0x85, 0x20, 0x5c, 0x3f, 0x27, 0xca, 0x2b, 0x6f, - 0x2e, 0xa3, 0x4d, 0xb8, 0x18, 0xf1, 0x59, 0x2e, 0x49, 0x1c, 0x72, 0xc6, 0x64, 0x98, 0x63, 0x21, - 0xa6, 0x8c, 0xc7, 0x5e, 0x4b, 0x2f, 0xfc, 0x9b, 0x99, 0x0c, 0x18, 0x93, 0x7d, 0x33, 0xa5, 0x62, - 0x2e, 0xf1, 0x58, 0x78, 0x6d, 0x7d, 0x65, 0xeb, 0x31, 0x9a, 0x40, 0x43, 0x48, 0xc6, 0xf1, 0x98, - 0x78, 0xcb, 0xda, 0xe9, 0x77, 0xcf, 0xe8, 0x10, 0x83, 0x92, 0x35, 0xb0, 0xf4, 0xaa, 0xd7, 0x0a, - 0x31, 0x09, 0x0f, 0xc8, 0x4c, 0x78, 0x1d, 0x6d, 0x41, 0x43, 0x88, 0xc9, 0xdb, 0x64, 0x26, 0xd0, - 0x15, 0x58, 0x36, 0x4f, 0xa8, 0x90, 0x13, 0x1c, 0xcf, 0xbc, 0x15, 0x1d, 0x8f, 0xb6, 0x01, 0x03, - 0x85, 0xf9, 0x5f, 0x3b, 0xb0, 0xf2, 0x44, 0x24, 0xe7, 0x59, 0xec, 0x3c, 0xce, 0x62, 0x95, 0x59, - 0x31, 0x15, 0x92, 0x33, 0xdb, 0xb8, 0x4b, 0x49, 0xdd, 0xf4, 0xea, 0x75, 0x42, 0x59, 0x66, 0x6f, - 0x7a, 0x23, 0xaa, 0x44, 0xa5, 0x29, 0x1e, 0x93, 0x50, 0xe2, 0xb1, 0x4e, 0xd4, 0x66, 0xe0, 0x6a, - 0xe0, 0x1e, 0x1e, 0xa3, 0xcb, 0xd0, 0x60, 0x22, 0xd4, 0x5a, 0x96, 0x4a, 0x3e, 0x26, 0x06, 0xaa, - 0x5a, 0xbe, 0x73, 0x9e, 0xdf, 0xa3, 0x43, 0xe1, 0x79, 0x31, 0x4c, 0x68, 0x64, 0xcb, 0xa5, 0x94, - 0xd0, 0xbf, 0x01, 0x52, 0x9c, 0xe1, 0x31, 0x49, 0x49, 0x26, 0x75, 0xd9, 0xb8, 0xc1, 0x02, 0xe2, - 0xdf, 0x87, 0x86, 0x09, 0x84, 0x2a, 0xe0, 0x98, 0x8a, 0x03, 0x65, 0xa6, 0x72, 0x7e, 0x29, 0x28, - 0x0f, 0x72, 0x4c, 0x63, 0xaf, 0x52, 0xe6, 0x84, 0x1a, 0xa3, 0x55, 0x68, 0x8d, 0x68, 0x42, 0x84, - 0xf6, 0xb1, 0xf0, 0xaa, 0xe5, 0x0b, 0x6f, 0x01, 0xf2, 0x7f, 0x72, 0xa0, 0x5e, 0x36, 0x35, 0xf4, - 0x19, 0xac, 0xe4, 0x9c, 0xe8, 0xce, 0x99, 0x24, 0x24, 0x0e, 0x99, 0x30, 0xd7, 0xde, 0x9f, 0x55, - 0xbd, 0x9d, 0x45, 0x75, 0xfb, 0x02, 0xbd, 0xa0, 0x0c, 0xa0, 0x87, 0x58, 0x92, 0x50, 0x14, 0xc3, - 0x8c, 0xe8, 0xeb, 0x5f, 0x59, 0xdc, 0x31, 0xf0, 0xa0, 0x44, 0xfd, 0x47, 0xe0, 0xda, 0x46, 0xa9, - 0x42, 0x9e, 0x27, 0x38, 0x0b, 0x17, 0xb2, 0xc7, 0x55, 0x80, 0x8a, 0x2c, 0xba, 0x0a, 0xe7, 0xf5, - 0xa4, 0xc9, 0x8f, 0x70, 0xa1, 0x51, 0xae, 0xa8, 0x89, 0x07, 0x25, 0xae, 0xd7, 0x5e, 0x81, 0x65, - 0xdb, 0x73, 0xc3, 0x48, 0xdd, 0x90, 0x65, 0x40, 0xdb, 0x16, 0xdc, 0x66, 0x31, 0x59, 0xfb, 0x0f, - 0x2c, 0xef, 0x90, 0x84, 0x48, 0x62, 0xbf, 0x5d, 0x1d, 0xa8, 0xf4, 0x76, 0x6c, 0x73, 0xed, 0xed, - 0x6c, 0xfe, 0x56, 0x87, 0x15, 0xeb, 0x02, 0xf5, 0x8a, 0xa6, 0x11, 0x41, 0x5f, 0x39, 0x50, 0x53, - 0x7f, 0x41, 0xf4, 0xca, 0x71, 0x1c, 0xb9, 0xf0, 0x7b, 0xf4, 0xaf, 0x1f, 0x67, 0x63, 0xf9, 0x3b, - 0xbc, 0xfc, 0xf9, 0xcf, 0xbf, 0x7c, 0x53, 0x39, 0xbf, 0xd6, 0xde, 0x38, 0xbc, 0x3e, 0xff, 0xe5, - 0xbe, 0xe6, 0x5c, 0x45, 0x05, 0x2c, 0x6d, 0xcd, 0xf6, 0x6e, 0x6e, 0xa3, 0x97, 0x8f, 0x43, 0xfa, - 0xf8, 0xa7, 0xe9, 0x9f, 0xe8, 0xf3, 0x8a, 0x24, 0xd4, 0xb6, 0x66, 0xbd, 0xfe, 0x5f, 0xa2, 0x75, - 0xe7, 0x39, 0x6b, 0xfd, 0xc2, 0x81, 0xea, 0xcd, 0x24, 0x41, 0xc7, 0x0f, 0xdb, 0xc9, 0x14, 0xae, - 0x5d, 0xd0, 0xc1, 0xee, 0xa0, 0x23, 0xc1, 0xbe, 0xe6, 0xa0, 0x29, 0x2c, 0x3d, 0xc4, 0x32, 0x9a, - 0x3c, 0xdf, 0xf3, 0x5f, 0x73, 0xd0, 0x21, 0xd4, 0xcb, 0x3a, 0x41, 0xc7, 0x7a, 0x33, 0x1f, 0xa9, - 0xad, 0x13, 0x64, 0xfd, 0x16, 0x7c, 0xe0, 0x5a, 0x64, 0x58, 0xd7, 0x4b, 0x5e, 0xfa, 0x3d, 0x00, - 0x00, 0xff, 0xff, 0x69, 0xa3, 0xa3, 0x27, 0xed, 0x11, 0x00, 0x00, + // 1565 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5b, 0x73, 0x1b, 0xb7, + 0x15, 0x1e, 0x5e, 0x44, 0x2e, 0x0f, 0x29, 0xca, 0x46, 0x7d, 0xd9, 0x6e, 0x2f, 0x56, 0xe5, 0x69, + 0xab, 0xfa, 0x81, 0xb2, 0x55, 0x4f, 0x3b, 0xed, 0xb4, 0x9d, 0xb1, 0x2e, 0xb6, 0xd9, 0x5a, 0x16, + 0xbb, 0xf4, 0xa5, 0xb7, 0xe9, 0x06, 0xdc, 0x05, 0x49, 0x44, 0xbb, 0x8b, 0x0d, 0x80, 0x15, 0xcd, + 0x97, 0x64, 0x26, 0x0f, 0x79, 0xc9, 0xe4, 0x29, 0xf9, 0x05, 0x79, 0xc9, 0x7b, 0x9e, 0xf3, 0x27, + 0x32, 0xf9, 0x0b, 0x19, 0xff, 0x8a, 0x3c, 0x64, 0x80, 0x05, 0xd6, 0x94, 0x9d, 0xc9, 0x44, 0xa2, + 0xec, 0xbc, 0xe1, 0x7c, 0x00, 0xbf, 0x73, 0x70, 0x6e, 0x38, 0x5c, 0xb8, 0x3a, 0xc5, 0x3c, 0x9a, + 0x61, 0x4e, 0xb6, 0xec, 0xa2, 0x97, 0x71, 0x26, 0x19, 0xba, 0x31, 0xa1, 0x72, 0x9a, 0x8f, 0x7a, + 0x21, 0x4b, 0x7a, 0x92, 0xa6, 0x47, 0x84, 0x8f, 0x48, 0x1c, 0xeb, 0x65, 0x71, 0x42, 0xf4, 0xec, + 0x2f, 0xbc, 0x9f, 0x4f, 0x18, 0x9b, 0xc4, 0x64, 0x0b, 0x67, 0x74, 0x0b, 0xa7, 0x29, 0x93, 0x58, + 0x52, 0x96, 0x8a, 0xe2, 0xdc, 0xc6, 0x53, 0x68, 0x0f, 0x72, 0x31, 0xf5, 0xc9, 0x3b, 0x39, 0x11, + 0x12, 0xdd, 0x87, 0x7a, 0x84, 0x25, 0x76, 0x2b, 0xeb, 0x95, 0xcd, 0xf6, 0xf6, 0xed, 0xde, 0x0f, + 0xd7, 0xd3, 0xbb, 0x6f, 0x16, 0xbe, 0x66, 0xd8, 0x68, 0xc2, 0xca, 0x7e, 0x92, 0xc9, 0xf9, 0xc6, + 0xdf, 0x00, 0xee, 0x11, 0x69, 0x15, 0x5c, 0x80, 0x5a, 0x82, 0x43, 0xcd, 0xdf, 0xf2, 0xd5, 0x12, + 0x75, 0xa1, 0x4a, 0x33, 0xb7, 0xaa, 0x81, 0x2a, 0xcd, 0xb4, 0x1c, 0xb9, 0x35, 0x23, 0x47, 0x1b, + 0x5f, 0x5c, 0x03, 0xc7, 0x72, 0x9b, 0xcd, 0x8a, 0xdd, 0x44, 0xff, 0x87, 0xd5, 0xc3, 0x9d, 0xe1, + 0xe1, 0x83, 0xfd, 0x47, 0xfb, 0x41, 0x34, 0x0d, 0x0b, 0x9e, 0xf6, 0xf6, 0x9f, 0xce, 0x62, 0x78, + 0x6f, 0xef, 0xfe, 0xee, 0xc0, 0xef, 0x58, 0xbe, 0xbd, 0x69, 0x98, 0xa1, 0x09, 0x5c, 0x28, 0xf9, + 0x53, 0x22, 0x47, 0x8c, 0x49, 0x6d, 0x5a, 0x7b, 0xfb, 0x2f, 0x67, 0x52, 0xf1, 0xb0, 0xe0, 0xf0, + 0xd7, 0x2c, 0xab, 0x01, 0x5e, 0x56, 0x34, 0x63, 0xfc, 0xc8, 0xad, 0xaf, 0xd7, 0x96, 0x51, 0xa4, + 0x38, 0x4e, 0x28, 0x52, 0x00, 0xfa, 0x37, 0x38, 0x09, 0x91, 0x58, 0x47, 0x79, 0x45, 0xdf, 0xe4, + 0xaf, 0x67, 0x52, 0x70, 0x60, 0x48, 0xfc, 0x92, 0x0e, 0x3d, 0x81, 0xa6, 0x35, 0xbd, 0xb1, 0x9c, + 0x8f, 0xb4, 0xe9, 0x96, 0xcc, 0x7b, 0x5e, 0x83, 0xba, 0x8a, 0xcd, 0x77, 0x24, 0xcf, 0x35, 0x68, + 0x97, 0x6e, 0x2b, 0xb3, 0x08, 0x2c, 0xd4, 0xcf, 0x90, 0x07, 0xce, 0x94, 0x09, 0x99, 0xe2, 0x84, + 0x98, 0x9c, 0x2a, 0x65, 0xf4, 0x0b, 0x80, 0x98, 0x60, 0x41, 0x02, 0x49, 0x13, 0xe2, 0xd6, 0xd7, + 0x2b, 0x9b, 0x35, 0xbf, 0xa5, 0x91, 0x47, 0x34, 0x21, 0xe8, 0x57, 0xd0, 0x51, 0xc7, 0x02, 0x41, + 0xf8, 0x31, 0xe1, 0xc2, 0x5d, 0x59, 0xaf, 0x6d, 0xb6, 0xfc, 0xb6, 0xc2, 0x86, 0x05, 0xa4, 0x8e, + 0xa8, 0xdf, 0x96, 0x47, 0x1a, 0xc5, 0x11, 0x85, 0xd9, 0x23, 0xbf, 0x5b, 0x08, 0xec, 0x04, 0x4b, + 0x32, 0xc3, 0x73, 0xb7, 0xa9, 0x0d, 0x29, 0x43, 0x73, 0xaf, 0x80, 0x11, 0x82, 0x3a, 0xe6, 0xe1, + 0xd4, 0x75, 0xf4, 0xb6, 0x5e, 0x2b, 0x2c, 0x27, 0x63, 0xea, 0xb6, 0xd6, 0x2b, 0x9b, 0x8e, 0xaf, + 0xd7, 0xca, 0x6e, 0x3a, 0xc6, 0x21, 0x09, 0xf4, 0xad, 0x40, 0x9f, 0x6e, 0x69, 0xe4, 0xa1, 0xba, + 0xd6, 0x03, 0x5d, 0x50, 0xed, 0x25, 0x22, 0xa0, 0x9c, 0xdd, 0xeb, 0x0f, 0x54, 0x39, 0x7a, 0x6f, + 0x43, 0xb5, 0x3f, 0x40, 0x2e, 0x34, 0x71, 0x14, 0x71, 0x22, 0x84, 0xf1, 0xbe, 0x15, 0xd5, 0x4e, + 0x4a, 0x64, 0x82, 0xc5, 0x91, 0xf1, 0xbe, 0x15, 0xd5, 0x8e, 0xbd, 0x70, 0xe1, 0x79, 0x2b, 0xa2, + 0x2b, 0xd0, 0x18, 0xe3, 0x84, 0xc6, 0x73, 0xe3, 0x74, 0x23, 0x79, 0x9f, 0xd4, 0xa1, 0x69, 0x0b, + 0xe2, 0x67, 0xd0, 0xc2, 0x71, 0xcc, 0x66, 0x41, 0xf6, 0x8c, 0x68, 0x9d, 0x8e, 0xef, 0x68, 0x60, + 0xf0, 0x8c, 0xa0, 0x5f, 0x43, 0xb7, 0xd8, 0x54, 0xf9, 0x31, 0x8e, 0xd9, 0x4c, 0xeb, 0x76, 0xfc, + 0x55, 0x8d, 0x3e, 0x35, 0x20, 0x7a, 0x0c, 0x75, 0xaa, 0x7e, 0x5e, 0x54, 0xec, 0x9d, 0x65, 0x2a, + 0xb6, 0xd7, 0x1f, 0xfc, 0x6b, 0xdf, 0xd7, 0x74, 0xe8, 0x5d, 0xb8, 0x5c, 0x86, 0x54, 0xed, 0x09, + 0xc9, 0x71, 0x96, 0x11, 0xae, 0x6f, 0xd3, 0xde, 0xee, 0x2f, 0xa5, 0x67, 0x67, 0x81, 0xd0, 0xbf, + 0x64, 0xf5, 0x2c, 0xa2, 0xea, 0x5a, 0x4c, 0x50, 0x62, 0xca, 0x77, 0xb9, 0x6b, 0x1d, 0x0a, 0x4a, + 0x7c, 0x4d, 0xe7, 0xdd, 0x86, 0xba, 0xba, 0xa4, 0xaa, 0xb2, 0x9c, 0xc7, 0xb6, 0xca, 0x72, 0x1e, + 0xab, 0x22, 0x0a, 0x59, 0x2a, 0x49, 0x2a, 0x85, 0x09, 0x72, 0x29, 0x7b, 0x5d, 0xe8, 0x2c, 0x1a, + 0xe7, 0xfd, 0x13, 0xea, 0x8a, 0x13, 0xfd, 0x14, 0x9c, 0x91, 0xaa, 0xad, 0x17, 0x54, 0x4d, 0x25, + 0x3f, 0xe6, 0xb1, 0x0a, 0xff, 0x11, 0xe1, 0x29, 0x89, 0x0d, 0x99, 0x91, 0x14, 0x4e, 0x53, 0x2a, + 0xb9, 0xed, 0xfe, 0x46, 0xf2, 0xbe, 0x2c, 0xd2, 0x42, 0xb7, 0xaf, 0x57, 0x1a, 0x7e, 0xe5, 0xf5, + 0x37, 0xfc, 0xea, 0xeb, 0x68, 0xf8, 0x63, 0x00, 0x9a, 0x4a, 0xc2, 0x55, 0xd9, 0x0a, 0xb7, 0xa6, + 0x5b, 0xfd, 0xdd, 0x65, 0xfa, 0x65, 0xaf, 0x6f, 0xe9, 0xfc, 0x05, 0x66, 0xf4, 0x16, 0x34, 0x23, + 0x32, 0xc6, 0x79, 0x2c, 0x4d, 0x7a, 0x9e, 0x97, 0x12, 0x4b, 0xeb, 0x7d, 0x5e, 0x81, 0x56, 0x09, + 0xa3, 0x03, 0xa8, 0x9f, 0x4f, 0x5c, 0x34, 0x8d, 0x79, 0x53, 0xce, 0x2d, 0x0c, 0x96, 0xcc, 0x7b, + 0xde, 0x05, 0xc7, 0x3e, 0x61, 0xe8, 0x12, 0xac, 0x08, 0x89, 0x25, 0x31, 0x89, 0x5a, 0x08, 0xaa, + 0xb9, 0x8f, 0x58, 0x1a, 0xd1, 0x74, 0x12, 0x24, 0x2c, 0x22, 0x5a, 0x7f, 0xcd, 0x6f, 0x1b, 0xec, + 0x80, 0x45, 0x04, 0xa5, 0xd0, 0x49, 0x70, 0x9a, 0x8f, 0x71, 0x28, 0x73, 0x4e, 0xb8, 0x69, 0x34, + 0x7f, 0x5f, 0xea, 0x41, 0xed, 0x1d, 0x2c, 0x30, 0xfa, 0x27, 0xf8, 0xd1, 0x08, 0x1c, 0x9a, 0x0a, + 0x89, 0xd3, 0x90, 0x2c, 0x15, 0xcd, 0x52, 0x57, 0xdf, 0xb0, 0xf9, 0x25, 0x2f, 0xfa, 0x1f, 0x34, + 0xc2, 0x5c, 0x48, 0x96, 0x98, 0xfe, 0xb2, 0xb7, 0x9c, 0x86, 0x5d, 0xcd, 0xe5, 0x1b, 0x4e, 0x75, + 0x83, 0x31, 0x0e, 0x69, 0x4c, 0xe5, 0xdc, 0x0c, 0x09, 0x4b, 0xde, 0xe0, 0xae, 0x61, 0xf3, 0x4b, + 0x5e, 0x6f, 0x1b, 0x3a, 0x8b, 0x3e, 0x7c, 0x65, 0x68, 0x44, 0x50, 0x17, 0x71, 0x3e, 0x31, 0xdd, + 0x47, 0xaf, 0xbd, 0xcf, 0x1c, 0x70, 0xac, 0x33, 0x5e, 0xf9, 0x41, 0x99, 0x1f, 0xd5, 0xc5, 0xfc, + 0xf8, 0xbe, 0xd1, 0xe2, 0xc4, 0xeb, 0x55, 0x7f, 0xe9, 0xf5, 0xba, 0x02, 0x0d, 0x4e, 0x44, 0x98, + 0x17, 0x1d, 0xdc, 0xf1, 0x8d, 0x84, 0xc6, 0x50, 0x3d, 0x1c, 0x1a, 0xaf, 0x3c, 0x39, 0x9f, 0xb8, + 0xf6, 0x0e, 0x33, 0xc2, 0xb1, 0xa4, 0xe9, 0x64, 0x38, 0x17, 0x92, 0x24, 0x7e, 0xf5, 0x70, 0xa8, + 0xe6, 0x07, 0x1c, 0xcf, 0xf0, 0x5c, 0x68, 0xeb, 0x9a, 0xda, 0x86, 0x56, 0x81, 0x28, 0xf3, 0x7e, + 0x03, 0x6b, 0xea, 0x99, 0x0b, 0x44, 0xc8, 0x69, 0x26, 0x75, 0x03, 0x2f, 0x26, 0x92, 0x55, 0x05, + 0x0f, 0x35, 0xaa, 0xda, 0xf8, 0x7f, 0xa1, 0x46, 0x33, 0xe1, 0xb6, 0x74, 0xeb, 0xea, 0x9f, 0x93, + 0xbd, 0xfd, 0x81, 0xaf, 0x58, 0x95, 0x73, 0x73, 0x41, 0xb8, 0x1e, 0x53, 0x8b, 0x09, 0xa7, 0x94, + 0xd1, 0x36, 0x5c, 0x0e, 0xf9, 0x3c, 0x93, 0x24, 0x0a, 0x38, 0x63, 0x32, 0xc8, 0xb0, 0x10, 0x33, + 0xc6, 0x23, 0x3d, 0xf3, 0xb4, 0xfc, 0x9f, 0x98, 0x4d, 0x9f, 0x31, 0x39, 0x30, 0x5b, 0x2a, 0xe6, + 0x12, 0x4f, 0x84, 0xdb, 0xd1, 0x13, 0x9a, 0x5e, 0xa3, 0x29, 0x34, 0x85, 0x64, 0x1c, 0x4f, 0x88, + 0xbb, 0xaa, 0x9d, 0xfe, 0xf0, 0x9c, 0x2e, 0x31, 0x2c, 0x58, 0x7d, 0x4b, 0xaf, 0x1e, 0x43, 0x21, + 0xa6, 0xc1, 0x11, 0x99, 0x0b, 0xb7, 0xab, 0x2d, 0x68, 0x0a, 0x31, 0xfd, 0x07, 0x99, 0x0b, 0x74, + 0x1d, 0x56, 0xcd, 0x9c, 0x1b, 0x70, 0x82, 0xa3, 0xb9, 0xbb, 0xa6, 0xe3, 0xd1, 0x31, 0xa0, 0xaf, + 0x30, 0xef, 0xa3, 0x0a, 0xac, 0xbd, 0x14, 0xc9, 0x32, 0x8b, 0x2b, 0x2f, 0xb2, 0x58, 0x65, 0x56, + 0x44, 0x85, 0xe4, 0xcc, 0xbe, 0xac, 0x85, 0xa4, 0x46, 0x31, 0x35, 0x8c, 0x52, 0x96, 0xda, 0x51, + 0xcc, 0x88, 0x2a, 0x51, 0x69, 0x82, 0x27, 0x24, 0x90, 0x78, 0xa2, 0x13, 0xb5, 0xe5, 0x3b, 0x1a, + 0x78, 0x84, 0x27, 0xe8, 0x2a, 0x34, 0x99, 0x08, 0xb4, 0x96, 0x95, 0x82, 0x8f, 0x89, 0xa1, 0xaa, + 0x96, 0x4f, 0x2b, 0x6f, 0x6e, 0x2a, 0x54, 0x78, 0x96, 0x8f, 0x62, 0x1a, 0xda, 0x72, 0x29, 0x24, + 0xf4, 0x4b, 0x80, 0x04, 0xa7, 0x78, 0x42, 0x12, 0x92, 0x4a, 0x5d, 0x36, 0x8e, 0xbf, 0x80, 0x78, + 0x8f, 0xa1, 0x69, 0x02, 0xa1, 0x0a, 0x38, 0xa2, 0xe2, 0x48, 0x99, 0xa9, 0x9c, 0x5f, 0x08, 0xca, + 0x83, 0x1c, 0xd3, 0xc8, 0xad, 0x16, 0x39, 0xa1, 0xd6, 0x68, 0x1d, 0xda, 0x63, 0x1a, 0x13, 0xa1, + 0x7d, 0x5c, 0xbc, 0xcb, 0x2d, 0x7f, 0x11, 0x52, 0xcf, 0x5d, 0xa3, 0x68, 0x6a, 0xe8, 0x3d, 0x58, + 0xcb, 0x38, 0xd1, 0x9d, 0x33, 0x8e, 0x49, 0x14, 0x30, 0x61, 0x9e, 0xbd, 0xd7, 0x55, 0xbd, 0xdd, + 0x45, 0x75, 0x87, 0x02, 0xfd, 0x56, 0x19, 0x40, 0x8f, 0xb1, 0x24, 0x81, 0xc8, 0x47, 0x29, 0xd1, + 0xf3, 0x99, 0xb2, 0xb8, 0x6b, 0xe0, 0x61, 0x81, 0x7a, 0xcf, 0xc0, 0xb1, 0x8d, 0x52, 0x85, 0x3c, + 0x8b, 0x71, 0x1a, 0x2c, 0x64, 0x8f, 0xa3, 0x00, 0x15, 0x59, 0x74, 0x03, 0x2e, 0xea, 0x4d, 0x93, + 0x1f, 0xc1, 0x42, 0xa3, 0x5c, 0x53, 0x1b, 0x4f, 0x0a, 0x5c, 0x9f, 0xbd, 0x0e, 0xab, 0xb6, 0xe7, + 0x06, 0xa1, 0x7a, 0x21, 0x8b, 0x80, 0x76, 0x2c, 0xb8, 0xcb, 0x22, 0xb2, 0x71, 0x0d, 0x56, 0xf7, + 0x48, 0x4c, 0x24, 0xb1, 0x5f, 0x00, 0xba, 0x50, 0xed, 0xef, 0xd9, 0xe6, 0xda, 0xdf, 0xdb, 0xfe, + 0xa6, 0x01, 0x6b, 0xd6, 0x05, 0xea, 0x4f, 0x13, 0x0d, 0x09, 0xfa, 0xb0, 0x02, 0xf5, 0x41, 0x2e, + 0xa6, 0xe8, 0x8f, 0xa7, 0x71, 0xe4, 0xc2, 0x87, 0x0c, 0xef, 0xd6, 0x69, 0x7e, 0x58, 0x7c, 0xa8, + 0xb8, 0xfa, 0xfe, 0x57, 0x5f, 0x7f, 0x5c, 0xbd, 0xb8, 0xd1, 0xd9, 0x3a, 0xbe, 0x55, 0x7e, 0x70, + 0xf9, 0x73, 0xe5, 0x06, 0xca, 0x61, 0x65, 0x67, 0x7e, 0x70, 0x67, 0x17, 0xfd, 0xe1, 0x34, 0xa4, + 0x2f, 0x3e, 0x7a, 0x78, 0x67, 0xfa, 0x8e, 0x82, 0x24, 0xd4, 0x77, 0xe6, 0xfd, 0xc1, 0x8f, 0xa2, + 0x75, 0xef, 0x0d, 0x6b, 0xfd, 0xa0, 0x02, 0xb5, 0x3b, 0x71, 0x8c, 0x4e, 0x1f, 0xb6, 0xb3, 0x29, + 0xdc, 0xb8, 0xa4, 0x83, 0xdd, 0x45, 0x27, 0x82, 0x7d, 0xb3, 0x82, 0x66, 0xb0, 0xf2, 0x14, 0xcb, + 0x70, 0xfa, 0x66, 0xef, 0x7f, 0xb3, 0x82, 0x8e, 0xa1, 0x51, 0xd4, 0x09, 0x3a, 0xd5, 0xcc, 0x7c, + 0xa2, 0xb6, 0xce, 0x90, 0xf5, 0x3b, 0xf0, 0x1f, 0xc7, 0x22, 0xa3, 0x86, 0x3e, 0xf2, 0xfb, 0x6f, + 0x03, 0x00, 0x00, 0xff, 0xff, 0x94, 0xf4, 0xda, 0x83, 0x78, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 07338b1be..9872ee21b 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -47,12 +47,12 @@ message Hardware { int64 family = 4; } string mac = 1; - string OBSOLETE_ip = 2; + string OBSOLETE_ip = 2; // obsolete string hostname = 3; int64 lease_time = 4; repeated string name_servers = 5; repeated string time_servers = 6; - string OBSOLETE_gateway = 7; + string OBSOLETE_gateway = 7; // obsolete string arch = 8; bool uefi = 9; string iface_name = 10; @@ -74,12 +74,18 @@ message Hardware { bool allow_pxe = 1; bool allow_workflow = 2; IPXE ipxe = 3; - Bootstrapper OBSOLETE_bootstrapper = 4; + Bootstrapper OBSOLETE_bootstrapper = 4; // obsolete Osie osie = 5; } message Network { - DHCP dhcp = 1; - Netboot netboot = 2; + message Interface { + DHCP dhcp = 1; + Netboot netboot = 2; + } + DHCP OBSOLETE_dhcp = 1; // obsolete + Netboot OBSOLETE_netboot = 2; // obsolete + repeated Interface interfaces = 3; + Interface default = 4; } message Metadata { message Manufacturer { @@ -146,10 +152,12 @@ message Hardware { } string id = 1; - DHCP dhcp = 2; - Netboot netboot = 3; - repeated Network network = 4; + DHCP OBSOLETE_dhcp = 2; // obsolete + Netboot OBSOLETE_netboot = 3; //obsolete + repeated Network OBSOLETE_network = 4; // obsolete Metadata metadata = 5; + Network network = 6; + } message DeleteRequest { From 960739c62e456adca33c721795a1b4582a8bbc65 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 15 May 2020 12:18:15 -0400 Subject: [PATCH 12/31] added hardware & workflow endpoints --- protos/hardware/hardware.pb.go | 202 +++++++++--------- protos/hardware/hardware.pb.gw.go | 339 ++++++++++++++++++++++++++++++ protos/hardware/hardware.proto | 18 +- protos/workflow/workflow.pb.go | 79 +++++++ protos/workflow/workflow.pb.gw.go | 164 +++++++++++++++ protos/workflow/workflow.proto | 12 +- 6 files changed, 710 insertions(+), 104 deletions(-) diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 8d942292b..1048607d5 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -1381,105 +1381,109 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1565 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5b, 0x73, 0x1b, 0xb7, - 0x15, 0x1e, 0x5e, 0x44, 0x2e, 0x0f, 0x29, 0xca, 0x46, 0x7d, 0xd9, 0x6e, 0x2f, 0x56, 0xe5, 0x69, - 0xab, 0xfa, 0x81, 0xb2, 0x55, 0x4f, 0x3b, 0xed, 0xb4, 0x9d, 0xb1, 0x2e, 0xb6, 0xd9, 0x5a, 0x16, - 0xbb, 0xf4, 0xa5, 0xb7, 0xe9, 0x06, 0xdc, 0x05, 0x49, 0x44, 0xbb, 0x8b, 0x0d, 0x80, 0x15, 0xcd, - 0x97, 0x64, 0x26, 0x0f, 0x79, 0xc9, 0xe4, 0x29, 0xf9, 0x05, 0x79, 0xc9, 0x7b, 0x9e, 0xf3, 0x27, - 0x32, 0xf9, 0x0b, 0x19, 0xff, 0x8a, 0x3c, 0x64, 0x80, 0x05, 0xd6, 0x94, 0x9d, 0xc9, 0x44, 0xa2, - 0xec, 0xbc, 0xe1, 0x7c, 0x00, 0xbf, 0x73, 0x70, 0x6e, 0x38, 0x5c, 0xb8, 0x3a, 0xc5, 0x3c, 0x9a, - 0x61, 0x4e, 0xb6, 0xec, 0xa2, 0x97, 0x71, 0x26, 0x19, 0xba, 0x31, 0xa1, 0x72, 0x9a, 0x8f, 0x7a, - 0x21, 0x4b, 0x7a, 0x92, 0xa6, 0x47, 0x84, 0x8f, 0x48, 0x1c, 0xeb, 0x65, 0x71, 0x42, 0xf4, 0xec, - 0x2f, 0xbc, 0x9f, 0x4f, 0x18, 0x9b, 0xc4, 0x64, 0x0b, 0x67, 0x74, 0x0b, 0xa7, 0x29, 0x93, 0x58, - 0x52, 0x96, 0x8a, 0xe2, 0xdc, 0xc6, 0x53, 0x68, 0x0f, 0x72, 0x31, 0xf5, 0xc9, 0x3b, 0x39, 0x11, - 0x12, 0xdd, 0x87, 0x7a, 0x84, 0x25, 0x76, 0x2b, 0xeb, 0x95, 0xcd, 0xf6, 0xf6, 0xed, 0xde, 0x0f, - 0xd7, 0xd3, 0xbb, 0x6f, 0x16, 0xbe, 0x66, 0xd8, 0x68, 0xc2, 0xca, 0x7e, 0x92, 0xc9, 0xf9, 0xc6, - 0xdf, 0x00, 0xee, 0x11, 0x69, 0x15, 0x5c, 0x80, 0x5a, 0x82, 0x43, 0xcd, 0xdf, 0xf2, 0xd5, 0x12, - 0x75, 0xa1, 0x4a, 0x33, 0xb7, 0xaa, 0x81, 0x2a, 0xcd, 0xb4, 0x1c, 0xb9, 0x35, 0x23, 0x47, 0x1b, - 0x5f, 0x5c, 0x03, 0xc7, 0x72, 0x9b, 0xcd, 0x8a, 0xdd, 0x44, 0xff, 0x87, 0xd5, 0xc3, 0x9d, 0xe1, - 0xe1, 0x83, 0xfd, 0x47, 0xfb, 0x41, 0x34, 0x0d, 0x0b, 0x9e, 0xf6, 0xf6, 0x9f, 0xce, 0x62, 0x78, - 0x6f, 0xef, 0xfe, 0xee, 0xc0, 0xef, 0x58, 0xbe, 0xbd, 0x69, 0x98, 0xa1, 0x09, 0x5c, 0x28, 0xf9, - 0x53, 0x22, 0x47, 0x8c, 0x49, 0x6d, 0x5a, 0x7b, 0xfb, 0x2f, 0x67, 0x52, 0xf1, 0xb0, 0xe0, 0xf0, - 0xd7, 0x2c, 0xab, 0x01, 0x5e, 0x56, 0x34, 0x63, 0xfc, 0xc8, 0xad, 0xaf, 0xd7, 0x96, 0x51, 0xa4, - 0x38, 0x4e, 0x28, 0x52, 0x00, 0xfa, 0x37, 0x38, 0x09, 0x91, 0x58, 0x47, 0x79, 0x45, 0xdf, 0xe4, - 0xaf, 0x67, 0x52, 0x70, 0x60, 0x48, 0xfc, 0x92, 0x0e, 0x3d, 0x81, 0xa6, 0x35, 0xbd, 0xb1, 0x9c, - 0x8f, 0xb4, 0xe9, 0x96, 0xcc, 0x7b, 0x5e, 0x83, 0xba, 0x8a, 0xcd, 0x77, 0x24, 0xcf, 0x35, 0x68, - 0x97, 0x6e, 0x2b, 0xb3, 0x08, 0x2c, 0xd4, 0xcf, 0x90, 0x07, 0xce, 0x94, 0x09, 0x99, 0xe2, 0x84, - 0x98, 0x9c, 0x2a, 0x65, 0xf4, 0x0b, 0x80, 0x98, 0x60, 0x41, 0x02, 0x49, 0x13, 0xe2, 0xd6, 0xd7, - 0x2b, 0x9b, 0x35, 0xbf, 0xa5, 0x91, 0x47, 0x34, 0x21, 0xe8, 0x57, 0xd0, 0x51, 0xc7, 0x02, 0x41, - 0xf8, 0x31, 0xe1, 0xc2, 0x5d, 0x59, 0xaf, 0x6d, 0xb6, 0xfc, 0xb6, 0xc2, 0x86, 0x05, 0xa4, 0x8e, - 0xa8, 0xdf, 0x96, 0x47, 0x1a, 0xc5, 0x11, 0x85, 0xd9, 0x23, 0xbf, 0x5b, 0x08, 0xec, 0x04, 0x4b, - 0x32, 0xc3, 0x73, 0xb7, 0xa9, 0x0d, 0x29, 0x43, 0x73, 0xaf, 0x80, 0x11, 0x82, 0x3a, 0xe6, 0xe1, - 0xd4, 0x75, 0xf4, 0xb6, 0x5e, 0x2b, 0x2c, 0x27, 0x63, 0xea, 0xb6, 0xd6, 0x2b, 0x9b, 0x8e, 0xaf, - 0xd7, 0xca, 0x6e, 0x3a, 0xc6, 0x21, 0x09, 0xf4, 0xad, 0x40, 0x9f, 0x6e, 0x69, 0xe4, 0xa1, 0xba, - 0xd6, 0x03, 0x5d, 0x50, 0xed, 0x25, 0x22, 0xa0, 0x9c, 0xdd, 0xeb, 0x0f, 0x54, 0x39, 0x7a, 0x6f, - 0x43, 0xb5, 0x3f, 0x40, 0x2e, 0x34, 0x71, 0x14, 0x71, 0x22, 0x84, 0xf1, 0xbe, 0x15, 0xd5, 0x4e, - 0x4a, 0x64, 0x82, 0xc5, 0x91, 0xf1, 0xbe, 0x15, 0xd5, 0x8e, 0xbd, 0x70, 0xe1, 0x79, 0x2b, 0xa2, - 0x2b, 0xd0, 0x18, 0xe3, 0x84, 0xc6, 0x73, 0xe3, 0x74, 0x23, 0x79, 0x9f, 0xd4, 0xa1, 0x69, 0x0b, - 0xe2, 0x67, 0xd0, 0xc2, 0x71, 0xcc, 0x66, 0x41, 0xf6, 0x8c, 0x68, 0x9d, 0x8e, 0xef, 0x68, 0x60, - 0xf0, 0x8c, 0xa0, 0x5f, 0x43, 0xb7, 0xd8, 0x54, 0xf9, 0x31, 0x8e, 0xd9, 0x4c, 0xeb, 0x76, 0xfc, - 0x55, 0x8d, 0x3e, 0x35, 0x20, 0x7a, 0x0c, 0x75, 0xaa, 0x7e, 0x5e, 0x54, 0xec, 0x9d, 0x65, 0x2a, - 0xb6, 0xd7, 0x1f, 0xfc, 0x6b, 0xdf, 0xd7, 0x74, 0xe8, 0x5d, 0xb8, 0x5c, 0x86, 0x54, 0xed, 0x09, - 0xc9, 0x71, 0x96, 0x11, 0xae, 0x6f, 0xd3, 0xde, 0xee, 0x2f, 0xa5, 0x67, 0x67, 0x81, 0xd0, 0xbf, - 0x64, 0xf5, 0x2c, 0xa2, 0xea, 0x5a, 0x4c, 0x50, 0x62, 0xca, 0x77, 0xb9, 0x6b, 0x1d, 0x0a, 0x4a, - 0x7c, 0x4d, 0xe7, 0xdd, 0x86, 0xba, 0xba, 0xa4, 0xaa, 0xb2, 0x9c, 0xc7, 0xb6, 0xca, 0x72, 0x1e, - 0xab, 0x22, 0x0a, 0x59, 0x2a, 0x49, 0x2a, 0x85, 0x09, 0x72, 0x29, 0x7b, 0x5d, 0xe8, 0x2c, 0x1a, - 0xe7, 0xfd, 0x13, 0xea, 0x8a, 0x13, 0xfd, 0x14, 0x9c, 0x91, 0xaa, 0xad, 0x17, 0x54, 0x4d, 0x25, - 0x3f, 0xe6, 0xb1, 0x0a, 0xff, 0x11, 0xe1, 0x29, 0x89, 0x0d, 0x99, 0x91, 0x14, 0x4e, 0x53, 0x2a, - 0xb9, 0xed, 0xfe, 0x46, 0xf2, 0xbe, 0x2c, 0xd2, 0x42, 0xb7, 0xaf, 0x57, 0x1a, 0x7e, 0xe5, 0xf5, - 0x37, 0xfc, 0xea, 0xeb, 0x68, 0xf8, 0x63, 0x00, 0x9a, 0x4a, 0xc2, 0x55, 0xd9, 0x0a, 0xb7, 0xa6, - 0x5b, 0xfd, 0xdd, 0x65, 0xfa, 0x65, 0xaf, 0x6f, 0xe9, 0xfc, 0x05, 0x66, 0xf4, 0x16, 0x34, 0x23, - 0x32, 0xc6, 0x79, 0x2c, 0x4d, 0x7a, 0x9e, 0x97, 0x12, 0x4b, 0xeb, 0x7d, 0x5e, 0x81, 0x56, 0x09, - 0xa3, 0x03, 0xa8, 0x9f, 0x4f, 0x5c, 0x34, 0x8d, 0x79, 0x53, 0xce, 0x2d, 0x0c, 0x96, 0xcc, 0x7b, - 0xde, 0x05, 0xc7, 0x3e, 0x61, 0xe8, 0x12, 0xac, 0x08, 0x89, 0x25, 0x31, 0x89, 0x5a, 0x08, 0xaa, - 0xb9, 0x8f, 0x58, 0x1a, 0xd1, 0x74, 0x12, 0x24, 0x2c, 0x22, 0x5a, 0x7f, 0xcd, 0x6f, 0x1b, 0xec, - 0x80, 0x45, 0x04, 0xa5, 0xd0, 0x49, 0x70, 0x9a, 0x8f, 0x71, 0x28, 0x73, 0x4e, 0xb8, 0x69, 0x34, - 0x7f, 0x5f, 0xea, 0x41, 0xed, 0x1d, 0x2c, 0x30, 0xfa, 0x27, 0xf8, 0xd1, 0x08, 0x1c, 0x9a, 0x0a, - 0x89, 0xd3, 0x90, 0x2c, 0x15, 0xcd, 0x52, 0x57, 0xdf, 0xb0, 0xf9, 0x25, 0x2f, 0xfa, 0x1f, 0x34, - 0xc2, 0x5c, 0x48, 0x96, 0x98, 0xfe, 0xb2, 0xb7, 0x9c, 0x86, 0x5d, 0xcd, 0xe5, 0x1b, 0x4e, 0x75, - 0x83, 0x31, 0x0e, 0x69, 0x4c, 0xe5, 0xdc, 0x0c, 0x09, 0x4b, 0xde, 0xe0, 0xae, 0x61, 0xf3, 0x4b, - 0x5e, 0x6f, 0x1b, 0x3a, 0x8b, 0x3e, 0x7c, 0x65, 0x68, 0x44, 0x50, 0x17, 0x71, 0x3e, 0x31, 0xdd, - 0x47, 0xaf, 0xbd, 0xcf, 0x1c, 0x70, 0xac, 0x33, 0x5e, 0xf9, 0x41, 0x99, 0x1f, 0xd5, 0xc5, 0xfc, - 0xf8, 0xbe, 0xd1, 0xe2, 0xc4, 0xeb, 0x55, 0x7f, 0xe9, 0xf5, 0xba, 0x02, 0x0d, 0x4e, 0x44, 0x98, - 0x17, 0x1d, 0xdc, 0xf1, 0x8d, 0x84, 0xc6, 0x50, 0x3d, 0x1c, 0x1a, 0xaf, 0x3c, 0x39, 0x9f, 0xb8, - 0xf6, 0x0e, 0x33, 0xc2, 0xb1, 0xa4, 0xe9, 0x64, 0x38, 0x17, 0x92, 0x24, 0x7e, 0xf5, 0x70, 0xa8, - 0xe6, 0x07, 0x1c, 0xcf, 0xf0, 0x5c, 0x68, 0xeb, 0x9a, 0xda, 0x86, 0x56, 0x81, 0x28, 0xf3, 0x7e, - 0x03, 0x6b, 0xea, 0x99, 0x0b, 0x44, 0xc8, 0x69, 0x26, 0x75, 0x03, 0x2f, 0x26, 0x92, 0x55, 0x05, - 0x0f, 0x35, 0xaa, 0xda, 0xf8, 0x7f, 0xa1, 0x46, 0x33, 0xe1, 0xb6, 0x74, 0xeb, 0xea, 0x9f, 0x93, - 0xbd, 0xfd, 0x81, 0xaf, 0x58, 0x95, 0x73, 0x73, 0x41, 0xb8, 0x1e, 0x53, 0x8b, 0x09, 0xa7, 0x94, - 0xd1, 0x36, 0x5c, 0x0e, 0xf9, 0x3c, 0x93, 0x24, 0x0a, 0x38, 0x63, 0x32, 0xc8, 0xb0, 0x10, 0x33, - 0xc6, 0x23, 0x3d, 0xf3, 0xb4, 0xfc, 0x9f, 0x98, 0x4d, 0x9f, 0x31, 0x39, 0x30, 0x5b, 0x2a, 0xe6, - 0x12, 0x4f, 0x84, 0xdb, 0xd1, 0x13, 0x9a, 0x5e, 0xa3, 0x29, 0x34, 0x85, 0x64, 0x1c, 0x4f, 0x88, - 0xbb, 0xaa, 0x9d, 0xfe, 0xf0, 0x9c, 0x2e, 0x31, 0x2c, 0x58, 0x7d, 0x4b, 0xaf, 0x1e, 0x43, 0x21, - 0xa6, 0xc1, 0x11, 0x99, 0x0b, 0xb7, 0xab, 0x2d, 0x68, 0x0a, 0x31, 0xfd, 0x07, 0x99, 0x0b, 0x74, - 0x1d, 0x56, 0xcd, 0x9c, 0x1b, 0x70, 0x82, 0xa3, 0xb9, 0xbb, 0xa6, 0xe3, 0xd1, 0x31, 0xa0, 0xaf, - 0x30, 0xef, 0xa3, 0x0a, 0xac, 0xbd, 0x14, 0xc9, 0x32, 0x8b, 0x2b, 0x2f, 0xb2, 0x58, 0x65, 0x56, - 0x44, 0x85, 0xe4, 0xcc, 0xbe, 0xac, 0x85, 0xa4, 0x46, 0x31, 0x35, 0x8c, 0x52, 0x96, 0xda, 0x51, - 0xcc, 0x88, 0x2a, 0x51, 0x69, 0x82, 0x27, 0x24, 0x90, 0x78, 0xa2, 0x13, 0xb5, 0xe5, 0x3b, 0x1a, - 0x78, 0x84, 0x27, 0xe8, 0x2a, 0x34, 0x99, 0x08, 0xb4, 0x96, 0x95, 0x82, 0x8f, 0x89, 0xa1, 0xaa, - 0x96, 0x4f, 0x2b, 0x6f, 0x6e, 0x2a, 0x54, 0x78, 0x96, 0x8f, 0x62, 0x1a, 0xda, 0x72, 0x29, 0x24, - 0xf4, 0x4b, 0x80, 0x04, 0xa7, 0x78, 0x42, 0x12, 0x92, 0x4a, 0x5d, 0x36, 0x8e, 0xbf, 0x80, 0x78, - 0x8f, 0xa1, 0x69, 0x02, 0xa1, 0x0a, 0x38, 0xa2, 0xe2, 0x48, 0x99, 0xa9, 0x9c, 0x5f, 0x08, 0xca, - 0x83, 0x1c, 0xd3, 0xc8, 0xad, 0x16, 0x39, 0xa1, 0xd6, 0x68, 0x1d, 0xda, 0x63, 0x1a, 0x13, 0xa1, - 0x7d, 0x5c, 0xbc, 0xcb, 0x2d, 0x7f, 0x11, 0x52, 0xcf, 0x5d, 0xa3, 0x68, 0x6a, 0xe8, 0x3d, 0x58, - 0xcb, 0x38, 0xd1, 0x9d, 0x33, 0x8e, 0x49, 0x14, 0x30, 0x61, 0x9e, 0xbd, 0xd7, 0x55, 0xbd, 0xdd, - 0x45, 0x75, 0x87, 0x02, 0xfd, 0x56, 0x19, 0x40, 0x8f, 0xb1, 0x24, 0x81, 0xc8, 0x47, 0x29, 0xd1, - 0xf3, 0x99, 0xb2, 0xb8, 0x6b, 0xe0, 0x61, 0x81, 0x7a, 0xcf, 0xc0, 0xb1, 0x8d, 0x52, 0x85, 0x3c, - 0x8b, 0x71, 0x1a, 0x2c, 0x64, 0x8f, 0xa3, 0x00, 0x15, 0x59, 0x74, 0x03, 0x2e, 0xea, 0x4d, 0x93, - 0x1f, 0xc1, 0x42, 0xa3, 0x5c, 0x53, 0x1b, 0x4f, 0x0a, 0x5c, 0x9f, 0xbd, 0x0e, 0xab, 0xb6, 0xe7, - 0x06, 0xa1, 0x7a, 0x21, 0x8b, 0x80, 0x76, 0x2c, 0xb8, 0xcb, 0x22, 0xb2, 0x71, 0x0d, 0x56, 0xf7, - 0x48, 0x4c, 0x24, 0xb1, 0x5f, 0x00, 0xba, 0x50, 0xed, 0xef, 0xd9, 0xe6, 0xda, 0xdf, 0xdb, 0xfe, - 0xa6, 0x01, 0x6b, 0xd6, 0x05, 0xea, 0x4f, 0x13, 0x0d, 0x09, 0xfa, 0xb0, 0x02, 0xf5, 0x41, 0x2e, - 0xa6, 0xe8, 0x8f, 0xa7, 0x71, 0xe4, 0xc2, 0x87, 0x0c, 0xef, 0xd6, 0x69, 0x7e, 0x58, 0x7c, 0xa8, - 0xb8, 0xfa, 0xfe, 0x57, 0x5f, 0x7f, 0x5c, 0xbd, 0xb8, 0xd1, 0xd9, 0x3a, 0xbe, 0x55, 0x7e, 0x70, - 0xf9, 0x73, 0xe5, 0x06, 0xca, 0x61, 0x65, 0x67, 0x7e, 0x70, 0x67, 0x17, 0xfd, 0xe1, 0x34, 0xa4, - 0x2f, 0x3e, 0x7a, 0x78, 0x67, 0xfa, 0x8e, 0x82, 0x24, 0xd4, 0x77, 0xe6, 0xfd, 0xc1, 0x8f, 0xa2, - 0x75, 0xef, 0x0d, 0x6b, 0xfd, 0xa0, 0x02, 0xb5, 0x3b, 0x71, 0x8c, 0x4e, 0x1f, 0xb6, 0xb3, 0x29, - 0xdc, 0xb8, 0xa4, 0x83, 0xdd, 0x45, 0x27, 0x82, 0x7d, 0xb3, 0x82, 0x66, 0xb0, 0xf2, 0x14, 0xcb, - 0x70, 0xfa, 0x66, 0xef, 0x7f, 0xb3, 0x82, 0x8e, 0xa1, 0x51, 0xd4, 0x09, 0x3a, 0xd5, 0xcc, 0x7c, - 0xa2, 0xb6, 0xce, 0x90, 0xf5, 0x3b, 0xf0, 0x1f, 0xc7, 0x22, 0xa3, 0x86, 0x3e, 0xf2, 0xfb, 0x6f, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x94, 0xf4, 0xda, 0x83, 0x78, 0x14, 0x00, 0x00, + // 1617 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0x37, + 0x16, 0xc6, 0x48, 0xb2, 0x34, 0x3a, 0x92, 0xe5, 0x84, 0x71, 0x9c, 0xc9, 0x6c, 0x36, 0xf1, 0x3a, + 0xd8, 0x5d, 0x6f, 0x1e, 0xe4, 0xc4, 0x1b, 0xec, 0x62, 0x17, 0x6d, 0x81, 0xf8, 0x92, 0x44, 0x6d, + 0x1c, 0xab, 0xa3, 0x5c, 0x7a, 0x43, 0xa7, 0xd4, 0x0c, 0x25, 0xb1, 0x9e, 0x5b, 0x87, 0x1c, 0x2b, + 0x42, 0x90, 0x16, 0xe8, 0x43, 0x5f, 0x8a, 0xa2, 0x40, 0x2f, 0x7f, 0xa0, 0x2f, 0x7d, 0xef, 0x73, + 0xff, 0x44, 0xd1, 0x97, 0xfe, 0x80, 0x22, 0xbf, 0xa3, 0x20, 0x87, 0x9c, 0xc8, 0x49, 0x51, 0xd4, + 0x96, 0xe3, 0x37, 0x9e, 0x8f, 0xd4, 0x77, 0x0e, 0xcf, 0x8d, 0x47, 0x03, 0xe7, 0x46, 0x38, 0xf5, + 0xc7, 0x38, 0x25, 0x6b, 0x7a, 0xd1, 0x4e, 0xd2, 0x98, 0xc7, 0xe8, 0xca, 0x90, 0xf2, 0x51, 0xd6, + 0x6f, 0x7b, 0x71, 0xd8, 0xe6, 0x34, 0xda, 0x23, 0x69, 0x9f, 0x04, 0x81, 0x5c, 0xe6, 0x27, 0x58, + 0x5b, 0xff, 0xc2, 0xbe, 0x30, 0x8c, 0xe3, 0x61, 0x40, 0xd6, 0x70, 0x42, 0xd7, 0x70, 0x14, 0xc5, + 0x1c, 0x73, 0x1a, 0x47, 0x2c, 0x3f, 0xb7, 0xf2, 0x10, 0x1a, 0xdd, 0x8c, 0x8d, 0x1c, 0xf2, 0x51, + 0x46, 0x18, 0x47, 0xb7, 0xa1, 0xe2, 0x63, 0x8e, 0x2d, 0x63, 0xd9, 0x58, 0x6d, 0xac, 0x5f, 0x6f, + 0xff, 0x79, 0x3d, 0xed, 0xdb, 0x6a, 0xe1, 0x48, 0x86, 0x95, 0x1a, 0xcc, 0x6d, 0x87, 0x09, 0x9f, + 0xac, 0xbc, 0x06, 0x70, 0x8b, 0x70, 0xad, 0xe0, 0x14, 0x94, 0x43, 0xec, 0x49, 0xfe, 0xba, 0x23, + 0x96, 0xa8, 0x05, 0x25, 0x9a, 0x58, 0x25, 0x09, 0x94, 0x68, 0x22, 0x65, 0xdf, 0x2a, 0x2b, 0xd9, + 0x5f, 0xf9, 0xf1, 0x12, 0x98, 0x9a, 0x5b, 0x6d, 0x1a, 0x7a, 0x13, 0xbd, 0x0f, 0xf3, 0xbb, 0x1b, + 0xbd, 0xdd, 0x3b, 0xdb, 0xf7, 0xb6, 0x5d, 0x7f, 0xe4, 0xe5, 0x3c, 0x8d, 0xf5, 0xff, 0x1d, 0xc5, + 0xf0, 0xf6, 0xd6, 0xed, 0xcd, 0xae, 0xd3, 0xd4, 0x7c, 0x5b, 0x23, 0x2f, 0x41, 0x43, 0x38, 0x55, + 0xf0, 0x47, 0x84, 0xf7, 0xe3, 0x98, 0x4b, 0xd3, 0x1a, 0xeb, 0xaf, 0x1c, 0x49, 0xc5, 0xdd, 0x9c, + 0xc3, 0x59, 0xd0, 0xac, 0x0a, 0x78, 0x5e, 0xd1, 0x38, 0x4e, 0xf7, 0xac, 0xca, 0x72, 0x79, 0x16, + 0x45, 0x82, 0xe3, 0x80, 0x22, 0x01, 0xa0, 0xb7, 0xc1, 0x0c, 0x09, 0xc7, 0x32, 0xca, 0x73, 0xf2, + 0x26, 0xaf, 0x1e, 0x49, 0xc1, 0x8e, 0x22, 0x71, 0x0a, 0x3a, 0xf4, 0x00, 0x6a, 0xda, 0xf4, 0xea, + 0x6c, 0x3e, 0x92, 0xa6, 0x6b, 0x32, 0xfb, 0x69, 0x19, 0x2a, 0x22, 0x36, 0xbf, 0x93, 0x3c, 0x97, + 0xa0, 0x51, 0xb8, 0xad, 0xc8, 0x22, 0xd0, 0x50, 0x27, 0x41, 0x36, 0x98, 0xa3, 0x98, 0xf1, 0x08, + 0x87, 0x44, 0xe5, 0x54, 0x21, 0xa3, 0xbf, 0x02, 0x04, 0x04, 0x33, 0xe2, 0x72, 0x1a, 0x12, 0xab, + 0xb2, 0x6c, 0xac, 0x96, 0x9d, 0xba, 0x44, 0xee, 0xd1, 0x90, 0xa0, 0xbf, 0x41, 0x53, 0x1c, 0x73, + 0x19, 0x49, 0xf7, 0x49, 0xca, 0xac, 0xb9, 0xe5, 0xf2, 0x6a, 0xdd, 0x69, 0x08, 0xac, 0x97, 0x43, + 0xe2, 0x88, 0xf8, 0x6d, 0x71, 0xa4, 0x9a, 0x1f, 0x11, 0x98, 0x3e, 0xf2, 0xaf, 0xa9, 0xc0, 0x0e, + 0x31, 0x27, 0x63, 0x3c, 0xb1, 0x6a, 0xd2, 0x90, 0x22, 0x34, 0xb7, 0x72, 0x18, 0x21, 0xa8, 0xe0, + 0xd4, 0x1b, 0x59, 0xa6, 0xdc, 0x96, 0x6b, 0x81, 0x65, 0x64, 0x40, 0xad, 0xfa, 0xb2, 0xb1, 0x6a, + 0x3a, 0x72, 0x2d, 0xec, 0xa6, 0x03, 0xec, 0x11, 0x57, 0xde, 0x0a, 0xe4, 0xe9, 0xba, 0x44, 0xee, + 0x8a, 0x6b, 0xdd, 0x91, 0x05, 0xd5, 0x98, 0x21, 0x02, 0xc2, 0xd9, 0xed, 0x4e, 0x57, 0x94, 0xa3, + 0xfd, 0x21, 0x94, 0x3a, 0x5d, 0x64, 0x41, 0x0d, 0xfb, 0x7e, 0x4a, 0x18, 0x53, 0xde, 0xd7, 0xa2, + 0xd8, 0x89, 0x08, 0x0f, 0x31, 0xdb, 0x53, 0xde, 0xd7, 0xa2, 0xd8, 0xd1, 0x17, 0xce, 0x3d, 0xaf, + 0x45, 0xb4, 0x04, 0xd5, 0x01, 0x0e, 0x69, 0x30, 0x51, 0x4e, 0x57, 0x92, 0xfd, 0x4d, 0x05, 0x6a, + 0xba, 0x20, 0xfe, 0x02, 0x75, 0x1c, 0x04, 0xf1, 0xd8, 0x4d, 0x1e, 0x11, 0xa9, 0xd3, 0x74, 0x4c, + 0x09, 0x74, 0x1f, 0x11, 0xf4, 0x77, 0x68, 0xe5, 0x9b, 0x22, 0x3f, 0x06, 0x41, 0x3c, 0x96, 0xba, + 0x4d, 0x67, 0x5e, 0xa2, 0x0f, 0x15, 0x88, 0xee, 0x43, 0x85, 0x8a, 0x9f, 0xe7, 0x15, 0x7b, 0x63, + 0x96, 0x8a, 0x6d, 0x77, 0xba, 0x6f, 0x6d, 0x3b, 0x92, 0x0e, 0x7d, 0x0c, 0x67, 0x8b, 0x90, 0x8a, + 0x3d, 0xc6, 0x53, 0x9c, 0x24, 0x24, 0x95, 0xb7, 0x69, 0xac, 0x77, 0x66, 0xd2, 0xb3, 0x31, 0x45, + 0xe8, 0x2c, 0x6a, 0x3d, 0xd3, 0xa8, 0xb8, 0x56, 0xcc, 0x28, 0x51, 0xe5, 0x3b, 0xdb, 0xb5, 0x76, + 0x19, 0x25, 0x8e, 0xa4, 0xb3, 0xaf, 0x43, 0x45, 0x5c, 0x52, 0x54, 0x59, 0x96, 0x06, 0xba, 0xca, + 0xb2, 0x34, 0x10, 0x45, 0xe4, 0xc5, 0x11, 0x27, 0x11, 0x67, 0x2a, 0xc8, 0x85, 0x6c, 0xb7, 0xa0, + 0x39, 0x6d, 0x9c, 0xfd, 0x26, 0x54, 0x04, 0x27, 0x3a, 0x0f, 0x66, 0x5f, 0xd4, 0xd6, 0x33, 0xaa, + 0x9a, 0x90, 0xef, 0xa7, 0x81, 0x08, 0xff, 0x1e, 0x49, 0x23, 0x12, 0x28, 0x32, 0x25, 0x09, 0x9c, + 0x46, 0x94, 0xa7, 0xba, 0xfb, 0x2b, 0xc9, 0xfe, 0x29, 0x4f, 0x0b, 0xd9, 0xbe, 0x5e, 0x68, 0xf8, + 0xc6, 0xcb, 0x6f, 0xf8, 0xa5, 0x97, 0xd1, 0xf0, 0x07, 0x00, 0x34, 0xe2, 0x24, 0x15, 0x65, 0xcb, + 0xac, 0xb2, 0x6c, 0xf5, 0x37, 0x67, 0xe9, 0x97, 0xed, 0x8e, 0xa6, 0x73, 0xa6, 0x98, 0xd1, 0x07, + 0x50, 0xf3, 0xc9, 0x00, 0x67, 0x01, 0x57, 0xe9, 0x79, 0x5c, 0x4a, 0x34, 0xad, 0xfd, 0x83, 0x01, + 0xf5, 0x02, 0x46, 0x3b, 0x50, 0x39, 0x9e, 0xb8, 0x48, 0x1a, 0xf5, 0xa6, 0x1c, 0x5b, 0x18, 0x34, + 0x99, 0xfd, 0xb4, 0x05, 0xa6, 0x7e, 0xc2, 0xd0, 0x22, 0xcc, 0x31, 0x8e, 0x39, 0x51, 0x89, 0x9a, + 0x0b, 0xa2, 0xb9, 0xf7, 0xe3, 0xc8, 0xa7, 0xd1, 0xd0, 0x0d, 0x63, 0x9f, 0x48, 0xfd, 0x65, 0xa7, + 0xa1, 0xb0, 0x9d, 0xd8, 0x27, 0x28, 0x82, 0x66, 0x88, 0xa3, 0x6c, 0x80, 0x3d, 0x9e, 0xa5, 0x24, + 0x55, 0x8d, 0xe6, 0xf5, 0x99, 0x1e, 0xd4, 0xf6, 0xce, 0x14, 0xa3, 0x73, 0x80, 0x1f, 0xf5, 0xc1, + 0xa4, 0x11, 0xe3, 0x38, 0xf2, 0xc8, 0x4c, 0xd1, 0x2c, 0x74, 0x75, 0x14, 0x9b, 0x53, 0xf0, 0xa2, + 0xf7, 0xa0, 0xea, 0x65, 0x8c, 0xc7, 0xa1, 0xea, 0x2f, 0x5b, 0xb3, 0x69, 0xd8, 0x94, 0x5c, 0x8e, + 0xe2, 0x14, 0x37, 0x18, 0x60, 0x8f, 0x06, 0x94, 0x4f, 0xd4, 0x90, 0x30, 0xe3, 0x0d, 0x6e, 0x2a, + 0x36, 0xa7, 0xe0, 0xb5, 0xd7, 0xa1, 0x39, 0xed, 0xc3, 0x17, 0x86, 0x46, 0x04, 0x15, 0x16, 0x64, + 0x43, 0xd5, 0x7d, 0xe4, 0xda, 0xfe, 0xde, 0x04, 0x53, 0x3b, 0xe3, 0x85, 0x1f, 0x14, 0xf9, 0x51, + 0x9a, 0xce, 0x8f, 0x3f, 0x1a, 0x2d, 0x0e, 0xbc, 0x5e, 0x95, 0xe7, 0x5e, 0xaf, 0x25, 0xa8, 0xa6, + 0x84, 0x79, 0x59, 0xde, 0xc1, 0x4d, 0x47, 0x49, 0x68, 0x00, 0xa5, 0xdd, 0x9e, 0xf2, 0xca, 0x83, + 0xe3, 0x89, 0x6b, 0x7b, 0x37, 0x21, 0x29, 0xe6, 0x34, 0x1a, 0xf6, 0x26, 0x8c, 0x93, 0xd0, 0x29, + 0xed, 0xf6, 0xc4, 0xfc, 0x80, 0x83, 0x31, 0x9e, 0x30, 0x69, 0x5d, 0x4d, 0xda, 0x50, 0xcf, 0x11, + 0x61, 0xde, 0x3f, 0x60, 0x41, 0x3c, 0x73, 0x2e, 0xf3, 0x52, 0x9a, 0x70, 0xd9, 0xc0, 0xf3, 0x89, + 0x64, 0x5e, 0xc0, 0x3d, 0x89, 0x8a, 0x36, 0xfe, 0x2e, 0x94, 0x69, 0xc2, 0xac, 0xba, 0x6c, 0x5d, + 0x9d, 0x63, 0xb2, 0xb7, 0xd3, 0x75, 0x04, 0xab, 0x70, 0x6e, 0xc6, 0x48, 0x2a, 0xc7, 0xd4, 0x7c, + 0xc2, 0x29, 0x64, 0xb4, 0x0e, 0x67, 0xbd, 0x74, 0x92, 0x70, 0xe2, 0xbb, 0x69, 0x1c, 0x73, 0x37, + 0xc1, 0x8c, 0x8d, 0xe3, 0xd4, 0x97, 0x33, 0x4f, 0xdd, 0x39, 0xa3, 0x36, 0x9d, 0x38, 0xe6, 0x5d, + 0xb5, 0x25, 0x62, 0xce, 0xf1, 0x90, 0x59, 0x4d, 0x39, 0xa1, 0xc9, 0x35, 0x1a, 0x41, 0x8d, 0xf1, + 0x38, 0xc5, 0x43, 0x62, 0xcd, 0x4b, 0xa7, 0xdf, 0x3d, 0xa6, 0x4b, 0xf4, 0x72, 0x56, 0x47, 0xd3, + 0x8b, 0xc7, 0x90, 0xb1, 0x91, 0xbb, 0x47, 0x26, 0xcc, 0x6a, 0x49, 0x0b, 0x6a, 0x8c, 0x8d, 0xde, + 0x20, 0x13, 0x86, 0x2e, 0xc3, 0xbc, 0x9a, 0x73, 0xdd, 0x94, 0x60, 0x7f, 0x62, 0x2d, 0xc8, 0x78, + 0x34, 0x15, 0xe8, 0x08, 0xcc, 0xfe, 0xc2, 0x80, 0x85, 0xe7, 0x22, 0x59, 0x64, 0xb1, 0xf1, 0x2c, + 0x8b, 0x45, 0x66, 0xf9, 0x94, 0xf1, 0x34, 0xd6, 0x2f, 0x6b, 0x2e, 0x89, 0x51, 0x4c, 0x0c, 0xa3, + 0x34, 0x8e, 0xf4, 0x28, 0xa6, 0x44, 0x91, 0xa8, 0x34, 0xc4, 0x43, 0xe2, 0x72, 0x3c, 0x94, 0x89, + 0x5a, 0x77, 0x4c, 0x09, 0xdc, 0xc3, 0x43, 0x74, 0x0e, 0x6a, 0x31, 0x73, 0xa5, 0x96, 0xb9, 0x9c, + 0x2f, 0x66, 0x3d, 0x51, 0x2d, 0xdf, 0x19, 0x27, 0x37, 0x15, 0x0a, 0x3c, 0xc9, 0xfa, 0x01, 0xf5, + 0x74, 0xb9, 0xe4, 0x12, 0xba, 0x08, 0x10, 0xe2, 0x08, 0x0f, 0x49, 0x48, 0x22, 0x2e, 0xcb, 0xc6, + 0x74, 0xa6, 0x10, 0xfb, 0x3e, 0xd4, 0x54, 0x20, 0x44, 0x01, 0xfb, 0x94, 0xed, 0x09, 0x33, 0x85, + 0xf3, 0x73, 0x41, 0x78, 0x30, 0xc5, 0xd4, 0xb7, 0x4a, 0x79, 0x4e, 0x88, 0x35, 0x5a, 0x86, 0xc6, + 0x80, 0x06, 0x84, 0x49, 0x1f, 0xe7, 0xef, 0x72, 0xdd, 0x99, 0x86, 0xc4, 0x73, 0x57, 0xcd, 0x9b, + 0x1a, 0xfa, 0x04, 0x16, 0x92, 0x94, 0xc8, 0xce, 0x19, 0x04, 0xc4, 0x77, 0x63, 0xa6, 0x9e, 0xbd, + 0x97, 0x55, 0xbd, 0xad, 0x69, 0x75, 0xbb, 0x0c, 0xfd, 0x53, 0x18, 0x40, 0xf7, 0x31, 0x27, 0x2e, + 0xcb, 0xfa, 0x11, 0x91, 0xf3, 0x99, 0xb0, 0xb8, 0xa5, 0xe0, 0x5e, 0x8e, 0xda, 0x8f, 0xc0, 0xd4, + 0x8d, 0x52, 0x84, 0x3c, 0x09, 0x70, 0xe4, 0x4e, 0x65, 0x8f, 0x29, 0x00, 0x11, 0x59, 0x74, 0x05, + 0x4e, 0xcb, 0x4d, 0x95, 0x1f, 0xee, 0x54, 0xa3, 0x5c, 0x10, 0x1b, 0x0f, 0x72, 0x5c, 0x9e, 0xbd, + 0x0c, 0xf3, 0xba, 0xe7, 0xba, 0x9e, 0x78, 0x21, 0xf3, 0x80, 0x36, 0x35, 0xb8, 0x19, 0xfb, 0x64, + 0xe5, 0x12, 0xcc, 0x6f, 0x91, 0x80, 0x70, 0xa2, 0xbf, 0x00, 0xb4, 0xa0, 0xd4, 0xd9, 0xd2, 0xcd, + 0xb5, 0xb3, 0xb5, 0xfe, 0x4b, 0x0d, 0x16, 0xb4, 0x0b, 0xc4, 0x9f, 0x26, 0xea, 0x11, 0xf4, 0xb9, + 0x01, 0x95, 0x6e, 0xc6, 0x46, 0xe8, 0xbf, 0x87, 0x71, 0xe4, 0xd4, 0x87, 0x0c, 0xfb, 0xda, 0x61, + 0x7e, 0x98, 0x7f, 0xa8, 0x38, 0xf7, 0xe9, 0xcf, 0xbf, 0x7e, 0x5d, 0x3a, 0xbd, 0xd2, 0x5c, 0xdb, + 0xbf, 0x56, 0x7c, 0x70, 0xf9, 0xbf, 0x71, 0x05, 0x7d, 0x6b, 0xc0, 0xdc, 0xc6, 0x64, 0xe7, 0xc6, + 0x26, 0xfa, 0xcf, 0x61, 0x58, 0x9f, 0x7d, 0xf5, 0xb0, 0x8f, 0xf4, 0x21, 0x65, 0xe5, 0xa2, 0x34, + 0xc8, 0x42, 0x4b, 0xd3, 0x06, 0xad, 0x85, 0xd8, 0x5b, 0x7b, 0x1c, 0x62, 0xef, 0x09, 0xfa, 0xca, + 0x80, 0xca, 0xc6, 0xa4, 0xd3, 0x3d, 0x61, 0xb3, 0x2e, 0x48, 0xb3, 0x96, 0xd0, 0xe2, 0x01, 0xb3, + 0x68, 0xb2, 0xf6, 0x98, 0x26, 0x4f, 0xd0, 0x97, 0xb9, 0x51, 0x5b, 0x27, 0x6c, 0xd4, 0x79, 0x69, + 0xd4, 0x19, 0x74, 0xfa, 0x80, 0x51, 0x8f, 0xa9, 0xff, 0x04, 0x7d, 0x66, 0x40, 0xf9, 0x46, 0x10, + 0xa0, 0xc3, 0xa7, 0xc4, 0x11, 0x6d, 0x59, 0x94, 0xb6, 0xb4, 0xd0, 0x81, 0x44, 0xba, 0x6a, 0xa0, + 0x31, 0xcc, 0x3d, 0xc4, 0xdc, 0x1b, 0x9d, 0xac, 0x6b, 0xae, 0x1a, 0x68, 0x1f, 0xaa, 0x79, 0x0d, + 0xa2, 0x43, 0xcd, 0xe3, 0x07, 0xea, 0xf6, 0x08, 0x15, 0xb5, 0x01, 0xef, 0x98, 0x1a, 0xe9, 0x57, + 0xe5, 0x91, 0x7f, 0xff, 0x16, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x0e, 0xbd, 0x79, 0xd4, 0x14, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.pb.gw.go b/protos/hardware/hardware.pb.gw.go index 17c068a01..b0864c7fd 100644 --- a/protos/hardware/hardware.pb.gw.go +++ b/protos/hardware/hardware.pb.gw.go @@ -65,6 +65,213 @@ func local_request_HardwareService_Push_0(ctx context.Context, marshaler runtime } +var ( + filter_HardwareService_ByMAC_0 = &utilities.DoubleArray{Encoding: map[string]int{"mac": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_HardwareService_ByMAC_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["mac"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "mac") + } + + protoReq.Mac, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "mac", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_HardwareService_ByMAC_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.ByMAC(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_HardwareService_ByMAC_0(ctx context.Context, marshaler runtime.Marshaler, server HardwareServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["mac"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "mac") + } + + protoReq.Mac, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "mac", err) + } + + if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_HardwareService_ByMAC_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.ByMAC(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_HardwareService_ByIP_0 = &utilities.DoubleArray{Encoding: map[string]int{"ip": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_HardwareService_ByIP_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["ip"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ip") + } + + protoReq.Ip, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ip", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_HardwareService_ByIP_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.ByIP(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_HardwareService_ByIP_0(ctx context.Context, marshaler runtime.Marshaler, server HardwareServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["ip"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ip") + } + + protoReq.Ip, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ip", err) + } + + if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_HardwareService_ByIP_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.ByIP(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_HardwareService_ByID_0 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + +func request_HardwareService_ByID_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_HardwareService_ByID_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.ByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_HardwareService_ByID_0(ctx context.Context, marshaler runtime.Marshaler, server HardwareServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_HardwareService_ByID_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.ByID(ctx, &protoReq) + return msg, metadata, err + +} + func request_HardwareService_All_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (HardwareService_AllClient, runtime.ServerMetadata, error) { var protoReq Empty var metadata runtime.ServerMetadata @@ -107,6 +314,66 @@ func RegisterHardwareServiceHandlerServer(ctx context.Context, mux *runtime.Serv }) + mux.Handle("GET", pattern_HardwareService_ByMAC_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_HardwareService_ByMAC_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_ByMAC_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_HardwareService_ByIP_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_HardwareService_ByIP_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_ByIP_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_HardwareService_ByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_HardwareService_ByID_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_ByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_HardwareService_All_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -175,6 +442,66 @@ func RegisterHardwareServiceHandlerClient(ctx context.Context, mux *runtime.Serv }) + mux.Handle("GET", pattern_HardwareService_ByMAC_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_HardwareService_ByMAC_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_ByMAC_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_HardwareService_ByIP_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_HardwareService_ByIP_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_ByIP_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_HardwareService_ByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_HardwareService_ByID_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_HardwareService_ByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_HardwareService_All_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -201,11 +528,23 @@ func RegisterHardwareServiceHandlerClient(ctx context.Context, mux *runtime.Serv var ( pattern_HardwareService_Push_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "hardware"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_HardwareService_ByMAC_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 2}, []string{"v1", "hardware", "mac"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_HardwareService_ByIP_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 2}, []string{"v1", "hardware", "ip"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_HardwareService_ByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "hardware", "id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_HardwareService_All_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "hardware"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( forward_HardwareService_Push_0 = runtime.ForwardResponseMessage + forward_HardwareService_ByMAC_0 = runtime.ForwardResponseMessage + + forward_HardwareService_ByIP_0 = runtime.ForwardResponseMessage + + forward_HardwareService_ByID_0 = runtime.ForwardResponseMessage + forward_HardwareService_All_0 = runtime.ForwardResponseStream ) diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 9872ee21b..871b14d89 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -13,9 +13,21 @@ service HardwareService { body: "*" }; }; - rpc ByMAC(GetRequest) returns (Hardware); - rpc ByIP(GetRequest) returns (Hardware); - rpc ByID(GetRequest) returns (Hardware); + rpc ByMAC(GetRequest) returns (Hardware) { + option (google.api.http) = { + get: "/v1/hardware/mac/{mac}" + }; + }; + rpc ByIP(GetRequest) returns (Hardware) { + option (google.api.http) = { + get: "/v1/hardware/ip/{ip}" + }; + }; + rpc ByID(GetRequest) returns (Hardware) { + option (google.api.http) = { + get: "/v1/hardware/{id}" + }; + }; rpc All(Empty) returns (stream Hardware) { option (google.api.http) = { get: "/v1/hardware" diff --git a/protos/workflow/workflow.pb.go b/protos/workflow/workflow.pb.go index 401a457b8..dd35f3351 100644 --- a/protos/workflow/workflow.pb.go +++ b/protos/workflow/workflow.pb.go @@ -969,6 +969,7 @@ func init() { } var fileDescriptor_87aff9429097fa52 = []byte{ +<<<<<<< HEAD // 1232 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, 0x14, 0xcf, 0xae, 0xe3, 0xd8, 0x7e, 0x8e, 0x9d, 0x74, 0x1a, 0x1a, 0xe3, 0x16, 0x61, 0x56, 0x42, @@ -1047,6 +1048,84 @@ var fileDescriptor_87aff9429097fa52 = []byte{ 0xcc, 0x6c, 0x1c, 0x1f, 0xcb, 0x69, 0xff, 0x32, 0xb1, 0xe4, 0x8f, 0xc8, 0xec, 0xe6, 0x81, 0x1a, 0xf3, 0x44, 0xff, 0xcf, 0xcd, 0x25, 0x51, 0xeb, 0x3d, 0x84, 0x4f, 0xb2, 0x5a, 0x77, 0xb4, 0x22, 0x9c, 0xde, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xca, 0x86, 0x66, 0x7c, 0x8a, 0x11, 0x00, 0x00, +======= + // 1200 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0x1a, 0xc7, + 0x17, 0xf7, 0x2e, 0xc6, 0xc0, 0xc1, 0x60, 0x67, 0x42, 0xe2, 0x0d, 0x49, 0xfe, 0x7f, 0xb2, 0x55, + 0x24, 0xcb, 0x17, 0x26, 0x75, 0x15, 0xa9, 0xc9, 0x9d, 0x6b, 0x30, 0x42, 0xb2, 0x71, 0xb4, 0xe0, + 0x24, 0xaa, 0x52, 0xa1, 0x31, 0x3b, 0x76, 0x56, 0x66, 0x77, 0xe9, 0xce, 0x60, 0xa7, 0xaa, 0x7a, + 0xd3, 0x57, 0xe8, 0x0b, 0x54, 0x7d, 0x8d, 0xf6, 0x2d, 0xaa, 0xbe, 0x41, 0x1f, 0xa4, 0x9a, 0xaf, + 0xfd, 0xe0, 0xc3, 0xa8, 0x55, 0xee, 0x38, 0x5f, 0xbf, 0x73, 0xf6, 0xfc, 0xce, 0x9c, 0x19, 0x60, + 0xe7, 0x36, 0x8c, 0xae, 0x2f, 0xc7, 0xe1, 0x6d, 0x53, 0xff, 0xd8, 0x9f, 0x44, 0x21, 0x0b, 0x51, + 0x51, 0xcb, 0xf5, 0x27, 0x57, 0x61, 0x78, 0x35, 0x26, 0x4d, 0x3c, 0xf1, 0x9a, 0x38, 0x08, 0x42, + 0x86, 0x99, 0x17, 0x06, 0x54, 0xfa, 0xd5, 0xb7, 0x98, 0xe7, 0x13, 0xca, 0xb0, 0x3f, 0x91, 0x0a, + 0xbb, 0x00, 0xf9, 0xb6, 0x3f, 0x61, 0x3f, 0xd8, 0xbf, 0x9b, 0x50, 0x7c, 0xa7, 0x40, 0x50, 0x15, + 0x4c, 0xcf, 0xb5, 0x8c, 0x86, 0xb1, 0x5b, 0x72, 0x4c, 0xcf, 0x45, 0x75, 0x28, 0x32, 0xe2, 0x4f, + 0xc6, 0x98, 0x11, 0xcb, 0x14, 0xda, 0x58, 0xe6, 0xb6, 0x8f, 0x38, 0x72, 0x6f, 0x71, 0x44, 0xac, + 0x9c, 0xb4, 0x69, 0x19, 0x3d, 0x87, 0x3c, 0x65, 0x3c, 0x68, 0xbd, 0x61, 0xec, 0x56, 0x0f, 0xb6, + 0xf6, 0xe3, 0xb2, 0xfb, 0x5c, 0xed, 0x48, 0x2b, 0xfa, 0x1a, 0x4a, 0xa3, 0x88, 0x60, 0x46, 0xdc, + 0x43, 0x66, 0xe5, 0x1b, 0xc6, 0x6e, 0xf9, 0xa0, 0xbe, 0x2f, 0xbf, 0x43, 0x96, 0x79, 0x31, 0xbd, + 0xdc, 0x1f, 0xe8, 0xca, 0x9d, 0xc4, 0x99, 0x47, 0x4e, 0x27, 0xae, 0x8a, 0xdc, 0x58, 0x1d, 0x19, + 0x3b, 0xf3, 0x48, 0x97, 0x8c, 0x89, 0x8c, 0x2c, 0xac, 0x8e, 0x8c, 0x9d, 0x11, 0x82, 0x75, 0x17, + 0x33, 0x6c, 0x15, 0xc5, 0xc7, 0x8a, 0xdf, 0x76, 0x07, 0x2a, 0x47, 0xa2, 0x28, 0x87, 0x7c, 0x3f, + 0x25, 0x94, 0x65, 0x3a, 0x66, 0xdc, 0xd1, 0x31, 0x33, 0xdb, 0x31, 0xbb, 0x01, 0x55, 0x0d, 0x44, + 0x27, 0x61, 0x40, 0xc9, 0x2c, 0x17, 0xf6, 0x13, 0x80, 0x0e, 0x61, 0x3a, 0xcf, 0xac, 0xf5, 0x2f, + 0x13, 0xb6, 0x34, 0x8d, 0x47, 0x61, 0xc0, 0xc8, 0x27, 0x86, 0xfe, 0x0f, 0x65, 0xdd, 0xf7, 0x61, + 0xec, 0x0c, 0x5a, 0xd5, 0x75, 0xd1, 0x73, 0xa8, 0x8e, 0xa6, 0x51, 0x44, 0x02, 0x36, 0xe4, 0x5a, + 0x12, 0xa9, 0xb2, 0x2a, 0x4a, 0xfb, 0x4e, 0x28, 0xd1, 0x33, 0xd8, 0xd4, 0x6e, 0x0c, 0xd3, 0x6b, + 0xc5, 0x76, 0x59, 0xe9, 0x06, 0x98, 0x5e, 0xa7, 0x91, 0xf0, 0x88, 0x0f, 0x9e, 0x60, 0x3e, 0x41, + 0x3a, 0x14, 0x4a, 0xf4, 0x02, 0x6a, 0x59, 0xb7, 0xa1, 0x17, 0xb8, 0xe4, 0x93, 0xe0, 0x3e, 0xe7, + 0xa0, 0x8c, 0x73, 0x97, 0x5b, 0x50, 0x67, 0x2e, 0x42, 0x0e, 0xd6, 0x86, 0x18, 0xac, 0x07, 0xc9, + 0x60, 0xc9, 0x20, 0x39, 0x5e, 0x59, 0x20, 0xa1, 0x43, 0x2f, 0x61, 0x87, 0x85, 0x0c, 0x8f, 0x87, + 0xc1, 0xd4, 0xbf, 0x20, 0xd1, 0x30, 0xbc, 0x54, 0x80, 0x54, 0x4c, 0x41, 0xce, 0xa9, 0x09, 0x73, + 0x4f, 0x58, 0xcf, 0x2e, 0x65, 0x28, 0xb5, 0xff, 0x30, 0xa1, 0xa6, 0xfb, 0x9a, 0xc0, 0x4d, 0xe9, + 0xea, 0xe6, 0x3e, 0x86, 0x12, 0xef, 0xd6, 0x30, 0xc0, 0x7e, 0x72, 0x78, 0x30, 0xbd, 0xee, 0x61, + 0x9f, 0xf0, 0x68, 0xf5, 0x39, 0xc2, 0x2c, 0x3b, 0x0a, 0x52, 0x25, 0x1c, 0x5e, 0x43, 0x25, 0xf5, + 0xbd, 0x53, 0xaa, 0x4e, 0xd2, 0x92, 0x0f, 0xde, 0xc4, 0xe9, 0xd2, 0x2c, 0x28, 0x50, 0x32, 0x0a, + 0x03, 0x97, 0xaa, 0xc6, 0x6a, 0x91, 0x5b, 0x7c, 0x42, 0x29, 0xbe, 0x92, 0x0d, 0x2c, 0x39, 0x5a, + 0xcc, 0x1e, 0xc5, 0xc2, 0xbf, 0x39, 0x8a, 0x8f, 0xa1, 0x24, 0x87, 0x87, 0xb7, 0x41, 0x9e, 0x8d, + 0xa2, 0x54, 0x74, 0x5d, 0xfb, 0x25, 0x3c, 0x9c, 0x99, 0x4a, 0x3d, 0xc0, 0x99, 0x30, 0x63, 0x26, + 0xec, 0x3b, 0xb8, 0x3f, 0x13, 0x76, 0xe2, 0x51, 0x86, 0x8e, 0xe1, 0x5e, 0xdc, 0xf3, 0x91, 0xd4, + 0x53, 0xcb, 0x68, 0xe4, 0x76, 0xcb, 0x07, 0x8f, 0x92, 0xc6, 0xcc, 0x26, 0xdc, 0xbe, 0xcd, 0x2a, + 0xa8, 0xfd, 0x2a, 0xa9, 0x4a, 0xf1, 0xac, 0xab, 0x5a, 0xc5, 0xaa, 0xfd, 0x9b, 0x09, 0xd5, 0x6c, + 0x6c, 0x96, 0x68, 0x63, 0x86, 0x68, 0x04, 0xeb, 0xa9, 0x01, 0x10, 0xbf, 0x51, 0x0d, 0xf2, 0x9e, + 0xcf, 0x39, 0x90, 0xb4, 0x4b, 0x81, 0x73, 0xc3, 0x97, 0x74, 0x38, 0x65, 0x82, 0xeb, 0x9c, 0xa3, + 0x45, 0x6e, 0x19, 0x85, 0xbe, 0x8f, 0x03, 0xd7, 0xca, 0x37, 0x72, 0x9c, 0x35, 0x25, 0xa2, 0xa7, + 0x00, 0x61, 0x30, 0xd4, 0x61, 0x1b, 0xc2, 0x58, 0x0a, 0x83, 0x81, 0x0a, 0x94, 0xe6, 0x4b, 0xec, + 0x8d, 0xa7, 0x11, 0xb1, 0x0a, 0xda, 0x7c, 0x2c, 0x15, 0x77, 0x32, 0xc7, 0x93, 0xde, 0x84, 0xe3, + 0xa9, 0x4f, 0xa8, 0x55, 0x92, 0x49, 0x95, 0x88, 0x1a, 0x50, 0x26, 0xc1, 0x8d, 0x17, 0x85, 0x81, + 0x4f, 0x02, 0x66, 0x81, 0xb0, 0xa6, 0x55, 0xf6, 0x19, 0xa0, 0x6c, 0x8f, 0x04, 0x7b, 0xaf, 0xe2, + 0x99, 0x1f, 0x7b, 0x94, 0x29, 0xde, 0xac, 0x79, 0xde, 0x64, 0x88, 0x3e, 0x0d, 0x3c, 0xd4, 0xee, + 0xc3, 0xc3, 0x0e, 0x61, 0xda, 0xa1, 0x85, 0x19, 0x5e, 0x48, 0x58, 0x6b, 0x8e, 0xb0, 0x96, 0xf8, + 0x0e, 0x12, 0x51, 0xbe, 0x92, 0x38, 0x07, 0x79, 0x47, 0x8b, 0x76, 0x07, 0x76, 0xe6, 0x40, 0xd5, + 0xee, 0xd5, 0xab, 0x9e, 0xc3, 0x6d, 0xca, 0x55, 0x7f, 0x07, 0xd0, 0x18, 0x1e, 0x9d, 0x8b, 0xfb, + 0xe5, 0x3f, 0x15, 0x58, 0x87, 0xa2, 0x4f, 0x18, 0x16, 0xf9, 0x4c, 0x91, 0x2f, 0x96, 0xe3, 0x3a, + 0x72, 0x49, 0x1d, 0x7b, 0x1d, 0xc8, 0xcb, 0x8d, 0x56, 0x86, 0xc2, 0x9b, 0x76, 0xaf, 0xd5, 0xed, + 0x75, 0xb6, 0xd7, 0xb8, 0xe0, 0x9c, 0xf7, 0x7a, 0x5c, 0x30, 0x10, 0xc0, 0xc6, 0xf1, 0x61, 0xf7, + 0xa4, 0xdd, 0xda, 0x36, 0xb9, 0x61, 0xd0, 0x3d, 0x6d, 0x9f, 0x9d, 0x0f, 0xb6, 0x73, 0x5c, 0xe8, + 0x9f, 0x1f, 0x1d, 0xb5, 0xfb, 0xfd, 0xed, 0xf5, 0x3d, 0x06, 0xe5, 0xf4, 0x82, 0x44, 0x50, 0x3d, + 0x3c, 0x1a, 0x74, 0xcf, 0x7a, 0xc3, 0x04, 0xf5, 0x21, 0x20, 0xa5, 0xeb, 0xf6, 0x86, 0x6f, 0x9c, + 0xb3, 0x8e, 0xc3, 0x43, 0x8d, 0x94, 0xaf, 0x86, 0x33, 0xd1, 0x3d, 0xa8, 0x28, 0x9d, 0xca, 0x9d, + 0x4b, 0xb9, 0xe9, 0x12, 0xd6, 0x0f, 0x7e, 0x2d, 0x41, 0x59, 0xf7, 0xa9, 0x7f, 0x33, 0x42, 0x1f, + 0xf4, 0xc5, 0x17, 0x3f, 0x42, 0x76, 0x92, 0x91, 0xc8, 0xdc, 0xad, 0x75, 0x6b, 0xde, 0x20, 0xf9, + 0xb2, 0x77, 0x7e, 0xfe, 0xf3, 0xef, 0x5f, 0xcc, 0x7b, 0xf6, 0x66, 0xf3, 0xe6, 0xcb, 0xf8, 0x89, + 0xf4, 0xda, 0xd8, 0x43, 0x7d, 0x28, 0xa7, 0x38, 0x46, 0xb5, 0x04, 0x21, 0xb9, 0x4b, 0xeb, 0x68, + 0x7e, 0x06, 0xed, 0xba, 0x40, 0xac, 0x21, 0x94, 0x46, 0xa4, 0xcd, 0x1f, 0x3d, 0xf7, 0x27, 0xd4, + 0x87, 0x6a, 0x4b, 0xbc, 0x0a, 0x56, 0xe0, 0xa6, 0x9e, 0x3d, 0xf2, 0xad, 0xa5, 0x40, 0xf7, 0x16, + 0x81, 0x9e, 0x42, 0x85, 0x8f, 0xba, 0x86, 0xa4, 0x68, 0x36, 0x7a, 0x61, 0x99, 0x0f, 0x04, 0xe2, + 0x16, 0xaa, 0x64, 0x10, 0x5f, 0x18, 0xe8, 0x0a, 0x50, 0xea, 0xc3, 0xf5, 0x8b, 0x60, 0x71, 0x9d, + 0xcb, 0x77, 0xa7, 0xdd, 0x10, 0xf8, 0xf5, 0x3d, 0x6b, 0xbe, 0xe2, 0xa6, 0x7c, 0xc3, 0x85, 0x80, + 0xfa, 0x1f, 0xc3, 0x5b, 0x1d, 0xd8, 0xbe, 0x21, 0x01, 0xa3, 0x4b, 0x12, 0xfd, 0x6f, 0xd9, 0x61, + 0x97, 0x17, 0x97, 0xfd, 0x4c, 0x64, 0x7b, 0x8c, 0x1e, 0x2d, 0xc8, 0x46, 0x04, 0xf0, 0x0b, 0x03, + 0xbd, 0x87, 0xfb, 0xf3, 0x5f, 0x46, 0x51, 0x63, 0xf9, 0x05, 0xa0, 0xb2, 0x3f, 0x5d, 0xea, 0x21, + 0x76, 0xcc, 0x1a, 0x7a, 0x9b, 0xe9, 0x99, 0xba, 0x19, 0x16, 0x01, 0x67, 0x2f, 0x8d, 0xfa, 0x93, + 0x65, 0x1e, 0x0a, 0xb7, 0x03, 0xc8, 0x21, 0x93, 0x30, 0x62, 0x99, 0x07, 0xc4, 0x8a, 0x66, 0xcc, + 0x4f, 0xcf, 0x1a, 0x7a, 0x0f, 0x5b, 0x33, 0x1b, 0x2b, 0x5d, 0xdd, 0xe2, 0x0d, 0x59, 0x7f, 0x76, + 0x87, 0x87, 0x3a, 0x3e, 0x6b, 0xe8, 0x43, 0xa6, 0xa9, 0xa7, 0x7a, 0xff, 0x7c, 0x26, 0xf4, 0xe1, + 0xdc, 0xfa, 0x7e, 0x2b, 0x57, 0xe7, 0xe7, 0x4a, 0x70, 0x02, 0x68, 0x7e, 0x03, 0xa3, 0x2f, 0x92, + 0xd0, 0xa5, 0xfb, 0x79, 0x41, 0x9b, 0xbf, 0x81, 0x6f, 0xe3, 0xbf, 0x55, 0x17, 0x1b, 0xe2, 0xf1, + 0xf3, 0xd5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x83, 0x41, 0xb0, 0x82, 0x0d, 0x00, 0x00, +>>>>>>> b5b515a... added hardware & workflow endpoints } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/workflow/workflow.pb.gw.go b/protos/workflow/workflow.pb.gw.go index a9aa4412e..3576c0a4e 100644 --- a/protos/workflow/workflow.pb.gw.go +++ b/protos/workflow/workflow.pb.gw.go @@ -190,6 +190,95 @@ func request_WorkflowSvc_ListWorkflows_0(ctx context.Context, marshaler runtime. } +func request_WorkflowSvc_GetWorkflowContext_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowSvcClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := client.GetWorkflowContext(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_WorkflowSvc_GetWorkflowContext_0(ctx context.Context, marshaler runtime.Marshaler, server WorkflowSvcServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + msg, err := server.GetWorkflowContext(ctx, &protoReq) + return msg, metadata, err + +} + +func request_WorkflowSvc_ShowWorkflowEvents_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowSvcClient, req *http.Request, pathParams map[string]string) (WorkflowSvc_ShowWorkflowEventsClient, runtime.ServerMetadata, error) { + var protoReq GetRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") + } + + protoReq.Id, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) + } + + stream, err := client.ShowWorkflowEvents(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + +} + // RegisterWorkflowSvcHandlerServer registers the http handlers for service WorkflowSvc to "mux". // UnaryRPC :call WorkflowSvcServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -262,6 +351,33 @@ func RegisterWorkflowSvcHandlerServer(ctx context.Context, mux *runtime.ServeMux return }) + mux.Handle("DELETE", pattern_WorkflowSvc_GetWorkflowContext_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_WorkflowSvc_GetWorkflowContext_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_GetWorkflowContext_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_WorkflowSvc_ShowWorkflowEvents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + return nil } @@ -383,6 +499,46 @@ func RegisterWorkflowSvcHandlerClient(ctx context.Context, mux *runtime.ServeMux }) + mux.Handle("DELETE", pattern_WorkflowSvc_GetWorkflowContext_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_WorkflowSvc_GetWorkflowContext_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_GetWorkflowContext_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_WorkflowSvc_ShowWorkflowEvents_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_WorkflowSvc_ShowWorkflowEvents_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_WorkflowSvc_ShowWorkflowEvents_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -394,6 +550,10 @@ var ( pattern_WorkflowSvc_DeleteWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "workflows", "id"}, "", runtime.AssumeColonVerbOpt(true))) pattern_WorkflowSvc_ListWorkflows_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "workflows"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_WorkflowSvc_GetWorkflowContext_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3}, []string{"v1", "workflows", "id", "state"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_WorkflowSvc_ShowWorkflowEvents_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3}, []string{"v1", "workflows", "id", "events"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( @@ -404,4 +564,8 @@ var ( forward_WorkflowSvc_DeleteWorkflow_0 = runtime.ForwardResponseMessage forward_WorkflowSvc_ListWorkflows_0 = runtime.ForwardResponseStream + + forward_WorkflowSvc_GetWorkflowContext_0 = runtime.ForwardResponseMessage + + forward_WorkflowSvc_ShowWorkflowEvents_0 = runtime.ForwardResponseStream ) diff --git a/protos/workflow/workflow.proto b/protos/workflow/workflow.proto index e724f1800..ded1598a2 100644 --- a/protos/workflow/workflow.proto +++ b/protos/workflow/workflow.proto @@ -29,8 +29,16 @@ service WorkflowSvc { get: "/v1/workflows" }; }; - rpc GetWorkflowContext(GetRequest) returns (WorkflowContext); - rpc ShowWorkflowEvents(GetRequest) returns (stream WorkflowActionStatus); + rpc GetWorkflowContext(GetRequest) returns (WorkflowContext) { + option (google.api.http) = { + delete: "/v1/workflows/{id}/state" + }; + }; + rpc ShowWorkflowEvents(GetRequest) returns (stream WorkflowActionStatus) { + option (google.api.http) = { + get: "/v1/workflows/{id}/events" + }; + }; rpc GetWorkflowContexts(WorkflowContextRequest) returns (WorkflowContextList) {} rpc GetWorkflowActions(WorkflowActionsRequest) returns (WorkflowActionList) {} rpc ReportActionStatus(WorkflowActionStatus) returns (Empty) {} From ba5f9ef52f58ba54196c8b69b9b943583ec6e81b Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 15 May 2020 14:11:11 -0400 Subject: [PATCH 13/31] updated post endpoints to match get endpoints; fixup --- protos/target/target.pb.gw.go | 2 +- protos/template/template.pb.go | 56 +++++++++++----------- protos/template/template.pb.gw.go | 2 +- protos/template/template.proto | 2 +- protos/workflow/workflow.pb.go | 79 +++++++++++++++++++++++++++++++ protos/workflow/workflow.pb.gw.go | 6 +-- protos/workflow/workflow.proto | 4 +- 7 files changed, 115 insertions(+), 36 deletions(-) diff --git a/protos/target/target.pb.gw.go b/protos/target/target.pb.gw.go index 1cffab129..c75d0ceeb 100644 --- a/protos/target/target.pb.gw.go +++ b/protos/target/target.pb.gw.go @@ -387,7 +387,7 @@ func RegisterTargetHandlerClient(ctx context.Context, mux *runtime.ServeMux, cli } var ( - pattern_Target_CreateTargets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "target"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Target_CreateTargets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "targets"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Target_TargetByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "targets", "ID"}, "", runtime.AssumeColonVerbOpt(true))) diff --git a/protos/template/template.pb.go b/protos/template/template.pb.go index cd6643d32..365cadb4e 100644 --- a/protos/template/template.pb.go +++ b/protos/template/template.pb.go @@ -225,34 +225,34 @@ func init() { func init() { proto.RegisterFile("template/template.proto", fileDescriptor_dca67df6b60706ce) } var fileDescriptor_dca67df6b60706ce = []byte{ - // 427 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xbf, 0x8e, 0xd3, 0x40, - 0x10, 0xc6, 0xb5, 0xe6, 0x2e, 0xdc, 0xed, 0x71, 0x3e, 0x58, 0x81, 0xce, 0xb2, 0xae, 0x88, 0x5c, - 0x9d, 0x52, 0xac, 0xb9, 0x20, 0x21, 0x14, 0xd1, 0xf0, 0x4f, 0x69, 0xa8, 0xac, 0x20, 0x24, 0xba, - 0x75, 0x3c, 0x09, 0xab, 0xd8, 0x5e, 0xe3, 0x1d, 0x83, 0x10, 0xa2, 0x80, 0x9a, 0x8e, 0x02, 0x51, - 0x51, 0xf0, 0x48, 0xbc, 0x02, 0x0f, 0x41, 0x89, 0xbc, 0x1b, 0x3b, 0x24, 0x20, 0x05, 0x2b, 0xd7, - 0x8d, 0x3e, 0x7f, 0x9f, 0xf7, 0x37, 0x33, 0xbb, 0xf4, 0x14, 0x21, 0x2b, 0x52, 0x81, 0x10, 0x36, - 0x05, 0x2f, 0x4a, 0x85, 0x8a, 0x0d, 0xe6, 0x12, 0x5f, 0x56, 0x31, 0x9f, 0xaa, 0x8c, 0xa3, 0xcc, - 0x17, 0x50, 0xc6, 0x90, 0xa6, 0xa6, 0xb4, 0x0e, 0xcd, 0x9b, 0x84, 0x7f, 0x36, 0x57, 0x6a, 0x9e, - 0x42, 0x28, 0x0a, 0x19, 0x8a, 0x3c, 0x57, 0x28, 0x50, 0xaa, 0x5c, 0x5b, 0x9f, 0x7f, 0x82, 0x32, - 0x03, 0x8d, 0x22, 0x2b, 0xac, 0x10, 0x5c, 0xa5, 0xfb, 0x4f, 0xb2, 0x02, 0xdf, 0x06, 0xbf, 0x08, - 0xbd, 0xfe, 0x5c, 0x95, 0x8b, 0x59, 0xaa, 0xde, 0x4c, 0x96, 0x3f, 0x63, 0x2e, 0x75, 0x64, 0xe2, - 0x91, 0x3e, 0x39, 0x3f, 0x8c, 0x1c, 0x99, 0x30, 0x46, 0xf7, 0x72, 0x91, 0x81, 0xe7, 0x18, 0xc5, - 0xd4, 0xb5, 0x96, 0x08, 0x14, 0xde, 0x15, 0xab, 0xd5, 0x35, 0xbb, 0x47, 0x0f, 0xa7, 0x25, 0x08, - 0x84, 0xe4, 0x01, 0x7a, 0x7b, 0x7d, 0x72, 0x7e, 0x34, 0xf4, 0xb9, 0x05, 0xb3, 0xe7, 0xc6, 0xd5, - 0x8c, 0x4f, 0x1a, 0x94, 0x68, 0x65, 0xae, 0x93, 0x55, 0x91, 0x2c, 0x93, 0xfb, 0xdb, 0x93, 0xad, - 0xb9, 0x4e, 0x26, 0x90, 0x82, 0x4d, 0xf6, 0xb6, 0x27, 0x5b, 0x73, 0xd0, 0xa7, 0xee, 0x23, 0x03, - 0x10, 0x81, 0x2e, 0x54, 0xae, 0xff, 0xea, 0x3b, 0x38, 0xa3, 0x74, 0x0c, 0x18, 0xc1, 0xab, 0x0a, - 0x34, 0x6e, 0x7e, 0x1d, 0x7e, 0xea, 0xd1, 0x83, 0x76, 0x64, 0xdf, 0x49, 0xf3, 0xb7, 0x56, 0xba, - 0xcf, 0xff, 0x7f, 0x7f, 0x7c, 0x73, 0x07, 0xfe, 0xa8, 0x4b, 0x7a, 0xbd, 0x8f, 0xe0, 0xf4, 0xe3, - 0x8f, 0x9f, 0x9f, 0x9d, 0x1b, 0xc1, 0xb5, 0xf0, 0xf5, 0x45, 0x7b, 0xa9, 0x46, 0x64, 0xc0, 0xbe, - 0x11, 0x7a, 0x34, 0x06, 0x6c, 0x11, 0xef, 0x76, 0x39, 0x64, 0x35, 0x0a, 0x7f, 0xa7, 0xd6, 0x02, - 0xdf, 0xe0, 0xdd, 0x64, 0xec, 0x4f, 0x3c, 0x1d, 0xbe, 0x93, 0xc9, 0x7b, 0xf6, 0x85, 0x50, 0xf7, - 0xb1, 0x59, 0xd1, 0xce, 0x90, 0x17, 0x5d, 0x72, 0xf6, 0x35, 0x2c, 0xc9, 0x06, 0xff, 0x22, 0xfb, - 0x4a, 0xe8, 0xf1, 0x53, 0xa9, 0xdb, 0xe1, 0x69, 0xd6, 0xfd, 0x80, 0x1d, 0x07, 0x77, 0xcb, 0xe0, - 0x9d, 0xb0, 0xe3, 0x35, 0xbc, 0xdb, 0x84, 0x7d, 0x20, 0xd4, 0x7d, 0x66, 0x9e, 0xc4, 0x25, 0xdd, - 0xbe, 0xee, 0xad, 0x3d, 0xa4, 0x2f, 0x0e, 0x1a, 0x25, 0xee, 0x19, 0xcb, 0x9d, 0xdf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xf0, 0x8c, 0x1d, 0x63, 0xdb, 0x04, 0x00, 0x00, + // 425 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x99, 0xb8, 0x5b, 0x77, 0x67, 0xd9, 0xac, 0x0c, 0x8a, 0x21, 0xec, 0xa1, 0xe4, 0x54, + 0x7a, 0x98, 0xd8, 0x0a, 0x22, 0xc5, 0x8b, 0xbf, 0xe8, 0xc5, 0x53, 0xa8, 0x08, 0xde, 0x26, 0xcd, + 0x6b, 0x1d, 0x9a, 0x64, 0x62, 0xe6, 0x45, 0x11, 0xf1, 0xa0, 0x77, 0x4f, 0x1e, 0xc4, 0x93, 0x17, + 0xff, 0x23, 0xff, 0x05, 0xff, 0x08, 0x8f, 0x92, 0x99, 0x26, 0xa5, 0x55, 0xa8, 0xa1, 0x7b, 0x7b, + 0x7c, 0xf3, 0xfd, 0x66, 0x3e, 0xef, 0xbd, 0x19, 0x7a, 0x1b, 0x21, 0x2b, 0x52, 0x81, 0x10, 0x36, + 0x05, 0x2f, 0x4a, 0x85, 0x8a, 0x0d, 0x97, 0x12, 0x5f, 0x55, 0x31, 0x9f, 0xab, 0x8c, 0xa3, 0xcc, + 0x57, 0x50, 0xc6, 0x90, 0xa6, 0xa6, 0xb4, 0x0e, 0xcd, 0x9b, 0x84, 0x7f, 0xb9, 0x54, 0x6a, 0x99, + 0x42, 0x28, 0x0a, 0x19, 0x8a, 0x3c, 0x57, 0x28, 0x50, 0xaa, 0x5c, 0x5b, 0x9f, 0x7f, 0x81, 0x32, + 0x03, 0x8d, 0x22, 0x2b, 0xac, 0x10, 0x5c, 0xa7, 0xc7, 0x4f, 0xb3, 0x02, 0xdf, 0x05, 0xbf, 0x09, + 0xbd, 0xf1, 0x42, 0x95, 0xab, 0x45, 0xaa, 0xde, 0xce, 0xd6, 0x3f, 0x63, 0x2e, 0x75, 0x64, 0xe2, + 0x91, 0x3e, 0x19, 0x9c, 0x46, 0x8e, 0x4c, 0x18, 0xa3, 0x47, 0xb9, 0xc8, 0xc0, 0x73, 0x8c, 0x62, + 0xea, 0x5a, 0x4b, 0x04, 0x0a, 0xef, 0x9a, 0xd5, 0xea, 0x9a, 0xdd, 0xa7, 0xa7, 0xf3, 0x12, 0x04, + 0x42, 0xf2, 0x10, 0xbd, 0xa3, 0x3e, 0x19, 0x9c, 0x8d, 0x7d, 0x6e, 0xc1, 0xec, 0xb9, 0x71, 0xb5, + 0xe0, 0xb3, 0x06, 0x25, 0xda, 0x98, 0xeb, 0x64, 0x55, 0x24, 0xeb, 0xe4, 0xf1, 0xfe, 0x64, 0x6b, + 0xae, 0x93, 0x09, 0xa4, 0x60, 0x93, 0xbd, 0xfd, 0xc9, 0xd6, 0x1c, 0xf4, 0xa9, 0xfb, 0xd8, 0x00, + 0x44, 0xa0, 0x0b, 0x95, 0xeb, 0xbf, 0xfa, 0x0e, 0x2e, 0x29, 0x9d, 0x02, 0x46, 0xf0, 0xba, 0x02, + 0x8d, 0xbb, 0x5f, 0xc7, 0x9f, 0x7b, 0xf4, 0xa4, 0x1d, 0xd9, 0x0f, 0xd2, 0xfc, 0xad, 0x95, 0x1e, + 0xf0, 0xff, 0xdf, 0x1f, 0xdf, 0xdd, 0x81, 0x3f, 0xe9, 0x92, 0xde, 0xee, 0x23, 0xf0, 0x3e, 0xfd, + 0xfc, 0xf5, 0xc5, 0x61, 0xc1, 0x79, 0xf8, 0x66, 0xd4, 0x5e, 0x2a, 0x3d, 0x21, 0x43, 0xf6, 0x9d, + 0xd0, 0xb3, 0x29, 0x60, 0xcb, 0x78, 0xaf, 0xcb, 0x29, 0x9b, 0x59, 0xf8, 0x07, 0xf5, 0x16, 0xf8, + 0x86, 0xef, 0x26, 0x63, 0x5b, 0x7c, 0xe1, 0x7b, 0x99, 0x7c, 0x60, 0x5f, 0x09, 0x75, 0x9f, 0x98, + 0x1d, 0x1d, 0x0c, 0x39, 0xea, 0x92, 0xb3, 0xcf, 0x61, 0x4d, 0x36, 0xfc, 0x17, 0xd9, 0x37, 0x42, + 0xcf, 0x9f, 0x49, 0xdd, 0x0e, 0x4f, 0xb3, 0xee, 0x07, 0x1c, 0x38, 0xb8, 0x5b, 0x06, 0xef, 0x82, + 0x6d, 0x2f, 0xf6, 0x0e, 0x61, 0x1f, 0x09, 0x75, 0x9f, 0x9b, 0x37, 0x71, 0x45, 0xd7, 0xaf, 0x7b, + 0x6b, 0x8f, 0xe8, 0xcb, 0x93, 0x46, 0x89, 0x7b, 0xc6, 0x72, 0xf7, 0x4f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xf9, 0xe7, 0x74, 0xcc, 0xdc, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/template/template.pb.gw.go b/protos/template/template.pb.gw.go index 9d499a177..1d6c0b326 100644 --- a/protos/template/template.pb.gw.go +++ b/protos/template/template.pb.gw.go @@ -387,7 +387,7 @@ func RegisterTemplateHandlerClient(ctx context.Context, mux *runtime.ServeMux, c } var ( - pattern_Template_CreateTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "template"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Template_CreateTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "templates"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Template_GetTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "templates", "id"}, "", runtime.AssumeColonVerbOpt(true))) diff --git a/protos/template/template.proto b/protos/template/template.proto index 3270f901b..9e6eaf469 100644 --- a/protos/template/template.proto +++ b/protos/template/template.proto @@ -10,7 +10,7 @@ import "timestamp.proto"; service Template { rpc CreateTemplate(WorkflowTemplate) returns (CreateResponse) { option (google.api.http) = { - post: "/v1/template" + post: "/v1/templates" body: "*" }; }; diff --git a/protos/workflow/workflow.pb.go b/protos/workflow/workflow.pb.go index dd35f3351..042e9f0ff 100644 --- a/protos/workflow/workflow.pb.go +++ b/protos/workflow/workflow.pb.go @@ -969,6 +969,7 @@ func init() { } var fileDescriptor_87aff9429097fa52 = []byte{ +<<<<<<< HEAD <<<<<<< HEAD // 1232 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, @@ -1126,6 +1127,84 @@ var fileDescriptor_87aff9429097fa52 = []byte{ 0xd0, 0xa5, 0xfb, 0x79, 0x41, 0x9b, 0xbf, 0x81, 0x6f, 0xe3, 0xbf, 0x55, 0x17, 0x1b, 0xe2, 0xf1, 0xf3, 0xd5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x83, 0x41, 0xb0, 0x82, 0x0d, 0x00, 0x00, >>>>>>> b5b515a... added hardware & workflow endpoints +======= + // 1198 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0x1a, 0xc7, + 0x17, 0xf7, 0x2e, 0xc6, 0xc0, 0x21, 0x60, 0x67, 0x42, 0xe2, 0x0d, 0x49, 0xfe, 0x7f, 0xb2, 0x55, + 0x24, 0xcb, 0x17, 0xc6, 0x75, 0x15, 0xa9, 0xc9, 0x9d, 0x6b, 0x30, 0x42, 0xb2, 0x71, 0xb4, 0xe0, + 0x24, 0xaa, 0x1a, 0xa1, 0x31, 0x3b, 0x76, 0x56, 0x66, 0x77, 0xe9, 0xce, 0x60, 0xa7, 0xaa, 0x7a, + 0xd3, 0x57, 0xe8, 0x13, 0xb4, 0xaf, 0xd1, 0xbe, 0x45, 0xd5, 0x37, 0xe8, 0x83, 0x54, 0xf3, 0xb5, + 0x1f, 0x7c, 0x18, 0xb5, 0xca, 0x1d, 0xe7, 0xeb, 0x77, 0xce, 0x9c, 0xdf, 0xd9, 0x33, 0x03, 0x6c, + 0xdf, 0x86, 0xd1, 0xf5, 0xe5, 0x38, 0xbc, 0x6d, 0xea, 0x1f, 0x7b, 0x93, 0x28, 0x64, 0x21, 0x2a, + 0x6a, 0xb9, 0xfe, 0xf4, 0x2a, 0x0c, 0xaf, 0xc6, 0xa4, 0x89, 0x27, 0x5e, 0x13, 0x07, 0x41, 0xc8, + 0x30, 0xf3, 0xc2, 0x80, 0x4a, 0xbf, 0xfa, 0x26, 0xf3, 0x7c, 0x42, 0x19, 0xf6, 0x27, 0x52, 0x61, + 0x17, 0x20, 0xdf, 0xf6, 0x27, 0xec, 0x07, 0xfb, 0x77, 0x13, 0x8a, 0xef, 0x14, 0x08, 0xaa, 0x82, + 0xe9, 0xb9, 0x96, 0xd1, 0x30, 0x76, 0x4a, 0x8e, 0xe9, 0xb9, 0xa8, 0x0e, 0x45, 0x46, 0xfc, 0xc9, + 0x18, 0x33, 0x62, 0x99, 0x42, 0x1b, 0xcb, 0xdc, 0xf6, 0x11, 0x47, 0xee, 0x2d, 0x8e, 0x88, 0x95, + 0x93, 0x36, 0x2d, 0xa3, 0x17, 0x90, 0xa7, 0x8c, 0x07, 0xad, 0x37, 0x8c, 0x9d, 0xea, 0xc1, 0xe6, + 0x5e, 0x5c, 0x76, 0x9f, 0xab, 0x1d, 0x69, 0x45, 0x5f, 0x43, 0x69, 0x14, 0x11, 0xcc, 0x88, 0x7b, + 0xc8, 0xac, 0x7c, 0xc3, 0xd8, 0x29, 0x1f, 0xd4, 0xf7, 0xe4, 0x39, 0x64, 0x99, 0x17, 0xd3, 0xcb, + 0xbd, 0x81, 0xae, 0xdc, 0x49, 0x9c, 0x79, 0xe4, 0x74, 0xe2, 0xaa, 0xc8, 0x8d, 0xd5, 0x91, 0xb1, + 0x33, 0x8f, 0x74, 0xc9, 0x98, 0xc8, 0xc8, 0xc2, 0xea, 0xc8, 0xd8, 0x19, 0x21, 0x58, 0x77, 0x31, + 0xc3, 0x56, 0x51, 0x1c, 0x56, 0xfc, 0xb6, 0x3b, 0x50, 0x39, 0x12, 0x45, 0x39, 0xe4, 0xfb, 0x29, + 0xa1, 0x2c, 0xd3, 0x31, 0xe3, 0x8e, 0x8e, 0x99, 0xd9, 0x8e, 0xd9, 0x0d, 0xa8, 0x6a, 0x20, 0x3a, + 0x09, 0x03, 0x4a, 0x66, 0xb9, 0xb0, 0x9f, 0x02, 0x74, 0x08, 0xd3, 0x79, 0x66, 0xad, 0x7f, 0x99, + 0xb0, 0xa9, 0x69, 0x3c, 0x0a, 0x03, 0x46, 0x3e, 0x31, 0xf4, 0x7f, 0x28, 0xeb, 0xbe, 0x0f, 0x63, + 0x67, 0xd0, 0xaa, 0xae, 0x8b, 0x5e, 0x40, 0x75, 0x34, 0x8d, 0x22, 0x12, 0xb0, 0x21, 0xd7, 0x92, + 0x48, 0x95, 0x55, 0x51, 0xda, 0x77, 0x42, 0x89, 0x9e, 0xc3, 0x3d, 0xed, 0xc6, 0x30, 0xbd, 0x56, + 0x6c, 0x97, 0x95, 0x6e, 0x80, 0xe9, 0x75, 0x1a, 0x09, 0x8f, 0xf8, 0xe0, 0x09, 0xe6, 0x13, 0xa4, + 0x43, 0xa1, 0x44, 0xfb, 0x50, 0xcb, 0xba, 0x0d, 0xbd, 0xc0, 0x25, 0x9f, 0x04, 0xf7, 0x39, 0x07, + 0x65, 0x9c, 0xbb, 0xdc, 0x82, 0x3a, 0x73, 0x11, 0x72, 0xb0, 0x36, 0xc4, 0x60, 0x3d, 0x4c, 0x06, + 0x4b, 0x06, 0xc9, 0xf1, 0xca, 0x02, 0x09, 0x1d, 0x7a, 0x09, 0xdb, 0x2c, 0x64, 0x78, 0x3c, 0x0c, + 0xa6, 0xfe, 0x05, 0x89, 0x86, 0xe1, 0xa5, 0x02, 0xa4, 0x62, 0x0a, 0x72, 0x4e, 0x4d, 0x98, 0x7b, + 0xc2, 0x7a, 0x76, 0x29, 0x43, 0xa9, 0xfd, 0x87, 0x09, 0x35, 0xdd, 0xd7, 0x04, 0x6e, 0x4a, 0x57, + 0x37, 0xf7, 0x09, 0x94, 0x78, 0xb7, 0x86, 0x01, 0xf6, 0x93, 0x8f, 0x07, 0xd3, 0xeb, 0x1e, 0xf6, + 0x09, 0x8f, 0x56, 0xc7, 0x11, 0x66, 0xd9, 0x51, 0x90, 0x2a, 0xe1, 0xf0, 0x1a, 0x2a, 0xa9, 0xf3, + 0x4e, 0xa9, 0xfa, 0x92, 0x96, 0x1c, 0xf8, 0x1e, 0x4e, 0x97, 0x66, 0x41, 0x81, 0x92, 0x51, 0x18, + 0xb8, 0x54, 0x35, 0x56, 0x8b, 0xdc, 0xe2, 0x13, 0x4a, 0xf1, 0x95, 0x6c, 0x60, 0xc9, 0xd1, 0x62, + 0xf6, 0x53, 0x2c, 0xfc, 0x9b, 0x4f, 0xf1, 0x09, 0x94, 0xe4, 0xf0, 0xf0, 0x36, 0xc8, 0x6f, 0xa3, + 0x28, 0x15, 0x5d, 0xd7, 0x7e, 0x09, 0x8f, 0x66, 0xa6, 0x52, 0x0f, 0x70, 0x26, 0xcc, 0x98, 0x09, + 0xfb, 0x00, 0x0f, 0x66, 0xc2, 0x4e, 0x3c, 0xca, 0xd0, 0x31, 0xdc, 0x8f, 0x7b, 0x3e, 0x92, 0x7a, + 0x6a, 0x19, 0x8d, 0xdc, 0x4e, 0xf9, 0xe0, 0x71, 0xd2, 0x98, 0xd9, 0x84, 0x5b, 0xb7, 0x59, 0x05, + 0xb5, 0x5f, 0x25, 0x55, 0x29, 0x9e, 0x75, 0x55, 0xab, 0x58, 0xb5, 0x7f, 0x33, 0xa1, 0x9a, 0x8d, + 0xcd, 0x12, 0x6d, 0xcc, 0x10, 0x8d, 0x60, 0x3d, 0x35, 0x00, 0xe2, 0x37, 0xaa, 0x41, 0xde, 0xf3, + 0x39, 0x07, 0x92, 0x76, 0x29, 0x70, 0x6e, 0xf8, 0x92, 0x0e, 0xa7, 0x4c, 0x70, 0x9d, 0x73, 0xb4, + 0xc8, 0x2d, 0xa3, 0xd0, 0xf7, 0x71, 0xe0, 0x5a, 0xf9, 0x46, 0x8e, 0xb3, 0xa6, 0x44, 0xf4, 0x0c, + 0x20, 0x0c, 0x86, 0x3a, 0x6c, 0x43, 0x18, 0x4b, 0x61, 0x30, 0x50, 0x81, 0xd2, 0x7c, 0x89, 0xbd, + 0xf1, 0x34, 0x22, 0x56, 0x41, 0x9b, 0x8f, 0xa5, 0xe2, 0x4e, 0xe6, 0x78, 0xd2, 0x9b, 0x70, 0x3c, + 0xf5, 0x09, 0xb5, 0x4a, 0x32, 0xa9, 0x12, 0x51, 0x03, 0xca, 0x24, 0xb8, 0xf1, 0xa2, 0x30, 0xf0, + 0x49, 0xc0, 0x2c, 0x10, 0xd6, 0xb4, 0xca, 0x3e, 0x03, 0x94, 0xed, 0x91, 0x60, 0xef, 0x55, 0x3c, + 0xf3, 0x63, 0x8f, 0x32, 0xc5, 0x9b, 0x35, 0xcf, 0x9b, 0x0c, 0xd1, 0x5f, 0x03, 0x0f, 0xb5, 0xfb, + 0xf0, 0xa8, 0x43, 0x98, 0x76, 0x68, 0x61, 0x86, 0x17, 0x12, 0xd6, 0x9a, 0x23, 0xac, 0x25, 0xce, + 0x41, 0x22, 0xca, 0x57, 0x12, 0xe7, 0x20, 0xef, 0x68, 0xd1, 0xee, 0xc0, 0xf6, 0x1c, 0xa8, 0xda, + 0xbd, 0x7a, 0xd5, 0x73, 0xb8, 0x7b, 0x72, 0xd5, 0xdf, 0x01, 0x34, 0x86, 0xc7, 0xe7, 0xe2, 0x7e, + 0xf9, 0x4f, 0x05, 0xd6, 0xa1, 0xe8, 0x13, 0x86, 0x45, 0x3e, 0x53, 0xe4, 0x8b, 0xe5, 0xb8, 0x8e, + 0x5c, 0x52, 0xc7, 0x6e, 0x07, 0xf2, 0x72, 0xa3, 0x95, 0xa1, 0xf0, 0xa6, 0xdd, 0x6b, 0x75, 0x7b, + 0x9d, 0xad, 0x35, 0x2e, 0x38, 0xe7, 0xbd, 0x1e, 0x17, 0x0c, 0x04, 0xb0, 0x71, 0x7c, 0xd8, 0x3d, + 0x69, 0xb7, 0xb6, 0x4c, 0x6e, 0x18, 0x74, 0x4f, 0xdb, 0x67, 0xe7, 0x83, 0xad, 0x1c, 0x17, 0xfa, + 0xe7, 0x47, 0x47, 0xed, 0x7e, 0x7f, 0x6b, 0x7d, 0x97, 0x41, 0x39, 0xbd, 0x20, 0x11, 0x54, 0x0f, + 0x8f, 0x06, 0xdd, 0xb3, 0xde, 0x30, 0x41, 0x7d, 0x04, 0x48, 0xe9, 0xba, 0xbd, 0xe1, 0x1b, 0xe7, + 0xac, 0xe3, 0xf0, 0x50, 0x23, 0xe5, 0xab, 0xe1, 0x4c, 0x74, 0x1f, 0x2a, 0x4a, 0xa7, 0x72, 0xe7, + 0x52, 0x6e, 0xba, 0x84, 0xf5, 0x83, 0x5f, 0x4b, 0x50, 0xd6, 0x7d, 0xea, 0xdf, 0x8c, 0xd0, 0x07, + 0x7d, 0xf1, 0xc5, 0x8f, 0x90, 0xed, 0x64, 0x24, 0x32, 0x77, 0x6b, 0xdd, 0x9a, 0x37, 0x48, 0xbe, + 0x6c, 0xeb, 0xe7, 0x3f, 0xff, 0xfe, 0xc5, 0x44, 0x76, 0xa5, 0x79, 0xf3, 0x65, 0xfc, 0x44, 0xa2, + 0xaf, 0x8d, 0x5d, 0xd4, 0x87, 0x72, 0x8a, 0x64, 0x54, 0x4b, 0x20, 0x92, 0xcb, 0xb4, 0x8e, 0xe6, + 0x87, 0xd0, 0xae, 0x0b, 0xc8, 0x1a, 0x42, 0x19, 0xc8, 0xe6, 0x8f, 0x9e, 0xfb, 0x13, 0xea, 0x43, + 0xb5, 0x25, 0x9e, 0x05, 0x2b, 0x70, 0x53, 0xef, 0x1e, 0xf9, 0xd8, 0x52, 0xa0, 0xbb, 0x8b, 0x40, + 0x4f, 0xa1, 0xc2, 0x67, 0x5d, 0x43, 0x52, 0x34, 0x1b, 0xbd, 0xb0, 0xcc, 0x87, 0x02, 0x71, 0x13, + 0x65, 0x4f, 0xbe, 0x6f, 0xa0, 0x2b, 0x40, 0xa9, 0x83, 0xeb, 0x27, 0xc1, 0xe2, 0x3a, 0x97, 0x2f, + 0x4f, 0xbb, 0x21, 0xf0, 0xeb, 0xc8, 0x9a, 0xaf, 0xb8, 0x29, 0x1f, 0x71, 0x21, 0xa0, 0xfe, 0xc7, + 0xf0, 0x56, 0x07, 0xb6, 0x6f, 0x48, 0xc0, 0xe8, 0x92, 0x44, 0xff, 0x5b, 0xf6, 0xb5, 0xcb, 0x9b, + 0xcb, 0x7e, 0x2e, 0xb2, 0x3d, 0x41, 0x8f, 0x17, 0x64, 0x23, 0x02, 0x78, 0xdf, 0x40, 0xef, 0xe1, + 0xc1, 0xfc, 0xc9, 0x28, 0x6a, 0x2c, 0xbf, 0x01, 0x54, 0xf6, 0x67, 0x4b, 0x3d, 0xc4, 0x92, 0x59, + 0x43, 0x6f, 0x33, 0x3d, 0x53, 0x57, 0xc3, 0x22, 0xe0, 0xec, 0xad, 0x51, 0x7f, 0xba, 0xcc, 0x43, + 0xe1, 0x76, 0x00, 0x39, 0x64, 0x12, 0x46, 0x2c, 0xf3, 0x82, 0x58, 0xd1, 0x8c, 0xf9, 0xe9, 0x59, + 0x43, 0xef, 0x61, 0x73, 0x66, 0x65, 0xa5, 0xab, 0x5b, 0xbc, 0x22, 0xeb, 0xcf, 0xef, 0xf0, 0x50, + 0xdf, 0xcf, 0x1a, 0xfa, 0x2e, 0xd3, 0xd4, 0x53, 0xbd, 0x80, 0x3e, 0x13, 0xfa, 0x70, 0x6e, 0x7f, + 0xbf, 0x95, 0xbb, 0xf3, 0x73, 0x25, 0x38, 0x01, 0x34, 0xbf, 0x82, 0xd1, 0x17, 0x49, 0xe8, 0xd2, + 0x05, 0xbd, 0xa0, 0xcd, 0xdf, 0xc0, 0xb7, 0xf1, 0xff, 0xaa, 0x8b, 0x0d, 0xf1, 0xfa, 0xf9, 0xea, + 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x4c, 0x85, 0x3e, 0x83, 0x0d, 0x00, 0x00, +>>>>>>> 73b8327... fixups } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/workflow/workflow.pb.gw.go b/protos/workflow/workflow.pb.gw.go index 3576c0a4e..2f8e8b7db 100644 --- a/protos/workflow/workflow.pb.gw.go +++ b/protos/workflow/workflow.pb.gw.go @@ -351,7 +351,7 @@ func RegisterWorkflowSvcHandlerServer(ctx context.Context, mux *runtime.ServeMux return }) - mux.Handle("DELETE", pattern_WorkflowSvc_GetWorkflowContext_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_WorkflowSvc_GetWorkflowContext_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -499,7 +499,7 @@ func RegisterWorkflowSvcHandlerClient(ctx context.Context, mux *runtime.ServeMux }) - mux.Handle("DELETE", pattern_WorkflowSvc_GetWorkflowContext_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_WorkflowSvc_GetWorkflowContext_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -543,7 +543,7 @@ func RegisterWorkflowSvcHandlerClient(ctx context.Context, mux *runtime.ServeMux } var ( - pattern_WorkflowSvc_CreateWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "workflow"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_WorkflowSvc_CreateWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "workflows"}, "", runtime.AssumeColonVerbOpt(true))) pattern_WorkflowSvc_GetWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "workflows", "id"}, "", runtime.AssumeColonVerbOpt(true))) diff --git a/protos/workflow/workflow.proto b/protos/workflow/workflow.proto index ded1598a2..8e0b6b377 100644 --- a/protos/workflow/workflow.proto +++ b/protos/workflow/workflow.proto @@ -10,7 +10,7 @@ import "timestamp.proto"; service WorkflowSvc { rpc CreateWorkflow(CreateRequest) returns (CreateResponse) { option (google.api.http) = { - post: "/v1/workflow" + post: "/v1/workflows" body: "*" }; }; @@ -31,7 +31,7 @@ service WorkflowSvc { }; rpc GetWorkflowContext(GetRequest) returns (WorkflowContext) { option (google.api.http) = { - delete: "/v1/workflows/{id}/state" + get: "/v1/workflows/{id}/state" }; }; rpc ShowWorkflowEvents(GetRequest) returns (stream WorkflowActionStatus) { From a2d82013d6aec842ca78096fcfdd45061de8972c Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 15 May 2020 14:45:51 -0400 Subject: [PATCH 14/31] changed bymac and byip to use post --- protos/hardware/hardware.pb.go | 205 +++++++++++++++--------------- protos/hardware/hardware.pb.gw.go | 114 ++++------------- protos/hardware/hardware.proto | 6 +- 3 files changed, 128 insertions(+), 197 deletions(-) diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 1048607d5..89b5e621e 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -1381,109 +1381,108 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1617 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0x37, - 0x16, 0xc6, 0x48, 0xb2, 0x34, 0x3a, 0x92, 0xe5, 0x84, 0x71, 0x9c, 0xc9, 0x6c, 0x36, 0xf1, 0x3a, - 0xd8, 0x5d, 0x6f, 0x1e, 0xe4, 0xc4, 0x1b, 0xec, 0x62, 0x17, 0x6d, 0x81, 0xf8, 0x92, 0x44, 0x6d, - 0x1c, 0xab, 0xa3, 0x5c, 0x7a, 0x43, 0xa7, 0xd4, 0x0c, 0x25, 0xb1, 0x9e, 0x5b, 0x87, 0x1c, 0x2b, - 0x42, 0x90, 0x16, 0xe8, 0x43, 0x5f, 0x8a, 0xa2, 0x40, 0x2f, 0x7f, 0xa0, 0x2f, 0x7d, 0xef, 0x73, - 0xff, 0x44, 0xd1, 0x97, 0xfe, 0x80, 0x22, 0xbf, 0xa3, 0x20, 0x87, 0x9c, 0xc8, 0x49, 0x51, 0xd4, - 0x96, 0xe3, 0x37, 0x9e, 0x8f, 0xd4, 0x77, 0x0e, 0xcf, 0x8d, 0x47, 0x03, 0xe7, 0x46, 0x38, 0xf5, - 0xc7, 0x38, 0x25, 0x6b, 0x7a, 0xd1, 0x4e, 0xd2, 0x98, 0xc7, 0xe8, 0xca, 0x90, 0xf2, 0x51, 0xd6, - 0x6f, 0x7b, 0x71, 0xd8, 0xe6, 0x34, 0xda, 0x23, 0x69, 0x9f, 0x04, 0x81, 0x5c, 0xe6, 0x27, 0x58, - 0x5b, 0xff, 0xc2, 0xbe, 0x30, 0x8c, 0xe3, 0x61, 0x40, 0xd6, 0x70, 0x42, 0xd7, 0x70, 0x14, 0xc5, - 0x1c, 0x73, 0x1a, 0x47, 0x2c, 0x3f, 0xb7, 0xf2, 0x10, 0x1a, 0xdd, 0x8c, 0x8d, 0x1c, 0xf2, 0x51, - 0x46, 0x18, 0x47, 0xb7, 0xa1, 0xe2, 0x63, 0x8e, 0x2d, 0x63, 0xd9, 0x58, 0x6d, 0xac, 0x5f, 0x6f, - 0xff, 0x79, 0x3d, 0xed, 0xdb, 0x6a, 0xe1, 0x48, 0x86, 0x95, 0x1a, 0xcc, 0x6d, 0x87, 0x09, 0x9f, - 0xac, 0xbc, 0x06, 0x70, 0x8b, 0x70, 0xad, 0xe0, 0x14, 0x94, 0x43, 0xec, 0x49, 0xfe, 0xba, 0x23, - 0x96, 0xa8, 0x05, 0x25, 0x9a, 0x58, 0x25, 0x09, 0x94, 0x68, 0x22, 0x65, 0xdf, 0x2a, 0x2b, 0xd9, - 0x5f, 0xf9, 0xf1, 0x12, 0x98, 0x9a, 0x5b, 0x6d, 0x1a, 0x7a, 0x13, 0xbd, 0x0f, 0xf3, 0xbb, 0x1b, - 0xbd, 0xdd, 0x3b, 0xdb, 0xf7, 0xb6, 0x5d, 0x7f, 0xe4, 0xe5, 0x3c, 0x8d, 0xf5, 0xff, 0x1d, 0xc5, - 0xf0, 0xf6, 0xd6, 0xed, 0xcd, 0xae, 0xd3, 0xd4, 0x7c, 0x5b, 0x23, 0x2f, 0x41, 0x43, 0x38, 0x55, - 0xf0, 0x47, 0x84, 0xf7, 0xe3, 0x98, 0x4b, 0xd3, 0x1a, 0xeb, 0xaf, 0x1c, 0x49, 0xc5, 0xdd, 0x9c, - 0xc3, 0x59, 0xd0, 0xac, 0x0a, 0x78, 0x5e, 0xd1, 0x38, 0x4e, 0xf7, 0xac, 0xca, 0x72, 0x79, 0x16, - 0x45, 0x82, 0xe3, 0x80, 0x22, 0x01, 0xa0, 0xb7, 0xc1, 0x0c, 0x09, 0xc7, 0x32, 0xca, 0x73, 0xf2, - 0x26, 0xaf, 0x1e, 0x49, 0xc1, 0x8e, 0x22, 0x71, 0x0a, 0x3a, 0xf4, 0x00, 0x6a, 0xda, 0xf4, 0xea, - 0x6c, 0x3e, 0x92, 0xa6, 0x6b, 0x32, 0xfb, 0x69, 0x19, 0x2a, 0x22, 0x36, 0xbf, 0x93, 0x3c, 0x97, - 0xa0, 0x51, 0xb8, 0xad, 0xc8, 0x22, 0xd0, 0x50, 0x27, 0x41, 0x36, 0x98, 0xa3, 0x98, 0xf1, 0x08, - 0x87, 0x44, 0xe5, 0x54, 0x21, 0xa3, 0xbf, 0x02, 0x04, 0x04, 0x33, 0xe2, 0x72, 0x1a, 0x12, 0xab, - 0xb2, 0x6c, 0xac, 0x96, 0x9d, 0xba, 0x44, 0xee, 0xd1, 0x90, 0xa0, 0xbf, 0x41, 0x53, 0x1c, 0x73, - 0x19, 0x49, 0xf7, 0x49, 0xca, 0xac, 0xb9, 0xe5, 0xf2, 0x6a, 0xdd, 0x69, 0x08, 0xac, 0x97, 0x43, - 0xe2, 0x88, 0xf8, 0x6d, 0x71, 0xa4, 0x9a, 0x1f, 0x11, 0x98, 0x3e, 0xf2, 0xaf, 0xa9, 0xc0, 0x0e, - 0x31, 0x27, 0x63, 0x3c, 0xb1, 0x6a, 0xd2, 0x90, 0x22, 0x34, 0xb7, 0x72, 0x18, 0x21, 0xa8, 0xe0, - 0xd4, 0x1b, 0x59, 0xa6, 0xdc, 0x96, 0x6b, 0x81, 0x65, 0x64, 0x40, 0xad, 0xfa, 0xb2, 0xb1, 0x6a, - 0x3a, 0x72, 0x2d, 0xec, 0xa6, 0x03, 0xec, 0x11, 0x57, 0xde, 0x0a, 0xe4, 0xe9, 0xba, 0x44, 0xee, - 0x8a, 0x6b, 0xdd, 0x91, 0x05, 0xd5, 0x98, 0x21, 0x02, 0xc2, 0xd9, 0xed, 0x4e, 0x57, 0x94, 0xa3, - 0xfd, 0x21, 0x94, 0x3a, 0x5d, 0x64, 0x41, 0x0d, 0xfb, 0x7e, 0x4a, 0x18, 0x53, 0xde, 0xd7, 0xa2, - 0xd8, 0x89, 0x08, 0x0f, 0x31, 0xdb, 0x53, 0xde, 0xd7, 0xa2, 0xd8, 0xd1, 0x17, 0xce, 0x3d, 0xaf, - 0x45, 0xb4, 0x04, 0xd5, 0x01, 0x0e, 0x69, 0x30, 0x51, 0x4e, 0x57, 0x92, 0xfd, 0x4d, 0x05, 0x6a, - 0xba, 0x20, 0xfe, 0x02, 0x75, 0x1c, 0x04, 0xf1, 0xd8, 0x4d, 0x1e, 0x11, 0xa9, 0xd3, 0x74, 0x4c, - 0x09, 0x74, 0x1f, 0x11, 0xf4, 0x77, 0x68, 0xe5, 0x9b, 0x22, 0x3f, 0x06, 0x41, 0x3c, 0x96, 0xba, - 0x4d, 0x67, 0x5e, 0xa2, 0x0f, 0x15, 0x88, 0xee, 0x43, 0x85, 0x8a, 0x9f, 0xe7, 0x15, 0x7b, 0x63, - 0x96, 0x8a, 0x6d, 0x77, 0xba, 0x6f, 0x6d, 0x3b, 0x92, 0x0e, 0x7d, 0x0c, 0x67, 0x8b, 0x90, 0x8a, - 0x3d, 0xc6, 0x53, 0x9c, 0x24, 0x24, 0x95, 0xb7, 0x69, 0xac, 0x77, 0x66, 0xd2, 0xb3, 0x31, 0x45, - 0xe8, 0x2c, 0x6a, 0x3d, 0xd3, 0xa8, 0xb8, 0x56, 0xcc, 0x28, 0x51, 0xe5, 0x3b, 0xdb, 0xb5, 0x76, - 0x19, 0x25, 0x8e, 0xa4, 0xb3, 0xaf, 0x43, 0x45, 0x5c, 0x52, 0x54, 0x59, 0x96, 0x06, 0xba, 0xca, - 0xb2, 0x34, 0x10, 0x45, 0xe4, 0xc5, 0x11, 0x27, 0x11, 0x67, 0x2a, 0xc8, 0x85, 0x6c, 0xb7, 0xa0, - 0x39, 0x6d, 0x9c, 0xfd, 0x26, 0x54, 0x04, 0x27, 0x3a, 0x0f, 0x66, 0x5f, 0xd4, 0xd6, 0x33, 0xaa, - 0x9a, 0x90, 0xef, 0xa7, 0x81, 0x08, 0xff, 0x1e, 0x49, 0x23, 0x12, 0x28, 0x32, 0x25, 0x09, 0x9c, - 0x46, 0x94, 0xa7, 0xba, 0xfb, 0x2b, 0xc9, 0xfe, 0x29, 0x4f, 0x0b, 0xd9, 0xbe, 0x5e, 0x68, 0xf8, - 0xc6, 0xcb, 0x6f, 0xf8, 0xa5, 0x97, 0xd1, 0xf0, 0x07, 0x00, 0x34, 0xe2, 0x24, 0x15, 0x65, 0xcb, - 0xac, 0xb2, 0x6c, 0xf5, 0x37, 0x67, 0xe9, 0x97, 0xed, 0x8e, 0xa6, 0x73, 0xa6, 0x98, 0xd1, 0x07, - 0x50, 0xf3, 0xc9, 0x00, 0x67, 0x01, 0x57, 0xe9, 0x79, 0x5c, 0x4a, 0x34, 0xad, 0xfd, 0x83, 0x01, - 0xf5, 0x02, 0x46, 0x3b, 0x50, 0x39, 0x9e, 0xb8, 0x48, 0x1a, 0xf5, 0xa6, 0x1c, 0x5b, 0x18, 0x34, - 0x99, 0xfd, 0xb4, 0x05, 0xa6, 0x7e, 0xc2, 0xd0, 0x22, 0xcc, 0x31, 0x8e, 0x39, 0x51, 0x89, 0x9a, - 0x0b, 0xa2, 0xb9, 0xf7, 0xe3, 0xc8, 0xa7, 0xd1, 0xd0, 0x0d, 0x63, 0x9f, 0x48, 0xfd, 0x65, 0xa7, - 0xa1, 0xb0, 0x9d, 0xd8, 0x27, 0x28, 0x82, 0x66, 0x88, 0xa3, 0x6c, 0x80, 0x3d, 0x9e, 0xa5, 0x24, - 0x55, 0x8d, 0xe6, 0xf5, 0x99, 0x1e, 0xd4, 0xf6, 0xce, 0x14, 0xa3, 0x73, 0x80, 0x1f, 0xf5, 0xc1, - 0xa4, 0x11, 0xe3, 0x38, 0xf2, 0xc8, 0x4c, 0xd1, 0x2c, 0x74, 0x75, 0x14, 0x9b, 0x53, 0xf0, 0xa2, - 0xf7, 0xa0, 0xea, 0x65, 0x8c, 0xc7, 0xa1, 0xea, 0x2f, 0x5b, 0xb3, 0x69, 0xd8, 0x94, 0x5c, 0x8e, - 0xe2, 0x14, 0x37, 0x18, 0x60, 0x8f, 0x06, 0x94, 0x4f, 0xd4, 0x90, 0x30, 0xe3, 0x0d, 0x6e, 0x2a, - 0x36, 0xa7, 0xe0, 0xb5, 0xd7, 0xa1, 0x39, 0xed, 0xc3, 0x17, 0x86, 0x46, 0x04, 0x15, 0x16, 0x64, - 0x43, 0xd5, 0x7d, 0xe4, 0xda, 0xfe, 0xde, 0x04, 0x53, 0x3b, 0xe3, 0x85, 0x1f, 0x14, 0xf9, 0x51, - 0x9a, 0xce, 0x8f, 0x3f, 0x1a, 0x2d, 0x0e, 0xbc, 0x5e, 0x95, 0xe7, 0x5e, 0xaf, 0x25, 0xa8, 0xa6, - 0x84, 0x79, 0x59, 0xde, 0xc1, 0x4d, 0x47, 0x49, 0x68, 0x00, 0xa5, 0xdd, 0x9e, 0xf2, 0xca, 0x83, - 0xe3, 0x89, 0x6b, 0x7b, 0x37, 0x21, 0x29, 0xe6, 0x34, 0x1a, 0xf6, 0x26, 0x8c, 0x93, 0xd0, 0x29, - 0xed, 0xf6, 0xc4, 0xfc, 0x80, 0x83, 0x31, 0x9e, 0x30, 0x69, 0x5d, 0x4d, 0xda, 0x50, 0xcf, 0x11, - 0x61, 0xde, 0x3f, 0x60, 0x41, 0x3c, 0x73, 0x2e, 0xf3, 0x52, 0x9a, 0x70, 0xd9, 0xc0, 0xf3, 0x89, - 0x64, 0x5e, 0xc0, 0x3d, 0x89, 0x8a, 0x36, 0xfe, 0x2e, 0x94, 0x69, 0xc2, 0xac, 0xba, 0x6c, 0x5d, - 0x9d, 0x63, 0xb2, 0xb7, 0xd3, 0x75, 0x04, 0xab, 0x70, 0x6e, 0xc6, 0x48, 0x2a, 0xc7, 0xd4, 0x7c, - 0xc2, 0x29, 0x64, 0xb4, 0x0e, 0x67, 0xbd, 0x74, 0x92, 0x70, 0xe2, 0xbb, 0x69, 0x1c, 0x73, 0x37, - 0xc1, 0x8c, 0x8d, 0xe3, 0xd4, 0x97, 0x33, 0x4f, 0xdd, 0x39, 0xa3, 0x36, 0x9d, 0x38, 0xe6, 0x5d, - 0xb5, 0x25, 0x62, 0xce, 0xf1, 0x90, 0x59, 0x4d, 0x39, 0xa1, 0xc9, 0x35, 0x1a, 0x41, 0x8d, 0xf1, - 0x38, 0xc5, 0x43, 0x62, 0xcd, 0x4b, 0xa7, 0xdf, 0x3d, 0xa6, 0x4b, 0xf4, 0x72, 0x56, 0x47, 0xd3, - 0x8b, 0xc7, 0x90, 0xb1, 0x91, 0xbb, 0x47, 0x26, 0xcc, 0x6a, 0x49, 0x0b, 0x6a, 0x8c, 0x8d, 0xde, - 0x20, 0x13, 0x86, 0x2e, 0xc3, 0xbc, 0x9a, 0x73, 0xdd, 0x94, 0x60, 0x7f, 0x62, 0x2d, 0xc8, 0x78, - 0x34, 0x15, 0xe8, 0x08, 0xcc, 0xfe, 0xc2, 0x80, 0x85, 0xe7, 0x22, 0x59, 0x64, 0xb1, 0xf1, 0x2c, - 0x8b, 0x45, 0x66, 0xf9, 0x94, 0xf1, 0x34, 0xd6, 0x2f, 0x6b, 0x2e, 0x89, 0x51, 0x4c, 0x0c, 0xa3, - 0x34, 0x8e, 0xf4, 0x28, 0xa6, 0x44, 0x91, 0xa8, 0x34, 0xc4, 0x43, 0xe2, 0x72, 0x3c, 0x94, 0x89, - 0x5a, 0x77, 0x4c, 0x09, 0xdc, 0xc3, 0x43, 0x74, 0x0e, 0x6a, 0x31, 0x73, 0xa5, 0x96, 0xb9, 0x9c, - 0x2f, 0x66, 0x3d, 0x51, 0x2d, 0xdf, 0x19, 0x27, 0x37, 0x15, 0x0a, 0x3c, 0xc9, 0xfa, 0x01, 0xf5, - 0x74, 0xb9, 0xe4, 0x12, 0xba, 0x08, 0x10, 0xe2, 0x08, 0x0f, 0x49, 0x48, 0x22, 0x2e, 0xcb, 0xc6, - 0x74, 0xa6, 0x10, 0xfb, 0x3e, 0xd4, 0x54, 0x20, 0x44, 0x01, 0xfb, 0x94, 0xed, 0x09, 0x33, 0x85, - 0xf3, 0x73, 0x41, 0x78, 0x30, 0xc5, 0xd4, 0xb7, 0x4a, 0x79, 0x4e, 0x88, 0x35, 0x5a, 0x86, 0xc6, - 0x80, 0x06, 0x84, 0x49, 0x1f, 0xe7, 0xef, 0x72, 0xdd, 0x99, 0x86, 0xc4, 0x73, 0x57, 0xcd, 0x9b, - 0x1a, 0xfa, 0x04, 0x16, 0x92, 0x94, 0xc8, 0xce, 0x19, 0x04, 0xc4, 0x77, 0x63, 0xa6, 0x9e, 0xbd, - 0x97, 0x55, 0xbd, 0xad, 0x69, 0x75, 0xbb, 0x0c, 0xfd, 0x53, 0x18, 0x40, 0xf7, 0x31, 0x27, 0x2e, - 0xcb, 0xfa, 0x11, 0x91, 0xf3, 0x99, 0xb0, 0xb8, 0xa5, 0xe0, 0x5e, 0x8e, 0xda, 0x8f, 0xc0, 0xd4, - 0x8d, 0x52, 0x84, 0x3c, 0x09, 0x70, 0xe4, 0x4e, 0x65, 0x8f, 0x29, 0x00, 0x11, 0x59, 0x74, 0x05, - 0x4e, 0xcb, 0x4d, 0x95, 0x1f, 0xee, 0x54, 0xa3, 0x5c, 0x10, 0x1b, 0x0f, 0x72, 0x5c, 0x9e, 0xbd, - 0x0c, 0xf3, 0xba, 0xe7, 0xba, 0x9e, 0x78, 0x21, 0xf3, 0x80, 0x36, 0x35, 0xb8, 0x19, 0xfb, 0x64, - 0xe5, 0x12, 0xcc, 0x6f, 0x91, 0x80, 0x70, 0xa2, 0xbf, 0x00, 0xb4, 0xa0, 0xd4, 0xd9, 0xd2, 0xcd, - 0xb5, 0xb3, 0xb5, 0xfe, 0x4b, 0x0d, 0x16, 0xb4, 0x0b, 0xc4, 0x9f, 0x26, 0xea, 0x11, 0xf4, 0xb9, - 0x01, 0x95, 0x6e, 0xc6, 0x46, 0xe8, 0xbf, 0x87, 0x71, 0xe4, 0xd4, 0x87, 0x0c, 0xfb, 0xda, 0x61, - 0x7e, 0x98, 0x7f, 0xa8, 0x38, 0xf7, 0xe9, 0xcf, 0xbf, 0x7e, 0x5d, 0x3a, 0xbd, 0xd2, 0x5c, 0xdb, - 0xbf, 0x56, 0x7c, 0x70, 0xf9, 0xbf, 0x71, 0x05, 0x7d, 0x6b, 0xc0, 0xdc, 0xc6, 0x64, 0xe7, 0xc6, - 0x26, 0xfa, 0xcf, 0x61, 0x58, 0x9f, 0x7d, 0xf5, 0xb0, 0x8f, 0xf4, 0x21, 0x65, 0xe5, 0xa2, 0x34, - 0xc8, 0x42, 0x4b, 0xd3, 0x06, 0xad, 0x85, 0xd8, 0x5b, 0x7b, 0x1c, 0x62, 0xef, 0x09, 0xfa, 0xca, - 0x80, 0xca, 0xc6, 0xa4, 0xd3, 0x3d, 0x61, 0xb3, 0x2e, 0x48, 0xb3, 0x96, 0xd0, 0xe2, 0x01, 0xb3, - 0x68, 0xb2, 0xf6, 0x98, 0x26, 0x4f, 0xd0, 0x97, 0xb9, 0x51, 0x5b, 0x27, 0x6c, 0xd4, 0x79, 0x69, - 0xd4, 0x19, 0x74, 0xfa, 0x80, 0x51, 0x8f, 0xa9, 0xff, 0x04, 0x7d, 0x66, 0x40, 0xf9, 0x46, 0x10, - 0xa0, 0xc3, 0xa7, 0xc4, 0x11, 0x6d, 0x59, 0x94, 0xb6, 0xb4, 0xd0, 0x81, 0x44, 0xba, 0x6a, 0xa0, - 0x31, 0xcc, 0x3d, 0xc4, 0xdc, 0x1b, 0x9d, 0xac, 0x6b, 0xae, 0x1a, 0x68, 0x1f, 0xaa, 0x79, 0x0d, - 0xa2, 0x43, 0xcd, 0xe3, 0x07, 0xea, 0xf6, 0x08, 0x15, 0xb5, 0x01, 0xef, 0x98, 0x1a, 0xe9, 0x57, - 0xe5, 0x91, 0x7f, 0xff, 0x16, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x0e, 0xbd, 0x79, 0xd4, 0x14, 0x00, - 0x00, + // 1609 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0xc7, + 0x15, 0xc6, 0x92, 0x14, 0xb9, 0x3c, 0xa4, 0x48, 0x7b, 0x2c, 0xdb, 0xeb, 0x75, 0x5b, 0xab, 0x34, + 0xda, 0xaa, 0x7e, 0xa0, 0x6c, 0xd5, 0x68, 0xd1, 0xa2, 0x2d, 0x60, 0x5d, 0x6c, 0xb3, 0xb5, 0x2c, + 0x66, 0xe9, 0x4b, 0x6e, 0xc8, 0x66, 0xb8, 0x3b, 0x24, 0x27, 0xda, 0x5b, 0x76, 0x66, 0x45, 0x13, + 0x41, 0x12, 0x20, 0x0f, 0x79, 0x09, 0x82, 0x04, 0x49, 0x7e, 0x41, 0x5e, 0xf2, 0x9e, 0xe7, 0xfc, + 0x89, 0xc0, 0x7f, 0x21, 0xf0, 0xef, 0x08, 0x66, 0x76, 0x66, 0x4d, 0xd9, 0x41, 0x10, 0x89, 0xb2, + 0xde, 0xe6, 0x7c, 0x33, 0xfc, 0xce, 0x99, 0x73, 0x9b, 0xc3, 0x85, 0x8b, 0x13, 0x9c, 0xfa, 0x53, + 0x9c, 0x92, 0x75, 0xbd, 0xe8, 0x26, 0x69, 0xcc, 0x63, 0x74, 0x6d, 0x4c, 0xf9, 0x24, 0x1b, 0x76, + 0xbd, 0x38, 0xec, 0x72, 0x1a, 0xed, 0x93, 0x74, 0x48, 0x82, 0x40, 0x2e, 0xf3, 0x13, 0xac, 0xab, + 0x7f, 0x61, 0xff, 0x6e, 0x1c, 0xc7, 0xe3, 0x80, 0xac, 0xe3, 0x84, 0xae, 0xe3, 0x28, 0x8a, 0x39, + 0xe6, 0x34, 0x8e, 0x58, 0x7e, 0xae, 0xf3, 0x18, 0x1a, 0xfd, 0x8c, 0x4d, 0x1c, 0xf2, 0x7e, 0x46, + 0x18, 0x47, 0x77, 0xa1, 0xe2, 0x63, 0x8e, 0x2d, 0x63, 0xd5, 0x58, 0x6b, 0x6c, 0xdc, 0xec, 0xfe, + 0x76, 0x3d, 0xdd, 0xbb, 0x6a, 0xe1, 0x48, 0x86, 0x4e, 0x0d, 0x96, 0x76, 0xc2, 0x84, 0xcf, 0x3a, + 0xff, 0x05, 0xb8, 0x43, 0xb8, 0x56, 0x70, 0x06, 0xca, 0x21, 0xf6, 0x24, 0x7f, 0xdd, 0x11, 0x4b, + 0xd4, 0x82, 0x12, 0x4d, 0xac, 0x92, 0x04, 0x4a, 0x34, 0x91, 0xb2, 0x6f, 0x95, 0x95, 0xec, 0x77, + 0x7e, 0xb8, 0x02, 0xa6, 0xe6, 0x56, 0x9b, 0x86, 0xde, 0x44, 0xef, 0xc0, 0xf2, 0xde, 0xe6, 0x60, + 0xef, 0xde, 0xce, 0x83, 0x1d, 0xd7, 0x9f, 0x78, 0x39, 0x4f, 0x63, 0xe3, 0x9f, 0xc7, 0x31, 0xbc, + 0xbb, 0x7d, 0x77, 0xab, 0xef, 0x34, 0x35, 0xdf, 0xf6, 0xc4, 0x4b, 0xd0, 0x18, 0xce, 0x14, 0xfc, + 0x11, 0xe1, 0xc3, 0x38, 0xe6, 0xd2, 0xb4, 0xc6, 0xc6, 0xbf, 0x8f, 0xa5, 0xe2, 0x7e, 0xce, 0xe1, + 0xb4, 0x35, 0xab, 0x02, 0x5e, 0x54, 0x34, 0x8d, 0xd3, 0x7d, 0xab, 0xb2, 0x5a, 0x5e, 0x44, 0x91, + 0xe0, 0x38, 0xa4, 0x48, 0x00, 0xe8, 0x0d, 0x30, 0x43, 0xc2, 0xb1, 0x8c, 0xf2, 0x92, 0xbc, 0xc9, + 0x7f, 0x8e, 0xa5, 0x60, 0x57, 0x91, 0x38, 0x05, 0x1d, 0x7a, 0x04, 0x35, 0x6d, 0x7a, 0x75, 0x31, + 0x1f, 0x49, 0xd3, 0x35, 0x99, 0xfd, 0xac, 0x0c, 0x15, 0x11, 0x9b, 0x5f, 0x48, 0x9e, 0x2b, 0xd0, + 0x28, 0xdc, 0x56, 0x64, 0x11, 0x68, 0xa8, 0x97, 0x20, 0x1b, 0xcc, 0x49, 0xcc, 0x78, 0x84, 0x43, + 0xa2, 0x72, 0xaa, 0x90, 0xd1, 0xef, 0x01, 0x02, 0x82, 0x19, 0x71, 0x39, 0x0d, 0x89, 0x55, 0x59, + 0x35, 0xd6, 0xca, 0x4e, 0x5d, 0x22, 0x0f, 0x68, 0x48, 0xd0, 0x1f, 0xa1, 0x29, 0x8e, 0xb9, 0x8c, + 0xa4, 0x07, 0x24, 0x65, 0xd6, 0xd2, 0x6a, 0x79, 0xad, 0xee, 0x34, 0x04, 0x36, 0xc8, 0x21, 0x71, + 0x44, 0xfc, 0xb6, 0x38, 0x52, 0xcd, 0x8f, 0x08, 0x4c, 0x1f, 0xf9, 0xeb, 0x5c, 0x60, 0xc7, 0x98, + 0x93, 0x29, 0x9e, 0x59, 0x35, 0x69, 0x48, 0x11, 0x9a, 0x3b, 0x39, 0x8c, 0x10, 0x54, 0x70, 0xea, + 0x4d, 0x2c, 0x53, 0x6e, 0xcb, 0xb5, 0xc0, 0x32, 0x32, 0xa2, 0x56, 0x7d, 0xd5, 0x58, 0x33, 0x1d, + 0xb9, 0x16, 0x76, 0xd3, 0x11, 0xf6, 0x88, 0x2b, 0x6f, 0x05, 0xf2, 0x74, 0x5d, 0x22, 0xf7, 0xc5, + 0xb5, 0xee, 0xc9, 0x82, 0x6a, 0x2c, 0x10, 0x01, 0xe1, 0xec, 0x6e, 0xaf, 0x2f, 0xca, 0xd1, 0x7e, + 0x0f, 0x4a, 0xbd, 0x3e, 0xb2, 0xa0, 0x86, 0x7d, 0x3f, 0x25, 0x8c, 0x29, 0xef, 0x6b, 0x51, 0xec, + 0x44, 0x84, 0x87, 0x98, 0xed, 0x2b, 0xef, 0x6b, 0x51, 0xec, 0xe8, 0x0b, 0xe7, 0x9e, 0xd7, 0x22, + 0xba, 0x00, 0xd5, 0x11, 0x0e, 0x69, 0x30, 0x53, 0x4e, 0x57, 0x92, 0xfd, 0x4d, 0x05, 0x6a, 0xba, + 0x20, 0x2e, 0x43, 0x1d, 0x07, 0x41, 0x3c, 0x75, 0x93, 0x27, 0x44, 0xea, 0x34, 0x1d, 0x53, 0x02, + 0xfd, 0x27, 0x04, 0xfd, 0x09, 0x5a, 0xf9, 0xa6, 0xc8, 0x8f, 0x51, 0x10, 0x4f, 0xa5, 0x6e, 0xd3, + 0x59, 0x96, 0xe8, 0x63, 0x05, 0xa2, 0x87, 0x50, 0xa1, 0xe2, 0xe7, 0x79, 0xc5, 0xde, 0x5a, 0xa4, + 0x62, 0xbb, 0xbd, 0xfe, 0xeb, 0x3b, 0x8e, 0xa4, 0x43, 0x1f, 0xc1, 0xf9, 0x22, 0xa4, 0x62, 0x8f, + 0xf1, 0x14, 0x27, 0x09, 0x49, 0xe5, 0x6d, 0x1a, 0x1b, 0xbd, 0x85, 0xf4, 0x6c, 0xce, 0x11, 0x3a, + 0x2b, 0x5a, 0xcf, 0x3c, 0x2a, 0xae, 0x15, 0x33, 0x4a, 0x54, 0xf9, 0x2e, 0x76, 0xad, 0x3d, 0x46, + 0x89, 0x23, 0xe9, 0xec, 0x9b, 0x50, 0x11, 0x97, 0x14, 0x55, 0x96, 0xa5, 0x81, 0xae, 0xb2, 0x2c, + 0x0d, 0x44, 0x11, 0x79, 0x71, 0xc4, 0x49, 0xc4, 0x99, 0x0a, 0x72, 0x21, 0xdb, 0x2d, 0x68, 0xce, + 0x1b, 0x67, 0xbf, 0x06, 0x15, 0xc1, 0x89, 0x2e, 0x81, 0x39, 0x14, 0xb5, 0xf5, 0x9c, 0xaa, 0x26, + 0xe4, 0x87, 0x69, 0x20, 0xc2, 0xbf, 0x4f, 0xd2, 0x88, 0x04, 0x8a, 0x4c, 0x49, 0x02, 0xa7, 0x11, + 0xe5, 0xa9, 0xee, 0xfe, 0x4a, 0xb2, 0x7f, 0xcc, 0xd3, 0x42, 0xb6, 0xaf, 0x97, 0x1a, 0xbe, 0xf1, + 0xea, 0x1b, 0x7e, 0xe9, 0x55, 0x34, 0xfc, 0x11, 0x00, 0x8d, 0x38, 0x49, 0x45, 0xd9, 0x32, 0xab, + 0x2c, 0x5b, 0xfd, 0xed, 0x45, 0xfa, 0x65, 0xb7, 0xa7, 0xe9, 0x9c, 0x39, 0x66, 0xf4, 0x2e, 0xd4, + 0x7c, 0x32, 0xc2, 0x59, 0xc0, 0x55, 0x7a, 0x9e, 0x94, 0x12, 0x4d, 0x6b, 0x7f, 0x6f, 0x40, 0xbd, + 0x80, 0xd1, 0x2e, 0x54, 0x4e, 0x26, 0x2e, 0x92, 0x46, 0xbd, 0x29, 0x27, 0x16, 0x06, 0x4d, 0x66, + 0x3f, 0x6b, 0x81, 0xa9, 0x9f, 0x30, 0xb4, 0x02, 0x4b, 0x8c, 0x63, 0x4e, 0x54, 0xa2, 0xe6, 0x82, + 0x68, 0xee, 0xc3, 0x38, 0xf2, 0x69, 0x34, 0x76, 0xc3, 0xd8, 0x27, 0x52, 0x7f, 0xd9, 0x69, 0x28, + 0x6c, 0x37, 0xf6, 0x09, 0x8a, 0xa0, 0x19, 0xe2, 0x28, 0x1b, 0x61, 0x8f, 0x67, 0x29, 0x49, 0x55, + 0xa3, 0xf9, 0xdf, 0x42, 0x0f, 0x6a, 0x77, 0x77, 0x8e, 0xd1, 0x39, 0xc4, 0x8f, 0x86, 0x60, 0xd2, + 0x88, 0x71, 0x1c, 0x79, 0x64, 0xa1, 0x68, 0x16, 0xba, 0x7a, 0x8a, 0xcd, 0x29, 0x78, 0xd1, 0xdb, + 0x50, 0xf5, 0x32, 0xc6, 0xe3, 0x50, 0xf5, 0x97, 0xed, 0xc5, 0x34, 0x6c, 0x49, 0x2e, 0x47, 0x71, + 0x8a, 0x1b, 0x8c, 0xb0, 0x47, 0x03, 0xca, 0x67, 0x6a, 0x48, 0x58, 0xf0, 0x06, 0xb7, 0x15, 0x9b, + 0x53, 0xf0, 0xda, 0x1b, 0xd0, 0x9c, 0xf7, 0xe1, 0x4b, 0x43, 0x23, 0x82, 0x0a, 0x0b, 0xb2, 0xb1, + 0xea, 0x3e, 0x72, 0x6d, 0x7f, 0x67, 0x82, 0xa9, 0x9d, 0xf1, 0xd2, 0x0f, 0x8a, 0xfc, 0x28, 0xcd, + 0xe7, 0xc7, 0xaf, 0x8d, 0x16, 0x87, 0x5e, 0xaf, 0xca, 0x0b, 0xaf, 0xd7, 0x05, 0xa8, 0xa6, 0x84, + 0x79, 0x59, 0xde, 0xc1, 0x4d, 0x47, 0x49, 0x68, 0x04, 0xa5, 0xbd, 0x81, 0xf2, 0xca, 0xa3, 0x93, + 0x89, 0x6b, 0x77, 0x2f, 0x21, 0x29, 0xe6, 0x34, 0x1a, 0x0f, 0x66, 0x8c, 0x93, 0xd0, 0x29, 0xed, + 0x0d, 0xc4, 0xfc, 0x80, 0x83, 0x29, 0x9e, 0x31, 0x69, 0x5d, 0x4d, 0xda, 0x50, 0xcf, 0x11, 0x61, + 0xde, 0x9f, 0xa1, 0x2d, 0x9e, 0x39, 0x97, 0x79, 0x29, 0x4d, 0xb8, 0x6c, 0xe0, 0xf9, 0x44, 0xb2, + 0x2c, 0xe0, 0x81, 0x44, 0x45, 0x1b, 0x7f, 0x0b, 0xca, 0x34, 0x61, 0x56, 0x5d, 0xb6, 0xae, 0xde, + 0x09, 0xd9, 0xdb, 0xeb, 0x3b, 0x82, 0x55, 0x38, 0x37, 0x63, 0x24, 0x95, 0x63, 0x6a, 0x3e, 0xe1, + 0x14, 0x32, 0xda, 0x80, 0xf3, 0x5e, 0x3a, 0x4b, 0x38, 0xf1, 0xdd, 0x34, 0x8e, 0xb9, 0x9b, 0x60, + 0xc6, 0xa6, 0x71, 0xea, 0xcb, 0x99, 0xa7, 0xee, 0x9c, 0x53, 0x9b, 0x4e, 0x1c, 0xf3, 0xbe, 0xda, + 0x12, 0x31, 0xe7, 0x78, 0xcc, 0xac, 0xa6, 0x9c, 0xd0, 0xe4, 0x1a, 0x4d, 0xa0, 0xc6, 0x78, 0x9c, + 0xe2, 0x31, 0xb1, 0x96, 0xa5, 0xd3, 0xef, 0x9f, 0xd0, 0x25, 0x06, 0x39, 0xab, 0xa3, 0xe9, 0xc5, + 0x63, 0xc8, 0xd8, 0xc4, 0xdd, 0x27, 0x33, 0x66, 0xb5, 0xa4, 0x05, 0x35, 0xc6, 0x26, 0xff, 0x27, + 0x33, 0x86, 0xae, 0xc2, 0xb2, 0x9a, 0x73, 0xdd, 0x94, 0x60, 0x7f, 0x66, 0xb5, 0x65, 0x3c, 0x9a, + 0x0a, 0x74, 0x04, 0x66, 0x7f, 0x6e, 0x40, 0xfb, 0x85, 0x48, 0x16, 0x59, 0x6c, 0x3c, 0xcf, 0x62, + 0x91, 0x59, 0x3e, 0x65, 0x3c, 0x8d, 0xf5, 0xcb, 0x9a, 0x4b, 0x62, 0x14, 0x13, 0xc3, 0x28, 0x8d, + 0x23, 0x3d, 0x8a, 0x29, 0x51, 0x24, 0x2a, 0x0d, 0xf1, 0x98, 0xb8, 0x1c, 0x8f, 0x65, 0xa2, 0xd6, + 0x1d, 0x53, 0x02, 0x0f, 0xf0, 0x18, 0x5d, 0x84, 0x5a, 0xcc, 0x5c, 0xa9, 0x65, 0x29, 0xe7, 0x8b, + 0xd9, 0x40, 0x54, 0xcb, 0xb7, 0xc6, 0xe9, 0x4d, 0x85, 0x02, 0x4f, 0xb2, 0x61, 0x40, 0x3d, 0x5d, + 0x2e, 0xb9, 0x84, 0xfe, 0x00, 0x10, 0xe2, 0x08, 0x8f, 0x49, 0x48, 0x22, 0x2e, 0xcb, 0xc6, 0x74, + 0xe6, 0x10, 0xfb, 0x21, 0xd4, 0x54, 0x20, 0x44, 0x01, 0xfb, 0x94, 0xed, 0x0b, 0x33, 0x85, 0xf3, + 0x73, 0x41, 0x78, 0x30, 0xc5, 0xd4, 0xb7, 0x4a, 0x79, 0x4e, 0x88, 0x35, 0x5a, 0x85, 0xc6, 0x88, + 0x06, 0x84, 0x49, 0x1f, 0xe7, 0xef, 0x72, 0xdd, 0x99, 0x87, 0xc4, 0x73, 0x57, 0xcd, 0x9b, 0x1a, + 0xfa, 0x18, 0xda, 0x49, 0x4a, 0x64, 0xe7, 0x0c, 0x02, 0xe2, 0xbb, 0x31, 0x53, 0xcf, 0xde, 0xab, + 0xaa, 0xde, 0xd6, 0xbc, 0xba, 0x3d, 0x86, 0xfe, 0x22, 0x0c, 0xa0, 0x07, 0x98, 0x13, 0x97, 0x65, + 0xc3, 0x88, 0xc8, 0xf9, 0x4c, 0x58, 0xdc, 0x52, 0xf0, 0x20, 0x47, 0xed, 0x27, 0x60, 0xea, 0x46, + 0x29, 0x42, 0x9e, 0x04, 0x38, 0x72, 0xe7, 0xb2, 0xc7, 0x14, 0x80, 0x88, 0x2c, 0xba, 0x06, 0x67, + 0xe5, 0xa6, 0xca, 0x0f, 0x77, 0xae, 0x51, 0xb6, 0xc5, 0xc6, 0xa3, 0x1c, 0x97, 0x67, 0xaf, 0xc2, + 0xb2, 0xee, 0xb9, 0xae, 0x27, 0x5e, 0xc8, 0x3c, 0xa0, 0x4d, 0x0d, 0x6e, 0xc5, 0x3e, 0xe9, 0x5c, + 0x81, 0xe5, 0x6d, 0x12, 0x10, 0x4e, 0xf4, 0x17, 0x80, 0x16, 0x94, 0x7a, 0xdb, 0xba, 0xb9, 0xf6, + 0xb6, 0x37, 0x9e, 0xd6, 0xa0, 0xad, 0x5d, 0x20, 0xfe, 0x34, 0x51, 0x8f, 0xa0, 0xcf, 0x0c, 0xa8, + 0xf4, 0x33, 0x36, 0x41, 0xff, 0x38, 0x8a, 0x23, 0xe7, 0x3e, 0x64, 0xd8, 0x37, 0x8e, 0xf2, 0xc3, + 0xfc, 0x43, 0xc5, 0xc5, 0x4f, 0x9e, 0xfe, 0xf4, 0x75, 0xe9, 0x6c, 0xa7, 0xb9, 0x7e, 0x70, 0xa3, + 0xf8, 0xe0, 0xf2, 0x2f, 0xe3, 0x1a, 0xfa, 0xca, 0x80, 0xa5, 0xcd, 0xd9, 0xee, 0xad, 0x2d, 0xf4, + 0xf7, 0xa3, 0xb0, 0x3e, 0xff, 0xea, 0x61, 0x1f, 0xeb, 0x43, 0x4a, 0xe7, 0xb2, 0x34, 0xe8, 0x7c, + 0xe7, 0xcc, 0xbc, 0x41, 0xeb, 0x21, 0xf6, 0x84, 0x51, 0x5f, 0x1a, 0x50, 0xd9, 0x9c, 0xf5, 0xfa, + 0xa7, 0x6c, 0x93, 0x2d, 0x6d, 0x5a, 0xe9, 0xb4, 0x0f, 0xd9, 0x44, 0x13, 0x61, 0xd2, 0x17, 0xb9, + 0x49, 0xdb, 0xa7, 0x6c, 0xd2, 0x25, 0x69, 0xd2, 0x39, 0x74, 0xf6, 0x90, 0x49, 0x1f, 0x50, 0xff, + 0x43, 0xf4, 0xa9, 0x01, 0xe5, 0x5b, 0x41, 0x80, 0x8e, 0x9e, 0x0d, 0xc7, 0xb4, 0x65, 0x45, 0xda, + 0xd2, 0x42, 0x87, 0x72, 0xe8, 0xba, 0x81, 0xa6, 0xb0, 0xf4, 0x18, 0x73, 0x6f, 0x72, 0xba, 0xae, + 0xb9, 0x6e, 0xa0, 0x03, 0xa8, 0xe6, 0xe5, 0x87, 0x8e, 0x34, 0x8a, 0x1f, 0x2a, 0xd9, 0x63, 0x14, + 0xd3, 0x26, 0xbc, 0x69, 0x6a, 0x64, 0x58, 0x95, 0x47, 0xfe, 0xf6, 0x73, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x71, 0x93, 0x94, 0x3b, 0xcf, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.pb.gw.go b/protos/hardware/hardware.pb.gw.go index b0864c7fd..3cdc2d7fc 100644 --- a/protos/hardware/hardware.pb.gw.go +++ b/protos/hardware/hardware.pb.gw.go @@ -65,36 +65,15 @@ func local_request_HardwareService_Push_0(ctx context.Context, marshaler runtime } -var ( - filter_HardwareService_ByMAC_0 = &utilities.DoubleArray{Encoding: map[string]int{"mac": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} -) - func request_HardwareService_ByMAC_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq GetRequest var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["mac"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "mac") - } - - protoReq.Mac, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "mac", err) - } - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_HardwareService_ByMAC_0); err != nil { + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -107,25 +86,11 @@ func local_request_HardwareService_ByMAC_0(ctx context.Context, marshaler runtim var protoReq GetRequest var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["mac"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "mac") - } - - protoReq.Mac, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "mac", err) + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) } - - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_HardwareService_ByMAC_0); err != nil { + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -134,36 +99,15 @@ func local_request_HardwareService_ByMAC_0(ctx context.Context, marshaler runtim } -var ( - filter_HardwareService_ByIP_0 = &utilities.DoubleArray{Encoding: map[string]int{"ip": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} -) - func request_HardwareService_ByIP_0(ctx context.Context, marshaler runtime.Marshaler, client HardwareServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq GetRequest var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["ip"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ip") - } - - protoReq.Ip, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ip", err) - } - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_HardwareService_ByIP_0); err != nil { + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -176,25 +120,11 @@ func local_request_HardwareService_ByIP_0(ctx context.Context, marshaler runtime var protoReq GetRequest var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["ip"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ip") - } - - protoReq.Ip, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ip", err) + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) } - - if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_HardwareService_ByIP_0); err != nil { + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -314,7 +244,7 @@ func RegisterHardwareServiceHandlerServer(ctx context.Context, mux *runtime.Serv }) - mux.Handle("GET", pattern_HardwareService_ByMAC_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_HardwareService_ByMAC_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -334,7 +264,7 @@ func RegisterHardwareServiceHandlerServer(ctx context.Context, mux *runtime.Serv }) - mux.Handle("GET", pattern_HardwareService_ByIP_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_HardwareService_ByIP_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -442,7 +372,7 @@ func RegisterHardwareServiceHandlerClient(ctx context.Context, mux *runtime.Serv }) - mux.Handle("GET", pattern_HardwareService_ByMAC_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_HardwareService_ByMAC_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -462,7 +392,7 @@ func RegisterHardwareServiceHandlerClient(ctx context.Context, mux *runtime.Serv }) - mux.Handle("GET", pattern_HardwareService_ByIP_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("POST", pattern_HardwareService_ByIP_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -528,9 +458,9 @@ func RegisterHardwareServiceHandlerClient(ctx context.Context, mux *runtime.Serv var ( pattern_HardwareService_Push_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "hardware"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_HardwareService_ByMAC_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 2}, []string{"v1", "hardware", "mac"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_HardwareService_ByMAC_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "hardware", "mac"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_HardwareService_ByIP_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 2}, []string{"v1", "hardware", "ip"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_HardwareService_ByIP_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "hardware", "ip"}, "", runtime.AssumeColonVerbOpt(true))) pattern_HardwareService_ByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "hardware", "id"}, "", runtime.AssumeColonVerbOpt(true))) diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 871b14d89..862dbc8fe 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -15,12 +15,14 @@ service HardwareService { }; rpc ByMAC(GetRequest) returns (Hardware) { option (google.api.http) = { - get: "/v1/hardware/mac/{mac}" + post: "/v1/hardware/mac" + body: "*" }; }; rpc ByIP(GetRequest) returns (Hardware) { option (google.api.http) = { - get: "/v1/hardware/ip/{ip}" + post: "/v1/hardware/ip" + body: "*" }; }; rpc ByID(GetRequest) returns (Hardware) { From 12003f7bdbcb1495e5a8a211a7b3dfc2ea569fdf Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 21 May 2020 12:18:01 -0400 Subject: [PATCH 15/31] scrubbed traces of target --- deploy/docker-compose.yml | 1 + http-server/http-server.go | 5 - protos/target/target.pb.gw.go | 407 ---------------------------------- 3 files changed, 1 insertion(+), 412 deletions(-) delete mode 100644 protos/target/target.pb.gw.go diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 61388aaf8..0a18bd7e2 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -113,6 +113,7 @@ services: TINKERBELL_GRPC_AUTHORITY: $TINKERBELL_HOST_IP:42113 TINKERBELL_CERT_URL: http://$TINKERBELL_HOST_IP:42114/cert ELASTIC_SEARCH_URL: $TINKERBELL_HOST_IP:9200 + DISCOVERY_TYPE: tinkerbell depends_on: cacher: condition: service_started diff --git a/http-server/http-server.go b/http-server/http-server.go index dbfdedb56..5a22c4617 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -18,7 +18,6 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/tinkerbell/tink/protos/hardware" - "github.com/tinkerbell/tink/protos/target" "github.com/tinkerbell/tink/protos/template" "github.com/tinkerbell/tink/protos/workflow" ) @@ -53,10 +52,6 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time. if err != nil { logger.Error(err) } - err = target.RegisterTargetHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) - if err != nil { - logger.Error(err) - } err = template.RegisterTemplateHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) if err != nil { logger.Error(err) diff --git a/protos/target/target.pb.gw.go b/protos/target/target.pb.gw.go deleted file mode 100644 index c75d0ceeb..000000000 --- a/protos/target/target.pb.gw.go +++ /dev/null @@ -1,407 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: target/target.proto - -/* -Package target is a reverse proxy. - -It translates gRPC into RESTful JSON APIs. -*/ -package target - -import ( - "context" - "io" - "net/http" - - "github.com/golang/protobuf/descriptor" - "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/status" -) - -// Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = descriptor.ForMessage - -func request_Target_CreateTargets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq PushRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.CreateTargets(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Target_CreateTargets_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq PushRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.CreateTargets(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Target_TargetByID_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["ID"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") - } - - protoReq.ID, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) - } - - msg, err := client.TargetByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Target_TargetByID_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["ID"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") - } - - protoReq.ID, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) - } - - msg, err := server.TargetByID(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Target_DeleteTargetByID_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["ID"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") - } - - protoReq.ID, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) - } - - msg, err := client.DeleteTargetByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Target_DeleteTargetByID_0(ctx context.Context, marshaler runtime.Marshaler, server TargetServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetRequest - var metadata runtime.ServerMetadata - - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["ID"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "ID") - } - - protoReq.ID, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "ID", err) - } - - msg, err := server.DeleteTargetByID(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Target_ListTargets_0(ctx context.Context, marshaler runtime.Marshaler, client TargetClient, req *http.Request, pathParams map[string]string) (Target_ListTargetsClient, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - - stream, err := client.ListTargets(ctx, &protoReq) - if err != nil { - return nil, metadata, err - } - header, err := stream.Header() - if err != nil { - return nil, metadata, err - } - metadata.HeaderMD = header - return stream, metadata, nil - -} - -// RegisterTargetHandlerServer registers the http handlers for service Target to "mux". -// UnaryRPC :call TargetServer directly. -// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. -func RegisterTargetHandlerServer(ctx context.Context, mux *runtime.ServeMux, server TargetServer) error { - - mux.Handle("POST", pattern_Target_CreateTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Target_CreateTargets_0(rctx, inboundMarshaler, server, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Target_CreateTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Target_TargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Target_TargetByID_0(rctx, inboundMarshaler, server, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Target_TargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("DELETE", pattern_Target_DeleteTargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Target_DeleteTargetByID_0(rctx, inboundMarshaler, server, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Target_DeleteTargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") - _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - }) - - return nil -} - -// RegisterTargetHandlerFromEndpoint is same as RegisterTargetHandler but -// automatically dials to "endpoint" and closes the connection when "ctx" gets done. -func RegisterTargetHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) - if err != nil { - return err - } - defer func() { - if err != nil { - if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) - } - return - } - go func() { - <-ctx.Done() - if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) - } - }() - }() - - return RegisterTargetHandler(ctx, mux, conn) -} - -// RegisterTargetHandler registers the http handlers for service Target to "mux". -// The handlers forward requests to the grpc endpoint over "conn". -func RegisterTargetHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { - return RegisterTargetHandlerClient(ctx, mux, NewTargetClient(conn)) -} - -// RegisterTargetHandlerClient registers the http handlers for service Target -// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "TargetClient". -// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "TargetClient" -// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "TargetClient" to call the correct interceptors. -func RegisterTargetHandlerClient(ctx context.Context, mux *runtime.ServeMux, client TargetClient) error { - - mux.Handle("POST", pattern_Target_CreateTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Target_CreateTargets_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Target_CreateTargets_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Target_TargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Target_TargetByID_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Target_TargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("DELETE", pattern_Target_DeleteTargetByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Target_DeleteTargetByID_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Target_DeleteTargetByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("GET", pattern_Target_ListTargets_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Target_ListTargets_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Target_ListTargets_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -var ( - pattern_Target_CreateTargets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "targets"}, "", runtime.AssumeColonVerbOpt(true))) - - pattern_Target_TargetByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "targets", "ID"}, "", runtime.AssumeColonVerbOpt(true))) - - pattern_Target_DeleteTargetByID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "targets", "ID"}, "", runtime.AssumeColonVerbOpt(true))) - - pattern_Target_ListTargets_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "targets"}, "", runtime.AssumeColonVerbOpt(true))) -) - -var ( - forward_Target_CreateTargets_0 = runtime.ForwardResponseMessage - - forward_Target_TargetByID_0 = runtime.ForwardResponseMessage - - forward_Target_DeleteTargetByID_0 = runtime.ForwardResponseMessage - - forward_Target_ListTargets_0 = runtime.ForwardResponseStream -) From 377f95bb42931921f38439171ede08c3159cca11 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Wed, 27 May 2020 11:29:35 -0400 Subject: [PATCH 16/31] removed hardware network.default --- deploy/docker-compose.yml | 4 +- protos/hardware/hardware.pb.go | 210 ++++++++++++++++----------------- protos/hardware/hardware.proto | 2 +- 3 files changed, 108 insertions(+), 108 deletions(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 0a18bd7e2..f959891dc 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -26,7 +26,7 @@ services: timeout: 2s retries: 30 volumes: - - ./state/certs:/certs/${FACILITY} + - ./state/certs:/certs/${FACILITY:-onprem} ports: - 42113:42113/tcp - 42114:42114/tcp @@ -149,7 +149,7 @@ services: PGUSER: tinkerbell ROLLBAR_TOKEN: ${ROLLBAR_TOKEN-ignored} volumes: - - ./state/certs:/certs/${FACILITY} + - ./state/certs:/certs/${FACILITY:-onprem} depends_on: db: condition: service_healthy diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 89b5e621e..a684c7d48 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -619,7 +619,7 @@ type Hardware_Network struct { OBSOLETEDhcp *Hardware_DHCP `protobuf:"bytes,1,opt,name=OBSOLETE_dhcp,json=OBSOLETEDhcp,proto3" json:"OBSOLETE_dhcp,omitempty"` OBSOLETENetboot *Hardware_Netboot `protobuf:"bytes,2,opt,name=OBSOLETE_netboot,json=OBSOLETENetboot,proto3" json:"OBSOLETE_netboot,omitempty"` Interfaces []*Hardware_Network_Interface `protobuf:"bytes,3,rep,name=interfaces,proto3" json:"interfaces,omitempty"` - Default *Hardware_Network_Interface `protobuf:"bytes,4,opt,name=default,proto3" json:"default,omitempty"` + OBSOLETEDefault *Hardware_Network_Interface `protobuf:"bytes,4,opt,name=OBSOLETE_default,json=OBSOLETEDefault,proto3" json:"OBSOLETE_default,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -671,9 +671,9 @@ func (m *Hardware_Network) GetInterfaces() []*Hardware_Network_Interface { return nil } -func (m *Hardware_Network) GetDefault() *Hardware_Network_Interface { +func (m *Hardware_Network) GetOBSOLETEDefault() *Hardware_Network_Interface { if m != nil { - return m.Default + return m.OBSOLETEDefault } return nil } @@ -1381,108 +1381,108 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1609 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0xc7, - 0x15, 0xc6, 0x92, 0x14, 0xb9, 0x3c, 0xa4, 0x48, 0x7b, 0x2c, 0xdb, 0xeb, 0x75, 0x5b, 0xab, 0x34, - 0xda, 0xaa, 0x7e, 0xa0, 0x6c, 0xd5, 0x68, 0xd1, 0xa2, 0x2d, 0x60, 0x5d, 0x6c, 0xb3, 0xb5, 0x2c, - 0x66, 0xe9, 0x4b, 0x6e, 0xc8, 0x66, 0xb8, 0x3b, 0x24, 0x27, 0xda, 0x5b, 0x76, 0x66, 0x45, 0x13, - 0x41, 0x12, 0x20, 0x0f, 0x79, 0x09, 0x82, 0x04, 0x49, 0x7e, 0x41, 0x5e, 0xf2, 0x9e, 0xe7, 0xfc, - 0x89, 0xc0, 0x7f, 0x21, 0xf0, 0xef, 0x08, 0x66, 0x76, 0x66, 0x4d, 0xd9, 0x41, 0x10, 0x89, 0xb2, - 0xde, 0xe6, 0x7c, 0x33, 0xfc, 0xce, 0x99, 0x73, 0x9b, 0xc3, 0x85, 0x8b, 0x13, 0x9c, 0xfa, 0x53, - 0x9c, 0x92, 0x75, 0xbd, 0xe8, 0x26, 0x69, 0xcc, 0x63, 0x74, 0x6d, 0x4c, 0xf9, 0x24, 0x1b, 0x76, - 0xbd, 0x38, 0xec, 0x72, 0x1a, 0xed, 0x93, 0x74, 0x48, 0x82, 0x40, 0x2e, 0xf3, 0x13, 0xac, 0xab, - 0x7f, 0x61, 0xff, 0x6e, 0x1c, 0xc7, 0xe3, 0x80, 0xac, 0xe3, 0x84, 0xae, 0xe3, 0x28, 0x8a, 0x39, - 0xe6, 0x34, 0x8e, 0x58, 0x7e, 0xae, 0xf3, 0x18, 0x1a, 0xfd, 0x8c, 0x4d, 0x1c, 0xf2, 0x7e, 0x46, - 0x18, 0x47, 0x77, 0xa1, 0xe2, 0x63, 0x8e, 0x2d, 0x63, 0xd5, 0x58, 0x6b, 0x6c, 0xdc, 0xec, 0xfe, - 0x76, 0x3d, 0xdd, 0xbb, 0x6a, 0xe1, 0x48, 0x86, 0x4e, 0x0d, 0x96, 0x76, 0xc2, 0x84, 0xcf, 0x3a, - 0xff, 0x05, 0xb8, 0x43, 0xb8, 0x56, 0x70, 0x06, 0xca, 0x21, 0xf6, 0x24, 0x7f, 0xdd, 0x11, 0x4b, - 0xd4, 0x82, 0x12, 0x4d, 0xac, 0x92, 0x04, 0x4a, 0x34, 0x91, 0xb2, 0x6f, 0x95, 0x95, 0xec, 0x77, - 0x7e, 0xb8, 0x02, 0xa6, 0xe6, 0x56, 0x9b, 0x86, 0xde, 0x44, 0xef, 0xc0, 0xf2, 0xde, 0xe6, 0x60, - 0xef, 0xde, 0xce, 0x83, 0x1d, 0xd7, 0x9f, 0x78, 0x39, 0x4f, 0x63, 0xe3, 0x9f, 0xc7, 0x31, 0xbc, - 0xbb, 0x7d, 0x77, 0xab, 0xef, 0x34, 0x35, 0xdf, 0xf6, 0xc4, 0x4b, 0xd0, 0x18, 0xce, 0x14, 0xfc, - 0x11, 0xe1, 0xc3, 0x38, 0xe6, 0xd2, 0xb4, 0xc6, 0xc6, 0xbf, 0x8f, 0xa5, 0xe2, 0x7e, 0xce, 0xe1, - 0xb4, 0x35, 0xab, 0x02, 0x5e, 0x54, 0x34, 0x8d, 0xd3, 0x7d, 0xab, 0xb2, 0x5a, 0x5e, 0x44, 0x91, - 0xe0, 0x38, 0xa4, 0x48, 0x00, 0xe8, 0x0d, 0x30, 0x43, 0xc2, 0xb1, 0x8c, 0xf2, 0x92, 0xbc, 0xc9, - 0x7f, 0x8e, 0xa5, 0x60, 0x57, 0x91, 0x38, 0x05, 0x1d, 0x7a, 0x04, 0x35, 0x6d, 0x7a, 0x75, 0x31, - 0x1f, 0x49, 0xd3, 0x35, 0x99, 0xfd, 0xac, 0x0c, 0x15, 0x11, 0x9b, 0x5f, 0x48, 0x9e, 0x2b, 0xd0, - 0x28, 0xdc, 0x56, 0x64, 0x11, 0x68, 0xa8, 0x97, 0x20, 0x1b, 0xcc, 0x49, 0xcc, 0x78, 0x84, 0x43, - 0xa2, 0x72, 0xaa, 0x90, 0xd1, 0xef, 0x01, 0x02, 0x82, 0x19, 0x71, 0x39, 0x0d, 0x89, 0x55, 0x59, - 0x35, 0xd6, 0xca, 0x4e, 0x5d, 0x22, 0x0f, 0x68, 0x48, 0xd0, 0x1f, 0xa1, 0x29, 0x8e, 0xb9, 0x8c, - 0xa4, 0x07, 0x24, 0x65, 0xd6, 0xd2, 0x6a, 0x79, 0xad, 0xee, 0x34, 0x04, 0x36, 0xc8, 0x21, 0x71, - 0x44, 0xfc, 0xb6, 0x38, 0x52, 0xcd, 0x8f, 0x08, 0x4c, 0x1f, 0xf9, 0xeb, 0x5c, 0x60, 0xc7, 0x98, - 0x93, 0x29, 0x9e, 0x59, 0x35, 0x69, 0x48, 0x11, 0x9a, 0x3b, 0x39, 0x8c, 0x10, 0x54, 0x70, 0xea, - 0x4d, 0x2c, 0x53, 0x6e, 0xcb, 0xb5, 0xc0, 0x32, 0x32, 0xa2, 0x56, 0x7d, 0xd5, 0x58, 0x33, 0x1d, - 0xb9, 0x16, 0x76, 0xd3, 0x11, 0xf6, 0x88, 0x2b, 0x6f, 0x05, 0xf2, 0x74, 0x5d, 0x22, 0xf7, 0xc5, - 0xb5, 0xee, 0xc9, 0x82, 0x6a, 0x2c, 0x10, 0x01, 0xe1, 0xec, 0x6e, 0xaf, 0x2f, 0xca, 0xd1, 0x7e, - 0x0f, 0x4a, 0xbd, 0x3e, 0xb2, 0xa0, 0x86, 0x7d, 0x3f, 0x25, 0x8c, 0x29, 0xef, 0x6b, 0x51, 0xec, - 0x44, 0x84, 0x87, 0x98, 0xed, 0x2b, 0xef, 0x6b, 0x51, 0xec, 0xe8, 0x0b, 0xe7, 0x9e, 0xd7, 0x22, - 0xba, 0x00, 0xd5, 0x11, 0x0e, 0x69, 0x30, 0x53, 0x4e, 0x57, 0x92, 0xfd, 0x4d, 0x05, 0x6a, 0xba, - 0x20, 0x2e, 0x43, 0x1d, 0x07, 0x41, 0x3c, 0x75, 0x93, 0x27, 0x44, 0xea, 0x34, 0x1d, 0x53, 0x02, - 0xfd, 0x27, 0x04, 0xfd, 0x09, 0x5a, 0xf9, 0xa6, 0xc8, 0x8f, 0x51, 0x10, 0x4f, 0xa5, 0x6e, 0xd3, - 0x59, 0x96, 0xe8, 0x63, 0x05, 0xa2, 0x87, 0x50, 0xa1, 0xe2, 0xe7, 0x79, 0xc5, 0xde, 0x5a, 0xa4, - 0x62, 0xbb, 0xbd, 0xfe, 0xeb, 0x3b, 0x8e, 0xa4, 0x43, 0x1f, 0xc1, 0xf9, 0x22, 0xa4, 0x62, 0x8f, - 0xf1, 0x14, 0x27, 0x09, 0x49, 0xe5, 0x6d, 0x1a, 0x1b, 0xbd, 0x85, 0xf4, 0x6c, 0xce, 0x11, 0x3a, - 0x2b, 0x5a, 0xcf, 0x3c, 0x2a, 0xae, 0x15, 0x33, 0x4a, 0x54, 0xf9, 0x2e, 0x76, 0xad, 0x3d, 0x46, - 0x89, 0x23, 0xe9, 0xec, 0x9b, 0x50, 0x11, 0x97, 0x14, 0x55, 0x96, 0xa5, 0x81, 0xae, 0xb2, 0x2c, - 0x0d, 0x44, 0x11, 0x79, 0x71, 0xc4, 0x49, 0xc4, 0x99, 0x0a, 0x72, 0x21, 0xdb, 0x2d, 0x68, 0xce, - 0x1b, 0x67, 0xbf, 0x06, 0x15, 0xc1, 0x89, 0x2e, 0x81, 0x39, 0x14, 0xb5, 0xf5, 0x9c, 0xaa, 0x26, - 0xe4, 0x87, 0x69, 0x20, 0xc2, 0xbf, 0x4f, 0xd2, 0x88, 0x04, 0x8a, 0x4c, 0x49, 0x02, 0xa7, 0x11, - 0xe5, 0xa9, 0xee, 0xfe, 0x4a, 0xb2, 0x7f, 0xcc, 0xd3, 0x42, 0xb6, 0xaf, 0x97, 0x1a, 0xbe, 0xf1, - 0xea, 0x1b, 0x7e, 0xe9, 0x55, 0x34, 0xfc, 0x11, 0x00, 0x8d, 0x38, 0x49, 0x45, 0xd9, 0x32, 0xab, - 0x2c, 0x5b, 0xfd, 0xed, 0x45, 0xfa, 0x65, 0xb7, 0xa7, 0xe9, 0x9c, 0x39, 0x66, 0xf4, 0x2e, 0xd4, - 0x7c, 0x32, 0xc2, 0x59, 0xc0, 0x55, 0x7a, 0x9e, 0x94, 0x12, 0x4d, 0x6b, 0x7f, 0x6f, 0x40, 0xbd, - 0x80, 0xd1, 0x2e, 0x54, 0x4e, 0x26, 0x2e, 0x92, 0x46, 0xbd, 0x29, 0x27, 0x16, 0x06, 0x4d, 0x66, - 0x3f, 0x6b, 0x81, 0xa9, 0x9f, 0x30, 0xb4, 0x02, 0x4b, 0x8c, 0x63, 0x4e, 0x54, 0xa2, 0xe6, 0x82, - 0x68, 0xee, 0xc3, 0x38, 0xf2, 0x69, 0x34, 0x76, 0xc3, 0xd8, 0x27, 0x52, 0x7f, 0xd9, 0x69, 0x28, - 0x6c, 0x37, 0xf6, 0x09, 0x8a, 0xa0, 0x19, 0xe2, 0x28, 0x1b, 0x61, 0x8f, 0x67, 0x29, 0x49, 0x55, - 0xa3, 0xf9, 0xdf, 0x42, 0x0f, 0x6a, 0x77, 0x77, 0x8e, 0xd1, 0x39, 0xc4, 0x8f, 0x86, 0x60, 0xd2, - 0x88, 0x71, 0x1c, 0x79, 0x64, 0xa1, 0x68, 0x16, 0xba, 0x7a, 0x8a, 0xcd, 0x29, 0x78, 0xd1, 0xdb, - 0x50, 0xf5, 0x32, 0xc6, 0xe3, 0x50, 0xf5, 0x97, 0xed, 0xc5, 0x34, 0x6c, 0x49, 0x2e, 0x47, 0x71, - 0x8a, 0x1b, 0x8c, 0xb0, 0x47, 0x03, 0xca, 0x67, 0x6a, 0x48, 0x58, 0xf0, 0x06, 0xb7, 0x15, 0x9b, - 0x53, 0xf0, 0xda, 0x1b, 0xd0, 0x9c, 0xf7, 0xe1, 0x4b, 0x43, 0x23, 0x82, 0x0a, 0x0b, 0xb2, 0xb1, - 0xea, 0x3e, 0x72, 0x6d, 0x7f, 0x67, 0x82, 0xa9, 0x9d, 0xf1, 0xd2, 0x0f, 0x8a, 0xfc, 0x28, 0xcd, - 0xe7, 0xc7, 0xaf, 0x8d, 0x16, 0x87, 0x5e, 0xaf, 0xca, 0x0b, 0xaf, 0xd7, 0x05, 0xa8, 0xa6, 0x84, - 0x79, 0x59, 0xde, 0xc1, 0x4d, 0x47, 0x49, 0x68, 0x04, 0xa5, 0xbd, 0x81, 0xf2, 0xca, 0xa3, 0x93, - 0x89, 0x6b, 0x77, 0x2f, 0x21, 0x29, 0xe6, 0x34, 0x1a, 0x0f, 0x66, 0x8c, 0x93, 0xd0, 0x29, 0xed, - 0x0d, 0xc4, 0xfc, 0x80, 0x83, 0x29, 0x9e, 0x31, 0x69, 0x5d, 0x4d, 0xda, 0x50, 0xcf, 0x11, 0x61, - 0xde, 0x9f, 0xa1, 0x2d, 0x9e, 0x39, 0x97, 0x79, 0x29, 0x4d, 0xb8, 0x6c, 0xe0, 0xf9, 0x44, 0xb2, - 0x2c, 0xe0, 0x81, 0x44, 0x45, 0x1b, 0x7f, 0x0b, 0xca, 0x34, 0x61, 0x56, 0x5d, 0xb6, 0xae, 0xde, - 0x09, 0xd9, 0xdb, 0xeb, 0x3b, 0x82, 0x55, 0x38, 0x37, 0x63, 0x24, 0x95, 0x63, 0x6a, 0x3e, 0xe1, - 0x14, 0x32, 0xda, 0x80, 0xf3, 0x5e, 0x3a, 0x4b, 0x38, 0xf1, 0xdd, 0x34, 0x8e, 0xb9, 0x9b, 0x60, - 0xc6, 0xa6, 0x71, 0xea, 0xcb, 0x99, 0xa7, 0xee, 0x9c, 0x53, 0x9b, 0x4e, 0x1c, 0xf3, 0xbe, 0xda, - 0x12, 0x31, 0xe7, 0x78, 0xcc, 0xac, 0xa6, 0x9c, 0xd0, 0xe4, 0x1a, 0x4d, 0xa0, 0xc6, 0x78, 0x9c, - 0xe2, 0x31, 0xb1, 0x96, 0xa5, 0xd3, 0xef, 0x9f, 0xd0, 0x25, 0x06, 0x39, 0xab, 0xa3, 0xe9, 0xc5, - 0x63, 0xc8, 0xd8, 0xc4, 0xdd, 0x27, 0x33, 0x66, 0xb5, 0xa4, 0x05, 0x35, 0xc6, 0x26, 0xff, 0x27, - 0x33, 0x86, 0xae, 0xc2, 0xb2, 0x9a, 0x73, 0xdd, 0x94, 0x60, 0x7f, 0x66, 0xb5, 0x65, 0x3c, 0x9a, - 0x0a, 0x74, 0x04, 0x66, 0x7f, 0x6e, 0x40, 0xfb, 0x85, 0x48, 0x16, 0x59, 0x6c, 0x3c, 0xcf, 0x62, - 0x91, 0x59, 0x3e, 0x65, 0x3c, 0x8d, 0xf5, 0xcb, 0x9a, 0x4b, 0x62, 0x14, 0x13, 0xc3, 0x28, 0x8d, - 0x23, 0x3d, 0x8a, 0x29, 0x51, 0x24, 0x2a, 0x0d, 0xf1, 0x98, 0xb8, 0x1c, 0x8f, 0x65, 0xa2, 0xd6, - 0x1d, 0x53, 0x02, 0x0f, 0xf0, 0x18, 0x5d, 0x84, 0x5a, 0xcc, 0x5c, 0xa9, 0x65, 0x29, 0xe7, 0x8b, - 0xd9, 0x40, 0x54, 0xcb, 0xb7, 0xc6, 0xe9, 0x4d, 0x85, 0x02, 0x4f, 0xb2, 0x61, 0x40, 0x3d, 0x5d, - 0x2e, 0xb9, 0x84, 0xfe, 0x00, 0x10, 0xe2, 0x08, 0x8f, 0x49, 0x48, 0x22, 0x2e, 0xcb, 0xc6, 0x74, - 0xe6, 0x10, 0xfb, 0x21, 0xd4, 0x54, 0x20, 0x44, 0x01, 0xfb, 0x94, 0xed, 0x0b, 0x33, 0x85, 0xf3, - 0x73, 0x41, 0x78, 0x30, 0xc5, 0xd4, 0xb7, 0x4a, 0x79, 0x4e, 0x88, 0x35, 0x5a, 0x85, 0xc6, 0x88, - 0x06, 0x84, 0x49, 0x1f, 0xe7, 0xef, 0x72, 0xdd, 0x99, 0x87, 0xc4, 0x73, 0x57, 0xcd, 0x9b, 0x1a, - 0xfa, 0x18, 0xda, 0x49, 0x4a, 0x64, 0xe7, 0x0c, 0x02, 0xe2, 0xbb, 0x31, 0x53, 0xcf, 0xde, 0xab, - 0xaa, 0xde, 0xd6, 0xbc, 0xba, 0x3d, 0x86, 0xfe, 0x22, 0x0c, 0xa0, 0x07, 0x98, 0x13, 0x97, 0x65, - 0xc3, 0x88, 0xc8, 0xf9, 0x4c, 0x58, 0xdc, 0x52, 0xf0, 0x20, 0x47, 0xed, 0x27, 0x60, 0xea, 0x46, - 0x29, 0x42, 0x9e, 0x04, 0x38, 0x72, 0xe7, 0xb2, 0xc7, 0x14, 0x80, 0x88, 0x2c, 0xba, 0x06, 0x67, - 0xe5, 0xa6, 0xca, 0x0f, 0x77, 0xae, 0x51, 0xb6, 0xc5, 0xc6, 0xa3, 0x1c, 0x97, 0x67, 0xaf, 0xc2, - 0xb2, 0xee, 0xb9, 0xae, 0x27, 0x5e, 0xc8, 0x3c, 0xa0, 0x4d, 0x0d, 0x6e, 0xc5, 0x3e, 0xe9, 0x5c, - 0x81, 0xe5, 0x6d, 0x12, 0x10, 0x4e, 0xf4, 0x17, 0x80, 0x16, 0x94, 0x7a, 0xdb, 0xba, 0xb9, 0xf6, - 0xb6, 0x37, 0x9e, 0xd6, 0xa0, 0xad, 0x5d, 0x20, 0xfe, 0x34, 0x51, 0x8f, 0xa0, 0xcf, 0x0c, 0xa8, - 0xf4, 0x33, 0x36, 0x41, 0xff, 0x38, 0x8a, 0x23, 0xe7, 0x3e, 0x64, 0xd8, 0x37, 0x8e, 0xf2, 0xc3, - 0xfc, 0x43, 0xc5, 0xc5, 0x4f, 0x9e, 0xfe, 0xf4, 0x75, 0xe9, 0x6c, 0xa7, 0xb9, 0x7e, 0x70, 0xa3, - 0xf8, 0xe0, 0xf2, 0x2f, 0xe3, 0x1a, 0xfa, 0xca, 0x80, 0xa5, 0xcd, 0xd9, 0xee, 0xad, 0x2d, 0xf4, - 0xf7, 0xa3, 0xb0, 0x3e, 0xff, 0xea, 0x61, 0x1f, 0xeb, 0x43, 0x4a, 0xe7, 0xb2, 0x34, 0xe8, 0x7c, - 0xe7, 0xcc, 0xbc, 0x41, 0xeb, 0x21, 0xf6, 0x84, 0x51, 0x5f, 0x1a, 0x50, 0xd9, 0x9c, 0xf5, 0xfa, - 0xa7, 0x6c, 0x93, 0x2d, 0x6d, 0x5a, 0xe9, 0xb4, 0x0f, 0xd9, 0x44, 0x13, 0x61, 0xd2, 0x17, 0xb9, - 0x49, 0xdb, 0xa7, 0x6c, 0xd2, 0x25, 0x69, 0xd2, 0x39, 0x74, 0xf6, 0x90, 0x49, 0x1f, 0x50, 0xff, - 0x43, 0xf4, 0xa9, 0x01, 0xe5, 0x5b, 0x41, 0x80, 0x8e, 0x9e, 0x0d, 0xc7, 0xb4, 0x65, 0x45, 0xda, - 0xd2, 0x42, 0x87, 0x72, 0xe8, 0xba, 0x81, 0xa6, 0xb0, 0xf4, 0x18, 0x73, 0x6f, 0x72, 0xba, 0xae, - 0xb9, 0x6e, 0xa0, 0x03, 0xa8, 0xe6, 0xe5, 0x87, 0x8e, 0x34, 0x8a, 0x1f, 0x2a, 0xd9, 0x63, 0x14, - 0xd3, 0x26, 0xbc, 0x69, 0x6a, 0x64, 0x58, 0x95, 0x47, 0xfe, 0xf6, 0x73, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x71, 0x93, 0x94, 0x3b, 0xcf, 0x14, 0x00, 0x00, + // 1611 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5f, 0x6f, 0x1b, 0x4b, + 0x15, 0xd7, 0xda, 0x8e, 0xbd, 0x3e, 0x76, 0xec, 0x76, 0x9a, 0xb6, 0xdb, 0x2d, 0xd0, 0xe0, 0x0a, + 0x08, 0x7d, 0x70, 0xda, 0x50, 0x81, 0x40, 0x80, 0xd4, 0xc4, 0x69, 0x6b, 0x68, 0x1a, 0xb3, 0xee, + 0x1f, 0xfe, 0x89, 0xd5, 0x78, 0x77, 0x6c, 0x0f, 0xd9, 0x7f, 0xdd, 0x99, 0x8d, 0x6b, 0x21, 0x40, + 0xe2, 0x81, 0x17, 0x84, 0x40, 0xc0, 0x27, 0xe0, 0x85, 0x77, 0xbe, 0xc7, 0x7d, 0xea, 0x37, 0xb8, + 0xba, 0xea, 0xe7, 0xb8, 0x9a, 0xd9, 0x99, 0xed, 0xa6, 0xbd, 0xba, 0xba, 0x89, 0xd3, 0xbc, 0xcd, + 0xf9, 0xcd, 0xf8, 0x77, 0xce, 0x9c, 0x7f, 0x73, 0xbc, 0x70, 0x7d, 0x8e, 0x53, 0x7f, 0x81, 0x53, + 0xb2, 0xad, 0x17, 0xfd, 0x24, 0x8d, 0x79, 0x8c, 0xee, 0xcc, 0x28, 0x9f, 0x67, 0x93, 0xbe, 0x17, + 0x87, 0x7d, 0x4e, 0xa3, 0x23, 0x92, 0x4e, 0x48, 0x10, 0xc8, 0x65, 0x7e, 0x82, 0xf5, 0xf5, 0x2f, + 0xec, 0xaf, 0xcd, 0xe2, 0x78, 0x16, 0x90, 0x6d, 0x9c, 0xd0, 0x6d, 0x1c, 0x45, 0x31, 0xc7, 0x9c, + 0xc6, 0x11, 0xcb, 0xcf, 0xf5, 0x5e, 0x42, 0x6b, 0x94, 0xb1, 0xb9, 0x43, 0x5e, 0x65, 0x84, 0x71, + 0xf4, 0x18, 0x6a, 0x3e, 0xe6, 0xd8, 0x32, 0x36, 0x8d, 0xad, 0xd6, 0xce, 0xfd, 0xfe, 0x57, 0xd7, + 0xd3, 0x7f, 0xac, 0x16, 0x8e, 0x64, 0xe8, 0x35, 0x60, 0x6d, 0x3f, 0x4c, 0xf8, 0xb2, 0xf7, 0x53, + 0x80, 0x47, 0x84, 0x6b, 0x05, 0x97, 0xa0, 0x1a, 0x62, 0x4f, 0xf2, 0x37, 0x1d, 0xb1, 0x44, 0x1d, + 0xa8, 0xd0, 0xc4, 0xaa, 0x48, 0xa0, 0x42, 0x13, 0x29, 0xfb, 0x56, 0x55, 0xc9, 0x7e, 0xef, 0x93, + 0x5b, 0x60, 0x6a, 0x6e, 0xb5, 0x69, 0xe8, 0x4d, 0xf4, 0x3b, 0x58, 0x3f, 0xdc, 0x1d, 0x1f, 0x3e, + 0xd9, 0x7f, 0xb6, 0xef, 0xfa, 0x73, 0x2f, 0xe7, 0x69, 0xed, 0xfc, 0xf0, 0x2c, 0x86, 0xf7, 0x07, + 0x8f, 0xf7, 0x46, 0x4e, 0x5b, 0xf3, 0x0d, 0xe6, 0x5e, 0x82, 0x66, 0x70, 0xa9, 0xe0, 0x8f, 0x08, + 0x9f, 0xc4, 0x31, 0x97, 0xa6, 0xb5, 0x76, 0x7e, 0x7c, 0x26, 0x15, 0x4f, 0x73, 0x0e, 0xa7, 0xab, + 0x59, 0x15, 0xf0, 0xbe, 0xa2, 0x45, 0x9c, 0x1e, 0x59, 0xb5, 0xcd, 0xea, 0x2a, 0x8a, 0x04, 0xc7, + 0x09, 0x45, 0x02, 0x40, 0xbf, 0x02, 0x33, 0x24, 0x1c, 0xcb, 0x28, 0xaf, 0xc9, 0x9b, 0xfc, 0xe4, + 0x4c, 0x0a, 0x0e, 0x14, 0x89, 0x53, 0xd0, 0xa1, 0x17, 0xd0, 0xd0, 0xa6, 0xd7, 0x57, 0xf3, 0x91, + 0x34, 0x5d, 0x93, 0xd9, 0x6f, 0xab, 0x50, 0x13, 0xb1, 0xf9, 0x82, 0xe4, 0xb9, 0x05, 0xad, 0xc2, + 0x6d, 0x45, 0x16, 0x81, 0x86, 0x86, 0x09, 0xb2, 0xc1, 0x9c, 0xc7, 0x8c, 0x47, 0x38, 0x24, 0x2a, + 0xa7, 0x0a, 0x19, 0x7d, 0x1d, 0x20, 0x20, 0x98, 0x11, 0x97, 0xd3, 0x90, 0x58, 0xb5, 0x4d, 0x63, + 0xab, 0xea, 0x34, 0x25, 0xf2, 0x8c, 0x86, 0x04, 0x7d, 0x13, 0xda, 0xe2, 0x98, 0xcb, 0x48, 0x7a, + 0x4c, 0x52, 0x66, 0xad, 0x6d, 0x56, 0xb7, 0x9a, 0x4e, 0x4b, 0x60, 0xe3, 0x1c, 0x12, 0x47, 0xc4, + 0x6f, 0x8b, 0x23, 0xf5, 0xfc, 0x88, 0xc0, 0xf4, 0x91, 0xef, 0x96, 0x02, 0x3b, 0xc3, 0x9c, 0x2c, + 0xf0, 0xd2, 0x6a, 0x48, 0x43, 0x8a, 0xd0, 0x3c, 0xca, 0x61, 0x84, 0xa0, 0x86, 0x53, 0x6f, 0x6e, + 0x99, 0x72, 0x5b, 0xae, 0x05, 0x96, 0x91, 0x29, 0xb5, 0x9a, 0x9b, 0xc6, 0x96, 0xe9, 0xc8, 0xb5, + 0xb0, 0x9b, 0x4e, 0xb1, 0x47, 0x5c, 0x79, 0x2b, 0x90, 0xa7, 0x9b, 0x12, 0x79, 0x2a, 0xae, 0xf5, + 0x44, 0x16, 0x54, 0x6b, 0x85, 0x08, 0x08, 0x67, 0xf7, 0x87, 0x23, 0x51, 0x8e, 0xf6, 0xef, 0xa1, + 0x32, 0x1c, 0x21, 0x0b, 0x1a, 0xd8, 0xf7, 0x53, 0xc2, 0x98, 0xf2, 0xbe, 0x16, 0xc5, 0x4e, 0x44, + 0x78, 0x88, 0xd9, 0x91, 0xf2, 0xbe, 0x16, 0xc5, 0x8e, 0xbe, 0x70, 0xee, 0x79, 0x2d, 0xa2, 0x6b, + 0x50, 0x9f, 0xe2, 0x90, 0x06, 0x4b, 0xe5, 0x74, 0x25, 0xd9, 0xff, 0xa9, 0x41, 0x43, 0x17, 0xc4, + 0x4d, 0x68, 0xe2, 0x20, 0x88, 0x17, 0x6e, 0xf2, 0x9a, 0x48, 0x9d, 0xa6, 0x63, 0x4a, 0x60, 0xf4, + 0x9a, 0xa0, 0x6f, 0x41, 0x27, 0xdf, 0x14, 0xf9, 0x31, 0x0d, 0xe2, 0x85, 0xd4, 0x6d, 0x3a, 0xeb, + 0x12, 0x7d, 0xa9, 0x40, 0xf4, 0x1c, 0x6a, 0x54, 0xfc, 0x3c, 0xaf, 0xd8, 0x07, 0xab, 0x54, 0x6c, + 0x7f, 0x38, 0xfa, 0xe5, 0xbe, 0x23, 0xe9, 0xd0, 0x9f, 0xe0, 0x6a, 0x11, 0x52, 0xb1, 0xc7, 0x78, + 0x8a, 0x93, 0x84, 0xa4, 0xf2, 0x36, 0xad, 0x9d, 0xe1, 0x4a, 0x7a, 0x76, 0x4b, 0x84, 0xce, 0x86, + 0xd6, 0x53, 0x46, 0xc5, 0xb5, 0x62, 0x46, 0x89, 0x2a, 0xdf, 0xd5, 0xae, 0x75, 0xc8, 0x28, 0x71, + 0x24, 0x9d, 0x7d, 0x1f, 0x6a, 0xe2, 0x92, 0xa2, 0xca, 0xb2, 0x34, 0xd0, 0x55, 0x96, 0xa5, 0x81, + 0x28, 0x22, 0x2f, 0x8e, 0x38, 0x89, 0x38, 0x53, 0x41, 0x2e, 0x64, 0xbb, 0x03, 0xed, 0xb2, 0x71, + 0xf6, 0x2f, 0xa0, 0x26, 0x38, 0xd1, 0x0d, 0x30, 0x27, 0xa2, 0xb6, 0xde, 0x51, 0x35, 0x84, 0xfc, + 0x3c, 0x0d, 0x44, 0xf8, 0x8f, 0x48, 0x1a, 0x91, 0x40, 0x91, 0x29, 0x49, 0xe0, 0x34, 0xa2, 0x3c, + 0xd5, 0xdd, 0x5f, 0x49, 0xf6, 0xa7, 0x79, 0x5a, 0xc8, 0xf6, 0xf5, 0x41, 0xc3, 0x37, 0x3e, 0x7e, + 0xc3, 0xaf, 0x7c, 0x8c, 0x86, 0x3f, 0x05, 0xa0, 0x11, 0x27, 0xa9, 0x28, 0x5b, 0x66, 0x55, 0x65, + 0xab, 0x7f, 0xb8, 0x4a, 0xbf, 0xec, 0x0f, 0x35, 0x9d, 0x53, 0x62, 0x46, 0xaf, 0x4a, 0x17, 0xf2, + 0xc9, 0x14, 0x67, 0x01, 0x57, 0x79, 0x7a, 0x5e, 0xda, 0x8a, 0xab, 0x0d, 0x72, 0x7a, 0xfb, 0xff, + 0x06, 0x34, 0x8b, 0x6d, 0x74, 0x00, 0xb5, 0xf3, 0x09, 0x94, 0xa4, 0x51, 0x8f, 0xcc, 0xb9, 0xc5, + 0x45, 0x93, 0xd9, 0x6f, 0x3b, 0x60, 0xea, 0x37, 0x0d, 0x6d, 0xc0, 0x1a, 0xe3, 0x98, 0x13, 0x95, + 0xb9, 0xb9, 0x20, 0xba, 0xfd, 0x24, 0x8e, 0x7c, 0x1a, 0xcd, 0xdc, 0x30, 0xf6, 0x89, 0xd4, 0x5f, + 0x75, 0x5a, 0x0a, 0x3b, 0x88, 0x7d, 0x82, 0x22, 0x68, 0x87, 0x38, 0xca, 0xa6, 0xd8, 0xe3, 0x59, + 0x4a, 0x52, 0xd5, 0x79, 0x7e, 0xb6, 0xd2, 0x0b, 0xdb, 0x3f, 0x28, 0x31, 0x3a, 0x27, 0xf8, 0xd1, + 0x04, 0x4c, 0x1a, 0x31, 0x8e, 0x23, 0x8f, 0xac, 0x14, 0xd5, 0x42, 0xd7, 0x50, 0xb1, 0x39, 0x05, + 0x2f, 0xfa, 0x2d, 0xd4, 0xbd, 0x8c, 0xf1, 0x38, 0x54, 0x0d, 0x67, 0xb0, 0x9a, 0x86, 0x3d, 0xc9, + 0xe5, 0x28, 0x4e, 0x71, 0x83, 0x29, 0xf6, 0x68, 0x40, 0xf9, 0x52, 0x4d, 0x0d, 0x2b, 0xde, 0xe0, + 0xa1, 0x62, 0x73, 0x0a, 0x5e, 0x7b, 0x07, 0xda, 0x65, 0x1f, 0x7e, 0x30, 0x45, 0x22, 0xa8, 0xb1, + 0x20, 0x9b, 0xa9, 0x76, 0x24, 0xd7, 0xf6, 0xff, 0x4c, 0x30, 0xb5, 0x33, 0x3e, 0xf8, 0x41, 0x91, + 0x1f, 0x95, 0x72, 0x7e, 0x7c, 0xd9, 0xac, 0x71, 0xe2, 0x39, 0xab, 0xbd, 0xf7, 0x9c, 0x5d, 0x83, + 0x7a, 0x4a, 0x98, 0x97, 0xe5, 0x2d, 0xdd, 0x74, 0x94, 0x84, 0xa6, 0x50, 0x39, 0x1c, 0x2b, 0xaf, + 0xbc, 0x38, 0x9f, 0xb8, 0xf6, 0x0f, 0x13, 0x92, 0x62, 0x4e, 0xa3, 0xd9, 0x78, 0xc9, 0x38, 0x09, + 0x9d, 0xca, 0xe1, 0x58, 0x0c, 0x14, 0x38, 0x58, 0xe0, 0x25, 0x93, 0xd6, 0x35, 0xa4, 0x0d, 0xcd, + 0x1c, 0x11, 0xe6, 0x7d, 0x1b, 0xba, 0xe2, 0xdd, 0x73, 0x99, 0x97, 0xd2, 0x84, 0xcb, 0x8e, 0x9e, + 0x8f, 0x28, 0xeb, 0x02, 0x1e, 0x4b, 0x54, 0xf4, 0xf5, 0xdf, 0x40, 0x95, 0x26, 0xcc, 0x6a, 0xca, + 0x5e, 0x36, 0x3c, 0x27, 0x7b, 0x87, 0x23, 0x47, 0xb0, 0x0a, 0xe7, 0x66, 0x8c, 0xa4, 0x72, 0x6e, + 0xcd, 0x47, 0x9e, 0x42, 0x46, 0x3b, 0x70, 0xd5, 0x4b, 0x97, 0x09, 0x27, 0xbe, 0x9b, 0xc6, 0x31, + 0x77, 0x13, 0xcc, 0xd8, 0x22, 0x4e, 0x7d, 0x39, 0x04, 0x35, 0x9d, 0x2b, 0x6a, 0xd3, 0x89, 0x63, + 0x3e, 0x52, 0x5b, 0x22, 0xe6, 0x1c, 0xcf, 0x98, 0xd5, 0x96, 0x23, 0x9b, 0x5c, 0xa3, 0x39, 0x34, + 0x18, 0x8f, 0x53, 0x3c, 0x23, 0xd6, 0xba, 0x74, 0xfa, 0xd3, 0x73, 0xba, 0xc4, 0x38, 0x67, 0x75, + 0x34, 0xbd, 0x78, 0x1d, 0x19, 0x9b, 0xbb, 0x47, 0x64, 0xc9, 0xac, 0x8e, 0xb4, 0xa0, 0xc1, 0xd8, + 0xfc, 0xe7, 0x64, 0xc9, 0xd0, 0x6d, 0x58, 0x57, 0x83, 0xaf, 0x9b, 0x12, 0xec, 0x2f, 0xad, 0xae, + 0x8c, 0x47, 0x5b, 0x81, 0x8e, 0xc0, 0xec, 0xbf, 0x1b, 0xd0, 0x7d, 0x2f, 0x92, 0x45, 0x16, 0x1b, + 0xef, 0xb2, 0x58, 0x64, 0x96, 0x4f, 0x19, 0x4f, 0x63, 0xfd, 0xd4, 0xe6, 0x92, 0x98, 0xcd, 0xc4, + 0x74, 0x4a, 0xe3, 0x48, 0xcf, 0x66, 0x4a, 0x14, 0x89, 0x4a, 0x43, 0x3c, 0x23, 0x2e, 0xc7, 0x33, + 0x99, 0xa8, 0x4d, 0xc7, 0x94, 0xc0, 0x33, 0x3c, 0x43, 0xd7, 0xa1, 0x11, 0x33, 0x57, 0x6a, 0x59, + 0xcb, 0xf9, 0x62, 0x36, 0x16, 0xd5, 0xf2, 0x5f, 0xe3, 0xe2, 0xc6, 0x44, 0x81, 0x27, 0xd9, 0x24, + 0xa0, 0x9e, 0x2e, 0x97, 0x5c, 0x42, 0xdf, 0x00, 0x08, 0x71, 0x84, 0x67, 0x24, 0x24, 0x11, 0x97, + 0x65, 0x63, 0x3a, 0x25, 0xc4, 0x7e, 0x0e, 0x0d, 0x15, 0x08, 0x51, 0xc0, 0x3e, 0x65, 0x47, 0xc2, + 0x4c, 0xe1, 0xfc, 0x5c, 0x10, 0x1e, 0x4c, 0x31, 0xf5, 0xad, 0x4a, 0x9e, 0x13, 0x62, 0x8d, 0x36, + 0xa1, 0x35, 0xa5, 0x01, 0x61, 0xd2, 0xc7, 0xf9, 0x43, 0xdd, 0x74, 0xca, 0x90, 0x78, 0xee, 0xea, + 0x79, 0x53, 0x43, 0x7f, 0x86, 0x6e, 0x92, 0x12, 0xd9, 0x39, 0x83, 0x80, 0xf8, 0x6e, 0xcc, 0xd4, + 0xb3, 0xf7, 0xb1, 0xaa, 0xb7, 0x53, 0x56, 0x77, 0xc8, 0xd0, 0x77, 0x84, 0x01, 0xf4, 0x18, 0x73, + 0xe2, 0xb2, 0x6c, 0x12, 0x11, 0x39, 0xb0, 0x09, 0x8b, 0x3b, 0x0a, 0x1e, 0xe7, 0xa8, 0xfd, 0x1a, + 0x4c, 0xdd, 0x28, 0x45, 0xc8, 0x93, 0x00, 0x47, 0x6e, 0x29, 0x7b, 0x4c, 0x01, 0x88, 0xc8, 0xa2, + 0x3b, 0x70, 0x59, 0x6e, 0xaa, 0xfc, 0x70, 0x4b, 0x8d, 0xb2, 0x2b, 0x36, 0x5e, 0xe4, 0xb8, 0x3c, + 0x7b, 0x1b, 0xd6, 0x75, 0xcf, 0x75, 0x3d, 0xf1, 0x42, 0xe6, 0x01, 0x6d, 0x6b, 0x70, 0x2f, 0xf6, + 0x49, 0xef, 0x16, 0xac, 0x0f, 0x48, 0x40, 0x38, 0xd1, 0x9f, 0x04, 0x3a, 0x50, 0x19, 0x0e, 0x74, + 0x73, 0x1d, 0x0e, 0x76, 0xde, 0x34, 0xa0, 0xab, 0x5d, 0x20, 0xfe, 0x45, 0x51, 0x8f, 0xa0, 0xbf, + 0x19, 0x50, 0x1b, 0x65, 0x6c, 0x8e, 0x7e, 0x70, 0x1a, 0x47, 0x96, 0xbe, 0x6c, 0xd8, 0xf7, 0x4e, + 0xf3, 0xc3, 0xfc, 0xcb, 0xc5, 0xf5, 0xbf, 0xbc, 0xf9, 0xec, 0xdf, 0x95, 0xcb, 0xbd, 0xf6, 0xf6, + 0xf1, 0xbd, 0xe2, 0x0b, 0xcc, 0x8f, 0x8c, 0x3b, 0xe8, 0x5f, 0x06, 0xac, 0xed, 0x2e, 0x0f, 0x1e, + 0xec, 0xa1, 0xef, 0x9f, 0x86, 0xf5, 0xdd, 0x67, 0x10, 0xfb, 0x4c, 0x5f, 0x56, 0x7a, 0x37, 0xa5, + 0x41, 0x57, 0x7b, 0x97, 0xca, 0x06, 0x6d, 0x87, 0xd8, 0x13, 0x46, 0xfd, 0xd3, 0x80, 0xda, 0xee, + 0x72, 0x38, 0xba, 0x60, 0x9b, 0x6c, 0x69, 0xd3, 0x46, 0xaf, 0x7b, 0xc2, 0x26, 0x9a, 0x08, 0x93, + 0xfe, 0x91, 0x9b, 0x34, 0xb8, 0x60, 0x93, 0x6e, 0x48, 0x93, 0xae, 0xa0, 0xcb, 0x27, 0x4c, 0xfa, + 0x03, 0xf5, 0xff, 0x88, 0xfe, 0x6a, 0x40, 0xf5, 0x41, 0x10, 0xa0, 0xd3, 0x67, 0xc3, 0x19, 0x6d, + 0xd9, 0x90, 0xb6, 0x74, 0xd0, 0x89, 0x1c, 0xba, 0x6b, 0xa0, 0x05, 0xac, 0xbd, 0xc4, 0xdc, 0x9b, + 0x5f, 0xac, 0x6b, 0xee, 0x1a, 0xe8, 0x18, 0xea, 0x79, 0xf9, 0xa1, 0x53, 0x8d, 0xe2, 0x27, 0x4a, + 0xf6, 0x0c, 0xc5, 0xb4, 0x0b, 0xbf, 0x36, 0x35, 0x32, 0xa9, 0xcb, 0x23, 0xdf, 0xfb, 0x3c, 0x00, + 0x00, 0xff, 0xff, 0xb5, 0x5b, 0xc7, 0x56, 0xe0, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 862dbc8fe..6eb5f0082 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -99,7 +99,7 @@ message Hardware { DHCP OBSOLETE_dhcp = 1; // obsolete Netboot OBSOLETE_netboot = 2; // obsolete repeated Interface interfaces = 3; - Interface default = 4; + Interface OBSOLETE_default = 4; // obsolete } message Metadata { message Manufacturer { From 1a0b67e4bd326b048e9328e57a6377096040e353 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 28 May 2020 20:14:20 -0400 Subject: [PATCH 17/31] filled out hardware storage struct --- protos/hardware/hardware.pb.go | 661 +++++++++++++++++++++++++++------ protos/hardware/hardware.proto | 50 ++- 2 files changed, 597 insertions(+), 114 deletions(-) diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index a684c7d48..551002cbd 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -1157,12 +1157,15 @@ func (m *Hardware_Metadata_Instance_IP) GetManagement() bool { } type Hardware_Metadata_Instance_Storage struct { - Disks []string `protobuf:"bytes,1,rep,name=disks,proto3" json:"disks,omitempty"` - Raid []string `protobuf:"bytes,2,rep,name=raid,proto3" json:"raid,omitempty"` - Filesystems []string `protobuf:"bytes,3,rep,name=filesystems,proto3" json:"filesystems,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OBSOLETEDisks []string `protobuf:"bytes,1,rep,name=OBSOLETE_disks,json=OBSOLETEDisks,proto3" json:"OBSOLETE_disks,omitempty"` + OBSOLETERaid []string `protobuf:"bytes,2,rep,name=OBSOLETE_raid,json=OBSOLETERaid,proto3" json:"OBSOLETE_raid,omitempty"` + OBSOLETEFilesystems []string `protobuf:"bytes,3,rep,name=OBSOLETE_filesystems,json=OBSOLETEFilesystems,proto3" json:"OBSOLETE_filesystems,omitempty"` + Disks []*Hardware_Metadata_Instance_Storage_Disk `protobuf:"bytes,4,rep,name=disks,proto3" json:"disks,omitempty"` + Raid []*Hardware_Metadata_Instance_Storage_RAID `protobuf:"bytes,5,rep,name=raid,proto3" json:"raid,omitempty"` + Filesystems []*Hardware_Metadata_Instance_Storage_Filesystem `protobuf:"bytes,6,rep,name=filesystems,proto3" json:"filesystems,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware_Metadata_Instance_Storage) Reset() { *m = Hardware_Metadata_Instance_Storage{} } @@ -1190,27 +1193,436 @@ func (m *Hardware_Metadata_Instance_Storage) XXX_DiscardUnknown() { var xxx_messageInfo_Hardware_Metadata_Instance_Storage proto.InternalMessageInfo -func (m *Hardware_Metadata_Instance_Storage) GetDisks() []string { +func (m *Hardware_Metadata_Instance_Storage) GetOBSOLETEDisks() []string { + if m != nil { + return m.OBSOLETEDisks + } + return nil +} + +func (m *Hardware_Metadata_Instance_Storage) GetOBSOLETERaid() []string { + if m != nil { + return m.OBSOLETERaid + } + return nil +} + +func (m *Hardware_Metadata_Instance_Storage) GetOBSOLETEFilesystems() []string { + if m != nil { + return m.OBSOLETEFilesystems + } + return nil +} + +func (m *Hardware_Metadata_Instance_Storage) GetDisks() []*Hardware_Metadata_Instance_Storage_Disk { if m != nil { return m.Disks } return nil } -func (m *Hardware_Metadata_Instance_Storage) GetRaid() []string { +func (m *Hardware_Metadata_Instance_Storage) GetRaid() []*Hardware_Metadata_Instance_Storage_RAID { if m != nil { return m.Raid } return nil } -func (m *Hardware_Metadata_Instance_Storage) GetFilesystems() []string { +func (m *Hardware_Metadata_Instance_Storage) GetFilesystems() []*Hardware_Metadata_Instance_Storage_Filesystem { if m != nil { return m.Filesystems } return nil } +type Hardware_Metadata_Instance_Storage_Disk struct { + Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"` + WipeTable bool `protobuf:"varint,2,opt,name=wipe_table,json=wipeTable,proto3" json:"wipe_table,omitempty"` + Partitions []*Hardware_Metadata_Instance_Storage_Disk_Partition `protobuf:"bytes,3,rep,name=partitions,proto3" json:"partitions,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_Disk) Reset() { + *m = Hardware_Metadata_Instance_Storage_Disk{} +} +func (m *Hardware_Metadata_Instance_Storage_Disk) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Instance_Storage_Disk) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_Disk) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 0} +} + +func (m *Hardware_Metadata_Instance_Storage_Disk) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage_Disk) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage_Disk) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage_Disk) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage_Disk) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage_Disk) GetDevice() string { + if m != nil { + return m.Device + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_Disk) GetWipeTable() bool { + if m != nil { + return m.WipeTable + } + return false +} + +func (m *Hardware_Metadata_Instance_Storage_Disk) GetPartitions() []*Hardware_Metadata_Instance_Storage_Disk_Partition { + if m != nil { + return m.Partitions + } + return nil +} + +type Hardware_Metadata_Instance_Storage_Disk_Partition struct { + Label string `protobuf:"bytes,1,opt,name=label,proto3" json:"label,omitempty"` + Number int64 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"` + Size int64 `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"` + Start int64 `protobuf:"varint,4,opt,name=start,proto3" json:"start,omitempty"` + TypeGuid string `protobuf:"bytes,5,opt,name=type_guid,json=typeGuid,proto3" json:"type_guid,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) Reset() { + *m = Hardware_Metadata_Instance_Storage_Disk_Partition{} +} +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) String() string { + return proto.CompactTextString(m) +} +func (*Hardware_Metadata_Instance_Storage_Disk_Partition) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_Disk_Partition) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 0, 0} +} + +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk_Partition.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk_Partition.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk_Partition.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk_Partition.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk_Partition.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Disk_Partition proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) GetLabel() string { + if m != nil { + return m.Label + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) GetNumber() int64 { + if m != nil { + return m.Number + } + return 0 +} + +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) GetSize() int64 { + if m != nil { + return m.Size + } + return 0 +} + +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) GetStart() int64 { + if m != nil { + return m.Start + } + return 0 +} + +func (m *Hardware_Metadata_Instance_Storage_Disk_Partition) GetTypeGuid() string { + if m != nil { + return m.TypeGuid + } + return "" +} + +type Hardware_Metadata_Instance_Storage_File struct { + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Contents string `protobuf:"bytes,2,opt,name=contents,proto3" json:"contents,omitempty"` + Mode int64 `protobuf:"varint,3,opt,name=mode,proto3" json:"mode,omitempty"` + Uid int64 `protobuf:"varint,4,opt,name=uid,proto3" json:"uid,omitempty"` + Gid int64 `protobuf:"varint,5,opt,name=gid,proto3" json:"gid,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_File) Reset() { + *m = Hardware_Metadata_Instance_Storage_File{} +} +func (m *Hardware_Metadata_Instance_Storage_File) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Instance_Storage_File) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_File) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 1} +} + +func (m *Hardware_Metadata_Instance_Storage_File) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_File.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage_File) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_File.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage_File) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_File.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage_File) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_File.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage_File) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_File.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_File proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage_File) GetPath() string { + if m != nil { + return m.Path + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_File) GetContents() string { + if m != nil { + return m.Contents + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_File) GetMode() int64 { + if m != nil { + return m.Mode + } + return 0 +} + +func (m *Hardware_Metadata_Instance_Storage_File) GetUid() int64 { + if m != nil { + return m.Uid + } + return 0 +} + +func (m *Hardware_Metadata_Instance_Storage_File) GetGid() int64 { + if m != nil { + return m.Gid + } + return 0 +} + +type Hardware_Metadata_Instance_Storage_Filesystem struct { + Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"` + Format string `protobuf:"bytes,2,opt,name=format,proto3" json:"format,omitempty"` + Files []*Hardware_Metadata_Instance_Storage_File `protobuf:"bytes,3,rep,name=files,proto3" json:"files,omitempty"` + Create *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions `protobuf:"bytes,4,opt,name=create,proto3" json:"create,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) Reset() { + *m = Hardware_Metadata_Instance_Storage_Filesystem{} +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) String() string { + return proto.CompactTextString(m) +} +func (*Hardware_Metadata_Instance_Storage_Filesystem) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_Filesystem) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 2} +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetDevice() string { + if m != nil { + return m.Device + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetFormat() string { + if m != nil { + return m.Format + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetFiles() []*Hardware_Metadata_Instance_Storage_File { + if m != nil { + return m.Files + } + return nil +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetCreate() *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions { + if m != nil { + return m.Create + } + return nil +} + +type Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions struct { + Force bool `protobuf:"varint,1,opt,name=force,proto3" json:"force,omitempty"` + Options []string `protobuf:"bytes,2,rep,name=options,proto3" json:"options,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) Reset() { + *m = Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions{} +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) String() string { + return proto.CompactTextString(m) +} +func (*Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 2, 0} +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) GetForce() bool { + if m != nil { + return m.Force + } + return false +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) GetOptions() []string { + if m != nil { + return m.Options + } + return nil +} + +type Hardware_Metadata_Instance_Storage_RAID struct { + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Level string `protobuf:"bytes,2,opt,name=level,proto3" json:"level,omitempty"` + Devices []string `protobuf:"bytes,3,rep,name=devices,proto3" json:"devices,omitempty"` + Spare int64 `protobuf:"varint,4,opt,name=spare,proto3" json:"spare,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_RAID) Reset() { + *m = Hardware_Metadata_Instance_Storage_RAID{} +} +func (m *Hardware_Metadata_Instance_Storage_RAID) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Instance_Storage_RAID) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_RAID) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 3} +} + +func (m *Hardware_Metadata_Instance_Storage_RAID) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_RAID.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage_RAID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_RAID.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage_RAID) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_RAID.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage_RAID) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_RAID.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage_RAID) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_RAID.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_RAID proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage_RAID) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_RAID) GetLevel() string { + if m != nil { + return m.Level + } + return "" +} + +func (m *Hardware_Metadata_Instance_Storage_RAID) GetDevices() []string { + if m != nil { + return m.Devices + } + return nil +} + +func (m *Hardware_Metadata_Instance_Storage_RAID) GetSpare() int64 { + if m != nil { + return m.Spare + } + return 0 +} + type Hardware_Metadata_Custom struct { PreinstalledOs *Hardware_Metadata_Instance_OperatingSystem `protobuf:"bytes,1,opt,name=preinstalled_os,json=preinstalledOs,proto3" json:"preinstalled_os,omitempty"` PrivateSubnets []string `protobuf:"bytes,2,rep,name=private_subnets,json=privateSubnets,proto3" json:"private_subnets,omitempty"` @@ -1371,6 +1783,12 @@ func init() { proto.RegisterType((*Hardware_Metadata_Instance_OperatingSystem)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.OperatingSystem") proto.RegisterType((*Hardware_Metadata_Instance_IP)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.IP") proto.RegisterType((*Hardware_Metadata_Instance_Storage)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_Disk)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Disk") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_Disk_Partition)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Disk.Partition") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_File)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.File") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_Filesystem)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Filesystem") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Filesystem.FilesystemOptions") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_RAID)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.RAID") proto.RegisterType((*Hardware_Metadata_Custom)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Custom") proto.RegisterType((*Hardware_Metadata_Facility)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Facility") proto.RegisterType((*DeleteRequest)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.DeleteRequest") @@ -1381,108 +1799,129 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1611 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5f, 0x6f, 0x1b, 0x4b, - 0x15, 0xd7, 0xda, 0x8e, 0xbd, 0x3e, 0x76, 0xec, 0x76, 0x9a, 0xb6, 0xdb, 0x2d, 0xd0, 0xe0, 0x0a, - 0x08, 0x7d, 0x70, 0xda, 0x50, 0x81, 0x40, 0x80, 0xd4, 0xc4, 0x69, 0x6b, 0x68, 0x1a, 0xb3, 0xee, - 0x1f, 0xfe, 0x89, 0xd5, 0x78, 0x77, 0x6c, 0x0f, 0xd9, 0x7f, 0xdd, 0x99, 0x8d, 0x6b, 0x21, 0x40, - 0xe2, 0x81, 0x17, 0x84, 0x40, 0xc0, 0x27, 0xe0, 0x85, 0x77, 0xbe, 0xc7, 0x7d, 0xea, 0x37, 0xb8, - 0xba, 0xea, 0xe7, 0xb8, 0x9a, 0xd9, 0x99, 0xed, 0xa6, 0xbd, 0xba, 0xba, 0x89, 0xd3, 0xbc, 0xcd, - 0xf9, 0xcd, 0xf8, 0x77, 0xce, 0x9c, 0x7f, 0x73, 0xbc, 0x70, 0x7d, 0x8e, 0x53, 0x7f, 0x81, 0x53, - 0xb2, 0xad, 0x17, 0xfd, 0x24, 0x8d, 0x79, 0x8c, 0xee, 0xcc, 0x28, 0x9f, 0x67, 0x93, 0xbe, 0x17, - 0x87, 0x7d, 0x4e, 0xa3, 0x23, 0x92, 0x4e, 0x48, 0x10, 0xc8, 0x65, 0x7e, 0x82, 0xf5, 0xf5, 0x2f, - 0xec, 0xaf, 0xcd, 0xe2, 0x78, 0x16, 0x90, 0x6d, 0x9c, 0xd0, 0x6d, 0x1c, 0x45, 0x31, 0xc7, 0x9c, - 0xc6, 0x11, 0xcb, 0xcf, 0xf5, 0x5e, 0x42, 0x6b, 0x94, 0xb1, 0xb9, 0x43, 0x5e, 0x65, 0x84, 0x71, - 0xf4, 0x18, 0x6a, 0x3e, 0xe6, 0xd8, 0x32, 0x36, 0x8d, 0xad, 0xd6, 0xce, 0xfd, 0xfe, 0x57, 0xd7, - 0xd3, 0x7f, 0xac, 0x16, 0x8e, 0x64, 0xe8, 0x35, 0x60, 0x6d, 0x3f, 0x4c, 0xf8, 0xb2, 0xf7, 0x53, - 0x80, 0x47, 0x84, 0x6b, 0x05, 0x97, 0xa0, 0x1a, 0x62, 0x4f, 0xf2, 0x37, 0x1d, 0xb1, 0x44, 0x1d, - 0xa8, 0xd0, 0xc4, 0xaa, 0x48, 0xa0, 0x42, 0x13, 0x29, 0xfb, 0x56, 0x55, 0xc9, 0x7e, 0xef, 0x93, - 0x5b, 0x60, 0x6a, 0x6e, 0xb5, 0x69, 0xe8, 0x4d, 0xf4, 0x3b, 0x58, 0x3f, 0xdc, 0x1d, 0x1f, 0x3e, - 0xd9, 0x7f, 0xb6, 0xef, 0xfa, 0x73, 0x2f, 0xe7, 0x69, 0xed, 0xfc, 0xf0, 0x2c, 0x86, 0xf7, 0x07, - 0x8f, 0xf7, 0x46, 0x4e, 0x5b, 0xf3, 0x0d, 0xe6, 0x5e, 0x82, 0x66, 0x70, 0xa9, 0xe0, 0x8f, 0x08, - 0x9f, 0xc4, 0x31, 0x97, 0xa6, 0xb5, 0x76, 0x7e, 0x7c, 0x26, 0x15, 0x4f, 0x73, 0x0e, 0xa7, 0xab, - 0x59, 0x15, 0xf0, 0xbe, 0xa2, 0x45, 0x9c, 0x1e, 0x59, 0xb5, 0xcd, 0xea, 0x2a, 0x8a, 0x04, 0xc7, - 0x09, 0x45, 0x02, 0x40, 0xbf, 0x02, 0x33, 0x24, 0x1c, 0xcb, 0x28, 0xaf, 0xc9, 0x9b, 0xfc, 0xe4, - 0x4c, 0x0a, 0x0e, 0x14, 0x89, 0x53, 0xd0, 0xa1, 0x17, 0xd0, 0xd0, 0xa6, 0xd7, 0x57, 0xf3, 0x91, - 0x34, 0x5d, 0x93, 0xd9, 0x6f, 0xab, 0x50, 0x13, 0xb1, 0xf9, 0x82, 0xe4, 0xb9, 0x05, 0xad, 0xc2, - 0x6d, 0x45, 0x16, 0x81, 0x86, 0x86, 0x09, 0xb2, 0xc1, 0x9c, 0xc7, 0x8c, 0x47, 0x38, 0x24, 0x2a, - 0xa7, 0x0a, 0x19, 0x7d, 0x1d, 0x20, 0x20, 0x98, 0x11, 0x97, 0xd3, 0x90, 0x58, 0xb5, 0x4d, 0x63, - 0xab, 0xea, 0x34, 0x25, 0xf2, 0x8c, 0x86, 0x04, 0x7d, 0x13, 0xda, 0xe2, 0x98, 0xcb, 0x48, 0x7a, - 0x4c, 0x52, 0x66, 0xad, 0x6d, 0x56, 0xb7, 0x9a, 0x4e, 0x4b, 0x60, 0xe3, 0x1c, 0x12, 0x47, 0xc4, - 0x6f, 0x8b, 0x23, 0xf5, 0xfc, 0x88, 0xc0, 0xf4, 0x91, 0xef, 0x96, 0x02, 0x3b, 0xc3, 0x9c, 0x2c, - 0xf0, 0xd2, 0x6a, 0x48, 0x43, 0x8a, 0xd0, 0x3c, 0xca, 0x61, 0x84, 0xa0, 0x86, 0x53, 0x6f, 0x6e, - 0x99, 0x72, 0x5b, 0xae, 0x05, 0x96, 0x91, 0x29, 0xb5, 0x9a, 0x9b, 0xc6, 0x96, 0xe9, 0xc8, 0xb5, - 0xb0, 0x9b, 0x4e, 0xb1, 0x47, 0x5c, 0x79, 0x2b, 0x90, 0xa7, 0x9b, 0x12, 0x79, 0x2a, 0xae, 0xf5, - 0x44, 0x16, 0x54, 0x6b, 0x85, 0x08, 0x08, 0x67, 0xf7, 0x87, 0x23, 0x51, 0x8e, 0xf6, 0xef, 0xa1, - 0x32, 0x1c, 0x21, 0x0b, 0x1a, 0xd8, 0xf7, 0x53, 0xc2, 0x98, 0xf2, 0xbe, 0x16, 0xc5, 0x4e, 0x44, - 0x78, 0x88, 0xd9, 0x91, 0xf2, 0xbe, 0x16, 0xc5, 0x8e, 0xbe, 0x70, 0xee, 0x79, 0x2d, 0xa2, 0x6b, - 0x50, 0x9f, 0xe2, 0x90, 0x06, 0x4b, 0xe5, 0x74, 0x25, 0xd9, 0xff, 0xa9, 0x41, 0x43, 0x17, 0xc4, - 0x4d, 0x68, 0xe2, 0x20, 0x88, 0x17, 0x6e, 0xf2, 0x9a, 0x48, 0x9d, 0xa6, 0x63, 0x4a, 0x60, 0xf4, - 0x9a, 0xa0, 0x6f, 0x41, 0x27, 0xdf, 0x14, 0xf9, 0x31, 0x0d, 0xe2, 0x85, 0xd4, 0x6d, 0x3a, 0xeb, - 0x12, 0x7d, 0xa9, 0x40, 0xf4, 0x1c, 0x6a, 0x54, 0xfc, 0x3c, 0xaf, 0xd8, 0x07, 0xab, 0x54, 0x6c, - 0x7f, 0x38, 0xfa, 0xe5, 0xbe, 0x23, 0xe9, 0xd0, 0x9f, 0xe0, 0x6a, 0x11, 0x52, 0xb1, 0xc7, 0x78, - 0x8a, 0x93, 0x84, 0xa4, 0xf2, 0x36, 0xad, 0x9d, 0xe1, 0x4a, 0x7a, 0x76, 0x4b, 0x84, 0xce, 0x86, - 0xd6, 0x53, 0x46, 0xc5, 0xb5, 0x62, 0x46, 0x89, 0x2a, 0xdf, 0xd5, 0xae, 0x75, 0xc8, 0x28, 0x71, - 0x24, 0x9d, 0x7d, 0x1f, 0x6a, 0xe2, 0x92, 0xa2, 0xca, 0xb2, 0x34, 0xd0, 0x55, 0x96, 0xa5, 0x81, - 0x28, 0x22, 0x2f, 0x8e, 0x38, 0x89, 0x38, 0x53, 0x41, 0x2e, 0x64, 0xbb, 0x03, 0xed, 0xb2, 0x71, - 0xf6, 0x2f, 0xa0, 0x26, 0x38, 0xd1, 0x0d, 0x30, 0x27, 0xa2, 0xb6, 0xde, 0x51, 0x35, 0x84, 0xfc, - 0x3c, 0x0d, 0x44, 0xf8, 0x8f, 0x48, 0x1a, 0x91, 0x40, 0x91, 0x29, 0x49, 0xe0, 0x34, 0xa2, 0x3c, - 0xd5, 0xdd, 0x5f, 0x49, 0xf6, 0xa7, 0x79, 0x5a, 0xc8, 0xf6, 0xf5, 0x41, 0xc3, 0x37, 0x3e, 0x7e, - 0xc3, 0xaf, 0x7c, 0x8c, 0x86, 0x3f, 0x05, 0xa0, 0x11, 0x27, 0xa9, 0x28, 0x5b, 0x66, 0x55, 0x65, - 0xab, 0x7f, 0xb8, 0x4a, 0xbf, 0xec, 0x0f, 0x35, 0x9d, 0x53, 0x62, 0x46, 0xaf, 0x4a, 0x17, 0xf2, - 0xc9, 0x14, 0x67, 0x01, 0x57, 0x79, 0x7a, 0x5e, 0xda, 0x8a, 0xab, 0x0d, 0x72, 0x7a, 0xfb, 0xff, - 0x06, 0x34, 0x8b, 0x6d, 0x74, 0x00, 0xb5, 0xf3, 0x09, 0x94, 0xa4, 0x51, 0x8f, 0xcc, 0xb9, 0xc5, - 0x45, 0x93, 0xd9, 0x6f, 0x3b, 0x60, 0xea, 0x37, 0x0d, 0x6d, 0xc0, 0x1a, 0xe3, 0x98, 0x13, 0x95, - 0xb9, 0xb9, 0x20, 0xba, 0xfd, 0x24, 0x8e, 0x7c, 0x1a, 0xcd, 0xdc, 0x30, 0xf6, 0x89, 0xd4, 0x5f, - 0x75, 0x5a, 0x0a, 0x3b, 0x88, 0x7d, 0x82, 0x22, 0x68, 0x87, 0x38, 0xca, 0xa6, 0xd8, 0xe3, 0x59, - 0x4a, 0x52, 0xd5, 0x79, 0x7e, 0xb6, 0xd2, 0x0b, 0xdb, 0x3f, 0x28, 0x31, 0x3a, 0x27, 0xf8, 0xd1, - 0x04, 0x4c, 0x1a, 0x31, 0x8e, 0x23, 0x8f, 0xac, 0x14, 0xd5, 0x42, 0xd7, 0x50, 0xb1, 0x39, 0x05, - 0x2f, 0xfa, 0x2d, 0xd4, 0xbd, 0x8c, 0xf1, 0x38, 0x54, 0x0d, 0x67, 0xb0, 0x9a, 0x86, 0x3d, 0xc9, - 0xe5, 0x28, 0x4e, 0x71, 0x83, 0x29, 0xf6, 0x68, 0x40, 0xf9, 0x52, 0x4d, 0x0d, 0x2b, 0xde, 0xe0, - 0xa1, 0x62, 0x73, 0x0a, 0x5e, 0x7b, 0x07, 0xda, 0x65, 0x1f, 0x7e, 0x30, 0x45, 0x22, 0xa8, 0xb1, - 0x20, 0x9b, 0xa9, 0x76, 0x24, 0xd7, 0xf6, 0xff, 0x4c, 0x30, 0xb5, 0x33, 0x3e, 0xf8, 0x41, 0x91, - 0x1f, 0x95, 0x72, 0x7e, 0x7c, 0xd9, 0xac, 0x71, 0xe2, 0x39, 0xab, 0xbd, 0xf7, 0x9c, 0x5d, 0x83, - 0x7a, 0x4a, 0x98, 0x97, 0xe5, 0x2d, 0xdd, 0x74, 0x94, 0x84, 0xa6, 0x50, 0x39, 0x1c, 0x2b, 0xaf, - 0xbc, 0x38, 0x9f, 0xb8, 0xf6, 0x0f, 0x13, 0x92, 0x62, 0x4e, 0xa3, 0xd9, 0x78, 0xc9, 0x38, 0x09, - 0x9d, 0xca, 0xe1, 0x58, 0x0c, 0x14, 0x38, 0x58, 0xe0, 0x25, 0x93, 0xd6, 0x35, 0xa4, 0x0d, 0xcd, - 0x1c, 0x11, 0xe6, 0x7d, 0x1b, 0xba, 0xe2, 0xdd, 0x73, 0x99, 0x97, 0xd2, 0x84, 0xcb, 0x8e, 0x9e, - 0x8f, 0x28, 0xeb, 0x02, 0x1e, 0x4b, 0x54, 0xf4, 0xf5, 0xdf, 0x40, 0x95, 0x26, 0xcc, 0x6a, 0xca, - 0x5e, 0x36, 0x3c, 0x27, 0x7b, 0x87, 0x23, 0x47, 0xb0, 0x0a, 0xe7, 0x66, 0x8c, 0xa4, 0x72, 0x6e, - 0xcd, 0x47, 0x9e, 0x42, 0x46, 0x3b, 0x70, 0xd5, 0x4b, 0x97, 0x09, 0x27, 0xbe, 0x9b, 0xc6, 0x31, - 0x77, 0x13, 0xcc, 0xd8, 0x22, 0x4e, 0x7d, 0x39, 0x04, 0x35, 0x9d, 0x2b, 0x6a, 0xd3, 0x89, 0x63, - 0x3e, 0x52, 0x5b, 0x22, 0xe6, 0x1c, 0xcf, 0x98, 0xd5, 0x96, 0x23, 0x9b, 0x5c, 0xa3, 0x39, 0x34, - 0x18, 0x8f, 0x53, 0x3c, 0x23, 0xd6, 0xba, 0x74, 0xfa, 0xd3, 0x73, 0xba, 0xc4, 0x38, 0x67, 0x75, - 0x34, 0xbd, 0x78, 0x1d, 0x19, 0x9b, 0xbb, 0x47, 0x64, 0xc9, 0xac, 0x8e, 0xb4, 0xa0, 0xc1, 0xd8, - 0xfc, 0xe7, 0x64, 0xc9, 0xd0, 0x6d, 0x58, 0x57, 0x83, 0xaf, 0x9b, 0x12, 0xec, 0x2f, 0xad, 0xae, - 0x8c, 0x47, 0x5b, 0x81, 0x8e, 0xc0, 0xec, 0xbf, 0x1b, 0xd0, 0x7d, 0x2f, 0x92, 0x45, 0x16, 0x1b, - 0xef, 0xb2, 0x58, 0x64, 0x96, 0x4f, 0x19, 0x4f, 0x63, 0xfd, 0xd4, 0xe6, 0x92, 0x98, 0xcd, 0xc4, - 0x74, 0x4a, 0xe3, 0x48, 0xcf, 0x66, 0x4a, 0x14, 0x89, 0x4a, 0x43, 0x3c, 0x23, 0x2e, 0xc7, 0x33, - 0x99, 0xa8, 0x4d, 0xc7, 0x94, 0xc0, 0x33, 0x3c, 0x43, 0xd7, 0xa1, 0x11, 0x33, 0x57, 0x6a, 0x59, - 0xcb, 0xf9, 0x62, 0x36, 0x16, 0xd5, 0xf2, 0x5f, 0xe3, 0xe2, 0xc6, 0x44, 0x81, 0x27, 0xd9, 0x24, - 0xa0, 0x9e, 0x2e, 0x97, 0x5c, 0x42, 0xdf, 0x00, 0x08, 0x71, 0x84, 0x67, 0x24, 0x24, 0x11, 0x97, - 0x65, 0x63, 0x3a, 0x25, 0xc4, 0x7e, 0x0e, 0x0d, 0x15, 0x08, 0x51, 0xc0, 0x3e, 0x65, 0x47, 0xc2, - 0x4c, 0xe1, 0xfc, 0x5c, 0x10, 0x1e, 0x4c, 0x31, 0xf5, 0xad, 0x4a, 0x9e, 0x13, 0x62, 0x8d, 0x36, - 0xa1, 0x35, 0xa5, 0x01, 0x61, 0xd2, 0xc7, 0xf9, 0x43, 0xdd, 0x74, 0xca, 0x90, 0x78, 0xee, 0xea, - 0x79, 0x53, 0x43, 0x7f, 0x86, 0x6e, 0x92, 0x12, 0xd9, 0x39, 0x83, 0x80, 0xf8, 0x6e, 0xcc, 0xd4, - 0xb3, 0xf7, 0xb1, 0xaa, 0xb7, 0x53, 0x56, 0x77, 0xc8, 0xd0, 0x77, 0x84, 0x01, 0xf4, 0x18, 0x73, - 0xe2, 0xb2, 0x6c, 0x12, 0x11, 0x39, 0xb0, 0x09, 0x8b, 0x3b, 0x0a, 0x1e, 0xe7, 0xa8, 0xfd, 0x1a, - 0x4c, 0xdd, 0x28, 0x45, 0xc8, 0x93, 0x00, 0x47, 0x6e, 0x29, 0x7b, 0x4c, 0x01, 0x88, 0xc8, 0xa2, - 0x3b, 0x70, 0x59, 0x6e, 0xaa, 0xfc, 0x70, 0x4b, 0x8d, 0xb2, 0x2b, 0x36, 0x5e, 0xe4, 0xb8, 0x3c, - 0x7b, 0x1b, 0xd6, 0x75, 0xcf, 0x75, 0x3d, 0xf1, 0x42, 0xe6, 0x01, 0x6d, 0x6b, 0x70, 0x2f, 0xf6, - 0x49, 0xef, 0x16, 0xac, 0x0f, 0x48, 0x40, 0x38, 0xd1, 0x9f, 0x04, 0x3a, 0x50, 0x19, 0x0e, 0x74, - 0x73, 0x1d, 0x0e, 0x76, 0xde, 0x34, 0xa0, 0xab, 0x5d, 0x20, 0xfe, 0x45, 0x51, 0x8f, 0xa0, 0xbf, - 0x19, 0x50, 0x1b, 0x65, 0x6c, 0x8e, 0x7e, 0x70, 0x1a, 0x47, 0x96, 0xbe, 0x6c, 0xd8, 0xf7, 0x4e, - 0xf3, 0xc3, 0xfc, 0xcb, 0xc5, 0xf5, 0xbf, 0xbc, 0xf9, 0xec, 0xdf, 0x95, 0xcb, 0xbd, 0xf6, 0xf6, - 0xf1, 0xbd, 0xe2, 0x0b, 0xcc, 0x8f, 0x8c, 0x3b, 0xe8, 0x5f, 0x06, 0xac, 0xed, 0x2e, 0x0f, 0x1e, - 0xec, 0xa1, 0xef, 0x9f, 0x86, 0xf5, 0xdd, 0x67, 0x10, 0xfb, 0x4c, 0x5f, 0x56, 0x7a, 0x37, 0xa5, - 0x41, 0x57, 0x7b, 0x97, 0xca, 0x06, 0x6d, 0x87, 0xd8, 0x13, 0x46, 0xfd, 0xd3, 0x80, 0xda, 0xee, - 0x72, 0x38, 0xba, 0x60, 0x9b, 0x6c, 0x69, 0xd3, 0x46, 0xaf, 0x7b, 0xc2, 0x26, 0x9a, 0x08, 0x93, - 0xfe, 0x91, 0x9b, 0x34, 0xb8, 0x60, 0x93, 0x6e, 0x48, 0x93, 0xae, 0xa0, 0xcb, 0x27, 0x4c, 0xfa, - 0x03, 0xf5, 0xff, 0x88, 0xfe, 0x6a, 0x40, 0xf5, 0x41, 0x10, 0xa0, 0xd3, 0x67, 0xc3, 0x19, 0x6d, - 0xd9, 0x90, 0xb6, 0x74, 0xd0, 0x89, 0x1c, 0xba, 0x6b, 0xa0, 0x05, 0xac, 0xbd, 0xc4, 0xdc, 0x9b, - 0x5f, 0xac, 0x6b, 0xee, 0x1a, 0xe8, 0x18, 0xea, 0x79, 0xf9, 0xa1, 0x53, 0x8d, 0xe2, 0x27, 0x4a, - 0xf6, 0x0c, 0xc5, 0xb4, 0x0b, 0xbf, 0x36, 0x35, 0x32, 0xa9, 0xcb, 0x23, 0xdf, 0xfb, 0x3c, 0x00, - 0x00, 0xff, 0xff, 0xb5, 0x5b, 0xc7, 0x56, 0xe0, 0x14, 0x00, 0x00, + // 1946 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1c, 0x49, + 0x15, 0xd6, 0x5c, 0x3c, 0x97, 0x33, 0xbe, 0x24, 0x95, 0x64, 0x33, 0xdb, 0x0b, 0xac, 0xf1, 0x0a, + 0xc8, 0xe6, 0x61, 0xbc, 0x31, 0x2b, 0x10, 0x08, 0x90, 0x62, 0x4f, 0x2e, 0x03, 0xeb, 0x78, 0xa8, + 0xc9, 0x26, 0x2c, 0xb7, 0xa6, 0xa6, 0xbb, 0x66, 0xa6, 0x70, 0x4f, 0x77, 0x6f, 0x55, 0x8d, 0x9d, + 0x61, 0xb5, 0x80, 0x40, 0xe2, 0x05, 0x21, 0x10, 0xf0, 0x0b, 0xf8, 0x09, 0x48, 0x3c, 0xf3, 0x23, + 0xf6, 0x91, 0xb7, 0x15, 0xe2, 0x07, 0x20, 0x7e, 0x00, 0x3a, 0x75, 0x69, 0x8f, 0x13, 0x58, 0xad, + 0x3d, 0x76, 0xde, 0xea, 0x7c, 0x55, 0xfd, 0x9d, 0x53, 0x75, 0x2e, 0x75, 0xba, 0xe0, 0xe6, 0x84, + 0xc9, 0xf8, 0x98, 0x49, 0xbe, 0xed, 0x07, 0x9d, 0x5c, 0x66, 0x3a, 0x23, 0xb7, 0xc7, 0x42, 0x4f, + 0x66, 0xc3, 0x4e, 0x94, 0x4d, 0x3b, 0x5a, 0xa4, 0x87, 0x5c, 0x0e, 0x79, 0x92, 0x98, 0xa1, 0x5d, + 0xa1, 0x3a, 0xfe, 0x8b, 0xe0, 0x33, 0xe3, 0x2c, 0x1b, 0x27, 0x7c, 0x9b, 0xe5, 0x62, 0x9b, 0xa5, + 0x69, 0xa6, 0x99, 0x16, 0x59, 0xaa, 0xec, 0xba, 0xad, 0xa7, 0xd0, 0xea, 0xcf, 0xd4, 0x84, 0xf2, + 0xf7, 0x67, 0x5c, 0x69, 0xf2, 0x10, 0xaa, 0x31, 0xd3, 0xac, 0x5d, 0xda, 0x2c, 0xdd, 0x6a, 0xed, + 0xbc, 0xdd, 0xf9, 0xf4, 0x7a, 0x3a, 0x0f, 0xdd, 0x80, 0x1a, 0x86, 0xad, 0x3a, 0xac, 0xdc, 0x9b, + 0xe6, 0x7a, 0xbe, 0xf5, 0x2d, 0x80, 0x07, 0x5c, 0x7b, 0x05, 0x57, 0xa0, 0x32, 0x65, 0x91, 0xe1, + 0x6f, 0x52, 0x1c, 0x92, 0x75, 0x28, 0x8b, 0xbc, 0x5d, 0x36, 0x40, 0x59, 0xe4, 0x46, 0x8e, 0xdb, + 0x15, 0x27, 0xc7, 0x5b, 0xff, 0x78, 0x13, 0x1a, 0x9e, 0xdb, 0x4d, 0x96, 0xfc, 0x24, 0xf9, 0x31, + 0xac, 0x1d, 0xec, 0x0e, 0x0e, 0xde, 0xb9, 0xf7, 0xf8, 0x5e, 0x18, 0x4f, 0x22, 0xcb, 0xd3, 0xda, + 0xf9, 0xda, 0x79, 0x0c, 0xef, 0x74, 0x1f, 0xee, 0xf5, 0xe9, 0xaa, 0xe7, 0xeb, 0x4e, 0xa2, 0x9c, + 0x8c, 0xe1, 0x4a, 0xc1, 0x9f, 0x72, 0x3d, 0xcc, 0x32, 0x6d, 0x4c, 0x6b, 0xed, 0x7c, 0xe3, 0x5c, + 0x2a, 0x1e, 0x59, 0x0e, 0xba, 0xe1, 0x59, 0x1d, 0xf0, 0xbc, 0xa2, 0xe3, 0x4c, 0x1e, 0xb6, 0xab, + 0x9b, 0x95, 0x65, 0x14, 0x21, 0xc7, 0x29, 0x45, 0x08, 0x90, 0xf7, 0xa0, 0x31, 0xe5, 0x9a, 0x19, + 0x2f, 0xaf, 0x98, 0x9d, 0x7c, 0xf3, 0x5c, 0x0a, 0xf6, 0x1d, 0x09, 0x2d, 0xe8, 0xc8, 0x13, 0xa8, + 0x7b, 0xd3, 0x6b, 0xcb, 0x9d, 0x91, 0x31, 0xdd, 0x93, 0x05, 0xff, 0xaa, 0x40, 0x15, 0x7d, 0xf3, + 0x3f, 0x82, 0xe7, 0x75, 0x68, 0x15, 0xc7, 0x56, 0x44, 0x11, 0x78, 0xa8, 0x97, 0x93, 0x00, 0x1a, + 0x93, 0x4c, 0xe9, 0x94, 0x4d, 0xb9, 0x8b, 0xa9, 0x42, 0x26, 0x9f, 0x05, 0x48, 0x38, 0x53, 0x3c, + 0xd4, 0x62, 0xca, 0xdb, 0xd5, 0xcd, 0xd2, 0xad, 0x0a, 0x6d, 0x1a, 0xe4, 0xb1, 0x98, 0x72, 0xf2, + 0x79, 0x58, 0xc5, 0x65, 0xa1, 0xe2, 0xf2, 0x88, 0x4b, 0xd5, 0x5e, 0xd9, 0xac, 0xdc, 0x6a, 0xd2, + 0x16, 0x62, 0x03, 0x0b, 0xe1, 0x12, 0xfc, 0xb6, 0x58, 0x52, 0xb3, 0x4b, 0x10, 0xf3, 0x4b, 0xde, + 0x5c, 0x70, 0xec, 0x98, 0x69, 0x7e, 0xcc, 0xe6, 0xed, 0xba, 0x31, 0xa4, 0x70, 0xcd, 0x03, 0x0b, + 0x13, 0x02, 0x55, 0x26, 0xa3, 0x49, 0xbb, 0x61, 0xa6, 0xcd, 0x18, 0xb1, 0x19, 0x1f, 0x89, 0x76, + 0x73, 0xb3, 0x74, 0xab, 0x41, 0xcd, 0x18, 0xed, 0x16, 0x23, 0x16, 0xf1, 0xd0, 0xec, 0x0a, 0xcc, + 0xea, 0xa6, 0x41, 0x1e, 0xe1, 0xb6, 0xde, 0x31, 0x09, 0xd5, 0x5a, 0xc2, 0x03, 0x78, 0xd8, 0x9d, + 0x5e, 0x1f, 0xd3, 0x31, 0xf8, 0x29, 0x94, 0x7b, 0x7d, 0xd2, 0x86, 0x3a, 0x8b, 0x63, 0xc9, 0x95, + 0x72, 0xa7, 0xef, 0x45, 0x9c, 0x49, 0xb9, 0x9e, 0x32, 0x75, 0xe8, 0x4e, 0xdf, 0x8b, 0x38, 0xe3, + 0x37, 0x6c, 0x4f, 0xde, 0x8b, 0xe4, 0x15, 0xa8, 0x8d, 0xd8, 0x54, 0x24, 0x73, 0x77, 0xe8, 0x4e, + 0x0a, 0xfe, 0x5c, 0x85, 0xba, 0x4f, 0x88, 0xd7, 0xa0, 0xc9, 0x92, 0x24, 0x3b, 0x0e, 0xf3, 0x67, + 0xdc, 0xe8, 0x6c, 0xd0, 0x86, 0x01, 0xfa, 0xcf, 0x38, 0xf9, 0x02, 0xac, 0xdb, 0x49, 0x8c, 0x8f, + 0x51, 0x92, 0x1d, 0x1b, 0xdd, 0x0d, 0xba, 0x66, 0xd0, 0xa7, 0x0e, 0x24, 0xef, 0x42, 0x55, 0xe0, + 0xe7, 0x36, 0x63, 0xef, 0x2e, 0x93, 0xb1, 0x9d, 0x5e, 0xff, 0x7b, 0xf7, 0xa8, 0xa1, 0x23, 0x3f, + 0x87, 0x1b, 0x85, 0x4b, 0x71, 0x4e, 0x69, 0xc9, 0xf2, 0x9c, 0x4b, 0xb3, 0x9b, 0xd6, 0x4e, 0x6f, + 0x29, 0x3d, 0xbb, 0x0b, 0x84, 0xf4, 0xba, 0xd7, 0xb3, 0x88, 0xe2, 0xb6, 0x32, 0x25, 0xb8, 0x4b, + 0xdf, 0xe5, 0xb6, 0x75, 0xa0, 0x04, 0xa7, 0x86, 0x2e, 0x78, 0x1b, 0xaa, 0xb8, 0x49, 0xcc, 0xb2, + 0x99, 0x4c, 0x7c, 0x96, 0xcd, 0x64, 0x82, 0x49, 0x14, 0x65, 0xa9, 0xe6, 0xa9, 0x56, 0xce, 0xc9, + 0x85, 0x1c, 0xac, 0xc3, 0xea, 0xa2, 0x71, 0xc1, 0x77, 0xa1, 0x8a, 0x9c, 0xe4, 0x55, 0x68, 0x0c, + 0x31, 0xb7, 0x4e, 0xa8, 0xea, 0x28, 0xbf, 0x2b, 0x13, 0x74, 0xff, 0x21, 0x97, 0x29, 0x4f, 0x1c, + 0x99, 0x93, 0x10, 0x17, 0xa9, 0xd0, 0xd2, 0x57, 0x7f, 0x27, 0x05, 0x1f, 0xdb, 0xb0, 0x30, 0xe5, + 0xeb, 0x85, 0x82, 0x5f, 0xba, 0xfc, 0x82, 0x5f, 0xbe, 0x8c, 0x82, 0x3f, 0x02, 0x10, 0xa9, 0xe6, + 0x12, 0xd3, 0x56, 0xb5, 0x2b, 0xa6, 0xd4, 0xdf, 0x5f, 0xa6, 0x5e, 0x76, 0x7a, 0x9e, 0x8e, 0x2e, + 0x30, 0x93, 0xf7, 0x17, 0x36, 0x14, 0xf3, 0x11, 0x9b, 0x25, 0xda, 0xc5, 0xe9, 0x45, 0x69, 0x2b, + 0xb6, 0xd6, 0xb5, 0xf4, 0xc1, 0x5f, 0x4b, 0xd0, 0x2c, 0xa6, 0xc9, 0x3e, 0x54, 0x2f, 0xc6, 0x51, + 0x86, 0xc6, 0x5d, 0x32, 0x17, 0xe6, 0x17, 0x4f, 0x16, 0xfc, 0xa7, 0x0d, 0x0d, 0x7f, 0xa7, 0x91, + 0xeb, 0xb0, 0xa2, 0x34, 0xd3, 0xdc, 0x45, 0xae, 0x15, 0xb0, 0xda, 0x0f, 0xb3, 0x34, 0x16, 0xe9, + 0x38, 0x9c, 0x66, 0x31, 0x37, 0xfa, 0x2b, 0xb4, 0xe5, 0xb0, 0xfd, 0x2c, 0xe6, 0x24, 0x85, 0xd5, + 0x29, 0x4b, 0x67, 0x23, 0x16, 0xe9, 0x99, 0xe4, 0xd2, 0x55, 0x9e, 0x6f, 0x2f, 0x75, 0xc3, 0x76, + 0xf6, 0x17, 0x18, 0xe9, 0x29, 0x7e, 0x32, 0x84, 0x86, 0x48, 0x95, 0x66, 0x69, 0xc4, 0x97, 0xf2, + 0x6a, 0xa1, 0xab, 0xe7, 0xd8, 0x68, 0xc1, 0x4b, 0x7e, 0x08, 0xb5, 0x68, 0xa6, 0x74, 0x36, 0x75, + 0x05, 0xa7, 0xbb, 0x9c, 0x86, 0x3d, 0xc3, 0x45, 0x1d, 0x27, 0xee, 0x60, 0xc4, 0x22, 0x91, 0x08, + 0x3d, 0x77, 0x5d, 0xc3, 0x92, 0x3b, 0xb8, 0xef, 0xd8, 0x68, 0xc1, 0x1b, 0xec, 0xc0, 0xea, 0xe2, + 0x19, 0xbe, 0xd0, 0x45, 0x12, 0xa8, 0xaa, 0x64, 0x36, 0x76, 0xe5, 0xc8, 0x8c, 0x83, 0xbf, 0x11, + 0x68, 0xf8, 0xc3, 0x78, 0xe1, 0x83, 0x22, 0x3e, 0xca, 0x8b, 0xf1, 0xf1, 0x49, 0xbd, 0xc6, 0xa9, + 0xeb, 0xac, 0xfa, 0xdc, 0x75, 0xf6, 0x0a, 0xd4, 0x24, 0x57, 0xd1, 0xcc, 0x96, 0xf4, 0x06, 0x75, + 0x12, 0x19, 0x41, 0xf9, 0x60, 0xe0, 0x4e, 0xe5, 0xc9, 0xc5, 0xf8, 0xb5, 0x73, 0x90, 0x73, 0xc9, + 0xb4, 0x48, 0xc7, 0x83, 0xb9, 0xd2, 0x7c, 0x4a, 0xcb, 0x07, 0x03, 0x6c, 0x28, 0x58, 0x72, 0xcc, + 0xe6, 0xca, 0x58, 0x57, 0x37, 0x36, 0x34, 0x2d, 0x82, 0xe6, 0x7d, 0x11, 0x36, 0xf0, 0xde, 0x0b, + 0x55, 0x24, 0x45, 0xae, 0x4d, 0x45, 0xb7, 0x2d, 0xca, 0x1a, 0xc2, 0x03, 0x83, 0x62, 0x5d, 0xff, + 0x01, 0x54, 0x44, 0xae, 0xda, 0x4d, 0x53, 0xcb, 0x7a, 0x17, 0x64, 0x6f, 0xaf, 0x4f, 0x91, 0x15, + 0x0f, 0x77, 0xa6, 0xb8, 0x34, 0x7d, 0xab, 0x6d, 0x79, 0x0a, 0x99, 0xec, 0xc0, 0x8d, 0x48, 0xce, + 0x73, 0xcd, 0xe3, 0x50, 0x66, 0x99, 0x0e, 0x73, 0xa6, 0xd4, 0x71, 0x26, 0x63, 0xd3, 0x04, 0x35, + 0xe9, 0x35, 0x37, 0x49, 0xb3, 0x4c, 0xf7, 0xdd, 0x14, 0xfa, 0x5c, 0xb3, 0xb1, 0x6a, 0xaf, 0x9a, + 0x96, 0xcd, 0x8c, 0xc9, 0x04, 0xea, 0x4a, 0x67, 0x92, 0x8d, 0x79, 0x7b, 0xcd, 0x1c, 0xfa, 0xa3, + 0x0b, 0xda, 0xc4, 0xc0, 0xb2, 0x52, 0x4f, 0x8f, 0xb7, 0xa3, 0x52, 0x93, 0xf0, 0x90, 0xcf, 0x55, + 0x7b, 0xdd, 0x58, 0x50, 0x57, 0x6a, 0xf2, 0x1d, 0x3e, 0x57, 0xe4, 0x0d, 0x58, 0x73, 0x8d, 0x6f, + 0x28, 0x39, 0x8b, 0xe7, 0xed, 0x0d, 0xe3, 0x8f, 0x55, 0x07, 0x52, 0xc4, 0x82, 0xdf, 0x95, 0x60, + 0xe3, 0x39, 0x4f, 0x16, 0x51, 0x5c, 0x3a, 0x89, 0x62, 0x8c, 0xac, 0x58, 0x28, 0x2d, 0x33, 0x7f, + 0xd5, 0x5a, 0x09, 0x7b, 0x33, 0xec, 0x4e, 0x45, 0x96, 0xfa, 0xde, 0xcc, 0x89, 0x18, 0xa8, 0x62, + 0xca, 0xc6, 0x3c, 0xd4, 0x6c, 0x6c, 0x02, 0xb5, 0x49, 0x1b, 0x06, 0x78, 0xcc, 0xc6, 0xe4, 0x26, + 0xd4, 0x33, 0x15, 0x1a, 0x2d, 0x2b, 0x96, 0x2f, 0x53, 0x03, 0xcc, 0x96, 0xbf, 0x94, 0x5e, 0x5e, + 0x9b, 0x88, 0x78, 0x3e, 0x1b, 0x26, 0x22, 0xf2, 0xe9, 0x62, 0x25, 0xf2, 0x39, 0x80, 0x29, 0x4b, + 0xd9, 0x98, 0x4f, 0x79, 0xaa, 0x4d, 0xda, 0x34, 0xe8, 0x02, 0x12, 0x7c, 0x0c, 0x50, 0x77, 0x9e, + 0xc0, 0x0e, 0xf2, 0xe4, 0x5a, 0x14, 0xea, 0x10, 0x0d, 0x46, 0x37, 0x14, 0xdd, 0x45, 0x17, 0x41, + 0x74, 0x46, 0xb1, 0x4c, 0x32, 0x11, 0xb7, 0xcb, 0x66, 0x55, 0xd1, 0x33, 0x50, 0x26, 0x62, 0x72, + 0x07, 0x8a, 0x3e, 0x2d, 0x1c, 0x89, 0x84, 0x2b, 0xe3, 0x0f, 0x7b, 0xa9, 0x37, 0xe9, 0x35, 0x3f, + 0x77, 0xff, 0x64, 0x8a, 0x08, 0x58, 0xb1, 0x5a, 0xed, 0x3f, 0xde, 0xe0, 0x62, 0xe3, 0xac, 0x83, + 0xc6, 0x53, 0xab, 0x81, 0x8c, 0xa1, 0x6a, 0x2c, 0x5f, 0xb9, 0x14, 0x4d, 0xf4, 0x6e, 0xaf, 0x4b, + 0x8d, 0x02, 0xf2, 0x01, 0xb4, 0x16, 0x77, 0x5f, 0x33, 0xfa, 0xde, 0xbb, 0x60, 0x7d, 0x27, 0x87, + 0x48, 0x17, 0xb5, 0x05, 0x7f, 0x2f, 0x43, 0x15, 0x77, 0x6d, 0x22, 0x9e, 0x1f, 0x89, 0xc8, 0xdf, + 0xdd, 0x4e, 0xc2, 0x1a, 0x77, 0x2c, 0x72, 0x0c, 0xeb, 0x61, 0xc2, 0xdd, 0xef, 0x42, 0x13, 0x91, + 0xc7, 0x08, 0x90, 0x0f, 0x01, 0x72, 0x26, 0xb5, 0x30, 0x6f, 0x23, 0xae, 0x1d, 0xfb, 0xd1, 0x25, + 0x78, 0xa5, 0xd3, 0xf7, 0x5a, 0xe8, 0x82, 0xc2, 0xe0, 0x97, 0x25, 0x68, 0x16, 0x33, 0x78, 0xbd, + 0x24, 0x6c, 0xc8, 0x7d, 0xe3, 0x6c, 0x05, 0xdc, 0x59, 0x3a, 0x9b, 0x0e, 0xb9, 0x74, 0x8d, 0x87, + 0x93, 0x4c, 0xde, 0x8b, 0x9f, 0xd9, 0x2b, 0xa7, 0x42, 0xcd, 0xd8, 0x5d, 0x50, 0x52, 0xbb, 0xcc, + 0xb1, 0x02, 0xe6, 0xb6, 0x9e, 0xe7, 0x3c, 0x1c, 0xcf, 0x4c, 0x3c, 0x98, 0xdc, 0x46, 0xe0, 0xc1, + 0x4c, 0xc4, 0x41, 0x0a, 0x55, 0x3c, 0x5c, 0xa4, 0xcb, 0x99, 0x9e, 0xf8, 0x32, 0x82, 0xe3, 0x4f, + 0xfa, 0x01, 0xc0, 0xf5, 0xa6, 0x1b, 0x72, 0xea, 0x71, 0x6c, 0x7e, 0x21, 0x44, 0xec, 0x94, 0xe3, + 0x10, 0x91, 0xb1, 0x53, 0x5a, 0xa1, 0x38, 0x0c, 0xfe, 0x5d, 0x06, 0x38, 0xf1, 0xe6, 0xff, 0xf5, + 0x1b, 0x16, 0x81, 0x4c, 0x4e, 0x99, 0xf6, 0x15, 0xcc, 0x4a, 0x98, 0x41, 0xc6, 0xff, 0xce, 0x57, + 0x83, 0x4b, 0x88, 0x33, 0x6a, 0x35, 0x90, 0x5f, 0x97, 0xa0, 0x16, 0x49, 0x8e, 0xf7, 0xbd, 0xed, + 0xb1, 0x0e, 0x2f, 0x2d, 0xa8, 0x17, 0x86, 0x07, 0xb9, 0x09, 0x0d, 0xea, 0x54, 0x07, 0x7b, 0x70, + 0xf5, 0x85, 0x49, 0xf4, 0xf3, 0x28, 0x93, 0x91, 0xff, 0x43, 0xb6, 0x02, 0x96, 0xd4, 0xcc, 0x2e, + 0x70, 0xf5, 0xca, 0x8b, 0xc1, 0x4f, 0xa0, 0x8a, 0x19, 0x8b, 0x4e, 0x33, 0x6d, 0x8a, 0x73, 0xb2, + 0x69, 0x51, 0x30, 0xea, 0xf8, 0x51, 0xf1, 0x57, 0x66, 0x05, 0xe4, 0xb2, 0x9e, 0xf0, 0xf5, 0xcc, + 0x8b, 0x26, 0xc6, 0x72, 0x26, 0x79, 0x11, 0x63, 0x28, 0x60, 0xf3, 0x5f, 0xb3, 0x2d, 0x1e, 0xf9, + 0x05, 0x6c, 0xe4, 0x92, 0x9b, 0x3e, 0x32, 0x49, 0x78, 0x1c, 0x66, 0xca, 0xfd, 0x04, 0x5c, 0x56, + 0x2f, 0xb3, 0xbe, 0xa8, 0xee, 0x40, 0x91, 0x2f, 0xa1, 0x01, 0xe2, 0x88, 0x69, 0x1e, 0xaa, 0xd9, + 0x30, 0xe5, 0xda, 0x9f, 0xc7, 0xba, 0x83, 0x07, 0x16, 0x0d, 0x9e, 0x41, 0xc3, 0xb7, 0x8d, 0x98, + 0x24, 0x79, 0xc2, 0xd2, 0x70, 0xe1, 0x2e, 0x6d, 0x20, 0x80, 0xf7, 0x1c, 0xb9, 0x0d, 0x57, 0xcd, + 0xa4, 0xbb, 0x2d, 0xc3, 0x85, 0xb6, 0x71, 0x03, 0x27, 0x9e, 0x58, 0xdc, 0xac, 0x7d, 0x03, 0xd6, + 0x7c, 0x07, 0x1a, 0x46, 0x3e, 0x43, 0x9a, 0x74, 0xd5, 0x83, 0x7b, 0x59, 0xcc, 0xb7, 0x5e, 0x87, + 0xb5, 0x2e, 0x4f, 0xb8, 0xe6, 0xfe, 0x81, 0x74, 0x1d, 0xca, 0xbd, 0xae, 0x6f, 0x35, 0x7b, 0xdd, + 0x9d, 0x8f, 0xea, 0xb0, 0xe1, 0x8f, 0x60, 0xc0, 0xa5, 0xc9, 0x89, 0xdf, 0x96, 0xa0, 0xda, 0x9f, + 0xa9, 0x09, 0xf9, 0xea, 0x59, 0x0e, 0x72, 0xe1, 0x9d, 0x37, 0xb8, 0x73, 0x96, 0x0f, 0xed, 0x3b, + 0xee, 0xcd, 0x5f, 0x7d, 0xf4, 0xcf, 0x3f, 0x95, 0xaf, 0x6e, 0xad, 0x6e, 0x1f, 0xdd, 0x29, 0xde, + 0xa3, 0xbf, 0x5e, 0xba, 0x4d, 0xfe, 0x58, 0x82, 0x95, 0xdd, 0xf9, 0xfe, 0xdd, 0x3d, 0xf2, 0x95, + 0xb3, 0xb0, 0x9e, 0x3c, 0x0a, 0x07, 0xe7, 0x7a, 0x67, 0xde, 0x7a, 0xcd, 0x18, 0x74, 0x63, 0xeb, + 0xca, 0xa2, 0x41, 0xdb, 0x53, 0x16, 0xa1, 0x51, 0x7f, 0x28, 0x41, 0x75, 0x77, 0xde, 0xeb, 0xbf, + 0x64, 0x9b, 0x02, 0x63, 0xd3, 0xf5, 0xad, 0x8d, 0x53, 0x36, 0x89, 0x1c, 0x4d, 0xfa, 0xbd, 0x35, + 0xa9, 0xfb, 0x92, 0x4d, 0x7a, 0xd5, 0x98, 0x74, 0x8d, 0x5c, 0x3d, 0x65, 0xd2, 0x07, 0x22, 0xfe, + 0x90, 0xfc, 0xa6, 0x04, 0x95, 0xbb, 0x49, 0x42, 0xce, 0x1e, 0x0d, 0xe7, 0xb4, 0xe5, 0xba, 0xb1, + 0x65, 0x9d, 0x9c, 0x8a, 0xa1, 0xb7, 0x4a, 0xe4, 0x18, 0x56, 0x9e, 0x32, 0x1d, 0x4d, 0x5e, 0xee, + 0xd1, 0xbc, 0x55, 0x22, 0x47, 0x50, 0xb3, 0xe9, 0x47, 0xce, 0xf4, 0x30, 0x71, 0x2a, 0x65, 0xcf, + 0x91, 0x4c, 0xbb, 0xf0, 0xfd, 0x86, 0x47, 0x86, 0x35, 0xb3, 0xe4, 0xcb, 0xff, 0x0d, 0x00, 0x00, + 0xff, 0xff, 0x0a, 0x5f, 0x16, 0xce, 0xee, 0x19, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 6eb5f0082..554ef0992 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -123,9 +123,53 @@ message Hardware { bool management = 6; } message Storage { - repeated string disks = 1; - repeated string raid = 2; - repeated string filesystems = 3; + message Disk { + message Partition { + string label = 1; + int64 number = 2; + int64 size = 3; + int64 start = 4; + string type_guid = 5; + } + + string device = 1; + bool wipe_table = 2; + repeated Partition partitions = 3; + } + + message File { + string path = 1; + string contents = 2; + int64 mode = 3; + int64 uid = 4; + int64 gid = 5; + } + + message Filesystem { + message FilesystemOptions { + bool force = 1; + repeated string options = 2; + } + + string device = 1; + string format = 2; + repeated File files = 3; + FilesystemOptions create = 4; + } + + message RAID { + string name = 1; + string level = 2; + repeated string devices = 3; + int64 spare = 4; + } + + repeated string OBSOLETE_disks = 1; // obsolete + repeated string OBSOLETE_raid = 2; // obsolete + repeated string OBSOLETE_filesystems = 3; // obsolete + repeated Disk disks = 4; + repeated RAID raid = 5; + repeated Filesystem filesystems = 6; } string id = 1; From a6028559aeed52ca9a589a7f10d3f115f4f5c406 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 29 May 2020 14:17:42 -0400 Subject: [PATCH 18/31] updated storage filesystem struct --- protos/hardware/hardware.pb.go | 406 +++++++++++++++++++-------------- protos/hardware/hardware.proto | 7 +- 2 files changed, 235 insertions(+), 178 deletions(-) diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 551002cbd..fe49e9eed 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -1440,74 +1440,80 @@ func (m *Hardware_Metadata_Instance_Storage_File) GetGid() int64 { return 0 } -type Hardware_Metadata_Instance_Storage_Filesystem struct { - Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"` - Format string `protobuf:"bytes,2,opt,name=format,proto3" json:"format,omitempty"` - Files []*Hardware_Metadata_Instance_Storage_File `protobuf:"bytes,3,rep,name=files,proto3" json:"files,omitempty"` - Create *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions `protobuf:"bytes,4,opt,name=create,proto3" json:"create,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Hardware_Metadata_Instance_Storage_Filesystem) Reset() { - *m = Hardware_Metadata_Instance_Storage_Filesystem{} -} -func (m *Hardware_Metadata_Instance_Storage_Filesystem) String() string { - return proto.CompactTextString(m) -} -func (*Hardware_Metadata_Instance_Storage_Filesystem) ProtoMessage() {} -func (*Hardware_Metadata_Instance_Storage_Filesystem) Descriptor() ([]byte, []int) { +type Hardware_Metadata_Instance_Storage_Mount struct { + Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"` + Format string `protobuf:"bytes,2,opt,name=format,proto3" json:"format,omitempty"` + Files []*Hardware_Metadata_Instance_Storage_File `protobuf:"bytes,3,rep,name=files,proto3" json:"files,omitempty"` + Create *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions `protobuf:"bytes,4,opt,name=create,proto3" json:"create,omitempty"` + Point string `protobuf:"bytes,5,opt,name=point,proto3" json:"point,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_Mount) Reset() { + *m = Hardware_Metadata_Instance_Storage_Mount{} +} +func (m *Hardware_Metadata_Instance_Storage_Mount) String() string { return proto.CompactTextString(m) } +func (*Hardware_Metadata_Instance_Storage_Mount) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_Mount) Descriptor() ([]byte, []int) { return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 2} } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Unmarshal(m, b) +func (m *Hardware_Metadata_Instance_Storage_Mount) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount.Unmarshal(m, b) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Marshal(b, m, deterministic) +func (m *Hardware_Metadata_Instance_Storage_Mount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount.Marshal(b, m, deterministic) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Merge(src proto.Message) { - xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Merge(m, src) +func (m *Hardware_Metadata_Instance_Storage_Mount) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount.Merge(m, src) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Size() int { - return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Size(m) +func (m *Hardware_Metadata_Instance_Storage_Mount) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount.Size(m) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_DiscardUnknown() { - xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.DiscardUnknown(m) +func (m *Hardware_Metadata_Instance_Storage_Mount) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount.DiscardUnknown(m) } -var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem proto.InternalMessageInfo +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount proto.InternalMessageInfo -func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetDevice() string { +func (m *Hardware_Metadata_Instance_Storage_Mount) GetDevice() string { if m != nil { return m.Device } return "" } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetFormat() string { +func (m *Hardware_Metadata_Instance_Storage_Mount) GetFormat() string { if m != nil { return m.Format } return "" } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetFiles() []*Hardware_Metadata_Instance_Storage_File { +func (m *Hardware_Metadata_Instance_Storage_Mount) GetFiles() []*Hardware_Metadata_Instance_Storage_File { if m != nil { return m.Files } return nil } -func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetCreate() *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions { +func (m *Hardware_Metadata_Instance_Storage_Mount) GetCreate() *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions { if m != nil { return m.Create } return nil } -type Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions struct { +func (m *Hardware_Metadata_Instance_Storage_Mount) GetPoint() string { + if m != nil { + return m.Point + } + return "" +} + +type Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions struct { Force bool `protobuf:"varint,1,opt,name=force,proto3" json:"force,omitempty"` Options []string `protobuf:"bytes,2,rep,name=options,proto3" json:"options,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1515,49 +1521,92 @@ type Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions struct { XXX_sizecache int32 `json:"-"` } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) Reset() { - *m = Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions{} +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) Reset() { + *m = Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions{} } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) String() string { +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) String() string { return proto.CompactTextString(m) } -func (*Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) ProtoMessage() {} -func (*Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) Descriptor() ([]byte, []int) { +func (*Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) Descriptor() ([]byte, []int) { return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 2, 0} } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Unmarshal(m, b) +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions.Unmarshal(m, b) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Marshal(b, m, deterministic) +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions.Marshal(b, m, deterministic) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Merge(m, src) +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions.Merge(m, src) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_Size() int { - return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.Size(m) +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions.Size(m) } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) XXX_DiscardUnknown() { - xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions.DiscardUnknown(m) +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions.DiscardUnknown(m) } -var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions proto.InternalMessageInfo +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions proto.InternalMessageInfo -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) GetForce() bool { +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) GetForce() bool { if m != nil { return m.Force } return false } -func (m *Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions) GetOptions() []string { +func (m *Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions) GetOptions() []string { if m != nil { return m.Options } return nil } +type Hardware_Metadata_Instance_Storage_Filesystem struct { + Mount *Hardware_Metadata_Instance_Storage_Mount `protobuf:"bytes,1,opt,name=mount,proto3" json:"mount,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) Reset() { + *m = Hardware_Metadata_Instance_Storage_Filesystem{} +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) String() string { + return proto.CompactTextString(m) +} +func (*Hardware_Metadata_Instance_Storage_Filesystem) ProtoMessage() {} +func (*Hardware_Metadata_Instance_Storage_Filesystem) Descriptor() ([]byte, []int) { + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 3} +} + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Unmarshal(m, b) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Marshal(b, m, deterministic) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Merge(src proto.Message) { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Merge(m, src) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_Size() int { + return xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.Size(m) +} +func (m *Hardware_Metadata_Instance_Storage_Filesystem) XXX_DiscardUnknown() { + xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem.DiscardUnknown(m) +} + +var xxx_messageInfo_Hardware_Metadata_Instance_Storage_Filesystem proto.InternalMessageInfo + +func (m *Hardware_Metadata_Instance_Storage_Filesystem) GetMount() *Hardware_Metadata_Instance_Storage_Mount { + if m != nil { + return m.Mount + } + return nil +} + type Hardware_Metadata_Instance_Storage_RAID struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Level string `protobuf:"bytes,2,opt,name=level,proto3" json:"level,omitempty"` @@ -1574,7 +1623,7 @@ func (m *Hardware_Metadata_Instance_Storage_RAID) Reset() { func (m *Hardware_Metadata_Instance_Storage_RAID) String() string { return proto.CompactTextString(m) } func (*Hardware_Metadata_Instance_Storage_RAID) ProtoMessage() {} func (*Hardware_Metadata_Instance_Storage_RAID) Descriptor() ([]byte, []int) { - return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 3} + return fileDescriptor_61ac56d7fc2e671f, []int{3, 3, 1, 2, 4} } func (m *Hardware_Metadata_Instance_Storage_RAID) XXX_Unmarshal(b []byte) error { @@ -1786,8 +1835,9 @@ func init() { proto.RegisterType((*Hardware_Metadata_Instance_Storage_Disk)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Disk") proto.RegisterType((*Hardware_Metadata_Instance_Storage_Disk_Partition)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Disk.Partition") proto.RegisterType((*Hardware_Metadata_Instance_Storage_File)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.File") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_Mount)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Mount") + proto.RegisterType((*Hardware_Metadata_Instance_Storage_Mount_FilesystemOptions)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Mount.FilesystemOptions") proto.RegisterType((*Hardware_Metadata_Instance_Storage_Filesystem)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Filesystem") - proto.RegisterType((*Hardware_Metadata_Instance_Storage_Filesystem_FilesystemOptions)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.Filesystem.FilesystemOptions") proto.RegisterType((*Hardware_Metadata_Instance_Storage_RAID)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Instance.Storage.RAID") proto.RegisterType((*Hardware_Metadata_Custom)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Custom") proto.RegisterType((*Hardware_Metadata_Facility)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.hardware.Hardware.Metadata.Facility") @@ -1799,129 +1849,131 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1946 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1c, 0x49, - 0x15, 0xd6, 0x5c, 0x3c, 0x97, 0x33, 0xbe, 0x24, 0x95, 0x64, 0x33, 0xdb, 0x0b, 0xac, 0xf1, 0x0a, - 0xc8, 0xe6, 0x61, 0xbc, 0x31, 0x2b, 0x10, 0x08, 0x90, 0x62, 0x4f, 0x2e, 0x03, 0xeb, 0x78, 0xa8, - 0xc9, 0x26, 0x2c, 0xb7, 0xa6, 0xa6, 0xbb, 0x66, 0xa6, 0x70, 0x4f, 0x77, 0x6f, 0x55, 0x8d, 0x9d, - 0x61, 0xb5, 0x80, 0x40, 0xe2, 0x05, 0x21, 0x10, 0xf0, 0x0b, 0xf8, 0x09, 0x48, 0x3c, 0xf3, 0x23, - 0xf6, 0x91, 0xb7, 0x15, 0xe2, 0x07, 0x20, 0x7e, 0x00, 0x3a, 0x75, 0x69, 0x8f, 0x13, 0x58, 0xad, - 0x3d, 0x76, 0xde, 0xea, 0x7c, 0x55, 0xfd, 0x9d, 0x53, 0x75, 0x2e, 0x75, 0xba, 0xe0, 0xe6, 0x84, - 0xc9, 0xf8, 0x98, 0x49, 0xbe, 0xed, 0x07, 0x9d, 0x5c, 0x66, 0x3a, 0x23, 0xb7, 0xc7, 0x42, 0x4f, - 0x66, 0xc3, 0x4e, 0x94, 0x4d, 0x3b, 0x5a, 0xa4, 0x87, 0x5c, 0x0e, 0x79, 0x92, 0x98, 0xa1, 0x5d, - 0xa1, 0x3a, 0xfe, 0x8b, 0xe0, 0x33, 0xe3, 0x2c, 0x1b, 0x27, 0x7c, 0x9b, 0xe5, 0x62, 0x9b, 0xa5, - 0x69, 0xa6, 0x99, 0x16, 0x59, 0xaa, 0xec, 0xba, 0xad, 0xa7, 0xd0, 0xea, 0xcf, 0xd4, 0x84, 0xf2, - 0xf7, 0x67, 0x5c, 0x69, 0xf2, 0x10, 0xaa, 0x31, 0xd3, 0xac, 0x5d, 0xda, 0x2c, 0xdd, 0x6a, 0xed, - 0xbc, 0xdd, 0xf9, 0xf4, 0x7a, 0x3a, 0x0f, 0xdd, 0x80, 0x1a, 0x86, 0xad, 0x3a, 0xac, 0xdc, 0x9b, - 0xe6, 0x7a, 0xbe, 0xf5, 0x2d, 0x80, 0x07, 0x5c, 0x7b, 0x05, 0x57, 0xa0, 0x32, 0x65, 0x91, 0xe1, - 0x6f, 0x52, 0x1c, 0x92, 0x75, 0x28, 0x8b, 0xbc, 0x5d, 0x36, 0x40, 0x59, 0xe4, 0x46, 0x8e, 0xdb, - 0x15, 0x27, 0xc7, 0x5b, 0xff, 0x78, 0x13, 0x1a, 0x9e, 0xdb, 0x4d, 0x96, 0xfc, 0x24, 0xf9, 0x31, - 0xac, 0x1d, 0xec, 0x0e, 0x0e, 0xde, 0xb9, 0xf7, 0xf8, 0x5e, 0x18, 0x4f, 0x22, 0xcb, 0xd3, 0xda, - 0xf9, 0xda, 0x79, 0x0c, 0xef, 0x74, 0x1f, 0xee, 0xf5, 0xe9, 0xaa, 0xe7, 0xeb, 0x4e, 0xa2, 0x9c, - 0x8c, 0xe1, 0x4a, 0xc1, 0x9f, 0x72, 0x3d, 0xcc, 0x32, 0x6d, 0x4c, 0x6b, 0xed, 0x7c, 0xe3, 0x5c, - 0x2a, 0x1e, 0x59, 0x0e, 0xba, 0xe1, 0x59, 0x1d, 0xf0, 0xbc, 0xa2, 0xe3, 0x4c, 0x1e, 0xb6, 0xab, - 0x9b, 0x95, 0x65, 0x14, 0x21, 0xc7, 0x29, 0x45, 0x08, 0x90, 0xf7, 0xa0, 0x31, 0xe5, 0x9a, 0x19, - 0x2f, 0xaf, 0x98, 0x9d, 0x7c, 0xf3, 0x5c, 0x0a, 0xf6, 0x1d, 0x09, 0x2d, 0xe8, 0xc8, 0x13, 0xa8, - 0x7b, 0xd3, 0x6b, 0xcb, 0x9d, 0x91, 0x31, 0xdd, 0x93, 0x05, 0xff, 0xaa, 0x40, 0x15, 0x7d, 0xf3, - 0x3f, 0x82, 0xe7, 0x75, 0x68, 0x15, 0xc7, 0x56, 0x44, 0x11, 0x78, 0xa8, 0x97, 0x93, 0x00, 0x1a, - 0x93, 0x4c, 0xe9, 0x94, 0x4d, 0xb9, 0x8b, 0xa9, 0x42, 0x26, 0x9f, 0x05, 0x48, 0x38, 0x53, 0x3c, - 0xd4, 0x62, 0xca, 0xdb, 0xd5, 0xcd, 0xd2, 0xad, 0x0a, 0x6d, 0x1a, 0xe4, 0xb1, 0x98, 0x72, 0xf2, - 0x79, 0x58, 0xc5, 0x65, 0xa1, 0xe2, 0xf2, 0x88, 0x4b, 0xd5, 0x5e, 0xd9, 0xac, 0xdc, 0x6a, 0xd2, - 0x16, 0x62, 0x03, 0x0b, 0xe1, 0x12, 0xfc, 0xb6, 0x58, 0x52, 0xb3, 0x4b, 0x10, 0xf3, 0x4b, 0xde, - 0x5c, 0x70, 0xec, 0x98, 0x69, 0x7e, 0xcc, 0xe6, 0xed, 0xba, 0x31, 0xa4, 0x70, 0xcd, 0x03, 0x0b, - 0x13, 0x02, 0x55, 0x26, 0xa3, 0x49, 0xbb, 0x61, 0xa6, 0xcd, 0x18, 0xb1, 0x19, 0x1f, 0x89, 0x76, - 0x73, 0xb3, 0x74, 0xab, 0x41, 0xcd, 0x18, 0xed, 0x16, 0x23, 0x16, 0xf1, 0xd0, 0xec, 0x0a, 0xcc, - 0xea, 0xa6, 0x41, 0x1e, 0xe1, 0xb6, 0xde, 0x31, 0x09, 0xd5, 0x5a, 0xc2, 0x03, 0x78, 0xd8, 0x9d, - 0x5e, 0x1f, 0xd3, 0x31, 0xf8, 0x29, 0x94, 0x7b, 0x7d, 0xd2, 0x86, 0x3a, 0x8b, 0x63, 0xc9, 0x95, - 0x72, 0xa7, 0xef, 0x45, 0x9c, 0x49, 0xb9, 0x9e, 0x32, 0x75, 0xe8, 0x4e, 0xdf, 0x8b, 0x38, 0xe3, - 0x37, 0x6c, 0x4f, 0xde, 0x8b, 0xe4, 0x15, 0xa8, 0x8d, 0xd8, 0x54, 0x24, 0x73, 0x77, 0xe8, 0x4e, - 0x0a, 0xfe, 0x5c, 0x85, 0xba, 0x4f, 0x88, 0xd7, 0xa0, 0xc9, 0x92, 0x24, 0x3b, 0x0e, 0xf3, 0x67, - 0xdc, 0xe8, 0x6c, 0xd0, 0x86, 0x01, 0xfa, 0xcf, 0x38, 0xf9, 0x02, 0xac, 0xdb, 0x49, 0x8c, 0x8f, - 0x51, 0x92, 0x1d, 0x1b, 0xdd, 0x0d, 0xba, 0x66, 0xd0, 0xa7, 0x0e, 0x24, 0xef, 0x42, 0x55, 0xe0, - 0xe7, 0x36, 0x63, 0xef, 0x2e, 0x93, 0xb1, 0x9d, 0x5e, 0xff, 0x7b, 0xf7, 0xa8, 0xa1, 0x23, 0x3f, - 0x87, 0x1b, 0x85, 0x4b, 0x71, 0x4e, 0x69, 0xc9, 0xf2, 0x9c, 0x4b, 0xb3, 0x9b, 0xd6, 0x4e, 0x6f, - 0x29, 0x3d, 0xbb, 0x0b, 0x84, 0xf4, 0xba, 0xd7, 0xb3, 0x88, 0xe2, 0xb6, 0x32, 0x25, 0xb8, 0x4b, - 0xdf, 0xe5, 0xb6, 0x75, 0xa0, 0x04, 0xa7, 0x86, 0x2e, 0x78, 0x1b, 0xaa, 0xb8, 0x49, 0xcc, 0xb2, - 0x99, 0x4c, 0x7c, 0x96, 0xcd, 0x64, 0x82, 0x49, 0x14, 0x65, 0xa9, 0xe6, 0xa9, 0x56, 0xce, 0xc9, - 0x85, 0x1c, 0xac, 0xc3, 0xea, 0xa2, 0x71, 0xc1, 0x77, 0xa1, 0x8a, 0x9c, 0xe4, 0x55, 0x68, 0x0c, - 0x31, 0xb7, 0x4e, 0xa8, 0xea, 0x28, 0xbf, 0x2b, 0x13, 0x74, 0xff, 0x21, 0x97, 0x29, 0x4f, 0x1c, - 0x99, 0x93, 0x10, 0x17, 0xa9, 0xd0, 0xd2, 0x57, 0x7f, 0x27, 0x05, 0x1f, 0xdb, 0xb0, 0x30, 0xe5, - 0xeb, 0x85, 0x82, 0x5f, 0xba, 0xfc, 0x82, 0x5f, 0xbe, 0x8c, 0x82, 0x3f, 0x02, 0x10, 0xa9, 0xe6, - 0x12, 0xd3, 0x56, 0xb5, 0x2b, 0xa6, 0xd4, 0xdf, 0x5f, 0xa6, 0x5e, 0x76, 0x7a, 0x9e, 0x8e, 0x2e, - 0x30, 0x93, 0xf7, 0x17, 0x36, 0x14, 0xf3, 0x11, 0x9b, 0x25, 0xda, 0xc5, 0xe9, 0x45, 0x69, 0x2b, - 0xb6, 0xd6, 0xb5, 0xf4, 0xc1, 0x5f, 0x4b, 0xd0, 0x2c, 0xa6, 0xc9, 0x3e, 0x54, 0x2f, 0xc6, 0x51, - 0x86, 0xc6, 0x5d, 0x32, 0x17, 0xe6, 0x17, 0x4f, 0x16, 0xfc, 0xa7, 0x0d, 0x0d, 0x7f, 0xa7, 0x91, - 0xeb, 0xb0, 0xa2, 0x34, 0xd3, 0xdc, 0x45, 0xae, 0x15, 0xb0, 0xda, 0x0f, 0xb3, 0x34, 0x16, 0xe9, - 0x38, 0x9c, 0x66, 0x31, 0x37, 0xfa, 0x2b, 0xb4, 0xe5, 0xb0, 0xfd, 0x2c, 0xe6, 0x24, 0x85, 0xd5, - 0x29, 0x4b, 0x67, 0x23, 0x16, 0xe9, 0x99, 0xe4, 0xd2, 0x55, 0x9e, 0x6f, 0x2f, 0x75, 0xc3, 0x76, - 0xf6, 0x17, 0x18, 0xe9, 0x29, 0x7e, 0x32, 0x84, 0x86, 0x48, 0x95, 0x66, 0x69, 0xc4, 0x97, 0xf2, - 0x6a, 0xa1, 0xab, 0xe7, 0xd8, 0x68, 0xc1, 0x4b, 0x7e, 0x08, 0xb5, 0x68, 0xa6, 0x74, 0x36, 0x75, - 0x05, 0xa7, 0xbb, 0x9c, 0x86, 0x3d, 0xc3, 0x45, 0x1d, 0x27, 0xee, 0x60, 0xc4, 0x22, 0x91, 0x08, - 0x3d, 0x77, 0x5d, 0xc3, 0x92, 0x3b, 0xb8, 0xef, 0xd8, 0x68, 0xc1, 0x1b, 0xec, 0xc0, 0xea, 0xe2, - 0x19, 0xbe, 0xd0, 0x45, 0x12, 0xa8, 0xaa, 0x64, 0x36, 0x76, 0xe5, 0xc8, 0x8c, 0x83, 0xbf, 0x11, - 0x68, 0xf8, 0xc3, 0x78, 0xe1, 0x83, 0x22, 0x3e, 0xca, 0x8b, 0xf1, 0xf1, 0x49, 0xbd, 0xc6, 0xa9, - 0xeb, 0xac, 0xfa, 0xdc, 0x75, 0xf6, 0x0a, 0xd4, 0x24, 0x57, 0xd1, 0xcc, 0x96, 0xf4, 0x06, 0x75, - 0x12, 0x19, 0x41, 0xf9, 0x60, 0xe0, 0x4e, 0xe5, 0xc9, 0xc5, 0xf8, 0xb5, 0x73, 0x90, 0x73, 0xc9, - 0xb4, 0x48, 0xc7, 0x83, 0xb9, 0xd2, 0x7c, 0x4a, 0xcb, 0x07, 0x03, 0x6c, 0x28, 0x58, 0x72, 0xcc, - 0xe6, 0xca, 0x58, 0x57, 0x37, 0x36, 0x34, 0x2d, 0x82, 0xe6, 0x7d, 0x11, 0x36, 0xf0, 0xde, 0x0b, - 0x55, 0x24, 0x45, 0xae, 0x4d, 0x45, 0xb7, 0x2d, 0xca, 0x1a, 0xc2, 0x03, 0x83, 0x62, 0x5d, 0xff, - 0x01, 0x54, 0x44, 0xae, 0xda, 0x4d, 0x53, 0xcb, 0x7a, 0x17, 0x64, 0x6f, 0xaf, 0x4f, 0x91, 0x15, - 0x0f, 0x77, 0xa6, 0xb8, 0x34, 0x7d, 0xab, 0x6d, 0x79, 0x0a, 0x99, 0xec, 0xc0, 0x8d, 0x48, 0xce, - 0x73, 0xcd, 0xe3, 0x50, 0x66, 0x99, 0x0e, 0x73, 0xa6, 0xd4, 0x71, 0x26, 0x63, 0xd3, 0x04, 0x35, - 0xe9, 0x35, 0x37, 0x49, 0xb3, 0x4c, 0xf7, 0xdd, 0x14, 0xfa, 0x5c, 0xb3, 0xb1, 0x6a, 0xaf, 0x9a, - 0x96, 0xcd, 0x8c, 0xc9, 0x04, 0xea, 0x4a, 0x67, 0x92, 0x8d, 0x79, 0x7b, 0xcd, 0x1c, 0xfa, 0xa3, - 0x0b, 0xda, 0xc4, 0xc0, 0xb2, 0x52, 0x4f, 0x8f, 0xb7, 0xa3, 0x52, 0x93, 0xf0, 0x90, 0xcf, 0x55, - 0x7b, 0xdd, 0x58, 0x50, 0x57, 0x6a, 0xf2, 0x1d, 0x3e, 0x57, 0xe4, 0x0d, 0x58, 0x73, 0x8d, 0x6f, - 0x28, 0x39, 0x8b, 0xe7, 0xed, 0x0d, 0xe3, 0x8f, 0x55, 0x07, 0x52, 0xc4, 0x82, 0xdf, 0x95, 0x60, - 0xe3, 0x39, 0x4f, 0x16, 0x51, 0x5c, 0x3a, 0x89, 0x62, 0x8c, 0xac, 0x58, 0x28, 0x2d, 0x33, 0x7f, - 0xd5, 0x5a, 0x09, 0x7b, 0x33, 0xec, 0x4e, 0x45, 0x96, 0xfa, 0xde, 0xcc, 0x89, 0x18, 0xa8, 0x62, - 0xca, 0xc6, 0x3c, 0xd4, 0x6c, 0x6c, 0x02, 0xb5, 0x49, 0x1b, 0x06, 0x78, 0xcc, 0xc6, 0xe4, 0x26, - 0xd4, 0x33, 0x15, 0x1a, 0x2d, 0x2b, 0x96, 0x2f, 0x53, 0x03, 0xcc, 0x96, 0xbf, 0x94, 0x5e, 0x5e, - 0x9b, 0x88, 0x78, 0x3e, 0x1b, 0x26, 0x22, 0xf2, 0xe9, 0x62, 0x25, 0xf2, 0x39, 0x80, 0x29, 0x4b, - 0xd9, 0x98, 0x4f, 0x79, 0xaa, 0x4d, 0xda, 0x34, 0xe8, 0x02, 0x12, 0x7c, 0x0c, 0x50, 0x77, 0x9e, - 0xc0, 0x0e, 0xf2, 0xe4, 0x5a, 0x14, 0xea, 0x10, 0x0d, 0x46, 0x37, 0x14, 0xdd, 0x45, 0x17, 0x41, - 0x74, 0x46, 0xb1, 0x4c, 0x32, 0x11, 0xb7, 0xcb, 0x66, 0x55, 0xd1, 0x33, 0x50, 0x26, 0x62, 0x72, - 0x07, 0x8a, 0x3e, 0x2d, 0x1c, 0x89, 0x84, 0x2b, 0xe3, 0x0f, 0x7b, 0xa9, 0x37, 0xe9, 0x35, 0x3f, - 0x77, 0xff, 0x64, 0x8a, 0x08, 0x58, 0xb1, 0x5a, 0xed, 0x3f, 0xde, 0xe0, 0x62, 0xe3, 0xac, 0x83, - 0xc6, 0x53, 0xab, 0x81, 0x8c, 0xa1, 0x6a, 0x2c, 0x5f, 0xb9, 0x14, 0x4d, 0xf4, 0x6e, 0xaf, 0x4b, - 0x8d, 0x02, 0xf2, 0x01, 0xb4, 0x16, 0x77, 0x5f, 0x33, 0xfa, 0xde, 0xbb, 0x60, 0x7d, 0x27, 0x87, - 0x48, 0x17, 0xb5, 0x05, 0x7f, 0x2f, 0x43, 0x15, 0x77, 0x6d, 0x22, 0x9e, 0x1f, 0x89, 0xc8, 0xdf, - 0xdd, 0x4e, 0xc2, 0x1a, 0x77, 0x2c, 0x72, 0x0c, 0xeb, 0x61, 0xc2, 0xdd, 0xef, 0x42, 0x13, 0x91, - 0xc7, 0x08, 0x90, 0x0f, 0x01, 0x72, 0x26, 0xb5, 0x30, 0x6f, 0x23, 0xae, 0x1d, 0xfb, 0xd1, 0x25, - 0x78, 0xa5, 0xd3, 0xf7, 0x5a, 0xe8, 0x82, 0xc2, 0xe0, 0x97, 0x25, 0x68, 0x16, 0x33, 0x78, 0xbd, - 0x24, 0x6c, 0xc8, 0x7d, 0xe3, 0x6c, 0x05, 0xdc, 0x59, 0x3a, 0x9b, 0x0e, 0xb9, 0x74, 0x8d, 0x87, - 0x93, 0x4c, 0xde, 0x8b, 0x9f, 0xd9, 0x2b, 0xa7, 0x42, 0xcd, 0xd8, 0x5d, 0x50, 0x52, 0xbb, 0xcc, - 0xb1, 0x02, 0xe6, 0xb6, 0x9e, 0xe7, 0x3c, 0x1c, 0xcf, 0x4c, 0x3c, 0x98, 0xdc, 0x46, 0xe0, 0xc1, - 0x4c, 0xc4, 0x41, 0x0a, 0x55, 0x3c, 0x5c, 0xa4, 0xcb, 0x99, 0x9e, 0xf8, 0x32, 0x82, 0xe3, 0x4f, - 0xfa, 0x01, 0xc0, 0xf5, 0xa6, 0x1b, 0x72, 0xea, 0x71, 0x6c, 0x7e, 0x21, 0x44, 0xec, 0x94, 0xe3, - 0x10, 0x91, 0xb1, 0x53, 0x5a, 0xa1, 0x38, 0x0c, 0xfe, 0x5d, 0x06, 0x38, 0xf1, 0xe6, 0xff, 0xf5, - 0x1b, 0x16, 0x81, 0x4c, 0x4e, 0x99, 0xf6, 0x15, 0xcc, 0x4a, 0x98, 0x41, 0xc6, 0xff, 0xce, 0x57, - 0x83, 0x4b, 0x88, 0x33, 0x6a, 0x35, 0x90, 0x5f, 0x97, 0xa0, 0x16, 0x49, 0x8e, 0xf7, 0xbd, 0xed, - 0xb1, 0x0e, 0x2f, 0x2d, 0xa8, 0x17, 0x86, 0x07, 0xb9, 0x09, 0x0d, 0xea, 0x54, 0x07, 0x7b, 0x70, - 0xf5, 0x85, 0x49, 0xf4, 0xf3, 0x28, 0x93, 0x91, 0xff, 0x43, 0xb6, 0x02, 0x96, 0xd4, 0xcc, 0x2e, - 0x70, 0xf5, 0xca, 0x8b, 0xc1, 0x4f, 0xa0, 0x8a, 0x19, 0x8b, 0x4e, 0x33, 0x6d, 0x8a, 0x73, 0xb2, - 0x69, 0x51, 0x30, 0xea, 0xf8, 0x51, 0xf1, 0x57, 0x66, 0x05, 0xe4, 0xb2, 0x9e, 0xf0, 0xf5, 0xcc, - 0x8b, 0x26, 0xc6, 0x72, 0x26, 0x79, 0x11, 0x63, 0x28, 0x60, 0xf3, 0x5f, 0xb3, 0x2d, 0x1e, 0xf9, - 0x05, 0x6c, 0xe4, 0x92, 0x9b, 0x3e, 0x32, 0x49, 0x78, 0x1c, 0x66, 0xca, 0xfd, 0x04, 0x5c, 0x56, - 0x2f, 0xb3, 0xbe, 0xa8, 0xee, 0x40, 0x91, 0x2f, 0xa1, 0x01, 0xe2, 0x88, 0x69, 0x1e, 0xaa, 0xd9, - 0x30, 0xe5, 0xda, 0x9f, 0xc7, 0xba, 0x83, 0x07, 0x16, 0x0d, 0x9e, 0x41, 0xc3, 0xb7, 0x8d, 0x98, - 0x24, 0x79, 0xc2, 0xd2, 0x70, 0xe1, 0x2e, 0x6d, 0x20, 0x80, 0xf7, 0x1c, 0xb9, 0x0d, 0x57, 0xcd, - 0xa4, 0xbb, 0x2d, 0xc3, 0x85, 0xb6, 0x71, 0x03, 0x27, 0x9e, 0x58, 0xdc, 0xac, 0x7d, 0x03, 0xd6, - 0x7c, 0x07, 0x1a, 0x46, 0x3e, 0x43, 0x9a, 0x74, 0xd5, 0x83, 0x7b, 0x59, 0xcc, 0xb7, 0x5e, 0x87, - 0xb5, 0x2e, 0x4f, 0xb8, 0xe6, 0xfe, 0x81, 0x74, 0x1d, 0xca, 0xbd, 0xae, 0x6f, 0x35, 0x7b, 0xdd, - 0x9d, 0x8f, 0xea, 0xb0, 0xe1, 0x8f, 0x60, 0xc0, 0xa5, 0xc9, 0x89, 0xdf, 0x96, 0xa0, 0xda, 0x9f, - 0xa9, 0x09, 0xf9, 0xea, 0x59, 0x0e, 0x72, 0xe1, 0x9d, 0x37, 0xb8, 0x73, 0x96, 0x0f, 0xed, 0x3b, - 0xee, 0xcd, 0x5f, 0x7d, 0xf4, 0xcf, 0x3f, 0x95, 0xaf, 0x6e, 0xad, 0x6e, 0x1f, 0xdd, 0x29, 0xde, - 0xa3, 0xbf, 0x5e, 0xba, 0x4d, 0xfe, 0x58, 0x82, 0x95, 0xdd, 0xf9, 0xfe, 0xdd, 0x3d, 0xf2, 0x95, - 0xb3, 0xb0, 0x9e, 0x3c, 0x0a, 0x07, 0xe7, 0x7a, 0x67, 0xde, 0x7a, 0xcd, 0x18, 0x74, 0x63, 0xeb, - 0xca, 0xa2, 0x41, 0xdb, 0x53, 0x16, 0xa1, 0x51, 0x7f, 0x28, 0x41, 0x75, 0x77, 0xde, 0xeb, 0xbf, - 0x64, 0x9b, 0x02, 0x63, 0xd3, 0xf5, 0xad, 0x8d, 0x53, 0x36, 0x89, 0x1c, 0x4d, 0xfa, 0xbd, 0x35, - 0xa9, 0xfb, 0x92, 0x4d, 0x7a, 0xd5, 0x98, 0x74, 0x8d, 0x5c, 0x3d, 0x65, 0xd2, 0x07, 0x22, 0xfe, - 0x90, 0xfc, 0xa6, 0x04, 0x95, 0xbb, 0x49, 0x42, 0xce, 0x1e, 0x0d, 0xe7, 0xb4, 0xe5, 0xba, 0xb1, - 0x65, 0x9d, 0x9c, 0x8a, 0xa1, 0xb7, 0x4a, 0xe4, 0x18, 0x56, 0x9e, 0x32, 0x1d, 0x4d, 0x5e, 0xee, - 0xd1, 0xbc, 0x55, 0x22, 0x47, 0x50, 0xb3, 0xe9, 0x47, 0xce, 0xf4, 0x30, 0x71, 0x2a, 0x65, 0xcf, - 0x91, 0x4c, 0xbb, 0xf0, 0xfd, 0x86, 0x47, 0x86, 0x35, 0xb3, 0xe4, 0xcb, 0xff, 0x0d, 0x00, 0x00, - 0xff, 0xff, 0x0a, 0x5f, 0x16, 0xce, 0xee, 0x19, 0x00, 0x00, + // 1977 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x8f, 0x1b, 0x49, + 0xf5, 0x97, 0xef, 0xf6, 0xf1, 0x5c, 0x92, 0x4a, 0xb2, 0x71, 0x7a, 0xff, 0x7f, 0x36, 0xcc, 0x0a, + 0x08, 0x79, 0x70, 0x36, 0xc3, 0x0a, 0x04, 0x02, 0xa4, 0x64, 0x9c, 0x8b, 0x61, 0x27, 0x63, 0xca, + 0xb3, 0x09, 0xcb, 0xad, 0x29, 0x77, 0x97, 0xed, 0xda, 0xe9, 0xdb, 0x76, 0x55, 0xcf, 0xc4, 0xac, + 0x76, 0x41, 0x3c, 0xf0, 0x82, 0x10, 0x08, 0xf8, 0x04, 0x7c, 0x04, 0x1e, 0x79, 0xe1, 0x43, 0xec, + 0x17, 0x40, 0x08, 0xc1, 0x67, 0xe0, 0x01, 0x09, 0x9d, 0xba, 0xf4, 0x78, 0x12, 0x58, 0x31, 0xe3, + 0x99, 0xbc, 0xd5, 0x39, 0x55, 0xfd, 0x3b, 0xe7, 0xd4, 0xb9, 0x76, 0xc1, 0xf5, 0x39, 0xcb, 0xc3, + 0x23, 0x96, 0xf3, 0x3b, 0x6e, 0xd1, 0xcf, 0xf2, 0x54, 0xa5, 0xe4, 0xf6, 0x4c, 0xa8, 0x79, 0x31, + 0xe9, 0x07, 0x69, 0xdc, 0x57, 0x22, 0x39, 0xe0, 0xf9, 0x84, 0x47, 0x91, 0x5e, 0x9a, 0x13, 0xb2, + 0xef, 0xbe, 0xf0, 0xfe, 0x6f, 0x96, 0xa6, 0xb3, 0x88, 0xdf, 0x61, 0x99, 0xb8, 0xc3, 0x92, 0x24, + 0x55, 0x4c, 0x89, 0x34, 0x91, 0xe6, 0xdc, 0xd6, 0x33, 0xe8, 0x8e, 0x0a, 0x39, 0xa7, 0xfc, 0x83, + 0x82, 0x4b, 0x45, 0x1e, 0x43, 0x3d, 0x64, 0x8a, 0xf5, 0x2a, 0x37, 0x2b, 0xb7, 0xba, 0xdb, 0x6f, + 0xf7, 0xff, 0x77, 0x39, 0xfd, 0xc7, 0x76, 0x41, 0x35, 0xc2, 0x56, 0x0b, 0x1a, 0x0f, 0xe2, 0x4c, + 0x2d, 0xb6, 0xbe, 0x09, 0xf0, 0x88, 0x2b, 0x27, 0xe0, 0x12, 0xd4, 0x62, 0x16, 0x68, 0xfc, 0x0e, + 0xc5, 0x25, 0xd9, 0x80, 0xaa, 0xc8, 0x7a, 0x55, 0xcd, 0xa8, 0x8a, 0x4c, 0xd3, 0x61, 0xaf, 0x66, + 0xe9, 0x70, 0xeb, 0x2f, 0xb7, 0xa1, 0xed, 0xb0, 0xed, 0x66, 0xc5, 0x6d, 0x92, 0x1f, 0xc1, 0xfa, + 0xde, 0xfd, 0xf1, 0xde, 0x3b, 0x0f, 0xf6, 0x1f, 0xf8, 0xe1, 0x3c, 0x30, 0x38, 0xdd, 0xed, 0xaf, + 0x9e, 0x45, 0xf1, 0xfe, 0xe0, 0xf1, 0xce, 0x88, 0xae, 0x39, 0xbc, 0xc1, 0x3c, 0xc8, 0xc8, 0x0c, + 0x2e, 0x95, 0xf8, 0x09, 0x57, 0x93, 0x34, 0x55, 0x5a, 0xb5, 0xee, 0xf6, 0xd7, 0xcf, 0x24, 0xe2, + 0x89, 0xc1, 0xa0, 0x9b, 0x0e, 0xd5, 0x32, 0x5e, 0x14, 0x74, 0x94, 0xe6, 0x07, 0xbd, 0xfa, 0xcd, + 0xda, 0x2a, 0x82, 0x10, 0xe3, 0x84, 0x20, 0x64, 0x90, 0xf7, 0xa0, 0x1d, 0x73, 0xc5, 0xb4, 0x97, + 0x1b, 0xda, 0x92, 0x6f, 0x9c, 0x49, 0xc0, 0xae, 0x05, 0xa1, 0x25, 0x1c, 0x79, 0x0a, 0x2d, 0xa7, + 0x7a, 0x73, 0xb5, 0x3b, 0xd2, 0xaa, 0x3b, 0x30, 0xef, 0xef, 0x35, 0xa8, 0xa3, 0x6f, 0xfe, 0x43, + 0xf0, 0xbc, 0x01, 0xdd, 0xf2, 0xda, 0xca, 0x28, 0x02, 0xc7, 0x1a, 0x66, 0xc4, 0x83, 0xf6, 0x3c, + 0x95, 0x2a, 0x61, 0x31, 0xb7, 0x31, 0x55, 0xd2, 0xe4, 0xff, 0x01, 0x22, 0xce, 0x24, 0xf7, 0x95, + 0x88, 0x79, 0xaf, 0x7e, 0xb3, 0x72, 0xab, 0x46, 0x3b, 0x9a, 0xb3, 0x2f, 0x62, 0x4e, 0x3e, 0x0b, + 0x6b, 0x78, 0xcc, 0x97, 0x3c, 0x3f, 0xe4, 0xb9, 0xec, 0x35, 0x6e, 0xd6, 0x6e, 0x75, 0x68, 0x17, + 0x79, 0x63, 0xc3, 0xc2, 0x23, 0xf8, 0x6d, 0x79, 0xa4, 0x69, 0x8e, 0x20, 0xcf, 0x1d, 0xf9, 0xe2, + 0x92, 0x63, 0x67, 0x4c, 0xf1, 0x23, 0xb6, 0xe8, 0xb5, 0xb4, 0x22, 0xa5, 0x6b, 0x1e, 0x19, 0x36, + 0x21, 0x50, 0x67, 0x79, 0x30, 0xef, 0xb5, 0xf5, 0xb6, 0x5e, 0x23, 0xaf, 0xe0, 0x53, 0xd1, 0xeb, + 0xdc, 0xac, 0xdc, 0x6a, 0x53, 0xbd, 0x46, 0xbd, 0xc5, 0x94, 0x05, 0xdc, 0xd7, 0x56, 0x81, 0x3e, + 0xdd, 0xd1, 0x9c, 0x27, 0x68, 0xd6, 0x3b, 0x3a, 0xa1, 0xba, 0x2b, 0x78, 0x00, 0x2f, 0xbb, 0x3f, + 0x1c, 0x61, 0x3a, 0x7a, 0xef, 0x43, 0x75, 0x38, 0x22, 0x3d, 0x68, 0xb1, 0x30, 0xcc, 0xb9, 0x94, + 0xf6, 0xf6, 0x1d, 0x89, 0x3b, 0x09, 0x57, 0x31, 0x93, 0x07, 0xf6, 0xf6, 0x1d, 0x89, 0x3b, 0xce, + 0x60, 0x73, 0xf3, 0x8e, 0x24, 0xaf, 0x41, 0x73, 0xca, 0x62, 0x11, 0x2d, 0xec, 0xa5, 0x5b, 0xca, + 0xfb, 0x7d, 0x1d, 0x5a, 0x2e, 0x21, 0x5e, 0x87, 0x0e, 0x8b, 0xa2, 0xf4, 0xc8, 0xcf, 0x9e, 0x73, + 0x2d, 0xb3, 0x4d, 0xdb, 0x9a, 0x31, 0x7a, 0xce, 0xc9, 0xe7, 0x60, 0xc3, 0x6c, 0x62, 0x7c, 0x4c, + 0xa3, 0xf4, 0x48, 0xcb, 0x6e, 0xd3, 0x75, 0xcd, 0x7d, 0x66, 0x99, 0xe4, 0x5d, 0xa8, 0x0b, 0xfc, + 0xdc, 0x64, 0xec, 0xbd, 0x55, 0x32, 0xb6, 0x3f, 0x1c, 0x7d, 0xf7, 0x01, 0xd5, 0x70, 0xe4, 0x63, + 0xb8, 0x56, 0xba, 0x14, 0xf7, 0xa4, 0xca, 0x59, 0x96, 0xf1, 0x5c, 0x5b, 0xd3, 0xdd, 0x1e, 0xae, + 0x24, 0xe7, 0xfe, 0x12, 0x20, 0xbd, 0xea, 0xe4, 0x2c, 0x73, 0xd1, 0xac, 0x54, 0x0a, 0x6e, 0xd3, + 0x77, 0x35, 0xb3, 0xf6, 0xa4, 0xe0, 0x54, 0xc3, 0x79, 0x6f, 0x43, 0x1d, 0x8d, 0xc4, 0x2c, 0x2b, + 0xf2, 0xc8, 0x65, 0x59, 0x91, 0x47, 0x98, 0x44, 0x41, 0x9a, 0x28, 0x9e, 0x28, 0x69, 0x9d, 0x5c, + 0xd2, 0xde, 0x06, 0xac, 0x2d, 0x2b, 0xe7, 0x7d, 0x07, 0xea, 0x88, 0x49, 0x6e, 0x40, 0x7b, 0x82, + 0xb9, 0x75, 0x0c, 0xd5, 0x42, 0xfa, 0xdd, 0x3c, 0x42, 0xf7, 0x1f, 0xf0, 0x3c, 0xe1, 0x91, 0x05, + 0xb3, 0x14, 0xf2, 0x45, 0x22, 0x54, 0xee, 0xaa, 0xbf, 0xa5, 0xbc, 0xbf, 0x9a, 0xb0, 0xd0, 0xe5, + 0xeb, 0xa5, 0x82, 0x5f, 0xb9, 0xf8, 0x82, 0x5f, 0xbd, 0x88, 0x82, 0x3f, 0x05, 0x10, 0x89, 0xe2, + 0x39, 0xa6, 0xad, 0xec, 0xd5, 0x74, 0xa9, 0x7f, 0xb8, 0x4a, 0xbd, 0xec, 0x0f, 0x1d, 0x1c, 0x5d, + 0x42, 0x26, 0x1f, 0x2c, 0x19, 0x14, 0xf2, 0x29, 0x2b, 0x22, 0x65, 0xe3, 0xf4, 0xbc, 0xa4, 0x95, + 0xa6, 0x0d, 0x0c, 0xbc, 0xf7, 0xc7, 0x0a, 0x74, 0xca, 0x6d, 0xb2, 0x0b, 0xf5, 0xf3, 0x71, 0x94, + 0x86, 0xb1, 0x4d, 0xe6, 0xdc, 0xfc, 0xe2, 0xc0, 0xbc, 0x7f, 0xde, 0x80, 0xb6, 0xeb, 0x69, 0xe4, + 0x2a, 0x34, 0xa4, 0x62, 0x8a, 0xdb, 0xc8, 0x35, 0x04, 0x56, 0xfb, 0x49, 0x9a, 0x84, 0x22, 0x99, + 0xf9, 0x71, 0x1a, 0x72, 0x2d, 0xbf, 0x46, 0xbb, 0x96, 0xb7, 0x9b, 0x86, 0x9c, 0x24, 0xb0, 0x16, + 0xb3, 0xa4, 0x98, 0xb2, 0x40, 0x15, 0x39, 0xcf, 0x6d, 0xe5, 0xf9, 0xd6, 0x4a, 0x1d, 0xb6, 0xbf, + 0xbb, 0x84, 0x48, 0x4f, 0xe0, 0x93, 0x09, 0xb4, 0x45, 0x22, 0x15, 0x4b, 0x02, 0xbe, 0x92, 0x57, + 0x4b, 0x59, 0x43, 0x8b, 0x46, 0x4b, 0x5c, 0xf2, 0x03, 0x68, 0x06, 0x85, 0x54, 0x69, 0x6c, 0x0b, + 0xce, 0x60, 0x35, 0x09, 0x3b, 0x1a, 0x8b, 0x5a, 0x4c, 0xb4, 0x60, 0xca, 0x02, 0x11, 0x09, 0xb5, + 0xb0, 0x53, 0xc3, 0x8a, 0x16, 0x3c, 0xb4, 0x68, 0xb4, 0xc4, 0xf5, 0xb6, 0x61, 0x6d, 0xf9, 0x0e, + 0x5f, 0x9a, 0x22, 0x09, 0xd4, 0x65, 0x54, 0xcc, 0x6c, 0x39, 0xd2, 0x6b, 0xef, 0x4f, 0x57, 0xa0, + 0xed, 0x2e, 0xe3, 0xa5, 0x0f, 0xca, 0xf8, 0xa8, 0x2e, 0xc7, 0xc7, 0xa7, 0xcd, 0x1a, 0x27, 0xda, + 0x59, 0xfd, 0x85, 0x76, 0xf6, 0x1a, 0x34, 0x73, 0x2e, 0x83, 0xc2, 0x94, 0xf4, 0x36, 0xb5, 0x14, + 0x99, 0x42, 0x75, 0x6f, 0x6c, 0x6f, 0xe5, 0xe9, 0xf9, 0xf8, 0xb5, 0xbf, 0x97, 0xf1, 0x9c, 0x29, + 0x91, 0xcc, 0xc6, 0x0b, 0xa9, 0x78, 0x4c, 0xab, 0x7b, 0x63, 0x1c, 0x28, 0x58, 0x74, 0xc4, 0x16, + 0x52, 0x6b, 0xd7, 0xd2, 0x3a, 0x74, 0x0c, 0x07, 0xd5, 0xfb, 0x3c, 0x6c, 0x62, 0xdf, 0xf3, 0x65, + 0x90, 0x8b, 0x4c, 0xe9, 0x8a, 0x6e, 0x46, 0x94, 0x75, 0x64, 0x8f, 0x35, 0x17, 0xeb, 0xfa, 0xf7, + 0xa1, 0x26, 0x32, 0xd9, 0xeb, 0xe8, 0x5a, 0x36, 0x3c, 0x27, 0x7d, 0x87, 0x23, 0x8a, 0xa8, 0x78, + 0xb9, 0x85, 0xe4, 0xb9, 0x9e, 0x5b, 0xcd, 0xc8, 0x53, 0xd2, 0x64, 0x1b, 0xae, 0x05, 0xf9, 0x22, + 0x53, 0x3c, 0xf4, 0xf3, 0x34, 0x55, 0x7e, 0xc6, 0xa4, 0x3c, 0x4a, 0xf3, 0x50, 0x0f, 0x41, 0x1d, + 0x7a, 0xc5, 0x6e, 0xd2, 0x34, 0x55, 0x23, 0xbb, 0x85, 0x3e, 0x57, 0x6c, 0x26, 0x7b, 0x6b, 0x7a, + 0x64, 0xd3, 0x6b, 0x32, 0x87, 0x96, 0x54, 0x69, 0xce, 0x66, 0xbc, 0xb7, 0xae, 0x2f, 0xfd, 0xc9, + 0x39, 0x19, 0x31, 0x36, 0xa8, 0xd4, 0xc1, 0x63, 0x77, 0x94, 0x72, 0xee, 0x1f, 0xf0, 0x85, 0xec, + 0x6d, 0x68, 0x0d, 0x5a, 0x52, 0xce, 0xbf, 0xcd, 0x17, 0x92, 0xbc, 0x09, 0xeb, 0x76, 0xf0, 0xf5, + 0x73, 0xce, 0xc2, 0x45, 0x6f, 0x53, 0xfb, 0x63, 0xcd, 0x32, 0x29, 0xf2, 0xbc, 0x5f, 0x55, 0x60, + 0xf3, 0x05, 0x4f, 0x96, 0x51, 0x5c, 0x39, 0x8e, 0x62, 0x8c, 0xac, 0x50, 0x48, 0x95, 0xa7, 0xae, + 0xd5, 0x1a, 0x0a, 0x67, 0x33, 0x9c, 0x4e, 0x45, 0x9a, 0xb8, 0xd9, 0xcc, 0x92, 0x18, 0xa8, 0x22, + 0x66, 0x33, 0xee, 0x2b, 0x36, 0xd3, 0x81, 0xda, 0xa1, 0x6d, 0xcd, 0xd8, 0x67, 0x33, 0x72, 0x1d, + 0x5a, 0xa9, 0xf4, 0xb5, 0x94, 0x86, 0xc1, 0x4b, 0xe5, 0x18, 0xb3, 0xe5, 0x0f, 0x95, 0x57, 0x37, + 0x26, 0x22, 0x3f, 0x2b, 0x26, 0x91, 0x08, 0x5c, 0xba, 0x18, 0x8a, 0x7c, 0x06, 0x20, 0x66, 0x09, + 0x9b, 0xf1, 0x98, 0x27, 0x4a, 0xa7, 0x4d, 0x9b, 0x2e, 0x71, 0xbc, 0x7f, 0x74, 0xa1, 0x65, 0x3d, + 0x81, 0x13, 0xe4, 0x71, 0x5b, 0x14, 0xf2, 0x00, 0x15, 0x46, 0x37, 0x94, 0xd3, 0xc5, 0x00, 0x99, + 0xe8, 0x8c, 0xf2, 0x58, 0xce, 0x44, 0xd8, 0xab, 0xea, 0x53, 0xe5, 0xcc, 0x40, 0x99, 0x08, 0xc9, + 0x5d, 0x28, 0xe7, 0x34, 0x7f, 0x2a, 0x22, 0x2e, 0xb5, 0x3f, 0x4c, 0x53, 0xef, 0xd0, 0x2b, 0x6e, + 0xef, 0xe1, 0xf1, 0x16, 0x11, 0xd0, 0x30, 0x52, 0xcd, 0x3f, 0xde, 0xf8, 0x7c, 0xe3, 0xac, 0x8f, + 0xca, 0x53, 0x23, 0x81, 0xcc, 0xa0, 0xae, 0x35, 0x6f, 0x5c, 0x88, 0x24, 0x7a, 0x6f, 0x38, 0xa0, + 0x5a, 0x00, 0xf9, 0x10, 0xba, 0xcb, 0xd6, 0x37, 0xb5, 0xbc, 0xf7, 0xce, 0x59, 0xde, 0xf1, 0x25, + 0xd2, 0x65, 0x69, 0xde, 0x9f, 0xab, 0x50, 0x47, 0xab, 0x75, 0xc4, 0xf3, 0x43, 0x11, 0xb8, 0xde, + 0x6d, 0x29, 0xac, 0x71, 0x47, 0x22, 0xc3, 0xb0, 0x9e, 0x44, 0xdc, 0xfe, 0x2e, 0x74, 0x90, 0xb3, + 0x8f, 0x0c, 0xf2, 0x11, 0x40, 0xc6, 0x72, 0x25, 0xf4, 0xdb, 0x88, 0x1d, 0xc7, 0x7e, 0x78, 0x01, + 0x5e, 0xe9, 0x8f, 0x9c, 0x14, 0xba, 0x24, 0xd0, 0xfb, 0x59, 0x05, 0x3a, 0xe5, 0x0e, 0xb6, 0x97, + 0x88, 0x4d, 0xb8, 0x1b, 0x9c, 0x0d, 0x81, 0x96, 0x25, 0x45, 0x3c, 0xe1, 0xb9, 0x1d, 0x3c, 0x2c, + 0xa5, 0xf3, 0x5e, 0xfc, 0xc4, 0xb4, 0x9c, 0x1a, 0xd5, 0x6b, 0xdb, 0xa0, 0x72, 0x65, 0x33, 0xc7, + 0x10, 0x98, 0xdb, 0x6a, 0x91, 0x71, 0x7f, 0x56, 0xe8, 0x78, 0xd0, 0xb9, 0x8d, 0x8c, 0x47, 0x85, + 0x08, 0xbd, 0x04, 0xea, 0x78, 0xb9, 0x08, 0x97, 0x31, 0x35, 0x77, 0x65, 0x04, 0xd7, 0x9f, 0xf6, + 0x03, 0x80, 0xe7, 0xf5, 0x34, 0x64, 0xc5, 0xe3, 0x5a, 0xff, 0x42, 0x88, 0xd0, 0x0a, 0xc7, 0x25, + 0x72, 0x66, 0x56, 0x68, 0x8d, 0xe2, 0xd2, 0xfb, 0x57, 0x15, 0x1a, 0xbb, 0x69, 0x91, 0xa8, 0xff, + 0xea, 0x32, 0xcc, 0xff, 0x34, 0x8f, 0x99, 0x72, 0xc5, 0xcb, 0x50, 0x98, 0x3c, 0xda, 0xf5, 0xd6, + 0x4d, 0xe3, 0x0b, 0x08, 0x31, 0x6a, 0x24, 0x90, 0x8f, 0xa1, 0x19, 0xe4, 0x1c, 0x3b, 0xbd, 0x99, + 0xae, 0xa6, 0xe7, 0x2c, 0x4b, 0x5f, 0xc0, 0x52, 0x50, 0xef, 0x65, 0x3a, 0x1e, 0xa8, 0x95, 0x8a, + 0x7e, 0xcc, 0x52, 0x91, 0x28, 0xeb, 0x2d, 0x43, 0x78, 0x3b, 0x70, 0xf9, 0xa5, 0x4f, 0xf0, 0xe8, + 0x34, 0xcd, 0x03, 0xf7, 0xb3, 0x6c, 0x08, 0xac, 0xae, 0xa9, 0x39, 0x60, 0x4b, 0x97, 0x23, 0xbd, + 0xe7, 0x00, 0xc7, 0x20, 0xe4, 0x7d, 0x68, 0xc4, 0xa8, 0x8b, 0x1d, 0xd3, 0xf7, 0x2f, 0xc2, 0x4e, + 0x6a, 0x44, 0x78, 0x3f, 0x86, 0x3a, 0x96, 0x0d, 0x8c, 0x1c, 0x3d, 0x2b, 0xd9, 0x48, 0xd3, 0x73, + 0x12, 0x86, 0x3e, 0x3f, 0x2c, 0x7f, 0x0d, 0x0d, 0x81, 0x56, 0x98, 0x98, 0x70, 0x45, 0xd5, 0x91, + 0x3a, 0xd0, 0x33, 0x96, 0xf3, 0x32, 0xd0, 0x91, 0xc0, 0x3f, 0x90, 0xa6, 0x99, 0x33, 0xc9, 0x4f, + 0x61, 0x33, 0xcb, 0xb9, 0x1e, 0x66, 0xa3, 0x88, 0x87, 0x7e, 0x2a, 0xad, 0x89, 0x17, 0x35, 0x50, + 0x6d, 0x2c, 0x8b, 0xdb, 0x93, 0xe4, 0x0b, 0xa8, 0x80, 0x38, 0x64, 0x8a, 0xfb, 0xb2, 0x98, 0x24, + 0x5c, 0x39, 0x4f, 0x6c, 0x58, 0xf6, 0xd8, 0x70, 0xbd, 0xe7, 0xd0, 0x76, 0xb3, 0x2b, 0x66, 0x6a, + 0x16, 0xb1, 0xc4, 0x5f, 0x6a, 0xe8, 0x6d, 0x64, 0x60, 0xb3, 0x25, 0xb7, 0xe1, 0xb2, 0xde, 0xb4, + 0x2d, 0xdb, 0x5f, 0x9a, 0x5d, 0x37, 0x71, 0xe3, 0xa9, 0xe1, 0xeb, 0xb3, 0x6f, 0xc2, 0xba, 0x1b, + 0x83, 0xfd, 0xc0, 0xa5, 0x69, 0x87, 0xae, 0x39, 0xe6, 0x4e, 0x1a, 0xf2, 0xad, 0x37, 0x60, 0x7d, + 0xc0, 0x23, 0xae, 0xb8, 0x7b, 0xa5, 0xdd, 0x80, 0xea, 0x70, 0xe0, 0xe6, 0xdd, 0xe1, 0x60, 0xfb, + 0x93, 0x16, 0x6c, 0xba, 0x2b, 0x18, 0xf3, 0x5c, 0x67, 0xe7, 0x2f, 0x2b, 0x50, 0x1f, 0x15, 0x72, + 0x4e, 0xbe, 0x72, 0x9a, 0x8b, 0x5c, 0x7a, 0x6c, 0xf6, 0xee, 0x9e, 0xe6, 0x43, 0xf3, 0x98, 0x7c, + 0xfd, 0xe7, 0x9f, 0xfc, 0xed, 0x77, 0xd5, 0xcb, 0x5b, 0x6b, 0x77, 0x0e, 0xef, 0x96, 0x8f, 0xe2, + 0x5f, 0xab, 0xdc, 0x26, 0xbf, 0xad, 0x40, 0xe3, 0xfe, 0x62, 0xf7, 0xde, 0x0e, 0xf9, 0xf2, 0x69, + 0x50, 0x8f, 0x5f, 0xa6, 0xbd, 0x33, 0x3d, 0x76, 0x6f, 0xbd, 0xae, 0x15, 0xba, 0xb6, 0x75, 0x69, + 0x59, 0xa1, 0x3b, 0x31, 0x0b, 0x50, 0xa9, 0xdf, 0x54, 0xa0, 0x7e, 0x7f, 0x31, 0x1c, 0xbd, 0x62, + 0x9d, 0x3c, 0xad, 0xd3, 0xd5, 0xad, 0xcd, 0x13, 0x3a, 0x89, 0x0c, 0x55, 0xfa, 0xb5, 0x51, 0x69, + 0xf0, 0x8a, 0x55, 0xba, 0xa1, 0x55, 0xba, 0x42, 0x2e, 0x9f, 0x50, 0xe9, 0x43, 0x11, 0x7e, 0x44, + 0x7e, 0x51, 0x81, 0xda, 0xbd, 0x28, 0x22, 0xa7, 0x8f, 0x86, 0x33, 0xea, 0x72, 0x55, 0xeb, 0xb2, + 0x41, 0x4e, 0xc4, 0xd0, 0x5b, 0x15, 0x72, 0x04, 0x8d, 0x67, 0x4c, 0x05, 0xf3, 0x57, 0x7b, 0x35, + 0x6f, 0x55, 0xc8, 0x21, 0x34, 0x4d, 0xfa, 0x91, 0x53, 0xbd, 0x8e, 0x9c, 0x48, 0xd9, 0x33, 0x24, + 0xd3, 0x7d, 0xf8, 0x5e, 0xdb, 0x71, 0x26, 0x4d, 0x7d, 0xe4, 0x4b, 0xff, 0x0e, 0x00, 0x00, 0xff, + 0xff, 0x76, 0xc7, 0x8a, 0x3b, 0x73, 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 554ef0992..7d9fbc4f4 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -145,7 +145,7 @@ message Hardware { int64 gid = 5; } - message Filesystem { + message Mount { message FilesystemOptions { bool force = 1; repeated string options = 2; @@ -155,6 +155,11 @@ message Hardware { string format = 2; repeated File files = 3; FilesystemOptions create = 4; + string point = 5; + } + + message Filesystem { + Mount mount = 1; } message RAID { From a082fac682f8a9746317a18a8486a93f11183cc1 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Tue, 2 Jun 2020 14:08:04 -0400 Subject: [PATCH 19/31] added/updated envvars in docker-compose file --- deploy/docker-compose.yml | 5 ++++- grpc-server/hardware.go | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index f959891dc..d3ff2b4a6 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -113,7 +113,7 @@ services: TINKERBELL_GRPC_AUTHORITY: $TINKERBELL_HOST_IP:42113 TINKERBELL_CERT_URL: http://$TINKERBELL_HOST_IP:42114/cert ELASTIC_SEARCH_URL: $TINKERBELL_HOST_IP:9200 - DISCOVERY_TYPE: tinkerbell + HARDWARE_DATA_MODEL: tinkerbell depends_on: cacher: condition: service_started @@ -171,6 +171,9 @@ services: HEGEL_USE_TLS: 0 CACHER_CERT_URL: http://127.0.0.1:42112/cert CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 + TINKERBELL_GRPC_AUTHORITY: 127.0.0.1:42113 + TINKERBELL_CERT_URL: http://127.0.0.1:42114/cert + HARDWARE_DATA_MODEL: tinkerbell depends_on: cacher: condition: service_started diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go index 6c7d0c01b..b703b7f78 100644 --- a/grpc-server/hardware.go +++ b/grpc-server/hardware.go @@ -32,6 +32,8 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware. return &hardware.Empty{}, err } + // TODO: somewhere here validate json (if ip addr contains cidr, etc.) + logger.With("id", hw.Id).Info("data pushed") var fn func() error From b54b1d8dc1494e919df048eaed53cffdb3b9c4b9 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Tue, 2 Jun 2020 14:47:17 -0400 Subject: [PATCH 20/31] fixup hardware & template protos --- protos/hardware/hardware.pb.go | 265 ++++++++++++++-------------- protos/hardware/hardware.proto | 3 +- protos/template/template.pb.go | 74 ++++---- protos/template/template.proto | 3 +- protos/workflow/workflow.pb.go | 314 +++++++++------------------------ 5 files changed, 262 insertions(+), 397 deletions(-) diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index fe49e9eed..ffe89d729 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -151,12 +151,13 @@ func (m *GetRequest) GetId() string { } type Hardware struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + OBSOLETE_JSON string `protobuf:"bytes,1,opt,name=OBSOLETE_JSON,json=OBSOLETEJSON,proto3" json:"OBSOLETE_JSON,omitempty"` OBSOLETEDhcp *Hardware_DHCP `protobuf:"bytes,2,opt,name=OBSOLETE_dhcp,json=OBSOLETEDhcp,proto3" json:"OBSOLETE_dhcp,omitempty"` OBSOLETENetboot *Hardware_Netboot `protobuf:"bytes,3,opt,name=OBSOLETE_netboot,json=OBSOLETENetboot,proto3" json:"OBSOLETE_netboot,omitempty"` OBSOLETENetwork []*Hardware_Network `protobuf:"bytes,4,rep,name=OBSOLETE_network,json=OBSOLETENetwork,proto3" json:"OBSOLETE_network,omitempty"` Metadata *Hardware_Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"` Network *Hardware_Network `protobuf:"bytes,6,opt,name=network,proto3" json:"network,omitempty"` + Id string `protobuf:"bytes,7,opt,name=id,proto3" json:"id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -187,9 +188,9 @@ func (m *Hardware) XXX_DiscardUnknown() { var xxx_messageInfo_Hardware proto.InternalMessageInfo -func (m *Hardware) GetId() string { +func (m *Hardware) GetOBSOLETE_JSON() string { if m != nil { - return m.Id + return m.OBSOLETE_JSON } return "" } @@ -229,6 +230,13 @@ func (m *Hardware) GetNetwork() *Hardware_Network { return nil } +func (m *Hardware) GetId() string { + if m != nil { + return m.Id + } + return "" +} + type Hardware_DHCP struct { Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` OBSOLETEIp string `protobuf:"bytes,2,opt,name=OBSOLETE_ip,json=OBSOLETEIp,proto3" json:"OBSOLETE_ip,omitempty"` @@ -1849,131 +1857,132 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1977 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x8f, 0x1b, 0x49, - 0xf5, 0x97, 0xef, 0xf6, 0xf1, 0x5c, 0x92, 0x4a, 0xb2, 0x71, 0x7a, 0xff, 0x7f, 0x36, 0xcc, 0x0a, - 0x08, 0x79, 0x70, 0x36, 0xc3, 0x0a, 0x04, 0x02, 0xa4, 0x64, 0x9c, 0x8b, 0x61, 0x27, 0x63, 0xca, - 0xb3, 0x09, 0xcb, 0xad, 0x29, 0x77, 0x97, 0xed, 0xda, 0xe9, 0xdb, 0x76, 0x55, 0xcf, 0xc4, 0xac, - 0x76, 0x41, 0x3c, 0xf0, 0x82, 0x10, 0x08, 0xf8, 0x04, 0x7c, 0x04, 0x1e, 0x79, 0xe1, 0x43, 0xec, - 0x17, 0x40, 0x08, 0xc1, 0x67, 0xe0, 0x01, 0x09, 0x9d, 0xba, 0xf4, 0x78, 0x12, 0x58, 0x31, 0xe3, - 0x99, 0xbc, 0xd5, 0x39, 0x55, 0xfd, 0x3b, 0xe7, 0xd4, 0xb9, 0x76, 0xc1, 0xf5, 0x39, 0xcb, 0xc3, - 0x23, 0x96, 0xf3, 0x3b, 0x6e, 0xd1, 0xcf, 0xf2, 0x54, 0xa5, 0xe4, 0xf6, 0x4c, 0xa8, 0x79, 0x31, - 0xe9, 0x07, 0x69, 0xdc, 0x57, 0x22, 0x39, 0xe0, 0xf9, 0x84, 0x47, 0x91, 0x5e, 0x9a, 0x13, 0xb2, - 0xef, 0xbe, 0xf0, 0xfe, 0x6f, 0x96, 0xa6, 0xb3, 0x88, 0xdf, 0x61, 0x99, 0xb8, 0xc3, 0x92, 0x24, - 0x55, 0x4c, 0x89, 0x34, 0x91, 0xe6, 0xdc, 0xd6, 0x33, 0xe8, 0x8e, 0x0a, 0x39, 0xa7, 0xfc, 0x83, - 0x82, 0x4b, 0x45, 0x1e, 0x43, 0x3d, 0x64, 0x8a, 0xf5, 0x2a, 0x37, 0x2b, 0xb7, 0xba, 0xdb, 0x6f, - 0xf7, 0xff, 0x77, 0x39, 0xfd, 0xc7, 0x76, 0x41, 0x35, 0xc2, 0x56, 0x0b, 0x1a, 0x0f, 0xe2, 0x4c, - 0x2d, 0xb6, 0xbe, 0x09, 0xf0, 0x88, 0x2b, 0x27, 0xe0, 0x12, 0xd4, 0x62, 0x16, 0x68, 0xfc, 0x0e, - 0xc5, 0x25, 0xd9, 0x80, 0xaa, 0xc8, 0x7a, 0x55, 0xcd, 0xa8, 0x8a, 0x4c, 0xd3, 0x61, 0xaf, 0x66, - 0xe9, 0x70, 0xeb, 0x2f, 0xb7, 0xa1, 0xed, 0xb0, 0xed, 0x66, 0xc5, 0x6d, 0x92, 0x1f, 0xc1, 0xfa, - 0xde, 0xfd, 0xf1, 0xde, 0x3b, 0x0f, 0xf6, 0x1f, 0xf8, 0xe1, 0x3c, 0x30, 0x38, 0xdd, 0xed, 0xaf, - 0x9e, 0x45, 0xf1, 0xfe, 0xe0, 0xf1, 0xce, 0x88, 0xae, 0x39, 0xbc, 0xc1, 0x3c, 0xc8, 0xc8, 0x0c, - 0x2e, 0x95, 0xf8, 0x09, 0x57, 0x93, 0x34, 0x55, 0x5a, 0xb5, 0xee, 0xf6, 0xd7, 0xcf, 0x24, 0xe2, - 0x89, 0xc1, 0xa0, 0x9b, 0x0e, 0xd5, 0x32, 0x5e, 0x14, 0x74, 0x94, 0xe6, 0x07, 0xbd, 0xfa, 0xcd, - 0xda, 0x2a, 0x82, 0x10, 0xe3, 0x84, 0x20, 0x64, 0x90, 0xf7, 0xa0, 0x1d, 0x73, 0xc5, 0xb4, 0x97, - 0x1b, 0xda, 0x92, 0x6f, 0x9c, 0x49, 0xc0, 0xae, 0x05, 0xa1, 0x25, 0x1c, 0x79, 0x0a, 0x2d, 0xa7, - 0x7a, 0x73, 0xb5, 0x3b, 0xd2, 0xaa, 0x3b, 0x30, 0xef, 0xef, 0x35, 0xa8, 0xa3, 0x6f, 0xfe, 0x43, - 0xf0, 0xbc, 0x01, 0xdd, 0xf2, 0xda, 0xca, 0x28, 0x02, 0xc7, 0x1a, 0x66, 0xc4, 0x83, 0xf6, 0x3c, - 0x95, 0x2a, 0x61, 0x31, 0xb7, 0x31, 0x55, 0xd2, 0xe4, 0xff, 0x01, 0x22, 0xce, 0x24, 0xf7, 0x95, - 0x88, 0x79, 0xaf, 0x7e, 0xb3, 0x72, 0xab, 0x46, 0x3b, 0x9a, 0xb3, 0x2f, 0x62, 0x4e, 0x3e, 0x0b, - 0x6b, 0x78, 0xcc, 0x97, 0x3c, 0x3f, 0xe4, 0xb9, 0xec, 0x35, 0x6e, 0xd6, 0x6e, 0x75, 0x68, 0x17, - 0x79, 0x63, 0xc3, 0xc2, 0x23, 0xf8, 0x6d, 0x79, 0xa4, 0x69, 0x8e, 0x20, 0xcf, 0x1d, 0xf9, 0xe2, - 0x92, 0x63, 0x67, 0x4c, 0xf1, 0x23, 0xb6, 0xe8, 0xb5, 0xb4, 0x22, 0xa5, 0x6b, 0x1e, 0x19, 0x36, - 0x21, 0x50, 0x67, 0x79, 0x30, 0xef, 0xb5, 0xf5, 0xb6, 0x5e, 0x23, 0xaf, 0xe0, 0x53, 0xd1, 0xeb, - 0xdc, 0xac, 0xdc, 0x6a, 0x53, 0xbd, 0x46, 0xbd, 0xc5, 0x94, 0x05, 0xdc, 0xd7, 0x56, 0x81, 0x3e, - 0xdd, 0xd1, 0x9c, 0x27, 0x68, 0xd6, 0x3b, 0x3a, 0xa1, 0xba, 0x2b, 0x78, 0x00, 0x2f, 0xbb, 0x3f, - 0x1c, 0x61, 0x3a, 0x7a, 0xef, 0x43, 0x75, 0x38, 0x22, 0x3d, 0x68, 0xb1, 0x30, 0xcc, 0xb9, 0x94, - 0xf6, 0xf6, 0x1d, 0x89, 0x3b, 0x09, 0x57, 0x31, 0x93, 0x07, 0xf6, 0xf6, 0x1d, 0x89, 0x3b, 0xce, - 0x60, 0x73, 0xf3, 0x8e, 0x24, 0xaf, 0x41, 0x73, 0xca, 0x62, 0x11, 0x2d, 0xec, 0xa5, 0x5b, 0xca, - 0xfb, 0x7d, 0x1d, 0x5a, 0x2e, 0x21, 0x5e, 0x87, 0x0e, 0x8b, 0xa2, 0xf4, 0xc8, 0xcf, 0x9e, 0x73, - 0x2d, 0xb3, 0x4d, 0xdb, 0x9a, 0x31, 0x7a, 0xce, 0xc9, 0xe7, 0x60, 0xc3, 0x6c, 0x62, 0x7c, 0x4c, - 0xa3, 0xf4, 0x48, 0xcb, 0x6e, 0xd3, 0x75, 0xcd, 0x7d, 0x66, 0x99, 0xe4, 0x5d, 0xa8, 0x0b, 0xfc, - 0xdc, 0x64, 0xec, 0xbd, 0x55, 0x32, 0xb6, 0x3f, 0x1c, 0x7d, 0xf7, 0x01, 0xd5, 0x70, 0xe4, 0x63, - 0xb8, 0x56, 0xba, 0x14, 0xf7, 0xa4, 0xca, 0x59, 0x96, 0xf1, 0x5c, 0x5b, 0xd3, 0xdd, 0x1e, 0xae, - 0x24, 0xe7, 0xfe, 0x12, 0x20, 0xbd, 0xea, 0xe4, 0x2c, 0x73, 0xd1, 0xac, 0x54, 0x0a, 0x6e, 0xd3, - 0x77, 0x35, 0xb3, 0xf6, 0xa4, 0xe0, 0x54, 0xc3, 0x79, 0x6f, 0x43, 0x1d, 0x8d, 0xc4, 0x2c, 0x2b, - 0xf2, 0xc8, 0x65, 0x59, 0x91, 0x47, 0x98, 0x44, 0x41, 0x9a, 0x28, 0x9e, 0x28, 0x69, 0x9d, 0x5c, - 0xd2, 0xde, 0x06, 0xac, 0x2d, 0x2b, 0xe7, 0x7d, 0x07, 0xea, 0x88, 0x49, 0x6e, 0x40, 0x7b, 0x82, - 0xb9, 0x75, 0x0c, 0xd5, 0x42, 0xfa, 0xdd, 0x3c, 0x42, 0xf7, 0x1f, 0xf0, 0x3c, 0xe1, 0x91, 0x05, - 0xb3, 0x14, 0xf2, 0x45, 0x22, 0x54, 0xee, 0xaa, 0xbf, 0xa5, 0xbc, 0xbf, 0x9a, 0xb0, 0xd0, 0xe5, - 0xeb, 0xa5, 0x82, 0x5f, 0xb9, 0xf8, 0x82, 0x5f, 0xbd, 0x88, 0x82, 0x3f, 0x05, 0x10, 0x89, 0xe2, - 0x39, 0xa6, 0xad, 0xec, 0xd5, 0x74, 0xa9, 0x7f, 0xb8, 0x4a, 0xbd, 0xec, 0x0f, 0x1d, 0x1c, 0x5d, - 0x42, 0x26, 0x1f, 0x2c, 0x19, 0x14, 0xf2, 0x29, 0x2b, 0x22, 0x65, 0xe3, 0xf4, 0xbc, 0xa4, 0x95, - 0xa6, 0x0d, 0x0c, 0xbc, 0xf7, 0xc7, 0x0a, 0x74, 0xca, 0x6d, 0xb2, 0x0b, 0xf5, 0xf3, 0x71, 0x94, - 0x86, 0xb1, 0x4d, 0xe6, 0xdc, 0xfc, 0xe2, 0xc0, 0xbc, 0x7f, 0xde, 0x80, 0xb6, 0xeb, 0x69, 0xe4, - 0x2a, 0x34, 0xa4, 0x62, 0x8a, 0xdb, 0xc8, 0x35, 0x04, 0x56, 0xfb, 0x49, 0x9a, 0x84, 0x22, 0x99, - 0xf9, 0x71, 0x1a, 0x72, 0x2d, 0xbf, 0x46, 0xbb, 0x96, 0xb7, 0x9b, 0x86, 0x9c, 0x24, 0xb0, 0x16, - 0xb3, 0xa4, 0x98, 0xb2, 0x40, 0x15, 0x39, 0xcf, 0x6d, 0xe5, 0xf9, 0xd6, 0x4a, 0x1d, 0xb6, 0xbf, - 0xbb, 0x84, 0x48, 0x4f, 0xe0, 0x93, 0x09, 0xb4, 0x45, 0x22, 0x15, 0x4b, 0x02, 0xbe, 0x92, 0x57, - 0x4b, 0x59, 0x43, 0x8b, 0x46, 0x4b, 0x5c, 0xf2, 0x03, 0x68, 0x06, 0x85, 0x54, 0x69, 0x6c, 0x0b, - 0xce, 0x60, 0x35, 0x09, 0x3b, 0x1a, 0x8b, 0x5a, 0x4c, 0xb4, 0x60, 0xca, 0x02, 0x11, 0x09, 0xb5, - 0xb0, 0x53, 0xc3, 0x8a, 0x16, 0x3c, 0xb4, 0x68, 0xb4, 0xc4, 0xf5, 0xb6, 0x61, 0x6d, 0xf9, 0x0e, - 0x5f, 0x9a, 0x22, 0x09, 0xd4, 0x65, 0x54, 0xcc, 0x6c, 0x39, 0xd2, 0x6b, 0xef, 0x4f, 0x57, 0xa0, - 0xed, 0x2e, 0xe3, 0xa5, 0x0f, 0xca, 0xf8, 0xa8, 0x2e, 0xc7, 0xc7, 0xa7, 0xcd, 0x1a, 0x27, 0xda, - 0x59, 0xfd, 0x85, 0x76, 0xf6, 0x1a, 0x34, 0x73, 0x2e, 0x83, 0xc2, 0x94, 0xf4, 0x36, 0xb5, 0x14, - 0x99, 0x42, 0x75, 0x6f, 0x6c, 0x6f, 0xe5, 0xe9, 0xf9, 0xf8, 0xb5, 0xbf, 0x97, 0xf1, 0x9c, 0x29, - 0x91, 0xcc, 0xc6, 0x0b, 0xa9, 0x78, 0x4c, 0xab, 0x7b, 0x63, 0x1c, 0x28, 0x58, 0x74, 0xc4, 0x16, - 0x52, 0x6b, 0xd7, 0xd2, 0x3a, 0x74, 0x0c, 0x07, 0xd5, 0xfb, 0x3c, 0x6c, 0x62, 0xdf, 0xf3, 0x65, - 0x90, 0x8b, 0x4c, 0xe9, 0x8a, 0x6e, 0x46, 0x94, 0x75, 0x64, 0x8f, 0x35, 0x17, 0xeb, 0xfa, 0xf7, - 0xa1, 0x26, 0x32, 0xd9, 0xeb, 0xe8, 0x5a, 0x36, 0x3c, 0x27, 0x7d, 0x87, 0x23, 0x8a, 0xa8, 0x78, - 0xb9, 0x85, 0xe4, 0xb9, 0x9e, 0x5b, 0xcd, 0xc8, 0x53, 0xd2, 0x64, 0x1b, 0xae, 0x05, 0xf9, 0x22, - 0x53, 0x3c, 0xf4, 0xf3, 0x34, 0x55, 0x7e, 0xc6, 0xa4, 0x3c, 0x4a, 0xf3, 0x50, 0x0f, 0x41, 0x1d, - 0x7a, 0xc5, 0x6e, 0xd2, 0x34, 0x55, 0x23, 0xbb, 0x85, 0x3e, 0x57, 0x6c, 0x26, 0x7b, 0x6b, 0x7a, - 0x64, 0xd3, 0x6b, 0x32, 0x87, 0x96, 0x54, 0x69, 0xce, 0x66, 0xbc, 0xb7, 0xae, 0x2f, 0xfd, 0xc9, - 0x39, 0x19, 0x31, 0x36, 0xa8, 0xd4, 0xc1, 0x63, 0x77, 0x94, 0x72, 0xee, 0x1f, 0xf0, 0x85, 0xec, - 0x6d, 0x68, 0x0d, 0x5a, 0x52, 0xce, 0xbf, 0xcd, 0x17, 0x92, 0xbc, 0x09, 0xeb, 0x76, 0xf0, 0xf5, - 0x73, 0xce, 0xc2, 0x45, 0x6f, 0x53, 0xfb, 0x63, 0xcd, 0x32, 0x29, 0xf2, 0xbc, 0x5f, 0x55, 0x60, - 0xf3, 0x05, 0x4f, 0x96, 0x51, 0x5c, 0x39, 0x8e, 0x62, 0x8c, 0xac, 0x50, 0x48, 0x95, 0xa7, 0xae, - 0xd5, 0x1a, 0x0a, 0x67, 0x33, 0x9c, 0x4e, 0x45, 0x9a, 0xb8, 0xd9, 0xcc, 0x92, 0x18, 0xa8, 0x22, - 0x66, 0x33, 0xee, 0x2b, 0x36, 0xd3, 0x81, 0xda, 0xa1, 0x6d, 0xcd, 0xd8, 0x67, 0x33, 0x72, 0x1d, - 0x5a, 0xa9, 0xf4, 0xb5, 0x94, 0x86, 0xc1, 0x4b, 0xe5, 0x18, 0xb3, 0xe5, 0x0f, 0x95, 0x57, 0x37, - 0x26, 0x22, 0x3f, 0x2b, 0x26, 0x91, 0x08, 0x5c, 0xba, 0x18, 0x8a, 0x7c, 0x06, 0x20, 0x66, 0x09, - 0x9b, 0xf1, 0x98, 0x27, 0x4a, 0xa7, 0x4d, 0x9b, 0x2e, 0x71, 0xbc, 0x7f, 0x74, 0xa1, 0x65, 0x3d, - 0x81, 0x13, 0xe4, 0x71, 0x5b, 0x14, 0xf2, 0x00, 0x15, 0x46, 0x37, 0x94, 0xd3, 0xc5, 0x00, 0x99, - 0xe8, 0x8c, 0xf2, 0x58, 0xce, 0x44, 0xd8, 0xab, 0xea, 0x53, 0xe5, 0xcc, 0x40, 0x99, 0x08, 0xc9, - 0x5d, 0x28, 0xe7, 0x34, 0x7f, 0x2a, 0x22, 0x2e, 0xb5, 0x3f, 0x4c, 0x53, 0xef, 0xd0, 0x2b, 0x6e, - 0xef, 0xe1, 0xf1, 0x16, 0x11, 0xd0, 0x30, 0x52, 0xcd, 0x3f, 0xde, 0xf8, 0x7c, 0xe3, 0xac, 0x8f, - 0xca, 0x53, 0x23, 0x81, 0xcc, 0xa0, 0xae, 0x35, 0x6f, 0x5c, 0x88, 0x24, 0x7a, 0x6f, 0x38, 0xa0, - 0x5a, 0x00, 0xf9, 0x10, 0xba, 0xcb, 0xd6, 0x37, 0xb5, 0xbc, 0xf7, 0xce, 0x59, 0xde, 0xf1, 0x25, - 0xd2, 0x65, 0x69, 0xde, 0x9f, 0xab, 0x50, 0x47, 0xab, 0x75, 0xc4, 0xf3, 0x43, 0x11, 0xb8, 0xde, - 0x6d, 0x29, 0xac, 0x71, 0x47, 0x22, 0xc3, 0xb0, 0x9e, 0x44, 0xdc, 0xfe, 0x2e, 0x74, 0x90, 0xb3, - 0x8f, 0x0c, 0xf2, 0x11, 0x40, 0xc6, 0x72, 0x25, 0xf4, 0xdb, 0x88, 0x1d, 0xc7, 0x7e, 0x78, 0x01, - 0x5e, 0xe9, 0x8f, 0x9c, 0x14, 0xba, 0x24, 0xd0, 0xfb, 0x59, 0x05, 0x3a, 0xe5, 0x0e, 0xb6, 0x97, - 0x88, 0x4d, 0xb8, 0x1b, 0x9c, 0x0d, 0x81, 0x96, 0x25, 0x45, 0x3c, 0xe1, 0xb9, 0x1d, 0x3c, 0x2c, - 0xa5, 0xf3, 0x5e, 0xfc, 0xc4, 0xb4, 0x9c, 0x1a, 0xd5, 0x6b, 0xdb, 0xa0, 0x72, 0x65, 0x33, 0xc7, - 0x10, 0x98, 0xdb, 0x6a, 0x91, 0x71, 0x7f, 0x56, 0xe8, 0x78, 0xd0, 0xb9, 0x8d, 0x8c, 0x47, 0x85, - 0x08, 0xbd, 0x04, 0xea, 0x78, 0xb9, 0x08, 0x97, 0x31, 0x35, 0x77, 0x65, 0x04, 0xd7, 0x9f, 0xf6, - 0x03, 0x80, 0xe7, 0xf5, 0x34, 0x64, 0xc5, 0xe3, 0x5a, 0xff, 0x42, 0x88, 0xd0, 0x0a, 0xc7, 0x25, - 0x72, 0x66, 0x56, 0x68, 0x8d, 0xe2, 0xd2, 0xfb, 0x57, 0x15, 0x1a, 0xbb, 0x69, 0x91, 0xa8, 0xff, - 0xea, 0x32, 0xcc, 0xff, 0x34, 0x8f, 0x99, 0x72, 0xc5, 0xcb, 0x50, 0x98, 0x3c, 0xda, 0xf5, 0xd6, - 0x4d, 0xe3, 0x0b, 0x08, 0x31, 0x6a, 0x24, 0x90, 0x8f, 0xa1, 0x19, 0xe4, 0x1c, 0x3b, 0xbd, 0x99, - 0xae, 0xa6, 0xe7, 0x2c, 0x4b, 0x5f, 0xc0, 0x52, 0x50, 0xef, 0x65, 0x3a, 0x1e, 0xa8, 0x95, 0x8a, - 0x7e, 0xcc, 0x52, 0x91, 0x28, 0xeb, 0x2d, 0x43, 0x78, 0x3b, 0x70, 0xf9, 0xa5, 0x4f, 0xf0, 0xe8, - 0x34, 0xcd, 0x03, 0xf7, 0xb3, 0x6c, 0x08, 0xac, 0xae, 0xa9, 0x39, 0x60, 0x4b, 0x97, 0x23, 0xbd, - 0xe7, 0x00, 0xc7, 0x20, 0xe4, 0x7d, 0x68, 0xc4, 0xa8, 0x8b, 0x1d, 0xd3, 0xf7, 0x2f, 0xc2, 0x4e, - 0x6a, 0x44, 0x78, 0x3f, 0x86, 0x3a, 0x96, 0x0d, 0x8c, 0x1c, 0x3d, 0x2b, 0xd9, 0x48, 0xd3, 0x73, - 0x12, 0x86, 0x3e, 0x3f, 0x2c, 0x7f, 0x0d, 0x0d, 0x81, 0x56, 0x98, 0x98, 0x70, 0x45, 0xd5, 0x91, - 0x3a, 0xd0, 0x33, 0x96, 0xf3, 0x32, 0xd0, 0x91, 0xc0, 0x3f, 0x90, 0xa6, 0x99, 0x33, 0xc9, 0x4f, - 0x61, 0x33, 0xcb, 0xb9, 0x1e, 0x66, 0xa3, 0x88, 0x87, 0x7e, 0x2a, 0xad, 0x89, 0x17, 0x35, 0x50, - 0x6d, 0x2c, 0x8b, 0xdb, 0x93, 0xe4, 0x0b, 0xa8, 0x80, 0x38, 0x64, 0x8a, 0xfb, 0xb2, 0x98, 0x24, - 0x5c, 0x39, 0x4f, 0x6c, 0x58, 0xf6, 0xd8, 0x70, 0xbd, 0xe7, 0xd0, 0x76, 0xb3, 0x2b, 0x66, 0x6a, - 0x16, 0xb1, 0xc4, 0x5f, 0x6a, 0xe8, 0x6d, 0x64, 0x60, 0xb3, 0x25, 0xb7, 0xe1, 0xb2, 0xde, 0xb4, - 0x2d, 0xdb, 0x5f, 0x9a, 0x5d, 0x37, 0x71, 0xe3, 0xa9, 0xe1, 0xeb, 0xb3, 0x6f, 0xc2, 0xba, 0x1b, - 0x83, 0xfd, 0xc0, 0xa5, 0x69, 0x87, 0xae, 0x39, 0xe6, 0x4e, 0x1a, 0xf2, 0xad, 0x37, 0x60, 0x7d, - 0xc0, 0x23, 0xae, 0xb8, 0x7b, 0xa5, 0xdd, 0x80, 0xea, 0x70, 0xe0, 0xe6, 0xdd, 0xe1, 0x60, 0xfb, - 0x93, 0x16, 0x6c, 0xba, 0x2b, 0x18, 0xf3, 0x5c, 0x67, 0xe7, 0x2f, 0x2b, 0x50, 0x1f, 0x15, 0x72, - 0x4e, 0xbe, 0x72, 0x9a, 0x8b, 0x5c, 0x7a, 0x6c, 0xf6, 0xee, 0x9e, 0xe6, 0x43, 0xf3, 0x98, 0x7c, - 0xfd, 0xe7, 0x9f, 0xfc, 0xed, 0x77, 0xd5, 0xcb, 0x5b, 0x6b, 0x77, 0x0e, 0xef, 0x96, 0x8f, 0xe2, - 0x5f, 0xab, 0xdc, 0x26, 0xbf, 0xad, 0x40, 0xe3, 0xfe, 0x62, 0xf7, 0xde, 0x0e, 0xf9, 0xf2, 0x69, - 0x50, 0x8f, 0x5f, 0xa6, 0xbd, 0x33, 0x3d, 0x76, 0x6f, 0xbd, 0xae, 0x15, 0xba, 0xb6, 0x75, 0x69, - 0x59, 0xa1, 0x3b, 0x31, 0x0b, 0x50, 0xa9, 0xdf, 0x54, 0xa0, 0x7e, 0x7f, 0x31, 0x1c, 0xbd, 0x62, - 0x9d, 0x3c, 0xad, 0xd3, 0xd5, 0xad, 0xcd, 0x13, 0x3a, 0x89, 0x0c, 0x55, 0xfa, 0xb5, 0x51, 0x69, - 0xf0, 0x8a, 0x55, 0xba, 0xa1, 0x55, 0xba, 0x42, 0x2e, 0x9f, 0x50, 0xe9, 0x43, 0x11, 0x7e, 0x44, - 0x7e, 0x51, 0x81, 0xda, 0xbd, 0x28, 0x22, 0xa7, 0x8f, 0x86, 0x33, 0xea, 0x72, 0x55, 0xeb, 0xb2, - 0x41, 0x4e, 0xc4, 0xd0, 0x5b, 0x15, 0x72, 0x04, 0x8d, 0x67, 0x4c, 0x05, 0xf3, 0x57, 0x7b, 0x35, - 0x6f, 0x55, 0xc8, 0x21, 0x34, 0x4d, 0xfa, 0x91, 0x53, 0xbd, 0x8e, 0x9c, 0x48, 0xd9, 0x33, 0x24, - 0xd3, 0x7d, 0xf8, 0x5e, 0xdb, 0x71, 0x26, 0x4d, 0x7d, 0xe4, 0x4b, 0xff, 0x0e, 0x00, 0x00, 0xff, - 0xff, 0x76, 0xc7, 0x8a, 0x3b, 0x73, 0x1a, 0x00, 0x00, + // 1989 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xeb, 0x8e, 0x1c, 0x47, + 0x15, 0xd6, 0xdc, 0x76, 0x66, 0xce, 0xec, 0xc5, 0x2e, 0xdb, 0xf1, 0xb8, 0x03, 0xc4, 0x6c, 0x04, + 0x18, 0x23, 0x8d, 0xe3, 0x25, 0x02, 0x81, 0x00, 0xc9, 0xf6, 0xf8, 0x32, 0x21, 0xeb, 0x1d, 0x6a, + 0x1c, 0x9b, 0x70, 0x6b, 0x6a, 0xba, 0x6b, 0x66, 0x2a, 0xdb, 0xb7, 0x74, 0x55, 0xef, 0x7a, 0x88, + 0x12, 0x10, 0x12, 0xfc, 0x41, 0x08, 0x04, 0x3c, 0x01, 0x8f, 0xc0, 0x4f, 0xfe, 0xf0, 0x10, 0x79, + 0x03, 0x84, 0xe0, 0x19, 0xf8, 0x81, 0x84, 0x4e, 0x5d, 0x7a, 0x7b, 0x6d, 0x88, 0xe2, 0x9d, 0x5d, + 0xff, 0xab, 0x73, 0xaa, 0xfa, 0x3b, 0xe7, 0xd4, 0xb9, 0x56, 0xc3, 0xe5, 0x05, 0xcb, 0xc3, 0x43, + 0x96, 0xf3, 0x1b, 0x6e, 0x31, 0xc8, 0xf2, 0x54, 0xa5, 0xe4, 0xfa, 0x5c, 0xa8, 0x45, 0x31, 0x1d, + 0x04, 0x69, 0x3c, 0x50, 0x22, 0xd9, 0xe7, 0xf9, 0x94, 0x47, 0x91, 0x5e, 0x9a, 0x13, 0x72, 0xe0, + 0xbe, 0xf0, 0x3e, 0x33, 0x4f, 0xd3, 0x79, 0xc4, 0x6f, 0xb0, 0x4c, 0xdc, 0x60, 0x49, 0x92, 0x2a, + 0xa6, 0x44, 0x9a, 0x48, 0x73, 0x6e, 0xfb, 0x09, 0xf4, 0xc6, 0x85, 0x5c, 0x50, 0xfe, 0x7e, 0xc1, + 0xa5, 0x22, 0x0f, 0xa0, 0x19, 0x32, 0xc5, 0xfa, 0xb5, 0xab, 0xb5, 0x6b, 0xbd, 0x9d, 0x37, 0x07, + 0x9f, 0x5e, 0xce, 0xe0, 0x81, 0x5d, 0x50, 0x8d, 0xb0, 0xdd, 0x86, 0xd6, 0xdd, 0x38, 0x53, 0xcb, + 0xed, 0xef, 0x00, 0xdc, 0xe7, 0xca, 0x09, 0x38, 0x07, 0x8d, 0x98, 0x05, 0x1a, 0xbf, 0x4b, 0x71, + 0x49, 0x36, 0xa1, 0x2e, 0xb2, 0x7e, 0x5d, 0x33, 0xea, 0x22, 0xd3, 0x74, 0xd8, 0x6f, 0x58, 0x3a, + 0xdc, 0xfe, 0xd5, 0x57, 0xa0, 0xe3, 0xb0, 0xc9, 0xeb, 0xb0, 0xb1, 0x77, 0x7b, 0xb2, 0xf7, 0xf6, + 0xdd, 0x47, 0x77, 0xfd, 0xb7, 0x26, 0x7b, 0x0f, 0x2d, 0xd0, 0xba, 0x63, 0x22, 0x8f, 0xfc, 0xa4, + 0x72, 0x28, 0x5c, 0x04, 0x06, 0xbc, 0xb7, 0xf3, 0x8d, 0x93, 0x58, 0x33, 0x18, 0x3e, 0xb8, 0x33, + 0x3e, 0xc2, 0x1f, 0x2e, 0x82, 0x8c, 0xcc, 0xe1, 0x5c, 0x89, 0x9f, 0x70, 0x35, 0x4d, 0x53, 0xa5, + 0xf5, 0xed, 0xed, 0x7c, 0xeb, 0x44, 0x22, 0x1e, 0x1a, 0x0c, 0xba, 0xe5, 0x50, 0x2d, 0xe3, 0x59, + 0x41, 0x87, 0x69, 0xbe, 0xdf, 0x6f, 0x5e, 0x6d, 0xac, 0x22, 0x08, 0x31, 0x8e, 0x09, 0x42, 0x06, + 0x79, 0x17, 0x3a, 0x31, 0x57, 0x4c, 0xbb, 0xbe, 0xa5, 0x2d, 0xf9, 0xf6, 0x89, 0x04, 0xec, 0x5a, + 0x10, 0x5a, 0xc2, 0x91, 0xc7, 0xd0, 0x76, 0xaa, 0xaf, 0xad, 0x76, 0x47, 0x5a, 0x75, 0x07, 0x66, + 0xc3, 0xa4, 0xed, 0xc2, 0xc4, 0xfb, 0x67, 0x03, 0x9a, 0xe8, 0xab, 0xff, 0x11, 0x61, 0xaf, 0x41, + 0xaf, 0xbc, 0xc6, 0x32, 0xd4, 0xc0, 0xb1, 0x46, 0x19, 0xf1, 0xa0, 0xb3, 0x48, 0xa5, 0x4a, 0x58, + 0xcc, 0x6d, 0xe0, 0x95, 0x34, 0xf9, 0x2c, 0x40, 0xc4, 0x99, 0xe4, 0xbe, 0x12, 0x31, 0xef, 0x37, + 0xaf, 0xd6, 0xae, 0x35, 0x68, 0x57, 0x73, 0x1e, 0x89, 0x98, 0x93, 0xcf, 0xc3, 0x3a, 0x1e, 0xf3, + 0x25, 0xcf, 0x0f, 0x78, 0x2e, 0xfb, 0xad, 0xab, 0x8d, 0x6b, 0x5d, 0xda, 0x43, 0xde, 0xc4, 0xb0, + 0xf0, 0x08, 0x7e, 0x5b, 0x1e, 0x59, 0x33, 0x47, 0x90, 0xe7, 0x8e, 0x7c, 0xb9, 0xe2, 0xe8, 0x39, + 0x53, 0xfc, 0x90, 0x2d, 0xad, 0x69, 0xa5, 0xab, 0xee, 0x1b, 0x36, 0x21, 0xd0, 0x64, 0x79, 0xb0, + 0xe8, 0x77, 0xf4, 0xb6, 0x5e, 0x23, 0xaf, 0xe0, 0x33, 0xd1, 0xef, 0x5e, 0xad, 0x5d, 0xeb, 0x50, + 0xbd, 0x46, 0xbd, 0xc5, 0x8c, 0x05, 0xdc, 0xd7, 0x56, 0x81, 0x3e, 0xdd, 0xd5, 0x9c, 0x87, 0x68, + 0xd6, 0xdb, 0x3a, 0xeb, 0x7a, 0x2b, 0x78, 0x04, 0x2f, 0x7b, 0x30, 0x1a, 0x63, 0xce, 0x7a, 0xef, + 0x41, 0x7d, 0x34, 0x26, 0x7d, 0x68, 0xb3, 0x30, 0xcc, 0xb9, 0x94, 0xf6, 0xf6, 0x1d, 0x89, 0x3b, + 0x09, 0x57, 0x31, 0x93, 0xfb, 0xf6, 0xf6, 0x1d, 0x89, 0x3b, 0xce, 0x60, 0x73, 0xf3, 0x8e, 0x24, + 0xaf, 0xc0, 0xda, 0x8c, 0xc5, 0x22, 0x5a, 0xda, 0x4b, 0xb7, 0x94, 0xf7, 0xa7, 0x26, 0xb4, 0x5d, + 0x82, 0xbc, 0x0a, 0x5d, 0x16, 0x45, 0xe9, 0xa1, 0x9f, 0x3d, 0xe5, 0x5a, 0x66, 0x87, 0x76, 0x34, + 0x63, 0xfc, 0x94, 0x93, 0x2f, 0xc0, 0xa6, 0xd9, 0xc4, 0x78, 0x99, 0x45, 0xe9, 0xa1, 0x96, 0xdd, + 0xa1, 0x1b, 0x9a, 0xfb, 0xc4, 0x32, 0xc9, 0x3b, 0xd0, 0x14, 0xf8, 0xb9, 0xc9, 0xe0, 0x5b, 0xab, + 0x64, 0xf0, 0x60, 0x34, 0xfe, 0xfe, 0x5d, 0xaa, 0xe1, 0xc8, 0x47, 0x70, 0xa9, 0x74, 0x29, 0xee, + 0x49, 0x95, 0xb3, 0x2c, 0xe3, 0xb9, 0xb6, 0xa6, 0xb7, 0x33, 0x5a, 0x49, 0xce, 0xed, 0x0a, 0x20, + 0xbd, 0xe8, 0xe4, 0x54, 0xb9, 0x68, 0x56, 0x2a, 0x05, 0xb7, 0xe9, 0xbc, 0x9a, 0x59, 0x7b, 0x52, + 0x70, 0xaa, 0xe1, 0xbc, 0x37, 0xa1, 0x89, 0x46, 0x62, 0x96, 0x15, 0x79, 0xe4, 0xb2, 0xac, 0xc8, + 0x23, 0x4c, 0xa2, 0x20, 0x4d, 0x14, 0x4f, 0x94, 0xb4, 0x4e, 0x2e, 0x69, 0x6f, 0x13, 0xd6, 0xab, + 0xca, 0x79, 0xdf, 0x83, 0x26, 0x62, 0x92, 0x2b, 0xd0, 0x99, 0x62, 0x6e, 0x1d, 0x41, 0xb5, 0x91, + 0x7e, 0x27, 0x8f, 0xd0, 0xfd, 0xfb, 0x3c, 0x4f, 0x78, 0x64, 0xc1, 0x2c, 0x85, 0x7c, 0x91, 0x08, + 0x95, 0xbb, 0x16, 0x61, 0x29, 0xef, 0xef, 0x26, 0x2c, 0x74, 0x6d, 0x78, 0xae, 0x01, 0xd4, 0xce, + 0xbe, 0x01, 0xd4, 0xcf, 0xa2, 0x01, 0xcc, 0x00, 0x44, 0xa2, 0x78, 0x8e, 0x69, 0x2b, 0xfb, 0x0d, + 0x5d, 0xfa, 0xef, 0xad, 0x52, 0x3f, 0x07, 0x23, 0x07, 0x47, 0x2b, 0xc8, 0xe4, 0xfd, 0x8a, 0x41, + 0x21, 0x9f, 0xb1, 0x22, 0x52, 0x36, 0x4e, 0x4f, 0x4b, 0x5a, 0x69, 0xda, 0xd0, 0xc0, 0x7b, 0x7f, + 0xa9, 0x41, 0xb7, 0xdc, 0x26, 0xbb, 0xd0, 0x3c, 0x1d, 0x47, 0x69, 0x18, 0xdb, 0x74, 0x4e, 0xcd, + 0x2f, 0x0e, 0xcc, 0xfb, 0xf7, 0x15, 0xe8, 0xb8, 0x1e, 0x47, 0x2e, 0x42, 0x4b, 0x2a, 0xa6, 0xb8, + 0x8d, 0x5c, 0x43, 0x60, 0xb5, 0x9f, 0xa6, 0x49, 0x28, 0x92, 0xb9, 0x1f, 0xa7, 0x21, 0xd7, 0xf2, + 0x1b, 0xb4, 0x67, 0x79, 0xbb, 0x69, 0xc8, 0x49, 0x02, 0xeb, 0x31, 0x4b, 0x8a, 0x19, 0x0b, 0x54, + 0x91, 0xf3, 0xdc, 0x56, 0x9e, 0xb7, 0x56, 0xea, 0xb8, 0x83, 0xdd, 0x0a, 0x22, 0x3d, 0x86, 0x4f, + 0xa6, 0xd0, 0x11, 0x89, 0x54, 0x2c, 0x09, 0xf8, 0x4a, 0x5e, 0x2d, 0x65, 0x8d, 0x2c, 0x1a, 0x2d, + 0x71, 0xc9, 0x8f, 0x60, 0x2d, 0x28, 0xa4, 0x4a, 0x63, 0x5b, 0x70, 0x86, 0xab, 0x49, 0xb8, 0xa3, + 0xb1, 0xa8, 0xc5, 0x44, 0x0b, 0x66, 0x2c, 0x10, 0x91, 0x50, 0x4b, 0x3b, 0x45, 0xac, 0x68, 0xc1, + 0x3d, 0x8b, 0x46, 0x4b, 0x5c, 0x6f, 0x07, 0xd6, 0xab, 0x77, 0x68, 0x07, 0x8c, 0x9a, 0x1b, 0x30, + 0xb0, 0xc9, 0xca, 0xa8, 0x98, 0xdb, 0x72, 0xa4, 0xd7, 0xde, 0x5f, 0x2f, 0x40, 0xc7, 0x5d, 0xc6, + 0x73, 0x1f, 0x94, 0xf1, 0x51, 0xaf, 0xc6, 0xc7, 0x27, 0xcd, 0x1a, 0xc7, 0xda, 0x59, 0xf3, 0x99, + 0x76, 0xf6, 0x0a, 0xac, 0xe5, 0x5c, 0x06, 0x85, 0x29, 0xe9, 0x1d, 0x6a, 0x29, 0x32, 0x83, 0xfa, + 0xde, 0xc4, 0xde, 0xca, 0xe3, 0xd3, 0xf1, 0xeb, 0x60, 0x2f, 0xe3, 0x39, 0x53, 0x22, 0x99, 0x4f, + 0x96, 0x52, 0xf1, 0x98, 0xd6, 0xf7, 0x26, 0x38, 0x50, 0xb0, 0xe8, 0x90, 0x2d, 0xa5, 0xd6, 0xae, + 0xad, 0x75, 0xe8, 0x1a, 0x0e, 0xaa, 0xf7, 0x45, 0xd8, 0xc2, 0xbe, 0xe7, 0xcb, 0x20, 0x17, 0x99, + 0xd2, 0x15, 0xdd, 0x8c, 0x28, 0x1b, 0xc8, 0x9e, 0x68, 0x2e, 0xd6, 0xf5, 0x1f, 0x42, 0x43, 0x64, + 0xb2, 0xdf, 0xd5, 0xb5, 0x6c, 0x74, 0x4a, 0xfa, 0x8e, 0xc6, 0x14, 0x51, 0xf1, 0x72, 0x0b, 0xc9, + 0x73, 0x3d, 0xc7, 0x9a, 0x91, 0xa7, 0xa4, 0xc9, 0x0e, 0x5c, 0x0a, 0xf2, 0x65, 0xa6, 0x78, 0xe8, + 0xe7, 0x69, 0xaa, 0xfc, 0x8c, 0x49, 0x79, 0x98, 0xe6, 0xa1, 0x1e, 0x82, 0xba, 0xf4, 0x82, 0xdd, + 0xa4, 0x69, 0xaa, 0xc6, 0x76, 0x0b, 0x7d, 0xae, 0xd8, 0x5c, 0xf6, 0xd7, 0xf5, 0xc8, 0xa6, 0xd7, + 0x64, 0x01, 0x6d, 0xa9, 0xd2, 0x9c, 0xcd, 0x79, 0x7f, 0x43, 0x5f, 0xfa, 0xc3, 0x53, 0x32, 0x62, + 0x62, 0x50, 0xa9, 0x83, 0xc7, 0xee, 0x28, 0xe5, 0xc2, 0xdf, 0xe7, 0x4b, 0xd9, 0xdf, 0xd4, 0x1a, + 0xb4, 0xa5, 0x5c, 0x7c, 0x97, 0x2f, 0x25, 0xbe, 0x83, 0xec, 0x20, 0xec, 0xe7, 0x9c, 0x85, 0xcb, + 0xfe, 0x96, 0xf6, 0xc7, 0xba, 0x65, 0x52, 0xe4, 0x79, 0xbf, 0xad, 0xc1, 0xd6, 0x33, 0x9e, 0x2c, + 0xa3, 0xb8, 0x76, 0x14, 0xc5, 0x18, 0x59, 0xa1, 0x90, 0x2a, 0x4f, 0x5d, 0xab, 0x35, 0x14, 0xce, + 0x66, 0x38, 0x9d, 0x8a, 0x34, 0x71, 0xb3, 0x99, 0x25, 0x31, 0x50, 0x45, 0xcc, 0xe6, 0xdc, 0x57, + 0x6c, 0xae, 0x03, 0xb5, 0x4b, 0x3b, 0x9a, 0xf1, 0x88, 0xcd, 0xc9, 0x65, 0x68, 0xa7, 0xd2, 0xd7, + 0x52, 0x5a, 0x06, 0x2f, 0x95, 0x13, 0xcc, 0x96, 0x3f, 0xd7, 0x5e, 0xde, 0x98, 0x88, 0xfc, 0xac, + 0x98, 0x46, 0x22, 0x70, 0xe9, 0x62, 0x28, 0xf2, 0x39, 0x80, 0x98, 0x25, 0x6c, 0xce, 0x63, 0x9e, + 0x28, 0x9d, 0x36, 0x1d, 0x5a, 0xe1, 0x78, 0xff, 0xea, 0x41, 0xdb, 0x7a, 0x02, 0x27, 0xc8, 0xa3, + 0xb6, 0x28, 0xe4, 0x3e, 0x2a, 0x8c, 0x6e, 0x28, 0xa7, 0x8b, 0x21, 0x32, 0x8f, 0x3d, 0x4a, 0x73, + 0x26, 0xc2, 0x7e, 0x5d, 0x9f, 0x2a, 0x67, 0x06, 0xca, 0x44, 0x48, 0x6e, 0x42, 0x39, 0xa7, 0xf9, + 0x33, 0x11, 0x71, 0xa9, 0xfd, 0x61, 0x9a, 0x7a, 0x97, 0x5e, 0x70, 0x7b, 0xf7, 0x8e, 0xb6, 0x88, + 0x80, 0x96, 0x91, 0x6a, 0xde, 0x7c, 0x93, 0xd3, 0x8d, 0xb3, 0x01, 0x2a, 0x4f, 0x8d, 0x04, 0x32, + 0x87, 0xa6, 0xd6, 0xbc, 0x75, 0x26, 0x92, 0xe8, 0xad, 0xd1, 0x90, 0x6a, 0x01, 0xe4, 0x03, 0xe8, + 0x55, 0xad, 0x5f, 0xd3, 0xf2, 0xde, 0x3d, 0x65, 0x79, 0x47, 0x97, 0x48, 0xab, 0xd2, 0xbc, 0xbf, + 0xd5, 0xa1, 0x89, 0x56, 0xeb, 0x88, 0xe7, 0x07, 0x22, 0x70, 0xbd, 0xdb, 0x52, 0x58, 0xe3, 0x0e, + 0x45, 0x86, 0x61, 0x3d, 0x8d, 0xb8, 0x7d, 0x2e, 0x74, 0x91, 0xf3, 0x08, 0x19, 0xe4, 0x43, 0x80, + 0x8c, 0xe5, 0x4a, 0xe8, 0x1f, 0x28, 0x76, 0x1c, 0xfb, 0xf1, 0x19, 0x78, 0x65, 0x30, 0x76, 0x52, + 0x68, 0x45, 0xa0, 0xf7, 0x8b, 0x1a, 0x74, 0xcb, 0x1d, 0x6c, 0x2f, 0x11, 0x9b, 0x72, 0x37, 0x38, + 0x1b, 0x02, 0x2d, 0x4b, 0x8a, 0x78, 0xca, 0x73, 0x3b, 0x78, 0x58, 0x4a, 0xe7, 0xbd, 0xf8, 0x99, + 0x69, 0x39, 0x0d, 0xaa, 0xd7, 0xb6, 0x41, 0xe5, 0xca, 0x66, 0x8e, 0x21, 0x30, 0xb7, 0xd5, 0x32, + 0xe3, 0xfe, 0xbc, 0xd0, 0xf1, 0xa0, 0x73, 0x1b, 0x19, 0xf7, 0x0b, 0x11, 0x7a, 0x09, 0x34, 0xf1, + 0x72, 0x11, 0x2e, 0x63, 0x6a, 0xe1, 0xca, 0x08, 0xae, 0x3f, 0xe9, 0x01, 0x80, 0xe7, 0xf5, 0x34, + 0x64, 0xc5, 0xe3, 0x5a, 0x3f, 0x21, 0x44, 0x68, 0x85, 0xe3, 0x12, 0x39, 0x73, 0x2b, 0xb4, 0x41, + 0x71, 0xe9, 0xfd, 0xa7, 0x0e, 0xad, 0xdd, 0xb4, 0x48, 0xd4, 0xff, 0x75, 0x19, 0xe6, 0x7f, 0x9a, + 0xc7, 0x4c, 0xb9, 0xe2, 0x65, 0x28, 0x4c, 0x1e, 0xed, 0x7a, 0xeb, 0xa6, 0xc9, 0x19, 0x84, 0x18, + 0x35, 0x12, 0xc8, 0x47, 0xb0, 0x16, 0xe4, 0x1c, 0x3b, 0xbd, 0x99, 0xae, 0x66, 0xa7, 0x2c, 0x4b, + 0x5f, 0x40, 0x25, 0xa8, 0xf7, 0x32, 0x1d, 0x0f, 0xd4, 0x4a, 0x45, 0x3f, 0x66, 0xa9, 0x48, 0x94, + 0xf5, 0x96, 0x21, 0xbc, 0x3b, 0x70, 0xfe, 0xb9, 0x4f, 0xf0, 0xe8, 0x2c, 0xcd, 0x03, 0xf7, 0x58, + 0x36, 0x04, 0x56, 0xd7, 0xd4, 0x1c, 0xb0, 0xa5, 0xcb, 0x91, 0xde, 0x53, 0x80, 0x23, 0x10, 0xf2, + 0x1e, 0xb4, 0x62, 0xd4, 0xc5, 0x8e, 0xe9, 0x8f, 0xce, 0xc2, 0x4e, 0x6a, 0x44, 0x78, 0x3f, 0x85, + 0x26, 0x96, 0x0d, 0x8c, 0x1c, 0x3d, 0x2b, 0xd9, 0x48, 0xd3, 0x73, 0x12, 0x86, 0x3e, 0x3f, 0x28, + 0x9f, 0x86, 0x86, 0x40, 0x2b, 0x4c, 0x4c, 0xb8, 0xa2, 0xea, 0x48, 0x1d, 0xe8, 0x19, 0xcb, 0x79, + 0x19, 0xe8, 0x48, 0xe0, 0x0b, 0x64, 0xcd, 0xcc, 0x99, 0xe4, 0xe7, 0xb0, 0x95, 0xe5, 0x5c, 0x0f, + 0xb3, 0x51, 0xc4, 0x43, 0x3f, 0x95, 0xd6, 0xc4, 0xb3, 0x1a, 0xa8, 0x36, 0xab, 0xe2, 0xf6, 0x24, + 0xf9, 0x12, 0x2a, 0x20, 0x0e, 0x98, 0xe2, 0xbe, 0x2c, 0xa6, 0x09, 0x57, 0xce, 0x13, 0x9b, 0x96, + 0x3d, 0x31, 0x5c, 0xef, 0x29, 0x74, 0xdc, 0xec, 0x8a, 0x99, 0x9a, 0x45, 0x2c, 0xf1, 0x2b, 0x0d, + 0xbd, 0x83, 0x0c, 0x6c, 0xb6, 0xe4, 0x3a, 0x9c, 0xd7, 0x9b, 0xb6, 0x65, 0xfb, 0x95, 0xd9, 0x75, + 0x0b, 0x37, 0x1e, 0x1b, 0xbe, 0x3e, 0xfb, 0x3a, 0x6c, 0xb8, 0x31, 0xd8, 0x0f, 0x5c, 0x9a, 0x76, + 0xe9, 0xba, 0x63, 0xde, 0x49, 0x43, 0xbe, 0xfd, 0x1a, 0x6c, 0x0c, 0x79, 0xc4, 0x15, 0x77, 0xbf, + 0x72, 0x37, 0xa1, 0x3e, 0x1a, 0xba, 0x79, 0x77, 0x34, 0xdc, 0xf9, 0xb8, 0x0d, 0x5b, 0xee, 0x0a, + 0x26, 0x3c, 0xd7, 0xd9, 0xf9, 0x9b, 0x1a, 0x34, 0xc7, 0x85, 0x5c, 0x90, 0xaf, 0xbf, 0xc8, 0x45, + 0x56, 0xfe, 0x48, 0x7b, 0x37, 0x5f, 0xe4, 0x43, 0xf3, 0xc7, 0xf9, 0xf2, 0x2f, 0x3f, 0xfe, 0xc7, + 0x1f, 0xeb, 0xe7, 0xb7, 0xd7, 0x6f, 0x1c, 0xdc, 0x2c, 0xff, 0x9c, 0x7f, 0xb3, 0x76, 0x9d, 0xfc, + 0xa1, 0x06, 0xad, 0xdb, 0xcb, 0xdd, 0x5b, 0x77, 0xc8, 0xd7, 0x5e, 0x04, 0xf5, 0xe8, 0xf7, 0xb5, + 0x77, 0xa2, 0x3f, 0xe2, 0xdb, 0xaf, 0x6a, 0x85, 0x2e, 0x6d, 0x9f, 0xab, 0x2a, 0x74, 0x23, 0x66, + 0x01, 0x2a, 0xf5, 0xfb, 0x1a, 0x34, 0x6f, 0x2f, 0x47, 0xe3, 0x97, 0xac, 0x93, 0xa7, 0x75, 0xba, + 0xb8, 0xbd, 0x75, 0x4c, 0x27, 0x91, 0xa1, 0x4a, 0xbf, 0x33, 0x2a, 0x0d, 0x5f, 0xb2, 0x4a, 0x57, + 0xb4, 0x4a, 0x17, 0xc8, 0xf9, 0x63, 0x2a, 0x7d, 0x20, 0xc2, 0x0f, 0xc9, 0xaf, 0x6b, 0xd0, 0xb8, + 0x15, 0x45, 0xe4, 0xc5, 0xa3, 0xe1, 0x84, 0xba, 0x5c, 0xd4, 0xba, 0x6c, 0x92, 0x63, 0x31, 0xf4, + 0x46, 0x8d, 0x1c, 0x42, 0xeb, 0x09, 0x53, 0xc1, 0xe2, 0xe5, 0x5e, 0xcd, 0x1b, 0x35, 0x72, 0x00, + 0x6b, 0x26, 0xfd, 0xc8, 0x0b, 0xfd, 0x1d, 0x39, 0x96, 0xb2, 0x27, 0x48, 0xa6, 0xdb, 0xf0, 0x83, + 0x8e, 0xe3, 0x4c, 0xd7, 0xf4, 0x91, 0xaf, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x24, 0xfe, + 0xda, 0x98, 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 7d9fbc4f4..9c816d71f 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -214,12 +214,13 @@ message Hardware { Facility facility = 6; } - string id = 1; + string OBSOLETE_JSON = 1; // obsolete DHCP OBSOLETE_dhcp = 2; // obsolete Netboot OBSOLETE_netboot = 3; //obsolete repeated Network OBSOLETE_network = 4; // obsolete Metadata metadata = 5; Network network = 6; + string id = 7; } diff --git a/protos/template/template.pb.go b/protos/template/template.pb.go index 365cadb4e..9d8b4a3d1 100644 --- a/protos/template/template.pb.go +++ b/protos/template/template.pb.go @@ -61,10 +61,11 @@ var xxx_messageInfo_Empty proto.InternalMessageInfo type WorkflowTemplate struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + OBSOLETEData []byte `protobuf:"bytes,3,opt,name=OBSOLETE_data,json=OBSOLETEData,proto3" json:"OBSOLETE_data,omitempty"` CreatedAt *timestamp.Timestamp `protobuf:"bytes,4,opt,name=createdAt,proto3" json:"createdAt,omitempty"` UpdatedAt *timestamp.Timestamp `protobuf:"bytes,5,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` DeletedAt *timestamp.Timestamp `protobuf:"bytes,6,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` + Data string `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -109,11 +110,11 @@ func (m *WorkflowTemplate) GetName() string { return "" } -func (m *WorkflowTemplate) GetData() string { +func (m *WorkflowTemplate) GetOBSOLETEData() []byte { if m != nil { - return m.Data + return m.OBSOLETEData } - return "" + return nil } func (m *WorkflowTemplate) GetCreatedAt() *timestamp.Timestamp { @@ -137,6 +138,13 @@ func (m *WorkflowTemplate) GetDeletedAt() *timestamp.Timestamp { return nil } +func (m *WorkflowTemplate) GetData() string { + if m != nil { + return m.Data + } + return "" +} + type CreateResponse struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -225,34 +233,36 @@ func init() { func init() { proto.RegisterFile("template/template.proto", fileDescriptor_dca67df6b60706ce) } var fileDescriptor_dca67df6b60706ce = []byte{ - // 425 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x8b, 0xd3, 0x40, - 0x14, 0xc7, 0x99, 0xb8, 0x5b, 0x77, 0x67, 0xd9, 0xac, 0x0c, 0x8a, 0x21, 0xec, 0xa1, 0xe4, 0x54, - 0x7a, 0x98, 0xd8, 0x0a, 0x22, 0xc5, 0x8b, 0xbf, 0xe8, 0xc5, 0x53, 0xa8, 0x08, 0xde, 0x26, 0xcd, - 0x6b, 0x1d, 0x9a, 0x64, 0x62, 0xe6, 0x45, 0x11, 0xf1, 0xa0, 0x77, 0x4f, 0x1e, 0xc4, 0x93, 0x17, - 0xff, 0x23, 0xff, 0x05, 0xff, 0x08, 0x8f, 0x92, 0x99, 0x26, 0xa5, 0x55, 0xa8, 0xa1, 0x7b, 0x7b, - 0x7c, 0xf3, 0xfd, 0x66, 0x3e, 0xef, 0xbd, 0x19, 0x7a, 0x1b, 0x21, 0x2b, 0x52, 0x81, 0x10, 0x36, - 0x05, 0x2f, 0x4a, 0x85, 0x8a, 0x0d, 0x97, 0x12, 0x5f, 0x55, 0x31, 0x9f, 0xab, 0x8c, 0xa3, 0xcc, - 0x57, 0x50, 0xc6, 0x90, 0xa6, 0xa6, 0xb4, 0x0e, 0xcd, 0x9b, 0x84, 0x7f, 0xb9, 0x54, 0x6a, 0x99, - 0x42, 0x28, 0x0a, 0x19, 0x8a, 0x3c, 0x57, 0x28, 0x50, 0xaa, 0x5c, 0x5b, 0x9f, 0x7f, 0x81, 0x32, - 0x03, 0x8d, 0x22, 0x2b, 0xac, 0x10, 0x5c, 0xa7, 0xc7, 0x4f, 0xb3, 0x02, 0xdf, 0x05, 0xbf, 0x09, - 0xbd, 0xf1, 0x42, 0x95, 0xab, 0x45, 0xaa, 0xde, 0xce, 0xd6, 0x3f, 0x63, 0x2e, 0x75, 0x64, 0xe2, - 0x91, 0x3e, 0x19, 0x9c, 0x46, 0x8e, 0x4c, 0x18, 0xa3, 0x47, 0xb9, 0xc8, 0xc0, 0x73, 0x8c, 0x62, - 0xea, 0x5a, 0x4b, 0x04, 0x0a, 0xef, 0x9a, 0xd5, 0xea, 0x9a, 0xdd, 0xa7, 0xa7, 0xf3, 0x12, 0x04, - 0x42, 0xf2, 0x10, 0xbd, 0xa3, 0x3e, 0x19, 0x9c, 0x8d, 0x7d, 0x6e, 0xc1, 0xec, 0xb9, 0x71, 0xb5, - 0xe0, 0xb3, 0x06, 0x25, 0xda, 0x98, 0xeb, 0x64, 0x55, 0x24, 0xeb, 0xe4, 0xf1, 0xfe, 0x64, 0x6b, - 0xae, 0x93, 0x09, 0xa4, 0x60, 0x93, 0xbd, 0xfd, 0xc9, 0xd6, 0x1c, 0xf4, 0xa9, 0xfb, 0xd8, 0x00, - 0x44, 0xa0, 0x0b, 0x95, 0xeb, 0xbf, 0xfa, 0x0e, 0x2e, 0x29, 0x9d, 0x02, 0x46, 0xf0, 0xba, 0x02, - 0x8d, 0xbb, 0x5f, 0xc7, 0x9f, 0x7b, 0xf4, 0xa4, 0x1d, 0xd9, 0x0f, 0xd2, 0xfc, 0xad, 0x95, 0x1e, - 0xf0, 0xff, 0xdf, 0x1f, 0xdf, 0xdd, 0x81, 0x3f, 0xe9, 0x92, 0xde, 0xee, 0x23, 0xf0, 0x3e, 0xfd, - 0xfc, 0xf5, 0xc5, 0x61, 0xc1, 0x79, 0xf8, 0x66, 0xd4, 0x5e, 0x2a, 0x3d, 0x21, 0x43, 0xf6, 0x9d, - 0xd0, 0xb3, 0x29, 0x60, 0xcb, 0x78, 0xaf, 0xcb, 0x29, 0x9b, 0x59, 0xf8, 0x07, 0xf5, 0x16, 0xf8, - 0x86, 0xef, 0x26, 0x63, 0x5b, 0x7c, 0xe1, 0x7b, 0x99, 0x7c, 0x60, 0x5f, 0x09, 0x75, 0x9f, 0x98, - 0x1d, 0x1d, 0x0c, 0x39, 0xea, 0x92, 0xb3, 0xcf, 0x61, 0x4d, 0x36, 0xfc, 0x17, 0xd9, 0x37, 0x42, - 0xcf, 0x9f, 0x49, 0xdd, 0x0e, 0x4f, 0xb3, 0xee, 0x07, 0x1c, 0x38, 0xb8, 0x5b, 0x06, 0xef, 0x82, - 0x6d, 0x2f, 0xf6, 0x0e, 0x61, 0x1f, 0x09, 0x75, 0x9f, 0x9b, 0x37, 0x71, 0x45, 0xd7, 0xaf, 0x7b, - 0x6b, 0x8f, 0xe8, 0xcb, 0x93, 0x46, 0x89, 0x7b, 0xc6, 0x72, 0xf7, 0x4f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xf9, 0xe7, 0x74, 0xcc, 0xdc, 0x04, 0x00, 0x00, + // 452 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6b, 0xd4, 0x40, + 0x14, 0xc7, 0x99, 0xd8, 0x6e, 0xdb, 0xd7, 0xee, 0x56, 0x06, 0xc5, 0x10, 0x7a, 0x58, 0xe2, 0x65, + 0xd9, 0xc3, 0xc4, 0x56, 0x10, 0x29, 0x5e, 0xac, 0x5d, 0x7a, 0x29, 0x14, 0xe2, 0x8a, 0xe0, 0x45, + 0x66, 0x9b, 0xd7, 0x75, 0x68, 0x92, 0x89, 0x3b, 0x2f, 0x8a, 0x88, 0x07, 0xbd, 0x7b, 0xf2, 0x20, + 0x1e, 0xc4, 0x8b, 0xdf, 0xc8, 0xaf, 0xe0, 0x07, 0x91, 0xcc, 0x6c, 0x52, 0xb6, 0x0a, 0x35, 0x6c, + 0x6f, 0x8f, 0x97, 0xff, 0x3f, 0xf3, 0xfb, 0xbf, 0x37, 0x03, 0x77, 0x08, 0xb3, 0x22, 0x95, 0x84, + 0x51, 0x5d, 0x88, 0x62, 0xa6, 0x49, 0xf3, 0xe1, 0x54, 0xd1, 0xab, 0x72, 0x22, 0x4e, 0x75, 0x26, + 0x48, 0xe5, 0xe7, 0x38, 0x9b, 0x60, 0x9a, 0xda, 0xd2, 0x29, 0x8c, 0xa8, 0x1d, 0xc1, 0xce, 0x54, + 0xeb, 0x69, 0x8a, 0x91, 0x2c, 0x54, 0x24, 0xf3, 0x5c, 0x93, 0x24, 0xa5, 0x73, 0xe3, 0x74, 0xc1, + 0x36, 0xa9, 0x0c, 0x0d, 0xc9, 0xac, 0x70, 0x8d, 0x70, 0x0d, 0x56, 0x47, 0x59, 0x41, 0xef, 0xc2, + 0xef, 0x1e, 0xdc, 0x7c, 0xae, 0x67, 0xe7, 0x67, 0xa9, 0x7e, 0x3b, 0x9e, 0xff, 0x8c, 0xf7, 0xc0, + 0x53, 0x89, 0xcf, 0xfa, 0x6c, 0xb0, 0x11, 0x7b, 0x2a, 0xe1, 0x1c, 0x56, 0x72, 0x99, 0xa1, 0xef, + 0xd9, 0x8e, 0xad, 0xf9, 0x5d, 0xe8, 0x9e, 0x1c, 0x3c, 0x3d, 0x39, 0x1e, 0x8d, 0x47, 0x2f, 0x13, + 0x49, 0xd2, 0xbf, 0xd1, 0x67, 0x83, 0xad, 0x78, 0xab, 0x6e, 0x1e, 0x4a, 0x92, 0xfc, 0x21, 0x6c, + 0x9c, 0xce, 0x50, 0x12, 0x26, 0x8f, 0xc9, 0x5f, 0xe9, 0xb3, 0xc1, 0xe6, 0x5e, 0x20, 0x1c, 0xa9, + 0x03, 0x99, 0x94, 0x67, 0x62, 0x5c, 0xb3, 0xc5, 0x17, 0xe2, 0xca, 0x59, 0x16, 0xc9, 0xdc, 0xb9, + 0x7a, 0xb5, 0xb3, 0x11, 0x57, 0xce, 0x04, 0x53, 0x74, 0xce, 0xce, 0xd5, 0xce, 0x46, 0x5c, 0xc5, + 0xb4, 0x49, 0xd6, 0x5c, 0xcc, 0xaa, 0x0e, 0xfb, 0xd0, 0x7b, 0x62, 0xa1, 0x62, 0x34, 0x85, 0xce, + 0xcd, 0x5f, 0xc3, 0x09, 0x77, 0x00, 0x8e, 0x90, 0x62, 0x7c, 0x5d, 0xa2, 0xa1, 0xcb, 0x5f, 0xf7, + 0x3e, 0x77, 0x60, 0xbd, 0x99, 0xeb, 0x4f, 0x56, 0xff, 0xad, 0x69, 0x3d, 0x12, 0xff, 0xbf, 0x64, + 0x71, 0x79, 0x51, 0xc1, 0x7e, 0x1b, 0xf7, 0x62, 0x8e, 0xd0, 0xff, 0xf4, 0xeb, 0xf7, 0x17, 0x8f, + 0x87, 0xdd, 0xe8, 0xcd, 0x6e, 0x73, 0xf3, 0xcc, 0x3e, 0x1b, 0xf2, 0x1f, 0x0c, 0x36, 0x8f, 0x90, + 0x1a, 0xc6, 0x07, 0x6d, 0x4e, 0xb9, 0x98, 0x45, 0xb0, 0x54, 0xb6, 0x30, 0xb0, 0x7c, 0xb7, 0x38, + 0x5f, 0xe0, 0x8b, 0xde, 0xab, 0xe4, 0x03, 0xff, 0xca, 0xa0, 0x77, 0x68, 0xf7, 0xb6, 0x34, 0xe4, + 0x6e, 0x1b, 0x9f, 0x7b, 0x33, 0x73, 0xb2, 0xe1, 0xbf, 0xc8, 0xbe, 0x31, 0xe8, 0x1e, 0x2b, 0xd3, + 0x0c, 0xcf, 0xf0, 0xf6, 0x07, 0x2c, 0x39, 0xb8, 0xdb, 0x16, 0x6f, 0x9b, 0x2f, 0x2e, 0xf6, 0x1e, + 0xe3, 0x1f, 0x19, 0xf4, 0x9e, 0xd9, 0x77, 0x72, 0x4d, 0xd7, 0xaf, 0x7d, 0xb4, 0x03, 0x78, 0xb1, + 0x5e, 0x77, 0x26, 0x1d, 0x2b, 0xb9, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x05, 0xbe, 0xa2, + 0x01, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/template/template.proto b/protos/template/template.proto index 9e6eaf469..eb23b9b2e 100644 --- a/protos/template/template.proto +++ b/protos/template/template.proto @@ -38,10 +38,11 @@ message Empty { message WorkflowTemplate { string id = 1; string name = 2; - string data = 3; + bytes OBSOLETE_data = 3; // obsolete google.protobuf.Timestamp createdAt = 4; google.protobuf.Timestamp updatedAt = 5; google.protobuf.Timestamp deletedAt = 6; + string data = 7; } message CreateResponse { diff --git a/protos/workflow/workflow.pb.go b/protos/workflow/workflow.pb.go index 042e9f0ff..8d5ede592 100644 --- a/protos/workflow/workflow.pb.go +++ b/protos/workflow/workflow.pb.go @@ -969,242 +969,86 @@ func init() { } var fileDescriptor_87aff9429097fa52 = []byte{ -<<<<<<< HEAD -<<<<<<< HEAD - // 1232 bytes of a gzipped FileDescriptorProto + // 1256 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xae, 0xe3, 0xd8, 0x7e, 0x8e, 0x9d, 0x74, 0x1a, 0x1a, 0xe3, 0x16, 0x61, 0x56, 0x42, - 0x8a, 0x72, 0x70, 0xda, 0x40, 0x81, 0x06, 0x09, 0x48, 0x6d, 0xd7, 0xb2, 0xd4, 0x3a, 0xd5, 0xda, - 0xa1, 0x12, 0x20, 0x59, 0x13, 0xef, 0x24, 0x59, 0xc5, 0xbb, 0xeb, 0xee, 0x8c, 0x93, 0x22, 0x84, - 0x90, 0xb8, 0x21, 0x2e, 0x20, 0x0e, 0x48, 0x88, 0x03, 0x82, 0x8f, 0xc4, 0x15, 0x38, 0xf1, 0x1d, - 0xb8, 0xa2, 0xf9, 0x67, 0xef, 0xda, 0x21, 0xc1, 0xeb, 0x4b, 0x6f, 0xfb, 0xfe, 0xfc, 0xde, 0xfc, - 0xf6, 0xbd, 0x37, 0xf3, 0x1e, 0x6c, 0x5e, 0x04, 0xe1, 0xd9, 0xf1, 0x20, 0xb8, 0xd8, 0xd1, 0x1f, - 0xd5, 0x61, 0x18, 0xb0, 0x00, 0x6d, 0x9f, 0xb8, 0xec, 0x74, 0x74, 0x54, 0xed, 0x07, 0x5e, 0x95, - 0xb9, 0xfe, 0x19, 0x09, 0x8f, 0xc8, 0x60, 0x20, 0x3e, 0xa5, 0x07, 0xad, 0x6a, 0x44, 0xf9, 0xce, - 0x49, 0x10, 0x9c, 0x0c, 0xc8, 0x0e, 0x1e, 0xba, 0x3b, 0xd8, 0xf7, 0x03, 0x86, 0x99, 0x1b, 0xf8, - 0x54, 0xfa, 0x95, 0xd7, 0x98, 0xeb, 0x11, 0xca, 0xb0, 0x37, 0x94, 0x0a, 0x2b, 0x03, 0xe9, 0x86, - 0x37, 0x64, 0x9f, 0x5b, 0x7f, 0x9a, 0x90, 0x7d, 0xa6, 0x82, 0xa0, 0x22, 0x98, 0xae, 0x53, 0x32, - 0x2a, 0xc6, 0x56, 0xce, 0x36, 0x5d, 0x07, 0x95, 0x21, 0xcb, 0x88, 0x37, 0x1c, 0x60, 0x46, 0x4a, - 0xa6, 0xd0, 0x8e, 0x65, 0x6e, 0x3b, 0xc5, 0xa1, 0x73, 0x81, 0x43, 0x52, 0x4a, 0x49, 0x9b, 0x96, - 0x51, 0x13, 0xd2, 0x94, 0x71, 0xd0, 0x72, 0xc5, 0xd8, 0x2a, 0xee, 0xde, 0xab, 0xfe, 0xff, 0x1f, - 0xa9, 0x76, 0x38, 0xd0, 0x96, 0x78, 0xf4, 0x1e, 0xe4, 0xfa, 0x21, 0xc1, 0x8c, 0x38, 0xfb, 0xac, - 0x94, 0xae, 0x18, 0x5b, 0xf9, 0xdd, 0x72, 0x55, 0xfe, 0xa9, 0x04, 0x1e, 0x8d, 0x8e, 0xab, 0x5d, - 0xfd, 0x6f, 0xf6, 0xc4, 0x99, 0x23, 0x47, 0x43, 0x47, 0x21, 0x57, 0xae, 0x47, 0x8e, 0x9d, 0x39, - 0xd2, 0x21, 0x03, 0x22, 0x91, 0x99, 0xeb, 0x91, 0x63, 0x67, 0x84, 0x60, 0xd9, 0xc1, 0x0c, 0x97, - 0xb2, 0x22, 0x1d, 0xe2, 0xdb, 0x6a, 0x42, 0xa1, 0x26, 0x48, 0xd9, 0xe4, 0xf9, 0x88, 0x50, 0x16, - 0xcb, 0xa9, 0x71, 0x45, 0x4e, 0xcd, 0x78, 0x4e, 0xad, 0x0a, 0x14, 0x75, 0x20, 0x3a, 0x0c, 0x7c, - 0x4a, 0xa6, 0xab, 0x65, 0xdd, 0x01, 0x68, 0x12, 0xa6, 0xcf, 0x99, 0xb6, 0xfe, 0x63, 0xc2, 0x9a, - 0x2e, 0x74, 0x2d, 0xf0, 0x19, 0x79, 0xc1, 0xd0, 0xeb, 0x90, 0xd7, 0x79, 0xef, 0x8d, 0x9d, 0x41, - 0xab, 0x5a, 0x0e, 0x7a, 0x13, 0x8a, 0xfd, 0x51, 0x18, 0x12, 0x9f, 0xf5, 0xb8, 0x96, 0x84, 0x8a, - 0x56, 0x41, 0x69, 0x9f, 0x09, 0x25, 0x7a, 0x03, 0x56, 0xb5, 0x1b, 0xc3, 0xf4, 0x4c, 0xf5, 0x43, - 0x5e, 0xe9, 0xba, 0x98, 0x9e, 0x45, 0x23, 0xe1, 0x3e, 0x6f, 0x4d, 0xd1, 0x1b, 0x93, 0x48, 0xfb, - 0x42, 0x89, 0xee, 0xc2, 0x46, 0xdc, 0xad, 0xe7, 0xfa, 0x0e, 0x79, 0x21, 0x6a, 0x9f, 0xb2, 0x51, - 0xcc, 0xb9, 0xc5, 0x2d, 0xc8, 0x9d, 0x41, 0xc8, 0xd6, 0x5b, 0x11, 0xad, 0xf7, 0xee, 0x3c, 0xad, - 0x27, 0xc3, 0xca, 0x06, 0x8c, 0x1f, 0x25, 0x74, 0xe8, 0x3e, 0x6c, 0xb2, 0x80, 0xe1, 0x41, 0xcf, - 0x1f, 0x79, 0x47, 0x24, 0xec, 0x05, 0xc7, 0xea, 0x48, 0x2a, 0xfa, 0x24, 0x65, 0x6f, 0x08, 0x73, - 0x5b, 0x58, 0x0f, 0x8e, 0x25, 0x94, 0x5a, 0x7f, 0x99, 0xb0, 0xa1, 0x33, 0x3f, 0x09, 0x37, 0xa2, - 0xd7, 0xa7, 0xff, 0x36, 0xe4, 0x78, 0x3e, 0x7b, 0x3e, 0xf6, 0x26, 0x17, 0x10, 0xd3, 0xb3, 0x36, - 0xf6, 0x08, 0x47, 0xab, 0x1f, 0x16, 0x66, 0x99, 0x73, 0x90, 0x2a, 0xe1, 0xf0, 0x19, 0x14, 0x22, - 0x19, 0x19, 0x51, 0x75, 0x1b, 0x13, 0xa7, 0x64, 0x15, 0x47, 0xc9, 0x97, 0x20, 0x43, 0x49, 0x3f, - 0xf0, 0x1d, 0xaa, 0x8a, 0xa3, 0x45, 0x6e, 0xf1, 0x08, 0xa5, 0xf8, 0x44, 0x16, 0x21, 0x67, 0x6b, - 0x31, 0x7e, 0x9d, 0x33, 0xf3, 0x5c, 0xe7, 0xdb, 0x90, 0x93, 0x0d, 0xc8, 0x13, 0x25, 0xef, 0x57, - 0x56, 0x2a, 0x5a, 0x8e, 0x75, 0x1f, 0x6e, 0x4d, 0x75, 0xb6, 0xbe, 0x04, 0x31, 0x98, 0x31, 0x05, - 0xfb, 0x0a, 0x6e, 0x4e, 0xc1, 0x1e, 0xbb, 0x94, 0xa1, 0x53, 0xb8, 0x31, 0xae, 0x4a, 0x5f, 0xea, - 0x69, 0xc9, 0xa8, 0xa4, 0xb6, 0xf2, 0xbb, 0xef, 0xcf, 0x93, 0xba, 0x69, 0x4a, 0xeb, 0x17, 0x71, - 0x05, 0xb5, 0x1e, 0x4c, 0x78, 0xab, 0x5e, 0xd1, 0xbc, 0xaf, 0xeb, 0x0c, 0xeb, 0x57, 0x13, 0x8a, - 0x71, 0x6c, 0xbc, 0x59, 0x8c, 0xa9, 0x66, 0x41, 0xb0, 0x1c, 0x69, 0x22, 0xf1, 0x8d, 0x36, 0x20, - 0xed, 0x7a, 0xbc, 0x4a, 0xb2, 0x75, 0xa4, 0xc0, 0xab, 0xc7, 0x87, 0x45, 0x30, 0x62, 0xa2, 0x5f, - 0x52, 0xb6, 0x16, 0xb9, 0xa5, 0x1f, 0x78, 0x1e, 0xf6, 0x9d, 0x52, 0xba, 0x92, 0xe2, 0x75, 0x55, - 0x22, 0x7a, 0x0d, 0x20, 0xf0, 0x7b, 0x1a, 0xb6, 0x22, 0x8c, 0xb9, 0xc0, 0xef, 0x2a, 0xa0, 0x34, - 0x1f, 0x63, 0x77, 0x30, 0x0a, 0x49, 0x29, 0xa3, 0xcd, 0x8f, 0xa4, 0xe2, 0xca, 0xda, 0xf2, 0x43, - 0xcf, 0x83, 0xc1, 0xc8, 0x23, 0xb4, 0x94, 0x93, 0x87, 0x2a, 0x11, 0x55, 0x20, 0x4f, 0xfc, 0x73, - 0x37, 0x0c, 0x7c, 0x8f, 0xf8, 0xac, 0x04, 0xc2, 0x1a, 0x55, 0x59, 0xcf, 0x01, 0xc5, 0x73, 0x24, - 0xea, 0xfb, 0xe9, 0xf8, 0xde, 0x0c, 0x5c, 0xca, 0x54, 0x65, 0xf7, 0x92, 0x54, 0x56, 0x06, 0xd5, - 0x77, 0x8e, 0x07, 0xb7, 0x3a, 0x70, 0xab, 0x49, 0x98, 0x76, 0xa8, 0x63, 0x86, 0x2f, 0x2d, 0x69, - 0x7d, 0xa6, 0xa4, 0x75, 0xf1, 0xa7, 0x24, 0xa4, 0xfc, 0x69, 0xe4, 0x55, 0x4a, 0xdb, 0x5a, 0xb4, - 0x9a, 0xb0, 0x39, 0x13, 0x54, 0xcd, 0x00, 0x3d, 0x72, 0x78, 0xb8, 0x55, 0x39, 0x72, 0xae, 0x08, - 0x34, 0x80, 0x57, 0x0f, 0xc5, 0x9c, 0x4b, 0x44, 0xb0, 0x0c, 0x59, 0x8f, 0x30, 0x2c, 0xce, 0x33, - 0xc5, 0x79, 0x63, 0x79, 0xcc, 0x23, 0x35, 0xe1, 0xb1, 0xdd, 0x84, 0xb4, 0x7c, 0x37, 0xf3, 0x90, - 0x79, 0xda, 0x68, 0xd7, 0x5b, 0xed, 0xe6, 0xfa, 0x12, 0x17, 0xec, 0xc3, 0x76, 0x9b, 0x0b, 0x06, - 0x02, 0x58, 0x79, 0xb4, 0xdf, 0x7a, 0xdc, 0xa8, 0xaf, 0x9b, 0xdc, 0xd0, 0x6d, 0x3d, 0x69, 0x1c, - 0x1c, 0x76, 0xd7, 0x53, 0x5c, 0xe8, 0x1c, 0xd6, 0x6a, 0x8d, 0x4e, 0x67, 0x7d, 0x79, 0x9b, 0x41, - 0x3e, 0xfa, 0x0c, 0x23, 0x28, 0xee, 0xd7, 0xba, 0xad, 0x83, 0x76, 0x6f, 0x12, 0xf5, 0x16, 0x20, - 0xa5, 0x6b, 0xb5, 0x7b, 0x4f, 0xed, 0x83, 0xa6, 0xcd, 0xa1, 0x46, 0xc4, 0x57, 0x87, 0x33, 0xd1, - 0x0d, 0x28, 0x28, 0x9d, 0x3a, 0x3b, 0x15, 0x71, 0xd3, 0x14, 0x96, 0x77, 0xff, 0x58, 0x83, 0xbc, - 0xce, 0x53, 0xe7, 0xbc, 0x8f, 0x7e, 0x31, 0xf4, 0x04, 0x1e, 0xef, 0x4b, 0x0f, 0xe6, 0xe9, 0x9a, - 0xd8, 0x1a, 0x50, 0xde, 0x4b, 0x02, 0x95, 0x45, 0xb7, 0x36, 0xbf, 0xfe, 0xfd, 0xef, 0x1f, 0xcc, - 0x1b, 0xd6, 0xea, 0xce, 0xf9, 0xbd, 0xf1, 0xce, 0xb8, 0x67, 0x6c, 0xa3, 0x1f, 0x0d, 0xc8, 0x47, - 0x3a, 0x05, 0xbd, 0x33, 0xcf, 0x21, 0x93, 0xdd, 0xa1, 0xfc, 0x76, 0x92, 0xdb, 0x60, 0x95, 0x05, - 0xad, 0x0d, 0x84, 0xa2, 0xb4, 0xe8, 0xce, 0x17, 0xae, 0xf3, 0x25, 0x67, 0x56, 0xac, 0x8b, 0x45, - 0x69, 0x61, 0x72, 0x73, 0x6d, 0x93, 0x72, 0xc9, 0x55, 0xcc, 0xb6, 0x2f, 0x63, 0xf6, 0xbd, 0x01, - 0x05, 0x7e, 0x75, 0x35, 0x2f, 0x8a, 0xe6, 0x3f, 0x20, 0x61, 0xc2, 0x5e, 0x11, 0xb4, 0xd6, 0x50, - 0x21, 0x46, 0xeb, 0xae, 0x81, 0xbe, 0x31, 0x00, 0x45, 0xea, 0xa8, 0xd7, 0xb5, 0xa4, 0x19, 0x5b, - 0x64, 0x6c, 0xa1, 0xef, 0x0c, 0x40, 0x9d, 0xd3, 0xe0, 0x42, 0xeb, 0x1b, 0xe7, 0xc4, 0x67, 0x34, - 0x31, 0x97, 0x8f, 0x92, 0x3f, 0xb4, 0x72, 0xf1, 0xb8, 0x6b, 0xa0, 0x9f, 0x0d, 0xb8, 0x39, 0x9b, - 0x1e, 0x8a, 0x1e, 0x2e, 0x32, 0x9e, 0x15, 0xbf, 0x0f, 0x17, 0x88, 0x21, 0x26, 0xc0, 0x12, 0xfa, - 0x29, 0x5e, 0x3d, 0x35, 0xda, 0x93, 0xb1, 0x8b, 0xef, 0x05, 0xe5, 0x0f, 0x92, 0xc7, 0x50, 0xe4, - 0xbe, 0x35, 0x00, 0xd9, 0x64, 0x18, 0x84, 0x2c, 0xb6, 0x8a, 0x2e, 0x5c, 0x96, 0x24, 0xd7, 0x72, - 0x89, 0x57, 0x72, 0x6d, 0x6a, 0xb4, 0xcd, 0x97, 0xa7, 0xcb, 0x87, 0x6d, 0xb9, 0xb6, 0x50, 0x0c, - 0xf5, 0xcc, 0x2e, 0xf1, 0x27, 0x3f, 0xda, 0x68, 0x4f, 0xf4, 0xb4, 0x7b, 0x89, 0x28, 0xfe, 0x66, - 0xcc, 0x6c, 0x1c, 0x1f, 0xcb, 0x69, 0xff, 0x32, 0xb1, 0xe4, 0x8f, 0xc8, 0xec, 0xe6, 0x81, 0x1a, - 0xf3, 0x44, 0xff, 0xcf, 0xcd, 0x25, 0x51, 0xeb, 0x3d, 0x84, 0x4f, 0xb2, 0x5a, 0x77, 0xb4, 0x22, - 0x9c, 0xde, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xca, 0x86, 0x66, 0x7c, 0x8a, 0x11, 0x00, 0x00, -======= - // 1200 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0x1a, 0xc7, - 0x17, 0xf7, 0x2e, 0xc6, 0xc0, 0xc1, 0x60, 0x67, 0x42, 0xe2, 0x0d, 0x49, 0xfe, 0x7f, 0xb2, 0x55, - 0x24, 0xcb, 0x17, 0x26, 0x75, 0x15, 0xa9, 0xc9, 0x9d, 0x6b, 0x30, 0x42, 0xb2, 0x71, 0xb4, 0xe0, - 0x24, 0xaa, 0x52, 0xa1, 0x31, 0x3b, 0x76, 0x56, 0x66, 0x77, 0xe9, 0xce, 0x60, 0xa7, 0xaa, 0x7a, - 0xd3, 0x57, 0xe8, 0x0b, 0x54, 0x7d, 0x8d, 0xf6, 0x2d, 0xaa, 0xbe, 0x41, 0x1f, 0xa4, 0x9a, 0xaf, - 0xfd, 0xe0, 0xc3, 0xa8, 0x55, 0xee, 0x38, 0x5f, 0xbf, 0x73, 0xf6, 0xfc, 0xce, 0x9c, 0x19, 0x60, - 0xe7, 0x36, 0x8c, 0xae, 0x2f, 0xc7, 0xe1, 0x6d, 0x53, 0xff, 0xd8, 0x9f, 0x44, 0x21, 0x0b, 0x51, - 0x51, 0xcb, 0xf5, 0x27, 0x57, 0x61, 0x78, 0x35, 0x26, 0x4d, 0x3c, 0xf1, 0x9a, 0x38, 0x08, 0x42, - 0x86, 0x99, 0x17, 0x06, 0x54, 0xfa, 0xd5, 0xb7, 0x98, 0xe7, 0x13, 0xca, 0xb0, 0x3f, 0x91, 0x0a, - 0xbb, 0x00, 0xf9, 0xb6, 0x3f, 0x61, 0x3f, 0xd8, 0xbf, 0x9b, 0x50, 0x7c, 0xa7, 0x40, 0x50, 0x15, - 0x4c, 0xcf, 0xb5, 0x8c, 0x86, 0xb1, 0x5b, 0x72, 0x4c, 0xcf, 0x45, 0x75, 0x28, 0x32, 0xe2, 0x4f, - 0xc6, 0x98, 0x11, 0xcb, 0x14, 0xda, 0x58, 0xe6, 0xb6, 0x8f, 0x38, 0x72, 0x6f, 0x71, 0x44, 0xac, - 0x9c, 0xb4, 0x69, 0x19, 0x3d, 0x87, 0x3c, 0x65, 0x3c, 0x68, 0xbd, 0x61, 0xec, 0x56, 0x0f, 0xb6, - 0xf6, 0xe3, 0xb2, 0xfb, 0x5c, 0xed, 0x48, 0x2b, 0xfa, 0x1a, 0x4a, 0xa3, 0x88, 0x60, 0x46, 0xdc, - 0x43, 0x66, 0xe5, 0x1b, 0xc6, 0x6e, 0xf9, 0xa0, 0xbe, 0x2f, 0xbf, 0x43, 0x96, 0x79, 0x31, 0xbd, - 0xdc, 0x1f, 0xe8, 0xca, 0x9d, 0xc4, 0x99, 0x47, 0x4e, 0x27, 0xae, 0x8a, 0xdc, 0x58, 0x1d, 0x19, - 0x3b, 0xf3, 0x48, 0x97, 0x8c, 0x89, 0x8c, 0x2c, 0xac, 0x8e, 0x8c, 0x9d, 0x11, 0x82, 0x75, 0x17, - 0x33, 0x6c, 0x15, 0xc5, 0xc7, 0x8a, 0xdf, 0x76, 0x07, 0x2a, 0x47, 0xa2, 0x28, 0x87, 0x7c, 0x3f, - 0x25, 0x94, 0x65, 0x3a, 0x66, 0xdc, 0xd1, 0x31, 0x33, 0xdb, 0x31, 0xbb, 0x01, 0x55, 0x0d, 0x44, - 0x27, 0x61, 0x40, 0xc9, 0x2c, 0x17, 0xf6, 0x13, 0x80, 0x0e, 0x61, 0x3a, 0xcf, 0xac, 0xf5, 0x2f, - 0x13, 0xb6, 0x34, 0x8d, 0x47, 0x61, 0xc0, 0xc8, 0x27, 0x86, 0xfe, 0x0f, 0x65, 0xdd, 0xf7, 0x61, - 0xec, 0x0c, 0x5a, 0xd5, 0x75, 0xd1, 0x73, 0xa8, 0x8e, 0xa6, 0x51, 0x44, 0x02, 0x36, 0xe4, 0x5a, - 0x12, 0xa9, 0xb2, 0x2a, 0x4a, 0xfb, 0x4e, 0x28, 0xd1, 0x33, 0xd8, 0xd4, 0x6e, 0x0c, 0xd3, 0x6b, - 0xc5, 0x76, 0x59, 0xe9, 0x06, 0x98, 0x5e, 0xa7, 0x91, 0xf0, 0x88, 0x0f, 0x9e, 0x60, 0x3e, 0x41, - 0x3a, 0x14, 0x4a, 0xf4, 0x02, 0x6a, 0x59, 0xb7, 0xa1, 0x17, 0xb8, 0xe4, 0x93, 0xe0, 0x3e, 0xe7, - 0xa0, 0x8c, 0x73, 0x97, 0x5b, 0x50, 0x67, 0x2e, 0x42, 0x0e, 0xd6, 0x86, 0x18, 0xac, 0x07, 0xc9, - 0x60, 0xc9, 0x20, 0x39, 0x5e, 0x59, 0x20, 0xa1, 0x43, 0x2f, 0x61, 0x87, 0x85, 0x0c, 0x8f, 0x87, - 0xc1, 0xd4, 0xbf, 0x20, 0xd1, 0x30, 0xbc, 0x54, 0x80, 0x54, 0x4c, 0x41, 0xce, 0xa9, 0x09, 0x73, - 0x4f, 0x58, 0xcf, 0x2e, 0x65, 0x28, 0xb5, 0xff, 0x30, 0xa1, 0xa6, 0xfb, 0x9a, 0xc0, 0x4d, 0xe9, - 0xea, 0xe6, 0x3e, 0x86, 0x12, 0xef, 0xd6, 0x30, 0xc0, 0x7e, 0x72, 0x78, 0x30, 0xbd, 0xee, 0x61, - 0x9f, 0xf0, 0x68, 0xf5, 0x39, 0xc2, 0x2c, 0x3b, 0x0a, 0x52, 0x25, 0x1c, 0x5e, 0x43, 0x25, 0xf5, - 0xbd, 0x53, 0xaa, 0x4e, 0xd2, 0x92, 0x0f, 0xde, 0xc4, 0xe9, 0xd2, 0x2c, 0x28, 0x50, 0x32, 0x0a, - 0x03, 0x97, 0xaa, 0xc6, 0x6a, 0x91, 0x5b, 0x7c, 0x42, 0x29, 0xbe, 0x92, 0x0d, 0x2c, 0x39, 0x5a, - 0xcc, 0x1e, 0xc5, 0xc2, 0xbf, 0x39, 0x8a, 0x8f, 0xa1, 0x24, 0x87, 0x87, 0xb7, 0x41, 0x9e, 0x8d, - 0xa2, 0x54, 0x74, 0x5d, 0xfb, 0x25, 0x3c, 0x9c, 0x99, 0x4a, 0x3d, 0xc0, 0x99, 0x30, 0x63, 0x26, - 0xec, 0x3b, 0xb8, 0x3f, 0x13, 0x76, 0xe2, 0x51, 0x86, 0x8e, 0xe1, 0x5e, 0xdc, 0xf3, 0x91, 0xd4, - 0x53, 0xcb, 0x68, 0xe4, 0x76, 0xcb, 0x07, 0x8f, 0x92, 0xc6, 0xcc, 0x26, 0xdc, 0xbe, 0xcd, 0x2a, - 0xa8, 0xfd, 0x2a, 0xa9, 0x4a, 0xf1, 0xac, 0xab, 0x5a, 0xc5, 0xaa, 0xfd, 0x9b, 0x09, 0xd5, 0x6c, - 0x6c, 0x96, 0x68, 0x63, 0x86, 0x68, 0x04, 0xeb, 0xa9, 0x01, 0x10, 0xbf, 0x51, 0x0d, 0xf2, 0x9e, - 0xcf, 0x39, 0x90, 0xb4, 0x4b, 0x81, 0x73, 0xc3, 0x97, 0x74, 0x38, 0x65, 0x82, 0xeb, 0x9c, 0xa3, - 0x45, 0x6e, 0x19, 0x85, 0xbe, 0x8f, 0x03, 0xd7, 0xca, 0x37, 0x72, 0x9c, 0x35, 0x25, 0xa2, 0xa7, - 0x00, 0x61, 0x30, 0xd4, 0x61, 0x1b, 0xc2, 0x58, 0x0a, 0x83, 0x81, 0x0a, 0x94, 0xe6, 0x4b, 0xec, - 0x8d, 0xa7, 0x11, 0xb1, 0x0a, 0xda, 0x7c, 0x2c, 0x15, 0x77, 0x32, 0xc7, 0x93, 0xde, 0x84, 0xe3, - 0xa9, 0x4f, 0xa8, 0x55, 0x92, 0x49, 0x95, 0x88, 0x1a, 0x50, 0x26, 0xc1, 0x8d, 0x17, 0x85, 0x81, - 0x4f, 0x02, 0x66, 0x81, 0xb0, 0xa6, 0x55, 0xf6, 0x19, 0xa0, 0x6c, 0x8f, 0x04, 0x7b, 0xaf, 0xe2, - 0x99, 0x1f, 0x7b, 0x94, 0x29, 0xde, 0xac, 0x79, 0xde, 0x64, 0x88, 0x3e, 0x0d, 0x3c, 0xd4, 0xee, - 0xc3, 0xc3, 0x0e, 0x61, 0xda, 0xa1, 0x85, 0x19, 0x5e, 0x48, 0x58, 0x6b, 0x8e, 0xb0, 0x96, 0xf8, - 0x0e, 0x12, 0x51, 0xbe, 0x92, 0x38, 0x07, 0x79, 0x47, 0x8b, 0x76, 0x07, 0x76, 0xe6, 0x40, 0xd5, - 0xee, 0xd5, 0xab, 0x9e, 0xc3, 0x6d, 0xca, 0x55, 0x7f, 0x07, 0xd0, 0x18, 0x1e, 0x9d, 0x8b, 0xfb, - 0xe5, 0x3f, 0x15, 0x58, 0x87, 0xa2, 0x4f, 0x18, 0x16, 0xf9, 0x4c, 0x91, 0x2f, 0x96, 0xe3, 0x3a, - 0x72, 0x49, 0x1d, 0x7b, 0x1d, 0xc8, 0xcb, 0x8d, 0x56, 0x86, 0xc2, 0x9b, 0x76, 0xaf, 0xd5, 0xed, - 0x75, 0xb6, 0xd7, 0xb8, 0xe0, 0x9c, 0xf7, 0x7a, 0x5c, 0x30, 0x10, 0xc0, 0xc6, 0xf1, 0x61, 0xf7, - 0xa4, 0xdd, 0xda, 0x36, 0xb9, 0x61, 0xd0, 0x3d, 0x6d, 0x9f, 0x9d, 0x0f, 0xb6, 0x73, 0x5c, 0xe8, - 0x9f, 0x1f, 0x1d, 0xb5, 0xfb, 0xfd, 0xed, 0xf5, 0x3d, 0x06, 0xe5, 0xf4, 0x82, 0x44, 0x50, 0x3d, - 0x3c, 0x1a, 0x74, 0xcf, 0x7a, 0xc3, 0x04, 0xf5, 0x21, 0x20, 0xa5, 0xeb, 0xf6, 0x86, 0x6f, 0x9c, - 0xb3, 0x8e, 0xc3, 0x43, 0x8d, 0x94, 0xaf, 0x86, 0x33, 0xd1, 0x3d, 0xa8, 0x28, 0x9d, 0xca, 0x9d, - 0x4b, 0xb9, 0xe9, 0x12, 0xd6, 0x0f, 0x7e, 0x2d, 0x41, 0x59, 0xf7, 0xa9, 0x7f, 0x33, 0x42, 0x1f, - 0xf4, 0xc5, 0x17, 0x3f, 0x42, 0x76, 0x92, 0x91, 0xc8, 0xdc, 0xad, 0x75, 0x6b, 0xde, 0x20, 0xf9, - 0xb2, 0x77, 0x7e, 0xfe, 0xf3, 0xef, 0x5f, 0xcc, 0x7b, 0xf6, 0x66, 0xf3, 0xe6, 0xcb, 0xf8, 0x89, - 0xf4, 0xda, 0xd8, 0x43, 0x7d, 0x28, 0xa7, 0x38, 0x46, 0xb5, 0x04, 0x21, 0xb9, 0x4b, 0xeb, 0x68, - 0x7e, 0x06, 0xed, 0xba, 0x40, 0xac, 0x21, 0x94, 0x46, 0xa4, 0xcd, 0x1f, 0x3d, 0xf7, 0x27, 0xd4, - 0x87, 0x6a, 0x4b, 0xbc, 0x0a, 0x56, 0xe0, 0xa6, 0x9e, 0x3d, 0xf2, 0xad, 0xa5, 0x40, 0xf7, 0x16, - 0x81, 0x9e, 0x42, 0x85, 0x8f, 0xba, 0x86, 0xa4, 0x68, 0x36, 0x7a, 0x61, 0x99, 0x0f, 0x04, 0xe2, - 0x16, 0xaa, 0x64, 0x10, 0x5f, 0x18, 0xe8, 0x0a, 0x50, 0xea, 0xc3, 0xf5, 0x8b, 0x60, 0x71, 0x9d, - 0xcb, 0x77, 0xa7, 0xdd, 0x10, 0xf8, 0xf5, 0x3d, 0x6b, 0xbe, 0xe2, 0xa6, 0x7c, 0xc3, 0x85, 0x80, - 0xfa, 0x1f, 0xc3, 0x5b, 0x1d, 0xd8, 0xbe, 0x21, 0x01, 0xa3, 0x4b, 0x12, 0xfd, 0x6f, 0xd9, 0x61, - 0x97, 0x17, 0x97, 0xfd, 0x4c, 0x64, 0x7b, 0x8c, 0x1e, 0x2d, 0xc8, 0x46, 0x04, 0xf0, 0x0b, 0x03, - 0xbd, 0x87, 0xfb, 0xf3, 0x5f, 0x46, 0x51, 0x63, 0xf9, 0x05, 0xa0, 0xb2, 0x3f, 0x5d, 0xea, 0x21, - 0x76, 0xcc, 0x1a, 0x7a, 0x9b, 0xe9, 0x99, 0xba, 0x19, 0x16, 0x01, 0x67, 0x2f, 0x8d, 0xfa, 0x93, - 0x65, 0x1e, 0x0a, 0xb7, 0x03, 0xc8, 0x21, 0x93, 0x30, 0x62, 0x99, 0x07, 0xc4, 0x8a, 0x66, 0xcc, - 0x4f, 0xcf, 0x1a, 0x7a, 0x0f, 0x5b, 0x33, 0x1b, 0x2b, 0x5d, 0xdd, 0xe2, 0x0d, 0x59, 0x7f, 0x76, - 0x87, 0x87, 0x3a, 0x3e, 0x6b, 0xe8, 0x43, 0xa6, 0xa9, 0xa7, 0x7a, 0xff, 0x7c, 0x26, 0xf4, 0xe1, - 0xdc, 0xfa, 0x7e, 0x2b, 0x57, 0xe7, 0xe7, 0x4a, 0x70, 0x02, 0x68, 0x7e, 0x03, 0xa3, 0x2f, 0x92, - 0xd0, 0xa5, 0xfb, 0x79, 0x41, 0x9b, 0xbf, 0x81, 0x6f, 0xe3, 0xbf, 0x55, 0x17, 0x1b, 0xe2, 0xf1, - 0xf3, 0xd5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x83, 0x41, 0xb0, 0x82, 0x0d, 0x00, 0x00, ->>>>>>> b5b515a... added hardware & workflow endpoints -======= - // 1198 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x6e, 0x1a, 0xc7, - 0x17, 0xf7, 0x2e, 0xc6, 0xc0, 0x21, 0x60, 0x67, 0x42, 0xe2, 0x0d, 0x49, 0xfe, 0x7f, 0xb2, 0x55, - 0x24, 0xcb, 0x17, 0xc6, 0x75, 0x15, 0xa9, 0xc9, 0x9d, 0x6b, 0x30, 0x42, 0xb2, 0x71, 0xb4, 0xe0, - 0x24, 0xaa, 0x1a, 0xa1, 0x31, 0x3b, 0x76, 0x56, 0x66, 0x77, 0xe9, 0xce, 0x60, 0xa7, 0xaa, 0x7a, - 0xd3, 0x57, 0xe8, 0x13, 0xb4, 0xaf, 0xd1, 0xbe, 0x45, 0xd5, 0x37, 0xe8, 0x83, 0x54, 0xf3, 0xb5, - 0x1f, 0x7c, 0x18, 0xb5, 0xca, 0x1d, 0xe7, 0xeb, 0x77, 0xce, 0x9c, 0xdf, 0xd9, 0x33, 0x03, 0x6c, - 0xdf, 0x86, 0xd1, 0xf5, 0xe5, 0x38, 0xbc, 0x6d, 0xea, 0x1f, 0x7b, 0x93, 0x28, 0x64, 0x21, 0x2a, - 0x6a, 0xb9, 0xfe, 0xf4, 0x2a, 0x0c, 0xaf, 0xc6, 0xa4, 0x89, 0x27, 0x5e, 0x13, 0x07, 0x41, 0xc8, - 0x30, 0xf3, 0xc2, 0x80, 0x4a, 0xbf, 0xfa, 0x26, 0xf3, 0x7c, 0x42, 0x19, 0xf6, 0x27, 0x52, 0x61, - 0x17, 0x20, 0xdf, 0xf6, 0x27, 0xec, 0x07, 0xfb, 0x77, 0x13, 0x8a, 0xef, 0x14, 0x08, 0xaa, 0x82, - 0xe9, 0xb9, 0x96, 0xd1, 0x30, 0x76, 0x4a, 0x8e, 0xe9, 0xb9, 0xa8, 0x0e, 0x45, 0x46, 0xfc, 0xc9, - 0x18, 0x33, 0x62, 0x99, 0x42, 0x1b, 0xcb, 0xdc, 0xf6, 0x11, 0x47, 0xee, 0x2d, 0x8e, 0x88, 0x95, - 0x93, 0x36, 0x2d, 0xa3, 0x17, 0x90, 0xa7, 0x8c, 0x07, 0xad, 0x37, 0x8c, 0x9d, 0xea, 0xc1, 0xe6, - 0x5e, 0x5c, 0x76, 0x9f, 0xab, 0x1d, 0x69, 0x45, 0x5f, 0x43, 0x69, 0x14, 0x11, 0xcc, 0x88, 0x7b, - 0xc8, 0xac, 0x7c, 0xc3, 0xd8, 0x29, 0x1f, 0xd4, 0xf7, 0xe4, 0x39, 0x64, 0x99, 0x17, 0xd3, 0xcb, - 0xbd, 0x81, 0xae, 0xdc, 0x49, 0x9c, 0x79, 0xe4, 0x74, 0xe2, 0xaa, 0xc8, 0x8d, 0xd5, 0x91, 0xb1, - 0x33, 0x8f, 0x74, 0xc9, 0x98, 0xc8, 0xc8, 0xc2, 0xea, 0xc8, 0xd8, 0x19, 0x21, 0x58, 0x77, 0x31, - 0xc3, 0x56, 0x51, 0x1c, 0x56, 0xfc, 0xb6, 0x3b, 0x50, 0x39, 0x12, 0x45, 0x39, 0xe4, 0xfb, 0x29, - 0xa1, 0x2c, 0xd3, 0x31, 0xe3, 0x8e, 0x8e, 0x99, 0xd9, 0x8e, 0xd9, 0x0d, 0xa8, 0x6a, 0x20, 0x3a, - 0x09, 0x03, 0x4a, 0x66, 0xb9, 0xb0, 0x9f, 0x02, 0x74, 0x08, 0xd3, 0x79, 0x66, 0xad, 0x7f, 0x99, - 0xb0, 0xa9, 0x69, 0x3c, 0x0a, 0x03, 0x46, 0x3e, 0x31, 0xf4, 0x7f, 0x28, 0xeb, 0xbe, 0x0f, 0x63, - 0x67, 0xd0, 0xaa, 0xae, 0x8b, 0x5e, 0x40, 0x75, 0x34, 0x8d, 0x22, 0x12, 0xb0, 0x21, 0xd7, 0x92, - 0x48, 0x95, 0x55, 0x51, 0xda, 0x77, 0x42, 0x89, 0x9e, 0xc3, 0x3d, 0xed, 0xc6, 0x30, 0xbd, 0x56, - 0x6c, 0x97, 0x95, 0x6e, 0x80, 0xe9, 0x75, 0x1a, 0x09, 0x8f, 0xf8, 0xe0, 0x09, 0xe6, 0x13, 0xa4, - 0x43, 0xa1, 0x44, 0xfb, 0x50, 0xcb, 0xba, 0x0d, 0xbd, 0xc0, 0x25, 0x9f, 0x04, 0xf7, 0x39, 0x07, - 0x65, 0x9c, 0xbb, 0xdc, 0x82, 0x3a, 0x73, 0x11, 0x72, 0xb0, 0x36, 0xc4, 0x60, 0x3d, 0x4c, 0x06, - 0x4b, 0x06, 0xc9, 0xf1, 0xca, 0x02, 0x09, 0x1d, 0x7a, 0x09, 0xdb, 0x2c, 0x64, 0x78, 0x3c, 0x0c, - 0xa6, 0xfe, 0x05, 0x89, 0x86, 0xe1, 0xa5, 0x02, 0xa4, 0x62, 0x0a, 0x72, 0x4e, 0x4d, 0x98, 0x7b, - 0xc2, 0x7a, 0x76, 0x29, 0x43, 0xa9, 0xfd, 0x87, 0x09, 0x35, 0xdd, 0xd7, 0x04, 0x6e, 0x4a, 0x57, - 0x37, 0xf7, 0x09, 0x94, 0x78, 0xb7, 0x86, 0x01, 0xf6, 0x93, 0x8f, 0x07, 0xd3, 0xeb, 0x1e, 0xf6, - 0x09, 0x8f, 0x56, 0xc7, 0x11, 0x66, 0xd9, 0x51, 0x90, 0x2a, 0xe1, 0xf0, 0x1a, 0x2a, 0xa9, 0xf3, - 0x4e, 0xa9, 0xfa, 0x92, 0x96, 0x1c, 0xf8, 0x1e, 0x4e, 0x97, 0x66, 0x41, 0x81, 0x92, 0x51, 0x18, - 0xb8, 0x54, 0x35, 0x56, 0x8b, 0xdc, 0xe2, 0x13, 0x4a, 0xf1, 0x95, 0x6c, 0x60, 0xc9, 0xd1, 0x62, - 0xf6, 0x53, 0x2c, 0xfc, 0x9b, 0x4f, 0xf1, 0x09, 0x94, 0xe4, 0xf0, 0xf0, 0x36, 0xc8, 0x6f, 0xa3, - 0x28, 0x15, 0x5d, 0xd7, 0x7e, 0x09, 0x8f, 0x66, 0xa6, 0x52, 0x0f, 0x70, 0x26, 0xcc, 0x98, 0x09, - 0xfb, 0x00, 0x0f, 0x66, 0xc2, 0x4e, 0x3c, 0xca, 0xd0, 0x31, 0xdc, 0x8f, 0x7b, 0x3e, 0x92, 0x7a, - 0x6a, 0x19, 0x8d, 0xdc, 0x4e, 0xf9, 0xe0, 0x71, 0xd2, 0x98, 0xd9, 0x84, 0x5b, 0xb7, 0x59, 0x05, - 0xb5, 0x5f, 0x25, 0x55, 0x29, 0x9e, 0x75, 0x55, 0xab, 0x58, 0xb5, 0x7f, 0x33, 0xa1, 0x9a, 0x8d, - 0xcd, 0x12, 0x6d, 0xcc, 0x10, 0x8d, 0x60, 0x3d, 0x35, 0x00, 0xe2, 0x37, 0xaa, 0x41, 0xde, 0xf3, - 0x39, 0x07, 0x92, 0x76, 0x29, 0x70, 0x6e, 0xf8, 0x92, 0x0e, 0xa7, 0x4c, 0x70, 0x9d, 0x73, 0xb4, - 0xc8, 0x2d, 0xa3, 0xd0, 0xf7, 0x71, 0xe0, 0x5a, 0xf9, 0x46, 0x8e, 0xb3, 0xa6, 0x44, 0xf4, 0x0c, - 0x20, 0x0c, 0x86, 0x3a, 0x6c, 0x43, 0x18, 0x4b, 0x61, 0x30, 0x50, 0x81, 0xd2, 0x7c, 0x89, 0xbd, - 0xf1, 0x34, 0x22, 0x56, 0x41, 0x9b, 0x8f, 0xa5, 0xe2, 0x4e, 0xe6, 0x78, 0xd2, 0x9b, 0x70, 0x3c, - 0xf5, 0x09, 0xb5, 0x4a, 0x32, 0xa9, 0x12, 0x51, 0x03, 0xca, 0x24, 0xb8, 0xf1, 0xa2, 0x30, 0xf0, - 0x49, 0xc0, 0x2c, 0x10, 0xd6, 0xb4, 0xca, 0x3e, 0x03, 0x94, 0xed, 0x91, 0x60, 0xef, 0x55, 0x3c, - 0xf3, 0x63, 0x8f, 0x32, 0xc5, 0x9b, 0x35, 0xcf, 0x9b, 0x0c, 0xd1, 0x5f, 0x03, 0x0f, 0xb5, 0xfb, - 0xf0, 0xa8, 0x43, 0x98, 0x76, 0x68, 0x61, 0x86, 0x17, 0x12, 0xd6, 0x9a, 0x23, 0xac, 0x25, 0xce, - 0x41, 0x22, 0xca, 0x57, 0x12, 0xe7, 0x20, 0xef, 0x68, 0xd1, 0xee, 0xc0, 0xf6, 0x1c, 0xa8, 0xda, - 0xbd, 0x7a, 0xd5, 0x73, 0xb8, 0x7b, 0x72, 0xd5, 0xdf, 0x01, 0x34, 0x86, 0xc7, 0xe7, 0xe2, 0x7e, - 0xf9, 0x4f, 0x05, 0xd6, 0xa1, 0xe8, 0x13, 0x86, 0x45, 0x3e, 0x53, 0xe4, 0x8b, 0xe5, 0xb8, 0x8e, - 0x5c, 0x52, 0xc7, 0x6e, 0x07, 0xf2, 0x72, 0xa3, 0x95, 0xa1, 0xf0, 0xa6, 0xdd, 0x6b, 0x75, 0x7b, - 0x9d, 0xad, 0x35, 0x2e, 0x38, 0xe7, 0xbd, 0x1e, 0x17, 0x0c, 0x04, 0xb0, 0x71, 0x7c, 0xd8, 0x3d, - 0x69, 0xb7, 0xb6, 0x4c, 0x6e, 0x18, 0x74, 0x4f, 0xdb, 0x67, 0xe7, 0x83, 0xad, 0x1c, 0x17, 0xfa, - 0xe7, 0x47, 0x47, 0xed, 0x7e, 0x7f, 0x6b, 0x7d, 0x97, 0x41, 0x39, 0xbd, 0x20, 0x11, 0x54, 0x0f, - 0x8f, 0x06, 0xdd, 0xb3, 0xde, 0x30, 0x41, 0x7d, 0x04, 0x48, 0xe9, 0xba, 0xbd, 0xe1, 0x1b, 0xe7, - 0xac, 0xe3, 0xf0, 0x50, 0x23, 0xe5, 0xab, 0xe1, 0x4c, 0x74, 0x1f, 0x2a, 0x4a, 0xa7, 0x72, 0xe7, - 0x52, 0x6e, 0xba, 0x84, 0xf5, 0x83, 0x5f, 0x4b, 0x50, 0xd6, 0x7d, 0xea, 0xdf, 0x8c, 0xd0, 0x07, - 0x7d, 0xf1, 0xc5, 0x8f, 0x90, 0xed, 0x64, 0x24, 0x32, 0x77, 0x6b, 0xdd, 0x9a, 0x37, 0x48, 0xbe, - 0x6c, 0xeb, 0xe7, 0x3f, 0xff, 0xfe, 0xc5, 0x44, 0x76, 0xa5, 0x79, 0xf3, 0x65, 0xfc, 0x44, 0xa2, - 0xaf, 0x8d, 0x5d, 0xd4, 0x87, 0x72, 0x8a, 0x64, 0x54, 0x4b, 0x20, 0x92, 0xcb, 0xb4, 0x8e, 0xe6, - 0x87, 0xd0, 0xae, 0x0b, 0xc8, 0x1a, 0x42, 0x19, 0xc8, 0xe6, 0x8f, 0x9e, 0xfb, 0x13, 0xea, 0x43, - 0xb5, 0x25, 0x9e, 0x05, 0x2b, 0x70, 0x53, 0xef, 0x1e, 0xf9, 0xd8, 0x52, 0xa0, 0xbb, 0x8b, 0x40, - 0x4f, 0xa1, 0xc2, 0x67, 0x5d, 0x43, 0x52, 0x34, 0x1b, 0xbd, 0xb0, 0xcc, 0x87, 0x02, 0x71, 0x13, - 0x65, 0x4f, 0xbe, 0x6f, 0xa0, 0x2b, 0x40, 0xa9, 0x83, 0xeb, 0x27, 0xc1, 0xe2, 0x3a, 0x97, 0x2f, - 0x4f, 0xbb, 0x21, 0xf0, 0xeb, 0xc8, 0x9a, 0xaf, 0xb8, 0x29, 0x1f, 0x71, 0x21, 0xa0, 0xfe, 0xc7, - 0xf0, 0x56, 0x07, 0xb6, 0x6f, 0x48, 0xc0, 0xe8, 0x92, 0x44, 0xff, 0x5b, 0xf6, 0xb5, 0xcb, 0x9b, - 0xcb, 0x7e, 0x2e, 0xb2, 0x3d, 0x41, 0x8f, 0x17, 0x64, 0x23, 0x02, 0x78, 0xdf, 0x40, 0xef, 0xe1, - 0xc1, 0xfc, 0xc9, 0x28, 0x6a, 0x2c, 0xbf, 0x01, 0x54, 0xf6, 0x67, 0x4b, 0x3d, 0xc4, 0x92, 0x59, - 0x43, 0x6f, 0x33, 0x3d, 0x53, 0x57, 0xc3, 0x22, 0xe0, 0xec, 0xad, 0x51, 0x7f, 0xba, 0xcc, 0x43, - 0xe1, 0x76, 0x00, 0x39, 0x64, 0x12, 0x46, 0x2c, 0xf3, 0x82, 0x58, 0xd1, 0x8c, 0xf9, 0xe9, 0x59, - 0x43, 0xef, 0x61, 0x73, 0x66, 0x65, 0xa5, 0xab, 0x5b, 0xbc, 0x22, 0xeb, 0xcf, 0xef, 0xf0, 0x50, - 0xdf, 0xcf, 0x1a, 0xfa, 0x2e, 0xd3, 0xd4, 0x53, 0xbd, 0x80, 0x3e, 0x13, 0xfa, 0x70, 0x6e, 0x7f, - 0xbf, 0x95, 0xbb, 0xf3, 0x73, 0x25, 0x38, 0x01, 0x34, 0xbf, 0x82, 0xd1, 0x17, 0x49, 0xe8, 0xd2, - 0x05, 0xbd, 0xa0, 0xcd, 0xdf, 0xc0, 0xb7, 0xf1, 0xff, 0xaa, 0x8b, 0x0d, 0xf1, 0xfa, 0xf9, 0xea, - 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x4c, 0x85, 0x3e, 0x83, 0x0d, 0x00, 0x00, ->>>>>>> 73b8327... fixups + 0x14, 0xcf, 0xae, 0xe3, 0xc4, 0x7e, 0xae, 0x1d, 0x77, 0x1a, 0xda, 0xad, 0x5b, 0x84, 0xbb, 0x12, + 0x52, 0x94, 0x83, 0xdd, 0x06, 0x0a, 0xb4, 0x48, 0x40, 0x6a, 0xbb, 0x96, 0xa5, 0xd6, 0xa9, 0xd6, + 0x0e, 0x95, 0x00, 0xc9, 0x9a, 0x78, 0x27, 0xc9, 0x2a, 0xde, 0x5d, 0x77, 0x67, 0x9c, 0x14, 0x21, + 0x84, 0xc4, 0x95, 0x0b, 0x88, 0x03, 0x12, 0xe2, 0x00, 0xe5, 0xc8, 0x91, 0x8f, 0xc2, 0x19, 0x4e, + 0x7c, 0x07, 0xae, 0x68, 0xfe, 0xd9, 0x5e, 0x3b, 0x34, 0x78, 0x7d, 0xe9, 0x6d, 0xdf, 0x9f, 0xdf, + 0x9b, 0xdf, 0xbc, 0xf7, 0x66, 0xdf, 0x83, 0x6b, 0x67, 0x61, 0x74, 0x72, 0x38, 0x08, 0xcf, 0xaa, + 0xfa, 0xa3, 0x32, 0x8c, 0x42, 0x16, 0xa2, 0xed, 0x23, 0x8f, 0x1d, 0x8f, 0x0e, 0x2a, 0xfd, 0xd0, + 0xaf, 0x30, 0x2f, 0x38, 0x21, 0xd1, 0x01, 0x19, 0x0c, 0xc4, 0xa7, 0xf4, 0xa0, 0x15, 0x8d, 0x28, + 0xdd, 0x3c, 0x0a, 0xc3, 0xa3, 0x01, 0xa9, 0xe2, 0xa1, 0x57, 0xc5, 0x41, 0x10, 0x32, 0xcc, 0xbc, + 0x30, 0xa0, 0xd2, 0xaf, 0xb4, 0xc1, 0x3c, 0x9f, 0x50, 0x86, 0xfd, 0xa1, 0x54, 0xd8, 0xeb, 0x90, + 0x6e, 0xf8, 0x43, 0xf6, 0xb9, 0xfd, 0xa7, 0x09, 0x99, 0xa7, 0x2a, 0x08, 0x2a, 0x80, 0xe9, 0xb9, + 0x96, 0x51, 0x36, 0xb6, 0xb2, 0x8e, 0xe9, 0xb9, 0xa8, 0x04, 0x19, 0x46, 0xfc, 0xe1, 0x00, 0x33, + 0x62, 0x99, 0x42, 0x3b, 0x96, 0xb9, 0xed, 0x18, 0x47, 0xee, 0x19, 0x8e, 0x88, 0x95, 0x92, 0x36, + 0x2d, 0xa3, 0x26, 0xa4, 0x29, 0xe3, 0xa0, 0xd5, 0xb2, 0xb1, 0x55, 0xd8, 0xb9, 0x53, 0xf9, 0xff, + 0x17, 0xa9, 0x74, 0x38, 0xd0, 0x91, 0x78, 0xf4, 0x1e, 0x64, 0xfb, 0x11, 0xc1, 0x8c, 0xb8, 0xbb, + 0xcc, 0x4a, 0x97, 0x8d, 0xad, 0xdc, 0x4e, 0xa9, 0x22, 0x6f, 0x2a, 0x81, 0x07, 0xa3, 0xc3, 0x4a, + 0x57, 0xdf, 0xcd, 0x99, 0x38, 0x73, 0xe4, 0x68, 0xe8, 0x2a, 0xe4, 0xda, 0xc5, 0xc8, 0xb1, 0x33, + 0x47, 0xba, 0x64, 0x40, 0x24, 0x72, 0xfd, 0x62, 0xe4, 0xd8, 0x19, 0x21, 0x58, 0x75, 0x31, 0xc3, + 0x56, 0x46, 0xa4, 0x43, 0x7c, 0xdb, 0x4d, 0xc8, 0xd7, 0x04, 0x29, 0x87, 0x3c, 0x1b, 0x11, 0xca, + 0x62, 0x39, 0x35, 0x5e, 0x92, 0x53, 0x33, 0x9e, 0x53, 0xbb, 0x0c, 0x05, 0x1d, 0x88, 0x0e, 0xc3, + 0x80, 0x92, 0xd9, 0x6a, 0xd9, 0x37, 0x01, 0x9a, 0x84, 0xe9, 0x73, 0x66, 0xad, 0xff, 0x98, 0xb0, + 0xa1, 0x0b, 0x5d, 0x0b, 0x03, 0x46, 0x9e, 0x33, 0xf4, 0x06, 0xe4, 0x74, 0xde, 0x7b, 0x63, 0x67, + 0xd0, 0xaa, 0x96, 0x8b, 0xde, 0x84, 0x42, 0x7f, 0x14, 0x45, 0x24, 0x60, 0x3d, 0xae, 0x25, 0x91, + 0xa2, 0x95, 0x57, 0xda, 0xa7, 0x42, 0x89, 0x6e, 0xc1, 0x25, 0xed, 0xc6, 0x30, 0x3d, 0x51, 0xfd, + 0x90, 0x53, 0xba, 0x2e, 0xa6, 0x27, 0xd3, 0x91, 0x70, 0x9f, 0xb7, 0xa6, 0xe8, 0x8d, 0x49, 0xa4, + 0x5d, 0xa1, 0x44, 0xb7, 0x61, 0x33, 0xee, 0xd6, 0xf3, 0x02, 0x97, 0x3c, 0x17, 0xb5, 0x4f, 0x39, + 0x28, 0xe6, 0xdc, 0xe2, 0x16, 0xe4, 0xcd, 0x21, 0x64, 0xeb, 0xad, 0x89, 0xd6, 0x7b, 0x77, 0x91, + 0xd6, 0x93, 0x61, 0x65, 0x03, 0xc6, 0x8f, 0x12, 0x3a, 0x74, 0x17, 0xae, 0xb1, 0x90, 0xe1, 0x41, + 0x2f, 0x18, 0xf9, 0x07, 0x24, 0xea, 0x85, 0x87, 0xea, 0x48, 0x2a, 0xfa, 0x24, 0xe5, 0x6c, 0x0a, + 0x73, 0x5b, 0x58, 0xf7, 0x0e, 0x25, 0x94, 0xda, 0x7f, 0x99, 0xb0, 0xa9, 0x33, 0x3f, 0x09, 0x37, + 0xa2, 0x17, 0xa7, 0xff, 0x06, 0x64, 0x79, 0x3e, 0x7b, 0x01, 0xf6, 0x27, 0x0f, 0x10, 0xd3, 0x93, + 0x36, 0xf6, 0x09, 0x47, 0xab, 0x0b, 0x0b, 0xb3, 0xcc, 0x39, 0x48, 0x95, 0x70, 0xf8, 0x0c, 0xf2, + 0x53, 0x19, 0x19, 0x51, 0xf5, 0x1a, 0x13, 0xa7, 0xe4, 0x12, 0x9e, 0x26, 0x6f, 0xc1, 0x3a, 0x25, + 0xfd, 0x30, 0x70, 0xa9, 0x2a, 0x8e, 0x16, 0xb9, 0xc5, 0x27, 0x94, 0xe2, 0x23, 0x59, 0x84, 0xac, + 0xa3, 0xc5, 0xf8, 0x73, 0x5e, 0x5f, 0xe4, 0x39, 0xdf, 0x80, 0xac, 0x6c, 0x40, 0x9e, 0x28, 0xf9, + 0xbe, 0x32, 0x52, 0xd1, 0x72, 0xed, 0xbb, 0x70, 0x75, 0xa6, 0xb3, 0xf5, 0x23, 0x88, 0xc1, 0x8c, + 0x19, 0xd8, 0x57, 0x70, 0x65, 0x06, 0xf6, 0xc8, 0xa3, 0x0c, 0x1d, 0xc3, 0xe5, 0x71, 0x55, 0xfa, + 0x52, 0x4f, 0x2d, 0xa3, 0x9c, 0xda, 0xca, 0xed, 0xbc, 0xbf, 0x48, 0xea, 0x66, 0x29, 0x15, 0xcf, + 0xe2, 0x0a, 0x6a, 0xdf, 0x9b, 0xf0, 0x56, 0xbd, 0xa2, 0x79, 0x5f, 0xd4, 0x19, 0xf6, 0x0b, 0x13, + 0x0a, 0x71, 0x6c, 0xbc, 0x59, 0x8c, 0x99, 0x66, 0x41, 0xb0, 0x3a, 0xd5, 0x44, 0xe2, 0x1b, 0x6d, + 0x42, 0xda, 0xf3, 0x79, 0x95, 0x64, 0xeb, 0x48, 0x81, 0x57, 0x8f, 0x0f, 0x8b, 0x70, 0xc4, 0x44, + 0xbf, 0xa4, 0x1c, 0x2d, 0x72, 0x4b, 0x3f, 0xf4, 0x7d, 0x1c, 0xb8, 0x56, 0xba, 0x9c, 0xe2, 0x75, + 0x55, 0x22, 0x7a, 0x1d, 0x20, 0x0c, 0x7a, 0x1a, 0xb6, 0x26, 0x8c, 0xd9, 0x30, 0xe8, 0x2a, 0xa0, + 0x34, 0x1f, 0x62, 0x6f, 0x30, 0x8a, 0x88, 0xb5, 0xae, 0xcd, 0x0f, 0xa5, 0xe2, 0xa5, 0xb5, 0xe5, + 0x87, 0x9e, 0x86, 0x83, 0x91, 0x4f, 0xa8, 0x95, 0x95, 0x87, 0x2a, 0x11, 0x95, 0x21, 0x47, 0x82, + 0x53, 0x2f, 0x0a, 0x03, 0x9f, 0x04, 0xcc, 0x02, 0x61, 0x9d, 0x56, 0xd9, 0xcf, 0x00, 0xc5, 0x73, + 0x24, 0xea, 0xfb, 0xe9, 0xf8, 0xdd, 0x0c, 0x3c, 0xca, 0x54, 0x65, 0xef, 0x27, 0xa9, 0xac, 0x0c, + 0xaa, 0xdf, 0x1c, 0x0f, 0x6e, 0x77, 0xe0, 0x6a, 0x93, 0x30, 0xed, 0x50, 0xc7, 0x0c, 0x9f, 0x5b, + 0xd2, 0xfa, 0x5c, 0x49, 0xeb, 0xe2, 0xa6, 0x24, 0xa2, 0xfc, 0xd7, 0xc8, 0xab, 0x94, 0x76, 0xb4, + 0x68, 0x37, 0xe1, 0xda, 0x5c, 0x50, 0x35, 0x03, 0xf4, 0xc8, 0xe1, 0xe1, 0x2e, 0xc9, 0x91, 0xf3, + 0x92, 0x40, 0x03, 0xb8, 0xbe, 0x2f, 0xe6, 0x5c, 0x22, 0x82, 0x25, 0xc8, 0xf8, 0x84, 0x61, 0x71, + 0x9e, 0x29, 0xce, 0x1b, 0xcb, 0x63, 0x1e, 0xa9, 0x09, 0x8f, 0xed, 0x26, 0xa4, 0xe5, 0x7f, 0x33, + 0x07, 0xeb, 0x4f, 0x1a, 0xed, 0x7a, 0xab, 0xdd, 0x2c, 0xae, 0x70, 0xc1, 0xd9, 0x6f, 0xb7, 0xb9, + 0x60, 0x20, 0x80, 0xb5, 0x87, 0xbb, 0xad, 0x47, 0x8d, 0x7a, 0xd1, 0xe4, 0x86, 0x6e, 0xeb, 0x71, + 0x63, 0x6f, 0xbf, 0x5b, 0x4c, 0x71, 0xa1, 0xb3, 0x5f, 0xab, 0x35, 0x3a, 0x9d, 0xe2, 0xea, 0x36, + 0x83, 0xdc, 0xf4, 0x6f, 0x18, 0x41, 0x61, 0xb7, 0xd6, 0x6d, 0xed, 0xb5, 0x7b, 0x93, 0xa8, 0x57, + 0x01, 0x29, 0x5d, 0xab, 0xdd, 0x7b, 0xe2, 0xec, 0x35, 0x1d, 0x0e, 0x35, 0xa6, 0x7c, 0x75, 0x38, + 0x13, 0x5d, 0x86, 0xbc, 0xd2, 0xa9, 0xb3, 0x53, 0x53, 0x6e, 0x9a, 0xc2, 0xea, 0xce, 0x8b, 0x22, + 0xe4, 0x74, 0x9e, 0x3a, 0xa7, 0x7d, 0xf4, 0x8b, 0xa1, 0x27, 0xf0, 0x78, 0x5f, 0xba, 0xb7, 0x48, + 0xd7, 0xc4, 0xd6, 0x80, 0xd2, 0xfd, 0x24, 0x50, 0x59, 0x74, 0xdb, 0xfa, 0xfa, 0x8f, 0xbf, 0xbf, + 0x37, 0x91, 0x9d, 0xaf, 0x9e, 0xde, 0x19, 0xef, 0x8c, 0xf4, 0xbe, 0xb1, 0x8d, 0x7e, 0x30, 0x20, + 0x37, 0xd5, 0x2a, 0xe8, 0x9d, 0x45, 0x4e, 0x99, 0x2c, 0x0f, 0xa5, 0xb7, 0x93, 0x3c, 0x07, 0xbb, + 0x24, 0x78, 0x6d, 0x22, 0x14, 0xe3, 0x55, 0xfd, 0xc2, 0x73, 0xbf, 0xe4, 0xcc, 0x0a, 0x75, 0xb1, + 0x29, 0x2d, 0x4d, 0x6e, 0xa1, 0x75, 0x52, 0x6e, 0xb9, 0x8a, 0xd9, 0xf6, 0x79, 0xcc, 0xbe, 0x33, + 0x20, 0xcf, 0xdf, 0xae, 0xe6, 0x45, 0xd1, 0xe2, 0x07, 0x24, 0x4c, 0xd8, 0x6b, 0x82, 0xd6, 0x06, + 0x8a, 0x17, 0xf2, 0xb6, 0x81, 0x7e, 0x33, 0x00, 0x4d, 0xd5, 0x51, 0xef, 0x6b, 0x49, 0x33, 0xb6, + 0xcc, 0xdc, 0xb2, 0xcb, 0x82, 0x64, 0x09, 0x59, 0xf3, 0xb9, 0xab, 0xca, 0x2d, 0xfd, 0x77, 0x03, + 0x50, 0xe7, 0x38, 0x3c, 0xd3, 0xc8, 0xc6, 0x29, 0x09, 0x18, 0x4d, 0xcc, 0xf6, 0xa3, 0xe4, 0xff, + 0x62, 0xb9, 0x9b, 0xd8, 0xb7, 0x04, 0xe5, 0x1b, 0xe8, 0xfa, 0x39, 0x94, 0x89, 0x20, 0x77, 0xdb, + 0x40, 0x3f, 0x19, 0x70, 0x65, 0x3e, 0xc7, 0x14, 0x3d, 0x58, 0x66, 0xc8, 0xab, 0x2b, 0x7c, 0xb8, + 0x44, 0x0c, 0x31, 0x47, 0x56, 0xd0, 0x8f, 0xf1, 0x16, 0x50, 0x0b, 0x42, 0x32, 0x76, 0xf1, 0xed, + 0xa2, 0xf4, 0x41, 0xf2, 0x18, 0x8a, 0xdc, 0x37, 0x06, 0x20, 0x87, 0x0c, 0xc3, 0x88, 0xc5, 0x16, + 0xda, 0xa5, 0x2b, 0x97, 0xe4, 0x6d, 0xaf, 0xf0, 0x4a, 0x6e, 0xcc, 0x0c, 0xc8, 0xc5, 0xf2, 0x74, + 0xfe, 0xc8, 0x2e, 0xd5, 0x96, 0x8a, 0xa1, 0x7e, 0xd6, 0x2b, 0xe8, 0xe7, 0x78, 0xa3, 0x3d, 0xd6, + 0x33, 0xf3, 0x15, 0xa2, 0xf8, 0xab, 0x31, 0xb7, 0xb7, 0x7c, 0x2c, 0x77, 0x86, 0x57, 0x89, 0xe5, + 0xb7, 0x06, 0xa0, 0xf9, 0xfd, 0x05, 0x35, 0x16, 0x89, 0xfe, 0x9f, 0xfb, 0x4f, 0xa2, 0xd6, 0x7b, + 0x00, 0x9f, 0x64, 0xb4, 0xee, 0x60, 0x4d, 0x38, 0xbd, 0xf5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x83, 0x4c, 0x56, 0x43, 0xd0, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. From ec14f1159febc163ca17bace961e2a4a17a4e14f Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Wed, 10 Jun 2020 12:40:39 -0400 Subject: [PATCH 21/31] added hardware version, updated docker-compose.yml --- deploy/docker-compose.yml | 70 ++++----- protos/hardware/hardware.pb.go | 254 +++++++++++++++++---------------- protos/hardware/hardware.proto | 2 +- protos/template/template.pb.go | 12 +- 4 files changed, 174 insertions(+), 164 deletions(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index d3ff2b4a6..5b266f852 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -99,8 +99,8 @@ services: ROLLBAR_TOKEN: ${ROLLBAR_TOKEN:-ignored} ROLLBAR_DISABLE: ${ROLLBAR_DISABLE:-1} MIRROR_HOST: ${TINKERBELL_NGINX_IP:-127.0.0.1} - CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 - CACHER_CERT_URL: http://127.0.0.1:42112/cert +# CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 +# CACHER_CERT_URL: http://127.0.0.1:42112/cert DNS_SERVERS: 8.8.8.8 PUBLIC_IP: $TINKERBELL_HOST_IP BOOTP_BIND: $TINKERBELL_HOST_IP:67 @@ -113,10 +113,10 @@ services: TINKERBELL_GRPC_AUTHORITY: $TINKERBELL_HOST_IP:42113 TINKERBELL_CERT_URL: http://$TINKERBELL_HOST_IP:42114/cert ELASTIC_SEARCH_URL: $TINKERBELL_HOST_IP:9200 - HARDWARE_DATA_MODEL: tinkerbell + DATA_MODEL_VERSION: 1 depends_on: - cacher: - condition: service_started + db: + condition: service_healthy ports: - $TINKERBELL_HOST_IP:80:80/tcp - 67:67/udp @@ -131,31 +131,31 @@ services: volumes: - ./state/webroot:/usr/share/nginx/html/ - cacher: - image: quay.io/packet/cacher:workflow - restart: unless-stopped - environment: - FACILITY: ${FACILITY:-onprem} - PACKET_API_AUTH_TOKEN: ${PACKET_API_AUTH_TOKEN} - PACKET_API_URL: ${PACKET_API_URL} - PACKET_CONSUMER_TOKEN: ${PACKET_CONSUMER_TOKEN-ignored} - PACKET_ENV: testing - PACKET_VERSION: ${PACKET_VERSION:-ignored} - PGDATABASE: tinkerbell - PGHOST: db - PGPASSWORD: tinkerbell - PGPORT: 5432 - PGSSLMODE: disable - PGUSER: tinkerbell - ROLLBAR_TOKEN: ${ROLLBAR_TOKEN-ignored} - volumes: - - ./state/certs:/certs/${FACILITY:-onprem} - depends_on: - db: - condition: service_healthy - ports: - - 42111:42111/tcp - - 42112:42112/tcp + # cacher: + # image: quay.io/packet/cacher:workflow + # restart: unless-stopped + # environment: + # FACILITY: ${FACILITY:-onprem} + # PACKET_API_AUTH_TOKEN: ${PACKET_API_AUTH_TOKEN} + # PACKET_API_URL: ${PACKET_API_URL} + # PACKET_CONSUMER_TOKEN: ${PACKET_CONSUMER_TOKEN-ignored} + # PACKET_ENV: testing + # PACKET_VERSION: ${PACKET_VERSION:-ignored} + # PGDATABASE: tinkerbell + # PGHOST: db + # PGPASSWORD: tinkerbell + # PGPORT: 5432 + # PGSSLMODE: disable + # PGUSER: tinkerbell + # ROLLBAR_TOKEN: ${ROLLBAR_TOKEN-ignored} + # volumes: + # - ./state/certs:/certs/${FACILITY:-onprem} + # depends_on: + # db: + # condition: service_healthy + # ports: + # - 42111:42111/tcp + # - 42112:42112/tcp hegel: image: quay.io/tinkerbell/hegel:latest @@ -169,11 +169,11 @@ services: GRPC_PORT: 42115 HEGEL_FACILITY: ${FACILITY:-onprem} HEGEL_USE_TLS: 0 - CACHER_CERT_URL: http://127.0.0.1:42112/cert - CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 +# CACHER_CERT_URL: http://127.0.0.1:42112/cert +# CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 TINKERBELL_GRPC_AUTHORITY: 127.0.0.1:42113 TINKERBELL_CERT_URL: http://127.0.0.1:42114/cert - HARDWARE_DATA_MODEL: tinkerbell + DATA_MODEL_VERSION: 1 depends_on: - cacher: - condition: service_started + db: + condition: service_healthy diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index ffe89d729..679ccb984 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -158,6 +158,7 @@ type Hardware struct { Metadata *Hardware_Metadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"` Network *Hardware_Network `protobuf:"bytes,6,opt,name=network,proto3" json:"network,omitempty"` Id string `protobuf:"bytes,7,opt,name=id,proto3" json:"id,omitempty"` + Version int64 `protobuf:"varint,8,opt,name=version,proto3" json:"version,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -237,6 +238,13 @@ func (m *Hardware) GetId() string { return "" } +func (m *Hardware) GetVersion() int64 { + if m != nil { + return m.Version + } + return 0 +} + type Hardware_DHCP struct { Mac string `protobuf:"bytes,1,opt,name=mac,proto3" json:"mac,omitempty"` OBSOLETEIp string `protobuf:"bytes,2,opt,name=OBSOLETE_ip,json=OBSOLETEIp,proto3" json:"OBSOLETE_ip,omitempty"` @@ -1857,132 +1865,132 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1989 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xeb, 0x8e, 0x1c, 0x47, + // 1996 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x8f, 0x1c, 0x47, 0x15, 0xd6, 0xdc, 0x76, 0x66, 0xce, 0xec, 0xc5, 0x2e, 0xdb, 0xf1, 0xb8, 0x03, 0xc4, 0x6c, 0x04, 0x18, 0x23, 0x8d, 0xe3, 0x25, 0x02, 0x81, 0x00, 0xc9, 0xf6, 0xf8, 0x32, 0x21, 0xeb, 0x1d, 0x6a, 0x1c, 0x9b, 0x70, 0x6b, 0x6a, 0xba, 0x6b, 0x66, 0x2a, 0xdb, 0xb7, 0x74, 0x55, 0xef, 0x7a, 0x88, - 0x12, 0x10, 0x12, 0xfc, 0x41, 0x08, 0x04, 0x3c, 0x01, 0x8f, 0xc0, 0x4f, 0xfe, 0xf0, 0x10, 0x79, - 0x03, 0x84, 0xe0, 0x19, 0xf8, 0x81, 0x84, 0x4e, 0x5d, 0x7a, 0x7b, 0x6d, 0x88, 0xe2, 0x9d, 0x5d, - 0xff, 0xab, 0x73, 0xaa, 0xfa, 0x3b, 0xe7, 0xd4, 0xb9, 0x56, 0xc3, 0xe5, 0x05, 0xcb, 0xc3, 0x43, - 0x96, 0xf3, 0x1b, 0x6e, 0x31, 0xc8, 0xf2, 0x54, 0xa5, 0xe4, 0xfa, 0x5c, 0xa8, 0x45, 0x31, 0x1d, - 0x04, 0x69, 0x3c, 0x50, 0x22, 0xd9, 0xe7, 0xf9, 0x94, 0x47, 0x91, 0x5e, 0x9a, 0x13, 0x72, 0xe0, - 0xbe, 0xf0, 0x3e, 0x33, 0x4f, 0xd3, 0x79, 0xc4, 0x6f, 0xb0, 0x4c, 0xdc, 0x60, 0x49, 0x92, 0x2a, - 0xa6, 0x44, 0x9a, 0x48, 0x73, 0x6e, 0xfb, 0x09, 0xf4, 0xc6, 0x85, 0x5c, 0x50, 0xfe, 0x7e, 0xc1, - 0xa5, 0x22, 0x0f, 0xa0, 0x19, 0x32, 0xc5, 0xfa, 0xb5, 0xab, 0xb5, 0x6b, 0xbd, 0x9d, 0x37, 0x07, - 0x9f, 0x5e, 0xce, 0xe0, 0x81, 0x5d, 0x50, 0x8d, 0xb0, 0xdd, 0x86, 0xd6, 0xdd, 0x38, 0x53, 0xcb, - 0xed, 0xef, 0x00, 0xdc, 0xe7, 0xca, 0x09, 0x38, 0x07, 0x8d, 0x98, 0x05, 0x1a, 0xbf, 0x4b, 0x71, - 0x49, 0x36, 0xa1, 0x2e, 0xb2, 0x7e, 0x5d, 0x33, 0xea, 0x22, 0xd3, 0x74, 0xd8, 0x6f, 0x58, 0x3a, - 0xdc, 0xfe, 0xd5, 0x57, 0xa0, 0xe3, 0xb0, 0xc9, 0xeb, 0xb0, 0xb1, 0x77, 0x7b, 0xb2, 0xf7, 0xf6, - 0xdd, 0x47, 0x77, 0xfd, 0xb7, 0x26, 0x7b, 0x0f, 0x2d, 0xd0, 0xba, 0x63, 0x22, 0x8f, 0xfc, 0xa4, - 0x72, 0x28, 0x5c, 0x04, 0x06, 0xbc, 0xb7, 0xf3, 0x8d, 0x93, 0x58, 0x33, 0x18, 0x3e, 0xb8, 0x33, - 0x3e, 0xc2, 0x1f, 0x2e, 0x82, 0x8c, 0xcc, 0xe1, 0x5c, 0x89, 0x9f, 0x70, 0x35, 0x4d, 0x53, 0xa5, - 0xf5, 0xed, 0xed, 0x7c, 0xeb, 0x44, 0x22, 0x1e, 0x1a, 0x0c, 0xba, 0xe5, 0x50, 0x2d, 0xe3, 0x59, - 0x41, 0x87, 0x69, 0xbe, 0xdf, 0x6f, 0x5e, 0x6d, 0xac, 0x22, 0x08, 0x31, 0x8e, 0x09, 0x42, 0x06, - 0x79, 0x17, 0x3a, 0x31, 0x57, 0x4c, 0xbb, 0xbe, 0xa5, 0x2d, 0xf9, 0xf6, 0x89, 0x04, 0xec, 0x5a, - 0x10, 0x5a, 0xc2, 0x91, 0xc7, 0xd0, 0x76, 0xaa, 0xaf, 0xad, 0x76, 0x47, 0x5a, 0x75, 0x07, 0x66, - 0xc3, 0xa4, 0xed, 0xc2, 0xc4, 0xfb, 0x67, 0x03, 0x9a, 0xe8, 0xab, 0xff, 0x11, 0x61, 0xaf, 0x41, - 0xaf, 0xbc, 0xc6, 0x32, 0xd4, 0xc0, 0xb1, 0x46, 0x19, 0xf1, 0xa0, 0xb3, 0x48, 0xa5, 0x4a, 0x58, - 0xcc, 0x6d, 0xe0, 0x95, 0x34, 0xf9, 0x2c, 0x40, 0xc4, 0x99, 0xe4, 0xbe, 0x12, 0x31, 0xef, 0x37, - 0xaf, 0xd6, 0xae, 0x35, 0x68, 0x57, 0x73, 0x1e, 0x89, 0x98, 0x93, 0xcf, 0xc3, 0x3a, 0x1e, 0xf3, - 0x25, 0xcf, 0x0f, 0x78, 0x2e, 0xfb, 0xad, 0xab, 0x8d, 0x6b, 0x5d, 0xda, 0x43, 0xde, 0xc4, 0xb0, - 0xf0, 0x08, 0x7e, 0x5b, 0x1e, 0x59, 0x33, 0x47, 0x90, 0xe7, 0x8e, 0x7c, 0xb9, 0xe2, 0xe8, 0x39, - 0x53, 0xfc, 0x90, 0x2d, 0xad, 0x69, 0xa5, 0xab, 0xee, 0x1b, 0x36, 0x21, 0xd0, 0x64, 0x79, 0xb0, - 0xe8, 0x77, 0xf4, 0xb6, 0x5e, 0x23, 0xaf, 0xe0, 0x33, 0xd1, 0xef, 0x5e, 0xad, 0x5d, 0xeb, 0x50, - 0xbd, 0x46, 0xbd, 0xc5, 0x8c, 0x05, 0xdc, 0xd7, 0x56, 0x81, 0x3e, 0xdd, 0xd5, 0x9c, 0x87, 0x68, - 0xd6, 0xdb, 0x3a, 0xeb, 0x7a, 0x2b, 0x78, 0x04, 0x2f, 0x7b, 0x30, 0x1a, 0x63, 0xce, 0x7a, 0xef, - 0x41, 0x7d, 0x34, 0x26, 0x7d, 0x68, 0xb3, 0x30, 0xcc, 0xb9, 0x94, 0xf6, 0xf6, 0x1d, 0x89, 0x3b, - 0x09, 0x57, 0x31, 0x93, 0xfb, 0xf6, 0xf6, 0x1d, 0x89, 0x3b, 0xce, 0x60, 0x73, 0xf3, 0x8e, 0x24, - 0xaf, 0xc0, 0xda, 0x8c, 0xc5, 0x22, 0x5a, 0xda, 0x4b, 0xb7, 0x94, 0xf7, 0xa7, 0x26, 0xb4, 0x5d, - 0x82, 0xbc, 0x0a, 0x5d, 0x16, 0x45, 0xe9, 0xa1, 0x9f, 0x3d, 0xe5, 0x5a, 0x66, 0x87, 0x76, 0x34, - 0x63, 0xfc, 0x94, 0x93, 0x2f, 0xc0, 0xa6, 0xd9, 0xc4, 0x78, 0x99, 0x45, 0xe9, 0xa1, 0x96, 0xdd, - 0xa1, 0x1b, 0x9a, 0xfb, 0xc4, 0x32, 0xc9, 0x3b, 0xd0, 0x14, 0xf8, 0xb9, 0xc9, 0xe0, 0x5b, 0xab, - 0x64, 0xf0, 0x60, 0x34, 0xfe, 0xfe, 0x5d, 0xaa, 0xe1, 0xc8, 0x47, 0x70, 0xa9, 0x74, 0x29, 0xee, - 0x49, 0x95, 0xb3, 0x2c, 0xe3, 0xb9, 0xb6, 0xa6, 0xb7, 0x33, 0x5a, 0x49, 0xce, 0xed, 0x0a, 0x20, - 0xbd, 0xe8, 0xe4, 0x54, 0xb9, 0x68, 0x56, 0x2a, 0x05, 0xb7, 0xe9, 0xbc, 0x9a, 0x59, 0x7b, 0x52, - 0x70, 0xaa, 0xe1, 0xbc, 0x37, 0xa1, 0x89, 0x46, 0x62, 0x96, 0x15, 0x79, 0xe4, 0xb2, 0xac, 0xc8, - 0x23, 0x4c, 0xa2, 0x20, 0x4d, 0x14, 0x4f, 0x94, 0xb4, 0x4e, 0x2e, 0x69, 0x6f, 0x13, 0xd6, 0xab, - 0xca, 0x79, 0xdf, 0x83, 0x26, 0x62, 0x92, 0x2b, 0xd0, 0x99, 0x62, 0x6e, 0x1d, 0x41, 0xb5, 0x91, - 0x7e, 0x27, 0x8f, 0xd0, 0xfd, 0xfb, 0x3c, 0x4f, 0x78, 0x64, 0xc1, 0x2c, 0x85, 0x7c, 0x91, 0x08, - 0x95, 0xbb, 0x16, 0x61, 0x29, 0xef, 0xef, 0x26, 0x2c, 0x74, 0x6d, 0x78, 0xae, 0x01, 0xd4, 0xce, - 0xbe, 0x01, 0xd4, 0xcf, 0xa2, 0x01, 0xcc, 0x00, 0x44, 0xa2, 0x78, 0x8e, 0x69, 0x2b, 0xfb, 0x0d, - 0x5d, 0xfa, 0xef, 0xad, 0x52, 0x3f, 0x07, 0x23, 0x07, 0x47, 0x2b, 0xc8, 0xe4, 0xfd, 0x8a, 0x41, - 0x21, 0x9f, 0xb1, 0x22, 0x52, 0x36, 0x4e, 0x4f, 0x4b, 0x5a, 0x69, 0xda, 0xd0, 0xc0, 0x7b, 0x7f, - 0xa9, 0x41, 0xb7, 0xdc, 0x26, 0xbb, 0xd0, 0x3c, 0x1d, 0x47, 0x69, 0x18, 0xdb, 0x74, 0x4e, 0xcd, - 0x2f, 0x0e, 0xcc, 0xfb, 0xf7, 0x15, 0xe8, 0xb8, 0x1e, 0x47, 0x2e, 0x42, 0x4b, 0x2a, 0xa6, 0xb8, - 0x8d, 0x5c, 0x43, 0x60, 0xb5, 0x9f, 0xa6, 0x49, 0x28, 0x92, 0xb9, 0x1f, 0xa7, 0x21, 0xd7, 0xf2, - 0x1b, 0xb4, 0x67, 0x79, 0xbb, 0x69, 0xc8, 0x49, 0x02, 0xeb, 0x31, 0x4b, 0x8a, 0x19, 0x0b, 0x54, - 0x91, 0xf3, 0xdc, 0x56, 0x9e, 0xb7, 0x56, 0xea, 0xb8, 0x83, 0xdd, 0x0a, 0x22, 0x3d, 0x86, 0x4f, - 0xa6, 0xd0, 0x11, 0x89, 0x54, 0x2c, 0x09, 0xf8, 0x4a, 0x5e, 0x2d, 0x65, 0x8d, 0x2c, 0x1a, 0x2d, - 0x71, 0xc9, 0x8f, 0x60, 0x2d, 0x28, 0xa4, 0x4a, 0x63, 0x5b, 0x70, 0x86, 0xab, 0x49, 0xb8, 0xa3, - 0xb1, 0xa8, 0xc5, 0x44, 0x0b, 0x66, 0x2c, 0x10, 0x91, 0x50, 0x4b, 0x3b, 0x45, 0xac, 0x68, 0xc1, - 0x3d, 0x8b, 0x46, 0x4b, 0x5c, 0x6f, 0x07, 0xd6, 0xab, 0x77, 0x68, 0x07, 0x8c, 0x9a, 0x1b, 0x30, - 0xb0, 0xc9, 0xca, 0xa8, 0x98, 0xdb, 0x72, 0xa4, 0xd7, 0xde, 0x5f, 0x2f, 0x40, 0xc7, 0x5d, 0xc6, - 0x73, 0x1f, 0x94, 0xf1, 0x51, 0xaf, 0xc6, 0xc7, 0x27, 0xcd, 0x1a, 0xc7, 0xda, 0x59, 0xf3, 0x99, - 0x76, 0xf6, 0x0a, 0xac, 0xe5, 0x5c, 0x06, 0x85, 0x29, 0xe9, 0x1d, 0x6a, 0x29, 0x32, 0x83, 0xfa, - 0xde, 0xc4, 0xde, 0xca, 0xe3, 0xd3, 0xf1, 0xeb, 0x60, 0x2f, 0xe3, 0x39, 0x53, 0x22, 0x99, 0x4f, - 0x96, 0x52, 0xf1, 0x98, 0xd6, 0xf7, 0x26, 0x38, 0x50, 0xb0, 0xe8, 0x90, 0x2d, 0xa5, 0xd6, 0xae, - 0xad, 0x75, 0xe8, 0x1a, 0x0e, 0xaa, 0xf7, 0x45, 0xd8, 0xc2, 0xbe, 0xe7, 0xcb, 0x20, 0x17, 0x99, - 0xd2, 0x15, 0xdd, 0x8c, 0x28, 0x1b, 0xc8, 0x9e, 0x68, 0x2e, 0xd6, 0xf5, 0x1f, 0x42, 0x43, 0x64, - 0xb2, 0xdf, 0xd5, 0xb5, 0x6c, 0x74, 0x4a, 0xfa, 0x8e, 0xc6, 0x14, 0x51, 0xf1, 0x72, 0x0b, 0xc9, - 0x73, 0x3d, 0xc7, 0x9a, 0x91, 0xa7, 0xa4, 0xc9, 0x0e, 0x5c, 0x0a, 0xf2, 0x65, 0xa6, 0x78, 0xe8, - 0xe7, 0x69, 0xaa, 0xfc, 0x8c, 0x49, 0x79, 0x98, 0xe6, 0xa1, 0x1e, 0x82, 0xba, 0xf4, 0x82, 0xdd, - 0xa4, 0x69, 0xaa, 0xc6, 0x76, 0x0b, 0x7d, 0xae, 0xd8, 0x5c, 0xf6, 0xd7, 0xf5, 0xc8, 0xa6, 0xd7, - 0x64, 0x01, 0x6d, 0xa9, 0xd2, 0x9c, 0xcd, 0x79, 0x7f, 0x43, 0x5f, 0xfa, 0xc3, 0x53, 0x32, 0x62, - 0x62, 0x50, 0xa9, 0x83, 0xc7, 0xee, 0x28, 0xe5, 0xc2, 0xdf, 0xe7, 0x4b, 0xd9, 0xdf, 0xd4, 0x1a, - 0xb4, 0xa5, 0x5c, 0x7c, 0x97, 0x2f, 0x25, 0xbe, 0x83, 0xec, 0x20, 0xec, 0xe7, 0x9c, 0x85, 0xcb, - 0xfe, 0x96, 0xf6, 0xc7, 0xba, 0x65, 0x52, 0xe4, 0x79, 0xbf, 0xad, 0xc1, 0xd6, 0x33, 0x9e, 0x2c, - 0xa3, 0xb8, 0x76, 0x14, 0xc5, 0x18, 0x59, 0xa1, 0x90, 0x2a, 0x4f, 0x5d, 0xab, 0x35, 0x14, 0xce, - 0x66, 0x38, 0x9d, 0x8a, 0x34, 0x71, 0xb3, 0x99, 0x25, 0x31, 0x50, 0x45, 0xcc, 0xe6, 0xdc, 0x57, - 0x6c, 0xae, 0x03, 0xb5, 0x4b, 0x3b, 0x9a, 0xf1, 0x88, 0xcd, 0xc9, 0x65, 0x68, 0xa7, 0xd2, 0xd7, - 0x52, 0x5a, 0x06, 0x2f, 0x95, 0x13, 0xcc, 0x96, 0x3f, 0xd7, 0x5e, 0xde, 0x98, 0x88, 0xfc, 0xac, - 0x98, 0x46, 0x22, 0x70, 0xe9, 0x62, 0x28, 0xf2, 0x39, 0x80, 0x98, 0x25, 0x6c, 0xce, 0x63, 0x9e, - 0x28, 0x9d, 0x36, 0x1d, 0x5a, 0xe1, 0x78, 0xff, 0xea, 0x41, 0xdb, 0x7a, 0x02, 0x27, 0xc8, 0xa3, - 0xb6, 0x28, 0xe4, 0x3e, 0x2a, 0x8c, 0x6e, 0x28, 0xa7, 0x8b, 0x21, 0x32, 0x8f, 0x3d, 0x4a, 0x73, - 0x26, 0xc2, 0x7e, 0x5d, 0x9f, 0x2a, 0x67, 0x06, 0xca, 0x44, 0x48, 0x6e, 0x42, 0x39, 0xa7, 0xf9, - 0x33, 0x11, 0x71, 0xa9, 0xfd, 0x61, 0x9a, 0x7a, 0x97, 0x5e, 0x70, 0x7b, 0xf7, 0x8e, 0xb6, 0x88, - 0x80, 0x96, 0x91, 0x6a, 0xde, 0x7c, 0x93, 0xd3, 0x8d, 0xb3, 0x01, 0x2a, 0x4f, 0x8d, 0x04, 0x32, - 0x87, 0xa6, 0xd6, 0xbc, 0x75, 0x26, 0x92, 0xe8, 0xad, 0xd1, 0x90, 0x6a, 0x01, 0xe4, 0x03, 0xe8, - 0x55, 0xad, 0x5f, 0xd3, 0xf2, 0xde, 0x3d, 0x65, 0x79, 0x47, 0x97, 0x48, 0xab, 0xd2, 0xbc, 0xbf, - 0xd5, 0xa1, 0x89, 0x56, 0xeb, 0x88, 0xe7, 0x07, 0x22, 0x70, 0xbd, 0xdb, 0x52, 0x58, 0xe3, 0x0e, - 0x45, 0x86, 0x61, 0x3d, 0x8d, 0xb8, 0x7d, 0x2e, 0x74, 0x91, 0xf3, 0x08, 0x19, 0xe4, 0x43, 0x80, - 0x8c, 0xe5, 0x4a, 0xe8, 0x1f, 0x28, 0x76, 0x1c, 0xfb, 0xf1, 0x19, 0x78, 0x65, 0x30, 0x76, 0x52, - 0x68, 0x45, 0xa0, 0xf7, 0x8b, 0x1a, 0x74, 0xcb, 0x1d, 0x6c, 0x2f, 0x11, 0x9b, 0x72, 0x37, 0x38, - 0x1b, 0x02, 0x2d, 0x4b, 0x8a, 0x78, 0xca, 0x73, 0x3b, 0x78, 0x58, 0x4a, 0xe7, 0xbd, 0xf8, 0x99, - 0x69, 0x39, 0x0d, 0xaa, 0xd7, 0xb6, 0x41, 0xe5, 0xca, 0x66, 0x8e, 0x21, 0x30, 0xb7, 0xd5, 0x32, - 0xe3, 0xfe, 0xbc, 0xd0, 0xf1, 0xa0, 0x73, 0x1b, 0x19, 0xf7, 0x0b, 0x11, 0x7a, 0x09, 0x34, 0xf1, - 0x72, 0x11, 0x2e, 0x63, 0x6a, 0xe1, 0xca, 0x08, 0xae, 0x3f, 0xe9, 0x01, 0x80, 0xe7, 0xf5, 0x34, - 0x64, 0xc5, 0xe3, 0x5a, 0x3f, 0x21, 0x44, 0x68, 0x85, 0xe3, 0x12, 0x39, 0x73, 0x2b, 0xb4, 0x41, - 0x71, 0xe9, 0xfd, 0xa7, 0x0e, 0xad, 0xdd, 0xb4, 0x48, 0xd4, 0xff, 0x75, 0x19, 0xe6, 0x7f, 0x9a, - 0xc7, 0x4c, 0xb9, 0xe2, 0x65, 0x28, 0x4c, 0x1e, 0xed, 0x7a, 0xeb, 0xa6, 0xc9, 0x19, 0x84, 0x18, - 0x35, 0x12, 0xc8, 0x47, 0xb0, 0x16, 0xe4, 0x1c, 0x3b, 0xbd, 0x99, 0xae, 0x66, 0xa7, 0x2c, 0x4b, - 0x5f, 0x40, 0x25, 0xa8, 0xf7, 0x32, 0x1d, 0x0f, 0xd4, 0x4a, 0x45, 0x3f, 0x66, 0xa9, 0x48, 0x94, - 0xf5, 0x96, 0x21, 0xbc, 0x3b, 0x70, 0xfe, 0xb9, 0x4f, 0xf0, 0xe8, 0x2c, 0xcd, 0x03, 0xf7, 0x58, - 0x36, 0x04, 0x56, 0xd7, 0xd4, 0x1c, 0xb0, 0xa5, 0xcb, 0x91, 0xde, 0x53, 0x80, 0x23, 0x10, 0xf2, - 0x1e, 0xb4, 0x62, 0xd4, 0xc5, 0x8e, 0xe9, 0x8f, 0xce, 0xc2, 0x4e, 0x6a, 0x44, 0x78, 0x3f, 0x85, - 0x26, 0x96, 0x0d, 0x8c, 0x1c, 0x3d, 0x2b, 0xd9, 0x48, 0xd3, 0x73, 0x12, 0x86, 0x3e, 0x3f, 0x28, - 0x9f, 0x86, 0x86, 0x40, 0x2b, 0x4c, 0x4c, 0xb8, 0xa2, 0xea, 0x48, 0x1d, 0xe8, 0x19, 0xcb, 0x79, - 0x19, 0xe8, 0x48, 0xe0, 0x0b, 0x64, 0xcd, 0xcc, 0x99, 0xe4, 0xe7, 0xb0, 0x95, 0xe5, 0x5c, 0x0f, - 0xb3, 0x51, 0xc4, 0x43, 0x3f, 0x95, 0xd6, 0xc4, 0xb3, 0x1a, 0xa8, 0x36, 0xab, 0xe2, 0xf6, 0x24, - 0xf9, 0x12, 0x2a, 0x20, 0x0e, 0x98, 0xe2, 0xbe, 0x2c, 0xa6, 0x09, 0x57, 0xce, 0x13, 0x9b, 0x96, - 0x3d, 0x31, 0x5c, 0xef, 0x29, 0x74, 0xdc, 0xec, 0x8a, 0x99, 0x9a, 0x45, 0x2c, 0xf1, 0x2b, 0x0d, - 0xbd, 0x83, 0x0c, 0x6c, 0xb6, 0xe4, 0x3a, 0x9c, 0xd7, 0x9b, 0xb6, 0x65, 0xfb, 0x95, 0xd9, 0x75, - 0x0b, 0x37, 0x1e, 0x1b, 0xbe, 0x3e, 0xfb, 0x3a, 0x6c, 0xb8, 0x31, 0xd8, 0x0f, 0x5c, 0x9a, 0x76, - 0xe9, 0xba, 0x63, 0xde, 0x49, 0x43, 0xbe, 0xfd, 0x1a, 0x6c, 0x0c, 0x79, 0xc4, 0x15, 0x77, 0xbf, - 0x72, 0x37, 0xa1, 0x3e, 0x1a, 0xba, 0x79, 0x77, 0x34, 0xdc, 0xf9, 0xb8, 0x0d, 0x5b, 0xee, 0x0a, - 0x26, 0x3c, 0xd7, 0xd9, 0xf9, 0x9b, 0x1a, 0x34, 0xc7, 0x85, 0x5c, 0x90, 0xaf, 0xbf, 0xc8, 0x45, - 0x56, 0xfe, 0x48, 0x7b, 0x37, 0x5f, 0xe4, 0x43, 0xf3, 0xc7, 0xf9, 0xf2, 0x2f, 0x3f, 0xfe, 0xc7, - 0x1f, 0xeb, 0xe7, 0xb7, 0xd7, 0x6f, 0x1c, 0xdc, 0x2c, 0xff, 0x9c, 0x7f, 0xb3, 0x76, 0x9d, 0xfc, - 0xa1, 0x06, 0xad, 0xdb, 0xcb, 0xdd, 0x5b, 0x77, 0xc8, 0xd7, 0x5e, 0x04, 0xf5, 0xe8, 0xf7, 0xb5, - 0x77, 0xa2, 0x3f, 0xe2, 0xdb, 0xaf, 0x6a, 0x85, 0x2e, 0x6d, 0x9f, 0xab, 0x2a, 0x74, 0x23, 0x66, - 0x01, 0x2a, 0xf5, 0xfb, 0x1a, 0x34, 0x6f, 0x2f, 0x47, 0xe3, 0x97, 0xac, 0x93, 0xa7, 0x75, 0xba, - 0xb8, 0xbd, 0x75, 0x4c, 0x27, 0x91, 0xa1, 0x4a, 0xbf, 0x33, 0x2a, 0x0d, 0x5f, 0xb2, 0x4a, 0x57, - 0xb4, 0x4a, 0x17, 0xc8, 0xf9, 0x63, 0x2a, 0x7d, 0x20, 0xc2, 0x0f, 0xc9, 0xaf, 0x6b, 0xd0, 0xb8, - 0x15, 0x45, 0xe4, 0xc5, 0xa3, 0xe1, 0x84, 0xba, 0x5c, 0xd4, 0xba, 0x6c, 0x92, 0x63, 0x31, 0xf4, - 0x46, 0x8d, 0x1c, 0x42, 0xeb, 0x09, 0x53, 0xc1, 0xe2, 0xe5, 0x5e, 0xcd, 0x1b, 0x35, 0x72, 0x00, - 0x6b, 0x26, 0xfd, 0xc8, 0x0b, 0xfd, 0x1d, 0x39, 0x96, 0xb2, 0x27, 0x48, 0xa6, 0xdb, 0xf0, 0x83, - 0x8e, 0xe3, 0x4c, 0xd7, 0xf4, 0x91, 0xaf, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x24, 0xfe, - 0xda, 0x98, 0x1a, 0x00, 0x00, + 0x12, 0x10, 0x0f, 0xbc, 0x20, 0x04, 0x02, 0xde, 0x91, 0xf8, 0x09, 0x3c, 0xf2, 0xc2, 0x8f, 0xc8, + 0x3f, 0x40, 0x08, 0x7e, 0x03, 0x0f, 0x48, 0xe8, 0xd4, 0xa5, 0xb7, 0xd7, 0x86, 0x28, 0xde, 0xd9, + 0xf5, 0x5b, 0x9d, 0x53, 0xd5, 0xdf, 0xb9, 0xd7, 0x39, 0xd5, 0x70, 0x79, 0xc1, 0xf2, 0xf0, 0x90, + 0xe5, 0xfc, 0x86, 0x5b, 0x0c, 0xb2, 0x3c, 0x55, 0x29, 0xb9, 0x3e, 0x17, 0x6a, 0x51, 0x4c, 0x07, + 0x41, 0x1a, 0x0f, 0x94, 0x48, 0xf6, 0x79, 0x3e, 0xe5, 0x51, 0xa4, 0x97, 0xe6, 0x84, 0x1c, 0xb8, + 0x2f, 0xbc, 0xcf, 0xcc, 0xd3, 0x74, 0x1e, 0xf1, 0x1b, 0x2c, 0x13, 0x37, 0x58, 0x92, 0xa4, 0x8a, + 0x29, 0x91, 0x26, 0xd2, 0x9c, 0xdb, 0x7e, 0x02, 0xbd, 0x71, 0x21, 0x17, 0x94, 0xbf, 0x5f, 0x70, + 0xa9, 0xc8, 0x03, 0x68, 0x86, 0x4c, 0xb1, 0x7e, 0xed, 0x6a, 0xed, 0x5a, 0x6f, 0xe7, 0xcd, 0xc1, + 0xa7, 0x97, 0x33, 0x78, 0x60, 0x17, 0x54, 0x23, 0x6c, 0xb7, 0xa1, 0x75, 0x37, 0xce, 0xd4, 0x72, + 0xfb, 0x3b, 0x00, 0xf7, 0xb9, 0x72, 0x02, 0xce, 0x41, 0x23, 0x66, 0x81, 0xc6, 0xef, 0x52, 0x5c, + 0x92, 0x4d, 0xa8, 0x8b, 0xac, 0x5f, 0xd7, 0x8c, 0xba, 0xc8, 0x34, 0x1d, 0xf6, 0x1b, 0x96, 0x0e, + 0xb7, 0xff, 0xf4, 0x15, 0xe8, 0x38, 0x6c, 0xf2, 0x3a, 0x6c, 0xec, 0xdd, 0x9e, 0xec, 0xbd, 0x7d, + 0xf7, 0xd1, 0x5d, 0xff, 0xad, 0xc9, 0xde, 0x43, 0x0b, 0xb4, 0xee, 0x98, 0xc8, 0x23, 0x3f, 0xa9, + 0x1c, 0x0a, 0x17, 0x81, 0x01, 0xef, 0xed, 0x7c, 0xe3, 0x24, 0xd6, 0x0c, 0x86, 0x0f, 0xee, 0x8c, + 0x8f, 0xf0, 0x87, 0x8b, 0x20, 0x23, 0x73, 0x38, 0x57, 0xe2, 0x27, 0x5c, 0x4d, 0xd3, 0x54, 0x69, + 0x7d, 0x7b, 0x3b, 0xdf, 0x3a, 0x91, 0x88, 0x87, 0x06, 0x83, 0x6e, 0x39, 0x54, 0xcb, 0x78, 0x56, + 0xd0, 0x61, 0x9a, 0xef, 0xf7, 0x9b, 0x57, 0x1b, 0xab, 0x08, 0x42, 0x8c, 0x63, 0x82, 0x90, 0x41, + 0xde, 0x85, 0x4e, 0xcc, 0x15, 0xd3, 0xa1, 0x6f, 0x69, 0x4b, 0xbe, 0x7d, 0x22, 0x01, 0xbb, 0x16, + 0x84, 0x96, 0x70, 0xe4, 0x31, 0xb4, 0x9d, 0xea, 0x6b, 0xab, 0xf9, 0x48, 0xab, 0xee, 0xc0, 0x6c, + 0x9a, 0xb4, 0x5d, 0x9a, 0x90, 0x3e, 0xb4, 0x0f, 0x78, 0x2e, 0x45, 0x9a, 0xf4, 0x3b, 0x57, 0x6b, + 0xd7, 0x1a, 0xd4, 0x91, 0xde, 0x3f, 0x1b, 0xd0, 0xc4, 0x28, 0xfe, 0x8f, 0xdc, 0x7b, 0x0d, 0x7a, + 0xa5, 0x83, 0xcb, 0x24, 0x04, 0xc7, 0x1a, 0x65, 0xc4, 0x83, 0xce, 0x22, 0x95, 0x2a, 0x61, 0x31, + 0xb7, 0x29, 0x59, 0xd2, 0xe4, 0xb3, 0x00, 0x11, 0x67, 0x92, 0xfb, 0x4a, 0xc4, 0xbc, 0xdf, 0xd4, + 0x42, 0xbb, 0x9a, 0xf3, 0x48, 0xc4, 0x9c, 0x7c, 0x1e, 0xd6, 0xf1, 0x98, 0x2f, 0x79, 0x8e, 0x9a, + 0xf4, 0x5b, 0x57, 0x1b, 0xd7, 0xba, 0xb4, 0x87, 0xbc, 0x89, 0x61, 0xe1, 0x11, 0xfc, 0xb6, 0x3c, + 0xb2, 0x66, 0x8e, 0x20, 0xcf, 0x1d, 0xf9, 0x72, 0x25, 0x05, 0xe6, 0x4c, 0xf1, 0x43, 0xb6, 0xb4, + 0x46, 0x97, 0x41, 0xbc, 0x6f, 0xd8, 0x84, 0x40, 0x93, 0xe5, 0xc1, 0x42, 0x9b, 0xdf, 0xa5, 0x7a, + 0x8d, 0xbc, 0x82, 0xcf, 0x44, 0xbf, 0x7b, 0xb5, 0x76, 0xad, 0x43, 0xf5, 0x1a, 0xf5, 0x16, 0x33, + 0x16, 0x70, 0x5f, 0x5b, 0x05, 0xfa, 0x74, 0x57, 0x73, 0x1e, 0xa2, 0x59, 0x6f, 0xeb, 0x7a, 0xec, + 0xad, 0x10, 0x2b, 0x74, 0xf6, 0x60, 0x34, 0xc6, 0x6a, 0xf6, 0xde, 0x83, 0xfa, 0x68, 0x8c, 0xc1, + 0x61, 0x61, 0x98, 0x73, 0x29, 0xad, 0xf7, 0x1d, 0x89, 0x3b, 0x09, 0x57, 0x31, 0x93, 0xfb, 0xd6, + 0xfb, 0x8e, 0xc4, 0x1d, 0x67, 0xb0, 0xf1, 0xbc, 0x23, 0xc9, 0x2b, 0xb0, 0x36, 0x63, 0xb1, 0x88, + 0x96, 0xd6, 0xe9, 0x96, 0xf2, 0xfe, 0xd8, 0x84, 0xb6, 0x2b, 0x9d, 0x57, 0xa1, 0xcb, 0xa2, 0x28, + 0x3d, 0xf4, 0xb3, 0xa7, 0x5c, 0xcb, 0xec, 0xd0, 0x8e, 0x66, 0x8c, 0x9f, 0x72, 0xf2, 0x05, 0xd8, + 0x34, 0x9b, 0x98, 0x49, 0xb3, 0x28, 0x3d, 0xd4, 0xb2, 0x3b, 0x74, 0x43, 0x73, 0x9f, 0x58, 0x26, + 0x79, 0x07, 0x9a, 0x02, 0x3f, 0x37, 0xb5, 0x7d, 0x6b, 0x95, 0xda, 0x1e, 0x8c, 0xc6, 0xdf, 0xbf, + 0x4b, 0x35, 0x1c, 0xf9, 0x08, 0x2e, 0x95, 0x21, 0xc5, 0x3d, 0xa9, 0x72, 0x96, 0x65, 0x3c, 0xd7, + 0xd6, 0xf4, 0x76, 0x46, 0x2b, 0xc9, 0xb9, 0x5d, 0x01, 0xa4, 0x17, 0x9d, 0x9c, 0x2a, 0x17, 0xcd, + 0x4a, 0xa5, 0xe0, 0xb6, 0xd0, 0x57, 0x33, 0x6b, 0x4f, 0x0a, 0x4e, 0x35, 0x9c, 0xf7, 0x26, 0x34, + 0xd1, 0x48, 0xac, 0xb2, 0x22, 0x8f, 0x5c, 0x95, 0x15, 0x79, 0x84, 0x45, 0x14, 0xa4, 0x89, 0xe2, + 0x89, 0x92, 0x36, 0xc8, 0x25, 0xed, 0x6d, 0xc2, 0x7a, 0x55, 0x39, 0xef, 0x7b, 0xd0, 0x44, 0x4c, + 0x72, 0x05, 0x3a, 0x53, 0xac, 0xad, 0x23, 0xa8, 0x36, 0xd2, 0xef, 0xe4, 0x11, 0x86, 0x7f, 0x9f, + 0xe7, 0x09, 0x8f, 0x2c, 0x98, 0xa5, 0x90, 0x2f, 0x12, 0xa1, 0x72, 0xd7, 0x3c, 0x2c, 0xe5, 0xfd, + 0xdd, 0xa4, 0x85, 0xbe, 0x35, 0x9e, 0x6b, 0x0d, 0xb5, 0xb3, 0x6f, 0x0d, 0xf5, 0xb3, 0x68, 0x0d, + 0x33, 0x00, 0x91, 0x28, 0x9e, 0x63, 0xd9, 0xca, 0x7e, 0x43, 0x37, 0x85, 0x7b, 0xab, 0xdc, 0xac, + 0x83, 0x91, 0x83, 0xa3, 0x15, 0x64, 0xf2, 0x7e, 0xc5, 0xa0, 0x90, 0xcf, 0x58, 0x11, 0x29, 0x9b, + 0xa7, 0xa7, 0x25, 0xad, 0x34, 0x6d, 0x68, 0xe0, 0xbd, 0xbf, 0xd4, 0xa0, 0x5b, 0x6e, 0x93, 0x5d, + 0x68, 0x9e, 0x4e, 0xa0, 0x34, 0x8c, 0x6d, 0x47, 0xa7, 0x16, 0x17, 0x07, 0xe6, 0xfd, 0xfb, 0x0a, + 0x74, 0x5c, 0xf7, 0x23, 0x17, 0xa1, 0x25, 0x15, 0x53, 0xdc, 0x66, 0xae, 0x21, 0xf0, 0xb6, 0x9f, + 0xa6, 0x49, 0x28, 0x92, 0xb9, 0x1f, 0xa7, 0x21, 0xd7, 0xf2, 0x1b, 0xb4, 0x67, 0x79, 0xbb, 0x69, + 0xc8, 0x49, 0x02, 0xeb, 0x31, 0x4b, 0x8a, 0x19, 0x0b, 0x54, 0x91, 0xf3, 0xdc, 0xde, 0x3c, 0x6f, + 0xad, 0xd4, 0x8b, 0x07, 0xbb, 0x15, 0x44, 0x7a, 0x0c, 0x9f, 0x4c, 0xa1, 0x23, 0x12, 0xa9, 0x58, + 0x12, 0xf0, 0x95, 0xa2, 0x5a, 0xca, 0x1a, 0x59, 0x34, 0x5a, 0xe2, 0x92, 0x1f, 0xc1, 0x5a, 0x50, + 0x48, 0x95, 0xc6, 0xf6, 0xc2, 0x19, 0xae, 0x26, 0xe1, 0x8e, 0xc6, 0xa2, 0x16, 0x13, 0x2d, 0x98, + 0xb1, 0x40, 0x44, 0x42, 0x2d, 0xed, 0x7c, 0xb1, 0xa2, 0x05, 0xf7, 0x2c, 0x1a, 0x2d, 0x71, 0xbd, + 0x1d, 0x58, 0xaf, 0xfa, 0xd0, 0x8e, 0x1e, 0xb5, 0x72, 0xf4, 0x20, 0xd0, 0x94, 0x51, 0x31, 0xb7, + 0xd7, 0x91, 0x5e, 0x7b, 0x7f, 0xbd, 0x00, 0x1d, 0xe7, 0x8c, 0xe7, 0x3e, 0x28, 0xf3, 0xa3, 0x5e, + 0xcd, 0x8f, 0x4f, 0x9a, 0x35, 0x8e, 0xb5, 0xb3, 0xe6, 0x33, 0xed, 0xec, 0x15, 0x58, 0xcb, 0xb9, + 0x0c, 0x0a, 0x73, 0xa5, 0x77, 0xa8, 0xa5, 0xc8, 0x0c, 0xea, 0x7b, 0x13, 0xeb, 0x95, 0xc7, 0xa7, + 0x13, 0xd7, 0xc1, 0x5e, 0xc6, 0x73, 0xa6, 0x44, 0x32, 0x9f, 0x2c, 0xa5, 0xe2, 0x31, 0xad, 0xef, + 0x4d, 0x70, 0xa0, 0x60, 0xd1, 0x21, 0x5b, 0x4a, 0xad, 0x5d, 0x5b, 0xeb, 0xd0, 0x35, 0x1c, 0x54, + 0xef, 0x8b, 0xb0, 0x85, 0x7d, 0xcf, 0x97, 0x41, 0x2e, 0x32, 0xa5, 0x6f, 0x74, 0x33, 0xa2, 0x6c, + 0x20, 0x7b, 0xa2, 0xb9, 0x78, 0xaf, 0xff, 0x10, 0x1a, 0x22, 0x93, 0xfd, 0xae, 0xbe, 0xcb, 0x46, + 0xa7, 0xa4, 0xef, 0x68, 0x4c, 0x11, 0x15, 0x9d, 0x5b, 0x48, 0x9e, 0xeb, 0x09, 0xd7, 0x8c, 0x3c, + 0x25, 0x4d, 0x76, 0xe0, 0x52, 0x90, 0x2f, 0x33, 0xc5, 0x43, 0x3f, 0x4f, 0x53, 0xe5, 0x67, 0x4c, + 0xca, 0xc3, 0x34, 0x0f, 0xf5, 0x10, 0xd4, 0xa5, 0x17, 0xec, 0x26, 0x4d, 0x53, 0x35, 0xb6, 0x5b, + 0x18, 0x73, 0xc5, 0xe6, 0xb2, 0xbf, 0xae, 0x47, 0x36, 0xbd, 0x26, 0x0b, 0x68, 0x4b, 0x95, 0xe6, + 0x6c, 0xce, 0xfb, 0x1b, 0xda, 0xe9, 0x0f, 0x4f, 0xc9, 0x88, 0x89, 0x41, 0xa5, 0x0e, 0x1e, 0xbb, + 0xa3, 0x94, 0x0b, 0x7f, 0x9f, 0x2f, 0x65, 0x7f, 0x53, 0x6b, 0xd0, 0x96, 0x72, 0xf1, 0x5d, 0xbe, + 0x94, 0xf8, 0x42, 0xb2, 0x23, 0xb2, 0x9f, 0x73, 0x16, 0x2e, 0xfb, 0x5b, 0x3a, 0x1e, 0xeb, 0x96, + 0x49, 0x91, 0xe7, 0xfd, 0xa6, 0x06, 0x5b, 0xcf, 0x44, 0xb2, 0xcc, 0xe2, 0xda, 0x51, 0x16, 0x63, + 0x66, 0x85, 0x42, 0xaa, 0x3c, 0x75, 0xad, 0xd6, 0x50, 0xd5, 0x61, 0xdb, 0xce, 0x66, 0x96, 0xc4, + 0x44, 0x15, 0x31, 0x9b, 0x73, 0x5f, 0xb1, 0xb9, 0x4e, 0xd4, 0x2e, 0xed, 0x68, 0xc6, 0x23, 0x36, + 0x27, 0x97, 0xa1, 0x9d, 0x4a, 0x5f, 0x4b, 0x69, 0x19, 0xbc, 0x54, 0x4e, 0xb0, 0x5a, 0xfe, 0x5c, + 0x7b, 0x79, 0x63, 0x22, 0xf2, 0xb3, 0x62, 0x1a, 0x89, 0xc0, 0x95, 0x8b, 0xa1, 0xc8, 0xe7, 0x00, + 0x62, 0x96, 0xb0, 0x39, 0x8f, 0x79, 0xa2, 0x74, 0xd9, 0x74, 0x68, 0x85, 0xe3, 0xfd, 0xab, 0x07, + 0x6d, 0x1b, 0x09, 0x9c, 0x20, 0x8f, 0xda, 0xa2, 0x90, 0xfb, 0xa8, 0x30, 0x86, 0xa1, 0x9c, 0x2e, + 0x86, 0xc8, 0x3c, 0xf6, 0x5c, 0xcd, 0x99, 0x08, 0xfb, 0x75, 0x7d, 0xaa, 0x9c, 0x19, 0x28, 0x13, + 0x21, 0xb9, 0x09, 0xe5, 0x9c, 0xe6, 0xcf, 0x44, 0xc4, 0xa5, 0x8e, 0x87, 0x69, 0xea, 0x5d, 0x7a, + 0xc1, 0xed, 0xdd, 0x3b, 0xda, 0x22, 0x02, 0x5a, 0x46, 0xaa, 0x79, 0x0d, 0x4e, 0x4e, 0x37, 0xcf, + 0x06, 0xa8, 0x3c, 0x35, 0x12, 0xc8, 0x1c, 0x9a, 0x5a, 0xf3, 0xd6, 0x99, 0x48, 0xa2, 0xb7, 0x46, + 0x43, 0xaa, 0x05, 0x90, 0x0f, 0xa0, 0x57, 0xb5, 0x7e, 0x4d, 0xcb, 0x7b, 0xf7, 0x94, 0xe5, 0x1d, + 0x39, 0x91, 0x56, 0xa5, 0x79, 0x7f, 0xab, 0x43, 0x13, 0xad, 0xd6, 0x19, 0xcf, 0x0f, 0x44, 0xe0, + 0x7a, 0xb7, 0xa5, 0xf0, 0x8e, 0x3b, 0x14, 0x19, 0xa6, 0xf5, 0x34, 0xe2, 0xf6, 0xb9, 0xd0, 0x45, + 0xce, 0x23, 0x64, 0x90, 0x0f, 0x01, 0x32, 0x96, 0x2b, 0xa1, 0x7f, 0xad, 0xd8, 0x71, 0xec, 0xc7, + 0x67, 0x10, 0x95, 0xc1, 0xd8, 0x49, 0xa1, 0x15, 0x81, 0xde, 0x2f, 0x6a, 0xd0, 0x2d, 0x77, 0xb0, + 0xbd, 0x44, 0x6c, 0xca, 0xdd, 0xe0, 0x6c, 0x08, 0xb4, 0x2c, 0x29, 0xe2, 0x29, 0xcf, 0xed, 0xe0, + 0x61, 0x29, 0x5d, 0xf7, 0xe2, 0x67, 0xa6, 0xe5, 0x34, 0xa8, 0x5e, 0xdb, 0x06, 0x95, 0x2b, 0x5b, + 0x39, 0x86, 0xc0, 0xda, 0x56, 0xcb, 0x8c, 0xfb, 0xf3, 0x42, 0xe7, 0x83, 0xae, 0x6d, 0x64, 0xdc, + 0x2f, 0x44, 0xe8, 0x25, 0xd0, 0x44, 0xe7, 0x22, 0x5c, 0xc6, 0xd4, 0xc2, 0x5d, 0x23, 0xb8, 0xfe, + 0xa4, 0x07, 0x00, 0x9e, 0xd7, 0xd3, 0x90, 0x15, 0x8f, 0x6b, 0xfd, 0x84, 0x10, 0xa1, 0x15, 0x8e, + 0x4b, 0xe4, 0xcc, 0xad, 0xd0, 0x06, 0xc5, 0xa5, 0xf7, 0x9f, 0x3a, 0xb4, 0x76, 0xd3, 0x22, 0x51, + 0xff, 0x37, 0x64, 0x58, 0xff, 0x69, 0x1e, 0x33, 0xe5, 0x2e, 0x2f, 0x43, 0x61, 0xf1, 0xe8, 0xd0, + 0xdb, 0x30, 0x4d, 0xce, 0x20, 0xc5, 0xa8, 0x91, 0x40, 0x3e, 0x82, 0xb5, 0x20, 0xe7, 0xd8, 0xe9, + 0xcd, 0x74, 0x35, 0x3b, 0x65, 0x59, 0xda, 0x01, 0x95, 0xa4, 0xde, 0xcb, 0x74, 0x3e, 0x50, 0x2b, + 0x15, 0xe3, 0x98, 0xa5, 0x22, 0x51, 0x36, 0x5a, 0x86, 0xf0, 0xee, 0xc0, 0xf9, 0xe7, 0x3e, 0xc1, + 0xa3, 0xb3, 0x34, 0x0f, 0xdc, 0x63, 0xd9, 0x10, 0x78, 0xbb, 0xa6, 0xe6, 0x80, 0xbd, 0xba, 0x1c, + 0xe9, 0x3d, 0x05, 0x38, 0x02, 0x21, 0xef, 0x41, 0x2b, 0x46, 0x5d, 0xec, 0x98, 0xfe, 0xe8, 0x2c, + 0xec, 0xa4, 0x46, 0x84, 0xf7, 0x53, 0x68, 0xe2, 0xb5, 0x81, 0x99, 0xa3, 0x67, 0x25, 0x9b, 0x69, + 0x7a, 0x4e, 0xc2, 0xd4, 0xe7, 0x07, 0xe5, 0xd3, 0xd0, 0x10, 0x68, 0x85, 0xc9, 0x09, 0x77, 0xa9, + 0x3a, 0x52, 0x27, 0x7a, 0xc6, 0x72, 0x5e, 0x26, 0x3a, 0x12, 0xf8, 0x02, 0x59, 0x33, 0x73, 0x26, + 0xf9, 0x39, 0x6c, 0x65, 0x39, 0xd7, 0xc3, 0x6c, 0x14, 0xf1, 0xd0, 0x4f, 0xa5, 0x35, 0xf1, 0xac, + 0x06, 0xaa, 0xcd, 0xaa, 0xb8, 0x3d, 0x49, 0xbe, 0x84, 0x0a, 0x88, 0x03, 0xa6, 0xb8, 0x2f, 0x8b, + 0x69, 0xc2, 0x95, 0x8b, 0xc4, 0xa6, 0x65, 0x4f, 0x0c, 0xd7, 0x7b, 0x0a, 0x1d, 0x37, 0xbb, 0x62, + 0xa5, 0x66, 0x11, 0x4b, 0xfc, 0x4a, 0x43, 0xef, 0x20, 0x03, 0x9b, 0x2d, 0xb9, 0x0e, 0xe7, 0xf5, + 0xa6, 0x6d, 0xd9, 0x7e, 0x65, 0x76, 0xdd, 0xc2, 0x8d, 0xc7, 0x86, 0xaf, 0xcf, 0xbe, 0x0e, 0x1b, + 0x6e, 0x0c, 0xf6, 0x03, 0x57, 0xa6, 0x5d, 0xba, 0xee, 0x98, 0x77, 0xd2, 0x90, 0x6f, 0xbf, 0x06, + 0x1b, 0x43, 0x1e, 0x71, 0xc5, 0xdd, 0x4f, 0xde, 0x4d, 0xa8, 0x8f, 0x86, 0x6e, 0xde, 0x1d, 0x0d, + 0x77, 0x3e, 0x6e, 0xc3, 0x96, 0x73, 0xc1, 0x84, 0xe7, 0xba, 0x3a, 0x7f, 0x5d, 0x83, 0xe6, 0xb8, + 0x90, 0x0b, 0xf2, 0xf5, 0x17, 0x71, 0x64, 0xe5, 0x5f, 0xb5, 0x77, 0xf3, 0x45, 0x3e, 0x34, 0xff, + 0xa2, 0x2f, 0xff, 0xf2, 0xe3, 0x7f, 0xfc, 0xa1, 0x7e, 0x7e, 0x7b, 0xfd, 0xc6, 0xc1, 0xcd, 0xf2, + 0x9f, 0xfa, 0x37, 0x6b, 0xd7, 0xc9, 0xef, 0x6b, 0xd0, 0xba, 0xbd, 0xdc, 0xbd, 0x75, 0x87, 0x7c, + 0xed, 0x45, 0x50, 0x8f, 0x7e, 0x6c, 0x7b, 0x27, 0xfa, 0x57, 0xbe, 0xfd, 0xaa, 0x56, 0xe8, 0xd2, + 0xf6, 0xb9, 0xaa, 0x42, 0x37, 0x62, 0x16, 0xa0, 0x52, 0xbf, 0xab, 0x41, 0xf3, 0xf6, 0x72, 0x34, + 0x7e, 0xc9, 0x3a, 0x79, 0x5a, 0xa7, 0x8b, 0xdb, 0x5b, 0xc7, 0x74, 0x12, 0x19, 0xaa, 0xf4, 0x5b, + 0xa3, 0xd2, 0xf0, 0x25, 0xab, 0x74, 0x45, 0xab, 0x74, 0x81, 0x9c, 0x3f, 0xa6, 0xd2, 0x07, 0x22, + 0xfc, 0x90, 0xfc, 0xaa, 0x06, 0x8d, 0x5b, 0x51, 0x44, 0x5e, 0x3c, 0x1b, 0x4e, 0xa8, 0xcb, 0x45, + 0xad, 0xcb, 0x26, 0x39, 0x96, 0x43, 0x6f, 0xd4, 0xc8, 0x21, 0xb4, 0x9e, 0x30, 0x15, 0x2c, 0x5e, + 0xae, 0x6b, 0xde, 0xa8, 0x91, 0x03, 0x58, 0x33, 0xe5, 0x47, 0x5e, 0xe8, 0xef, 0xc8, 0xb1, 0x92, + 0x3d, 0x41, 0x31, 0xdd, 0x86, 0x1f, 0x74, 0x1c, 0x67, 0xba, 0xa6, 0x8f, 0x7c, 0xf5, 0xbf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x18, 0x61, 0xf3, 0x5a, 0xb2, 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index 9c816d71f..d79a02a70 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -221,7 +221,7 @@ message Hardware { Metadata metadata = 5; Network network = 6; string id = 7; - + int64 version = 8; } message DeleteRequest { diff --git a/protos/template/template.pb.go b/protos/template/template.pb.go index 9d8b4a3d1..fb2104150 100644 --- a/protos/template/template.pb.go +++ b/protos/template/template.pb.go @@ -230,7 +230,9 @@ func init() { proto.RegisterType((*GetRequest)(nil), "github.aaakk.us.kg.tinkerbell.tink.protos.template.GetRequest") } -func init() { proto.RegisterFile("template/template.proto", fileDescriptor_dca67df6b60706ce) } +func init() { + proto.RegisterFile("template/template.proto", fileDescriptor_dca67df6b60706ce) +} var fileDescriptor_dca67df6b60706ce = []byte{ // 452 bytes of a gzipped FileDescriptorProto @@ -267,11 +269,11 @@ var fileDescriptor_dca67df6b60706ce = []byte{ // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // TemplateClient is the client API for Template service. // @@ -285,10 +287,10 @@ type TemplateClient interface { } type templateClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewTemplateClient(cc *grpc.ClientConn) TemplateClient { +func NewTemplateClient(cc grpc.ClientConnInterface) TemplateClient { return &templateClient{cc} } From c06bf190df545eb4ed0cedda428a61b3b6986c73 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 11 Jun 2020 13:52:29 -0400 Subject: [PATCH 22/31] changed log.Fatal to log.Println; updated basic auth to check if user/pass envvars are set --- cmd/tink-cli/cmd/hardware/all.go | 4 ++-- grpc-server/hardware.go | 2 +- http-server/http-server.go | 18 +++++++++++------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cmd/tink-cli/cmd/hardware/all.go b/cmd/tink-cli/cmd/hardware/all.go index 90910a812..1e8a1eef1 100644 --- a/cmd/tink-cli/cmd/hardware/all.go +++ b/cmd/tink-cli/cmd/hardware/all.go @@ -27,12 +27,12 @@ var allCmd = &cobra.Command{ for hw, err = alls.Recv(); err == nil && hw != nil; hw, err = alls.Recv() { b, err := json.Marshal(hw) if err != nil { - log.Fatal(err) + log.Println(err) } fmt.Println(string(b)) } if err != nil && err != io.EOF { - log.Fatal(err) + log.Println(err) } }, } diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go index b703b7f78..b79543586 100644 --- a/grpc-server/hardware.go +++ b/grpc-server/hardware.go @@ -27,7 +27,7 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware. if hw.Id == "" { metrics.CacheTotals.With(labels).Inc() metrics.CacheErrors.With(labels).Inc() - err := errors.New("id must be set to a UUID") + err := errors.New("id must be set to a UUID, got id: " + hw.Id) logger.Error(err) return &hardware.Empty{}, err } diff --git a/http-server/http-server.go b/http-server/http-server.go index 5a22c4617..88e361130 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -129,15 +129,19 @@ func setupGitRevJSON() { gitRevJSON = b } +// BasicAuth adds authentication to the routes handled by handler +// skips authentication if both authUsername and authPassword aren't set func BasicAuth(handler http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - user, pass, ok := r.BasicAuth() - if !ok || subtle.ConstantTimeCompare([]byte(user), []byte(authUsername)) != 1 || - subtle.ConstantTimeCompare([]byte(pass), []byte(authPassword)) != 1 { - w.Header().Set("WWW-Authenticate", `Basic realm="Tink Realm"`) - w.WriteHeader(401) - w.Write([]byte("401 Unauthorized\n")) - return + if authUsername != "" || authPassword != "" { + user, pass, ok := r.BasicAuth() + if !ok || subtle.ConstantTimeCompare([]byte(user), []byte(authUsername)) != 1 || + subtle.ConstantTimeCompare([]byte(pass), []byte(authPassword)) != 1 { + w.Header().Set("WWW-Authenticate", `Basic realm="Tink Realm"`) + w.WriteHeader(401) + w.Write([]byte("401 Unauthorized\n")) + return + } } handler.ServeHTTP(w, r) }) From 0b60b7742c5ee40ac71596a5f4b0a9d8be0f0478 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 12 Jun 2020 10:41:41 -0400 Subject: [PATCH 23/31] allow default grpc and http port to be overridden by envvars --- deploy/docker-compose.yml | 4 +++- grpc-server/grpc-server.go | 5 ++++- http-server/http-server.go | 11 +++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 5b266f852..ca8ff71d5 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -15,13 +15,15 @@ services: PGPORT: 5432 PGSSLMODE: disable PGUSER: tinkerbell + TINKERBELL_GRPC_AUTHORITY: 127.0.0.1:42113 + TINKERBELL_HTTP_AUTHORITY: :42114 TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME:-admin} TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD:-admin} depends_on: db: condition: service_healthy healthcheck: - test: ["CMD-SHELL", "wget -qO- 127.0.0.1:42114/cert"] + test: ["CMD-SHELL", "wget -qO- 127.0.0.1:42114/cert"] # port needs to match TINKERBELL_HTTP_AUTHORITY interval: 5s timeout: 2s retries: 30 diff --git a/grpc-server/grpc-server.go b/grpc-server/grpc-server.go index fcbdeecd2..d8ef3a677 100644 --- a/grpc-server/grpc-server.go +++ b/grpc-server/grpc-server.go @@ -25,7 +25,7 @@ import ( var ( logger log.Logger - grpcListenAddr = ":42113" + grpcListenAddr = os.Getenv("TINKERBELL_GRPC_AUTHORITY") ) // Server is the gRPC server for tinkerbell @@ -76,6 +76,9 @@ func SetupGRPC(ctx context.Context, log log.Logger, facility string, errCh chan< go func() { logger.Info("serving grpc") + if grpcListenAddr == "" { + grpcListenAddr = ":42113" + } lis, err := net.Listen("tcp", grpcListenAddr) if err != nil { err = errors.Wrap(err, "failed to listen") diff --git a/http-server/http-server.go b/http-server/http-server.go index 88e361130..f7caf39a8 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -25,8 +25,8 @@ import ( var ( gitRev = "unknown" gitRevJSON []byte - grpcListenAddr = "localhost:42113" - httpListenAddr = ":42114" + grpcListenAddr = os.Getenv("TINKERBELL_GRPC_AUTHORITY") + httpListenAddr = os.Getenv("TINKERBELL_HTTP_AUTHORITY") authUsername = os.Getenv("TINK_AUTH_USERNAME") authPassword = os.Getenv("TINK_AUTH_PASSWORD") startTime = time.Now() @@ -48,6 +48,10 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time. mux := grpcRuntime.NewServeMux() dialOpts := []grpc.DialOption{grpc.WithTransportCredentials(creds)} + + if grpcListenAddr == "" { + grpcListenAddr = "localhost:42113" + } err := hardware.RegisterHardwareServiceHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) if err != nil { logger.Error(err) @@ -70,6 +74,9 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time. http.HandleFunc("/_packet/healthcheck", healthCheckHandler) http.Handle("/", BasicAuth(mux)) + if httpListenAddr == "" { + httpListenAddr = ":42114" + } srv := &http.Server{ Addr: httpListenAddr, } From 53872e9bd61267c963ce61ca7f1242d664b2f1c1 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Sat, 13 Jun 2020 23:05:31 -0400 Subject: [PATCH 24/31] brought info log outside of lock/unlock --- grpc-server/hardware.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go index b79543586..4e3d54317 100644 --- a/grpc-server/hardware.go +++ b/grpc-server/hardware.go @@ -74,10 +74,10 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware. case ch <- string(data): default: metrics.WatchMissTotal.Inc() - logger.With("id", hw.Id ).Info("skipping blocked watcher") } } s.watchLock.RUnlock() + logger.With("id", hw.Id ).Info("skipping blocked watcher") return &hardware.Empty{}, err } From 9b64c8f5af8775a0056f5747d0b201d04f0cbfa8 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Mon, 15 Jun 2020 16:30:36 -0400 Subject: [PATCH 25/31] prettier --- deploy/docker-compose.yml | 8 ++++---- grpc-server/hardware.go | 2 +- http-server/http-server.go | 7 ++++--- protos/hardware/hardware.pb.go | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index ca8ff71d5..8e4a47933 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -101,8 +101,8 @@ services: ROLLBAR_TOKEN: ${ROLLBAR_TOKEN:-ignored} ROLLBAR_DISABLE: ${ROLLBAR_DISABLE:-1} MIRROR_HOST: ${TINKERBELL_NGINX_IP:-127.0.0.1} -# CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 -# CACHER_CERT_URL: http://127.0.0.1:42112/cert + # CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 + # CACHER_CERT_URL: http://127.0.0.1:42112/cert DNS_SERVERS: 8.8.8.8 PUBLIC_IP: $TINKERBELL_HOST_IP BOOTP_BIND: $TINKERBELL_HOST_IP:67 @@ -171,8 +171,8 @@ services: GRPC_PORT: 42115 HEGEL_FACILITY: ${FACILITY:-onprem} HEGEL_USE_TLS: 0 -# CACHER_CERT_URL: http://127.0.0.1:42112/cert -# CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 + # CACHER_CERT_URL: http://127.0.0.1:42112/cert + # CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 TINKERBELL_GRPC_AUTHORITY: 127.0.0.1:42113 TINKERBELL_CERT_URL: http://127.0.0.1:42114/cert DATA_MODEL_VERSION: 1 diff --git a/grpc-server/hardware.go b/grpc-server/hardware.go index 4e3d54317..105fd7dbe 100644 --- a/grpc-server/hardware.go +++ b/grpc-server/hardware.go @@ -77,7 +77,7 @@ func (s *server) Push(ctx context.Context, in *hardware.PushRequest) (*hardware. } } s.watchLock.RUnlock() - logger.With("id", hw.Id ).Info("skipping blocked watcher") + logger.With("id", hw.Id).Info("skipping blocked watcher") return &hardware.Empty{}, err } diff --git a/http-server/http-server.go b/http-server/http-server.go index f7caf39a8..e86272e00 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -6,13 +6,14 @@ import ( "crypto/subtle" "crypto/x509" "encoding/json" - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" "net/http" "os" "runtime" "time" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" + grpcRuntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/packethost/pkg/log" "github.com/pkg/errors" @@ -152,4 +153,4 @@ func BasicAuth(handler http.Handler) http.Handler { } handler.ServeHTTP(w, r) }) -} \ No newline at end of file +} diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 679ccb984..6bffbb8c2 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -6,12 +6,13 @@ package hardware import ( context "context" fmt "fmt" + math "math" + proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. From b98e2ac1ab2c3527c71383dd98c249d1fe78fccf Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Wed, 17 Jun 2020 22:06:18 -0400 Subject: [PATCH 26/31] fixup --- protos/protoc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/protoc.sh b/protos/protoc.sh index 90ff775c7..fbb702a46 100755 --- a/protos/protoc.sh +++ b/protos/protoc.sh @@ -4,5 +4,5 @@ set -e for proto in hardware template workflow; do echo "Generating ${proto}.pb.go..." - protoc -I ./ -I ./common/ -I $GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis "${proto}/${proto}.proto" --go_out=plugins=grpc:./ --grpc-gateway_out=logtostderr=true:. + protoc -I ./ -I ./common/ -I "$GOPATH"/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis "${proto}/${proto}.proto" --go_out=plugins=grpc:./ --grpc-gateway_out=logtostderr=true:. done From 0e994ef4448078ee10bd63418641984dbbaca7f4 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 18 Jun 2020 15:21:26 -0400 Subject: [PATCH 27/31] fixed grpc connection refused; removed cacher from docker-compose.yml --- deploy/docker-compose.yml | 32 +------------------------------- http-server/http-server.go | 7 ++++--- setup.sh | 2 +- 3 files changed, 6 insertions(+), 35 deletions(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 8e4a47933..de3e21d0e 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -15,7 +15,7 @@ services: PGPORT: 5432 PGSSLMODE: disable PGUSER: tinkerbell - TINKERBELL_GRPC_AUTHORITY: 127.0.0.1:42113 + TINKERBELL_GRPC_AUTHORITY: :42113 TINKERBELL_HTTP_AUTHORITY: :42114 TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME:-admin} TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD:-admin} @@ -101,8 +101,6 @@ services: ROLLBAR_TOKEN: ${ROLLBAR_TOKEN:-ignored} ROLLBAR_DISABLE: ${ROLLBAR_DISABLE:-1} MIRROR_HOST: ${TINKERBELL_NGINX_IP:-127.0.0.1} - # CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 - # CACHER_CERT_URL: http://127.0.0.1:42112/cert DNS_SERVERS: 8.8.8.8 PUBLIC_IP: $TINKERBELL_HOST_IP BOOTP_BIND: $TINKERBELL_HOST_IP:67 @@ -133,32 +131,6 @@ services: volumes: - ./state/webroot:/usr/share/nginx/html/ - # cacher: - # image: quay.io/packet/cacher:workflow - # restart: unless-stopped - # environment: - # FACILITY: ${FACILITY:-onprem} - # PACKET_API_AUTH_TOKEN: ${PACKET_API_AUTH_TOKEN} - # PACKET_API_URL: ${PACKET_API_URL} - # PACKET_CONSUMER_TOKEN: ${PACKET_CONSUMER_TOKEN-ignored} - # PACKET_ENV: testing - # PACKET_VERSION: ${PACKET_VERSION:-ignored} - # PGDATABASE: tinkerbell - # PGHOST: db - # PGPASSWORD: tinkerbell - # PGPORT: 5432 - # PGSSLMODE: disable - # PGUSER: tinkerbell - # ROLLBAR_TOKEN: ${ROLLBAR_TOKEN-ignored} - # volumes: - # - ./state/certs:/certs/${FACILITY:-onprem} - # depends_on: - # db: - # condition: service_healthy - # ports: - # - 42111:42111/tcp - # - 42112:42112/tcp - hegel: image: quay.io/tinkerbell/hegel:latest restart: unless-stopped @@ -171,8 +143,6 @@ services: GRPC_PORT: 42115 HEGEL_FACILITY: ${FACILITY:-onprem} HEGEL_USE_TLS: 0 - # CACHER_CERT_URL: http://127.0.0.1:42112/cert - # CACHER_GRPC_AUTHORITY: 127.0.0.1:42111 TINKERBELL_GRPC_AUTHORITY: 127.0.0.1:42113 TINKERBELL_CERT_URL: http://127.0.0.1:42114/cert DATA_MODEL_VERSION: 1 diff --git a/http-server/http-server.go b/http-server/http-server.go index e86272e00..b0f0bac0e 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -53,15 +53,16 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time. if grpcListenAddr == "" { grpcListenAddr = "localhost:42113" } - err := hardware.RegisterHardwareServiceHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) + grpcEndpoint := "localhost" + grpcListenAddr + err := hardware.RegisterHardwareServiceHandlerFromEndpoint(ctx, mux, grpcEndpoint, dialOpts) if err != nil { logger.Error(err) } - err = template.RegisterTemplateHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) + err = template.RegisterTemplateHandlerFromEndpoint(ctx, mux, grpcEndpoint, dialOpts) if err != nil { logger.Error(err) } - err = workflow.RegisterWorkflowSvcHandlerFromEndpoint(ctx, mux, grpcListenAddr, dialOpts) + err = workflow.RegisterWorkflowSvcHandlerFromEndpoint(ctx, mux, grpcEndpoint, dialOpts) if err != nil { logger.Error(err) } diff --git a/setup.sh b/setup.sh index 7233f89b9..1c6b98dc6 100755 --- a/setup.sh +++ b/setup.sh @@ -418,7 +418,7 @@ setup_docker_registry() ( ) start_components() ( - local components=(db cacher hegel tink-server boots tink-cli nginx) + local components=(db hegel tink-server boots tink-cli nginx) for comp in "${components[@]}"; do docker-compose -f "$DEPLOYDIR/docker-compose.yml" up --build -d "$comp" sleep 3 From aab2e1c465885b6156299b0993602129752898bd Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 18 Jun 2020 15:52:31 -0400 Subject: [PATCH 28/31] updated http server to handle if TINKERBELL_GRPC_AUTHORITY is just the port --- http-server/http-server.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/http-server/http-server.go b/http-server/http-server.go index b0f0bac0e..999ebc571 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -6,6 +6,7 @@ import ( "crypto/subtle" "crypto/x509" "encoding/json" + "net" "net/http" "os" "runtime" @@ -26,7 +27,7 @@ import ( var ( gitRev = "unknown" gitRevJSON []byte - grpcListenAddr = os.Getenv("TINKERBELL_GRPC_AUTHORITY") + grpcEndpoint = os.Getenv("TINKERBELL_GRPC_AUTHORITY") httpListenAddr = os.Getenv("TINKERBELL_HTTP_AUTHORITY") authUsername = os.Getenv("TINK_AUTH_USERNAME") authPassword = os.Getenv("TINK_AUTH_PASSWORD") @@ -50,11 +51,17 @@ func SetupHTTP(ctx context.Context, lg log.Logger, certPEM []byte, modTime time. dialOpts := []grpc.DialOption{grpc.WithTransportCredentials(creds)} - if grpcListenAddr == "" { - grpcListenAddr = "localhost:42113" + if grpcEndpoint == "" { + grpcEndpoint = "localhost:42113" } - grpcEndpoint := "localhost" + grpcListenAddr - err := hardware.RegisterHardwareServiceHandlerFromEndpoint(ctx, mux, grpcEndpoint, dialOpts) + host, _, err := net.SplitHostPort(grpcEndpoint) + if err != nil { + logger.Error(err) + } + if host == "" { + grpcEndpoint = "localhost" + grpcEndpoint + } + err = hardware.RegisterHardwareServiceHandlerFromEndpoint(ctx, mux, grpcEndpoint, dialOpts) if err != nil { logger.Error(err) } From 1ddde35e6abaeaf1c6b8707ed92b878945e49abd Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Thu, 18 Jun 2020 21:37:29 -0400 Subject: [PATCH 29/31] fixup --- http-server/http-server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http-server/http-server.go b/http-server/http-server.go index 999ebc571..241276765 100644 --- a/http-server/http-server.go +++ b/http-server/http-server.go @@ -27,7 +27,7 @@ import ( var ( gitRev = "unknown" gitRevJSON []byte - grpcEndpoint = os.Getenv("TINKERBELL_GRPC_AUTHORITY") + grpcEndpoint = os.Getenv("TINKERBELL_GRPC_AUTHORITY") httpListenAddr = os.Getenv("TINKERBELL_HTTP_AUTHORITY") authUsername = os.Getenv("TINK_AUTH_USERNAME") authPassword = os.Getenv("TINK_AUTH_PASSWORD") From a2944c1dd079bd72b61cb955919524fc4542f14c Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 19 Jun 2020 20:50:09 -0400 Subject: [PATCH 30/31] updated hardware proto field names --- protos/hardware/hardware.pb.go | 309 +++++++++++++++++---------------- protos/hardware/hardware.proto | 4 +- 2 files changed, 157 insertions(+), 156 deletions(-) diff --git a/protos/hardware/hardware.pb.go b/protos/hardware/hardware.pb.go index 6bffbb8c2..ab515c2b1 100644 --- a/protos/hardware/hardware.pb.go +++ b/protos/hardware/hardware.pb.go @@ -6,13 +6,12 @@ package hardware import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -869,24 +868,24 @@ func (m *Hardware_Metadata_Manufacturer) GetSlug() string { } type Hardware_Metadata_Instance struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - State string `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` - Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` - AllowPxe bool `protobuf:"varint,4,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` - Rescue bool `protobuf:"varint,5,opt,name=rescue,proto3" json:"rescue,omitempty"` - OS *Hardware_Metadata_Instance_OperatingSystem `protobuf:"bytes,6,opt,name=OS,proto3" json:"OS,omitempty"` - AlwaysPxe bool `protobuf:"varint,7,opt,name=always_pxe,json=alwaysPxe,proto3" json:"always_pxe,omitempty"` - IpxeScriptUrl string `protobuf:"bytes,8,opt,name=ipxe_script_url,json=ipxeScriptUrl,proto3" json:"ipxe_script_url,omitempty"` - Ips []*Hardware_Metadata_Instance_IP `protobuf:"bytes,9,rep,name=ips,proto3" json:"ips,omitempty"` - Userdata string `protobuf:"bytes,10,opt,name=userdata,proto3" json:"userdata,omitempty"` - CryptedRootPassword string `protobuf:"bytes,11,opt,name=crypted_root_password,json=cryptedRootPassword,proto3" json:"crypted_root_password,omitempty"` - Tags []string `protobuf:"bytes,12,rep,name=tags,proto3" json:"tags,omitempty"` - Storage *Hardware_Metadata_Instance_Storage `protobuf:"bytes,13,opt,name=storage,proto3" json:"storage,omitempty"` - SshKeys []string `protobuf:"bytes,14,rep,name=ssh_keys,json=sshKeys,proto3" json:"ssh_keys,omitempty"` - NetworkReady bool `protobuf:"varint,15,opt,name=network_ready,json=networkReady,proto3" json:"network_ready,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + State string `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` + Hostname string `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"` + AllowPxe bool `protobuf:"varint,4,opt,name=allow_pxe,json=allowPxe,proto3" json:"allow_pxe,omitempty"` + Rescue bool `protobuf:"varint,5,opt,name=rescue,proto3" json:"rescue,omitempty"` + OperatingSystemVersion *Hardware_Metadata_Instance_OperatingSystem `protobuf:"bytes,6,opt,name=operating_system_version,json=operatingSystemVersion,proto3" json:"operating_system_version,omitempty"` + AlwaysPxe bool `protobuf:"varint,7,opt,name=always_pxe,json=alwaysPxe,proto3" json:"always_pxe,omitempty"` + IpxeScriptUrl string `protobuf:"bytes,8,opt,name=ipxe_script_url,json=ipxeScriptUrl,proto3" json:"ipxe_script_url,omitempty"` + Ips []*Hardware_Metadata_Instance_IP `protobuf:"bytes,9,rep,name=ips,proto3" json:"ips,omitempty"` + Userdata string `protobuf:"bytes,10,opt,name=userdata,proto3" json:"userdata,omitempty"` + CryptedRootPassword string `protobuf:"bytes,11,opt,name=crypted_root_password,json=cryptedRootPassword,proto3" json:"crypted_root_password,omitempty"` + Tags []string `protobuf:"bytes,12,rep,name=tags,proto3" json:"tags,omitempty"` + Storage *Hardware_Metadata_Instance_Storage `protobuf:"bytes,13,opt,name=storage,proto3" json:"storage,omitempty"` + SshKeys []string `protobuf:"bytes,14,rep,name=ssh_keys,json=sshKeys,proto3" json:"ssh_keys,omitempty"` + NetworkReady bool `protobuf:"varint,15,opt,name=network_ready,json=networkReady,proto3" json:"network_ready,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware_Metadata_Instance) Reset() { *m = Hardware_Metadata_Instance{} } @@ -949,9 +948,9 @@ func (m *Hardware_Metadata_Instance) GetRescue() bool { return false } -func (m *Hardware_Metadata_Instance) GetOS() *Hardware_Metadata_Instance_OperatingSystem { +func (m *Hardware_Metadata_Instance) GetOperatingSystemVersion() *Hardware_Metadata_Instance_OperatingSystem { if m != nil { - return m.OS + return m.OperatingSystemVersion } return nil } @@ -1690,11 +1689,11 @@ func (m *Hardware_Metadata_Instance_Storage_RAID) GetSpare() int64 { } type Hardware_Metadata_Custom struct { - PreinstalledOs *Hardware_Metadata_Instance_OperatingSystem `protobuf:"bytes,1,opt,name=preinstalled_os,json=preinstalledOs,proto3" json:"preinstalled_os,omitempty"` - PrivateSubnets []string `protobuf:"bytes,2,rep,name=private_subnets,json=privateSubnets,proto3" json:"private_subnets,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + PreinstalledOperatingSystemVersion *Hardware_Metadata_Instance_OperatingSystem `protobuf:"bytes,1,opt,name=preinstalled_operating_system_version,json=preinstalledOperatingSystemVersion,proto3" json:"preinstalled_operating_system_version,omitempty"` + PrivateSubnets []string `protobuf:"bytes,2,rep,name=private_subnets,json=privateSubnets,proto3" json:"private_subnets,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Hardware_Metadata_Custom) Reset() { *m = Hardware_Metadata_Custom{} } @@ -1722,9 +1721,9 @@ func (m *Hardware_Metadata_Custom) XXX_DiscardUnknown() { var xxx_messageInfo_Hardware_Metadata_Custom proto.InternalMessageInfo -func (m *Hardware_Metadata_Custom) GetPreinstalledOs() *Hardware_Metadata_Instance_OperatingSystem { +func (m *Hardware_Metadata_Custom) GetPreinstalledOperatingSystemVersion() *Hardware_Metadata_Instance_OperatingSystem { if m != nil { - return m.PreinstalledOs + return m.PreinstalledOperatingSystemVersion } return nil } @@ -1866,132 +1865,134 @@ func init() { } var fileDescriptor_61ac56d7fc2e671f = []byte{ - // 1996 bytes of a gzipped FileDescriptorProto + // 2017 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x8f, 0x1c, 0x47, - 0x15, 0xd6, 0xdc, 0x76, 0x66, 0xce, 0xec, 0xc5, 0x2e, 0xdb, 0xf1, 0xb8, 0x03, 0xc4, 0x6c, 0x04, - 0x18, 0x23, 0x8d, 0xe3, 0x25, 0x02, 0x81, 0x00, 0xc9, 0xf6, 0xf8, 0x32, 0x21, 0xeb, 0x1d, 0x6a, - 0x1c, 0x9b, 0x70, 0x6b, 0x6a, 0xba, 0x6b, 0x66, 0x2a, 0xdb, 0xb7, 0x74, 0x55, 0xef, 0x7a, 0x88, - 0x12, 0x10, 0x0f, 0xbc, 0x20, 0x04, 0x02, 0xde, 0x91, 0xf8, 0x09, 0x3c, 0xf2, 0xc2, 0x8f, 0xc8, - 0x3f, 0x40, 0x08, 0x7e, 0x03, 0x0f, 0x48, 0xe8, 0xd4, 0xa5, 0xb7, 0xd7, 0x86, 0x28, 0xde, 0xd9, - 0xf5, 0x5b, 0x9d, 0x53, 0xd5, 0xdf, 0xb9, 0xd7, 0x39, 0xd5, 0x70, 0x79, 0xc1, 0xf2, 0xf0, 0x90, - 0xe5, 0xfc, 0x86, 0x5b, 0x0c, 0xb2, 0x3c, 0x55, 0x29, 0xb9, 0x3e, 0x17, 0x6a, 0x51, 0x4c, 0x07, - 0x41, 0x1a, 0x0f, 0x94, 0x48, 0xf6, 0x79, 0x3e, 0xe5, 0x51, 0xa4, 0x97, 0xe6, 0x84, 0x1c, 0xb8, - 0x2f, 0xbc, 0xcf, 0xcc, 0xd3, 0x74, 0x1e, 0xf1, 0x1b, 0x2c, 0x13, 0x37, 0x58, 0x92, 0xa4, 0x8a, - 0x29, 0x91, 0x26, 0xd2, 0x9c, 0xdb, 0x7e, 0x02, 0xbd, 0x71, 0x21, 0x17, 0x94, 0xbf, 0x5f, 0x70, - 0xa9, 0xc8, 0x03, 0x68, 0x86, 0x4c, 0xb1, 0x7e, 0xed, 0x6a, 0xed, 0x5a, 0x6f, 0xe7, 0xcd, 0xc1, - 0xa7, 0x97, 0x33, 0x78, 0x60, 0x17, 0x54, 0x23, 0x6c, 0xb7, 0xa1, 0x75, 0x37, 0xce, 0xd4, 0x72, - 0xfb, 0x3b, 0x00, 0xf7, 0xb9, 0x72, 0x02, 0xce, 0x41, 0x23, 0x66, 0x81, 0xc6, 0xef, 0x52, 0x5c, - 0x92, 0x4d, 0xa8, 0x8b, 0xac, 0x5f, 0xd7, 0x8c, 0xba, 0xc8, 0x34, 0x1d, 0xf6, 0x1b, 0x96, 0x0e, - 0xb7, 0xff, 0xf4, 0x15, 0xe8, 0x38, 0x6c, 0xf2, 0x3a, 0x6c, 0xec, 0xdd, 0x9e, 0xec, 0xbd, 0x7d, - 0xf7, 0xd1, 0x5d, 0xff, 0xad, 0xc9, 0xde, 0x43, 0x0b, 0xb4, 0xee, 0x98, 0xc8, 0x23, 0x3f, 0xa9, - 0x1c, 0x0a, 0x17, 0x81, 0x01, 0xef, 0xed, 0x7c, 0xe3, 0x24, 0xd6, 0x0c, 0x86, 0x0f, 0xee, 0x8c, - 0x8f, 0xf0, 0x87, 0x8b, 0x20, 0x23, 0x73, 0x38, 0x57, 0xe2, 0x27, 0x5c, 0x4d, 0xd3, 0x54, 0x69, - 0x7d, 0x7b, 0x3b, 0xdf, 0x3a, 0x91, 0x88, 0x87, 0x06, 0x83, 0x6e, 0x39, 0x54, 0xcb, 0x78, 0x56, - 0xd0, 0x61, 0x9a, 0xef, 0xf7, 0x9b, 0x57, 0x1b, 0xab, 0x08, 0x42, 0x8c, 0x63, 0x82, 0x90, 0x41, - 0xde, 0x85, 0x4e, 0xcc, 0x15, 0xd3, 0xa1, 0x6f, 0x69, 0x4b, 0xbe, 0x7d, 0x22, 0x01, 0xbb, 0x16, - 0x84, 0x96, 0x70, 0xe4, 0x31, 0xb4, 0x9d, 0xea, 0x6b, 0xab, 0xf9, 0x48, 0xab, 0xee, 0xc0, 0x6c, - 0x9a, 0xb4, 0x5d, 0x9a, 0x90, 0x3e, 0xb4, 0x0f, 0x78, 0x2e, 0x45, 0x9a, 0xf4, 0x3b, 0x57, 0x6b, - 0xd7, 0x1a, 0xd4, 0x91, 0xde, 0x3f, 0x1b, 0xd0, 0xc4, 0x28, 0xfe, 0x8f, 0xdc, 0x7b, 0x0d, 0x7a, - 0xa5, 0x83, 0xcb, 0x24, 0x04, 0xc7, 0x1a, 0x65, 0xc4, 0x83, 0xce, 0x22, 0x95, 0x2a, 0x61, 0x31, - 0xb7, 0x29, 0x59, 0xd2, 0xe4, 0xb3, 0x00, 0x11, 0x67, 0x92, 0xfb, 0x4a, 0xc4, 0xbc, 0xdf, 0xd4, - 0x42, 0xbb, 0x9a, 0xf3, 0x48, 0xc4, 0x9c, 0x7c, 0x1e, 0xd6, 0xf1, 0x98, 0x2f, 0x79, 0x8e, 0x9a, - 0xf4, 0x5b, 0x57, 0x1b, 0xd7, 0xba, 0xb4, 0x87, 0xbc, 0x89, 0x61, 0xe1, 0x11, 0xfc, 0xb6, 0x3c, - 0xb2, 0x66, 0x8e, 0x20, 0xcf, 0x1d, 0xf9, 0x72, 0x25, 0x05, 0xe6, 0x4c, 0xf1, 0x43, 0xb6, 0xb4, - 0x46, 0x97, 0x41, 0xbc, 0x6f, 0xd8, 0x84, 0x40, 0x93, 0xe5, 0xc1, 0x42, 0x9b, 0xdf, 0xa5, 0x7a, - 0x8d, 0xbc, 0x82, 0xcf, 0x44, 0xbf, 0x7b, 0xb5, 0x76, 0xad, 0x43, 0xf5, 0x1a, 0xf5, 0x16, 0x33, - 0x16, 0x70, 0x5f, 0x5b, 0x05, 0xfa, 0x74, 0x57, 0x73, 0x1e, 0xa2, 0x59, 0x6f, 0xeb, 0x7a, 0xec, - 0xad, 0x10, 0x2b, 0x74, 0xf6, 0x60, 0x34, 0xc6, 0x6a, 0xf6, 0xde, 0x83, 0xfa, 0x68, 0x8c, 0xc1, - 0x61, 0x61, 0x98, 0x73, 0x29, 0xad, 0xf7, 0x1d, 0x89, 0x3b, 0x09, 0x57, 0x31, 0x93, 0xfb, 0xd6, - 0xfb, 0x8e, 0xc4, 0x1d, 0x67, 0xb0, 0xf1, 0xbc, 0x23, 0xc9, 0x2b, 0xb0, 0x36, 0x63, 0xb1, 0x88, - 0x96, 0xd6, 0xe9, 0x96, 0xf2, 0xfe, 0xd8, 0x84, 0xb6, 0x2b, 0x9d, 0x57, 0xa1, 0xcb, 0xa2, 0x28, - 0x3d, 0xf4, 0xb3, 0xa7, 0x5c, 0xcb, 0xec, 0xd0, 0x8e, 0x66, 0x8c, 0x9f, 0x72, 0xf2, 0x05, 0xd8, - 0x34, 0x9b, 0x98, 0x49, 0xb3, 0x28, 0x3d, 0xd4, 0xb2, 0x3b, 0x74, 0x43, 0x73, 0x9f, 0x58, 0x26, - 0x79, 0x07, 0x9a, 0x02, 0x3f, 0x37, 0xb5, 0x7d, 0x6b, 0x95, 0xda, 0x1e, 0x8c, 0xc6, 0xdf, 0xbf, - 0x4b, 0x35, 0x1c, 0xf9, 0x08, 0x2e, 0x95, 0x21, 0xc5, 0x3d, 0xa9, 0x72, 0x96, 0x65, 0x3c, 0xd7, - 0xd6, 0xf4, 0x76, 0x46, 0x2b, 0xc9, 0xb9, 0x5d, 0x01, 0xa4, 0x17, 0x9d, 0x9c, 0x2a, 0x17, 0xcd, - 0x4a, 0xa5, 0xe0, 0xb6, 0xd0, 0x57, 0x33, 0x6b, 0x4f, 0x0a, 0x4e, 0x35, 0x9c, 0xf7, 0x26, 0x34, - 0xd1, 0x48, 0xac, 0xb2, 0x22, 0x8f, 0x5c, 0x95, 0x15, 0x79, 0x84, 0x45, 0x14, 0xa4, 0x89, 0xe2, - 0x89, 0x92, 0x36, 0xc8, 0x25, 0xed, 0x6d, 0xc2, 0x7a, 0x55, 0x39, 0xef, 0x7b, 0xd0, 0x44, 0x4c, - 0x72, 0x05, 0x3a, 0x53, 0xac, 0xad, 0x23, 0xa8, 0x36, 0xd2, 0xef, 0xe4, 0x11, 0x86, 0x7f, 0x9f, - 0xe7, 0x09, 0x8f, 0x2c, 0x98, 0xa5, 0x90, 0x2f, 0x12, 0xa1, 0x72, 0xd7, 0x3c, 0x2c, 0xe5, 0xfd, - 0xdd, 0xa4, 0x85, 0xbe, 0x35, 0x9e, 0x6b, 0x0d, 0xb5, 0xb3, 0x6f, 0x0d, 0xf5, 0xb3, 0x68, 0x0d, - 0x33, 0x00, 0x91, 0x28, 0x9e, 0x63, 0xd9, 0xca, 0x7e, 0x43, 0x37, 0x85, 0x7b, 0xab, 0xdc, 0xac, - 0x83, 0x91, 0x83, 0xa3, 0x15, 0x64, 0xf2, 0x7e, 0xc5, 0xa0, 0x90, 0xcf, 0x58, 0x11, 0x29, 0x9b, - 0xa7, 0xa7, 0x25, 0xad, 0x34, 0x6d, 0x68, 0xe0, 0xbd, 0xbf, 0xd4, 0xa0, 0x5b, 0x6e, 0x93, 0x5d, - 0x68, 0x9e, 0x4e, 0xa0, 0x34, 0x8c, 0x6d, 0x47, 0xa7, 0x16, 0x17, 0x07, 0xe6, 0xfd, 0xfb, 0x0a, - 0x74, 0x5c, 0xf7, 0x23, 0x17, 0xa1, 0x25, 0x15, 0x53, 0xdc, 0x66, 0xae, 0x21, 0xf0, 0xb6, 0x9f, - 0xa6, 0x49, 0x28, 0x92, 0xb9, 0x1f, 0xa7, 0x21, 0xd7, 0xf2, 0x1b, 0xb4, 0x67, 0x79, 0xbb, 0x69, - 0xc8, 0x49, 0x02, 0xeb, 0x31, 0x4b, 0x8a, 0x19, 0x0b, 0x54, 0x91, 0xf3, 0xdc, 0xde, 0x3c, 0x6f, - 0xad, 0xd4, 0x8b, 0x07, 0xbb, 0x15, 0x44, 0x7a, 0x0c, 0x9f, 0x4c, 0xa1, 0x23, 0x12, 0xa9, 0x58, - 0x12, 0xf0, 0x95, 0xa2, 0x5a, 0xca, 0x1a, 0x59, 0x34, 0x5a, 0xe2, 0x92, 0x1f, 0xc1, 0x5a, 0x50, - 0x48, 0x95, 0xc6, 0xf6, 0xc2, 0x19, 0xae, 0x26, 0xe1, 0x8e, 0xc6, 0xa2, 0x16, 0x13, 0x2d, 0x98, - 0xb1, 0x40, 0x44, 0x42, 0x2d, 0xed, 0x7c, 0xb1, 0xa2, 0x05, 0xf7, 0x2c, 0x1a, 0x2d, 0x71, 0xbd, - 0x1d, 0x58, 0xaf, 0xfa, 0xd0, 0x8e, 0x1e, 0xb5, 0x72, 0xf4, 0x20, 0xd0, 0x94, 0x51, 0x31, 0xb7, - 0xd7, 0x91, 0x5e, 0x7b, 0x7f, 0xbd, 0x00, 0x1d, 0xe7, 0x8c, 0xe7, 0x3e, 0x28, 0xf3, 0xa3, 0x5e, - 0xcd, 0x8f, 0x4f, 0x9a, 0x35, 0x8e, 0xb5, 0xb3, 0xe6, 0x33, 0xed, 0xec, 0x15, 0x58, 0xcb, 0xb9, - 0x0c, 0x0a, 0x73, 0xa5, 0x77, 0xa8, 0xa5, 0xc8, 0x0c, 0xea, 0x7b, 0x13, 0xeb, 0x95, 0xc7, 0xa7, - 0x13, 0xd7, 0xc1, 0x5e, 0xc6, 0x73, 0xa6, 0x44, 0x32, 0x9f, 0x2c, 0xa5, 0xe2, 0x31, 0xad, 0xef, - 0x4d, 0x70, 0xa0, 0x60, 0xd1, 0x21, 0x5b, 0x4a, 0xad, 0x5d, 0x5b, 0xeb, 0xd0, 0x35, 0x1c, 0x54, - 0xef, 0x8b, 0xb0, 0x85, 0x7d, 0xcf, 0x97, 0x41, 0x2e, 0x32, 0xa5, 0x6f, 0x74, 0x33, 0xa2, 0x6c, - 0x20, 0x7b, 0xa2, 0xb9, 0x78, 0xaf, 0xff, 0x10, 0x1a, 0x22, 0x93, 0xfd, 0xae, 0xbe, 0xcb, 0x46, - 0xa7, 0xa4, 0xef, 0x68, 0x4c, 0x11, 0x15, 0x9d, 0x5b, 0x48, 0x9e, 0xeb, 0x09, 0xd7, 0x8c, 0x3c, - 0x25, 0x4d, 0x76, 0xe0, 0x52, 0x90, 0x2f, 0x33, 0xc5, 0x43, 0x3f, 0x4f, 0x53, 0xe5, 0x67, 0x4c, - 0xca, 0xc3, 0x34, 0x0f, 0xf5, 0x10, 0xd4, 0xa5, 0x17, 0xec, 0x26, 0x4d, 0x53, 0x35, 0xb6, 0x5b, - 0x18, 0x73, 0xc5, 0xe6, 0xb2, 0xbf, 0xae, 0x47, 0x36, 0xbd, 0x26, 0x0b, 0x68, 0x4b, 0x95, 0xe6, - 0x6c, 0xce, 0xfb, 0x1b, 0xda, 0xe9, 0x0f, 0x4f, 0xc9, 0x88, 0x89, 0x41, 0xa5, 0x0e, 0x1e, 0xbb, - 0xa3, 0x94, 0x0b, 0x7f, 0x9f, 0x2f, 0x65, 0x7f, 0x53, 0x6b, 0xd0, 0x96, 0x72, 0xf1, 0x5d, 0xbe, - 0x94, 0xf8, 0x42, 0xb2, 0x23, 0xb2, 0x9f, 0x73, 0x16, 0x2e, 0xfb, 0x5b, 0x3a, 0x1e, 0xeb, 0x96, - 0x49, 0x91, 0xe7, 0xfd, 0xa6, 0x06, 0x5b, 0xcf, 0x44, 0xb2, 0xcc, 0xe2, 0xda, 0x51, 0x16, 0x63, - 0x66, 0x85, 0x42, 0xaa, 0x3c, 0x75, 0xad, 0xd6, 0x50, 0xd5, 0x61, 0xdb, 0xce, 0x66, 0x96, 0xc4, - 0x44, 0x15, 0x31, 0x9b, 0x73, 0x5f, 0xb1, 0xb9, 0x4e, 0xd4, 0x2e, 0xed, 0x68, 0xc6, 0x23, 0x36, - 0x27, 0x97, 0xa1, 0x9d, 0x4a, 0x5f, 0x4b, 0x69, 0x19, 0xbc, 0x54, 0x4e, 0xb0, 0x5a, 0xfe, 0x5c, - 0x7b, 0x79, 0x63, 0x22, 0xf2, 0xb3, 0x62, 0x1a, 0x89, 0xc0, 0x95, 0x8b, 0xa1, 0xc8, 0xe7, 0x00, - 0x62, 0x96, 0xb0, 0x39, 0x8f, 0x79, 0xa2, 0x74, 0xd9, 0x74, 0x68, 0x85, 0xe3, 0xfd, 0xab, 0x07, - 0x6d, 0x1b, 0x09, 0x9c, 0x20, 0x8f, 0xda, 0xa2, 0x90, 0xfb, 0xa8, 0x30, 0x86, 0xa1, 0x9c, 0x2e, - 0x86, 0xc8, 0x3c, 0xf6, 0x5c, 0xcd, 0x99, 0x08, 0xfb, 0x75, 0x7d, 0xaa, 0x9c, 0x19, 0x28, 0x13, - 0x21, 0xb9, 0x09, 0xe5, 0x9c, 0xe6, 0xcf, 0x44, 0xc4, 0xa5, 0x8e, 0x87, 0x69, 0xea, 0x5d, 0x7a, - 0xc1, 0xed, 0xdd, 0x3b, 0xda, 0x22, 0x02, 0x5a, 0x46, 0xaa, 0x79, 0x0d, 0x4e, 0x4e, 0x37, 0xcf, - 0x06, 0xa8, 0x3c, 0x35, 0x12, 0xc8, 0x1c, 0x9a, 0x5a, 0xf3, 0xd6, 0x99, 0x48, 0xa2, 0xb7, 0x46, - 0x43, 0xaa, 0x05, 0x90, 0x0f, 0xa0, 0x57, 0xb5, 0x7e, 0x4d, 0xcb, 0x7b, 0xf7, 0x94, 0xe5, 0x1d, - 0x39, 0x91, 0x56, 0xa5, 0x79, 0x7f, 0xab, 0x43, 0x13, 0xad, 0xd6, 0x19, 0xcf, 0x0f, 0x44, 0xe0, - 0x7a, 0xb7, 0xa5, 0xf0, 0x8e, 0x3b, 0x14, 0x19, 0xa6, 0xf5, 0x34, 0xe2, 0xf6, 0xb9, 0xd0, 0x45, - 0xce, 0x23, 0x64, 0x90, 0x0f, 0x01, 0x32, 0x96, 0x2b, 0xa1, 0x7f, 0xad, 0xd8, 0x71, 0xec, 0xc7, - 0x67, 0x10, 0x95, 0xc1, 0xd8, 0x49, 0xa1, 0x15, 0x81, 0xde, 0x2f, 0x6a, 0xd0, 0x2d, 0x77, 0xb0, - 0xbd, 0x44, 0x6c, 0xca, 0xdd, 0xe0, 0x6c, 0x08, 0xb4, 0x2c, 0x29, 0xe2, 0x29, 0xcf, 0xed, 0xe0, - 0x61, 0x29, 0x5d, 0xf7, 0xe2, 0x67, 0xa6, 0xe5, 0x34, 0xa8, 0x5e, 0xdb, 0x06, 0x95, 0x2b, 0x5b, - 0x39, 0x86, 0xc0, 0xda, 0x56, 0xcb, 0x8c, 0xfb, 0xf3, 0x42, 0xe7, 0x83, 0xae, 0x6d, 0x64, 0xdc, - 0x2f, 0x44, 0xe8, 0x25, 0xd0, 0x44, 0xe7, 0x22, 0x5c, 0xc6, 0xd4, 0xc2, 0x5d, 0x23, 0xb8, 0xfe, - 0xa4, 0x07, 0x00, 0x9e, 0xd7, 0xd3, 0x90, 0x15, 0x8f, 0x6b, 0xfd, 0x84, 0x10, 0xa1, 0x15, 0x8e, - 0x4b, 0xe4, 0xcc, 0xad, 0xd0, 0x06, 0xc5, 0xa5, 0xf7, 0x9f, 0x3a, 0xb4, 0x76, 0xd3, 0x22, 0x51, - 0xff, 0x37, 0x64, 0x58, 0xff, 0x69, 0x1e, 0x33, 0xe5, 0x2e, 0x2f, 0x43, 0x61, 0xf1, 0xe8, 0xd0, - 0xdb, 0x30, 0x4d, 0xce, 0x20, 0xc5, 0xa8, 0x91, 0x40, 0x3e, 0x82, 0xb5, 0x20, 0xe7, 0xd8, 0xe9, - 0xcd, 0x74, 0x35, 0x3b, 0x65, 0x59, 0xda, 0x01, 0x95, 0xa4, 0xde, 0xcb, 0x74, 0x3e, 0x50, 0x2b, - 0x15, 0xe3, 0x98, 0xa5, 0x22, 0x51, 0x36, 0x5a, 0x86, 0xf0, 0xee, 0xc0, 0xf9, 0xe7, 0x3e, 0xc1, - 0xa3, 0xb3, 0x34, 0x0f, 0xdc, 0x63, 0xd9, 0x10, 0x78, 0xbb, 0xa6, 0xe6, 0x80, 0xbd, 0xba, 0x1c, - 0xe9, 0x3d, 0x05, 0x38, 0x02, 0x21, 0xef, 0x41, 0x2b, 0x46, 0x5d, 0xec, 0x98, 0xfe, 0xe8, 0x2c, - 0xec, 0xa4, 0x46, 0x84, 0xf7, 0x53, 0x68, 0xe2, 0xb5, 0x81, 0x99, 0xa3, 0x67, 0x25, 0x9b, 0x69, - 0x7a, 0x4e, 0xc2, 0xd4, 0xe7, 0x07, 0xe5, 0xd3, 0xd0, 0x10, 0x68, 0x85, 0xc9, 0x09, 0x77, 0xa9, - 0x3a, 0x52, 0x27, 0x7a, 0xc6, 0x72, 0x5e, 0x26, 0x3a, 0x12, 0xf8, 0x02, 0x59, 0x33, 0x73, 0x26, - 0xf9, 0x39, 0x6c, 0x65, 0x39, 0xd7, 0xc3, 0x6c, 0x14, 0xf1, 0xd0, 0x4f, 0xa5, 0x35, 0xf1, 0xac, - 0x06, 0xaa, 0xcd, 0xaa, 0xb8, 0x3d, 0x49, 0xbe, 0x84, 0x0a, 0x88, 0x03, 0xa6, 0xb8, 0x2f, 0x8b, - 0x69, 0xc2, 0x95, 0x8b, 0xc4, 0xa6, 0x65, 0x4f, 0x0c, 0xd7, 0x7b, 0x0a, 0x1d, 0x37, 0xbb, 0x62, - 0xa5, 0x66, 0x11, 0x4b, 0xfc, 0x4a, 0x43, 0xef, 0x20, 0x03, 0x9b, 0x2d, 0xb9, 0x0e, 0xe7, 0xf5, - 0xa6, 0x6d, 0xd9, 0x7e, 0x65, 0x76, 0xdd, 0xc2, 0x8d, 0xc7, 0x86, 0xaf, 0xcf, 0xbe, 0x0e, 0x1b, - 0x6e, 0x0c, 0xf6, 0x03, 0x57, 0xa6, 0x5d, 0xba, 0xee, 0x98, 0x77, 0xd2, 0x90, 0x6f, 0xbf, 0x06, - 0x1b, 0x43, 0x1e, 0x71, 0xc5, 0xdd, 0x4f, 0xde, 0x4d, 0xa8, 0x8f, 0x86, 0x6e, 0xde, 0x1d, 0x0d, - 0x77, 0x3e, 0x6e, 0xc3, 0x96, 0x73, 0xc1, 0x84, 0xe7, 0xba, 0x3a, 0x7f, 0x5d, 0x83, 0xe6, 0xb8, - 0x90, 0x0b, 0xf2, 0xf5, 0x17, 0x71, 0x64, 0xe5, 0x5f, 0xb5, 0x77, 0xf3, 0x45, 0x3e, 0x34, 0xff, - 0xa2, 0x2f, 0xff, 0xf2, 0xe3, 0x7f, 0xfc, 0xa1, 0x7e, 0x7e, 0x7b, 0xfd, 0xc6, 0xc1, 0xcd, 0xf2, - 0x9f, 0xfa, 0x37, 0x6b, 0xd7, 0xc9, 0xef, 0x6b, 0xd0, 0xba, 0xbd, 0xdc, 0xbd, 0x75, 0x87, 0x7c, - 0xed, 0x45, 0x50, 0x8f, 0x7e, 0x6c, 0x7b, 0x27, 0xfa, 0x57, 0xbe, 0xfd, 0xaa, 0x56, 0xe8, 0xd2, - 0xf6, 0xb9, 0xaa, 0x42, 0x37, 0x62, 0x16, 0xa0, 0x52, 0xbf, 0xab, 0x41, 0xf3, 0xf6, 0x72, 0x34, - 0x7e, 0xc9, 0x3a, 0x79, 0x5a, 0xa7, 0x8b, 0xdb, 0x5b, 0xc7, 0x74, 0x12, 0x19, 0xaa, 0xf4, 0x5b, - 0xa3, 0xd2, 0xf0, 0x25, 0xab, 0x74, 0x45, 0xab, 0x74, 0x81, 0x9c, 0x3f, 0xa6, 0xd2, 0x07, 0x22, - 0xfc, 0x90, 0xfc, 0xaa, 0x06, 0x8d, 0x5b, 0x51, 0x44, 0x5e, 0x3c, 0x1b, 0x4e, 0xa8, 0xcb, 0x45, - 0xad, 0xcb, 0x26, 0x39, 0x96, 0x43, 0x6f, 0xd4, 0xc8, 0x21, 0xb4, 0x9e, 0x30, 0x15, 0x2c, 0x5e, - 0xae, 0x6b, 0xde, 0xa8, 0x91, 0x03, 0x58, 0x33, 0xe5, 0x47, 0x5e, 0xe8, 0xef, 0xc8, 0xb1, 0x92, - 0x3d, 0x41, 0x31, 0xdd, 0x86, 0x1f, 0x74, 0x1c, 0x67, 0xba, 0xa6, 0x8f, 0x7c, 0xf5, 0xbf, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x18, 0x61, 0xf3, 0x5a, 0xb2, 0x1a, 0x00, 0x00, + 0x15, 0x56, 0xcf, 0x65, 0x67, 0xe6, 0xcc, 0x5e, 0xec, 0xf2, 0x6d, 0xd2, 0x01, 0x62, 0x36, 0x0a, + 0x18, 0x23, 0x8d, 0xe3, 0x25, 0x02, 0x81, 0x00, 0xc9, 0xf6, 0xfa, 0x32, 0x21, 0xeb, 0x1d, 0x6a, + 0x1c, 0x9b, 0x70, 0x6b, 0x6a, 0xba, 0x6b, 0x66, 0x2a, 0xdb, 0xd3, 0xdd, 0xe9, 0xaa, 0xde, 0xf5, + 0x10, 0x25, 0x42, 0x3c, 0xf0, 0x82, 0x10, 0x11, 0xf0, 0x0b, 0x78, 0xe3, 0x95, 0x3f, 0xc0, 0x4f, + 0xe0, 0x21, 0xcf, 0xbc, 0x20, 0x2e, 0xbf, 0x80, 0x47, 0x24, 0x74, 0xea, 0xd2, 0xdb, 0x6b, 0x27, + 0x11, 0xbb, 0xb3, 0xeb, 0xb7, 0x3a, 0x5f, 0x57, 0x7f, 0xe7, 0x9c, 0x3a, 0xe7, 0xd4, 0x39, 0xdd, + 0x70, 0x65, 0xc6, 0xf2, 0xe8, 0x80, 0xe5, 0xfc, 0x86, 0x5b, 0xf4, 0xb3, 0x3c, 0x55, 0x29, 0xb9, + 0x3e, 0x15, 0x6a, 0x56, 0x8c, 0xfb, 0x61, 0x3a, 0xef, 0x2b, 0x91, 0xec, 0xf1, 0x7c, 0xcc, 0xe3, + 0x58, 0x2f, 0xcd, 0x0e, 0xd9, 0x77, 0x6f, 0xf8, 0x9f, 0x9b, 0xa6, 0xe9, 0x34, 0xe6, 0x37, 0x58, + 0x26, 0x6e, 0xb0, 0x24, 0x49, 0x15, 0x53, 0x22, 0x4d, 0xa4, 0xd9, 0xb7, 0xf9, 0x04, 0xba, 0xc3, + 0x42, 0xce, 0x28, 0x7f, 0xaf, 0xe0, 0x52, 0x91, 0x07, 0xd0, 0x88, 0x98, 0x62, 0x3d, 0xef, 0xaa, + 0x77, 0xad, 0xbb, 0xf5, 0x46, 0xff, 0xff, 0xd7, 0xd3, 0x7f, 0x60, 0x17, 0x54, 0x33, 0x6c, 0xb6, + 0xa0, 0x79, 0x77, 0x9e, 0xa9, 0xc5, 0xe6, 0x77, 0x01, 0xee, 0x73, 0xe5, 0x14, 0x9c, 0x83, 0xfa, + 0x9c, 0x85, 0x9a, 0xbf, 0x43, 0x71, 0x49, 0xd6, 0xa1, 0x26, 0xb2, 0x5e, 0x4d, 0x03, 0x35, 0x91, + 0x69, 0x39, 0xea, 0xd5, 0xad, 0x1c, 0x6d, 0xfe, 0xe7, 0xab, 0xd0, 0x76, 0xdc, 0xe4, 0x55, 0x58, + 0xdb, 0xbd, 0x3d, 0xda, 0x7d, 0xeb, 0xee, 0xa3, 0xbb, 0xc1, 0x9b, 0xa3, 0xdd, 0x87, 0x96, 0x68, + 0xd5, 0x81, 0x88, 0x91, 0x9f, 0x56, 0x36, 0x45, 0xb3, 0xd0, 0x90, 0x77, 0xb7, 0xbe, 0x79, 0x12, + 0x6f, 0xfa, 0xdb, 0x0f, 0xee, 0x0c, 0x0f, 0xf9, 0xb7, 0x67, 0x61, 0x46, 0xa6, 0x70, 0xae, 0xe4, + 0x4f, 0xb8, 0x1a, 0xa7, 0xa9, 0xd2, 0xf6, 0x76, 0xb7, 0xbe, 0x7d, 0x22, 0x15, 0x0f, 0x0d, 0x07, + 0xdd, 0x70, 0xac, 0x16, 0x78, 0x56, 0xd1, 0x41, 0x9a, 0xef, 0xf5, 0x1a, 0x57, 0xeb, 0xcb, 0x28, + 0x42, 0x8e, 0x23, 0x8a, 0x10, 0x20, 0xef, 0x40, 0x7b, 0xce, 0x15, 0xd3, 0xa1, 0x6f, 0x6a, 0x4f, + 0xbe, 0x73, 0x22, 0x05, 0x3b, 0x96, 0x84, 0x96, 0x74, 0xe4, 0x31, 0xb4, 0x9c, 0xe9, 0x2b, 0xcb, + 0x9d, 0x91, 0x36, 0xdd, 0x91, 0xd9, 0x34, 0x69, 0xb9, 0x34, 0x21, 0x3d, 0x68, 0xed, 0xf3, 0x5c, + 0x8a, 0x34, 0xe9, 0xb5, 0xaf, 0x7a, 0xd7, 0xea, 0xd4, 0x89, 0xfe, 0xbf, 0xea, 0xd0, 0xc0, 0x28, + 0x7e, 0x42, 0xee, 0xbd, 0x02, 0xdd, 0xf2, 0x80, 0xcb, 0x24, 0x04, 0x07, 0x0d, 0x32, 0xe2, 0x43, + 0x7b, 0x96, 0x4a, 0x95, 0xb0, 0x39, 0xb7, 0x29, 0x59, 0xca, 0xe4, 0xf3, 0x00, 0x31, 0x67, 0x92, + 0x07, 0x4a, 0xcc, 0x79, 0xaf, 0xa1, 0x95, 0x76, 0x34, 0xf2, 0x48, 0xcc, 0x39, 0xf9, 0x22, 0xac, + 0xe2, 0xb6, 0x40, 0xf2, 0x1c, 0x2d, 0xe9, 0x35, 0xaf, 0xd6, 0xaf, 0x75, 0x68, 0x17, 0xb1, 0x91, + 0x81, 0x70, 0x0b, 0xbe, 0x5b, 0x6e, 0x59, 0x31, 0x5b, 0x10, 0x73, 0x5b, 0xbe, 0x52, 0x49, 0x81, + 0x29, 0x53, 0xfc, 0x80, 0x2d, 0xac, 0xd3, 0x65, 0x10, 0xef, 0x1b, 0x98, 0x10, 0x68, 0xb0, 0x3c, + 0x9c, 0x69, 0xf7, 0x3b, 0x54, 0xaf, 0x11, 0x2b, 0xf8, 0x44, 0xf4, 0x3a, 0x57, 0xbd, 0x6b, 0x6d, + 0xaa, 0xd7, 0x68, 0xb7, 0x98, 0xb0, 0x90, 0x07, 0xda, 0x2b, 0xd0, 0xbb, 0x3b, 0x1a, 0x79, 0x88, + 0x6e, 0xbd, 0xa5, 0xeb, 0xb1, 0xbb, 0x44, 0xac, 0xf0, 0xb0, 0xfb, 0x83, 0x21, 0x56, 0xb3, 0xff, + 0x2e, 0xd4, 0x06, 0x43, 0x0c, 0x0e, 0x8b, 0xa2, 0x9c, 0x4b, 0x69, 0x4f, 0xdf, 0x89, 0xf8, 0x24, + 0xe1, 0x6a, 0xce, 0xe4, 0x9e, 0x3d, 0x7d, 0x27, 0xe2, 0x13, 0xe7, 0xb0, 0x39, 0x79, 0x27, 0x92, + 0xcb, 0xb0, 0x32, 0x61, 0x73, 0x11, 0x2f, 0xec, 0xa1, 0x5b, 0xc9, 0xff, 0x43, 0x03, 0x5a, 0xae, + 0x74, 0x5e, 0x86, 0x0e, 0x8b, 0xe3, 0xf4, 0x20, 0xc8, 0x9e, 0x72, 0xad, 0xb3, 0x4d, 0xdb, 0x1a, + 0x18, 0x3e, 0xe5, 0xe4, 0x35, 0x58, 0x37, 0x0f, 0x31, 0x93, 0x26, 0x71, 0x7a, 0xa0, 0x75, 0xb7, + 0xe9, 0x9a, 0x46, 0x9f, 0x58, 0x90, 0xbc, 0x0d, 0x0d, 0x81, 0xaf, 0x9b, 0xda, 0xbe, 0xb5, 0x4c, + 0x6d, 0xf7, 0x07, 0xc3, 0x1f, 0xdc, 0xa5, 0x9a, 0x8e, 0x7c, 0x08, 0x97, 0xca, 0x90, 0xe2, 0x33, + 0xa9, 0x72, 0x96, 0x65, 0x3c, 0xd7, 0xde, 0x74, 0xb7, 0x06, 0x4b, 0xe9, 0xb9, 0x5d, 0x21, 0xa4, + 0x17, 0x9d, 0x9e, 0x2a, 0x8a, 0x6e, 0xa5, 0x52, 0x70, 0x5b, 0xe8, 0xcb, 0xb9, 0xb5, 0x2b, 0x05, + 0xa7, 0x9a, 0xce, 0x7f, 0x03, 0x1a, 0xe8, 0x24, 0x56, 0x59, 0x91, 0xc7, 0xae, 0xca, 0x8a, 0x3c, + 0xc6, 0x22, 0x0a, 0xd3, 0x44, 0xf1, 0x44, 0x49, 0x1b, 0xe4, 0x52, 0xf6, 0xd7, 0x61, 0xb5, 0x6a, + 0x9c, 0xff, 0x7d, 0x68, 0x20, 0x27, 0x79, 0x09, 0xda, 0x63, 0xac, 0xad, 0x43, 0xaa, 0x16, 0xca, + 0x6f, 0xe7, 0x31, 0x86, 0x7f, 0x8f, 0xe7, 0x09, 0x8f, 0x2d, 0x99, 0x95, 0x10, 0x17, 0x89, 0x50, + 0xb9, 0x6b, 0x1e, 0x56, 0xf2, 0xff, 0x6e, 0xd2, 0x42, 0xdf, 0x1a, 0xcf, 0xb5, 0x06, 0xef, 0xec, + 0x5b, 0x43, 0xed, 0x2c, 0x5a, 0xc3, 0x04, 0x40, 0x24, 0x8a, 0xe7, 0x58, 0xb6, 0xb2, 0x57, 0xd7, + 0x4d, 0xe1, 0xde, 0x32, 0x37, 0x6b, 0x7f, 0xe0, 0xe8, 0x68, 0x85, 0x99, 0xbc, 0x57, 0x71, 0x28, + 0xe2, 0x13, 0x56, 0xc4, 0xca, 0xe6, 0xe9, 0x69, 0x69, 0x2b, 0x5d, 0xdb, 0x36, 0xf4, 0xfe, 0x9f, + 0x3d, 0xe8, 0x94, 0x8f, 0xc9, 0x0e, 0x34, 0x4e, 0x27, 0x50, 0x9a, 0xc6, 0xb6, 0xa3, 0x53, 0x8b, + 0x8b, 0x23, 0xf3, 0xff, 0xea, 0x43, 0xdb, 0x75, 0x3f, 0x72, 0x11, 0x9a, 0x52, 0x31, 0xc5, 0x6d, + 0xe6, 0x1a, 0x01, 0x6f, 0xfb, 0x71, 0x9a, 0x44, 0x22, 0x99, 0x06, 0xf3, 0x34, 0xe2, 0x5a, 0x7f, + 0x9d, 0x76, 0x2d, 0xb6, 0x93, 0x46, 0x9c, 0x24, 0xb0, 0x3a, 0x67, 0x49, 0x31, 0x61, 0xa1, 0x2a, + 0x72, 0x9e, 0xdb, 0x9b, 0xe7, 0xcd, 0xa5, 0x7a, 0x71, 0x7f, 0xa7, 0xc2, 0x48, 0x8f, 0xf0, 0x93, + 0x31, 0xb4, 0x45, 0x22, 0x15, 0x4b, 0x42, 0xbe, 0x54, 0x54, 0x4b, 0x5d, 0x03, 0xcb, 0x46, 0x4b, + 0x5e, 0xf2, 0x63, 0x58, 0x09, 0x0b, 0xa9, 0xd2, 0xb9, 0xbd, 0x70, 0xb6, 0x97, 0xd3, 0x70, 0x47, + 0x73, 0x51, 0xcb, 0x89, 0x1e, 0x4c, 0x58, 0x28, 0x62, 0xa1, 0x16, 0x76, 0xbe, 0x58, 0xd2, 0x83, + 0x7b, 0x96, 0x8d, 0x96, 0xbc, 0xfe, 0x16, 0xac, 0x56, 0xcf, 0xd0, 0x8e, 0x1e, 0x5e, 0x39, 0x7a, + 0x10, 0x68, 0xc8, 0xb8, 0x98, 0xda, 0xeb, 0x48, 0xaf, 0xfd, 0x7f, 0x5e, 0x80, 0xb6, 0x3b, 0x8c, + 0xe7, 0x5e, 0x28, 0xf3, 0xa3, 0x56, 0xcd, 0x8f, 0xcf, 0x9a, 0x35, 0x8e, 0xb4, 0xb3, 0xc6, 0x33, + 0xed, 0xec, 0x32, 0xac, 0xe4, 0x5c, 0x86, 0x85, 0xb9, 0xd2, 0xdb, 0xd4, 0x4a, 0xe4, 0x23, 0x0f, + 0x7a, 0x69, 0xc6, 0x73, 0xa6, 0x30, 0xe7, 0xe4, 0x42, 0x2a, 0x3e, 0x0f, 0xdc, 0x90, 0x64, 0x0e, + 0xeb, 0xf1, 0xe9, 0x84, 0xbb, 0xbf, 0xeb, 0xd4, 0x8c, 0xb4, 0x16, 0x7a, 0x39, 0x3d, 0x0a, 0x3c, + 0x36, 0x5a, 0x71, 0xf6, 0x60, 0xf1, 0x01, 0x5b, 0x48, 0xed, 0x48, 0x4b, 0x9b, 0xdb, 0x31, 0x08, + 0x7a, 0xf2, 0x25, 0xd8, 0xc0, 0x16, 0x19, 0xc8, 0x30, 0x17, 0x99, 0xd2, 0x97, 0xbf, 0x99, 0x66, + 0xd6, 0x10, 0x1e, 0x69, 0x14, 0x5b, 0xc0, 0x8f, 0xa0, 0x2e, 0x32, 0xd9, 0xeb, 0xe8, 0x6b, 0x6f, + 0x70, 0x4a, 0x3e, 0x0c, 0x86, 0x14, 0x59, 0x31, 0x0e, 0x85, 0xe4, 0xb9, 0x1e, 0x86, 0xcd, 0x74, + 0x54, 0xca, 0x64, 0x0b, 0x2e, 0x85, 0xf9, 0x22, 0x53, 0x3c, 0x0a, 0xf2, 0x34, 0x55, 0x41, 0xc6, + 0xa4, 0x3c, 0x48, 0xf3, 0x48, 0xcf, 0x4b, 0x1d, 0x7a, 0xc1, 0x3e, 0xa4, 0x69, 0xaa, 0x86, 0xf6, + 0x11, 0xa6, 0x87, 0x62, 0x53, 0xd9, 0x5b, 0xd5, 0xd3, 0x9d, 0x5e, 0x93, 0x19, 0xb4, 0xa4, 0x4a, + 0x73, 0x36, 0xe5, 0xbd, 0x35, 0x1d, 0x88, 0x87, 0xa7, 0xe4, 0xc4, 0xc8, 0xb0, 0x52, 0x47, 0x8f, + 0x8d, 0x54, 0xca, 0x59, 0xb0, 0xc7, 0x17, 0xb2, 0xb7, 0xae, 0x2d, 0x68, 0x49, 0x39, 0xfb, 0x1e, + 0x5f, 0x48, 0xfc, 0x98, 0xb2, 0xd3, 0x74, 0x90, 0x73, 0x16, 0x2d, 0x7a, 0x1b, 0x3a, 0x1e, 0xab, + 0x16, 0xa4, 0x88, 0xf9, 0xbf, 0xf1, 0x60, 0xe3, 0x99, 0xe8, 0x96, 0x09, 0xef, 0x1d, 0x26, 0x3c, + 0x26, 0x61, 0x24, 0xa4, 0xca, 0x53, 0xd7, 0x95, 0x8d, 0x54, 0x9d, 0xcb, 0xed, 0x18, 0x67, 0x45, + 0xcc, 0x69, 0x31, 0x67, 0x53, 0x1e, 0x28, 0x36, 0xd5, 0x39, 0xdd, 0xa1, 0x6d, 0x0d, 0x3c, 0x62, + 0x53, 0x72, 0x05, 0x5a, 0xa9, 0x0c, 0xb4, 0x96, 0xa6, 0xe1, 0x4b, 0xe5, 0x08, 0x0b, 0xeb, 0x8f, + 0xde, 0x8b, 0x9b, 0x28, 0x11, 0xcf, 0x8a, 0x71, 0x2c, 0x42, 0x57, 0x59, 0x46, 0x22, 0x5f, 0x00, + 0x98, 0xb3, 0x84, 0x4d, 0xf9, 0x9c, 0x27, 0x4a, 0x97, 0x52, 0x9b, 0x56, 0x10, 0xff, 0xdf, 0x5d, + 0x68, 0xd9, 0x48, 0xe0, 0xb0, 0x79, 0xd8, 0x41, 0x85, 0xdc, 0x43, 0x83, 0x31, 0x0c, 0xe5, 0x20, + 0xb2, 0x8d, 0xe0, 0x91, 0x2f, 0xdb, 0x9c, 0x89, 0xa8, 0x57, 0xd3, 0xbb, 0xca, 0xf1, 0x82, 0x32, + 0x11, 0x91, 0x9b, 0x50, 0x8e, 0x74, 0xc1, 0x44, 0xc4, 0xdc, 0xd4, 0xb4, 0xe9, 0xff, 0x1d, 0x7a, + 0xc1, 0x3d, 0xbb, 0x77, 0xf8, 0x88, 0x08, 0x68, 0x1a, 0xad, 0xe6, 0xc3, 0x71, 0x74, 0xba, 0x79, + 0xd6, 0x47, 0xe3, 0xa9, 0xd1, 0x40, 0xa6, 0xd0, 0xd0, 0x96, 0x37, 0xcf, 0x44, 0x13, 0xbd, 0x35, + 0xd8, 0xa6, 0x5a, 0x01, 0x79, 0x1f, 0xba, 0x55, 0xef, 0x57, 0xb4, 0xbe, 0x77, 0x4e, 0x59, 0xdf, + 0xe1, 0x21, 0xd2, 0xaa, 0x36, 0xff, 0x2f, 0x35, 0x68, 0xa0, 0xd7, 0x3a, 0xe3, 0xf9, 0xbe, 0x08, + 0x5d, 0x9b, 0xb7, 0x12, 0xde, 0x71, 0x07, 0x22, 0xc3, 0xb4, 0x1e, 0xc7, 0xdc, 0x7e, 0x59, 0x74, + 0x10, 0x79, 0x84, 0x00, 0xf9, 0x00, 0x20, 0x63, 0xb9, 0x12, 0xfa, 0x2f, 0x8c, 0x9d, 0xdc, 0x7e, + 0x72, 0x06, 0x51, 0xe9, 0x0f, 0x9d, 0x16, 0x5a, 0x51, 0xe8, 0xff, 0xc2, 0x83, 0x4e, 0xf9, 0x04, + 0x3b, 0x51, 0xcc, 0xc6, 0xdc, 0xcd, 0xd8, 0x46, 0x40, 0xcf, 0x92, 0x62, 0x3e, 0xe6, 0xb9, 0x9d, + 0x51, 0xac, 0xa4, 0xeb, 0x5e, 0xfc, 0xdc, 0x74, 0xa7, 0x3a, 0xd5, 0x6b, 0xdb, 0xcb, 0x72, 0x65, + 0x2b, 0xc7, 0x08, 0x58, 0xdb, 0x6a, 0x91, 0xf1, 0x60, 0x5a, 0xe8, 0x7c, 0xd0, 0xb5, 0x8d, 0xc0, + 0xfd, 0x42, 0x44, 0x7e, 0x02, 0x0d, 0x3c, 0x5c, 0xa4, 0xcb, 0x98, 0x9a, 0xb9, 0x6b, 0x04, 0xd7, + 0x9f, 0xf5, 0xad, 0x80, 0xfb, 0xf5, 0xe0, 0x64, 0xd5, 0xe3, 0x5a, 0x7f, 0x6d, 0x88, 0xc8, 0x2a, + 0xc7, 0x25, 0x22, 0x53, 0xab, 0xb4, 0x4e, 0x71, 0xe9, 0xff, 0xb7, 0x06, 0xcd, 0x9d, 0xb4, 0x48, + 0xd4, 0xa7, 0x86, 0x0c, 0xeb, 0x3f, 0xcd, 0xe7, 0x4c, 0xb9, 0xcb, 0xcb, 0x48, 0x58, 0x3c, 0x3a, + 0xf4, 0x36, 0x4c, 0xa3, 0x33, 0x48, 0x31, 0x6a, 0x34, 0x90, 0x0f, 0x61, 0x25, 0xcc, 0x39, 0x0e, + 0x05, 0x66, 0x10, 0x9b, 0x9c, 0xb2, 0x2e, 0x7d, 0x00, 0x95, 0xa4, 0xde, 0xcd, 0x74, 0x3e, 0x50, + 0xab, 0x15, 0xe3, 0x98, 0xa5, 0x22, 0x51, 0x36, 0x5a, 0x46, 0xf0, 0xef, 0xc0, 0xf9, 0xe7, 0x5e, + 0xc1, 0xad, 0x93, 0x34, 0x0f, 0xdd, 0x77, 0xb5, 0x11, 0xf0, 0x76, 0x4d, 0xcd, 0x06, 0x7b, 0x75, + 0x39, 0xd1, 0x7f, 0x0a, 0x70, 0x48, 0x42, 0xde, 0x85, 0xe6, 0x1c, 0x6d, 0xb1, 0x13, 0xfd, 0xa3, + 0xb3, 0xf0, 0x93, 0x1a, 0x15, 0xfe, 0xcf, 0xa0, 0x81, 0xd7, 0x06, 0x66, 0x8e, 0x1e, 0xab, 0x6c, + 0xa6, 0xe9, 0x91, 0x0a, 0x53, 0x9f, 0xef, 0x97, 0x5f, 0x91, 0x46, 0x40, 0x2f, 0x4c, 0x4e, 0xb8, + 0x4b, 0xd5, 0x89, 0x3a, 0xd1, 0x33, 0x96, 0xf3, 0x32, 0xd1, 0x51, 0xf0, 0xff, 0xe6, 0xc1, 0x8a, + 0x19, 0x49, 0xc9, 0x9f, 0x3c, 0x78, 0x2d, 0xcb, 0xb9, 0x1e, 0x7c, 0xe3, 0x98, 0x47, 0xc1, 0xa7, + 0xce, 0x5e, 0xde, 0x99, 0xce, 0x5e, 0x9b, 0x55, 0x23, 0x76, 0x3f, 0x79, 0x0e, 0xfb, 0x32, 0x6c, + 0x64, 0xb9, 0xd8, 0x67, 0x8a, 0x07, 0xb2, 0x18, 0x27, 0x5c, 0xb9, 0xa0, 0xad, 0x5b, 0x78, 0x64, + 0x50, 0xff, 0x29, 0xb4, 0xdd, 0x44, 0x8c, 0x45, 0x9d, 0xc5, 0x2c, 0x09, 0x2a, 0xbd, 0xbf, 0x8d, + 0x00, 0xf6, 0x65, 0x72, 0x1d, 0xce, 0xeb, 0x87, 0xd6, 0xc7, 0xa0, 0x32, 0x11, 0x6f, 0xe0, 0x03, + 0xab, 0x59, 0xef, 0x7d, 0x15, 0xd6, 0xdc, 0x70, 0x1d, 0x84, 0xae, 0xa2, 0x3b, 0x74, 0xd5, 0x81, + 0x77, 0xd2, 0x88, 0x6f, 0xbe, 0x02, 0x6b, 0xdb, 0x3c, 0xe6, 0x8a, 0xbb, 0x5f, 0xc7, 0xeb, 0x50, + 0x1b, 0x6c, 0xbb, 0x29, 0x7a, 0xb0, 0xbd, 0xf5, 0x71, 0x0b, 0x36, 0xdc, 0xb1, 0x8c, 0x78, 0xae, + 0x0b, 0xf9, 0xd7, 0x1e, 0x34, 0x86, 0x85, 0x9c, 0x91, 0x6f, 0x1c, 0xe7, 0x70, 0x2b, 0x7f, 0xc0, + 0xfd, 0x9b, 0xc7, 0x79, 0xd1, 0xfc, 0xe1, 0xbe, 0xf2, 0xcb, 0x8f, 0xff, 0xf1, 0xfb, 0xda, 0xf9, + 0xcd, 0xd5, 0x1b, 0xfb, 0x37, 0xcb, 0x3f, 0xf5, 0xdf, 0xf2, 0xae, 0x93, 0xdf, 0x79, 0xd0, 0xbc, + 0xbd, 0xd8, 0xb9, 0x75, 0x87, 0x7c, 0xfd, 0x38, 0xac, 0x87, 0xbf, 0xcb, 0xfd, 0x13, 0xfd, 0x81, + 0xdf, 0x7c, 0x59, 0x1b, 0x74, 0x69, 0xf3, 0x5c, 0xd5, 0xa0, 0x1b, 0x73, 0x16, 0xa2, 0x51, 0x1f, + 0x79, 0xd0, 0xb8, 0xbd, 0x18, 0x0c, 0x5f, 0xb0, 0x4d, 0xbe, 0xb6, 0xe9, 0xe2, 0xe6, 0xc6, 0x11, + 0x9b, 0x44, 0x86, 0x26, 0xfd, 0xd6, 0x98, 0xb4, 0xfd, 0x82, 0x4d, 0x7a, 0x49, 0x9b, 0x74, 0x81, + 0x9c, 0x3f, 0x62, 0xd2, 0xfb, 0x22, 0xfa, 0x80, 0xfc, 0xca, 0x83, 0xfa, 0xad, 0x38, 0x26, 0xc7, + 0xcf, 0x86, 0x13, 0xda, 0x72, 0x51, 0xdb, 0xb2, 0x4e, 0x8e, 0xe4, 0xd0, 0xeb, 0x1e, 0x39, 0x80, + 0xe6, 0x13, 0xa6, 0xc2, 0xd9, 0x8b, 0x3d, 0x9a, 0xd7, 0x3d, 0xb2, 0x0f, 0x2b, 0xa6, 0xfc, 0xc8, + 0xb1, 0xfe, 0xb9, 0x1c, 0x29, 0xd9, 0x13, 0x14, 0xd3, 0x6d, 0xf8, 0x61, 0xdb, 0x21, 0xe3, 0x15, + 0xbd, 0xe5, 0x6b, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x64, 0x79, 0xa2, 0x8c, 0x08, 0x1b, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protos/hardware/hardware.proto b/protos/hardware/hardware.proto index d79a02a70..f94301492 100644 --- a/protos/hardware/hardware.proto +++ b/protos/hardware/hardware.proto @@ -183,7 +183,7 @@ message Hardware { bool allow_pxe = 4; bool rescue = 5; - OperatingSystem OS = 6; + OperatingSystem operating_system_version = 6; bool always_pxe = 7; string ipxe_script_url = 8; repeated IP ips = 9; @@ -197,7 +197,7 @@ message Hardware { bool network_ready = 15; } message Custom { - Instance.OperatingSystem preinstalled_os = 1; + Instance.OperatingSystem preinstalled_operating_system_version = 1; repeated string private_subnets = 2; } message Facility { From bc1a5a9fc88fc34f7a541ebc6eccc19d9b002518 Mon Sep 17 00:00:00 2001 From: Kelly Deng Date: Fri, 19 Jun 2020 21:05:23 -0400 Subject: [PATCH 31/31] updated basic auth envvars to default to empty --- deploy/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index de3e21d0e..eaec855ef 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -17,8 +17,8 @@ services: PGUSER: tinkerbell TINKERBELL_GRPC_AUTHORITY: :42113 TINKERBELL_HTTP_AUTHORITY: :42114 - TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME:-admin} - TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD:-admin} + TINK_AUTH_USERNAME: ${TINKERBELL_TINK_USERNAME} + TINK_AUTH_PASSWORD: ${TINKERBELL_TINK_PASSWORD} depends_on: db: condition: service_healthy