From 0dd2ceef7898c0bc5e7f01147db82d68a72bdcd8 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 22 Apr 2020 19:26:40 +0200 Subject: [PATCH] add uuid (key) as part of the accounts payload --- go.mod | 2 - go.sum | 49 ++++++++-- pkg/proto/v0/accounts.pb.go | 159 ++++++++++++--------------------- pkg/proto/v0/accounts.proto | 12 +-- pkg/store/filesystem/option.go | 27 ++++++ pkg/store/filesystem/store.go | 22 ++++- 6 files changed, 153 insertions(+), 118 deletions(-) create mode 100644 pkg/store/filesystem/option.go diff --git a/go.mod b/go.mod index ea7145fbda..f5e910db42 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,9 @@ go 1.13 require ( github.com/golang/protobuf v1.4.0 - github.com/joho/godotenv v1.3.0 github.com/micro/cli/v2 v2.1.2 github.com/micro/go-micro/v2 v2.0.0 github.com/oklog/run v1.1.0 - github.com/owncloud/ocis-hello v0.1.0-alpha1 github.com/owncloud/ocis-pkg/v2 v2.0.1 github.com/owncloud/ocis-settings v0.0.0-20200407203258-bd5da39fe8c0 github.com/restic/calens v0.2.0 diff --git a/go.sum b/go.sum index cf34386c67..6cb936ad82 100644 --- a/go.sum +++ b/go.sum @@ -43,12 +43,16 @@ github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocm github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= 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/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190605020000-c4ba1fdf4d36/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= +github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver/v3 v3.0.2 h1:tRi7ENs+AaOUCH+j6qwNQgPYfV26dX3JNonq+V4mhqc= github.com/Masterminds/semver/v3 v3.0.2/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/sprig/v3 v3.0.1 h1:RuaOafp+8qOLUPX1lInLfUrLc1MEVbnz7a40RLoixKY= github.com/Masterminds/sprig/v3 v3.0.1/go.mod h1:Cp7HwZjmqKrC+Y7XqSJOU2yRvAJRGLiohfgz5ZJj8+4= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= @@ -144,6 +148,7 @@ github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY= github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -151,6 +156,7 @@ github.com/coreos/etcd v3.3.18+incompatible h1:Zz1aXgDrFFi1nadh58tA9ktt06cmPTwNN github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= @@ -163,9 +169,11 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decker502/dnspod-go v0.2.0/go.mod h1:qsurYu1FgxcDwfSwXJdLt4kRsBLZeosEb9uq4Sy+08g= github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= @@ -244,6 +252,7 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/go-stomp/stomp v2.0.3+incompatible/go.mod h1:VqCtqNZv1226A1/79yh+rMiFUcfY3R109np+7ke4n0c= github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM= github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31 h1:28FVBuwkwowZMjbA7M0wXsI6t3PYulRTMio3SO+eKCM= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -254,6 +263,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/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= @@ -270,8 +280,6 @@ github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -283,10 +291,12 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -311,6 +321,7 @@ github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsC github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= @@ -318,9 +329,12 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -370,11 +384,13 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= +github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= @@ -382,6 +398,7 @@ github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJS github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/joncalhoun/qson v0.0.0-20170526102502-8a9cab3a62b1/go.mod h1:DFXrEwSRX0p/aSvxE21319menCBFeQO0jXpRj7LEZUA= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -393,6 +410,7 @@ github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGn github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -407,11 +425,14 @@ github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA= github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w= @@ -477,6 +498,7 @@ github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/minio/highwayhash v1.0.0/go.mod h1:xQboMTeM9nY9v/LlAOxFctujiv5+Aq2hR5dxBpaMbdc= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -492,6 +514,7 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= @@ -557,7 +580,6 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= -github.com/owncloud/ocis-hello v0.0.0-20200114105804-61741477dcec/go.mod h1:hrXqmloO2NHbdkDTPSNneobwzQgki8CUuQD8fqjkPv8= github.com/owncloud/ocis-hello v0.1.0-alpha1/go.mod h1:tU2bOB7DjuXZ+ju+5A+7pUHmTfPIYUk3tMflqHTBTpE= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596 h1:3aMNmuDCIdKsaa4YdVTQEBJMjGz8KiuIB/+xlJUCT3k= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= @@ -582,6 +604,7 @@ 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 v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +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-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= @@ -616,6 +639,7 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/restic/calens v0.1.0/go.mod h1:u67f5msOjCTDYNzOf/NoAUSdmXP03YXPCwIQLYADy5M= +github.com/restic/calens v0.2.0 h1:LVNAtmFc+Pb4ODX66qdX1T3Di1P0OTLyUsVyvM/xD7E= github.com/restic/calens v0.2.0/go.mod h1:UXwyAKS4wsgUZGEc7NrzzygJbLsQZIo3wl+62Q1wvmU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -640,13 +664,17 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5I github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= 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= @@ -661,7 +689,6 @@ github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzu github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4= github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= @@ -674,6 +701,7 @@ github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRci github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -684,6 +712,7 @@ github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLp github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc h1:yUaosFVTJwnltaHbSNC3i82I92quFs+OFPRl8kNMVwo= github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= github.com/transip/gotransip v0.0.0-20190812104329-6d8d9179b66f/go.mod h1:i0f4R4o2HM0m3DZYQWsj6/MEowD57VzoH0v3d7igeFY= @@ -703,11 +732,13 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= 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= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -726,6 +757,7 @@ go.uber.org/multierr v1.3.0 h1:sFPn2GLc3poCkfrpIXGhBD2X0CMIo4Q/zSULXrj/+uc= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= go.uber.org/ratelimit v0.1.0/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= 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.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= @@ -771,6 +803,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -823,6 +856,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -872,6 +906,7 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= 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-20190921001708-c4c64cad1fd0 h1:xQwXv67TxFo9nC1GJFyab5eq/5B590r6RlnL/G8Sz7w= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/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= @@ -901,9 +936,11 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361 h1:RIIXAeV6GvDBuADKumTODatUqANFZ+5BPMnzsy4hulY= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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= @@ -935,7 +972,6 @@ google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBr google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba h1:pRj9OXZbwNtbtZtOB4dLwfK4u+EVRMvP+e9zKkg2grM= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb h1:nAFaltAMbNVA0rixtwvdnqgSVLX3HFUUvMkEklmzbYM= google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -968,6 +1004,7 @@ gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUy gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -1012,6 +1049,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh 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= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/api v0.0.0-20191109101513-0171b7c15da1/go.mod h1:VJq7+38rpM4TSUbRiZX4P5UVAKK2UQpNQLZClkFQkpE= k8s.io/apimachinery v0.0.0-20191109100837-dffb012825f2/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s= @@ -1027,4 +1065,5 @@ k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/pkg/proto/v0/accounts.pb.go b/pkg/proto/v0/accounts.pb.go index 287bea7013..83483159a1 100644 --- a/pkg/proto/v0/accounts.pb.go +++ b/pkg/proto/v0/accounts.pb.go @@ -70,8 +70,7 @@ func (m *Record) GetPayload() *Payload { } type Payload struct { - Phoenix *Phoenix `protobuf:"bytes,1,opt,name=phoenix,proto3" json:"phoenix,omitempty"` - Account *Account `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` + Account *Account `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -102,13 +101,6 @@ func (m *Payload) XXX_DiscardUnknown() { var xxx_messageInfo_Payload proto.InternalMessageInfo -func (m *Payload) GetPhoenix() *Phoenix { - if m != nil { - return m.Phoenix - } - return nil -} - func (m *Payload) GetAccount() *Account { if m != nil { return m.Account @@ -117,8 +109,9 @@ func (m *Payload) GetAccount() *Account { } type Account struct { - StandardClaims *StandardClaims `protobuf:"bytes,1,opt,name=standard_claims,json=standardClaims,proto3" json:"standard_claims,omitempty"` - Identities []*IdHistory `protobuf:"bytes,2,rep,name=identities,proto3" json:"identities,omitempty"` + Uuid string `protobuf:"bytes,1,opt,name=uuid,proto3" json:"uuid,omitempty"` + StandardClaims *StandardClaims `protobuf:"bytes,2,opt,name=standard_claims,json=standardClaims,proto3" json:"standard_claims,omitempty"` + Identities []*IdHistory `protobuf:"bytes,3,rep,name=identities,proto3" json:"identities,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -149,6 +142,13 @@ func (m *Account) XXX_DiscardUnknown() { var xxx_messageInfo_Account proto.InternalMessageInfo +func (m *Account) GetUuid() string { + if m != nil { + return m.Uuid + } + return "" +} + func (m *Account) GetStandardClaims() *StandardClaims { if m != nil { return m.StandardClaims @@ -481,45 +481,6 @@ func (m *IdHistory) GetIss() string { return "" } -type Phoenix struct { - Theme string `protobuf:"bytes,1,opt,name=theme,proto3" json:"theme,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Phoenix) Reset() { *m = Phoenix{} } -func (m *Phoenix) String() string { return proto.CompactTextString(m) } -func (*Phoenix) ProtoMessage() {} -func (*Phoenix) Descriptor() ([]byte, []int) { - return fileDescriptor_e3c84319968a576b, []int{6} -} - -func (m *Phoenix) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Phoenix.Unmarshal(m, b) -} -func (m *Phoenix) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Phoenix.Marshal(b, m, deterministic) -} -func (m *Phoenix) XXX_Merge(src proto.Message) { - xxx_messageInfo_Phoenix.Merge(m, src) -} -func (m *Phoenix) XXX_Size() int { - return xxx_messageInfo_Phoenix.Size(m) -} -func (m *Phoenix) XXX_DiscardUnknown() { - xxx_messageInfo_Phoenix.DiscardUnknown(m) -} - -var xxx_messageInfo_Phoenix proto.InternalMessageInfo - -func (m *Phoenix) GetTheme() string { - if m != nil { - return m.Theme - } - return "" -} - type Query struct { Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -531,7 +492,7 @@ func (m *Query) Reset() { *m = Query{} } func (m *Query) String() string { return proto.CompactTextString(m) } func (*Query) ProtoMessage() {} func (*Query) Descriptor() ([]byte, []int) { - return fileDescriptor_e3c84319968a576b, []int{7} + return fileDescriptor_e3c84319968a576b, []int{6} } func (m *Query) XXX_Unmarshal(b []byte) error { @@ -570,7 +531,7 @@ func (m *Records) Reset() { *m = Records{} } func (m *Records) String() string { return proto.CompactTextString(m) } func (*Records) ProtoMessage() {} func (*Records) Descriptor() ([]byte, []int) { - return fileDescriptor_e3c84319968a576b, []int{8} + return fileDescriptor_e3c84319968a576b, []int{7} } func (m *Records) XXX_Unmarshal(b []byte) error { @@ -605,7 +566,6 @@ func init() { proto.RegisterType((*StandardClaims)(nil), "settings.StandardClaims") proto.RegisterType((*Address)(nil), "settings.Address") proto.RegisterType((*IdHistory)(nil), "settings.IdHistory") - proto.RegisterType((*Phoenix)(nil), "settings.Phoenix") proto.RegisterType((*Query)(nil), "settings.Query") proto.RegisterType((*Records)(nil), "settings.Records") } @@ -613,52 +573,51 @@ func init() { func init() { proto.RegisterFile("pkg/proto/v0/accounts.proto", fileDescriptor_e3c84319968a576b) } var fileDescriptor_e3c84319968a576b = []byte{ - // 748 bytes of a gzipped FileDescriptorProto + // 728 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0x5f, 0x8f, 0xdb, 0x44, - 0x10, 0x97, 0x9b, 0xcb, 0x39, 0x99, 0xf4, 0xfe, 0xed, 0x95, 0x6a, 0x49, 0xa9, 0x1a, 0x2c, 0x21, - 0x05, 0x10, 0x09, 0x5c, 0xc5, 0x07, 0x38, 0x2a, 0x54, 0x90, 0x50, 0x05, 0x3e, 0xc1, 0x03, 0x2f, - 0x96, 0xe3, 0x9d, 0xe4, 0x56, 0x67, 0x7b, 0xad, 0xdd, 0x75, 0x20, 0xbc, 0xf1, 0x31, 0xf8, 0x30, - 0x7c, 0x31, 0x9e, 0xd0, 0xce, 0xae, 0x9d, 0x4b, 0xd3, 0xa7, 0xec, 0xef, 0xcf, 0x4c, 0xc6, 0xa3, - 0x99, 0x81, 0x17, 0xcd, 0xc3, 0x66, 0xd9, 0x68, 0x65, 0xd5, 0x72, 0xfb, 0xf5, 0x32, 0x2f, 0x0a, - 0xd5, 0xd6, 0xd6, 0x2c, 0x88, 0x61, 0x23, 0x83, 0xd6, 0xca, 0x7a, 0x63, 0xa6, 0x2f, 0x36, 0x4a, - 0x6d, 0x4a, 0xf4, 0xce, 0x55, 0xbb, 0x5e, 0x62, 0xd5, 0xd8, 0x9d, 0xb7, 0x25, 0x6f, 0xe1, 0x34, - 0xc5, 0x42, 0x69, 0xc1, 0x2e, 0x61, 0xf0, 0x80, 0x3b, 0x1e, 0xcd, 0xa2, 0xf9, 0x38, 0x75, 0x4f, - 0xf6, 0x25, 0xc4, 0x4d, 0xbe, 0x2b, 0x55, 0x2e, 0xf8, 0x93, 0x59, 0x34, 0x9f, 0xdc, 0x5c, 0x2d, - 0xba, 0xa4, 0x8b, 0x9f, 0xbd, 0x90, 0x76, 0x8e, 0xa4, 0x80, 0x38, 0x70, 0x14, 0x77, 0xaf, 0xb0, - 0x96, 0x7f, 0x52, 0xb6, 0xc3, 0x38, 0x2f, 0xa4, 0x9d, 0xc3, 0x99, 0x43, 0xe5, 0xc7, 0x7f, 0x72, - 0xeb, 0x85, 0xb4, 0x73, 0x24, 0x7f, 0x47, 0x10, 0x07, 0x92, 0xdd, 0xc2, 0x85, 0xb1, 0x79, 0x2d, - 0x72, 0x2d, 0xb2, 0xa2, 0xcc, 0x65, 0x65, 0xc2, 0xbf, 0xf1, 0x7d, 0x82, 0xbb, 0x60, 0x78, 0x43, - 0x7a, 0x7a, 0x6e, 0x0e, 0x30, 0x7b, 0x0d, 0x20, 0x05, 0xd6, 0x56, 0x5a, 0x89, 0x86, 0x3f, 0x99, - 0x0d, 0xe6, 0x93, 0x9b, 0xeb, 0x7d, 0xf4, 0x8f, 0xe2, 0x07, 0x69, 0xac, 0xd2, 0xbb, 0xf4, 0x91, - 0x2d, 0xf9, 0xef, 0x04, 0xce, 0x0f, 0xf3, 0xba, 0xd6, 0x99, 0x76, 0xd5, 0xb5, 0xce, 0xb4, 0x2b, - 0xc6, 0xe0, 0xa4, 0xce, 0x2b, 0xa4, 0x4f, 0x1a, 0xa7, 0xf4, 0x66, 0x2f, 0x01, 0x36, 0x72, 0x8b, - 0x75, 0x46, 0xca, 0x80, 0x94, 0x31, 0x31, 0xef, 0x9c, 0xfc, 0x0a, 0x26, 0xeb, 0xbc, 0x92, 0xe5, - 0xce, 0xeb, 0x27, 0xa4, 0x83, 0xa7, 0x3a, 0x43, 0x25, 0x85, 0x28, 0xd1, 0x1b, 0x86, 0xde, 0xe0, - 0x29, 0x32, 0x4c, 0x61, 0x54, 0xcb, 0xe2, 0x81, 0xd4, 0x53, 0x52, 0x7b, 0xcc, 0xbe, 0x02, 0xd6, - 0x68, 0x5c, 0xa3, 0xd6, 0x28, 0xb2, 0xd6, 0xa0, 0x26, 0x57, 0x4c, 0xae, 0xab, 0x5e, 0xf9, 0x35, - 0x08, 0x8c, 0x43, 0xdc, 0x68, 0xb5, 0x96, 0x25, 0xf2, 0x11, 0x79, 0x3a, 0x48, 0x8a, 0x2c, 0x6c, - 0xab, 0x91, 0x8f, 0x83, 0xe2, 0xa1, 0x53, 0xfe, 0xc0, 0x95, 0x91, 0x16, 0x39, 0x78, 0x25, 0x40, - 0xf6, 0x0c, 0x86, 0x58, 0xe5, 0xb2, 0xe4, 0x13, 0xe2, 0x3d, 0x60, 0x9f, 0xc1, 0x39, 0x3d, 0xb2, - 0x2d, 0x6a, 0xb9, 0x96, 0x28, 0xf8, 0xd3, 0x59, 0x34, 0x1f, 0xa5, 0x67, 0xc4, 0xfe, 0x16, 0x48, - 0xf6, 0x1c, 0x4e, 0x37, 0x58, 0x0b, 0xd4, 0xfc, 0x8c, 0xa2, 0x03, 0x62, 0x9f, 0xc0, 0x78, 0x25, - 0xb5, 0xbd, 0x17, 0xb9, 0x45, 0x7e, 0xee, 0xbb, 0xd9, 0x13, 0xae, 0x17, 0x7f, 0xa9, 0x1a, 0x65, - 0xbd, 0x56, 0xfc, 0xc2, 0xf7, 0xa2, 0xc3, 0x2e, 0x63, 0xa9, 0x8a, 0xbc, 0x44, 0x7e, 0xe9, 0x33, - 0x7a, 0xc4, 0x3e, 0x85, 0xa7, 0xcd, 0xbd, 0xaa, 0x31, 0xab, 0xdb, 0x6a, 0x85, 0x9a, 0x5f, 0x91, - 0x3a, 0x21, 0xee, 0x1d, 0x51, 0xec, 0x06, 0x3e, 0x7a, 0x6c, 0xd9, 0x97, 0xce, 0xa8, 0xf4, 0xeb, - 0x47, 0xde, 0xfe, 0x03, 0x5e, 0x02, 0xb4, 0x8d, 0x2b, 0x4a, 0x64, 0xb9, 0xe5, 0xd7, 0xb3, 0x68, - 0x3e, 0x4c, 0xc7, 0x81, 0xb9, 0xb5, 0xb4, 0x00, 0x42, 0x68, 0x34, 0x86, 0x3f, 0x3b, 0x5a, 0x00, - 0x2f, 0xa4, 0x9d, 0x23, 0xf9, 0xd7, 0x2d, 0x80, 0x7f, 0xbb, 0x06, 0xac, 0x95, 0xae, 0x72, 0x6b, - 0x51, 0x84, 0xd9, 0xdb, 0x13, 0xae, 0xbb, 0xc6, 0x6a, 0x44, 0x9b, 0x75, 0xd9, 0xfd, 0x2c, 0x9e, - 0x79, 0xb6, 0x4b, 0x32, 0x85, 0x11, 0x7d, 0xbd, 0xb4, 0xbb, 0x30, 0x92, 0x3d, 0x76, 0x7d, 0xd2, - 0xb8, 0x91, 0xaa, 0x0e, 0xc3, 0x18, 0x90, 0x1b, 0xc4, 0x46, 0x19, 0x9b, 0x97, 0x59, 0xa1, 0x44, - 0x3f, 0x88, 0x9e, 0x7a, 0xa3, 0x04, 0x4d, 0x02, 0xed, 0xa8, 0xde, 0x85, 0x39, 0xec, 0x60, 0xb2, - 0x84, 0x71, 0xbf, 0x55, 0x1f, 0x58, 0x9b, 0x4b, 0x18, 0xc8, 0xbe, 0x52, 0xf7, 0x4c, 0x5e, 0x41, - 0x1c, 0x4e, 0x86, 0x9b, 0x22, 0x7b, 0x8f, 0x15, 0x86, 0x00, 0x0f, 0x92, 0x8f, 0x61, 0xf8, 0x4b, - 0x8b, 0x3e, 0xdb, 0xe1, 0xfd, 0x4a, 0xbe, 0x85, 0xd8, 0xdf, 0x36, 0xc3, 0xbe, 0x80, 0x58, 0xfb, - 0x27, 0x8f, 0x68, 0xcd, 0x2f, 0xf7, 0x4d, 0xf6, 0x9e, 0xb4, 0x33, 0xdc, 0xfc, 0x13, 0xc1, 0xc5, - 0x5d, 0x10, 0xef, 0x50, 0x6f, 0x65, 0x81, 0xec, 0x73, 0x18, 0xdc, 0xa1, 0x65, 0x47, 0x51, 0xd3, - 0x23, 0x86, 0xcd, 0x61, 0xf0, 0x16, 0x2d, 0xbb, 0xd8, 0x0b, 0x54, 0xdf, 0x07, 0x9c, 0xdf, 0xc0, - 0xc9, 0x4f, 0xd2, 0x58, 0xf6, 0x7c, 0xe1, 0x2f, 0xf4, 0xa2, 0xbb, 0xd0, 0x8b, 0xef, 0xdd, 0x85, - 0x9e, 0x5e, 0xbd, 0x1f, 0x61, 0xbe, 0x8b, 0x7f, 0x1f, 0x7a, 0xd3, 0x29, 0xfd, 0xbc, 0xfe, 0x3f, - 0x00, 0x00, 0xff, 0xff, 0x89, 0x43, 0x0c, 0x13, 0x04, 0x06, 0x00, 0x00, + 0x10, 0x97, 0xc9, 0xe5, 0x9c, 0x4c, 0x7a, 0xff, 0xf6, 0x4a, 0xb5, 0xa4, 0x54, 0x04, 0x4b, 0x48, + 0x01, 0x44, 0x02, 0xa9, 0xe0, 0xfd, 0xa8, 0x50, 0x41, 0x42, 0x15, 0x38, 0x82, 0x07, 0x5e, 0x2c, + 0xc7, 0x3b, 0x49, 0x57, 0x67, 0x7b, 0xad, 0xdd, 0x75, 0x50, 0xf8, 0x1e, 0x3c, 0xf0, 0x61, 0xf8, + 0x62, 0x3c, 0xa1, 0x9d, 0x5d, 0x3b, 0x97, 0x5e, 0x9f, 0x3c, 0xbf, 0x3f, 0x33, 0x1a, 0x8f, 0x66, + 0x16, 0x9e, 0x37, 0xf7, 0xbb, 0x65, 0xa3, 0x95, 0x55, 0xcb, 0xfd, 0xd7, 0xcb, 0xbc, 0x28, 0x54, + 0x5b, 0x5b, 0xb3, 0x20, 0x86, 0x8d, 0x0c, 0x5a, 0x2b, 0xeb, 0x9d, 0x99, 0x3e, 0xdf, 0x29, 0xb5, + 0x2b, 0xd1, 0x3b, 0x37, 0xed, 0x76, 0x89, 0x55, 0x63, 0x0f, 0xde, 0x96, 0xbc, 0x86, 0xf3, 0x14, + 0x0b, 0xa5, 0x05, 0xbb, 0x86, 0xc1, 0x3d, 0x1e, 0x78, 0x34, 0x8b, 0xe6, 0xe3, 0xd4, 0x85, 0xec, + 0x4b, 0x88, 0x9b, 0xfc, 0x50, 0xaa, 0x5c, 0xf0, 0x0f, 0x66, 0xd1, 0x7c, 0xb2, 0xba, 0x59, 0x74, + 0x45, 0x17, 0xbf, 0x78, 0x21, 0xed, 0x1c, 0xc9, 0x77, 0x10, 0x07, 0xce, 0xe5, 0x85, 0x66, 0xa8, + 0xda, 0x49, 0xde, 0x9d, 0x17, 0xd2, 0xce, 0x91, 0xfc, 0x1d, 0x41, 0x1c, 0x48, 0xc6, 0xe0, 0xac, + 0x6d, 0xa5, 0x08, 0x3d, 0x50, 0xcc, 0xee, 0xe0, 0xca, 0xd8, 0xbc, 0x16, 0xb9, 0x16, 0x59, 0x51, + 0xe6, 0xb2, 0x32, 0xa1, 0x19, 0x7e, 0x2c, 0xba, 0x0e, 0x86, 0x57, 0xa4, 0xa7, 0x97, 0xe6, 0x04, + 0xb3, 0x97, 0x00, 0x52, 0x60, 0x6d, 0xa5, 0x95, 0x68, 0xf8, 0x60, 0x36, 0x98, 0x4f, 0x56, 0xb7, + 0xc7, 0xec, 0x9f, 0xc4, 0x8f, 0xd2, 0x58, 0xa5, 0x0f, 0xe9, 0x03, 0x5b, 0xf2, 0xdf, 0x19, 0x5c, + 0x9e, 0xd6, 0x75, 0x13, 0x32, 0xed, 0xa6, 0x9b, 0x90, 0x69, 0x37, 0xae, 0xe1, 0x3a, 0xaf, 0x90, + 0x3a, 0x1a, 0xa7, 0x14, 0xb3, 0x17, 0x00, 0x3b, 0xb9, 0xc7, 0x3a, 0x23, 0x65, 0x40, 0xca, 0x98, + 0x98, 0x37, 0x4e, 0xfe, 0x04, 0x26, 0xdb, 0xbc, 0x92, 0xe5, 0xc1, 0xeb, 0x67, 0xa4, 0x83, 0xa7, + 0x3a, 0x43, 0x25, 0x85, 0x28, 0xd1, 0x1b, 0x86, 0xde, 0xe0, 0x29, 0x32, 0x4c, 0x61, 0x54, 0xcb, + 0xe2, 0x9e, 0xd4, 0x73, 0x52, 0x7b, 0xcc, 0xbe, 0x02, 0xd6, 0x68, 0xdc, 0xa2, 0xd6, 0x28, 0xb2, + 0xd6, 0xa0, 0x26, 0x57, 0x4c, 0xae, 0x9b, 0x5e, 0xf9, 0x2d, 0x08, 0x8c, 0x43, 0xdc, 0x68, 0xb5, + 0x95, 0x25, 0xf2, 0x11, 0x79, 0x3a, 0x48, 0x8a, 0x2c, 0x6c, 0xab, 0x91, 0x8f, 0x83, 0xe2, 0xa1, + 0x53, 0xfe, 0xc4, 0x8d, 0x91, 0x16, 0x39, 0x78, 0x25, 0x40, 0xf6, 0x14, 0x86, 0x58, 0xe5, 0xb2, + 0xe4, 0x13, 0xe2, 0x3d, 0x60, 0x9f, 0xc1, 0x25, 0x05, 0xd9, 0x1e, 0xb5, 0xdc, 0x4a, 0x14, 0xfc, + 0xc9, 0x2c, 0x9a, 0x8f, 0xd2, 0x0b, 0x62, 0x7f, 0x0f, 0x24, 0x7b, 0x06, 0xe7, 0x3b, 0xac, 0x05, + 0x6a, 0x7e, 0x41, 0xd9, 0x01, 0xb1, 0x8f, 0x61, 0xbc, 0x91, 0xda, 0xbe, 0x15, 0xb9, 0x45, 0x7e, + 0xe9, 0xa7, 0xd9, 0x13, 0x6e, 0x16, 0x7f, 0xa9, 0x1a, 0x65, 0xbd, 0x55, 0xfc, 0xca, 0xcf, 0xa2, + 0xc3, 0xae, 0x62, 0xa9, 0x8a, 0xbc, 0x44, 0x7e, 0xed, 0x2b, 0x7a, 0xc4, 0x3e, 0x85, 0x27, 0xcd, + 0x5b, 0x55, 0x63, 0x56, 0xb7, 0xd5, 0x06, 0x35, 0xbf, 0x21, 0x75, 0x42, 0xdc, 0x1b, 0xa2, 0xd8, + 0x0a, 0x3e, 0x7c, 0x68, 0x39, 0xb6, 0xce, 0xa8, 0xf5, 0xdb, 0x07, 0xde, 0xfe, 0x07, 0x5e, 0x00, + 0xb4, 0x8d, 0x6b, 0x4a, 0x64, 0xb9, 0xe5, 0xb7, 0xb3, 0x68, 0x3e, 0x4c, 0xc7, 0x81, 0xb9, 0xb3, + 0x74, 0x14, 0x42, 0x68, 0x34, 0x86, 0x3f, 0x7d, 0x74, 0x14, 0x5e, 0x48, 0x3b, 0x47, 0xf2, 0xaf, + 0x3b, 0x0a, 0x1f, 0xbb, 0x01, 0x6c, 0x95, 0xae, 0x72, 0x6b, 0xb1, 0xbb, 0x8c, 0x23, 0xe1, 0xa6, + 0x6b, 0xac, 0x46, 0xb4, 0x59, 0x57, 0xdd, 0xef, 0xe2, 0x85, 0x67, 0xbb, 0x22, 0x53, 0x18, 0xd1, + 0xdf, 0x4b, 0x7b, 0x08, 0x2b, 0xd9, 0x63, 0x37, 0x27, 0x8d, 0x3b, 0xa9, 0xea, 0xb0, 0x8c, 0x01, + 0xb9, 0x45, 0x6c, 0x94, 0xb1, 0x79, 0x99, 0x15, 0x4a, 0xf4, 0x8b, 0xe8, 0xa9, 0x57, 0x4a, 0xd0, + 0x26, 0xd0, 0xdd, 0xea, 0x43, 0xd8, 0xc3, 0x0e, 0x26, 0x4b, 0x18, 0xf7, 0x57, 0xf5, 0x9e, 0xb3, + 0xb9, 0x86, 0x81, 0xec, 0x3b, 0x75, 0x61, 0xf2, 0x11, 0x0c, 0x7f, 0x6d, 0xd1, 0x9b, 0x4f, 0x5f, + 0xa1, 0xe4, 0x5b, 0x88, 0xfd, 0x0b, 0x65, 0xd8, 0x17, 0x10, 0x6b, 0x1f, 0xf2, 0x88, 0xae, 0xf8, + 0xfa, 0x38, 0x43, 0xef, 0x49, 0x3b, 0xc3, 0xea, 0x9f, 0x08, 0xae, 0xd6, 0x41, 0x5c, 0xa3, 0xde, + 0xcb, 0x02, 0xd9, 0xe7, 0x30, 0x58, 0xa3, 0x65, 0x8f, 0xb2, 0xa6, 0x8f, 0x18, 0x36, 0x87, 0xc1, + 0x6b, 0xb4, 0xec, 0xea, 0x28, 0x50, 0x7f, 0xef, 0x71, 0x7e, 0x03, 0x67, 0x3f, 0x4b, 0x63, 0xd9, + 0xb3, 0x85, 0x7f, 0x67, 0x17, 0xdd, 0x3b, 0xbb, 0xf8, 0xc1, 0xbd, 0xb3, 0xd3, 0x9b, 0x77, 0x33, + 0xcc, 0xf7, 0xf1, 0x1f, 0x43, 0x6f, 0x3a, 0xa7, 0xcf, 0xcb, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, + 0xde, 0xd4, 0xaa, 0xfd, 0xca, 0x05, 0x00, 0x00, } diff --git a/pkg/proto/v0/accounts.proto b/pkg/proto/v0/accounts.proto index d48059bcca..ba583cf591 100644 --- a/pkg/proto/v0/accounts.proto +++ b/pkg/proto/v0/accounts.proto @@ -16,13 +16,13 @@ message Record { } message Payload { - Phoenix phoenix = 1; - Account account = 2; + Account account = 1; } message Account { - StandardClaims standard_claims = 1; - repeated IdHistory identities = 2; // keep track of every identity of a given user + string uuid = 1; + StandardClaims standard_claims = 2; + repeated IdHistory identities = 3; // keep track of every identity of a given user } // OIDC standard claims https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims @@ -63,10 +63,6 @@ message IdHistory { string iss = 2; } -message Phoenix { - string theme = 1; -} - message Query { string key = 1; } diff --git a/pkg/store/filesystem/option.go b/pkg/store/filesystem/option.go new file mode 100644 index 0000000000..63ffb325af --- /dev/null +++ b/pkg/store/filesystem/option.go @@ -0,0 +1,27 @@ +package store + +// Options are the available configurable options on initialization. +type Options struct { + UUID string +} + +// Option captures configuration behavior. +type Option func(*Options) + +// NewOptions build a new Options struct. +func NewOptions(o ...Option) *Options { + opts := &Options{} + + for _, f := range o { + f(opts) + } + + return opts +} + +// WithUUID sets UUID option. +func WithUUID(uuid string) Option { + return func(o *Options) { + o.UUID = uuid + } +} diff --git a/pkg/store/filesystem/store.go b/pkg/store/filesystem/store.go index 5b21972f39..e7d8adbaa6 100644 --- a/pkg/store/filesystem/store.go +++ b/pkg/store/filesystem/store.go @@ -69,6 +69,19 @@ func (s Store) List() ([]*proto.Record, error) { return records, nil } +// NewRecord initializes a new record with the given options +func NewRecord(options ...Option) *proto.Record { + opts := NewOptions(options...) + + return &proto.Record{ + Payload: &proto.Payload{ + Account: &proto.Account{ + Uuid: opts.UUID, + }, + }, + } +} + // Read implements the store interface. This implementation only reads by id. func (s Store) Read(key string) (*proto.Record, error) { contents, err := ioutil.ReadFile(path.Join(s.mountPath, key)) @@ -77,13 +90,16 @@ func (s Store) Read(key string) (*proto.Record, error) { return nil, err } - record := proto.Record{} - if err = json.Unmarshal(contents, &record); err != nil { + rec := NewRecord( + WithUUID(key), + ) + + if err = json.Unmarshal(contents, rec); err != nil { s.Logger.Err(err).Msg("error unmarshaling record") return nil, err } - return &record, nil + return rec, nil } // Write implements the store interface