From 232ecd8c515ffa60a89aea3fb87a25d2370c4e90 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Tue, 23 Nov 2021 17:33:54 -0800 Subject: [PATCH] [cherry-pick] Remove Google Analytics (#1296) (#1309) /cherry-pick Signed-off-by: Tamal Saha Co-authored-by: Tamal Saha --- go.mod | 14 +- go.sum | 61 +- pkg/root.go | 4 - vendor/github.com/google/uuid/.travis.yml | 9 - vendor/github.com/google/uuid/CONTRIBUTING.md | 10 - vendor/github.com/google/uuid/CONTRIBUTORS | 9 - vendor/github.com/google/uuid/LICENSE | 27 - vendor/github.com/google/uuid/README.md | 19 - vendor/github.com/google/uuid/dce.go | 80 -- vendor/github.com/google/uuid/doc.go | 12 - vendor/github.com/google/uuid/go.mod | 1 - vendor/github.com/google/uuid/hash.go | 53 - vendor/github.com/google/uuid/marshal.go | 38 - vendor/github.com/google/uuid/node.go | 90 -- vendor/github.com/google/uuid/node_js.go | 12 - vendor/github.com/google/uuid/node_net.go | 33 - vendor/github.com/google/uuid/sql.go | 59 - vendor/github.com/google/uuid/time.go | 123 -- vendor/github.com/google/uuid/util.go | 43 - vendor/github.com/google/uuid/uuid.go | 245 ---- vendor/github.com/google/uuid/version1.go | 44 - vendor/github.com/google/uuid/version4.go | 43 - .../jpillora/go-ogle-analytics/.gitignore | 1 - .../jpillora/go-ogle-analytics/LICENSE | 22 - .../jpillora/go-ogle-analytics/README.md | 81 -- .../jpillora/go-ogle-analytics/client.go | 76 - .../jpillora/go-ogle-analytics/conv.go | 19 - .../jpillora/go-ogle-analytics/type-client.go | 1228 ----------------- .../jpillora/go-ogle-analytics/type-event.go | 58 - .../go-ogle-analytics/type-exception.go | 49 - .../jpillora/go-ogle-analytics/type-item.go | 98 -- .../go-ogle-analytics/type-pageview.go | 24 - .../go-ogle-analytics/type-screenview.go | 24 - .../jpillora/go-ogle-analytics/type-social.go | 41 - .../jpillora/go-ogle-analytics/type-timing.go | 177 --- .../go-ogle-analytics/type-transaction.go | 95 -- .../license-verifier/Makefile | 4 +- .../apis/licenses/v1alpha1/helper.go | 21 + .../apis/licenses/v1alpha1/types.go | 23 +- .../v1alpha1/zz_generated.deepcopy.go | 8 + .../license-verifier/info/lib.go | 23 +- .../license-verifier/kubernetes/go.mod | 4 +- .../license-verifier/kubernetes/go.sum | 137 +- .../license-verifier/kubernetes/lib.go | 2 +- .../license-verifier/lib.go | 22 + vendor/gomodules.xyz/flags/go.mod | 2 +- vendor/gomodules.xyz/flags/go.sum | 4 +- vendor/gomodules.xyz/homedir/LICENSE | 202 --- vendor/gomodules.xyz/homedir/README.md | 3 - vendor/gomodules.xyz/homedir/go.mod | 3 - vendor/gomodules.xyz/homedir/homedir.go | 92 -- vendor/gomodules.xyz/logs/go.mod | 4 +- vendor/gomodules.xyz/logs/go.sum | 12 +- vendor/gomodules.xyz/logs/lib.go | 4 +- vendor/gomodules.xyz/wait/README.md | 2 +- vendor/gomodules.xyz/wait/wait.go | 268 +++- vendor/gomodules.xyz/x/analytics/analytics.go | 24 - vendor/kmodules.xyz/client-go/Makefile | 4 +- .../client-go/core/v1/kubernetes.go | 7 - .../client-go/dynamic/kubernetes.go | 13 + vendor/kmodules.xyz/client-go/meta/lib.go | 20 +- .../client-go/meta/preconditions.go | 54 + .../client-go/tools/analytics/analytics.go | 75 - .../kmodules.xyz/client-go/tools/cli/cli.go | 62 - .../auditor/v1alpha1/openapi_generated.go | 4 +- .../apis/auditor/v1alpha1/siteinfo_types.go | 4 +- .../auditor/v1alpha1/zz_generated.deepcopy.go | 6 +- .../crds/auditor.appscode.com_siteinfoes.yaml | 173 --- .../crds/auditor.appscode.com_siteinfos.yaml | 2 - .../offshoot-api/api/v1/generated.pb.go | 430 ++++-- .../offshoot-api/api/v1/generated.proto | 9 +- .../offshoot-api/api/v1/openapi_generated.go | 16 + .../kmodules.xyz/offshoot-api/api/v1/types.go | 9 +- .../api/v1/zz_generated.deepcopy.go | 7 + .../apis/config/v1alpha1/generated.pb.go | 295 +++- .../apis/config/v1alpha1/generated.proto | 13 + .../apis/config/v1alpha1/openapi_generated.go | 90 ++ .../config/v1alpha1/redis_config_types.go | 40 + .../config/v1alpha1/zz_generated.deepcopy.go | 33 + vendor/modules.txt | 27 +- 80 files changed, 1346 insertions(+), 3933 deletions(-) delete mode 100644 vendor/github.com/google/uuid/.travis.yml delete mode 100644 vendor/github.com/google/uuid/CONTRIBUTING.md delete mode 100644 vendor/github.com/google/uuid/CONTRIBUTORS delete mode 100644 vendor/github.com/google/uuid/LICENSE delete mode 100644 vendor/github.com/google/uuid/README.md delete mode 100644 vendor/github.com/google/uuid/dce.go delete mode 100644 vendor/github.com/google/uuid/doc.go delete mode 100644 vendor/github.com/google/uuid/go.mod delete mode 100644 vendor/github.com/google/uuid/hash.go delete mode 100644 vendor/github.com/google/uuid/marshal.go delete mode 100644 vendor/github.com/google/uuid/node.go delete mode 100644 vendor/github.com/google/uuid/node_js.go delete mode 100644 vendor/github.com/google/uuid/node_net.go delete mode 100644 vendor/github.com/google/uuid/sql.go delete mode 100644 vendor/github.com/google/uuid/time.go delete mode 100644 vendor/github.com/google/uuid/util.go delete mode 100644 vendor/github.com/google/uuid/uuid.go delete mode 100644 vendor/github.com/google/uuid/version1.go delete mode 100644 vendor/github.com/google/uuid/version4.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/.gitignore delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/LICENSE delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/README.md delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/client.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/conv.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-client.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-event.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-exception.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-item.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-pageview.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-screenview.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-social.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-timing.go delete mode 100644 vendor/github.com/jpillora/go-ogle-analytics/type-transaction.go create mode 100644 vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go delete mode 100644 vendor/gomodules.xyz/homedir/LICENSE delete mode 100644 vendor/gomodules.xyz/homedir/README.md delete mode 100644 vendor/gomodules.xyz/homedir/go.mod delete mode 100644 vendor/gomodules.xyz/homedir/homedir.go delete mode 100644 vendor/gomodules.xyz/x/analytics/analytics.go create mode 100644 vendor/kmodules.xyz/client-go/meta/preconditions.go delete mode 100644 vendor/kmodules.xyz/client-go/tools/analytics/analytics.go delete mode 100644 vendor/kmodules.xyz/client-go/tools/cli/cli.go delete mode 100644 vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfoes.yaml create mode 100644 vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/redis_config_types.go diff --git a/go.mod b/go.mod index 0332b099c..90c1d1638 100644 --- a/go.mod +++ b/go.mod @@ -5,20 +5,20 @@ go 1.15 require ( github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.1.3 - go.bytebuilders.dev/license-verifier/kubernetes v0.9.3 - gomodules.xyz/flags v0.1.2 + go.bytebuilders.dev/license-verifier/kubernetes v0.9.5 + gomodules.xyz/flags v0.1.3 gomodules.xyz/go-sh v0.1.0 - gomodules.xyz/logs v0.0.4 + gomodules.xyz/logs v0.0.6 gomodules.xyz/pointer v0.1.0 gomodules.xyz/x v0.0.8 k8s.io/api v0.21.1 k8s.io/apimachinery v0.21.1 k8s.io/client-go v0.21.1 k8s.io/klog/v2 v2.8.0 - kmodules.xyz/client-go v0.0.0-20211028132207-0cf6ea46b030 - kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e - kmodules.xyz/offshoot-api v0.0.0-20210829122105-6f4d481b0c61 - kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb + kmodules.xyz/client-go v0.0.0-20211122091731-6c471b24a4ea // indirect + kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52 + kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41 + kubedb.dev/apimachinery v0.23.0 stash.appscode.dev/apimachinery v0.16.0 ) diff --git a/go.sum b/go.sum index 607277a7f..1cc9d4b0c 100644 --- a/go.sum +++ b/go.sum @@ -112,7 +112,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= -github.com/cloudevents/sdk-go/v2 v2.4.1/go.mod h1:MZiMwmAh5tGj+fPFvtHv9hKurKqXtdB9haJYMJ/7GJY= +github.com/cloudevents/sdk-go/v2 v2.5.0/go.mod h1:nlXhgFkf0uTopxmRXalyMwS2LG70cRGPrxzmjJgSG0U= github.com/cloudflare/cloudflare-go v0.13.2/go.mod h1:27kfc1apuifUmJhp069y0+hwlKDg4bd8LWlu7oKeZvM= github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= @@ -255,7 +255,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -382,7 +381,6 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef h1:jLpa0vamfyIGeIJ/CfUJEWoKriw4ODeOgF1XxDvgMZ4= github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef/go.mod h1:PlwhC7q1VSK73InDzdDatVetQrTsQHIbOvcJAZzitY0= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -503,7 +501,7 @@ github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5Vgl github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nats.go v1.11.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= +github.com/nats-io/nats.go v1.13.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= @@ -712,12 +710,12 @@ github.com/yuin/goldmark v1.3.3/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= -go.bytebuilders.dev/audit v0.0.7/go.mod h1:pLOah94jc2oS62e8woosk7EAOHLyS0qkI4bGth18qyA= -go.bytebuilders.dev/license-verifier v0.9.2/go.mod h1:0sBh2Y3jcTLQYeV9ySbBgN5Ibatp6aNtvH/gI1ZFXCk= -go.bytebuilders.dev/license-verifier v0.9.3 h1:foHyjil3Y2OesjUInQZeRl5kntWWCPkqqQOz1wSAmLo= +go.bytebuilders.dev/audit v0.0.10/go.mod h1:jhNyXHoeVHijC4tM7EYpcB9RqkwnI27IoRN3k0ivick= go.bytebuilders.dev/license-verifier v0.9.3/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8= -go.bytebuilders.dev/license-verifier/kubernetes v0.9.3 h1:rrgo72xtiEEyE0exFSQ8HMpQpxt+hpJW2a9QWOkk4n4= -go.bytebuilders.dev/license-verifier/kubernetes v0.9.3/go.mod h1:PjBQMcD/iYzJYKkWlTl0DnMPeAzjow/jH9Rg8L8Cmc8= +go.bytebuilders.dev/license-verifier v0.9.5 h1:XUbFH3LzHSpQFtVS/MiT5RN0gr/KNNBvnOm78KYoAEQ= +go.bytebuilders.dev/license-verifier v0.9.5/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8= +go.bytebuilders.dev/license-verifier/kubernetes v0.9.5 h1:KWzmh4qZ+3cR8LpBuUfufb2goK5NuULyE0uKYgt3D50= +go.bytebuilders.dev/license-verifier/kubernetes v0.9.5/go.mod h1:mg5pZDweHlpTTw57kOdLj4bU107hHVP/1xTKKZ1eUNc= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= @@ -984,22 +982,21 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f h1:hTyhR4r+tj1Uq7/PpFxLTzbeA0LhMVp7bEYfhkzFjdY= gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f/go.mod h1:K3m7N+nBOlf91/tpv8REUGwsAgaKFwElQCuiLhm12AQ= gomodules.xyz/encoding v0.0.2/go.mod h1:ZD+5Llh/9P/xTqoiurjs2w3XfAV2jNtsh04FbucIpLw= -gomodules.xyz/flags v0.1.0/go.mod h1:H9lmar5MMXuxHBrSgrGZt4q2gkD+8GCm/3Fs2FCE2zA= -gomodules.xyz/flags v0.1.2 h1:z/XHHGmduLYY/aSkzcQWJgXWIs3TCTSTLkmwtCjoizg= gomodules.xyz/flags v0.1.2/go.mod h1:CIzWYc2zYDs5lQyGJsjhqKgIj+LriNLpiYuX8Pk34gc= +gomodules.xyz/flags v0.1.3 h1:jQ06+EfmoMv5NvjXvJon03dOhLU+FF0TQMWN7I6qpzs= +gomodules.xyz/flags v0.1.3/go.mod h1:e+kvBLnqdEWGG670SKOYag1CXStM2Slrxq01OIK3tFs= gomodules.xyz/go-sh v0.1.0 h1:1BJAuGREh2RhePt7HRrpmjnkbgfpXlCzc42SiyZ5dkc= gomodules.xyz/go-sh v0.1.0/go.mod h1:N8IrjNiYppUI/rxENYrWD6FOrSxSyEZnIekPEWM7LP0= gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4= -gomodules.xyz/homedir v0.1.0 h1:qnY/+0XQbMk/UcpImZCJYeSI1rNa2BFtcJ/xqxzCpow= gomodules.xyz/homedir v0.1.0/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4= gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= gomodules.xyz/jsonpath v0.0.1/go.mod h1:du28vmLHrgEV48JqK/7rn92YHsVDoQuqrowb2w6YZmE= -gomodules.xyz/kglog v0.0.4/go.mod h1:yjAPb3e0axQl6itwq8EgCYIGOcnMe4FfHPihUM7fRsc= -gomodules.xyz/logs v0.0.4 h1:r/NdZwGa5znX2VhtvzFr9FhqhRO19Hei4dSlSrrn71o= gomodules.xyz/logs v0.0.4/go.mod h1:GRwztZB2qW4vSV/9KZR2DKFhAwyn1w/S7s4bfnV1jqo= +gomodules.xyz/logs v0.0.6 h1:8+9Wkud5yBPtIvkVszubyTeFxNII30lWODom0+GZD8U= +gomodules.xyz/logs v0.0.6/go.mod h1:Q+fFtZFLEB5q86KmDehXCGuMP72Rv+Rwz0KuVxK+Gi4= gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d h1:i6r7bk2jF965W3xmORgz+KYhlH608oRvrAPpcNHorlo= gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d/go.mod h1:i2WNHvGpzLKI+/qWRhscddeashtzrtxCAucS2H7hrtM= gomodules.xyz/password-generator v0.2.6/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg= @@ -1010,14 +1007,14 @@ gomodules.xyz/pointer v0.1.0 h1:sG2UKrYVSo6E3r4itAjXfPfe4fuXMi0KdyTHpR3vGCg= gomodules.xyz/pointer v0.1.0/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo= gomodules.xyz/runtime v0.2.0/go.mod h1:/R/Dw906YIUHKJ5cfKUaJgJrojFjpRU+n0s3Wjn1tqs= gomodules.xyz/sets v0.0.0-20200930152147-4f4543544799/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= -gomodules.xyz/sets v0.0.0-20210218105342-2efe2fb519a2/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= gomodules.xyz/sets v0.1.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= gomodules.xyz/sets v0.2.0 h1:T8YPBWDaPGh/+HBjfL2JYdWeNqxNMoMofEdlvhLKE9w= gomodules.xyz/sets v0.2.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= gomodules.xyz/stow v0.2.4/go.mod h1:aAgUEHyZ+4nKznyVupMMkP0JX9MXW1ZRrbRGaclp3E0= gomodules.xyz/sync v0.1.0/go.mod h1:kv570yCdknyiZ8Y94uaRFGBC5E47TV/5A7PD9jlnJoQ= -gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 h1:iiD24jN1H8PzliVe1igIzYsx8+VmbXG12y9UUSupUJU= gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545/go.mod h1:g/epKzZQuCqgvhzhaoG4cSBNGHqnOrhFR4Q7szDJ1JM= +gomodules.xyz/wait v0.2.0 h1:HnRIh+cvIrrKIFaXoYznCVVirv2/2xu3KzjSzsQmYAY= +gomodules.xyz/wait v0.2.0/go.mod h1:g/epKzZQuCqgvhzhaoG4cSBNGHqnOrhFR4Q7szDJ1JM= gomodules.xyz/x v0.0.5/go.mod h1:EGy7cB7ifSuOcbNFc0U1zUPTf5yY8RtXVJlAlhGS9OE= gomodules.xyz/x v0.0.7/go.mod h1:CMXe28rpApV30pPw9cxdyEmvoC+aa5LiAqzks9dlxag= gomodules.xyz/x v0.0.8 h1:piAVBINs42F6RPf5WbiulSNYWU0JFwueKoBfR98J9Ro= @@ -1144,31 +1141,34 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b/go.mod h1:A6GAK6xP5zBuWK6A/vUkkjKzcuywkms7fIxRf5wblO4= -kmodules.xyz/client-go v0.0.0-20210822203828-5e9cebbf1dfa/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= +kmodules.xyz/client-go v0.0.0-20210719120358-dd0503cf99cf/go.mod h1:E/vGngai00UtVwP8R4PWpPUBF/EZa6Ub9WS5+tVcs4M= +kmodules.xyz/client-go v0.0.0-20210831030638-b1d662179991/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= -kmodules.xyz/client-go v0.0.0-20211028132207-0cf6ea46b030 h1:jzGC4s2WKkpZMELKUpaEUY/5d7i3rYau9kp1hxZlYb0= -kmodules.xyz/client-go v0.0.0-20211028132207-0cf6ea46b030/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I= +kmodules.xyz/client-go v0.0.0-20211013093146-1fbfd52e78c9/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= +kmodules.xyz/client-go v0.0.0-20211107190155-5bb4090d2728/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I= +kmodules.xyz/client-go v0.0.0-20211110065417-091bd089a92d/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I= +kmodules.xyz/client-go v0.0.0-20211122091731-6c471b24a4ea h1:z5Li57oxum0018ryWpI5w5HYVFgI2S2cVj27R76IRnU= +kmodules.xyz/client-go v0.0.0-20211122091731-6c471b24a4ea/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I= kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA= -kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153/go.mod h1:/NLuNSf299U0XVuNEh2swtw3EczWFRL3Sx24WhNoWCM= -kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e h1:0IEUFAJPgwPx3+Zb1BMcHLywKhJtXMk6YCHNsjWJwYQ= kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e/go.mod h1:pGabego8q4oi/2sNjhdtFkgVaVw4AyGv14GO6VtAjTw= -kmodules.xyz/monitoring-agent-api v0.0.0-20210618005119-a8c212adc2bf/go.mod h1:QsbPe5SefM7XmLzJgdMX/1iXxwqAC1Do1eHa98TCq3k= -kmodules.xyz/monitoring-agent-api v0.0.0-20210618110729-9cd872c66513/go.mod h1:QsbPe5SefM7XmLzJgdMX/1iXxwqAC1Do1eHa98TCq3k= -kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9/go.mod h1:8sCfgZQImwjTLh2mDxYiim6+GecFN+DamkPSF9joyu4= +kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52 h1:UWVpU7y5znTUusU+JhPB+ojh26f6K2v8sNb37U1DolQ= +kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52/go.mod h1:yHLFe4wVYxepTnN00CFUf29xH+jEHDokq6d2fbp9pks= +kmodules.xyz/monitoring-agent-api v0.0.0-20210928135619-38ca075a2dbd/go.mod h1:08pBqfEuy29EjhaMrHB2XFy2iekoFi7AjaXcJS+xAck= kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e h1:2QZBUcUI6r7mLU5/9+Xxd1eDClEIEkZkJlyCU91UoY8= kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e/go.mod h1:Tkcf9uTplnrJ6C8o0zlw2kpgS1SaWAiMO5P2YgLjTo8= -kmodules.xyz/offshoot-api v0.0.0-20210618005544-5217a24765da/go.mod h1:3LECbAL3FgbyK80NP3V3Pmiuo/a3hFWg/PR6SPFhTns= -kmodules.xyz/offshoot-api v0.0.0-20210829122105-6f4d481b0c61 h1:J56UGmRFddu6tERRd8BELmP5QbXxievzb+6vAjFptiM= kmodules.xyz/offshoot-api v0.0.0-20210829122105-6f4d481b0c61/go.mod h1:3LECbAL3FgbyK80NP3V3Pmiuo/a3hFWg/PR6SPFhTns= +kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41 h1:GCDyb1fbgCHUNuFk9MecSFvzMq/WCeGk8pDEtqivziA= +kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41/go.mod h1:sJYyxf84ZvbVz4SivxMgSelGRYn19wOLUtObiEncCxk= kmodules.xyz/openshift v0.0.0-20210618001443-f2507caa512f/go.mod h1:8E5ckbd1KMNmR4hc7ScvmQnGfx1ULUUp+UTmoDdxRkc= kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027 h1:rtSPsruEkoBOLcbJkxMQjnPafpv8/vJnfWlTIj9yRBg= kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027/go.mod h1:H4NcvS1RQxeXtQONALbU6r9OT3Xa7cMhfamX/k9t9wo= -kmodules.xyz/resource-metadata v0.5.7/go.mod h1:Jdi7zBXRwwFTOR0CxwKxqJhsDVIilhrgNipPjnKLyrs= +kmodules.xyz/resource-metadata v0.6.4/go.mod h1:KWf68Ado/hgYpb/msYNvhYSLWvS/bJcVAAHO1/q9nNg= +kmodules.xyz/resource-metrics v0.0.3/go.mod h1:6Dv63HDgp83DhA+lZNB7GIQR6PLjNrYW6ghQKioQzII= kmodules.xyz/resource-metrics v0.0.5/go.mod h1:6Dv63HDgp83DhA+lZNB7GIQR6PLjNrYW6ghQKioQzII= -kmodules.xyz/webhook-runtime v0.0.0-20210618013329-0accb929102b/go.mod h1:MFZFmJk9IXNHwq8JlF/mukwBDbopFQj4swaB2MWHc/U= -kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb h1:ldJ/5yMdsAvMAO7qWGK/NIViBLVndmmE6jQpPa6pvwE= -kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb/go.mod h1:pE5rairEKDwM8iOevHCidDIouEE4Im6Ei6Zf5s/a17E= +kmodules.xyz/webhook-runtime v0.0.0-20210928141616-7f73c2ab318a/go.mod h1:MFZFmJk9IXNHwq8JlF/mukwBDbopFQj4swaB2MWHc/U= +kubedb.dev/apimachinery v0.23.0 h1:K0dKXx7XJINv3Py75D/up6V3zl8XfX/e/rvspNejXNA= +kubedb.dev/apimachinery v0.23.0/go.mod h1:x8UBaJPIBCD6S58VQ+38+QxFUXCYdvFrmP9FnOuPOaI= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= @@ -1202,6 +1202,5 @@ sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ= software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04/go.mod h1:/Ys7EVp/ved+2xkfhqMbRpaJtI3p/KpCPRLJ6ZgDddA= stash.appscode.dev/apimachinery v0.16.0 h1:6mvmPatv9nR5Wc+PCt3Cg9R7WRJRqhy2yLu2b/HmXhA= stash.appscode.dev/apimachinery v0.16.0/go.mod h1:unpV/YyHVECNrAdFjFg/SetmPeUjfvc2+P8cnGjih/U= diff --git a/pkg/root.go b/pkg/root.go index 3eec5a673..755357730 100644 --- a/pkg/root.go +++ b/pkg/root.go @@ -22,7 +22,6 @@ import ( "github.com/spf13/cobra" v "gomodules.xyz/x/version" clientsetscheme "k8s.io/client-go/kubernetes/scheme" - "kmodules.xyz/client-go/tools/cli" ) var SupportedProducts = []string{"stash-enterprise", "kubedb-ext-stash"} @@ -36,13 +35,10 @@ func NewRootCmd() *cobra.Command { Long: `MongoDB backup & restore plugin for Stash by AppsCode. For more information, visit here: https://appscode.com/products/stash`, DisableAutoGenTag: true, PersistentPreRunE: func(c *cobra.Command, args []string) error { - cli.SendAnalytics(c, v.Version.Version) - return scheme.AddToScheme(clientsetscheme.Scheme) }, } rootCmd.PersistentFlags().StringVar(&licenseApiService, "license-apiservice", "", "Name of ApiService used to expose License endpoint") - rootCmd.PersistentFlags().BoolVar(&cli.EnableAnalytics, "enable-analytics", cli.EnableAnalytics, "Send analytical events to Google Analytics") rootCmd.AddCommand(v.NewCmdVersion()) rootCmd.AddCommand(NewCmdBackup()) diff --git a/vendor/github.com/google/uuid/.travis.yml b/vendor/github.com/google/uuid/.travis.yml deleted file mode 100644 index d8156a60b..000000000 --- a/vendor/github.com/google/uuid/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: go - -go: - - 1.4.3 - - 1.5.3 - - tip - -script: - - go test -v ./... diff --git a/vendor/github.com/google/uuid/CONTRIBUTING.md b/vendor/github.com/google/uuid/CONTRIBUTING.md deleted file mode 100644 index 04fdf09f1..000000000 --- a/vendor/github.com/google/uuid/CONTRIBUTING.md +++ /dev/null @@ -1,10 +0,0 @@ -# How to contribute - -We definitely welcome patches and contribution to this project! - -### Legal requirements - -In order to protect both you and ourselves, you will need to sign the -[Contributor License Agreement](https://cla.developers.google.com/clas). - -You may have already signed it for other Google projects. diff --git a/vendor/github.com/google/uuid/CONTRIBUTORS b/vendor/github.com/google/uuid/CONTRIBUTORS deleted file mode 100644 index b4bb97f6b..000000000 --- a/vendor/github.com/google/uuid/CONTRIBUTORS +++ /dev/null @@ -1,9 +0,0 @@ -Paul Borman -bmatsuo -shawnps -theory -jboverfelt -dsymonds -cd1 -wallclockbuilder -dansouza diff --git a/vendor/github.com/google/uuid/LICENSE b/vendor/github.com/google/uuid/LICENSE deleted file mode 100644 index 5dc68268d..000000000 --- a/vendor/github.com/google/uuid/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2009,2014 Google Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/google/uuid/README.md b/vendor/github.com/google/uuid/README.md deleted file mode 100644 index f765a46f9..000000000 --- a/vendor/github.com/google/uuid/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# uuid ![build status](https://travis-ci.org/google/uuid.svg?branch=master) -The uuid package generates and inspects UUIDs based on -[RFC 4122](http://tools.ietf.org/html/rfc4122) -and DCE 1.1: Authentication and Security Services. - -This package is based on the github.com/pborman/uuid package (previously named -code.google.com/p/go-uuid). It differs from these earlier packages in that -a UUID is a 16 byte array rather than a byte slice. One loss due to this -change is the ability to represent an invalid UUID (vs a NIL UUID). - -###### Install -`go get github.com/google/uuid` - -###### Documentation -[![GoDoc](https://godoc.org/github.com/google/uuid?status.svg)](http://godoc.org/github.com/google/uuid) - -Full `go doc` style documentation for the package can be viewed online without -installing this package by using the GoDoc site here: -http://pkg.go.dev/github.com/google/uuid diff --git a/vendor/github.com/google/uuid/dce.go b/vendor/github.com/google/uuid/dce.go deleted file mode 100644 index fa820b9d3..000000000 --- a/vendor/github.com/google/uuid/dce.go +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "encoding/binary" - "fmt" - "os" -) - -// A Domain represents a Version 2 domain -type Domain byte - -// Domain constants for DCE Security (Version 2) UUIDs. -const ( - Person = Domain(0) - Group = Domain(1) - Org = Domain(2) -) - -// NewDCESecurity returns a DCE Security (Version 2) UUID. -// -// The domain should be one of Person, Group or Org. -// On a POSIX system the id should be the users UID for the Person -// domain and the users GID for the Group. The meaning of id for -// the domain Org or on non-POSIX systems is site defined. -// -// For a given domain/id pair the same token may be returned for up to -// 7 minutes and 10 seconds. -func NewDCESecurity(domain Domain, id uint32) (UUID, error) { - uuid, err := NewUUID() - if err == nil { - uuid[6] = (uuid[6] & 0x0f) | 0x20 // Version 2 - uuid[9] = byte(domain) - binary.BigEndian.PutUint32(uuid[0:], id) - } - return uuid, err -} - -// NewDCEPerson returns a DCE Security (Version 2) UUID in the person -// domain with the id returned by os.Getuid. -// -// NewDCESecurity(Person, uint32(os.Getuid())) -func NewDCEPerson() (UUID, error) { - return NewDCESecurity(Person, uint32(os.Getuid())) -} - -// NewDCEGroup returns a DCE Security (Version 2) UUID in the group -// domain with the id returned by os.Getgid. -// -// NewDCESecurity(Group, uint32(os.Getgid())) -func NewDCEGroup() (UUID, error) { - return NewDCESecurity(Group, uint32(os.Getgid())) -} - -// Domain returns the domain for a Version 2 UUID. Domains are only defined -// for Version 2 UUIDs. -func (uuid UUID) Domain() Domain { - return Domain(uuid[9]) -} - -// ID returns the id for a Version 2 UUID. IDs are only defined for Version 2 -// UUIDs. -func (uuid UUID) ID() uint32 { - return binary.BigEndian.Uint32(uuid[0:4]) -} - -func (d Domain) String() string { - switch d { - case Person: - return "Person" - case Group: - return "Group" - case Org: - return "Org" - } - return fmt.Sprintf("Domain%d", int(d)) -} diff --git a/vendor/github.com/google/uuid/doc.go b/vendor/github.com/google/uuid/doc.go deleted file mode 100644 index 5b8a4b9af..000000000 --- a/vendor/github.com/google/uuid/doc.go +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package uuid generates and inspects UUIDs. -// -// UUIDs are based on RFC 4122 and DCE 1.1: Authentication and Security -// Services. -// -// A UUID is a 16 byte (128 bit) array. UUIDs may be used as keys to -// maps or compared directly. -package uuid diff --git a/vendor/github.com/google/uuid/go.mod b/vendor/github.com/google/uuid/go.mod deleted file mode 100644 index fc84cd79d..000000000 --- a/vendor/github.com/google/uuid/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/google/uuid diff --git a/vendor/github.com/google/uuid/hash.go b/vendor/github.com/google/uuid/hash.go deleted file mode 100644 index b17461631..000000000 --- a/vendor/github.com/google/uuid/hash.go +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "crypto/md5" - "crypto/sha1" - "hash" -) - -// Well known namespace IDs and UUIDs -var ( - NameSpaceDNS = Must(Parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")) - NameSpaceURL = Must(Parse("6ba7b811-9dad-11d1-80b4-00c04fd430c8")) - NameSpaceOID = Must(Parse("6ba7b812-9dad-11d1-80b4-00c04fd430c8")) - NameSpaceX500 = Must(Parse("6ba7b814-9dad-11d1-80b4-00c04fd430c8")) - Nil UUID // empty UUID, all zeros -) - -// NewHash returns a new UUID derived from the hash of space concatenated with -// data generated by h. The hash should be at least 16 byte in length. The -// first 16 bytes of the hash are used to form the UUID. The version of the -// UUID will be the lower 4 bits of version. NewHash is used to implement -// NewMD5 and NewSHA1. -func NewHash(h hash.Hash, space UUID, data []byte, version int) UUID { - h.Reset() - h.Write(space[:]) - h.Write(data) - s := h.Sum(nil) - var uuid UUID - copy(uuid[:], s) - uuid[6] = (uuid[6] & 0x0f) | uint8((version&0xf)<<4) - uuid[8] = (uuid[8] & 0x3f) | 0x80 // RFC 4122 variant - return uuid -} - -// NewMD5 returns a new MD5 (Version 3) UUID based on the -// supplied name space and data. It is the same as calling: -// -// NewHash(md5.New(), space, data, 3) -func NewMD5(space UUID, data []byte) UUID { - return NewHash(md5.New(), space, data, 3) -} - -// NewSHA1 returns a new SHA1 (Version 5) UUID based on the -// supplied name space and data. It is the same as calling: -// -// NewHash(sha1.New(), space, data, 5) -func NewSHA1(space UUID, data []byte) UUID { - return NewHash(sha1.New(), space, data, 5) -} diff --git a/vendor/github.com/google/uuid/marshal.go b/vendor/github.com/google/uuid/marshal.go deleted file mode 100644 index 14bd34072..000000000 --- a/vendor/github.com/google/uuid/marshal.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import "fmt" - -// MarshalText implements encoding.TextMarshaler. -func (uuid UUID) MarshalText() ([]byte, error) { - var js [36]byte - encodeHex(js[:], uuid) - return js[:], nil -} - -// UnmarshalText implements encoding.TextUnmarshaler. -func (uuid *UUID) UnmarshalText(data []byte) error { - id, err := ParseBytes(data) - if err != nil { - return err - } - *uuid = id - return nil -} - -// MarshalBinary implements encoding.BinaryMarshaler. -func (uuid UUID) MarshalBinary() ([]byte, error) { - return uuid[:], nil -} - -// UnmarshalBinary implements encoding.BinaryUnmarshaler. -func (uuid *UUID) UnmarshalBinary(data []byte) error { - if len(data) != 16 { - return fmt.Errorf("invalid UUID (got %d bytes)", len(data)) - } - copy(uuid[:], data) - return nil -} diff --git a/vendor/github.com/google/uuid/node.go b/vendor/github.com/google/uuid/node.go deleted file mode 100644 index d651a2b06..000000000 --- a/vendor/github.com/google/uuid/node.go +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "sync" -) - -var ( - nodeMu sync.Mutex - ifname string // name of interface being used - nodeID [6]byte // hardware for version 1 UUIDs - zeroID [6]byte // nodeID with only 0's -) - -// NodeInterface returns the name of the interface from which the NodeID was -// derived. The interface "user" is returned if the NodeID was set by -// SetNodeID. -func NodeInterface() string { - defer nodeMu.Unlock() - nodeMu.Lock() - return ifname -} - -// SetNodeInterface selects the hardware address to be used for Version 1 UUIDs. -// If name is "" then the first usable interface found will be used or a random -// Node ID will be generated. If a named interface cannot be found then false -// is returned. -// -// SetNodeInterface never fails when name is "". -func SetNodeInterface(name string) bool { - defer nodeMu.Unlock() - nodeMu.Lock() - return setNodeInterface(name) -} - -func setNodeInterface(name string) bool { - iname, addr := getHardwareInterface(name) // null implementation for js - if iname != "" && addr != nil { - ifname = iname - copy(nodeID[:], addr) - return true - } - - // We found no interfaces with a valid hardware address. If name - // does not specify a specific interface generate a random Node ID - // (section 4.1.6) - if name == "" { - ifname = "random" - randomBits(nodeID[:]) - return true - } - return false -} - -// NodeID returns a slice of a copy of the current Node ID, setting the Node ID -// if not already set. -func NodeID() []byte { - defer nodeMu.Unlock() - nodeMu.Lock() - if nodeID == zeroID { - setNodeInterface("") - } - nid := nodeID - return nid[:] -} - -// SetNodeID sets the Node ID to be used for Version 1 UUIDs. The first 6 bytes -// of id are used. If id is less than 6 bytes then false is returned and the -// Node ID is not set. -func SetNodeID(id []byte) bool { - if len(id) < 6 { - return false - } - defer nodeMu.Unlock() - nodeMu.Lock() - copy(nodeID[:], id) - ifname = "user" - return true -} - -// NodeID returns the 6 byte node id encoded in uuid. It returns nil if uuid is -// not valid. The NodeID is only well defined for version 1 and 2 UUIDs. -func (uuid UUID) NodeID() []byte { - var node [6]byte - copy(node[:], uuid[10:]) - return node[:] -} diff --git a/vendor/github.com/google/uuid/node_js.go b/vendor/github.com/google/uuid/node_js.go deleted file mode 100644 index 24b78edc9..000000000 --- a/vendor/github.com/google/uuid/node_js.go +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2017 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build js - -package uuid - -// getHardwareInterface returns nil values for the JS version of the code. -// This remvoves the "net" dependency, because it is not used in the browser. -// Using the "net" library inflates the size of the transpiled JS code by 673k bytes. -func getHardwareInterface(name string) (string, []byte) { return "", nil } diff --git a/vendor/github.com/google/uuid/node_net.go b/vendor/github.com/google/uuid/node_net.go deleted file mode 100644 index 0cbbcddbd..000000000 --- a/vendor/github.com/google/uuid/node_net.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build !js - -package uuid - -import "net" - -var interfaces []net.Interface // cached list of interfaces - -// getHardwareInterface returns the name and hardware address of interface name. -// If name is "" then the name and hardware address of one of the system's -// interfaces is returned. If no interfaces are found (name does not exist or -// there are no interfaces) then "", nil is returned. -// -// Only addresses of at least 6 bytes are returned. -func getHardwareInterface(name string) (string, []byte) { - if interfaces == nil { - var err error - interfaces, err = net.Interfaces() - if err != nil { - return "", nil - } - } - for _, ifs := range interfaces { - if len(ifs.HardwareAddr) >= 6 && (name == "" || name == ifs.Name) { - return ifs.Name, ifs.HardwareAddr - } - } - return "", nil -} diff --git a/vendor/github.com/google/uuid/sql.go b/vendor/github.com/google/uuid/sql.go deleted file mode 100644 index f326b54db..000000000 --- a/vendor/github.com/google/uuid/sql.go +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "database/sql/driver" - "fmt" -) - -// Scan implements sql.Scanner so UUIDs can be read from databases transparently -// Currently, database types that map to string and []byte are supported. Please -// consult database-specific driver documentation for matching types. -func (uuid *UUID) Scan(src interface{}) error { - switch src := src.(type) { - case nil: - return nil - - case string: - // if an empty UUID comes from a table, we return a null UUID - if src == "" { - return nil - } - - // see Parse for required string format - u, err := Parse(src) - if err != nil { - return fmt.Errorf("Scan: %v", err) - } - - *uuid = u - - case []byte: - // if an empty UUID comes from a table, we return a null UUID - if len(src) == 0 { - return nil - } - - // assumes a simple slice of bytes if 16 bytes - // otherwise attempts to parse - if len(src) != 16 { - return uuid.Scan(string(src)) - } - copy((*uuid)[:], src) - - default: - return fmt.Errorf("Scan: unable to scan type %T into UUID", src) - } - - return nil -} - -// Value implements sql.Valuer so that UUIDs can be written to databases -// transparently. Currently, UUIDs map to strings. Please consult -// database-specific driver documentation for matching types. -func (uuid UUID) Value() (driver.Value, error) { - return uuid.String(), nil -} diff --git a/vendor/github.com/google/uuid/time.go b/vendor/github.com/google/uuid/time.go deleted file mode 100644 index e6ef06cdc..000000000 --- a/vendor/github.com/google/uuid/time.go +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "encoding/binary" - "sync" - "time" -) - -// A Time represents a time as the number of 100's of nanoseconds since 15 Oct -// 1582. -type Time int64 - -const ( - lillian = 2299160 // Julian day of 15 Oct 1582 - unix = 2440587 // Julian day of 1 Jan 1970 - epoch = unix - lillian // Days between epochs - g1582 = epoch * 86400 // seconds between epochs - g1582ns100 = g1582 * 10000000 // 100s of a nanoseconds between epochs -) - -var ( - timeMu sync.Mutex - lasttime uint64 // last time we returned - clockSeq uint16 // clock sequence for this run - - timeNow = time.Now // for testing -) - -// UnixTime converts t the number of seconds and nanoseconds using the Unix -// epoch of 1 Jan 1970. -func (t Time) UnixTime() (sec, nsec int64) { - sec = int64(t - g1582ns100) - nsec = (sec % 10000000) * 100 - sec /= 10000000 - return sec, nsec -} - -// GetTime returns the current Time (100s of nanoseconds since 15 Oct 1582) and -// clock sequence as well as adjusting the clock sequence as needed. An error -// is returned if the current time cannot be determined. -func GetTime() (Time, uint16, error) { - defer timeMu.Unlock() - timeMu.Lock() - return getTime() -} - -func getTime() (Time, uint16, error) { - t := timeNow() - - // If we don't have a clock sequence already, set one. - if clockSeq == 0 { - setClockSequence(-1) - } - now := uint64(t.UnixNano()/100) + g1582ns100 - - // If time has gone backwards with this clock sequence then we - // increment the clock sequence - if now <= lasttime { - clockSeq = ((clockSeq + 1) & 0x3fff) | 0x8000 - } - lasttime = now - return Time(now), clockSeq, nil -} - -// ClockSequence returns the current clock sequence, generating one if not -// already set. The clock sequence is only used for Version 1 UUIDs. -// -// The uuid package does not use global static storage for the clock sequence or -// the last time a UUID was generated. Unless SetClockSequence is used, a new -// random clock sequence is generated the first time a clock sequence is -// requested by ClockSequence, GetTime, or NewUUID. (section 4.2.1.1) -func ClockSequence() int { - defer timeMu.Unlock() - timeMu.Lock() - return clockSequence() -} - -func clockSequence() int { - if clockSeq == 0 { - setClockSequence(-1) - } - return int(clockSeq & 0x3fff) -} - -// SetClockSequence sets the clock sequence to the lower 14 bits of seq. Setting to -// -1 causes a new sequence to be generated. -func SetClockSequence(seq int) { - defer timeMu.Unlock() - timeMu.Lock() - setClockSequence(seq) -} - -func setClockSequence(seq int) { - if seq == -1 { - var b [2]byte - randomBits(b[:]) // clock sequence - seq = int(b[0])<<8 | int(b[1]) - } - oldSeq := clockSeq - clockSeq = uint16(seq&0x3fff) | 0x8000 // Set our variant - if oldSeq != clockSeq { - lasttime = 0 - } -} - -// Time returns the time in 100s of nanoseconds since 15 Oct 1582 encoded in -// uuid. The time is only defined for version 1 and 2 UUIDs. -func (uuid UUID) Time() Time { - time := int64(binary.BigEndian.Uint32(uuid[0:4])) - time |= int64(binary.BigEndian.Uint16(uuid[4:6])) << 32 - time |= int64(binary.BigEndian.Uint16(uuid[6:8])&0xfff) << 48 - return Time(time) -} - -// ClockSequence returns the clock sequence encoded in uuid. -// The clock sequence is only well defined for version 1 and 2 UUIDs. -func (uuid UUID) ClockSequence() int { - return int(binary.BigEndian.Uint16(uuid[8:10])) & 0x3fff -} diff --git a/vendor/github.com/google/uuid/util.go b/vendor/github.com/google/uuid/util.go deleted file mode 100644 index 5ea6c7378..000000000 --- a/vendor/github.com/google/uuid/util.go +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "io" -) - -// randomBits completely fills slice b with random data. -func randomBits(b []byte) { - if _, err := io.ReadFull(rander, b); err != nil { - panic(err.Error()) // rand should never fail - } -} - -// xvalues returns the value of a byte as a hexadecimal digit or 255. -var xvalues = [256]byte{ - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 255, 255, 255, 255, 255, 255, - 255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 10, 11, 12, 13, 14, 15, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, -} - -// xtob converts hex characters x1 and x2 into a byte. -func xtob(x1, x2 byte) (byte, bool) { - b1 := xvalues[x1] - b2 := xvalues[x2] - return (b1 << 4) | b2, b1 != 255 && b2 != 255 -} diff --git a/vendor/github.com/google/uuid/uuid.go b/vendor/github.com/google/uuid/uuid.go deleted file mode 100644 index 524404cc5..000000000 --- a/vendor/github.com/google/uuid/uuid.go +++ /dev/null @@ -1,245 +0,0 @@ -// Copyright 2018 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "bytes" - "crypto/rand" - "encoding/hex" - "errors" - "fmt" - "io" - "strings" -) - -// A UUID is a 128 bit (16 byte) Universal Unique IDentifier as defined in RFC -// 4122. -type UUID [16]byte - -// A Version represents a UUID's version. -type Version byte - -// A Variant represents a UUID's variant. -type Variant byte - -// Constants returned by Variant. -const ( - Invalid = Variant(iota) // Invalid UUID - RFC4122 // The variant specified in RFC4122 - Reserved // Reserved, NCS backward compatibility. - Microsoft // Reserved, Microsoft Corporation backward compatibility. - Future // Reserved for future definition. -) - -var rander = rand.Reader // random function - -// Parse decodes s into a UUID or returns an error. Both the standard UUID -// forms of xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx and -// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx are decoded as well as the -// Microsoft encoding {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx} and the raw hex -// encoding: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx. -func Parse(s string) (UUID, error) { - var uuid UUID - switch len(s) { - // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - case 36: - - // urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - case 36 + 9: - if strings.ToLower(s[:9]) != "urn:uuid:" { - return uuid, fmt.Errorf("invalid urn prefix: %q", s[:9]) - } - s = s[9:] - - // {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx} - case 36 + 2: - s = s[1:] - - // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - case 32: - var ok bool - for i := range uuid { - uuid[i], ok = xtob(s[i*2], s[i*2+1]) - if !ok { - return uuid, errors.New("invalid UUID format") - } - } - return uuid, nil - default: - return uuid, fmt.Errorf("invalid UUID length: %d", len(s)) - } - // s is now at least 36 bytes long - // it must be of the form xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' { - return uuid, errors.New("invalid UUID format") - } - for i, x := range [16]int{ - 0, 2, 4, 6, - 9, 11, - 14, 16, - 19, 21, - 24, 26, 28, 30, 32, 34} { - v, ok := xtob(s[x], s[x+1]) - if !ok { - return uuid, errors.New("invalid UUID format") - } - uuid[i] = v - } - return uuid, nil -} - -// ParseBytes is like Parse, except it parses a byte slice instead of a string. -func ParseBytes(b []byte) (UUID, error) { - var uuid UUID - switch len(b) { - case 36: // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - case 36 + 9: // urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - if !bytes.Equal(bytes.ToLower(b[:9]), []byte("urn:uuid:")) { - return uuid, fmt.Errorf("invalid urn prefix: %q", b[:9]) - } - b = b[9:] - case 36 + 2: // {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx} - b = b[1:] - case 32: // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - var ok bool - for i := 0; i < 32; i += 2 { - uuid[i/2], ok = xtob(b[i], b[i+1]) - if !ok { - return uuid, errors.New("invalid UUID format") - } - } - return uuid, nil - default: - return uuid, fmt.Errorf("invalid UUID length: %d", len(b)) - } - // s is now at least 36 bytes long - // it must be of the form xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - if b[8] != '-' || b[13] != '-' || b[18] != '-' || b[23] != '-' { - return uuid, errors.New("invalid UUID format") - } - for i, x := range [16]int{ - 0, 2, 4, 6, - 9, 11, - 14, 16, - 19, 21, - 24, 26, 28, 30, 32, 34} { - v, ok := xtob(b[x], b[x+1]) - if !ok { - return uuid, errors.New("invalid UUID format") - } - uuid[i] = v - } - return uuid, nil -} - -// MustParse is like Parse but panics if the string cannot be parsed. -// It simplifies safe initialization of global variables holding compiled UUIDs. -func MustParse(s string) UUID { - uuid, err := Parse(s) - if err != nil { - panic(`uuid: Parse(` + s + `): ` + err.Error()) - } - return uuid -} - -// FromBytes creates a new UUID from a byte slice. Returns an error if the slice -// does not have a length of 16. The bytes are copied from the slice. -func FromBytes(b []byte) (uuid UUID, err error) { - err = uuid.UnmarshalBinary(b) - return uuid, err -} - -// Must returns uuid if err is nil and panics otherwise. -func Must(uuid UUID, err error) UUID { - if err != nil { - panic(err) - } - return uuid -} - -// String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx -// , or "" if uuid is invalid. -func (uuid UUID) String() string { - var buf [36]byte - encodeHex(buf[:], uuid) - return string(buf[:]) -} - -// URN returns the RFC 2141 URN form of uuid, -// urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx, or "" if uuid is invalid. -func (uuid UUID) URN() string { - var buf [36 + 9]byte - copy(buf[:], "urn:uuid:") - encodeHex(buf[9:], uuid) - return string(buf[:]) -} - -func encodeHex(dst []byte, uuid UUID) { - hex.Encode(dst, uuid[:4]) - dst[8] = '-' - hex.Encode(dst[9:13], uuid[4:6]) - dst[13] = '-' - hex.Encode(dst[14:18], uuid[6:8]) - dst[18] = '-' - hex.Encode(dst[19:23], uuid[8:10]) - dst[23] = '-' - hex.Encode(dst[24:], uuid[10:]) -} - -// Variant returns the variant encoded in uuid. -func (uuid UUID) Variant() Variant { - switch { - case (uuid[8] & 0xc0) == 0x80: - return RFC4122 - case (uuid[8] & 0xe0) == 0xc0: - return Microsoft - case (uuid[8] & 0xe0) == 0xe0: - return Future - default: - return Reserved - } -} - -// Version returns the version of uuid. -func (uuid UUID) Version() Version { - return Version(uuid[6] >> 4) -} - -func (v Version) String() string { - if v > 15 { - return fmt.Sprintf("BAD_VERSION_%d", v) - } - return fmt.Sprintf("VERSION_%d", v) -} - -func (v Variant) String() string { - switch v { - case RFC4122: - return "RFC4122" - case Reserved: - return "Reserved" - case Microsoft: - return "Microsoft" - case Future: - return "Future" - case Invalid: - return "Invalid" - } - return fmt.Sprintf("BadVariant%d", int(v)) -} - -// SetRand sets the random number generator to r, which implements io.Reader. -// If r.Read returns an error when the package requests random data then -// a panic will be issued. -// -// Calling SetRand with nil sets the random number generator to the default -// generator. -func SetRand(r io.Reader) { - if r == nil { - rander = rand.Reader - return - } - rander = r -} diff --git a/vendor/github.com/google/uuid/version1.go b/vendor/github.com/google/uuid/version1.go deleted file mode 100644 index 463109629..000000000 --- a/vendor/github.com/google/uuid/version1.go +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import ( - "encoding/binary" -) - -// NewUUID returns a Version 1 UUID based on the current NodeID and clock -// sequence, and the current time. If the NodeID has not been set by SetNodeID -// or SetNodeInterface then it will be set automatically. If the NodeID cannot -// be set NewUUID returns nil. If clock sequence has not been set by -// SetClockSequence then it will be set automatically. If GetTime fails to -// return the current NewUUID returns nil and an error. -// -// In most cases, New should be used. -func NewUUID() (UUID, error) { - var uuid UUID - now, seq, err := GetTime() - if err != nil { - return uuid, err - } - - timeLow := uint32(now & 0xffffffff) - timeMid := uint16((now >> 32) & 0xffff) - timeHi := uint16((now >> 48) & 0x0fff) - timeHi |= 0x1000 // Version 1 - - binary.BigEndian.PutUint32(uuid[0:], timeLow) - binary.BigEndian.PutUint16(uuid[4:], timeMid) - binary.BigEndian.PutUint16(uuid[6:], timeHi) - binary.BigEndian.PutUint16(uuid[8:], seq) - - nodeMu.Lock() - if nodeID == zeroID { - setNodeInterface("") - } - copy(uuid[10:], nodeID[:]) - nodeMu.Unlock() - - return uuid, nil -} diff --git a/vendor/github.com/google/uuid/version4.go b/vendor/github.com/google/uuid/version4.go deleted file mode 100644 index c110465db..000000000 --- a/vendor/github.com/google/uuid/version4.go +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2016 Google Inc. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package uuid - -import "io" - -// New creates a new random UUID or panics. New is equivalent to -// the expression -// -// uuid.Must(uuid.NewRandom()) -func New() UUID { - return Must(NewRandom()) -} - -// NewRandom returns a Random (Version 4) UUID. -// -// The strength of the UUIDs is based on the strength of the crypto/rand -// package. -// -// A note about uniqueness derived from the UUID Wikipedia entry: -// -// Randomly generated UUIDs have 122 random bits. One's annual risk of being -// hit by a meteorite is estimated to be one chance in 17 billion, that -// means the probability is about 0.00000000006 (6 × 10−11), -// equivalent to the odds of creating a few tens of trillions of UUIDs in a -// year and having one duplicate. -func NewRandom() (UUID, error) { - return NewRandomFromReader(rander) -} - -// NewRandomFromReader returns a UUID based on bytes read from a given io.Reader. -func NewRandomFromReader(r io.Reader) (UUID, error) { - var uuid UUID - _, err := io.ReadFull(r, uuid[:]) - if err != nil { - return Nil, err - } - uuid[6] = (uuid[6] & 0x0f) | 0x40 // Version 4 - uuid[8] = (uuid[8] & 0x3f) | 0x80 // Variant is 10 - return uuid, nil -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/.gitignore b/vendor/github.com/jpillora/go-ogle-analytics/.gitignore deleted file mode 100644 index 3010792c7..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/.gitignore +++ /dev/null @@ -1 +0,0 @@ -example/tracker-id.txt \ No newline at end of file diff --git a/vendor/github.com/jpillora/go-ogle-analytics/LICENSE b/vendor/github.com/jpillora/go-ogle-analytics/LICENSE deleted file mode 100644 index ec9f7530c..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -MIT License - -Copyright © 2015 dev@jpillora.com, Google Inc. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/vendor/github.com/jpillora/go-ogle-analytics/README.md b/vendor/github.com/jpillora/go-ogle-analytics/README.md deleted file mode 100644 index 9a85f3af7..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/README.md +++ /dev/null @@ -1,81 +0,0 @@ -## Go-ogle Analytics - -Track and monitor your Go programs for free with Google Analytics - -The `ga` package is essentially a Go wrapper around the [Google Analytics - Measurement Protocol](https://developers.google.com/analytics/devguides/collection/protocol/v1/reference) - -**Warning** This package is 95% generated from the [Parameter Reference](https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters) so it may contain bugs - please report them. GA allows "10 million hits per month per property" and will reject requests after that. - -### Install - -``` -go get -v github.com/jpillora/go-ogle-analytics -``` - -### API - -Create a new `client` and `Send()` a 'pageview', 'screenview', 'event', 'transaction', 'item', 'social', 'exception' or 'timing' event. - -#### http://godoc.org/github.com/jpillora/go-ogle-analytics - -### Quick Usage - -1. Log into GA and create a new property and note its Tracker ID - -1. Create a `ga-test.go` file - - ``` go - package main - - import "github.com/jpillora/go-ogle-analytics" - - func main() { - client, err := ga.NewClient("UA-XXXXXXXX-Y") - if err != nil { - panic(err) - } - - err = client.Send(ga.NewEvent("Foo", "Bar").Label("Bazz")) - if err != nil { - panic(err) - } - - println("Event fired!") - } - ``` - -1. In GA, go to Real-time > Events - -1. Run `ga-test.go` - - ``` - $ go run ga-test.go - Event fired! - ``` - -1. Watch as your event appears - - ![foo-ga](https://cloud.githubusercontent.com/assets/633843/5979585/023fc580-a8fd-11e4-803a-956610bcc2e2.png) - -#### MIT License - -Copyright © 2015 <dev@jpillora.com> - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/vendor/github.com/jpillora/go-ogle-analytics/client.go b/vendor/github.com/jpillora/go-ogle-analytics/client.go deleted file mode 100644 index 85f9169d2..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/client.go +++ /dev/null @@ -1,76 +0,0 @@ -//go:generate go run generate/protocol.go - -package ga - -import ( - "bytes" - "fmt" - "net/http" - "net/url" - "regexp" -) - -var trackingIDMatcher = regexp.MustCompile(`^UA-\d+-\d+$`) - -func NewClient(trackingID string) (*Client, error) { - if !trackingIDMatcher.MatchString(trackingID) { - return nil, fmt.Errorf("Invalid Tracking ID: %s", trackingID) - } - return &Client{ - UseTLS: true, - HttpClient: http.DefaultClient, - protocolVersion: "1", - protocolVersionSet: true, - trackingID: trackingID, - clientID: "go-ga", - clientIDSet: true, - }, nil -} - -type hitType interface { - addFields(url.Values) error -} - -func (c *Client) Send(h hitType) error { - - cpy := c.Copy() - - v := url.Values{} - - cpy.setType(h) - - err := cpy.addFields(v) - if err != nil { - return err - } - - err = h.addFields(v) - if err != nil { - return err - } - - url := "" - if cpy.UseTLS { - url = "https://www.google-analytics.com/collect" - } else { - url = "http://ssl.google-analytics.com/collect" - } - - str := v.Encode() - buf := bytes.NewBufferString(str) - - resp, err := c.HttpClient.Post(url, "application/x-www-form-urlencoded", buf) - if err != nil { - return err - } - - defer resp.Body.Close() - - if resp.StatusCode/100 != 2 { - return fmt.Errorf("Rejected by Google with code %d", resp.StatusCode) - } - - // fmt.Printf("POST %s => %d\n", str, resp.StatusCode) - - return nil -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/conv.go b/vendor/github.com/jpillora/go-ogle-analytics/conv.go deleted file mode 100644 index 4deeb4a33..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/conv.go +++ /dev/null @@ -1,19 +0,0 @@ -package ga - -import "fmt" - -func bool2str(val bool) string { - if val { - return "1" - } else { - return "0" - } -} - -func int2str(val int64) string { - return fmt.Sprintf("%d", val) -} - -func float2str(val float64) string { - return fmt.Sprintf("%.6f", val) -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-client.go b/vendor/github.com/jpillora/go-ogle-analytics/type-client.go deleted file mode 100644 index b914c6727..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-client.go +++ /dev/null @@ -1,1228 +0,0 @@ -package ga - -import ( - "net/http" - "net/url" -) - -//WARNING: This file was generated. Do not edit. - -//Client Hit Type -type Client struct { - //Use TLS when Send()ing - UseTLS bool - HttpClient *http.Client - protocolVersion string - protocolVersionSet bool - trackingID string - anonymizeIP bool - anonymizeIPSet bool - dataSource string - dataSourceSet bool - queueTime int64 - queueTimeSet bool - cacheBuster string - cacheBusterSet bool - clientID string - clientIDSet bool - userID string - userIDSet bool - sessionControl string - sessionControlSet bool - iPOverride string - iPOverrideSet bool - userAgentOverride string - userAgentOverrideSet bool - geographicalOverride string - geographicalOverrideSet bool - documentReferrer string - documentReferrerSet bool - campaignName string - campaignNameSet bool - campaignSource string - campaignSourceSet bool - campaignMedium string - campaignMediumSet bool - campaignKeyword string - campaignKeywordSet bool - campaignContent string - campaignContentSet bool - campaignID string - campaignIDSet bool - googleAdWordsID string - googleAdWordsIDSet bool - googleDisplayAdsID string - googleDisplayAdsIDSet bool - screenResolution string - screenResolutionSet bool - viewportSize string - viewportSizeSet bool - documentEncoding string - documentEncodingSet bool - screenColors string - screenColorsSet bool - userLanguage string - userLanguageSet bool - javaEnabled bool - javaEnabledSet bool - flashVersion string - flashVersionSet bool - hitType string - nonInteractionHit bool - nonInteractionHitSet bool - documentLocationURL string - documentLocationURLSet bool - documentHostName string - documentHostNameSet bool - documentPath string - documentPathSet bool - documentTitle string - documentTitleSet bool - screenName string - screenNameSet bool - linkID string - linkIDSet bool - applicationName string - applicationNameSet bool - applicationID string - applicationIDSet bool - applicationVersion string - applicationVersionSet bool - applicationInstallerID string - applicationInstallerIDSet bool - productSKU string - productSKUSet bool - productName string - productNameSet bool - productBrand string - productBrandSet bool - productCategory string - productCategorySet bool - productVariant string - productVariantSet bool - productPrice float64 - productPriceSet bool - productQuantity int64 - productQuantitySet bool - productCouponCode string - productCouponCodeSet bool - productPosition int64 - productPositionSet bool - productCustomDimension string - productCustomDimensionSet bool - productCustomMetric int64 - productCustomMetricSet bool - productAction string - productActionSet bool - transactionID string - transactionIDSet bool - affiliation string - affiliationSet bool - revenue float64 - revenueSet bool - tax float64 - taxSet bool - shipping float64 - shippingSet bool - couponCode string - couponCodeSet bool - productActionList string - productActionListSet bool - checkoutStep int64 - checkoutStepSet bool - checkoutStepOption string - checkoutStepOptionSet bool - productImpressionListName string - productImpressionListNameSet bool - productImpressionSKU string - productImpressionSKUSet bool - productImpressionName string - productImpressionNameSet bool - productImpressionBrand string - productImpressionBrandSet bool - productImpressionCategory string - productImpressionCategorySet bool - productImpressionVariant string - productImpressionVariantSet bool - productImpressionPosition int64 - productImpressionPositionSet bool - productImpressionPrice float64 - productImpressionPriceSet bool - productImpressionCustomDimension string - productImpressionCustomDimensionSet bool - productImpressionCustomMetric int64 - productImpressionCustomMetricSet bool - promotionID string - promotionIDSet bool - promotionName string - promotionNameSet bool - promotionCreative string - promotionCreativeSet bool - promotionPosition string - promotionPositionSet bool - promotionAction string - promotionActionSet bool - customDimension string - customDimensionSet bool - customMetric int64 - customMetricSet bool - experimentID string - experimentIDSet bool - experimentVariant string - experimentVariantSet bool - dimensionIndex string - dimensionIndexSet bool - listIndex string - listIndexSet bool - metricIndex string - metricIndexSet bool - productIndex string - productIndexSet bool - promoIndex string - promoIndexSet bool -} - -func (c *Client) setType(h hitType) { - switch h.(type) { - case *Event: - c.hitType = "event" - case *Exception: - c.hitType = "exception" - case *Item: - c.hitType = "item" - case *Pageview: - c.hitType = "pageview" - case *Screenview: - c.hitType = "screenview" - case *Social: - c.hitType = "social" - case *Timing: - c.hitType = "timing" - case *Transaction: - c.hitType = "transaction" - } -} - -func (h *Client) addFields(v url.Values) error { - if h.protocolVersionSet { - v.Add("v", h.protocolVersion) - } - v.Add("tid", h.trackingID) - if h.anonymizeIPSet { - v.Add("aip", bool2str(h.anonymizeIP)) - } - if h.dataSourceSet { - v.Add("ds", h.dataSource) - } - if h.queueTimeSet { - v.Add("qt", int2str(h.queueTime)) - } - if h.cacheBusterSet { - v.Add("z", h.cacheBuster) - } - if h.clientIDSet { - v.Add("cid", h.clientID) - } - if h.userIDSet { - v.Add("uid", h.userID) - } - if h.sessionControlSet { - v.Add("sc", h.sessionControl) - } - if h.iPOverrideSet { - v.Add("uip", h.iPOverride) - } - if h.userAgentOverrideSet { - v.Add("ua", h.userAgentOverride) - } - if h.geographicalOverrideSet { - v.Add("geoid", h.geographicalOverride) - } - if h.documentReferrerSet { - v.Add("dr", h.documentReferrer) - } - if h.campaignNameSet { - v.Add("cn", h.campaignName) - } - if h.campaignSourceSet { - v.Add("cs", h.campaignSource) - } - if h.campaignMediumSet { - v.Add("cm", h.campaignMedium) - } - if h.campaignKeywordSet { - v.Add("ck", h.campaignKeyword) - } - if h.campaignContentSet { - v.Add("cc", h.campaignContent) - } - if h.campaignIDSet { - v.Add("ci", h.campaignID) - } - if h.googleAdWordsIDSet { - v.Add("gclid", h.googleAdWordsID) - } - if h.googleDisplayAdsIDSet { - v.Add("dclid", h.googleDisplayAdsID) - } - if h.screenResolutionSet { - v.Add("sr", h.screenResolution) - } - if h.viewportSizeSet { - v.Add("vp", h.viewportSize) - } - if h.documentEncodingSet { - v.Add("de", h.documentEncoding) - } - if h.screenColorsSet { - v.Add("sd", h.screenColors) - } - if h.userLanguageSet { - v.Add("ul", h.userLanguage) - } - if h.javaEnabledSet { - v.Add("je", bool2str(h.javaEnabled)) - } - if h.flashVersionSet { - v.Add("fl", h.flashVersion) - } - v.Add("t", h.hitType) - if h.nonInteractionHitSet { - v.Add("ni", bool2str(h.nonInteractionHit)) - } - if h.documentLocationURLSet { - v.Add("dl", h.documentLocationURL) - } - if h.documentHostNameSet { - v.Add("dh", h.documentHostName) - } - if h.documentPathSet { - v.Add("dp", h.documentPath) - } - if h.documentTitleSet { - v.Add("dt", h.documentTitle) - } - if h.screenNameSet { - v.Add("cd", h.screenName) - } - if h.linkIDSet { - v.Add("linkid", h.linkID) - } - if h.applicationNameSet { - v.Add("an", h.applicationName) - } - if h.applicationIDSet { - v.Add("aid", h.applicationID) - } - if h.applicationVersionSet { - v.Add("av", h.applicationVersion) - } - if h.applicationInstallerIDSet { - v.Add("aiid", h.applicationInstallerID) - } - if h.productSKUSet { - v.Add("pr"+h.productIndex+"id", h.productSKU) - } - if h.productNameSet { - v.Add("pr"+h.productIndex+"nm", h.productName) - } - if h.productBrandSet { - v.Add("pr"+h.productIndex+"br", h.productBrand) - } - if h.productCategorySet { - v.Add("pr"+h.productIndex+"ca", h.productCategory) - } - if h.productVariantSet { - v.Add("pr"+h.productIndex+"va", h.productVariant) - } - if h.productPriceSet { - v.Add("pr"+h.productIndex+"pr", float2str(h.productPrice)) - } - if h.productQuantitySet { - v.Add("pr"+h.productIndex+"qt", int2str(h.productQuantity)) - } - if h.productCouponCodeSet { - v.Add("pr"+h.productIndex+"cc", h.productCouponCode) - } - if h.productPositionSet { - v.Add("pr"+h.productIndex+"ps", int2str(h.productPosition)) - } - if h.productCustomDimensionSet { - v.Add("pr"+h.productIndex+"cd"+h.dimensionIndex+"", h.productCustomDimension) - } - if h.productCustomMetricSet { - v.Add("pr"+h.productIndex+"cm"+h.metricIndex+"", int2str(h.productCustomMetric)) - } - if h.productActionSet { - v.Add("pa", h.productAction) - } - if h.transactionIDSet { - v.Add("ti", h.transactionID) - } - if h.affiliationSet { - v.Add("ta", h.affiliation) - } - if h.revenueSet { - v.Add("tr", float2str(h.revenue)) - } - if h.taxSet { - v.Add("tt", float2str(h.tax)) - } - if h.shippingSet { - v.Add("ts", float2str(h.shipping)) - } - if h.couponCodeSet { - v.Add("tcc", h.couponCode) - } - if h.productActionListSet { - v.Add("pal", h.productActionList) - } - if h.checkoutStepSet { - v.Add("cos", int2str(h.checkoutStep)) - } - if h.checkoutStepOptionSet { - v.Add("col", h.checkoutStepOption) - } - if h.productImpressionListNameSet { - v.Add("il"+h.listIndex+"nm", h.productImpressionListName) - } - if h.productImpressionSKUSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"id", h.productImpressionSKU) - } - if h.productImpressionNameSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"nm", h.productImpressionName) - } - if h.productImpressionBrandSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"br", h.productImpressionBrand) - } - if h.productImpressionCategorySet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"ca", h.productImpressionCategory) - } - if h.productImpressionVariantSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"va", h.productImpressionVariant) - } - if h.productImpressionPositionSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"ps", int2str(h.productImpressionPosition)) - } - if h.productImpressionPriceSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"pr", float2str(h.productImpressionPrice)) - } - if h.productImpressionCustomDimensionSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"cd"+h.dimensionIndex+"", h.productImpressionCustomDimension) - } - if h.productImpressionCustomMetricSet { - v.Add("il"+h.listIndex+"pi"+h.productIndex+"cm"+h.metricIndex+"", int2str(h.productImpressionCustomMetric)) - } - if h.promotionIDSet { - v.Add("promo"+h.promoIndex+"id", h.promotionID) - } - if h.promotionNameSet { - v.Add("promo"+h.promoIndex+"nm", h.promotionName) - } - if h.promotionCreativeSet { - v.Add("promo"+h.promoIndex+"cr", h.promotionCreative) - } - if h.promotionPositionSet { - v.Add("promo"+h.promoIndex+"ps", h.promotionPosition) - } - if h.promotionActionSet { - v.Add("promoa", h.promotionAction) - } - if h.customDimensionSet { - v.Add("cd"+h.dimensionIndex+"", h.customDimension) - } - if h.customMetricSet { - v.Add("cm"+h.metricIndex+"", int2str(h.customMetric)) - } - if h.experimentIDSet { - v.Add("xid", h.experimentID) - } - if h.experimentVariantSet { - v.Add("xvar", h.experimentVariant) - } - return nil -} - -// The Protocol version. The current value is '1'. This will -// only change when there are changes made that are not backwards -// compatible. -func (h *Client) ProtocolVersion(protocolVersion string) *Client { - h.protocolVersion = protocolVersion - h.protocolVersionSet = true - return h -} - -// When present, the IP address of the sender will be anonymized. -// For example, the IP will be anonymized if any of the following -// parameters are present in the payload: &aip=, &aip=0, or -// &aip=1 -func (h *Client) AnonymizeIP(anonymizeIP bool) *Client { - h.anonymizeIP = anonymizeIP - h.anonymizeIPSet = true - return h -} - -// Indicates the data source of the hit. Hits sent from analytics.js -// will have data source set to 'web'; hits sent from one of -// the mobile SDKs will have data source set to 'app'. -func (h *Client) DataSource(dataSource string) *Client { - h.dataSource = dataSource - h.dataSourceSet = true - return h -} - -// Used to collect offline / latent hits. The value represents -// the time delta (in milliseconds) between when the hit being -// reported occurred and the time the hit was sent. The value -// must be greater than or equal to 0. Values greater than -// four hours may lead to hits not being processed. -func (h *Client) QueueTime(queueTime int64) *Client { - h.queueTime = queueTime - h.queueTimeSet = true - return h -} - -// Used to send a random number in GET requests to ensure browsers -// and proxies don't cache hits. It should be sent as the final -// parameter of the request since we've seen some 3rd party -// internet filtering software add additional parameters to -// HTTP requests incorrectly. This value is not used in reporting. -func (h *Client) CacheBuster(cacheBuster string) *Client { - h.cacheBuster = cacheBuster - h.cacheBusterSet = true - return h -} - -// This anonymously identifies a particular user, device, or -// browser instance. For the web, this is generally stored -// as a first-party cookie with a two-year expiration. For -// mobile apps, this is randomly generated for each particular -// instance of an application install. The value of this field -// should be a random UUID (version 4) as described in http://www.ietf.org/rfc/rfc4122.txt -func (h *Client) ClientID(clientID string) *Client { - h.clientID = clientID - h.clientIDSet = true - return h -} - -// This is intended to be a known identifier for a user provided -// by the site owner/tracking library user. It may not itself -// be PII (personally identifiable information). The value -// should never be persisted in GA cookies or other Analytics -// provided storage. -func (h *Client) UserID(userID string) *Client { - h.userID = userID - h.userIDSet = true - return h -} - -// Used to control the session duration. A value of 'start' -// forces a new session to start with this hit and 'end' forces -// the current session to end with this hit. All other values -// are ignored. -func (h *Client) SessionControl(sessionControl string) *Client { - h.sessionControl = sessionControl - h.sessionControlSet = true - return h -} - -// The IP address of the user. This should be a valid IP address -// in IPv4 or IPv6 format. It will always be anonymized just -// as though &aip (anonymize IP) had been used. -func (h *Client) IPOverride(iPOverride string) *Client { - h.iPOverride = iPOverride - h.iPOverrideSet = true - return h -} - -// The User Agent of the browser. Note that Google has libraries -// to identify real user agents. Hand crafting your own agent -// could break at any time. -func (h *Client) UserAgentOverride(userAgentOverride string) *Client { - h.userAgentOverride = userAgentOverride - h.userAgentOverrideSet = true - return h -} - -// The geographical location of the user. The geographical -// ID should be a two letter country code or a criteria ID -// representing a city or region (see http://developers.google.com/analytics/devguides/collection/protocol/v1/geoid). -// This parameter takes precedent over any location derived -// from IP address, including the IP Override parameter. An -// invalid code will result in geographical dimensions to be -// set to '(not set)'. -func (h *Client) GeographicalOverride(geographicalOverride string) *Client { - h.geographicalOverride = geographicalOverride - h.geographicalOverrideSet = true - return h -} - -// Specifies which referral source brought traffic to a website. -// This value is also used to compute the traffic source. The -// format of this value is a URL. -func (h *Client) DocumentReferrer(documentReferrer string) *Client { - h.documentReferrer = documentReferrer - h.documentReferrerSet = true - return h -} - -// Specifies the campaign name. -func (h *Client) CampaignName(campaignName string) *Client { - h.campaignName = campaignName - h.campaignNameSet = true - return h -} - -// Specifies the campaign source. -func (h *Client) CampaignSource(campaignSource string) *Client { - h.campaignSource = campaignSource - h.campaignSourceSet = true - return h -} - -// Specifies the campaign medium. -func (h *Client) CampaignMedium(campaignMedium string) *Client { - h.campaignMedium = campaignMedium - h.campaignMediumSet = true - return h -} - -// Specifies the campaign keyword. -func (h *Client) CampaignKeyword(campaignKeyword string) *Client { - h.campaignKeyword = campaignKeyword - h.campaignKeywordSet = true - return h -} - -// Specifies the campaign content. -func (h *Client) CampaignContent(campaignContent string) *Client { - h.campaignContent = campaignContent - h.campaignContentSet = true - return h -} - -// Specifies the campaign ID. -func (h *Client) CampaignID(campaignID string) *Client { - h.campaignID = campaignID - h.campaignIDSet = true - return h -} - -// Specifies the Google AdWords Id. -func (h *Client) GoogleAdWordsID(googleAdWordsID string) *Client { - h.googleAdWordsID = googleAdWordsID - h.googleAdWordsIDSet = true - return h -} - -// Specifies the Google Display Ads Id. -func (h *Client) GoogleDisplayAdsID(googleDisplayAdsID string) *Client { - h.googleDisplayAdsID = googleDisplayAdsID - h.googleDisplayAdsIDSet = true - return h -} - -// Specifies the screen resolution. -func (h *Client) ScreenResolution(screenResolution string) *Client { - h.screenResolution = screenResolution - h.screenResolutionSet = true - return h -} - -// Specifies the viewable area of the browser / device. -func (h *Client) ViewportSize(viewportSize string) *Client { - h.viewportSize = viewportSize - h.viewportSizeSet = true - return h -} - -// Specifies the character set used to encode the page / document. -func (h *Client) DocumentEncoding(documentEncoding string) *Client { - h.documentEncoding = documentEncoding - h.documentEncodingSet = true - return h -} - -// Specifies the screen color depth. -func (h *Client) ScreenColors(screenColors string) *Client { - h.screenColors = screenColors - h.screenColorsSet = true - return h -} - -// Specifies the language. -func (h *Client) UserLanguage(userLanguage string) *Client { - h.userLanguage = userLanguage - h.userLanguageSet = true - return h -} - -// Specifies whether Java was enabled. -func (h *Client) JavaEnabled(javaEnabled bool) *Client { - h.javaEnabled = javaEnabled - h.javaEnabledSet = true - return h -} - -// Specifies the flash version. -func (h *Client) FlashVersion(flashVersion string) *Client { - h.flashVersion = flashVersion - h.flashVersionSet = true - return h -} - -// Specifies that a hit be considered non-interactive. -func (h *Client) NonInteractionHit(nonInteractionHit bool) *Client { - h.nonInteractionHit = nonInteractionHit - h.nonInteractionHitSet = true - return h -} - -// Use this parameter to send the full URL (document location) -// of the page on which content resides. You can use the &dh -// and &dp parameters to override the hostname and path + query -// portions of the document location, accordingly. The JavaScript -// clients determine this parameter using the concatenation -// of the document.location.origin + document.location.pathname -// + document.location.search browser parameters. Be sure to -// remove any user authentication or other private information -// from the URL if present. For 'pageview' hits, either &dl -// or both &dh and &dp have to be specified for the hit to -// be valid. -func (h *Client) DocumentLocationURL(documentLocationURL string) *Client { - h.documentLocationURL = documentLocationURL - h.documentLocationURLSet = true - return h -} - -// Specifies the hostname from which content was hosted. -func (h *Client) DocumentHostName(documentHostName string) *Client { - h.documentHostName = documentHostName - h.documentHostNameSet = true - return h -} - -// The path portion of the page URL. Should begin with '/'. -// For 'pageview' hits, either &dl or both &dh and &dp have -// to be specified for the hit to be valid. -func (h *Client) DocumentPath(documentPath string) *Client { - h.documentPath = documentPath - h.documentPathSet = true - return h -} - -// The title of the page / document. -func (h *Client) DocumentTitle(documentTitle string) *Client { - h.documentTitle = documentTitle - h.documentTitleSet = true - return h -} - -// If not specified, this will default to the unique URL of -// the page by either using the &dl parameter as-is or assembling -// it from &dh and &dp. App tracking makes use of this for -// the 'Screen Name' of the screenview hit. -func (h *Client) ScreenName(screenName string) *Client { - h.screenName = screenName - h.screenNameSet = true - return h -} - -// The ID of a clicked DOM element, used to disambiguate multiple -// links to the same URL in In-Page Analytics reports when -// Enhanced Link Attribution is enabled for the property. -func (h *Client) LinkID(linkID string) *Client { - h.linkID = linkID - h.linkIDSet = true - return h -} - -// Specifies the application name. -func (h *Client) ApplicationName(applicationName string) *Client { - h.applicationName = applicationName - h.applicationNameSet = true - return h -} - -// Application identifier. -func (h *Client) ApplicationID(applicationID string) *Client { - h.applicationID = applicationID - h.applicationIDSet = true - return h -} - -// Specifies the application version. -func (h *Client) ApplicationVersion(applicationVersion string) *Client { - h.applicationVersion = applicationVersion - h.applicationVersionSet = true - return h -} - -// Application installer identifier. -func (h *Client) ApplicationInstallerID(applicationInstallerID string) *Client { - h.applicationInstallerID = applicationInstallerID - h.applicationInstallerIDSet = true - return h -} - -// The SKU of the product. Product index must be a positive -// integer between 1 and 200, inclusive. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) ProductSKU(productSKU string) *Client { - h.productSKU = productSKU - h.productSKUSet = true - return h -} - -// The name of the product. Product index must be a positive -// integer between 1 and 200, inclusive. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) ProductName(productName string) *Client { - h.productName = productName - h.productNameSet = true - return h -} - -// The brand associated with the product. Product index must -// be a positive integer between 1 and 200, inclusive. For -// analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductBrand(productBrand string) *Client { - h.productBrand = productBrand - h.productBrandSet = true - return h -} - -// The category to which the product belongs. Product index -// must be a positive integer between 1 and 200, inclusive. -// The product category parameter can be hierarchical. Use -// / as a delimiter to specify up to 5-levels of hierarchy. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductCategory(productCategory string) *Client { - h.productCategory = productCategory - h.productCategorySet = true - return h -} - -// The variant of the product. Product index must be a positive -// integer between 1 and 200, inclusive. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) ProductVariant(productVariant string) *Client { - h.productVariant = productVariant - h.productVariantSet = true - return h -} - -// The price of a product. Product index must be a positive -// integer between 1 and 200, inclusive. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) ProductPrice(productPrice float64) *Client { - h.productPrice = productPrice - h.productPriceSet = true - return h -} - -// The quantity of a product. Product index must be a positive -// integer between 1 and 200, inclusive. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) ProductQuantity(productQuantity int64) *Client { - h.productQuantity = productQuantity - h.productQuantitySet = true - return h -} - -// The coupon code associated with a product. Product index -// must be a positive integer between 1 and 200, inclusive. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductCouponCode(productCouponCode string) *Client { - h.productCouponCode = productCouponCode - h.productCouponCodeSet = true - return h -} - -// The product's position in a list or collection. Product -// index must be a positive integer between 1 and 200, inclusive. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductPosition(productPosition int64) *Client { - h.productPosition = productPosition - h.productPositionSet = true - return h -} - -// A product-level custom dimension where dimension index is -// a positive integer between 1 and 200, inclusive. Product -// index must be a positive integer between 1 and 200, inclusive. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductCustomDimension(productCustomDimension string) *Client { - h.productCustomDimension = productCustomDimension - h.productCustomDimensionSet = true - return h -} - -// A product-level custom metric where metric index is a positive -// integer between 1 and 200, inclusive. Product index must -// be a positive integer between 1 and 200, inclusive. For -// analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductCustomMetric(productCustomMetric int64) *Client { - h.productCustomMetric = productCustomMetric - h.productCustomMetricSet = true - return h -} - -// The role of the products included in a hit. If a product -// action is not specified, all product definitions included -// with the hit will be ignored. Must be one of: detail, click, -// add, remove, checkout, checkout_option, purchase, refund. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductAction(productAction string) *Client { - h.productAction = productAction - h.productActionSet = true - return h -} - -// The transaction ID. This is an additional parameter that -// can be sent when Product Action is set to 'purchase' or -// 'refund'. For analytics.js the Enhanced Ecommerce plugin -// must be installed before using this field. -func (h *Client) TransactionID(transactionID string) *Client { - h.transactionID = transactionID - h.transactionIDSet = true - return h -} - -// The store or affiliation from which this transaction occurred. -// This is an additional parameter that can be sent when Product -// Action is set to 'purchase' or 'refund'. For analytics.js -// the Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) Affiliation(affiliation string) *Client { - h.affiliation = affiliation - h.affiliationSet = true - return h -} - -// The total value of the transaction, including tax and shipping. -// If not sent, this value will be automatically calculated -// using the product quantity and price fields of all products -// in the same hit. This is an additional parameter that can -// be sent when Product Action is set to 'purchase' or 'refund'. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) Revenue(revenue float64) *Client { - h.revenue = revenue - h.revenueSet = true - return h -} - -// The total tax associated with the transaction. This is an -// additional parameter that can be sent when Product Action -// is set to 'purchase' or 'refund'. For analytics.js the Enhanced -// Ecommerce plugin must be installed before using this field. -func (h *Client) Tax(tax float64) *Client { - h.tax = tax - h.taxSet = true - return h -} - -// The shipping cost associated with the transaction. This -// is an additional parameter that can be sent when Product -// Action is set to 'purchase' or 'refund'. For analytics.js -// the Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) Shipping(shipping float64) *Client { - h.shipping = shipping - h.shippingSet = true - return h -} - -// The transaction coupon redeemed with the transaction. This -// is an additional parameter that can be sent when Product -// Action is set to 'purchase' or 'refund'. For analytics.js -// the Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) CouponCode(couponCode string) *Client { - h.couponCode = couponCode - h.couponCodeSet = true - return h -} - -// The list or collection from which a product action occurred. -// This is an additional parameter that can be sent when Product -// Action is set to 'detail' or 'click'. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) ProductActionList(productActionList string) *Client { - h.productActionList = productActionList - h.productActionListSet = true - return h -} - -// The step number in a checkout funnel. This is an additional -// parameter that can be sent when Product Action is set to -// 'checkout'. For analytics.js the Enhanced Ecommerce plugin -// must be installed before using this field. -func (h *Client) CheckoutStep(checkoutStep int64) *Client { - h.checkoutStep = checkoutStep - h.checkoutStepSet = true - return h -} - -// Additional information about a checkout step. This is an -// additional parameter that can be sent when Product Action -// is set to 'checkout'. For analytics.js the Enhanced Ecommerce -// plugin must be installed before using this field. -func (h *Client) CheckoutStepOption(checkoutStepOption string) *Client { - h.checkoutStepOption = checkoutStepOption - h.checkoutStepOptionSet = true - return h -} - -// The list or collection to which a product belongs. Impression -// List index must be a positive integer between 1 and 200, -// inclusive. For analytics.js the Enhanced Ecommerce plugin -// must be installed before using this field. -func (h *Client) ProductImpressionListName(productImpressionListName string) *Client { - h.productImpressionListName = productImpressionListName - h.productImpressionListNameSet = true - return h -} - -// The product ID or SKU. Impression List index must be a positive -// integer between 1 and 200, inclusive. Product index must -// be a positive integer between 1 and 200, inclusive. For -// analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductImpressionSKU(productImpressionSKU string) *Client { - h.productImpressionSKU = productImpressionSKU - h.productImpressionSKUSet = true - return h -} - -// The name of the product. Impression List index must be a -// positive integer between 1 and 200, inclusive. Product index -// must be a positive integer between 1 and 200, inclusive. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductImpressionName(productImpressionName string) *Client { - h.productImpressionName = productImpressionName - h.productImpressionNameSet = true - return h -} - -// The brand associated with the product. Impression List index -// must be a positive integer between 1 and 200, inclusive. -// Product index must be a positive integer between 1 and 200, -// inclusive. For analytics.js the Enhanced Ecommerce plugin -// must be installed before using this field. -func (h *Client) ProductImpressionBrand(productImpressionBrand string) *Client { - h.productImpressionBrand = productImpressionBrand - h.productImpressionBrandSet = true - return h -} - -// The category to which the product belongs. Impression List -// index must be a positive integer between 1 and 200, inclusive. -// Product index must be a positive integer between 1 and 200, -// inclusive. For analytics.js the Enhanced Ecommerce plugin -// must be installed before using this field. -func (h *Client) ProductImpressionCategory(productImpressionCategory string) *Client { - h.productImpressionCategory = productImpressionCategory - h.productImpressionCategorySet = true - return h -} - -// The variant of the product. Impression List index must be -// a positive integer between 1 and 200, inclusive. Product -// index must be a positive integer between 1 and 200, inclusive. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductImpressionVariant(productImpressionVariant string) *Client { - h.productImpressionVariant = productImpressionVariant - h.productImpressionVariantSet = true - return h -} - -// The product's position in a list or collection. Impression -// List index must be a positive integer between 1 and 200, -// inclusive. Product index must be a positive integer between -// 1 and 200, inclusive. For analytics.js the Enhanced Ecommerce -// plugin must be installed before using this field. -func (h *Client) ProductImpressionPosition(productImpressionPosition int64) *Client { - h.productImpressionPosition = productImpressionPosition - h.productImpressionPositionSet = true - return h -} - -// The price of a product. Impression List index must be a -// positive integer between 1 and 200, inclusive. Product index -// must be a positive integer between 1 and 200, inclusive. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) ProductImpressionPrice(productImpressionPrice float64) *Client { - h.productImpressionPrice = productImpressionPrice - h.productImpressionPriceSet = true - return h -} - -// A product-level custom dimension where dimension index is -// a positive integer between 1 and 200, inclusive. Impression -// List index must be a positive integer between 1 and 200, -// inclusive. Product index must be a positive integer between -// 1 and 200, inclusive. For analytics.js the Enhanced Ecommerce -// plugin must be installed before using this field. -func (h *Client) ProductImpressionCustomDimension(productImpressionCustomDimension string) *Client { - h.productImpressionCustomDimension = productImpressionCustomDimension - h.productImpressionCustomDimensionSet = true - return h -} - -// A product-level custom metric where metric index is a positive -// integer between 1 and 200, inclusive. Impression List index -// must be a positive integer between 1 and 200, inclusive. -// Product index must be a positive integer between 1 and 200, -// inclusive. For analytics.js the Enhanced Ecommerce plugin -// must be installed before using this field. -func (h *Client) ProductImpressionCustomMetric(productImpressionCustomMetric int64) *Client { - h.productImpressionCustomMetric = productImpressionCustomMetric - h.productImpressionCustomMetricSet = true - return h -} - -// The promotion ID. Promotion index must be a positive integer -// between 1 and 200, inclusive. For analytics.js the Enhanced -// Ecommerce plugin must be installed before using this field. -func (h *Client) PromotionID(promotionID string) *Client { - h.promotionID = promotionID - h.promotionIDSet = true - return h -} - -// The name of the promotion. Promotion index must be a positive -// integer between 1 and 200, inclusive. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) PromotionName(promotionName string) *Client { - h.promotionName = promotionName - h.promotionNameSet = true - return h -} - -// The creative associated with the promotion. Promotion index -// must be a positive integer between 1 and 200, inclusive. -// For analytics.js the Enhanced Ecommerce plugin must be installed -// before using this field. -func (h *Client) PromotionCreative(promotionCreative string) *Client { - h.promotionCreative = promotionCreative - h.promotionCreativeSet = true - return h -} - -// The position of the creative. Promotion index must be a -// positive integer between 1 and 200, inclusive. For analytics.js -// the Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) PromotionPosition(promotionPosition string) *Client { - h.promotionPosition = promotionPosition - h.promotionPositionSet = true - return h -} - -// Specifies the role of the promotions included in a hit. -// If a promotion action is not specified, the default promotion -// action, 'view', is assumed. To measure a user click on a -// promotion set this to 'promo_click'. For analytics.js the -// Enhanced Ecommerce plugin must be installed before using -// this field. -func (h *Client) PromotionAction(promotionAction string) *Client { - h.promotionAction = promotionAction - h.promotionActionSet = true - return h -} - -// Each custom dimension has an associated index. There is -// a maximum of 20 custom dimensions (200 for Premium accounts). -// The dimension index must be a positive integer between 1 -// and 200, inclusive. -func (h *Client) CustomDimension(customDimension string) *Client { - h.customDimension = customDimension - h.customDimensionSet = true - return h -} - -// Each custom metric has an associated index. There is a maximum -// of 20 custom metrics (200 for Premium accounts). The metric -// index must be a positive integer between 1 and 200, inclusive. -func (h *Client) CustomMetric(customMetric int64) *Client { - h.customMetric = customMetric - h.customMetricSet = true - return h -} - -// This parameter specifies that this user has been exposed -// to an experiment with the given ID. It should be sent in -// conjunction with the Experiment Variant parameter. -func (h *Client) ExperimentID(experimentID string) *Client { - h.experimentID = experimentID - h.experimentIDSet = true - return h -} - -// This parameter specifies that this user has been exposed -// to a particular variation of an experiment. It should be -// sent in conjunction with the Experiment ID parameter. -func (h *Client) ExperimentVariant(experimentVariant string) *Client { - h.experimentVariant = experimentVariant - h.experimentVariantSet = true - return h -} - -// DimensionIndex is required by other properties -func (h *Client) DimensionIndex(dimensionIndex string) *Client { - h.dimensionIndex = dimensionIndex - h.dimensionIndexSet = true - return h -} - -// ListIndex is required by other properties -func (h *Client) ListIndex(listIndex string) *Client { - h.listIndex = listIndex - h.listIndexSet = true - return h -} - -// MetricIndex is required by other properties -func (h *Client) MetricIndex(metricIndex string) *Client { - h.metricIndex = metricIndex - h.metricIndexSet = true - return h -} - -// ProductIndex is required by other properties -func (h *Client) ProductIndex(productIndex string) *Client { - h.productIndex = productIndex - h.productIndexSet = true - return h -} - -// PromoIndex is required by other properties -func (h *Client) PromoIndex(promoIndex string) *Client { - h.promoIndex = promoIndex - h.promoIndexSet = true - return h -} - -func (h *Client) Copy() *Client { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-event.go b/vendor/github.com/jpillora/go-ogle-analytics/type-event.go deleted file mode 100644 index b27c36849..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-event.go +++ /dev/null @@ -1,58 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Event Hit Type -type Event struct { - category string - action string - label string - labelSet bool - value int64 - valueSet bool -} - -// NewEvent creates a new Event Hit Type. -// Specifies the event category. -// Specifies the event action. - -func NewEvent(category string, action string) *Event { - h := &Event{ - category: category, - action: action, - } - return h -} - -func (h *Event) addFields(v url.Values) error { - v.Add("ec", h.category) - v.Add("ea", h.action) - if h.labelSet { - v.Add("el", h.label) - } - if h.valueSet { - v.Add("ev", int2str(h.value)) - } - return nil -} - -// Specifies the event label. -func (h *Event) Label(label string) *Event { - h.label = label - h.labelSet = true - return h -} - -// Specifies the event value. Values must be non-negative. -func (h *Event) Value(value int64) *Event { - h.value = value - h.valueSet = true - return h -} - -func (h *Event) Copy() *Event { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-exception.go b/vendor/github.com/jpillora/go-ogle-analytics/type-exception.go deleted file mode 100644 index f5dd25869..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-exception.go +++ /dev/null @@ -1,49 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Exception Hit Type -type Exception struct { - description string - descriptionSet bool - isExceptionFatal bool - isExceptionFatalSet bool -} - -// NewException creates a new Exception Hit Type. - -func NewException() *Exception { - h := &Exception{} - return h -} - -func (h *Exception) addFields(v url.Values) error { - if h.descriptionSet { - v.Add("exd", h.description) - } - if h.isExceptionFatalSet { - v.Add("exf", bool2str(h.isExceptionFatal)) - } - return nil -} - -// Specifies the description of an exception. -func (h *Exception) Description(description string) *Exception { - h.description = description - h.descriptionSet = true - return h -} - -// Specifies whether the exception was fatal. -func (h *Exception) IsExceptionFatal(isExceptionFatal bool) *Exception { - h.isExceptionFatal = isExceptionFatal - h.isExceptionFatalSet = true - return h -} - -func (h *Exception) Copy() *Exception { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-item.go b/vendor/github.com/jpillora/go-ogle-analytics/type-item.go deleted file mode 100644 index 9675c716d..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-item.go +++ /dev/null @@ -1,98 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Item Hit Type -type Item struct { - iD string - name string - price float64 - priceSet bool - quantity int64 - quantitySet bool - code string - codeSet bool - category string - categorySet bool - currencyCode string - currencyCodeSet bool -} - -// NewItem creates a new Item Hit Type. -// A unique identifier for the transaction. This value should -// be the same for both the Transaction hit and Items hits -// associated to the particular transaction. -// Specifies the item name. - -func NewItem(iD string, name string) *Item { - h := &Item{ - iD: iD, - name: name, - } - return h -} - -func (h *Item) addFields(v url.Values) error { - v.Add("ti", h.iD) - v.Add("in", h.name) - if h.priceSet { - v.Add("ip", float2str(h.price)) - } - if h.quantitySet { - v.Add("iq", int2str(h.quantity)) - } - if h.codeSet { - v.Add("ic", h.code) - } - if h.categorySet { - v.Add("iv", h.category) - } - if h.currencyCodeSet { - v.Add("cu", h.currencyCode) - } - return nil -} - -// Specifies the price for a single item / unit. -func (h *Item) Price(price float64) *Item { - h.price = price - h.priceSet = true - return h -} - -// Specifies the number of items purchased. -func (h *Item) Quantity(quantity int64) *Item { - h.quantity = quantity - h.quantitySet = true - return h -} - -// Specifies the SKU or item code. -func (h *Item) Code(code string) *Item { - h.code = code - h.codeSet = true - return h -} - -// Specifies the category that the item belongs to. -func (h *Item) Category(category string) *Item { - h.category = category - h.categorySet = true - return h -} - -// When present indicates the local currency for all transaction -// currency values. Value should be a valid ISO 4217 currency -// code. -func (h *Item) CurrencyCode(currencyCode string) *Item { - h.currencyCode = currencyCode - h.currencyCodeSet = true - return h -} - -func (h *Item) Copy() *Item { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-pageview.go b/vendor/github.com/jpillora/go-ogle-analytics/type-pageview.go deleted file mode 100644 index bc8bc5408..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-pageview.go +++ /dev/null @@ -1,24 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Pageview Hit Type -type Pageview struct { -} - -// NewPageview creates a new Pageview Hit Type. -func NewPageview() *Pageview { - h := &Pageview{} - return h -} - -func (h *Pageview) addFields(v url.Values) error { - return nil -} - -func (h *Pageview) Copy() *Pageview { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-screenview.go b/vendor/github.com/jpillora/go-ogle-analytics/type-screenview.go deleted file mode 100644 index 859a16e37..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-screenview.go +++ /dev/null @@ -1,24 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Screenview Hit Type -type Screenview struct { -} - -// NewScreenview creates a new Screenview Hit Type. -func NewScreenview() *Screenview { - h := &Screenview{} - return h -} - -func (h *Screenview) addFields(v url.Values) error { - return nil -} - -func (h *Screenview) Copy() *Screenview { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-social.go b/vendor/github.com/jpillora/go-ogle-analytics/type-social.go deleted file mode 100644 index 3f8cb34d3..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-social.go +++ /dev/null @@ -1,41 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Social Hit Type -type Social struct { - network string - action string - actionTarget string -} - -// NewSocial creates a new Social Hit Type. -// Specifies the social network, for example Facebook or Google -// Plus. -// Specifies the social interaction action. For example on -// Google Plus when a user clicks the +1 button, the social -// action is 'plus'. -// Specifies the target of a social interaction. This value -// is typically a URL but can be any text. -func NewSocial(network string, action string, actionTarget string) *Social { - h := &Social{ - network: network, - action: action, - actionTarget: actionTarget, - } - return h -} - -func (h *Social) addFields(v url.Values) error { - v.Add("sn", h.network) - v.Add("sa", h.action) - v.Add("st", h.actionTarget) - return nil -} - -func (h *Social) Copy() *Social { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-timing.go b/vendor/github.com/jpillora/go-ogle-analytics/type-timing.go deleted file mode 100644 index a980520db..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-timing.go +++ /dev/null @@ -1,177 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Timing Hit Type -type Timing struct { - userTimingCategory string - userTimingCategorySet bool - userTimingVariableName string - userTimingVariableNameSet bool - userTimingTime int64 - userTimingTimeSet bool - userTimingLabel string - userTimingLabelSet bool - pageLoadTime int64 - pageLoadTimeSet bool - dNSTime int64 - dNSTimeSet bool - pageDownloadTime int64 - pageDownloadTimeSet bool - redirectResponseTime int64 - redirectResponseTimeSet bool - tCPConnectTime int64 - tCPConnectTimeSet bool - serverResponseTime int64 - serverResponseTimeSet bool - dOMInteractiveTime int64 - dOMInteractiveTimeSet bool - contentLoadTime int64 - contentLoadTimeSet bool -} - -// NewTiming creates a new Timing Hit Type. - -func NewTiming() *Timing { - h := &Timing{} - return h -} - -func (h *Timing) addFields(v url.Values) error { - if h.userTimingCategorySet { - v.Add("utc", h.userTimingCategory) - } - if h.userTimingVariableNameSet { - v.Add("utv", h.userTimingVariableName) - } - if h.userTimingTimeSet { - v.Add("utt", int2str(h.userTimingTime)) - } - if h.userTimingLabelSet { - v.Add("utl", h.userTimingLabel) - } - if h.pageLoadTimeSet { - v.Add("plt", int2str(h.pageLoadTime)) - } - if h.dNSTimeSet { - v.Add("dns", int2str(h.dNSTime)) - } - if h.pageDownloadTimeSet { - v.Add("pdt", int2str(h.pageDownloadTime)) - } - if h.redirectResponseTimeSet { - v.Add("rrt", int2str(h.redirectResponseTime)) - } - if h.tCPConnectTimeSet { - v.Add("tcp", int2str(h.tCPConnectTime)) - } - if h.serverResponseTimeSet { - v.Add("srt", int2str(h.serverResponseTime)) - } - if h.dOMInteractiveTimeSet { - v.Add("dit", int2str(h.dOMInteractiveTime)) - } - if h.contentLoadTimeSet { - v.Add("clt", int2str(h.contentLoadTime)) - } - return nil -} - -// Specifies the user timing category. -func (h *Timing) UserTimingCategory(userTimingCategory string) *Timing { - h.userTimingCategory = userTimingCategory - h.userTimingCategorySet = true - return h -} - -// Specifies the user timing variable. -func (h *Timing) UserTimingVariableName(userTimingVariableName string) *Timing { - h.userTimingVariableName = userTimingVariableName - h.userTimingVariableNameSet = true - return h -} - -// Specifies the user timing value. The value is in milliseconds. -func (h *Timing) UserTimingTime(userTimingTime int64) *Timing { - h.userTimingTime = userTimingTime - h.userTimingTimeSet = true - return h -} - -// Specifies the user timing label. -func (h *Timing) UserTimingLabel(userTimingLabel string) *Timing { - h.userTimingLabel = userTimingLabel - h.userTimingLabelSet = true - return h -} - -// Specifies the time it took for a page to load. The value -// is in milliseconds. -func (h *Timing) PageLoadTime(pageLoadTime int64) *Timing { - h.pageLoadTime = pageLoadTime - h.pageLoadTimeSet = true - return h -} - -// Specifies the time it took to do a DNS lookup.The value -// is in milliseconds. -func (h *Timing) DNSTime(dNSTime int64) *Timing { - h.dNSTime = dNSTime - h.dNSTimeSet = true - return h -} - -// Specifies the time it took for the page to be downloaded. -// The value is in milliseconds. -func (h *Timing) PageDownloadTime(pageDownloadTime int64) *Timing { - h.pageDownloadTime = pageDownloadTime - h.pageDownloadTimeSet = true - return h -} - -// Specifies the time it took for any redirects to happen. -// The value is in milliseconds. -func (h *Timing) RedirectResponseTime(redirectResponseTime int64) *Timing { - h.redirectResponseTime = redirectResponseTime - h.redirectResponseTimeSet = true - return h -} - -// Specifies the time it took for a TCP connection to be made. -// The value is in milliseconds. -func (h *Timing) TCPConnectTime(tCPConnectTime int64) *Timing { - h.tCPConnectTime = tCPConnectTime - h.tCPConnectTimeSet = true - return h -} - -// Specifies the time it took for the server to respond after -// the connect time. The value is in milliseconds. -func (h *Timing) ServerResponseTime(serverResponseTime int64) *Timing { - h.serverResponseTime = serverResponseTime - h.serverResponseTimeSet = true - return h -} - -// Specifies the time it took for Document.readyState to be -// 'interactive'. The value is in milliseconds. -func (h *Timing) DOMInteractiveTime(dOMInteractiveTime int64) *Timing { - h.dOMInteractiveTime = dOMInteractiveTime - h.dOMInteractiveTimeSet = true - return h -} - -// Specifies the time it took for the DOMContentLoaded Event -// to fire. The value is in milliseconds. -func (h *Timing) ContentLoadTime(contentLoadTime int64) *Timing { - h.contentLoadTime = contentLoadTime - h.contentLoadTimeSet = true - return h -} - -func (h *Timing) Copy() *Timing { - c := *h - return &c -} diff --git a/vendor/github.com/jpillora/go-ogle-analytics/type-transaction.go b/vendor/github.com/jpillora/go-ogle-analytics/type-transaction.go deleted file mode 100644 index 55c781e03..000000000 --- a/vendor/github.com/jpillora/go-ogle-analytics/type-transaction.go +++ /dev/null @@ -1,95 +0,0 @@ -package ga - -import "net/url" - -//WARNING: This file was generated. Do not edit. - -//Transaction Hit Type -type Transaction struct { - iD string - affiliation string - affiliationSet bool - revenue float64 - revenueSet bool - shipping float64 - shippingSet bool - tax float64 - taxSet bool - currencyCode string - currencyCodeSet bool -} - -// NewTransaction creates a new Transaction Hit Type. -// A unique identifier for the transaction. This value should -// be the same for both the Transaction hit and Items hits -// associated to the particular transaction. - -func NewTransaction(iD string) *Transaction { - h := &Transaction{ - iD: iD, - } - return h -} - -func (h *Transaction) addFields(v url.Values) error { - v.Add("ti", h.iD) - if h.affiliationSet { - v.Add("ta", h.affiliation) - } - if h.revenueSet { - v.Add("tr", float2str(h.revenue)) - } - if h.shippingSet { - v.Add("ts", float2str(h.shipping)) - } - if h.taxSet { - v.Add("tt", float2str(h.tax)) - } - if h.currencyCodeSet { - v.Add("cu", h.currencyCode) - } - return nil -} - -// Specifies the affiliation or store name. -func (h *Transaction) Affiliation(affiliation string) *Transaction { - h.affiliation = affiliation - h.affiliationSet = true - return h -} - -// Specifies the total revenue associated with the transaction. -// This value should include any shipping or tax costs. -func (h *Transaction) Revenue(revenue float64) *Transaction { - h.revenue = revenue - h.revenueSet = true - return h -} - -// Specifies the total shipping cost of the transaction. -func (h *Transaction) Shipping(shipping float64) *Transaction { - h.shipping = shipping - h.shippingSet = true - return h -} - -// Specifies the total tax of the transaction. -func (h *Transaction) Tax(tax float64) *Transaction { - h.tax = tax - h.taxSet = true - return h -} - -// When present indicates the local currency for all transaction -// currency values. Value should be a valid ISO 4217 currency -// code. -func (h *Transaction) CurrencyCode(currencyCode string) *Transaction { - h.currencyCode = currencyCode - h.currencyCodeSet = true - return h -} - -func (h *Transaction) Copy() *Transaction { - c := *h - return &c -} diff --git a/vendor/go.bytebuilders.dev/license-verifier/Makefile b/vendor/go.bytebuilders.dev/license-verifier/Makefile index 46d9217cb..083435503 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/Makefile +++ b/vendor/go.bytebuilders.dev/license-verifier/Makefile @@ -61,10 +61,10 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) windows/amd64 darwin/amd64 OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS)) ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) -BASEIMAGE_PROD ?= gcr.io/distroless/static:nonroot +BASEIMAGE_PROD ?= gcr.io/distroless/static-debian10 BASEIMAGE_DBG ?= debian:buster -GO_VERSION ?= 1.16 +GO_VERSION ?= 1.17 BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION) OUTBIN = bin/$(OS)_$(ARCH)/$(BIN) diff --git a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go new file mode 100644 index 000000000..c2c59bd77 --- /dev/null +++ b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/helper.go @@ -0,0 +1,21 @@ +/* +Copyright AppsCode Inc. and Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +func (l License) DisableAnalytics() bool { + return len(l.FeatureFlags) > 0 && l.FeatureFlags["DisableAnalytics"] == "true" +} diff --git a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go index f5528e624..78dc72f03 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go +++ b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/types.go @@ -26,16 +26,19 @@ import ( type License struct { metav1.TypeMeta `json:",inline,omitempty"` - Issuer string `json:"issuer,omitempty"` // byte.builders - Features []string `json:"features,omitempty"` - PlanName string `json:"planName,omitempty"` - Clusters []string `json:"clusters,omitempty"` // cluster_id ? - User *User `json:"user,omitempty"` - NotBefore *metav1.Time `json:"notBefore,omitempty"` // start of subscription start - NotAfter *metav1.Time `json:"notAfter,omitempty"` // if set, use this - ID string `json:"id,omitempty"` // license ID - Status LicenseStatus `json:"status"` - Reason string `json:"reason"` + Issuer string `json:"issuer,omitempty"` // byte.builders + ProductLine string `json:"productLine,omitempty"` + TierName string `json:"tierName,omitempty"` + PlanName string `json:"planName,omitempty"` + Features []string `json:"features,omitempty"` + FeatureFlags map[string]string `json:"featureFlags,omitempty"` + Clusters []string `json:"clusters,omitempty"` // cluster_id ? + User *User `json:"user,omitempty"` + NotBefore *metav1.Time `json:"notBefore,omitempty"` // start of subscription start + NotAfter *metav1.Time `json:"notAfter,omitempty"` // if set, use this + ID string `json:"id,omitempty"` // license ID + Status LicenseStatus `json:"status"` + Reason string `json:"reason"` } type User struct { diff --git a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go index d57524e32..12f3b7127 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* @@ -33,6 +34,13 @@ func (in *License) DeepCopyInto(out *License) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.FeatureFlags != nil { + in, out := &in.FeatureFlags, &out.FeatureFlags + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } if in.Clusters != nil { in, out := &in.Clusters, &out.Clusters *out = make([]string, len(*in)) diff --git a/vendor/go.bytebuilders.dev/license-verifier/info/lib.go b/vendor/go.bytebuilders.dev/license-verifier/info/lib.go index 586805186..f2b760cfe 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/info/lib.go +++ b/vendor/go.bytebuilders.dev/license-verifier/info/lib.go @@ -16,7 +16,11 @@ limitations under the License. package info -import "strconv" +import ( + "net/url" + "path" + "strconv" +) var ( EnforceLicense string @@ -28,8 +32,9 @@ var ( ProductName string // This has been renamed to Features ProductUID string - prodRegistrationAPIEndpoint string = "https://byte.builders/api/v1/register" - qaRegistrationAPIEndpoint string = "https://appscode.ninja/api/v1/register" + prodAddress = "https://byte.builders" + qaAddress = "https://appscode.ninja" + registrationAPIPath = "api/v1/register" ) func SkipLicenseVerification() bool { @@ -38,8 +43,16 @@ func SkipLicenseVerification() bool { } func RegistrationAPIEndpoint() string { + u := APIServerAddress() + u.Path = path.Join(u.Path, registrationAPIPath) + return u.String() +} + +func APIServerAddress() *url.URL { if SkipLicenseVerification() { - return qaRegistrationAPIEndpoint + u, _ := url.Parse(qaAddress) + return u } - return prodRegistrationAPIEndpoint + u, _ := url.Parse(prodAddress) + return u } diff --git a/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod b/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod index 2b6d11a99..f31e9296e 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod +++ b/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.mod @@ -4,14 +4,14 @@ go 1.16 require ( github.com/gogo/protobuf v1.3.2 - go.bytebuilders.dev/license-verifier v0.9.3 + go.bytebuilders.dev/license-verifier v0.9.5 k8s.io/api v0.21.1 k8s.io/apimachinery v0.21.1 k8s.io/apiserver v0.21.1 k8s.io/client-go v0.21.1 k8s.io/klog/v2 v2.8.0 k8s.io/kube-aggregator v0.21.1 - kmodules.xyz/client-go v0.0.0-20210822203828-5e9cebbf1dfa + kmodules.xyz/client-go v0.0.0-20211107190155-5bb4090d2728 ) replace go.bytebuilders.dev/license-verifier => ./.. diff --git a/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.sum b/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.sum index 9f2bbe0bf..31454e5f8 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.sum +++ b/vendor/go.bytebuilders.dev/license-verifier/kubernetes/go.sum @@ -32,6 +32,7 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -42,6 +43,10 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -49,19 +54,27 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -69,8 +82,10 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe/go.mod h1:VQx0hjo2oUeQkQUET7wRwradO6f+fN5jzXgB/zROxxE= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -83,6 +98,7 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -98,10 +114,15 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= @@ -114,6 +135,8 @@ github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGE github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -127,6 +150,7 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -182,10 +206,13 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -217,6 +244,7 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -226,8 +254,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -250,6 +279,9 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -260,7 +292,9 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -271,6 +305,7 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -283,17 +318,21 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef/go.mod h1:PlwhC7q1VSK73InDzdDatVetQrTsQHIbOvcJAZzitY0= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -302,7 +341,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -317,6 +355,9 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -361,63 +402,99 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= @@ -430,6 +507,7 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= @@ -447,6 +525,9 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -463,6 +544,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= @@ -478,10 +560,13 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -489,15 +574,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -506,6 +596,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -550,6 +641,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-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-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -597,6 +689,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -616,6 +709,7 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -636,8 +730,9 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 h1:JWgyZ1qgdTaF3N3oxC+MdTV7qvEEgHo3otj+HB5CM7Q= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= +golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= @@ -654,9 +749,11 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -677,6 +774,8 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -686,6 +785,7 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -704,7 +804,7 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4= +gomodules.xyz/homedir v0.1.0/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d h1:i6r7bk2jF965W3xmORgz+KYhlH608oRvrAPpcNHorlo= @@ -712,8 +812,9 @@ gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d/go.mod h1:i2WNHvGpzLKI gomodules.xyz/password-generator v0.2.7/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg= gomodules.xyz/pointer v0.1.0 h1:sG2UKrYVSo6E3r4itAjXfPfe4fuXMi0KdyTHpR3vGCg= gomodules.xyz/pointer v0.1.0/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo= -gomodules.xyz/sets v0.1.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= -gomodules.xyz/x v0.0.7/go.mod h1:CMXe28rpApV30pPw9cxdyEmvoC+aa5LiAqzks9dlxag= +gomodules.xyz/sets v0.2.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= +gomodules.xyz/x v0.0.8/go.mod h1:YnL5CAnLrEtAV/NQGn5sKJe6u08/vDlRyJddXIuD9mc= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -725,6 +826,7 @@ google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= @@ -736,6 +838,7 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -752,11 +855,15 @@ google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -782,6 +889,7 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -790,6 +898,7 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -806,6 +915,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -835,10 +945,11 @@ k8s.io/kube-aggregator v0.21.1/go.mod h1:cAZ0n02IiSl57sQSHz4vvrz3upQRMbytOiZnpPJ k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210527160623-6fdb442a123b h1:MSqsVQ3pZvPGTqCjptfimO2WjG7A9un2zcpiHkA6M/s= k8s.io/utils v0.0.0-20210527160623-6fdb442a123b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -kmodules.xyz/client-go v0.0.0-20210822203828-5e9cebbf1dfa h1:RVNXgIIDBHCW0YMOEUBhTK00ADcBi8THLBBGo9uevp0= -kmodules.xyz/client-go v0.0.0-20210822203828-5e9cebbf1dfa/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176 h1:Mx0aa+SUAcNRQbs5jUzV8lkDlGFU8laZsY9jrcVX5SY= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +kmodules.xyz/client-go v0.0.0-20211107190155-5bb4090d2728 h1:wfpdSr2OID1uAD59HtupacI+c3o+UyEdeCL/qrKasdE= +kmodules.xyz/client-go v0.0.0-20211107190155-5bb4090d2728/go.mod h1:ENUu8pPK19xzBkVpAJHoGCI2QRvb1SqffWRt0K2sV5I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= @@ -848,8 +959,10 @@ sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0Z sigs.k8s.io/kustomize/api v0.8.8/go.mod h1:He1zoK0nk43Pc6NlV085xDXDXTNprtcyKZVm3swsdNY= sigs.k8s.io/kustomize/kyaml v0.10.17/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4cPcfUVt5Hg= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/vendor/go.bytebuilders.dev/license-verifier/kubernetes/lib.go b/vendor/go.bytebuilders.dev/license-verifier/kubernetes/lib.go index 75980eae1..278e65fda 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/kubernetes/lib.go +++ b/vendor/go.bytebuilders.dev/license-verifier/kubernetes/lib.go @@ -207,7 +207,7 @@ func (le *LicenseEnforcer) LoadLicense() v1alpha1.License { block, _ := pem.Decode(le.opts.License) if block == nil { // This probably is a JWT token, should be check for that when ready - license, _ := verifier.BadLicense(errors.New("failed to parse certificate PEM")) + license, _ := verifier.BadLicense(fmt.Errorf("failed to parse certificate PEM %s", string(le.opts.License))) return license } diff --git a/vendor/go.bytebuilders.dev/license-verifier/lib.go b/vendor/go.bytebuilders.dev/license-verifier/lib.go index ed0c47ffb..8e3b4f712 100644 --- a/vendor/go.bytebuilders.dev/license-verifier/lib.go +++ b/vendor/go.bytebuilders.dev/license-verifier/lib.go @@ -102,6 +102,28 @@ func VerifyLicense(opts *Options) (v1alpha1.License, error) { license.PlanName = "stash-community" } } + if len(cert.Subject.Country) > 0 { + license.ProductLine = cert.Subject.Country[0] + } + if len(cert.Subject.Province) > 0 { + license.TierName = cert.Subject.Province[0] + } + if license.ProductLine == "" || license.TierName == "" { + parts := strings.SplitN(license.PlanName, "-", 2) + if len(parts) > 0 { + license.ProductLine = parts[0] + } + if len(parts) > 1 { + license.TierName = parts[1] + } + } + license.FeatureFlags = map[string]string{} + for _, ff := range cert.Subject.Locality { + parts := strings.SplitN(ff, "=", 2) + if len(parts) == 2 { + license.FeatureFlags[parts[0]] = parts[1] + } + } var user *v1alpha1.User for _, e := range cert.EmailAddresses { diff --git a/vendor/gomodules.xyz/flags/go.mod b/vendor/gomodules.xyz/flags/go.mod index 5ae74d0d4..ed6873dea 100644 --- a/vendor/gomodules.xyz/flags/go.mod +++ b/vendor/gomodules.xyz/flags/go.mod @@ -5,5 +5,5 @@ go 1.16 require ( github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 - gomodules.xyz/sets v0.1.0 + gomodules.xyz/sets v0.2.0 ) diff --git a/vendor/gomodules.xyz/flags/go.sum b/vendor/gomodules.xyz/flags/go.sum index f5402d0c0..3786ed8ee 100644 --- a/vendor/gomodules.xyz/flags/go.sum +++ b/vendor/gomodules.xyz/flags/go.sum @@ -248,8 +248,8 @@ golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/sets v0.1.0 h1:G/9/DV98gZw4uTLe9gNOnctk57P5kW8bYcBYOaFyAzM= -gomodules.xyz/sets v0.1.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= +gomodules.xyz/sets v0.2.0 h1:T8YPBWDaPGh/+HBjfL2JYdWeNqxNMoMofEdlvhLKE9w= +gomodules.xyz/sets v0.2.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= diff --git a/vendor/gomodules.xyz/homedir/LICENSE b/vendor/gomodules.xyz/homedir/LICENSE deleted file mode 100644 index d64569567..000000000 --- a/vendor/gomodules.xyz/homedir/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/vendor/gomodules.xyz/homedir/README.md b/vendor/gomodules.xyz/homedir/README.md deleted file mode 100644 index c65b4340c..000000000 --- a/vendor/gomodules.xyz/homedir/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# homedir - -Fork of https://github.com/kubernetes/client-go/tree/master/util/homedir diff --git a/vendor/gomodules.xyz/homedir/go.mod b/vendor/gomodules.xyz/homedir/go.mod deleted file mode 100644 index b540181a2..000000000 --- a/vendor/gomodules.xyz/homedir/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module gomodules.xyz/homedir - -go 1.15 diff --git a/vendor/gomodules.xyz/homedir/homedir.go b/vendor/gomodules.xyz/homedir/homedir.go deleted file mode 100644 index 3fdbeb8cf..000000000 --- a/vendor/gomodules.xyz/homedir/homedir.go +++ /dev/null @@ -1,92 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package homedir - -import ( - "os" - "path/filepath" - "runtime" -) - -// HomeDir returns the home directory for the current user. -// On Windows: -// 1. the first of %HOME%, %HOMEDRIVE%%HOMEPATH%, %USERPROFILE% containing a `.kube\config` file is returned. -// 2. if none of those locations contain a `.kube\config` file, the first of %HOME%, %USERPROFILE%, %HOMEDRIVE%%HOMEPATH% that exists and is writeable is returned. -// 3. if none of those locations are writeable, the first of %HOME%, %USERPROFILE%, %HOMEDRIVE%%HOMEPATH% that exists is returned. -// 4. if none of those locations exists, the first of %HOME%, %USERPROFILE%, %HOMEDRIVE%%HOMEPATH% that is set is returned. -func HomeDir() string { - if runtime.GOOS == "windows" { - home := os.Getenv("HOME") - homeDriveHomePath := "" - if homeDrive, homePath := os.Getenv("HOMEDRIVE"), os.Getenv("HOMEPATH"); len(homeDrive) > 0 && len(homePath) > 0 { - homeDriveHomePath = homeDrive + homePath - } - userProfile := os.Getenv("USERPROFILE") - - // Return first of %HOME%, %HOMEDRIVE%/%HOMEPATH%, %USERPROFILE% that contains a `.kube\config` file. - // %HOMEDRIVE%/%HOMEPATH% is preferred over %USERPROFILE% for backwards-compatibility. - for _, p := range []string{home, homeDriveHomePath, userProfile} { - if len(p) == 0 { - continue - } - if _, err := os.Stat(filepath.Join(p, ".kube", "config")); err != nil { - continue - } - return p - } - - firstSetPath := "" - firstExistingPath := "" - - // Prefer %USERPROFILE% over %HOMEDRIVE%/%HOMEPATH% for compatibility with other auth-writing tools - for _, p := range []string{home, userProfile, homeDriveHomePath} { - if len(p) == 0 { - continue - } - if len(firstSetPath) == 0 { - // remember the first path that is set - firstSetPath = p - } - info, err := os.Stat(p) - if err != nil { - continue - } - if len(firstExistingPath) == 0 { - // remember the first path that exists - firstExistingPath = p - } - if info.IsDir() && info.Mode().Perm()&(1<<(uint(7))) != 0 { - // return first path that is writeable - return p - } - } - - // If none are writeable, return first location that exists - if len(firstExistingPath) > 0 { - return firstExistingPath - } - - // If none exist, return first location that is set - if len(firstSetPath) > 0 { - return firstSetPath - } - - // We've got nothing - return "" - } - return os.Getenv("HOME") -} diff --git a/vendor/gomodules.xyz/logs/go.mod b/vendor/gomodules.xyz/logs/go.mod index de0fcbc6c..554c6d027 100644 --- a/vendor/gomodules.xyz/logs/go.mod +++ b/vendor/gomodules.xyz/logs/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 - gomodules.xyz/flags v0.1.2 - gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 + gomodules.xyz/flags v0.1.3 + gomodules.xyz/wait v0.2.0 k8s.io/klog/v2 v2.8.0 ) diff --git a/vendor/gomodules.xyz/logs/go.sum b/vendor/gomodules.xyz/logs/go.sum index 6035e3941..1ab9cf799 100644 --- a/vendor/gomodules.xyz/logs/go.sum +++ b/vendor/gomodules.xyz/logs/go.sum @@ -252,12 +252,12 @@ golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f h1:hTyhR4r+tj1Uq7/PpFxLTzbeA0LhMVp7bEYfhkzFjdY= gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f/go.mod h1:K3m7N+nBOlf91/tpv8REUGwsAgaKFwElQCuiLhm12AQ= -gomodules.xyz/flags v0.1.2 h1:z/XHHGmduLYY/aSkzcQWJgXWIs3TCTSTLkmwtCjoizg= -gomodules.xyz/flags v0.1.2/go.mod h1:CIzWYc2zYDs5lQyGJsjhqKgIj+LriNLpiYuX8Pk34gc= -gomodules.xyz/sets v0.1.0 h1:G/9/DV98gZw4uTLe9gNOnctk57P5kW8bYcBYOaFyAzM= -gomodules.xyz/sets v0.1.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= -gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 h1:iiD24jN1H8PzliVe1igIzYsx8+VmbXG12y9UUSupUJU= -gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545/go.mod h1:g/epKzZQuCqgvhzhaoG4cSBNGHqnOrhFR4Q7szDJ1JM= +gomodules.xyz/flags v0.1.3 h1:jQ06+EfmoMv5NvjXvJon03dOhLU+FF0TQMWN7I6qpzs= +gomodules.xyz/flags v0.1.3/go.mod h1:e+kvBLnqdEWGG670SKOYag1CXStM2Slrxq01OIK3tFs= +gomodules.xyz/sets v0.2.0 h1:T8YPBWDaPGh/+HBjfL2JYdWeNqxNMoMofEdlvhLKE9w= +gomodules.xyz/sets v0.2.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= +gomodules.xyz/wait v0.2.0 h1:HnRIh+cvIrrKIFaXoYznCVVirv2/2xu3KzjSzsQmYAY= +gomodules.xyz/wait v0.2.0/go.mod h1:g/epKzZQuCqgvhzhaoG4cSBNGHqnOrhFR4Q7szDJ1JM= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= diff --git a/vendor/gomodules.xyz/logs/lib.go b/vendor/gomodules.xyz/logs/lib.go index ca844da97..3bec711b2 100644 --- a/vendor/gomodules.xyz/logs/lib.go +++ b/vendor/gomodules.xyz/logs/lib.go @@ -75,9 +75,9 @@ func Init(rootCmd *cobra.Command, printFlags bool) { return } - fs := rootCmd.Flags() if fn := rootCmd.PersistentPreRunE; fn != nil { rootCmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error { + fs := cmd.Flags() if printFlags { flags.PrintFlags(fs) } @@ -86,6 +86,7 @@ func Init(rootCmd *cobra.Command, printFlags bool) { } } else if fn := rootCmd.PersistentPreRun; fn != nil { rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) { + fs := cmd.Flags() if printFlags { flags.PrintFlags(fs) } @@ -94,6 +95,7 @@ func Init(rootCmd *cobra.Command, printFlags bool) { } } else { rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) { + fs := cmd.Flags() if printFlags { flags.PrintFlags(fs) } diff --git a/vendor/gomodules.xyz/wait/README.md b/vendor/gomodules.xyz/wait/README.md index d3b13378c..c325fc92b 100644 --- a/vendor/gomodules.xyz/wait/README.md +++ b/vendor/gomodules.xyz/wait/README.md @@ -2,4 +2,4 @@ # wait -This library has been forked from https://github.com/kubernetes/apimachinery/tree/v0.18.8/pkg/util/wait so that it can easily used in non-k8s related projects. +This library has been forked from https://github.com/kubernetes/apimachinery/tree/v0.22.0-alpha.2/pkg/util/wait so that it can easily used in non-k8s related projects. diff --git a/vendor/gomodules.xyz/wait/wait.go b/vendor/gomodules.xyz/wait/wait.go index 17a69eb62..a53dfb8ac 100644 --- a/vendor/gomodules.xyz/wait/wait.go +++ b/vendor/gomodules.xyz/wait/wait.go @@ -204,10 +204,29 @@ var ErrWaitTimeout = errors.New("timed out waiting for the condition") // if the loop should be aborted. type ConditionFunc func() (done bool, err error) +// ConditionWithContextFunc returns true if the condition is satisfied, or an error +// if the loop should be aborted. +// +// The caller passes along a context that can be used by the condition function. +type ConditionWithContextFunc func(context.Context) (done bool, err error) + +// WithContext converts a ConditionFunc into a ConditionWithContextFunc +func (cf ConditionFunc) WithContext() ConditionWithContextFunc { + return func(context.Context) (done bool, err error) { + return cf() + } +} + // runConditionWithCrashProtection runs a ConditionFunc with crash protection func runConditionWithCrashProtection(condition ConditionFunc) (bool, error) { + return runConditionWithCrashProtectionWithContext(context.TODO(), condition.WithContext()) +} + +// runConditionWithCrashProtectionWithContext runs a +// ConditionWithContextFunc with crash protection. +func runConditionWithCrashProtectionWithContext(ctx context.Context, condition ConditionWithContextFunc) (bool, error) { defer handleCrash() - return condition() + return condition(ctx) } // Backoff holds parameters applied to a Backoff function. @@ -417,38 +436,42 @@ func ExponentialBackoff(backoff Backoff, condition ConditionFunc) error { // // If you want to Poll something forever, see PollInfinite. func Poll(interval, timeout time.Duration, condition ConditionFunc) error { - return pollInternal(poller(interval, timeout), condition) + return PollWithContext(context.Background(), interval, timeout, condition.WithContext()) } -func pollInternal(wait WaitFunc, condition ConditionFunc) error { - done := make(chan struct{}) - defer close(done) - return WaitFor(wait, condition, done) -} - -// PollImmediate tries a condition func until it returns true, an error, or the timeout -// is reached. +// PollWithContext tries a condition func until it returns true, an error, +// or when the context expires or the timeout is reached, whichever +// happens first. // -// PollImmediate always checks 'condition' before waiting for the interval. 'condition' -// will always be invoked at least once. +// PollWithContext always waits the interval before the run of 'condition'. +// 'condition' will always be invoked at least once. // // Some intervals may be missed if the condition takes too long or the time // window is too short. // -// If you want to immediately Poll something forever, see PollImmediateInfinite. -func PollImmediate(interval, timeout time.Duration, condition ConditionFunc) error { - return pollImmediateInternal(poller(interval, timeout), condition) +// If you want to Poll something forever, see PollInfinite. +func PollWithContext(ctx context.Context, interval, timeout time.Duration, condition ConditionWithContextFunc) error { + return poll(ctx, false, poller(interval, timeout), condition) } -func pollImmediateInternal(wait WaitFunc, condition ConditionFunc) error { - done, err := runConditionWithCrashProtection(condition) - if err != nil { - return err - } - if done { - return nil - } - return pollInternal(wait, condition) +// PollUntil tries a condition func until it returns true, an error or stopCh is +// closed. +// +// PollUntil always waits interval before the first run of 'condition'. +// 'condition' will always be invoked at least once. +func PollUntil(interval time.Duration, condition ConditionFunc, stopCh <-chan struct{}) error { + ctx, cancel := contextForChannel(stopCh) + defer cancel() + return PollUntilWithContext(ctx, interval, condition.WithContext()) +} + +// PollUntilWithContext tries a condition func until it returns true, +// an error or the specified context is cancelled or expired. +// +// PollUntilWithContext always waits interval before the first run of 'condition'. +// 'condition' will always be invoked at least once. +func PollUntilWithContext(ctx context.Context, interval time.Duration, condition ConditionWithContextFunc) error { + return poll(ctx, false, poller(interval, 0), condition) } // PollInfinite tries a condition func until it returns true or an error @@ -458,37 +481,45 @@ func pollImmediateInternal(wait WaitFunc, condition ConditionFunc) error { // Some intervals may be missed if the condition takes too long or the time // window is too short. func PollInfinite(interval time.Duration, condition ConditionFunc) error { - done := make(chan struct{}) - defer close(done) - return PollUntil(interval, condition, done) + return PollInfiniteWithContext(context.Background(), interval, condition.WithContext()) } -// PollImmediateInfinite tries a condition func until it returns true or an error +// PollInfiniteWithContext tries a condition func until it returns true or an error // -// PollImmediateInfinite runs the 'condition' before waiting for the interval. +// PollInfiniteWithContext always waits the interval before the run of 'condition'. // // Some intervals may be missed if the condition takes too long or the time // window is too short. -func PollImmediateInfinite(interval time.Duration, condition ConditionFunc) error { - done, err := runConditionWithCrashProtection(condition) - if err != nil { - return err - } - if done { - return nil - } - return PollInfinite(interval, condition) +func PollInfiniteWithContext(ctx context.Context, interval time.Duration, condition ConditionWithContextFunc) error { + return poll(ctx, false, poller(interval, 0), condition) } -// PollUntil tries a condition func until it returns true, an error or stopCh is -// closed. +// PollImmediate tries a condition func until it returns true, an error, or the timeout +// is reached. // -// PollUntil always waits interval before the first run of 'condition'. +// PollImmediate always checks 'condition' before waiting for the interval. 'condition' +// will always be invoked at least once. +// +// Some intervals may be missed if the condition takes too long or the time +// window is too short. +// +// If you want to immediately Poll something forever, see PollImmediateInfinite. +func PollImmediate(interval, timeout time.Duration, condition ConditionFunc) error { + return PollImmediateWithContext(context.Background(), interval, timeout, condition.WithContext()) +} + +// PollImmediateWithContext tries a condition func until it returns true, an error, +// or the timeout is reached or the specified context expires, whichever happens first. +// +// PollImmediateWithContext always checks 'condition' before waiting for the interval. // 'condition' will always be invoked at least once. -func PollUntil(interval time.Duration, condition ConditionFunc, stopCh <-chan struct{}) error { - ctx, cancel := contextForChannel(stopCh) - defer cancel() - return WaitFor(poller(interval, 0), condition, ctx.Done()) +// +// Some intervals may be missed if the condition takes too long or the time +// window is too short. +// +// If you want to immediately Poll something forever, see PollImmediateInfinite. +func PollImmediateWithContext(ctx context.Context, interval, timeout time.Duration, condition ConditionWithContextFunc) error { + return poll(ctx, true, poller(interval, timeout), condition) } // PollImmediateUntil tries a condition func until it returns true, an error or stopCh is closed. @@ -496,18 +527,67 @@ func PollUntil(interval time.Duration, condition ConditionFunc, stopCh <-chan st // PollImmediateUntil runs the 'condition' before waiting for the interval. // 'condition' will always be invoked at least once. func PollImmediateUntil(interval time.Duration, condition ConditionFunc, stopCh <-chan struct{}) error { - done, err := condition() - if err != nil { - return err - } - if done { - return nil + ctx, cancel := contextForChannel(stopCh) + defer cancel() + return PollImmediateUntilWithContext(ctx, interval, condition.WithContext()) +} + +// PollImmediateUntilWithContext tries a condition func until it returns true, +// an error or the specified context is cancelled or expired. +// +// PollImmediateUntilWithContext runs the 'condition' before waiting for the interval. +// 'condition' will always be invoked at least once. +func PollImmediateUntilWithContext(ctx context.Context, interval time.Duration, condition ConditionWithContextFunc) error { + return poll(ctx, true, poller(interval, 0), condition) +} + +// PollImmediateInfinite tries a condition func until it returns true or an error +// +// PollImmediateInfinite runs the 'condition' before waiting for the interval. +// +// Some intervals may be missed if the condition takes too long or the time +// window is too short. +func PollImmediateInfinite(interval time.Duration, condition ConditionFunc) error { + return PollImmediateInfiniteWithContext(context.Background(), interval, condition.WithContext()) +} + +// PollImmediateInfiniteWithContext tries a condition func until it returns true +// or an error or the specified context gets cancelled or expired. +// +// PollImmediateInfiniteWithContext runs the 'condition' before waiting for the interval. +// +// Some intervals may be missed if the condition takes too long or the time +// window is too short. +func PollImmediateInfiniteWithContext(ctx context.Context, interval time.Duration, condition ConditionWithContextFunc) error { + return poll(ctx, true, poller(interval, 0), condition) +} + +// Internally used, each of the the public 'Poll*' function defined in this +// package should invoke this internal function with appropriate parameters. +// ctx: the context specified by the caller, for infinite polling pass +// a context that never gets cancelled or expired. +// immediate: if true, the 'condition' will be invoked before waiting for the interval, +// in this case 'condition' will always be invoked at least once. +// wait: user specified WaitFunc function that controls at what interval the condition +// function should be invoked periodically and whether it is bound by a timeout. +// condition: user specified ConditionWithContextFunc function. +func poll(ctx context.Context, immediate bool, wait WaitWithContextFunc, condition ConditionWithContextFunc) error { + if immediate { + done, err := runConditionWithCrashProtectionWithContext(ctx, condition) + if err != nil { + return err + } + if done { + return nil + } } + select { - case <-stopCh: + case <-ctx.Done(): + // returning ctx.Err() will break backward compatibility return ErrWaitTimeout default: - return PollUntil(interval, condition, stopCh) + return WaitForWithContext(ctx, wait, condition) } } @@ -515,6 +595,20 @@ func PollImmediateUntil(interval time.Duration, condition ConditionFunc, stopCh // should be executed and is closed when the last test should be invoked. type WaitFunc func(done <-chan struct{}) <-chan struct{} +// WithContext converts the WaitFunc to an equivalent WaitWithContextFunc +func (w WaitFunc) WithContext() WaitWithContextFunc { + return func(ctx context.Context) <-chan struct{} { + return w(ctx.Done()) + } +} + +// WaitWithContextFunc creates a channel that receives an item every time a test +// should be executed and is closed when the last test should be invoked. +// +// When the specified context gets cancelled or expires the function +// stops sending item and returns immediately. +type WaitWithContextFunc func(ctx context.Context) <-chan struct{} + // WaitFor continually checks 'fn' as driven by 'wait'. // // WaitFor gets a channel from 'wait()'', and then invokes 'fn' once for every value @@ -531,13 +625,35 @@ type WaitFunc func(done <-chan struct{}) <-chan struct{} // "uniform pseudo-random", the `fn` might still run one or multiple time, // though eventually `WaitFor` will return. func WaitFor(wait WaitFunc, fn ConditionFunc, done <-chan struct{}) error { - stopCh := make(chan struct{}) - defer close(stopCh) - c := wait(stopCh) + ctx, cancel := contextForChannel(done) + defer cancel() + return WaitForWithContext(ctx, wait.WithContext(), fn.WithContext()) +} + +// WaitForWithContext continually checks 'fn' as driven by 'wait'. +// +// WaitForWithContext gets a channel from 'wait()'', and then invokes 'fn' +// once for every value placed on the channel and once more when the +// channel is closed. If the channel is closed and 'fn' +// returns false without error, WaitForWithContext returns ErrWaitTimeout. +// +// If 'fn' returns an error the loop ends and that error is returned. If +// 'fn' returns true the loop ends and nil is returned. +// +// context.Canceled will be returned if the ctx.Done() channel is closed +// without fn ever returning true. +// +// When the ctx.Done() channel is closed, because the golang `select` statement is +// "uniform pseudo-random", the `fn` might still run one or multiple times, +// though eventually `WaitForWithContext` will return. +func WaitForWithContext(ctx context.Context, wait WaitWithContextFunc, fn ConditionWithContextFunc) error { + waitCtx, cancel := context.WithCancel(context.Background()) + defer cancel() + c := wait(waitCtx) for { select { case _, open := <-c: - ok, err := runConditionWithCrashProtection(fn) + ok, err := runConditionWithCrashProtectionWithContext(ctx, fn) if err != nil { return err } @@ -547,7 +663,8 @@ func WaitFor(wait WaitFunc, fn ConditionFunc, done <-chan struct{}) error { if !open { return ErrWaitTimeout } - case <-done: + case <-ctx.Done(): + // returning ctx.Err() will break backward compatibility return ErrWaitTimeout } } @@ -563,8 +680,8 @@ func WaitFor(wait WaitFunc, fn ConditionFunc, done <-chan struct{}) error { // // Output ticks are not buffered. If the channel is not ready to receive an // item, the tick is skipped. -func poller(interval, timeout time.Duration) WaitFunc { - return WaitFunc(func(done <-chan struct{}) <-chan struct{} { +func poller(interval, timeout time.Duration) WaitWithContextFunc { + return WaitWithContextFunc(func(ctx context.Context) <-chan struct{} { ch := make(chan struct{}) go func() { @@ -594,7 +711,7 @@ func poller(interval, timeout time.Duration) WaitFunc { } case <-after: return - case <-done: + case <-ctx.Done(): return } } @@ -603,3 +720,32 @@ func poller(interval, timeout time.Duration) WaitFunc { return ch }) } + +// ExponentialBackoffWithContext works with a request context and a Backoff. It ensures that the retry wait never +// exceeds the deadline specified by the request context. +func ExponentialBackoffWithContext(ctx context.Context, backoff Backoff, condition ConditionFunc) error { + for backoff.Steps > 0 { + select { + case <-ctx.Done(): + return ctx.Err() + default: + } + + if ok, err := runConditionWithCrashProtection(condition); err != nil || ok { + return err + } + + if backoff.Steps == 1 { + break + } + + waitBeforeRetry := backoff.Step() + select { + case <-ctx.Done(): + return ctx.Err() + case <-time.After(waitBeforeRetry): + } + } + + return ErrWaitTimeout +} diff --git a/vendor/gomodules.xyz/x/analytics/analytics.go b/vendor/gomodules.xyz/x/analytics/analytics.go deleted file mode 100644 index 76295dae3..000000000 --- a/vendor/gomodules.xyz/x/analytics/analytics.go +++ /dev/null @@ -1,24 +0,0 @@ -package analytics - -import ( - "io/ioutil" - "os" - "path/filepath" - - "github.com/google/uuid" - "gomodules.xyz/homedir" -) - -func ClientID() string { - dir := filepath.Join(homedir.HomeDir(), ".appscode") - filename := filepath.Join(dir, "client-id") - id, err := ioutil.ReadFile(filename) - if os.IsNotExist(err) { - id := uuid.New().String() - if e2 := os.MkdirAll(dir, 0755); e2 == nil { - ioutil.WriteFile(filename, []byte(id), 0644) - } - return id - } - return string(id) -} diff --git a/vendor/kmodules.xyz/client-go/Makefile b/vendor/kmodules.xyz/client-go/Makefile index ac493f7d6..45d78307e 100644 --- a/vendor/kmodules.xyz/client-go/Makefile +++ b/vendor/kmodules.xyz/client-go/Makefile @@ -55,8 +55,8 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS)) ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) -BASEIMAGE_PROD ?= gcr.io/distroless/static-debian10 -BASEIMAGE_DBG ?= debian:buster +BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11 +BASEIMAGE_DBG ?= debian:bullseye GO_VERSION ?= 1.17 BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION) diff --git a/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go b/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go index 02cabbc08..a56f461d4 100644 --- a/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go +++ b/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go @@ -19,8 +19,6 @@ package v1 import ( "sort" - meta_util "kmodules.xyz/client-go/meta" - jsoniter "github.com/json-iterator/go" "gomodules.xyz/mergo" core "k8s.io/api/core/v1" @@ -270,11 +268,6 @@ func EnsureEnvVarDeleted(vars []core.EnvVar, name string) []core.EnvVar { return vars } -// Deprecated use meta_util.OverwriteKeys() -func UpsertMap(maps, upsert map[string]string) map[string]string { - return meta_util.OverwriteKeys(maps, upsert) -} - func MergeLocalObjectReferences(l1, l2 []core.LocalObjectReference) []core.LocalObjectReference { result := make([]core.LocalObjectReference, 0, len(l1)+len(l2)) m := make(map[string]core.LocalObjectReference) diff --git a/vendor/kmodules.xyz/client-go/dynamic/kubernetes.go b/vendor/kmodules.xyz/client-go/dynamic/kubernetes.go index 5ab1bfb8d..8e44bcfc9 100644 --- a/vendor/kmodules.xyz/client-go/dynamic/kubernetes.go +++ b/vendor/kmodules.xyz/client-go/dynamic/kubernetes.go @@ -386,3 +386,16 @@ func ResourcesNotExists( } return true, nil } + +func ClusterUID(client dynamic.Interface) (string, error) { + ns, err := client.Resource(schema.GroupVersionResource{ + Group: "", + Version: "v1", + Resource: "namespaces", + }).Get(context.TODO(), "kube-system", metav1.GetOptions{}) + if err != nil { + return "", err + } + clusterID, _, err := unstructured.NestedString(ns.UnstructuredContent(), "metadata", "uid") + return clusterID, err +} diff --git a/vendor/kmodules.xyz/client-go/meta/lib.go b/vendor/kmodules.xyz/client-go/meta/lib.go index 36ab7b402..bb7fdff01 100644 --- a/vendor/kmodules.xyz/client-go/meta/lib.go +++ b/vendor/kmodules.xyz/client-go/meta/lib.go @@ -72,7 +72,7 @@ func GetKind(v interface{}) string { } func FilterKeys(domainKey string, out, in map[string]string) map[string]string { - if in == nil { + if len(in) == 0 { return out } if out == nil { @@ -102,7 +102,7 @@ func FilterKeys(domainKey string, out, in map[string]string) map[string]string { } func MergeKeys(out, in map[string]string) map[string]string { - if in == nil { + if len(in) == 0 { return out } if out == nil { @@ -117,16 +117,22 @@ func MergeKeys(out, in map[string]string) map[string]string { return out } -func OverwriteKeys(out, in map[string]string) map[string]string { - if in == nil { +func OverwriteKeys(out map[string]string, ins ...map[string]string) map[string]string { + if len(ins) == 0 { return out } if out == nil { - out = make(map[string]string, len(in)) + n := 0 + for _, in := range ins { + n += len(in) + } + out = make(map[string]string, n) } - for k, v := range in { - out[k] = v + for _, in := range ins { + for k, v := range in { + out[k] = v + } } return out } diff --git a/vendor/kmodules.xyz/client-go/meta/preconditions.go b/vendor/kmodules.xyz/client-go/meta/preconditions.go new file mode 100644 index 000000000..0f7d914be --- /dev/null +++ b/vendor/kmodules.xyz/client-go/meta/preconditions.go @@ -0,0 +1,54 @@ +/* +Copyright AppsCode Inc. and Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package meta + +import ( + "fmt" + "strings" + + "k8s.io/apimachinery/pkg/util/mergepatch" + "k8s.io/apimachinery/pkg/util/sets" +) + +type PreConditionSet struct { + sets.String +} + +func (s PreConditionSet) PreconditionFunc() []mergepatch.PreconditionFunc { + preconditions := []mergepatch.PreconditionFunc{ + mergepatch.RequireKeyUnchanged("apiVersion"), + mergepatch.RequireKeyUnchanged("kind"), + mergepatch.RequireMetadataKeyUnchanged("name"), + mergepatch.RequireMetadataKeyUnchanged("namespace"), + } + + for _, field := range s.List() { + preconditions = append(preconditions, + RequireChainKeyUnchanged(field), + ) + } + return preconditions +} + +func (s PreConditionSet) Error() error { + strList := strings.Join(s.List(), "\n\t") + return fmt.Errorf(strings.Join([]string{`At least one of the following was changed: + apiVersion + kind + name + namespace`, strList}, "\n\t")) +} diff --git a/vendor/kmodules.xyz/client-go/tools/analytics/analytics.go b/vendor/kmodules.xyz/client-go/tools/analytics/analytics.go deleted file mode 100644 index f173a2a91..000000000 --- a/vendor/kmodules.xyz/client-go/tools/analytics/analytics.go +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright AppsCode Inc. and Contributors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package analytics - -import ( - "os" - - "kmodules.xyz/client-go/meta" - "kmodules.xyz/client-go/tools/clusterid" - - "gomodules.xyz/x/analytics" - kerr "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" -) - -const ( - Key = "APPSCODE_ANALYTICS_CLIENT_ID" -) - -func ClientID() string { - if id, found := os.LookupEnv(Key); found { - return id - } - - defer runtime.HandleCrash() - - if !meta.PossiblyInCluster() { - return analytics.ClientID() - } - - cfg, err := rest.InClusterConfig() - if err != nil { - return "$k8s$inclusterconfig" - } - client, err := kubernetes.NewForConfig(cfg) - if err != nil { - return "$k8s$newforconfig" - } - id, err := clusterid.ClusterUID(client.CoreV1().Namespaces()) - if err != nil { - return reasonForError(err) - } - return id -} - -func reasonForError(err error) string { - switch t := err.(type) { - case kerr.APIStatus: - return "$k8s$err$" + string(t.Status().Reason) - } - return "$k8s$err$" + trim(err.Error(), 32) // 32 = length of uuid -} - -func trim(s string, length int) string { - if len(s) > length { - return s[:length] - } - return s -} diff --git a/vendor/kmodules.xyz/client-go/tools/cli/cli.go b/vendor/kmodules.xyz/client-go/tools/cli/cli.go deleted file mode 100644 index 7bb2f5d87..000000000 --- a/vendor/kmodules.xyz/client-go/tools/cli/cli.go +++ /dev/null @@ -1,62 +0,0 @@ -/* -Copyright AppsCode Inc. and Contributors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package cli - -import ( - "context" - "strings" - "time" - - "kmodules.xyz/client-go/tools/analytics" - - ga "github.com/jpillora/go-ogle-analytics" - "github.com/spf13/cobra" -) - -const ( - gaTrackingCode = "UA-62096468-20" - gaTrackingInterval = 1 * time.Hour -) - -var ( - AnalyticsClientID = analytics.ClientID() - EnableAnalytics = true -) - -func SendAnalytics(c *cobra.Command, version string) { - if !EnableAnalytics { - return - } - if client, err := ga.NewClient(gaTrackingCode); err == nil { - client.ClientID(AnalyticsClientID) - parts := strings.Split(c.CommandPath(), " ") - _ = client.Send(ga.NewEvent(parts[0], strings.Join(parts[1:], "/")).Label(version)) - } -} - -func SendPeriodicAnalytics(c *cobra.Command, version string) context.CancelFunc { - if !EnableAnalytics { - return func() {} - } - ticker := time.NewTicker(gaTrackingInterval) - go func() { - for range ticker.C { - SendAnalytics(c, version) - } - }() - return ticker.Stop -} diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go index 44c386cdb..c6dec6553 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go @@ -16148,12 +16148,10 @@ func schema_custom_resources_apis_auditor_v1alpha1_SiteInfo(ref common.Reference }, "kubernetes": { SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("kmodules.xyz/custom-resources/apis/auditor/v1alpha1.KubernetesInfo"), + Ref: ref("kmodules.xyz/custom-resources/apis/auditor/v1alpha1.KubernetesInfo"), }, }, }, - Required: []string{"kubernetes"}, }, }, Dependencies: []string{ diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go index 973fca03d..063327cac 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go +++ b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go @@ -38,8 +38,8 @@ const ( type SiteInfo struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Product *ProductInfo `json:"product,omitempty"` - Kubernetes KubernetesInfo `json:"kubernetes"` + Product *ProductInfo `json:"product,omitempty"` + Kubernetes *KubernetesInfo `json:"kubernetes,omitempty"` } type Version struct { diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go index 88bdc5e84..9daa452c5 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go @@ -202,7 +202,11 @@ func (in *SiteInfo) DeepCopyInto(out *SiteInfo) { *out = new(ProductInfo) **out = **in } - in.Kubernetes.DeepCopyInto(&out.Kubernetes) + if in.Kubernetes != nil { + in, out := &in.Kubernetes, &out.Kubernetes + *out = new(KubernetesInfo) + (*in).DeepCopyInto(*out) + } return } diff --git a/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfoes.yaml b/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfoes.yaml deleted file mode 100644 index a57394eac..000000000 --- a/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfoes.yaml +++ /dev/null @@ -1,173 +0,0 @@ - ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - name: siteinfoes.auditor.appscode.com -spec: - group: auditor.appscode.com - names: - kind: SiteInfo - listKind: SiteInfoList - plural: siteinfoes - singular: siteinfo - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: SiteInfo captures information of a product deployment site. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - kubernetes: - properties: - clusterName: - description: https://github.com/kmodules/client-go/blob/master/tools/clusterid/lib.go - type: string - clusterUID: - type: string - controlPlane: - description: https://github.com/kmodules/client-go/blob/kubernetes-1.16.3/tools/analytics/analytics.go#L66 - properties: - dnsNames: - items: - type: string - type: array - emailAddresses: - items: - type: string - type: array - ipAddresses: - items: - type: string - type: array - notAfter: - format: date-time - type: string - notBefore: - format: date-time - type: string - uris: - items: - type: string - type: array - required: - - notAfter - - notBefore - type: object - nodeStats: - properties: - allocatable: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: Allocatable represents the resources of a node that - are available for scheduling. Defaults to Capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: 'Capacity represents the total resources of a node. - More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity' - type: object - count: - type: integer - type: object - version: - description: 'Info contains versioning information. TODO: Add []string - of api versions supported? It''s still unclear how we''ll want to - distribute that information.' - properties: - buildDate: - type: string - compiler: - type: string - gitCommit: - type: string - gitTreeState: - type: string - gitVersion: - type: string - goVersion: - type: string - major: - type: string - minor: - type: string - platform: - type: string - required: - - buildDate - - compiler - - gitCommit - - gitTreeState - - gitVersion - - goVersion - - major - - minor - - platform - type: object - required: - - nodeStats - type: object - metadata: - type: object - product: - properties: - licenseID: - type: string - productName: - description: This has been renamed to Features - type: string - productOwnerName: - type: string - productOwnerUID: - type: string - productUID: - type: string - version: - properties: - commitHash: - type: string - commitTimestamp: - type: string - compiler: - type: string - gitBranch: - type: string - gitTag: - type: string - goVersion: - type: string - platform: - type: string - version: - type: string - versionStrategy: - type: string - type: object - required: - - version - type: object - required: - - kubernetes - type: object - served: true - storage: true diff --git a/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml b/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml index 7121d65b3..49e0fd897 100644 --- a/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml +++ b/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml @@ -169,8 +169,6 @@ spec: required: - version type: object - required: - - kubernetes type: object served: true storage: true diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go index 9bdb1683a..7f89983fb 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go @@ -415,6 +415,7 @@ func init() { proto.RegisterType((*NiceSettings)(nil), "kmodules.xyz.offshoot_api.api.v1.NiceSettings") proto.RegisterType((*ObjectMeta)(nil), "kmodules.xyz.offshoot_api.api.v1.ObjectMeta") proto.RegisterMapType((map[string]string)(nil), "kmodules.xyz.offshoot_api.api.v1.ObjectMeta.AnnotationsEntry") + proto.RegisterMapType((map[string]string)(nil), "kmodules.xyz.offshoot_api.api.v1.ObjectMeta.LabelsEntry") proto.RegisterType((*PartialObjectMeta)(nil), "kmodules.xyz.offshoot_api.api.v1.PartialObjectMeta") proto.RegisterMapType((map[string]string)(nil), "kmodules.xyz.offshoot_api.api.v1.PartialObjectMeta.AnnotationsEntry") proto.RegisterMapType((map[string]string)(nil), "kmodules.xyz.offshoot_api.api.v1.PartialObjectMeta.LabelsEntry") @@ -435,135 +436,136 @@ func init() { } var fileDescriptor_3a450b99b211cb39 = []byte{ - // 2046 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0xc7, - 0x15, 0x36, 0x25, 0x52, 0xe2, 0x1e, 0x4a, 0x94, 0x34, 0x8a, 0x9c, 0xb5, 0xaa, 0x92, 0x2a, 0x5b, - 0x14, 0x0a, 0x1a, 0x2f, 0xa3, 0xc4, 0x05, 0x9c, 0x04, 0x75, 0xaa, 0xa5, 0x64, 0x5b, 0xa9, 0x2c, - 0x11, 0x43, 0x25, 0xbd, 0xa0, 0xb7, 0xd5, 0x72, 0x44, 0xad, 0xb5, 0xdc, 0x61, 0x77, 0x86, 0xb4, - 0x99, 0xa2, 0x68, 0x9e, 0xfb, 0xd4, 0x5f, 0xd0, 0x7f, 0xd0, 0x3f, 0xd0, 0xc7, 0xa2, 0x0f, 0x06, - 0x0a, 0x14, 0x79, 0xcc, 0x13, 0x51, 0xb3, 0xff, 0xc2, 0x45, 0x81, 0x62, 0x66, 0x67, 0x2f, 0x24, - 0x97, 0xd6, 0xc5, 0x76, 0x1e, 0x08, 0x70, 0xcf, 0xe5, 0x9b, 0x33, 0x67, 0xce, 0x65, 0xe6, 0xc0, - 0x7b, 0xe7, 0x6d, 0xda, 0xec, 0xba, 0x84, 0x19, 0x4f, 0xfb, 0x5f, 0x54, 0xe9, 0xe9, 0x29, 0x3b, - 0xa3, 0x94, 0xdf, 0xb6, 0x3a, 0x4e, 0x55, 0xfc, 0x7a, 0xdb, 0xd5, 0x16, 0xf1, 0x88, 0x6f, 0x71, - 0xd2, 0x34, 0x3a, 0x3e, 0xe5, 0x14, 0x6d, 0x26, 0x35, 0x8c, 0x50, 0xe3, 0x37, 0x56, 0xc7, 0x31, - 0xc4, 0xaf, 0xb7, 0xbd, 0x7e, 0xbb, 0xe5, 0xf0, 0xb3, 0xee, 0x89, 0x61, 0xd3, 0x76, 0xb5, 0x45, - 0x5b, 0xb4, 0x2a, 0x15, 0x4f, 0xba, 0xa7, 0xf2, 0x4b, 0x7e, 0xc8, 0x7f, 0x01, 0xe0, 0x7a, 0xe5, - 0xfc, 0x2e, 0x33, 0x1c, 0x2a, 0xd7, 0xb3, 0xa9, 0x4f, 0x52, 0x16, 0x5d, 0xbf, 0x13, 0xcb, 0xb4, - 0x2d, 0xfb, 0xcc, 0xf1, 0x88, 0xdf, 0xaf, 0x76, 0xce, 0x5b, 0x82, 0xc0, 0xaa, 0x6d, 0xc2, 0xad, - 0x14, 0xad, 0xca, 0xff, 0x72, 0xa0, 0xd7, 0xa8, 0xc7, 0x2d, 0x21, 0x8f, 0xbb, 0x1e, 0x77, 0xda, - 0xa4, 0x41, 0x38, 0x77, 0xbc, 0x16, 0x43, 0x3f, 0x07, 0xcd, 0x27, 0x8c, 0x76, 0x7d, 0x9b, 0x30, - 0x3d, 0xb3, 0x99, 0xd9, 0x2a, 0xbc, 0xbf, 0x65, 0x04, 0xcb, 0xc8, 0x8d, 0x08, 0x53, 0x8c, 0xde, - 0xb6, 0x81, 0x95, 0x10, 0x26, 0xbf, 0xeb, 0x3a, 0x3e, 0x69, 0x13, 0x8f, 0x33, 0x73, 0xe5, 0xd9, - 0xa0, 0x7c, 0x63, 0x38, 0x28, 0x6b, 0x21, 0x97, 0xe1, 0x18, 0x0d, 0x61, 0x58, 0x74, 0x9d, 0x1e, - 0xf1, 0x08, 0x63, 0x75, 0x9f, 0x9e, 0x10, 0x7d, 0x46, 0xc2, 0xdf, 0x4a, 0x83, 0x97, 0x02, 0xe6, - 0xca, 0x70, 0x50, 0x5e, 0x3c, 0x48, 0xea, 0xe0, 0x51, 0x08, 0xf4, 0x19, 0x14, 0x7d, 0x62, 0x35, - 0x9d, 0x18, 0x74, 0xf6, 0x22, 0x50, 0x34, 0x1c, 0x94, 0x8b, 0x78, 0x44, 0x09, 0x8f, 0x81, 0xa0, - 0x4f, 0x41, 0x73, 0x9d, 0x53, 0x62, 0xf7, 0x6d, 0x97, 0xe8, 0x59, 0x89, 0xf8, 0xed, 0x34, 0xc4, - 0x83, 0x50, 0xc8, 0x5c, 0x14, 0xdb, 0x8e, 0x3e, 0x71, 0xac, 0x8e, 0x4e, 0x60, 0x89, 0x11, 0xbb, - 0xeb, 0x3b, 0xbc, 0x2f, 0xbc, 0x4e, 0x9e, 0x72, 0x3d, 0x27, 0x11, 0xbf, 0x9b, 0x86, 0xd8, 0x18, - 0x15, 0x35, 0x57, 0x87, 0x83, 0xf2, 0xd2, 0x18, 0x11, 0x8f, 0x03, 0xa2, 0x03, 0xc8, 0x7a, 0x8e, - 0x4d, 0xf4, 0x39, 0x09, 0x6c, 0x18, 0x17, 0x05, 0xa3, 0x71, 0xe8, 0xd8, 0xd1, 0x99, 0x9b, 0xf9, - 0xe1, 0xa0, 0x9c, 0x15, 0x14, 0x2c, 0x51, 0xd0, 0x31, 0xcc, 0x39, 0x54, 0xe2, 0xcd, 0x4b, 0xbc, - 0xf7, 0x2e, 0xc6, 0xdb, 0x3f, 0x1a, 0x41, 0x84, 0xe1, 0xa0, 0x3c, 0x17, 0xd0, 0xb0, 0xc2, 0x42, - 0x07, 0x30, 0x4f, 0xbc, 0xde, 0x7d, 0x9f, 0xb6, 0xf5, 0xfc, 0xe6, 0xec, 0x56, 0xe1, 0xfd, 0xef, - 0xa4, 0xed, 0x7f, 0x2f, 0x10, 0x69, 0xc8, 0x98, 0x31, 0x97, 0x54, 0x40, 0xcd, 0x2b, 0x32, 0x0e, - 0x21, 0xd0, 0x87, 0x30, 0x4b, 0xbc, 0x9e, 0xae, 0x49, 0xa4, 0xf5, 0x29, 0x48, 0x9f, 0x5b, 0xbe, - 0x59, 0x50, 0x10, 0xb3, 0x7b, 0x5e, 0x0f, 0x0b, 0x9d, 0xca, 0xaf, 0xa1, 0x38, 0x6a, 0x2e, 0x2a, - 0x43, 0xce, 0x76, 0x2d, 0x16, 0x04, 0x7c, 0xce, 0xd4, 0x86, 0x83, 0x72, 0xae, 0x26, 0x08, 0x38, - 0xa0, 0xa3, 0x1f, 0x80, 0x26, 0xff, 0xec, 0x5a, 0xdc, 0x92, 0x61, 0x9b, 0x0b, 0x0e, 0xbc, 0x16, - 0x12, 0x71, 0xcc, 0xaf, 0xdc, 0x83, 0x85, 0x11, 0x74, 0x03, 0xc0, 0x6a, 0x3e, 0xee, 0x32, 0x2e, - 0x92, 0x44, 0x2d, 0x51, 0x1c, 0x0e, 0xca, 0xb0, 0x13, 0x51, 0x71, 0x42, 0xa2, 0xf2, 0xf7, 0x0c, - 0xc0, 0xd1, 0xc9, 0x63, 0x62, 0xf3, 0x47, 0x84, 0x5b, 0x88, 0x43, 0xc1, 0xf2, 0x3c, 0xca, 0x2d, - 0xee, 0x50, 0x4f, 0x98, 0x28, 0x76, 0xfc, 0xa3, 0x8b, 0x8f, 0x24, 0x86, 0x30, 0x76, 0x62, 0xfd, - 0x3d, 0x8f, 0xfb, 0x7d, 0x73, 0x55, 0x39, 0xa5, 0x90, 0xe0, 0xe0, 0xe4, 0x32, 0xeb, 0xf7, 0x60, - 0x79, 0x5c, 0x0b, 0x2d, 0xc3, 0xec, 0x39, 0xe9, 0xcb, 0x1d, 0x68, 0x58, 0xfc, 0x45, 0x6f, 0x41, - 0xae, 0x67, 0xb9, 0xdd, 0x20, 0x95, 0x35, 0x1c, 0x7c, 0x7c, 0x34, 0x73, 0x37, 0x53, 0x79, 0x91, - 0x85, 0x95, 0xba, 0xe5, 0x73, 0xc7, 0x72, 0x13, 0x7b, 0xd9, 0x84, 0xac, 0x67, 0xb5, 0x49, 0x00, - 0x61, 0x2e, 0x28, 0x2b, 0xb2, 0x87, 0x56, 0x5b, 0xc4, 0x9e, 0xd5, 0x26, 0xe8, 0x2e, 0x2c, 0x84, - 0xf5, 0x4a, 0x50, 0x03, 0x60, 0xf3, 0x2d, 0x25, 0xb9, 0xf0, 0x20, 0xc1, 0xc3, 0x23, 0x92, 0xa8, - 0x0a, 0x9a, 0x40, 0x60, 0x1d, 0xcb, 0x0e, 0xaa, 0x80, 0x16, 0xd7, 0xa3, 0xc3, 0x90, 0x81, 0x63, - 0x19, 0xd4, 0x82, 0x39, 0xd7, 0x3a, 0x21, 0x2e, 0xd3, 0xb3, 0xd2, 0xa7, 0x9f, 0x5c, 0xec, 0xd3, - 0x89, 0x1d, 0x19, 0x07, 0x12, 0x21, 0xf0, 0x6a, 0x51, 0x2d, 0x37, 0x17, 0x10, 0xb1, 0x82, 0x47, - 0xbf, 0x1f, 0x3d, 0xc1, 0x9c, 0x5c, 0x6d, 0xf7, 0x3a, 0xab, 0x5d, 0xfd, 0x20, 0xd1, 0x13, 0x58, - 0xa2, 0x4f, 0x44, 0xa1, 0x27, 0xa7, 0xc4, 0x27, 0x9e, 0x28, 0xeb, 0x73, 0xd2, 0x80, 0x3b, 0x89, - 0xa4, 0x89, 0xba, 0x87, 0xd1, 0x39, 0x6f, 0x09, 0x02, 0x33, 0x44, 0xf7, 0x90, 0x61, 0x34, 0xa2, - 0x6c, 0xbe, 0xad, 0x16, 0x5c, 0x1a, 0xa5, 0x33, 0x3c, 0xbe, 0xca, 0xfa, 0x87, 0x50, 0x48, 0x38, - 0xe7, 0x2a, 0xc1, 0xf3, 0xca, 0xc1, 0xf7, 0xd7, 0x19, 0x58, 0xab, 0x13, 0x9f, 0x39, 0x8c, 0x13, - 0x8f, 0x7f, 0x4e, 0xdd, 0x6e, 0x9b, 0xd4, 0x5c, 0xcb, 0x69, 0xa3, 0xc7, 0x90, 0x17, 0x1b, 0x6b, - 0x8a, 0x3c, 0x0e, 0xba, 0xdb, 0x07, 0xd7, 0x38, 0x07, 0xf3, 0x96, 0xf2, 0xc2, 0x64, 0x88, 0xe3, - 0x08, 0x1f, 0x1d, 0x41, 0x96, 0x75, 0x88, 0xad, 0xda, 0xdc, 0xed, 0xd4, 0x8e, 0x94, 0x66, 0x64, - 0xa3, 0x43, 0xec, 0x38, 0x37, 0xc4, 0x17, 0x96, 0x40, 0xe8, 0xa7, 0x30, 0xc7, 0xb8, 0xc5, 0xbb, - 0x4c, 0x35, 0xb9, 0xea, 0xe5, 0x21, 0xa5, 0x5a, 0x1c, 0xa0, 0xc1, 0x37, 0x56, 0x70, 0x95, 0x7f, - 0x69, 0x80, 0xea, 0xb4, 0x39, 0x7e, 0x17, 0xf8, 0x32, 0x03, 0x0b, 0x1e, 0x6d, 0x92, 0x06, 0x71, - 0x89, 0xcd, 0xa9, 0xaf, 0x6a, 0xcf, 0xfd, 0x4b, 0x78, 0x6c, 0x02, 0xcc, 0x38, 0x4c, 0x00, 0x05, - 0xb1, 0x1b, 0x25, 0x75, 0x92, 0x85, 0x47, 0x56, 0x44, 0x9f, 0x02, 0x62, 0xc4, 0xef, 0x39, 0x36, - 0xd9, 0xb1, 0x6d, 0xda, 0xf5, 0x78, 0xa2, 0x28, 0xac, 0x2b, 0x7d, 0xd4, 0x98, 0x90, 0xc0, 0x29, - 0x5a, 0xa8, 0x09, 0x1b, 0x56, 0x97, 0xd3, 0xb6, 0x20, 0x8c, 0xaa, 0x1c, 0xd3, 0x73, 0xe2, 0x49, - 0xa7, 0xe6, 0xcd, 0xcd, 0xe1, 0xa0, 0xbc, 0xb1, 0xf3, 0x12, 0x39, 0xfc, 0x52, 0x14, 0xf4, 0x2e, - 0xe4, 0xc5, 0x0e, 0xa4, 0x9d, 0x59, 0x69, 0xe7, 0xb2, 0xb2, 0x33, 0x7f, 0xa8, 0xe8, 0x38, 0x92, - 0x40, 0x64, 0xda, 0xe5, 0xe0, 0xfb, 0xa9, 0x67, 0x4b, 0x9b, 0xd7, 0xbb, 0x1f, 0x78, 0xb0, 0xec, - 0xb4, 0xad, 0x16, 0xa9, 0x77, 0x5d, 0xb7, 0x41, 0x6c, 0x9f, 0xf0, 0xb0, 0x0a, 0xa4, 0x5e, 0xee, - 0x0e, 0xa8, 0x1d, 0xc6, 0x74, 0x9c, 0xf9, 0xba, 0xda, 0xc6, 0xf2, 0xfe, 0x18, 0x12, 0x9e, 0xc0, - 0x46, 0xf7, 0x21, 0x6f, 0x9d, 0x9e, 0x3a, 0x9e, 0xc3, 0xfb, 0xea, 0x0e, 0xb1, 0x91, 0xb6, 0xce, - 0x8e, 0x92, 0x31, 0x17, 0x84, 0x7b, 0xc2, 0x2f, 0x1c, 0xe9, 0xa2, 0x8f, 0x61, 0x91, 0xd9, 0x67, - 0x44, 0x04, 0x9b, 0x2f, 0x3d, 0x9a, 0x97, 0x1e, 0x5d, 0x53, 0xa6, 0x2c, 0x36, 0x92, 0x4c, 0x3c, - 0x2a, 0x8b, 0x3e, 0x83, 0x02, 0xa7, 0xae, 0x68, 0x10, 0xb2, 0xec, 0x06, 0x57, 0x85, 0x52, 0x9a, - 0x1d, 0xc7, 0x91, 0x58, 0x5c, 0x50, 0x63, 0x1a, 0xc3, 0x49, 0x1c, 0xf4, 0x00, 0x56, 0x3a, 0xbe, - 0x43, 0xa5, 0x7b, 0x45, 0xcf, 0x97, 0x76, 0x81, 0xb4, 0x2b, 0x2e, 0x0b, 0xe3, 0x02, 0x78, 0x52, - 0x07, 0x6d, 0x41, 0x3e, 0x24, 0xea, 0x05, 0x79, 0x2b, 0x90, 0x6e, 0x08, 0x75, 0x71, 0xc4, 0x45, - 0xcd, 0xc4, 0x2d, 0xf7, 0x81, 0xc5, 0x09, 0xd3, 0x17, 0xe4, 0x66, 0xbe, 0x37, 0x25, 0x48, 0x70, - 0x52, 0xd8, 0xbc, 0xa9, 0xac, 0x2a, 0x8e, 0x90, 0x19, 0x1e, 0xc3, 0x44, 0x3f, 0x86, 0x65, 0x3f, - 0x48, 0xda, 0x78, 0x5f, 0x8b, 0x41, 0xfb, 0x15, 0xc7, 0x8e, 0xc7, 0x78, 0x78, 0x42, 0x1a, 0xdd, - 0x07, 0x44, 0x3c, 0xeb, 0xc4, 0x25, 0x2a, 0x31, 0x0e, 0x1c, 0xef, 0x9c, 0xe9, 0x45, 0x99, 0x57, - 0x37, 0x45, 0xa6, 0xee, 0x4d, 0x70, 0x71, 0x8a, 0xc6, 0xfa, 0x27, 0xb0, 0x32, 0x51, 0x2e, 0xae, - 0xd4, 0x00, 0xfe, 0x56, 0x84, 0x79, 0x91, 0x2c, 0xa2, 0x6a, 0xa6, 0x97, 0x90, 0xcc, 0xb5, 0x4a, - 0x48, 0x77, 0xac, 0x20, 0xce, 0xc8, 0x63, 0xf8, 0xf8, 0x52, 0x05, 0x51, 0x18, 0x73, 0xcd, 0x2a, - 0x98, 0x4c, 0xa7, 0xd9, 0xd7, 0x99, 0x4e, 0xd9, 0xeb, 0xa7, 0x53, 0xee, 0x35, 0xa5, 0xd3, 0x37, - 0x5d, 0x9a, 0x52, 0xd3, 0x77, 0xfe, 0x15, 0xd3, 0x37, 0xff, 0xd2, 0xf4, 0xfd, 0x21, 0x14, 0xce, - 0x28, 0xe3, 0x87, 0x84, 0x3f, 0xa1, 0xfe, 0xb9, 0xae, 0xc9, 0x7c, 0x88, 0x3c, 0xf3, 0x30, 0x66, - 0xe1, 0xa4, 0x1c, 0x7a, 0x07, 0xe6, 0xc5, 0x67, 0x7d, 0x7f, 0x57, 0x96, 0x97, 0x7c, 0xfc, 0x1a, - 0x7a, 0x18, 0x90, 0x71, 0xc8, 0x0f, 0x45, 0xf7, 0xeb, 0x35, 0x59, 0x49, 0xc6, 0x44, 0xf7, 0xeb, - 0x35, 0x1c, 0xf2, 0xd1, 0x11, 0xac, 0xb1, 0x33, 0xcb, 0x27, 0x75, 0x9f, 0xda, 0x24, 0xd8, 0x4a, - 0x70, 0x65, 0x5e, 0x90, 0x8a, 0xb7, 0x86, 0x83, 0xf2, 0x5a, 0x23, 0x4d, 0x00, 0xa7, 0xeb, 0xa5, - 0xb5, 0xb0, 0xc5, 0x37, 0xd0, 0xc2, 0x8e, 0x40, 0x6b, 0x7a, 0xac, 0x4e, 0x5d, 0xc7, 0xee, 0xcb, - 0x92, 0xa2, 0x99, 0xdb, 0xe1, 0xf5, 0x7e, 0xf7, 0xb0, 0x11, 0x30, 0x5e, 0x0c, 0xca, 0x1b, 0x93, - 0x73, 0x13, 0x23, 0xe2, 0xe3, 0x18, 0x03, 0x3d, 0x92, 0x80, 0x35, 0xea, 0x9d, 0x3a, 0x2d, 0x7d, - 0x49, 0x5a, 0xbc, 0x39, 0xc5, 0xe2, 0xdd, 0xc3, 0x46, 0x20, 0x17, 0xbc, 0xfa, 0xa2, 0x4f, 0x1c, - 0x23, 0xa0, 0x5f, 0x41, 0x51, 0x24, 0x59, 0x34, 0x58, 0x61, 0xfa, 0xb2, 0x8c, 0xe2, 0xd4, 0xb9, - 0x41, 0x24, 0x15, 0x17, 0xe7, 0xfd, 0x11, 0x65, 0x3c, 0x06, 0x86, 0x36, 0x20, 0x6b, 0xf9, 0x2d, - 0xa6, 0xaf, 0x6c, 0xce, 0x6e, 0x69, 0xc1, 0x8b, 0x7d, 0xc7, 0x6f, 0x31, 0x2c, 0xa9, 0xe1, 0x6b, - 0x18, 0x5d, 0xfd, 0x35, 0x3c, 0x3a, 0xf0, 0x59, 0x7d, 0xb3, 0x03, 0x9f, 0xb7, 0xde, 0xc4, 0xc0, - 0x67, 0xed, 0xb5, 0x0f, 0x7c, 0x6e, 0xbe, 0xda, 0xc0, 0xe7, 0x0f, 0xa0, 0xdb, 0xe1, 0xc1, 0x8d, - 0x85, 0xb5, 0xfe, 0xf6, 0xe5, 0x27, 0x3f, 0x1b, 0xc3, 0x41, 0x39, 0x9e, 0xd3, 0x8d, 0xe7, 0xc7, - 0xd4, 0x25, 0x5e, 0xbd, 0x79, 0xfe, 0x65, 0x06, 0x96, 0xea, 0xb4, 0x79, 0x4c, 0xda, 0x1d, 0xd7, - 0xe2, 0x44, 0x36, 0xd1, 0x5f, 0x4e, 0xbc, 0x9b, 0xde, 0xbd, 0xca, 0x04, 0xc2, 0x44, 0x2a, 0x50, - 0x20, 0xf5, 0xa5, 0xf4, 0x5b, 0x00, 0xb1, 0x1d, 0x9f, 0xba, 0x2e, 0xf1, 0xd5, 0x7b, 0xe9, 0x9a, - 0xf8, 0xb5, 0x08, 0x07, 0x27, 0x30, 0xd1, 0x4f, 0xd4, 0x5b, 0x2c, 0xe8, 0x9e, 0xef, 0x5c, 0xba, - 0x61, 0xa7, 0xbd, 0xc3, 0x2a, 0xff, 0xcc, 0xc0, 0xd2, 0xf8, 0x5b, 0xe9, 0x08, 0x66, 0x3b, 0xb4, - 0xa9, 0x7c, 0x73, 0xe7, 0x3a, 0x2f, 0x24, 0x73, 0x5e, 0xe4, 0xa5, 0xa0, 0x0b, 0x24, 0xd4, 0x02, - 0x2d, 0x3a, 0x62, 0xe5, 0x92, 0x8f, 0x2e, 0x86, 0x9d, 0x36, 0xd7, 0x55, 0xe3, 0xaa, 0x88, 0x1b, - 0x63, 0x57, 0xfe, 0x08, 0x05, 0x75, 0xfb, 0xa9, 0x53, 0x9f, 0x5f, 0x62, 0x44, 0xb3, 0x09, 0xd9, - 0x0e, 0xf5, 0xb9, 0x9a, 0x83, 0x45, 0x12, 0x42, 0x1b, 0x4b, 0x4e, 0xf8, 0x06, 0x12, 0x14, 0xe9, - 0xf1, 0xdc, 0xe8, 0x1b, 0x48, 0x4a, 0x46, 0x12, 0x95, 0xff, 0xe6, 0x22, 0x0b, 0x64, 0xac, 0x61, - 0xc8, 0x09, 0x94, 0x70, 0xd4, 0x75, 0xfb, 0xe2, 0x5d, 0x27, 0xec, 0x37, 0x17, 0xd5, 0x4a, 0x39, - 0xf1, 0xc5, 0x70, 0x00, 0x85, 0xaa, 0xa0, 0xd9, 0x6e, 0x97, 0x71, 0xe2, 0xef, 0xd7, 0xd5, 0xf3, - 0x31, 0xaa, 0x5d, 0xb5, 0x90, 0x81, 0x63, 0x19, 0x64, 0x42, 0x96, 0xf7, 0x3b, 0xe1, 0x20, 0xc9, - 0x08, 0x37, 0x79, 0xdc, 0xef, 0x90, 0x17, 0x83, 0x72, 0x29, 0xa5, 0xc9, 0x28, 0x23, 0x84, 0x04, - 0x96, 0xba, 0x68, 0x1b, 0x0a, 0xe4, 0x29, 0x27, 0xbe, 0x67, 0xb9, 0xfb, 0xf5, 0x60, 0xca, 0xa4, - 0x99, 0x4b, 0xa2, 0xe7, 0xef, 0xc5, 0x64, 0x9c, 0x94, 0x41, 0xf7, 0xa0, 0xe8, 0x52, 0xab, 0x69, - 0x5a, 0xae, 0xe5, 0xd9, 0xd2, 0xd8, 0x9c, 0x34, 0x20, 0x6a, 0x13, 0x07, 0x23, 0x5c, 0x3c, 0x26, - 0x8d, 0x7e, 0x06, 0x7a, 0x92, 0x12, 0x8c, 0x51, 0xb1, 0xe5, 0xb5, 0xd4, 0xd8, 0x47, 0x0b, 0xca, - 0xca, 0xc1, 0x14, 0x19, 0x3c, 0x55, 0x1b, 0xfd, 0x29, 0x03, 0x6b, 0xa1, 0xa5, 0xc7, 0xbe, 0xb8, - 0x52, 0xda, 0xaa, 0x19, 0x07, 0x97, 0xa7, 0x63, 0x65, 0xe1, 0xda, 0x5e, 0x9a, 0xd0, 0x8b, 0x41, - 0xf9, 0x83, 0xe9, 0x3e, 0x4b, 0x55, 0x91, 0x8e, 0x4c, 0x5f, 0x12, 0x3d, 0x82, 0xd5, 0x33, 0x62, - 0xb9, 0xfc, 0xac, 0x76, 0x46, 0xec, 0xf3, 0x30, 0xa6, 0xd4, 0x35, 0xec, 0x5b, 0xca, 0x92, 0xd5, - 0x87, 0x93, 0x22, 0x38, 0x4d, 0x0f, 0x7d, 0x01, 0x6b, 0x8c, 0x30, 0xe6, 0x50, 0x2f, 0xbc, 0x34, - 0xab, 0x6b, 0x81, 0x16, 0x96, 0x8b, 0xb4, 0x72, 0x9d, 0xa2, 0xa0, 0xae, 0x4f, 0x69, 0x2c, 0x9c, - 0xbe, 0x44, 0xe5, 0x1f, 0x19, 0x58, 0x0d, 0x43, 0xe7, 0x9b, 0xab, 0xb8, 0x13, 0xb3, 0xa9, 0x4b, - 0xa6, 0xd8, 0xb4, 0x9a, 0x68, 0x6e, 0x3d, 0x7b, 0x5e, 0xba, 0xf1, 0xd5, 0xf3, 0xd2, 0x8d, 0xaf, - 0x9f, 0x97, 0x6e, 0x7c, 0x39, 0x2c, 0x65, 0x9e, 0x0d, 0x4b, 0x99, 0xaf, 0x86, 0xa5, 0xcc, 0xd7, - 0xc3, 0x52, 0xe6, 0xdf, 0xc3, 0x52, 0xe6, 0xcf, 0xff, 0x29, 0xdd, 0xf8, 0xc5, 0x4c, 0x6f, 0xfb, - 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x4e, 0xa9, 0x3e, 0x5c, 0x1b, 0x00, 0x00, + // 2057 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5b, 0x6f, 0x1b, 0xc7, + 0x15, 0x36, 0x25, 0x52, 0xe2, 0x1e, 0xea, 0x3a, 0xb2, 0x9c, 0xb5, 0xaa, 0x92, 0x2a, 0x5b, 0x14, + 0x0a, 0x1a, 0x53, 0x51, 0xe2, 0x02, 0x4e, 0x82, 0x3a, 0xd5, 0xd2, 0xb2, 0xad, 0x54, 0x96, 0x88, + 0xa1, 0x92, 0x5e, 0xd0, 0x4b, 0x46, 0xcb, 0x11, 0xb5, 0xd6, 0x72, 0x87, 0xdd, 0x19, 0xd2, 0x66, + 0x8a, 0xa2, 0x79, 0xee, 0x53, 0x7f, 0x41, 0xff, 0x41, 0xff, 0x40, 0x9f, 0xfb, 0x60, 0xa0, 0x40, + 0x91, 0xc7, 0x3c, 0xb1, 0x35, 0xfb, 0x2f, 0x5c, 0x14, 0x28, 0x66, 0x76, 0xf6, 0x42, 0x72, 0x69, + 0x5d, 0x6c, 0xa7, 0x0f, 0x04, 0xb8, 0xe7, 0xf2, 0x9d, 0x33, 0x33, 0xe7, 0x32, 0x73, 0xe0, 0xdd, + 0xb3, 0x16, 0x6b, 0x74, 0x5c, 0xca, 0x2b, 0x4f, 0x7b, 0x5f, 0x6c, 0xb1, 0x93, 0x13, 0x7e, 0xca, + 0x98, 0xb8, 0x45, 0xda, 0xce, 0x96, 0xfc, 0x75, 0xb7, 0xb7, 0x9a, 0xd4, 0xa3, 0x3e, 0x11, 0xb4, + 0x51, 0x69, 0xfb, 0x4c, 0x30, 0xb4, 0x91, 0xd4, 0xa8, 0x84, 0x1a, 0xbf, 0x21, 0x6d, 0xa7, 0x22, + 0x7f, 0xdd, 0xed, 0xb5, 0x5b, 0x4d, 0x47, 0x9c, 0x76, 0x8e, 0x2b, 0x36, 0x6b, 0x6d, 0x35, 0x59, + 0x93, 0x6d, 0x29, 0xc5, 0xe3, 0xce, 0x89, 0xfa, 0x52, 0x1f, 0xea, 0x5f, 0x00, 0xb8, 0x56, 0x3e, + 0xbb, 0xc3, 0x2b, 0x0e, 0x53, 0xf6, 0x6c, 0xe6, 0xd3, 0x14, 0xa3, 0x6b, 0xb7, 0x63, 0x99, 0x16, + 0xb1, 0x4f, 0x1d, 0x8f, 0xfa, 0xbd, 0xad, 0xf6, 0x59, 0x53, 0x12, 0xf8, 0x56, 0x8b, 0x0a, 0x92, + 0xa2, 0x55, 0xfe, 0x6f, 0x0e, 0xcc, 0x2a, 0xf3, 0x04, 0x91, 0xf2, 0xb8, 0xe3, 0x09, 0xa7, 0x45, + 0xeb, 0x54, 0x08, 0xc7, 0x6b, 0x72, 0xf4, 0x73, 0x30, 0x7c, 0xca, 0x59, 0xc7, 0xb7, 0x29, 0x37, + 0x33, 0x1b, 0x99, 0xcd, 0xc2, 0x7b, 0x9b, 0x95, 0xc0, 0x8c, 0x5a, 0x88, 0x74, 0xa5, 0xd2, 0xdd, + 0xae, 0x60, 0x2d, 0x84, 0xe9, 0x6f, 0x3b, 0x8e, 0x4f, 0x5b, 0xd4, 0x13, 0xdc, 0x5a, 0x7e, 0xd6, + 0x2f, 0x5d, 0x1b, 0xf4, 0x4b, 0x46, 0xc8, 0xe5, 0x38, 0x46, 0x43, 0x18, 0xe6, 0x5d, 0xa7, 0x4b, + 0x3d, 0xca, 0x79, 0xcd, 0x67, 0xc7, 0xd4, 0x9c, 0x52, 0xf0, 0x37, 0xd3, 0xe0, 0x95, 0x80, 0xb5, + 0x3c, 0xe8, 0x97, 0xe6, 0xf7, 0x93, 0x3a, 0x78, 0x18, 0x02, 0x7d, 0x0a, 0x0b, 0x3e, 0x25, 0x0d, + 0x27, 0x06, 0x9d, 0x3e, 0x0f, 0x14, 0x0d, 0xfa, 0xa5, 0x05, 0x3c, 0xa4, 0x84, 0x47, 0x40, 0xd0, + 0x27, 0x60, 0xb8, 0xce, 0x09, 0xb5, 0x7b, 0xb6, 0x4b, 0xcd, 0xac, 0x42, 0xfc, 0x76, 0x1a, 0xe2, + 0x7e, 0x28, 0x64, 0xcd, 0xcb, 0x65, 0x47, 0x9f, 0x38, 0x56, 0x47, 0xc7, 0xb0, 0xc8, 0xa9, 0xdd, + 0xf1, 0x1d, 0xd1, 0x93, 0xbb, 0x4e, 0x9f, 0x0a, 0x33, 0xa7, 0x10, 0xbf, 0x9b, 0x86, 0x58, 0x1f, + 0x16, 0xb5, 0x56, 0x06, 0xfd, 0xd2, 0xe2, 0x08, 0x11, 0x8f, 0x02, 0xa2, 0x7d, 0xc8, 0x7a, 0x8e, + 0x4d, 0xcd, 0x19, 0x05, 0x5c, 0xa9, 0x9c, 0x17, 0x8c, 0x95, 0x03, 0xc7, 0x8e, 0xce, 0xdc, 0xca, + 0x0f, 0xfa, 0xa5, 0xac, 0xa4, 0x60, 0x85, 0x82, 0x8e, 0x60, 0xc6, 0x61, 0x0a, 0x6f, 0x56, 0xe1, + 0xbd, 0x7b, 0x3e, 0xde, 0xde, 0xe1, 0x10, 0x22, 0x0c, 0xfa, 0xa5, 0x99, 0x80, 0x86, 0x35, 0x16, + 0xda, 0x87, 0x59, 0xea, 0x75, 0xef, 0xfb, 0xac, 0x65, 0xe6, 0x37, 0xa6, 0x37, 0x0b, 0xef, 0x7d, + 0x27, 0x6d, 0xfd, 0xbb, 0x81, 0x48, 0x5d, 0xc5, 0x8c, 0xb5, 0xa8, 0x03, 0x6a, 0x56, 0x93, 0x71, + 0x08, 0x81, 0x3e, 0x80, 0x69, 0xea, 0x75, 0x4d, 0x43, 0x21, 0xad, 0x4d, 0x40, 0xfa, 0x8c, 0xf8, + 0x56, 0x41, 0x43, 0x4c, 0xef, 0x7a, 0x5d, 0x2c, 0x75, 0xca, 0xbf, 0x86, 0x85, 0x61, 0x77, 0x51, + 0x09, 0x72, 0xb6, 0x4b, 0x78, 0x10, 0xf0, 0x39, 0xcb, 0x18, 0xf4, 0x4b, 0xb9, 0xaa, 0x24, 0xe0, + 0x80, 0x8e, 0x7e, 0x00, 0x86, 0xfa, 0x73, 0x8f, 0x08, 0xa2, 0xc2, 0x36, 0x17, 0x1c, 0x78, 0x35, + 0x24, 0xe2, 0x98, 0x5f, 0xbe, 0x0b, 0x73, 0x43, 0xe8, 0x15, 0x00, 0xd2, 0x78, 0xdc, 0xe1, 0x42, + 0x26, 0x89, 0x36, 0xb1, 0x30, 0xe8, 0x97, 0x60, 0x27, 0xa2, 0xe2, 0x84, 0x44, 0xf9, 0x9f, 0x53, + 0x00, 0x87, 0xc7, 0x8f, 0xa9, 0x2d, 0x1e, 0x51, 0x41, 0xd0, 0xe7, 0x30, 0xe3, 0x92, 0x63, 0xea, + 0x4a, 0xef, 0xe4, 0x62, 0xef, 0x9c, 0x7f, 0x1a, 0xb1, 0x76, 0x65, 0x5f, 0xa9, 0xee, 0x7a, 0xc2, + 0xef, 0x59, 0x0b, 0x7a, 0x2b, 0x66, 0x02, 0x22, 0xd6, 0xb8, 0x48, 0x40, 0x81, 0x78, 0x1e, 0x13, + 0x44, 0x38, 0xcc, 0xe3, 0xe6, 0x94, 0x32, 0xf3, 0xa3, 0x4b, 0x99, 0xd9, 0x89, 0xf5, 0x03, 0x5b, + 0x2b, 0xda, 0x56, 0x21, 0xc1, 0xc1, 0x49, 0x33, 0x6b, 0x1f, 0x40, 0x21, 0xe1, 0x1c, 0x5a, 0x82, + 0xe9, 0x33, 0xda, 0x53, 0xdb, 0x63, 0x60, 0xf9, 0x17, 0x5d, 0x87, 0x5c, 0x97, 0xb8, 0x9d, 0xa0, + 0x4e, 0x18, 0x38, 0xf8, 0xf8, 0x70, 0xea, 0x4e, 0x66, 0xed, 0x2e, 0x2c, 0x8d, 0x1a, 0xbc, 0x8c, + 0x7e, 0xf9, 0x45, 0x16, 0x96, 0x6b, 0xc4, 0x17, 0x0e, 0x71, 0x13, 0x1b, 0xbd, 0x01, 0x59, 0x8f, + 0xb4, 0x68, 0x00, 0x61, 0xcd, 0xe9, 0x05, 0x64, 0x0f, 0x48, 0x4b, 0x26, 0x06, 0x69, 0x51, 0x74, + 0x07, 0xe6, 0xc2, 0x62, 0x2a, 0xa9, 0x01, 0xb0, 0x75, 0x5d, 0x4b, 0xce, 0x3d, 0x48, 0xf0, 0xf0, + 0x90, 0x24, 0xda, 0x02, 0x43, 0x22, 0xf0, 0x36, 0xb1, 0x83, 0x12, 0x65, 0xc4, 0xc5, 0xf2, 0x20, + 0x64, 0xe0, 0x58, 0x06, 0x35, 0xa3, 0x53, 0xcf, 0xaa, 0xe3, 0xf8, 0xf8, 0xfc, 0xe3, 0x18, 0x5b, + 0xd1, 0x85, 0x0e, 0xff, 0x77, 0xc3, 0x87, 0x9f, 0x53, 0xd6, 0xee, 0x5d, 0xc5, 0xda, 0xe5, 0x63, + 0x00, 0x3d, 0x81, 0x45, 0xf6, 0x44, 0x76, 0x21, 0x7a, 0x42, 0x7d, 0xea, 0xc9, 0x9e, 0x33, 0xa3, + 0x1c, 0xb8, 0x9d, 0xc8, 0xe8, 0xa8, 0xb5, 0x55, 0xda, 0x67, 0x4d, 0x49, 0xe0, 0x15, 0xd9, 0xda, + 0x54, 0x04, 0x0e, 0x29, 0x5b, 0x6f, 0x69, 0x83, 0x8b, 0xc3, 0x74, 0x8e, 0x47, 0xad, 0xfc, 0x3f, + 0x83, 0xef, 0x2f, 0x53, 0xb0, 0x5a, 0xa3, 0x3e, 0x77, 0xb8, 0xa0, 0x9e, 0xf8, 0x8c, 0xb9, 0x9d, + 0x16, 0xad, 0xba, 0xc4, 0x69, 0xa1, 0xc7, 0x90, 0x97, 0x0b, 0x6b, 0xc8, 0x22, 0x13, 0xb4, 0xde, + 0xf7, 0xaf, 0x70, 0x0e, 0xd6, 0x4d, 0xbd, 0x0b, 0xe3, 0x21, 0x8e, 0x23, 0x7c, 0x74, 0x08, 0x59, + 0xde, 0xa6, 0xb6, 0xee, 0xc1, 0xb7, 0x52, 0xdb, 0x65, 0x9a, 0x93, 0xf5, 0x36, 0xb5, 0xe3, 0xdc, + 0x90, 0x5f, 0x58, 0x01, 0xa1, 0x9f, 0xc2, 0x0c, 0x17, 0x44, 0x74, 0xb8, 0xee, 0xc0, 0x5b, 0x17, + 0x87, 0x54, 0x6a, 0x71, 0x80, 0x06, 0xdf, 0x58, 0xc3, 0x95, 0xff, 0x61, 0x00, 0xaa, 0xb1, 0xc6, + 0xe8, 0x45, 0xe5, 0xcb, 0x0c, 0xcc, 0x79, 0xac, 0x41, 0xeb, 0xd4, 0xa5, 0xb6, 0x60, 0xbe, 0xae, + 0x8e, 0xf7, 0x2f, 0xb0, 0x63, 0x63, 0x60, 0x95, 0x83, 0x04, 0x50, 0x10, 0xbb, 0x51, 0x52, 0x27, + 0x59, 0x78, 0xc8, 0x22, 0xfa, 0x04, 0x10, 0xa7, 0x7e, 0xd7, 0xb1, 0xe9, 0x8e, 0x6d, 0xb3, 0x8e, + 0x27, 0x12, 0x45, 0x61, 0x4d, 0xeb, 0xa3, 0xfa, 0x98, 0x04, 0x4e, 0xd1, 0x42, 0x0d, 0x58, 0x27, + 0x1d, 0xc1, 0x5a, 0x92, 0x30, 0xac, 0x72, 0xc4, 0xce, 0xa8, 0xa7, 0x36, 0x35, 0x6f, 0x6d, 0x0c, + 0xfa, 0xa5, 0xf5, 0x9d, 0x97, 0xc8, 0xe1, 0x97, 0xa2, 0xa0, 0x77, 0x20, 0x2f, 0x57, 0xa0, 0xfc, + 0xcc, 0x2a, 0x3f, 0x97, 0xb4, 0x9f, 0xf9, 0x03, 0x4d, 0xc7, 0x91, 0x04, 0xa2, 0x93, 0x6e, 0x2e, + 0xdf, 0x4f, 0x3d, 0x5b, 0xd6, 0xb8, 0xda, 0xe5, 0xc5, 0x83, 0x25, 0xa7, 0x45, 0x9a, 0xb4, 0xd6, + 0x71, 0xdd, 0x3a, 0xb5, 0x7d, 0x2a, 0xc2, 0x2a, 0x90, 0x7a, 0xf3, 0xdc, 0x67, 0x76, 0x18, 0xd3, + 0x71, 0xe6, 0x9b, 0x7a, 0x19, 0x4b, 0x7b, 0x23, 0x48, 0x78, 0x0c, 0x1b, 0xdd, 0x87, 0x3c, 0x39, + 0x39, 0x71, 0x3c, 0x47, 0xf4, 0xf4, 0x05, 0x67, 0x3d, 0xcd, 0xce, 0x8e, 0x96, 0xb1, 0xe6, 0xe4, + 0xf6, 0x84, 0x5f, 0x38, 0xd2, 0x45, 0x1f, 0xc1, 0x3c, 0xb7, 0x4f, 0xa9, 0x0c, 0x36, 0x5f, 0xed, + 0x68, 0x5e, 0xed, 0xe8, 0xaa, 0x76, 0x65, 0xbe, 0x9e, 0x64, 0xe2, 0x61, 0x59, 0xf4, 0x29, 0x14, + 0x04, 0x73, 0x65, 0x83, 0x50, 0x65, 0x37, 0xb8, 0xc7, 0x14, 0xd3, 0xfc, 0x38, 0x8a, 0xc4, 0xe2, + 0x82, 0x1a, 0xd3, 0x38, 0x4e, 0xe2, 0xa0, 0x07, 0xb0, 0xdc, 0xf6, 0x1d, 0xa6, 0xb6, 0x57, 0x5e, + 0x48, 0x94, 0x5f, 0xa0, 0xfc, 0x8a, 0xcb, 0xc2, 0xa8, 0x00, 0x1e, 0xd7, 0x41, 0x9b, 0x90, 0x0f, + 0x89, 0x66, 0x41, 0x5d, 0x59, 0xd4, 0x36, 0x84, 0xba, 0x38, 0xe2, 0xa2, 0x46, 0xe2, 0x0a, 0xfe, + 0x80, 0x08, 0xca, 0xcd, 0x39, 0xb5, 0x98, 0xef, 0x4d, 0x08, 0x12, 0x9c, 0x14, 0xb6, 0x6e, 0x68, + 0xaf, 0x16, 0x86, 0xc8, 0x1c, 0x8f, 0x60, 0xa2, 0x1f, 0xc3, 0x92, 0x1f, 0x24, 0x6d, 0xbc, 0xae, + 0xf9, 0xa0, 0xfd, 0xca, 0x63, 0xc7, 0x23, 0x3c, 0x3c, 0x26, 0x8d, 0xee, 0x03, 0xa2, 0x1e, 0x39, + 0x76, 0xa9, 0x4e, 0x8c, 0x7d, 0xc7, 0x3b, 0xe3, 0xe6, 0x82, 0xca, 0xab, 0x1b, 0x32, 0x53, 0x77, + 0xc7, 0xb8, 0x38, 0x45, 0x63, 0xed, 0x63, 0x58, 0x1e, 0x2b, 0x17, 0x97, 0x6a, 0x00, 0x7f, 0x5d, + 0x80, 0x59, 0x99, 0x2c, 0xb2, 0x6a, 0xa6, 0x97, 0x90, 0xcc, 0x95, 0x4a, 0x48, 0x67, 0xa4, 0x20, + 0x06, 0xf7, 0xb8, 0x8f, 0x2e, 0x54, 0x10, 0xa5, 0x33, 0x57, 0xac, 0x82, 0xc9, 0x74, 0x9a, 0x7e, + 0x9d, 0xe9, 0x94, 0xbd, 0x7a, 0x3a, 0xe5, 0x5e, 0x53, 0x3a, 0x7d, 0xd3, 0xa5, 0x29, 0x35, 0x7d, + 0x67, 0x5f, 0x31, 0x7d, 0xf3, 0x2f, 0x4d, 0xdf, 0x1f, 0x42, 0xe1, 0x94, 0x71, 0x71, 0x40, 0xc5, + 0x13, 0xe6, 0x9f, 0x99, 0x86, 0xca, 0x87, 0x68, 0x67, 0x1e, 0xc6, 0x2c, 0x9c, 0x94, 0x43, 0x6f, + 0xc3, 0xac, 0xfc, 0xac, 0xed, 0xdd, 0x53, 0xe5, 0x25, 0x1f, 0x3f, 0xd5, 0x1e, 0x06, 0x64, 0x1c, + 0xf2, 0x43, 0xd1, 0xbd, 0x5a, 0x55, 0x55, 0x92, 0x11, 0xd1, 0xbd, 0x5a, 0x15, 0x87, 0x7c, 0x74, + 0x08, 0xab, 0xfc, 0x94, 0xf8, 0xb4, 0xe6, 0x33, 0x9b, 0x06, 0x4b, 0x09, 0xae, 0xcc, 0x73, 0x4a, + 0xf1, 0xe6, 0xa0, 0x5f, 0x5a, 0xad, 0xa7, 0x09, 0xe0, 0x74, 0xbd, 0xb4, 0x16, 0x36, 0xff, 0x06, + 0x5a, 0xd8, 0x21, 0x18, 0x0d, 0x8f, 0xd7, 0x98, 0xeb, 0xd8, 0x3d, 0x55, 0x52, 0x0c, 0x6b, 0x3b, + 0xbc, 0xde, 0xdf, 0x3b, 0xa8, 0x07, 0x8c, 0x17, 0xfd, 0xd2, 0xfa, 0xf8, 0x50, 0xa7, 0x12, 0xf1, + 0x71, 0x8c, 0x81, 0x1e, 0x29, 0xc0, 0x2a, 0xf3, 0x4e, 0x9c, 0xa6, 0xb9, 0xa8, 0x3c, 0xde, 0x98, + 0xe0, 0xf1, 0xbd, 0x83, 0x7a, 0x20, 0x17, 0x3c, 0x49, 0xa3, 0x4f, 0x1c, 0x23, 0xa0, 0x5f, 0xc1, + 0x82, 0x4c, 0xb2, 0x68, 0xea, 0xc3, 0xcd, 0x25, 0x15, 0xc5, 0xa9, 0x43, 0x8d, 0x48, 0x2a, 0x2e, + 0xce, 0x7b, 0x43, 0xca, 0x78, 0x04, 0x0c, 0xad, 0x43, 0x96, 0xf8, 0x4d, 0x6e, 0x2e, 0x6f, 0x4c, + 0x6f, 0x1a, 0xc1, 0x38, 0x61, 0xc7, 0x6f, 0x72, 0xac, 0xa8, 0xe1, 0x53, 0x1d, 0x5d, 0xfe, 0xa9, + 0x3e, 0x3c, 0x8d, 0x5a, 0x79, 0xb3, 0xd3, 0xa8, 0xeb, 0x6f, 0x62, 0x1a, 0xb5, 0xfa, 0xda, 0xa7, + 0x51, 0x37, 0x5e, 0x6d, 0x1a, 0xf5, 0x7b, 0x30, 0xed, 0xf0, 0xe0, 0x46, 0xc2, 0xda, 0x7c, 0xeb, + 0xe2, 0x63, 0xa9, 0xf5, 0x41, 0xbf, 0x14, 0x0f, 0x11, 0x47, 0xf3, 0x63, 0xa2, 0x89, 0x57, 0x6f, + 0x9e, 0x7f, 0x9e, 0x82, 0xc5, 0x1a, 0x6b, 0x1c, 0xd1, 0x56, 0xdb, 0x25, 0x82, 0xaa, 0x26, 0xfa, + 0xcb, 0xb1, 0x77, 0xd3, 0x3b, 0x97, 0x19, 0x5e, 0x58, 0x48, 0x07, 0x0a, 0xa4, 0xbe, 0x94, 0x3e, + 0x07, 0x90, 0xcb, 0xf1, 0x99, 0xeb, 0x52, 0x5f, 0xbf, 0x97, 0xae, 0x88, 0x5f, 0x8d, 0x70, 0x70, + 0x02, 0x13, 0xfd, 0x44, 0xbf, 0xc5, 0x82, 0xee, 0xf9, 0xf6, 0x85, 0x1b, 0x76, 0xda, 0x3b, 0xac, + 0xfc, 0xf7, 0x0c, 0x2c, 0x8e, 0xbe, 0x95, 0x0e, 0x61, 0xba, 0xcd, 0x1a, 0x7a, 0x6f, 0x6e, 0x5f, + 0xe5, 0x85, 0x64, 0xcd, 0xca, 0xbc, 0x94, 0x74, 0x89, 0x84, 0x9a, 0x60, 0x44, 0x47, 0xac, 0xb7, + 0xe4, 0xc3, 0xf3, 0x61, 0x27, 0x0d, 0x9d, 0xf5, 0x2c, 0x2d, 0xe2, 0xc6, 0xd8, 0xe5, 0x3f, 0x40, + 0x41, 0xdf, 0x7e, 0x6a, 0xcc, 0x17, 0x17, 0x18, 0xd1, 0x6c, 0x40, 0xb6, 0xcd, 0x7c, 0xa1, 0x87, + 0x74, 0x91, 0x84, 0xd4, 0xc6, 0x8a, 0x13, 0xbe, 0x81, 0x24, 0x45, 0xed, 0x78, 0x6e, 0xf8, 0x0d, + 0xa4, 0x24, 0x23, 0x89, 0xf2, 0x7f, 0x72, 0x91, 0x07, 0x2a, 0xd6, 0x30, 0xe4, 0x24, 0x4a, 0x38, + 0x8c, 0xbb, 0x75, 0xfe, 0xaa, 0x13, 0xfe, 0x5b, 0xf3, 0xda, 0x52, 0x4e, 0x7e, 0x71, 0x1c, 0x40, + 0xa1, 0x2d, 0x30, 0x6c, 0xb7, 0xc3, 0x05, 0xf5, 0xf7, 0x6a, 0xfa, 0xf9, 0x18, 0xd5, 0xae, 0x6a, + 0xc8, 0xc0, 0xb1, 0x0c, 0xb2, 0x20, 0x2b, 0x7a, 0xed, 0x70, 0x90, 0x54, 0x09, 0x17, 0x79, 0xd4, + 0x6b, 0xd3, 0x17, 0xfd, 0x52, 0x31, 0xa5, 0xc9, 0x68, 0x27, 0xa4, 0x04, 0x56, 0xba, 0x68, 0x1b, + 0x0a, 0xf4, 0xa9, 0xa0, 0xbe, 0x47, 0xdc, 0xbd, 0x5a, 0x30, 0x65, 0x32, 0xac, 0x45, 0xd9, 0xf3, + 0x77, 0x63, 0x32, 0x4e, 0xca, 0xa0, 0xbb, 0xb0, 0xe0, 0x32, 0xd2, 0xb0, 0x88, 0x4b, 0x3c, 0x5b, + 0x39, 0x9b, 0x53, 0x0e, 0x44, 0x6d, 0x62, 0x7f, 0x88, 0x8b, 0x47, 0xa4, 0xd1, 0xcf, 0xc0, 0x4c, + 0x52, 0x82, 0x19, 0x2f, 0x26, 0x5e, 0x53, 0x8f, 0x7d, 0x8c, 0xa0, 0xac, 0xec, 0x4f, 0x90, 0xc1, + 0x13, 0xb5, 0xd1, 0x1f, 0x33, 0xb0, 0x1a, 0x7a, 0x7a, 0xe4, 0xcb, 0x2b, 0xa5, 0xad, 0x9b, 0x71, + 0x70, 0x79, 0x3a, 0xd2, 0x1e, 0xae, 0xee, 0xa6, 0x09, 0xbd, 0xe8, 0x97, 0xde, 0x9f, 0xbc, 0x67, + 0xa9, 0x2a, 0x6a, 0x23, 0xd3, 0x4d, 0xa2, 0x47, 0xb0, 0x72, 0x4a, 0x89, 0x2b, 0x4e, 0xab, 0xa7, + 0xd4, 0x3e, 0x0b, 0x63, 0x4a, 0x5f, 0xc3, 0xbe, 0xa5, 0x3d, 0x59, 0x79, 0x38, 0x2e, 0x82, 0xd3, + 0xf4, 0xd0, 0x17, 0xb0, 0xca, 0x29, 0xe7, 0x0e, 0xf3, 0xc2, 0x4b, 0xb3, 0xbe, 0x16, 0x18, 0x61, + 0xb9, 0x48, 0x2b, 0xd7, 0x29, 0x0a, 0xfa, 0xfa, 0x94, 0xc6, 0xc2, 0xe9, 0x26, 0xca, 0x7f, 0xcb, + 0xc0, 0x4a, 0x18, 0x3a, 0xdf, 0x5c, 0xc5, 0x1d, 0x9b, 0x4d, 0x5d, 0x30, 0xc5, 0x26, 0xd5, 0x44, + 0x6b, 0xf3, 0xd9, 0xf3, 0xe2, 0xb5, 0xaf, 0x9e, 0x17, 0xaf, 0x7d, 0xfd, 0xbc, 0x78, 0xed, 0xcb, + 0x41, 0x31, 0xf3, 0x6c, 0x50, 0xcc, 0x7c, 0x35, 0x28, 0x66, 0xbe, 0x1e, 0x14, 0x33, 0xff, 0x1a, + 0x14, 0x33, 0x7f, 0xfa, 0x77, 0xf1, 0xda, 0x2f, 0xa6, 0xba, 0xdb, 0xff, 0x0b, 0x00, 0x00, 0xff, + 0xff, 0xef, 0xdf, 0x17, 0x73, 0xf9, 0x1b, 0x00, 0x00, } func (m *ContainerRuntimeSettings) Marshal() (dAtA []byte, err error) { @@ -801,6 +803,30 @@ func (m *ObjectMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0xa i = encodeVarintGenerated(dAtA, i, uint64(baseI-i)) i-- + dAtA[i] = 0x12 + } + } + if len(m.Labels) > 0 { + keysForLabels := make([]string, 0, len(m.Labels)) + for k := range m.Labels { + keysForLabels = append(keysForLabels, string(k)) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForLabels) + for iNdEx := len(keysForLabels) - 1; iNdEx >= 0; iNdEx-- { + v := m.Labels[string(keysForLabels[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintGenerated(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForLabels[iNdEx]) + copy(dAtA[i:], keysForLabels[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(keysForLabels[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintGenerated(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa } } @@ -1764,6 +1790,14 @@ func (m *ObjectMeta) Size() (n int) { } var l int _ = l + if len(m.Labels) > 0 { + for k, v := range m.Labels { + _ = k + _ = v + mapEntrySize := 1 + len(k) + sovGenerated(uint64(len(k))) + 1 + len(v) + sovGenerated(uint64(len(v))) + n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize)) + } + } if len(m.Annotations) > 0 { for k, v := range m.Annotations { _ = k @@ -2142,6 +2176,16 @@ func (this *ObjectMeta) String() string { if this == nil { return "nil" } + keysForLabels := make([]string, 0, len(this.Labels)) + for k := range this.Labels { + keysForLabels = append(keysForLabels, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForLabels) + mapStringForLabels := "map[string]string{" + for _, k := range keysForLabels { + mapStringForLabels += fmt.Sprintf("%v: %v,", k, this.Labels[k]) + } + mapStringForLabels += "}" keysForAnnotations := make([]string, 0, len(this.Annotations)) for k := range this.Annotations { keysForAnnotations = append(keysForAnnotations, k) @@ -2153,6 +2197,7 @@ func (this *ObjectMeta) String() string { } mapStringForAnnotations += "}" s := strings.Join([]string{`&ObjectMeta{`, + `Labels:` + mapStringForLabels + `,`, `Annotations:` + mapStringForAnnotations + `,`, `}`, }, "") @@ -2954,6 +2999,133 @@ func (m *ObjectMeta) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Labels", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Labels == nil { + m.Labels = make(map[string]string) + } + var mapkey string + var mapvalue string + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthGenerated + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthGenerated + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var stringLenmapvalue uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapvalue |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapvalue := int(stringLenmapvalue) + if intStringLenmapvalue < 0 { + return ErrInvalidLengthGenerated + } + postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthGenerated + } + if postStringIndexmapvalue > l { + return io.ErrUnexpectedEOF + } + mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) + iNdEx = postStringIndexmapvalue + } else { + iNdEx = entryPreIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.Labels[mapkey] = mapvalue + iNdEx = postIndex + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Annotations", wireType) } diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto index 83fdbc504..4e104edf6 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto @@ -103,12 +103,19 @@ message NiceSettings { // ObjectMeta is metadata that all persisted resources must have, which includes all objects // users must create. message ObjectMeta { + // Map of string keys and values that can be used to organize and categorize + // (scope and select) objects. May match selectors of replication controllers + // and services. + // More info: http://kubernetes.io/docs/user-guide/labels + // +optional + map labels = 1; + // Annotations is an unstructured key value map stored with a resource that may be // set by external tools to store and retrieve arbitrary metadata. They are not // queryable and should be preserved when modifying objects. // More info: http://kubernetes.io/docs/user-guide/annotations // +optional - map annotations = 1; + map annotations = 2; } // ObjectMeta is metadata that all persisted resources must have, which includes all objects diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go b/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go index 948d9eece..77a2bed2f 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go @@ -188,6 +188,22 @@ func schema_kmodulesxyz_offshoot_api_api_v1_ObjectMeta(ref common.ReferenceCallb Description: "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.", Type: []string{"object"}, Properties: map[string]spec.Schema{ + "labels": { + SchemaProps: spec.SchemaProps{ + Description: "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels", + Type: []string{"object"}, + AdditionalProperties: &spec.SchemaOrBool{ + Allows: true, + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, "annotations": { SchemaProps: spec.SchemaProps{ Description: "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations", diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/types.go b/vendor/kmodules.xyz/offshoot-api/api/v1/types.go index 221684e1a..25c49c555 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/types.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/types.go @@ -23,12 +23,19 @@ import ( // ObjectMeta is metadata that all persisted resources must have, which includes all objects // users must create. type ObjectMeta struct { + // Map of string keys and values that can be used to organize and categorize + // (scope and select) objects. May match selectors of replication controllers + // and services. + // More info: http://kubernetes.io/docs/user-guide/labels + // +optional + Labels map[string]string `json:"labels,omitempty" protobuf:"bytes,1,rep,name=labels"` + // Annotations is an unstructured key value map stored with a resource that may be // set by external tools to store and retrieve arbitrary metadata. They are not // queryable and should be preserved when modifying objects. // More info: http://kubernetes.io/docs/user-guide/annotations // +optional - Annotations map[string]string `json:"annotations,omitempty" protobuf:"bytes,1,rep,name=annotations"` + Annotations map[string]string `json:"annotations,omitempty" protobuf:"bytes,2,rep,name=annotations"` } // PodTemplateSpec describes the data a pod should have when created from a template diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go index a72c3a258..f31dec332 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go @@ -138,6 +138,13 @@ func (in *NiceSettings) DeepCopy() *NiceSettings { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ObjectMeta) DeepCopyInto(out *ObjectMeta) { *out = *in + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } if in.Annotations != nil { in, out := &in.Annotations, &out.Annotations *out = make(map[string]string, len(*in)) diff --git a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.pb.go b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.pb.go index ecb633b1e..a7f265899 100644 --- a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.pb.go +++ b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.pb.go @@ -29,6 +29,7 @@ import ( proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + v1 "k8s.io/api/core/v1" ) // Reference imports to suppress errors if they are not otherwise used. @@ -98,10 +99,39 @@ func (m *MongoDBConfiguration) XXX_DiscardUnknown() { var xxx_messageInfo_MongoDBConfiguration proto.InternalMessageInfo +func (m *RedisConfiguration) Reset() { *m = RedisConfiguration{} } +func (*RedisConfiguration) ProtoMessage() {} +func (*RedisConfiguration) Descriptor() ([]byte, []int) { + return fileDescriptor_318314d2cc52e664, []int{2} +} +func (m *RedisConfiguration) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RedisConfiguration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *RedisConfiguration) XXX_Merge(src proto.Message) { + xxx_messageInfo_RedisConfiguration.Merge(m, src) +} +func (m *RedisConfiguration) XXX_Size() int { + return m.Size() +} +func (m *RedisConfiguration) XXX_DiscardUnknown() { + xxx_messageInfo_RedisConfiguration.DiscardUnknown(m) +} + +var xxx_messageInfo_RedisConfiguration proto.InternalMessageInfo + func init() { proto.RegisterType((*GaleraArbitratorConfiguration)(nil), "kubedb.dev.apimachinery.apis.config.v1alpha1.GaleraArbitratorConfiguration") proto.RegisterType((*MongoDBConfiguration)(nil), "kubedb.dev.apimachinery.apis.config.v1alpha1.MongoDBConfiguration") proto.RegisterMapType((map[string]string)(nil), "kubedb.dev.apimachinery.apis.config.v1alpha1.MongoDBConfiguration.ReplicaSetsEntry") + proto.RegisterType((*RedisConfiguration)(nil), "kubedb.dev.apimachinery.apis.config.v1alpha1.RedisConfiguration") } func init() { @@ -109,41 +139,46 @@ func init() { } var fileDescriptor_318314d2cc52e664 = []byte{ - // 532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x52, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x8d, 0x13, 0xa2, 0x92, 0x4d, 0x11, 0xc5, 0xe4, 0x10, 0x45, 0xc2, 0x8d, 0xca, 0x25, 0x48, - 0x74, 0x57, 0xad, 0x10, 0x8a, 0x10, 0x42, 0x4a, 0x0a, 0xed, 0xa9, 0x17, 0x9b, 0x13, 0x17, 0xb4, - 0xb1, 0xa7, 0xb6, 0xe5, 0x8f, 0xb5, 0xf6, 0x23, 0x22, 0x9c, 0x38, 0x57, 0x42, 0xe2, 0x67, 0xe5, - 0xd8, 0x63, 0x4f, 0x15, 0x31, 0x7f, 0x04, 0xc5, 0x9b, 0xd4, 0x0e, 0xa1, 0x42, 0x1c, 0x7a, 0xf3, - 0xcc, 0xbc, 0xf7, 0xf6, 0xcd, 0xf3, 0xa0, 0xb7, 0x91, 0x9a, 0x80, 0x37, 0xc1, 0x1e, 0x4c, 0x09, - 0xcd, 0xc2, 0x84, 0xba, 0x41, 0x98, 0x02, 0x9f, 0x2d, 0x0b, 0x41, 0x5c, 0x96, 0x5e, 0x84, 0x3e, - 0x99, 0x1e, 0xd1, 0x38, 0x0b, 0xe8, 0x11, 0xf1, 0x21, 0x05, 0x4e, 0x25, 0x78, 0x38, 0xe3, 0x4c, - 0x32, 0xf3, 0x65, 0xc9, 0xc6, 0x55, 0xf6, 0xb2, 0x10, 0x58, 0xb3, 0xf1, 0x9a, 0xdd, 0x3b, 0xf4, - 0x43, 0x19, 0xa8, 0x09, 0x76, 0x59, 0x42, 0x7c, 0xe6, 0x33, 0x52, 0x88, 0x4c, 0xd4, 0x45, 0x51, - 0x15, 0x45, 0xf1, 0xa5, 0xc5, 0x7b, 0xaf, 0xa2, 0xa1, 0xc0, 0x21, 0xdb, 0xb4, 0x95, 0x45, 0xbe, - 0xb6, 0x96, 0x80, 0xa4, 0x64, 0xba, 0x65, 0xa9, 0x47, 0xee, 0x62, 0x71, 0x95, 0xca, 0x30, 0x81, - 0x2d, 0xc2, 0xeb, 0x7f, 0x11, 0x84, 0x1b, 0x40, 0x42, 0xb7, 0x78, 0xa7, 0x51, 0xc2, 0x3c, 0x15, - 0x83, 0xc0, 0x5f, 0x66, 0x5f, 0x89, 0xab, 0x84, 0x64, 0xc9, 0x21, 0x07, 0xc1, 0x14, 0x77, 0x41, - 0x68, 0x93, 0x34, 0xcb, 0x5c, 0x2a, 0x69, 0xcc, 0xee, 0xce, 0xf0, 0xe0, 0x7b, 0x1d, 0x3d, 0x3b, - 0xa3, 0x31, 0x70, 0x3a, 0xe2, 0x93, 0x50, 0x72, 0x2a, 0x19, 0x3f, 0x29, 0x92, 0x53, 0x9c, 0xca, - 0x90, 0xa5, 0xe6, 0x0b, 0xb4, 0x43, 0x3d, 0x8f, 0x83, 0x10, 0x5d, 0xa3, 0x6f, 0x0c, 0x5a, 0xe3, - 0xc7, 0xf3, 0x9b, 0xfd, 0x5a, 0x7e, 0xb3, 0xbf, 0x33, 0xd2, 0x6d, 0x7b, 0x3d, 0x37, 0x9f, 0xa3, - 0xa6, 0xcf, 0x99, 0xca, 0xba, 0xf5, 0x02, 0xf8, 0x68, 0x05, 0x6c, 0x9e, 0x2d, 0x9b, 0xb6, 0x9e, - 0x99, 0x04, 0xb5, 0x84, 0x90, 0xe7, 0x20, 0x03, 0xe6, 0x75, 0x1b, 0x05, 0xf0, 0xc9, 0x0a, 0xd8, - 0x72, 0x9c, 0x8f, 0x7a, 0x60, 0x97, 0x18, 0x33, 0x42, 0x4d, 0x21, 0xa9, 0x08, 0xba, 0x0f, 0xfa, - 0xc6, 0xa0, 0x7d, 0x7c, 0x8a, 0xab, 0xab, 0x63, 0xbd, 0xfa, 0xe7, 0xdb, 0xd5, 0xf5, 0xcf, 0x2f, - 0x57, 0xbf, 0x3d, 0x00, 0xec, 0x2c, 0x45, 0x46, 0x9e, 0xc7, 0x52, 0x27, 0x03, 0xb7, 0x74, 0x57, - 0xf4, 0x6d, 0xfd, 0xc6, 0xc1, 0x65, 0x03, 0x75, 0xce, 0x59, 0xea, 0xb3, 0xf7, 0xe3, 0xcd, 0x18, - 0x86, 0x68, 0x57, 0x5f, 0x94, 0x03, 0x7c, 0x0a, 0x7c, 0x95, 0x45, 0x67, 0x25, 0xb2, 0x7b, 0x52, - 0x99, 0xd9, 0x1b, 0x48, 0xf3, 0xd2, 0x40, 0x6d, 0x0e, 0x59, 0x1c, 0xba, 0xd4, 0x01, 0x29, 0xba, - 0xf5, 0x7e, 0x63, 0xd0, 0x3e, 0x76, 0xf0, 0xff, 0x5c, 0x2f, 0xfe, 0x9b, 0x27, 0x6c, 0x97, 0xaa, - 0x1f, 0x52, 0xc9, 0x67, 0xe3, 0xa7, 0x2b, 0x3b, 0xed, 0xca, 0xc4, 0xae, 0x3e, 0x5e, 0x86, 0xd9, - 0xb8, 0xff, 0x30, 0x7b, 0xef, 0xd0, 0xde, 0x9f, 0x16, 0xcd, 0x3d, 0xd4, 0x88, 0x60, 0xa6, 0xe3, - 0xb3, 0x97, 0x9f, 0x66, 0x07, 0x35, 0xa7, 0x34, 0x56, 0xa0, 0xaf, 0xc6, 0xd6, 0xc5, 0x9b, 0xfa, - 0xd0, 0x18, 0xe3, 0xf9, 0xc2, 0xaa, 0x5d, 0x2d, 0xac, 0xda, 0xf5, 0xc2, 0xaa, 0x7d, 0xcb, 0x2d, - 0x63, 0x9e, 0x5b, 0xc6, 0x55, 0x6e, 0x19, 0xd7, 0xb9, 0x65, 0xfc, 0xcc, 0x2d, 0xe3, 0xc7, 0x2f, - 0xab, 0xf6, 0xe9, 0xe1, 0xda, 0xd4, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0x21, 0x3d, 0x59, - 0x4f, 0x04, 0x00, 0x00, + // 616 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4f, 0x6f, 0xd3, 0x4e, + 0x10, 0x8d, 0x93, 0x5f, 0xd4, 0x5f, 0x37, 0x45, 0x04, 0x93, 0x43, 0x14, 0x09, 0xb7, 0x0a, 0x97, + 0x20, 0xd1, 0xb5, 0x5a, 0x21, 0x54, 0x21, 0x84, 0xd4, 0x04, 0xda, 0x0b, 0x15, 0xd2, 0x9a, 0x13, + 0x17, 0xb4, 0x59, 0x4f, 0x6d, 0xd7, 0x7f, 0xd6, 0xda, 0x5d, 0x5b, 0x84, 0x13, 0xe7, 0x4a, 0x48, + 0x7c, 0xac, 0x1e, 0x7b, 0xec, 0xa9, 0xa2, 0xe6, 0xcc, 0x77, 0x40, 0xf6, 0xa6, 0x75, 0xda, 0xb4, + 0x42, 0x1c, 0x7a, 0xf3, 0xec, 0xbc, 0xf7, 0xf6, 0xcd, 0xf3, 0x2c, 0x7a, 0x1d, 0x66, 0x53, 0x70, + 0xa7, 0xd8, 0x85, 0xdc, 0xa6, 0x69, 0x10, 0x53, 0xe6, 0x07, 0x09, 0x88, 0x59, 0x59, 0x48, 0x9b, + 0xf1, 0xe4, 0x30, 0xf0, 0xec, 0x7c, 0x8b, 0x46, 0xa9, 0x4f, 0xb7, 0x6c, 0x0f, 0x12, 0x10, 0x54, + 0x81, 0x8b, 0x53, 0xc1, 0x15, 0x37, 0x9f, 0xd7, 0x6c, 0xbc, 0xc8, 0x2e, 0x0b, 0x89, 0x35, 0x1b, + 0x5f, 0xb2, 0x07, 0x9b, 0x5e, 0xa0, 0xfc, 0x6c, 0x8a, 0x19, 0x8f, 0x6d, 0x8f, 0x7b, 0xdc, 0xae, + 0x44, 0xa6, 0xd9, 0x61, 0x55, 0x55, 0x45, 0xf5, 0xa5, 0xc5, 0x07, 0xc3, 0x70, 0x47, 0xe2, 0x80, + 0x97, 0x4e, 0x6c, 0xc6, 0x05, 0xd8, 0xf9, 0x92, 0x81, 0xc1, 0x8b, 0x1a, 0x53, 0x5b, 0x4f, 0x43, + 0x4f, 0xdb, 0x8f, 0x41, 0xd1, 0xdb, 0x58, 0xf6, 0x5d, 0x2c, 0x91, 0x25, 0x2a, 0x88, 0x61, 0x89, + 0xf0, 0xf2, 0x6f, 0x04, 0xc9, 0x7c, 0x88, 0xe9, 0x12, 0x6f, 0x2f, 0x8c, 0xb9, 0x9b, 0x45, 0x20, + 0xf1, 0x97, 0xd9, 0x57, 0x9b, 0x65, 0x52, 0xf1, 0x78, 0x53, 0x80, 0xe4, 0x99, 0x60, 0x20, 0xb5, + 0x49, 0x9a, 0xa6, 0x8c, 0x2a, 0x1a, 0xf1, 0xbb, 0x73, 0x1e, 0x7e, 0x6f, 0xa2, 0x27, 0xfb, 0x34, + 0x02, 0x41, 0x77, 0xc5, 0x34, 0x50, 0x82, 0x2a, 0x2e, 0x26, 0x55, 0xba, 0x99, 0xa0, 0x2a, 0xe0, + 0x89, 0xf9, 0x0c, 0xad, 0x50, 0xd7, 0x15, 0x20, 0x65, 0xdf, 0xd8, 0x30, 0x46, 0xab, 0xe3, 0x87, + 0x27, 0xe7, 0xeb, 0x8d, 0xe2, 0x7c, 0x7d, 0x65, 0x57, 0x1f, 0x93, 0xcb, 0xbe, 0xf9, 0x14, 0xb5, + 0x3d, 0xc1, 0xb3, 0xb4, 0xdf, 0xac, 0x80, 0x0f, 0xe6, 0xc0, 0xf6, 0x7e, 0x79, 0x48, 0x74, 0xcf, + 0xb4, 0xd1, 0xaa, 0x94, 0xea, 0x00, 0x94, 0xcf, 0xdd, 0x7e, 0xab, 0x02, 0x3e, 0x9a, 0x03, 0x57, + 0x1d, 0xe7, 0xa3, 0x6e, 0x90, 0x1a, 0x63, 0x86, 0xa8, 0x2d, 0x15, 0x95, 0x7e, 0xff, 0xbf, 0x0d, + 0x63, 0xd4, 0xd9, 0xde, 0xc3, 0x8b, 0xa3, 0x63, 0x3d, 0xfa, 0xe7, 0xab, 0xd1, 0xf5, 0x82, 0xd4, + 0xa3, 0x5f, 0x2d, 0x09, 0x76, 0x4a, 0x91, 0x5d, 0xd7, 0xe5, 0x89, 0x93, 0x02, 0xab, 0xdd, 0x55, + 0xe7, 0x44, 0xdf, 0x31, 0x3c, 0x6e, 0xa1, 0xde, 0x01, 0x4f, 0x3c, 0xfe, 0x76, 0x7c, 0x3d, 0x86, + 0x1d, 0xb4, 0xa6, 0xb7, 0xce, 0x01, 0x91, 0x83, 0x98, 0x67, 0xd1, 0x9b, 0x8b, 0xac, 0x4d, 0x16, + 0x7a, 0xe4, 0x1a, 0xd2, 0x3c, 0x36, 0x50, 0x47, 0x40, 0x1a, 0x05, 0x8c, 0x3a, 0xa0, 0x64, 0xbf, + 0xb9, 0xd1, 0x1a, 0x75, 0xb6, 0x1d, 0xfc, 0x2f, 0x1b, 0x8e, 0x6f, 0xf3, 0x84, 0x49, 0xad, 0xfa, + 0x2e, 0x51, 0x62, 0x36, 0x7e, 0x3c, 0xb7, 0xd3, 0x59, 0xe8, 0x90, 0xc5, 0xcb, 0xeb, 0x30, 0x5b, + 0xf7, 0x1f, 0xe6, 0xe0, 0x0d, 0xea, 0xde, 0xb4, 0x68, 0x76, 0x51, 0x2b, 0x84, 0x99, 0x8e, 0x8f, + 0x94, 0x9f, 0x66, 0x0f, 0xb5, 0x73, 0x1a, 0x65, 0xa0, 0xb7, 0x86, 0xe8, 0xe2, 0x55, 0x73, 0xc7, + 0x18, 0xfe, 0x36, 0x90, 0x49, 0xc0, 0x0d, 0xe4, 0xf5, 0x5f, 0x71, 0x84, 0xba, 0x2c, 0x0a, 0x20, + 0x51, 0x13, 0x10, 0xca, 0x01, 0x26, 0x40, 0x55, 0x7a, 0x9d, 0xed, 0x11, 0xd6, 0xcf, 0xa9, 0xf4, + 0x8d, 0xcb, 0x97, 0x8d, 0xf3, 0x2d, 0xfc, 0x9e, 0x33, 0x1a, 0x7d, 0x98, 0x1e, 0x01, 0x53, 0x04, + 0x0e, 0x41, 0x40, 0xc2, 0x60, 0xdc, 0x2b, 0xce, 0xd7, 0xbb, 0x93, 0x1b, 0x2a, 0x64, 0x49, 0xb7, + 0xce, 0xab, 0x79, 0xff, 0x79, 0x8d, 0xf1, 0xc9, 0x85, 0xd5, 0x38, 0xbd, 0xb0, 0x1a, 0x67, 0x17, + 0x56, 0xe3, 0x5b, 0x61, 0x19, 0x27, 0x85, 0x65, 0x9c, 0x16, 0x96, 0x71, 0x56, 0x58, 0xc6, 0xcf, + 0xc2, 0x32, 0x7e, 0xfc, 0xb2, 0x1a, 0x9f, 0xfe, 0xbf, 0x14, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, + 0xc8, 0xcc, 0x1b, 0xe9, 0x63, 0x05, 0x00, 0x00, } func (m *GaleraArbitratorConfiguration) Marshal() (dAtA []byte, err error) { @@ -256,6 +291,51 @@ func (m *MongoDBConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *RedisConfiguration) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *RedisConfiguration) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RedisConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Stash.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if m.ClientCertSecret != nil { + { + size, err := m.ClientCertSecret.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintGenerated(dAtA []byte, offset int, v uint64) int { offset -= sovGenerated(v) base := offset @@ -305,6 +385,21 @@ func (m *MongoDBConfiguration) Size() (n int) { return n } +func (m *RedisConfiguration) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ClientCertSecret != nil { + l = m.ClientCertSecret.Size() + n += 1 + l + sovGenerated(uint64(l)) + } + l = m.Stash.Size() + n += 1 + l + sovGenerated(uint64(l)) + return n +} + func sovGenerated(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -346,6 +441,17 @@ func (this *MongoDBConfiguration) String() string { }, "") return s } +func (this *RedisConfiguration) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&RedisConfiguration{`, + `ClientCertSecret:` + strings.Replace(fmt.Sprintf("%v", this.ClientCertSecret), "LocalObjectReference", "v1.LocalObjectReference", 1) + `,`, + `Stash:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Stash), "StashAddonSpec", "v1alpha1.StashAddonSpec", 1), `&`, ``, 1) + `,`, + `}`, + }, "") + return s +} func valueToStringGenerated(v interface{}) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -775,6 +881,125 @@ func (m *MongoDBConfiguration) Unmarshal(dAtA []byte) error { } return nil } +func (m *RedisConfiguration) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: RedisConfiguration: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: RedisConfiguration: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ClientCertSecret", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ClientCertSecret == nil { + m.ClientCertSecret = &v1.LocalObjectReference{} + } + if err := m.ClientCertSecret.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Stash", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Stash.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipGenerated(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.proto b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.proto index 3239dccb8..3cdada9f1 100644 --- a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.proto +++ b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/generated.proto @@ -21,6 +21,7 @@ syntax = "proto2"; package kubedb.dev.apimachinery.apis.config.v1alpha1; +import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; @@ -75,3 +76,15 @@ message MongoDBConfiguration { optional kmodules.xyz.custom_resources.apis.appcatalog.v1alpha1.StashAddonSpec stash = 3; } +// RedisConfiguration defines a Redis appBinding configuration. +message RedisConfiguration { + // ClientCertSecret is the client secret name which needs to provide when the Redis client need to authenticate with client key and cert. + // It will be used when `tls-auth-clients` value is set to `required` or `yes`. + // +optional + optional k8s.io.api.core.v1.LocalObjectReference clientCertSecret = 1; + + // Stash defines backup and restore task definitions. + // +optional + optional kmodules.xyz.custom_resources.apis.appcatalog.v1alpha1.StashAddonSpec stash = 2; +} + diff --git a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/openapi_generated.go index 05a7816d5..c41a18866 100644 --- a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/openapi_generated.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* @@ -362,6 +363,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), + "kmodules.xyz/client-go/api/v1.ObjectReference": schema_kmodulesxyz_client_go_api_v1_ObjectReference(ref), "kmodules.xyz/client-go/api/v1.ResourceID": schema_kmodulesxyz_client_go_api_v1_ResourceID(ref), "kmodules.xyz/client-go/api/v1.TLSConfig": schema_kmodulesxyz_client_go_api_v1_TLSConfig(ref), "kmodules.xyz/client-go/api/v1.X509Subject": schema_kmodulesxyz_client_go_api_v1_X509Subject(ref), @@ -410,6 +412,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kmodules.xyz/offshoot-api/api/v1.ServiceTemplateSpec": schema_kmodulesxyz_offshoot_api_api_v1_ServiceTemplateSpec(ref), "kubedb.dev/apimachinery/apis/config/v1alpha1.GaleraArbitratorConfiguration": schema_apimachinery_apis_config_v1alpha1_GaleraArbitratorConfiguration(ref), "kubedb.dev/apimachinery/apis/config/v1alpha1.MongoDBConfiguration": schema_apimachinery_apis_config_v1alpha1_MongoDBConfiguration(ref), + "kubedb.dev/apimachinery/apis/config/v1alpha1.RedisConfiguration": schema_apimachinery_apis_config_v1alpha1_RedisConfiguration(ref), } } @@ -17688,6 +17691,35 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) } } +func schema_kmodulesxyz_client_go_api_v1_ObjectReference(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ObjectReference contains enough information to let you inspect or modify the referred object.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "namespace": { + SchemaProps: spec.SchemaProps{ + Description: "Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/", + Type: []string{"string"}, + Format: "", + }, + }, + "name": { + SchemaProps: spec.SchemaProps{ + Description: "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"name"}, + }, + }, + } +} + func schema_kmodulesxyz_client_go_api_v1_ResourceID(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -19234,6 +19266,22 @@ func schema_kmodulesxyz_offshoot_api_api_v1_ObjectMeta(ref common.ReferenceCallb Description: "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.", Type: []string{"object"}, Properties: map[string]spec.Schema{ + "labels": { + SchemaProps: spec.SchemaProps{ + Description: "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels", + Type: []string{"object"}, + AdditionalProperties: &spec.SchemaOrBool{ + Allows: true, + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, "annotations": { SchemaProps: spec.SchemaProps{ Description: "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations", @@ -20099,3 +20147,45 @@ func schema_apimachinery_apis_config_v1alpha1_MongoDBConfiguration(ref common.Re "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec"}, } } + +func schema_apimachinery_apis_config_v1alpha1_RedisConfiguration(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "RedisConfiguration defines a Redis appBinding configuration.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "clientCertSecret": { + SchemaProps: spec.SchemaProps{ + Description: "ClientCertSecret is the client secret name which needs to provide when the Redis client need to authenticate with client key and cert. It will be used when `tls-auth-clients` value is set to `required` or `yes`.", + Ref: ref("k8s.io/api/core/v1.LocalObjectReference"), + }, + }, + "stash": { + SchemaProps: spec.SchemaProps{ + Description: "Stash defines backup and restore task definitions.", + Default: map[string]interface{}{}, + Ref: ref("kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "k8s.io/api/core/v1.LocalObjectReference", "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec"}, + } +} diff --git a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/redis_config_types.go b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/redis_config_types.go new file mode 100644 index 000000000..345ea5ef3 --- /dev/null +++ b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/redis_config_types.go @@ -0,0 +1,40 @@ +/* +Copyright AppsCode Inc. and Contributors +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v1alpha1 + +import ( + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + appcat "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1" +) + +const ( + ResourceKindRedisConfiguration = "RedisConfiguration" +) + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// RedisConfiguration defines a Redis appBinding configuration. +type RedisConfiguration struct { + metav1.TypeMeta `json:",inline,omitempty"` + + // ClientCertSecret is the client secret name which needs to provide when the Redis client need to authenticate with client key and cert. + // It will be used when `tls-auth-clients` value is set to `required` or `yes`. + // +optional + ClientCertSecret *v1.LocalObjectReference `json:"clientCertSecret,omitempty" protobuf:"bytes,1,opt,name=clientCertSecret"` + + // Stash defines backup and restore task definitions. + // +optional + Stash appcat.StashAddonSpec `json:"stash,omitempty" protobuf:"bytes,2,opt,name=stash"` +} diff --git a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go index 8699b7a76..3340edd68 100644 --- a/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubedb.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* @@ -21,6 +22,7 @@ limitations under the License. package v1alpha1 import ( + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -82,3 +84,34 @@ func (in *MongoDBConfiguration) DeepCopyObject() runtime.Object { } return nil } + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RedisConfiguration) DeepCopyInto(out *RedisConfiguration) { + *out = *in + out.TypeMeta = in.TypeMeta + if in.ClientCertSecret != nil { + in, out := &in.ClientCertSecret, &out.ClientCertSecret + *out = new(v1.LocalObjectReference) + **out = **in + } + in.Stash.DeepCopyInto(&out.Stash) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RedisConfiguration. +func (in *RedisConfiguration) DeepCopy() *RedisConfiguration { + if in == nil { + return nil + } + out := new(RedisConfiguration) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *RedisConfiguration) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 152304e59..3714d932c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -67,8 +67,6 @@ github.com/google/go-cmp/cmp/internal/value # github.com/google/gofuzz v1.2.0 github.com/google/gofuzz github.com/google/gofuzz/bytesource -# github.com/google/uuid v1.1.2 -github.com/google/uuid # github.com/googleapis/gnostic v0.5.5 => github.com/googleapis/gnostic v0.4.1 github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/extensions @@ -80,8 +78,6 @@ github.com/hashicorp/golang-lru/simplelru github.com/imdario/mergo # github.com/inconshreveable/mousetrap v1.0.0 github.com/inconshreveable/mousetrap -# github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef -github.com/jpillora/go-ogle-analytics # github.com/json-iterator/go v1.1.11 github.com/json-iterator/go # github.com/mailru/easyjson v0.7.0 @@ -127,12 +123,12 @@ github.com/yudai/gojsondiff github.com/yudai/gojsondiff/formatter # github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 github.com/yudai/golcs -# go.bytebuilders.dev/license-verifier v0.9.3 +# go.bytebuilders.dev/license-verifier v0.9.5 go.bytebuilders.dev/license-verifier go.bytebuilders.dev/license-verifier/apis/licenses go.bytebuilders.dev/license-verifier/apis/licenses/v1alpha1 go.bytebuilders.dev/license-verifier/info -# go.bytebuilders.dev/license-verifier/kubernetes v0.9.3 +# go.bytebuilders.dev/license-verifier/kubernetes v0.9.5 ## explicit go.bytebuilders.dev/license-verifier/kubernetes # golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b @@ -168,17 +164,15 @@ golang.org/x/text/width golang.org/x/time/rate # gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f gomodules.xyz/clock -# gomodules.xyz/flags v0.1.2 +# gomodules.xyz/flags v0.1.3 ## explicit gomodules.xyz/flags # gomodules.xyz/go-sh v0.1.0 ## explicit gomodules.xyz/go-sh -# gomodules.xyz/homedir v0.1.0 -gomodules.xyz/homedir # gomodules.xyz/jsonpatch/v2 v2.2.0 gomodules.xyz/jsonpatch/v2 -# gomodules.xyz/logs v0.0.4 +# gomodules.xyz/logs v0.0.6 ## explicit gomodules.xyz/logs # gomodules.xyz/mergo v0.3.13-0.20210702100041-9d62ff8ece4d @@ -188,11 +182,10 @@ gomodules.xyz/mergo gomodules.xyz/pointer # gomodules.xyz/sets v0.2.0 gomodules.xyz/sets -# gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 +# gomodules.xyz/wait v0.2.0 gomodules.xyz/wait # gomodules.xyz/x v0.0.8 ## explicit -gomodules.xyz/x/analytics gomodules.xyz/x/version # google.golang.org/appengine v1.6.7 google.golang.org/appengine @@ -536,7 +529,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20211028132207-0cf6ea46b030 +# kmodules.xyz/client-go v0.0.0-20211122091731-6c471b24a4ea ## explicit kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -547,10 +540,8 @@ kmodules.xyz/client-go/core/v1 kmodules.xyz/client-go/discovery kmodules.xyz/client-go/dynamic kmodules.xyz/client-go/meta -kmodules.xyz/client-go/tools/analytics -kmodules.xyz/client-go/tools/cli kmodules.xyz/client-go/tools/clusterid -# kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e +# kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52 ## explicit kmodules.xyz/custom-resources/apis/appcatalog kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1 @@ -566,12 +557,12 @@ kmodules.xyz/custom-resources/client/clientset/versioned/typed/metrics/v1alpha1 kmodules.xyz/custom-resources/crds # kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e kmodules.xyz/objectstore-api/api/v1 -# kmodules.xyz/offshoot-api v0.0.0-20210829122105-6f4d481b0c61 +# kmodules.xyz/offshoot-api v0.0.0-20211103060642-3e217667cf41 ## explicit kmodules.xyz/offshoot-api/api/v1 # kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027 kmodules.xyz/prober/api/v1 -# kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb +# kubedb.dev/apimachinery v0.23.0 ## explicit kubedb.dev/apimachinery/apis/config kubedb.dev/apimachinery/apis/config/v1alpha1