From 1b048da76a1ad7d6d7b216c4465f5f4fb68ab69f Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 22 Jul 2020 21:53:01 +0200 Subject: [PATCH 01/79] Fix store command - Was started with the wrong flagset - Didn't use the ocis-store config at all --- pkg/command/store.go | 47 ++++++++++++++---------------------------- pkg/config/config.go | 3 +++ pkg/runtime/runtime.go | 1 + 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/pkg/command/store.go b/pkg/command/store.go index d5ff547f07..7a5e7b92d2 100644 --- a/pkg/command/store.go +++ b/pkg/command/store.go @@ -3,15 +3,10 @@ package command import ( - "context" - "strings" - "time" - "github.com/micro/cli/v2" - "github.com/micro/go-micro/v2" - gostore "github.com/micro/go-micro/v2/store" - "github.com/micro/go-micro/v2/store/file" - "github.com/owncloud/ocis-ocs/pkg/flagset" + "github.com/owncloud/ocis-store/pkg/command" + svcconfig "github.com/owncloud/ocis-store/pkg/config" + "github.com/owncloud/ocis-store/pkg/flagset" "github.com/owncloud/ocis/pkg/config" "github.com/owncloud/ocis/pkg/register" ) @@ -22,37 +17,27 @@ func StoreCommand(cfg *config.Config) *cli.Command { Name: "store", Usage: "Start a go-micro store", Category: "Runtime", - Flags: flagset.ServerWithConfig(cfg.OCS), + Flags: flagset.ServerWithConfig(cfg.Store), Action: func(ctx *cli.Context) error { - file.DefaultDir = "/var/tmp/ocis/store" - store := file.NewStore( - gostore.Database("ocis"), - gostore.Table("ocis"), - gostore.WithContext(context.Background()), - ) + storeCommand := command.Server(configureStore(cfg)) - mopts := []micro.Option{ - micro.Name( - strings.Join( - []string{ - "com.owncloud", - "store", - }, - ".", - ), - ), - micro.RegisterTTL(time.Second * 30), - micro.RegisterInterval(time.Second * 10), - micro.Store(store), + if err := storeCommand.Before(ctx); err != nil { + return err } - service := micro.NewService(mopts...) - service.Init() - return service.Run() + return cli.HandleAction(storeCommand.Action, ctx) }, } } +func configureStore(cfg *config.Config) *svcconfig.Config { + cfg.Store.Log.Level = cfg.Log.Level + cfg.Store.Log.Pretty = cfg.Log.Pretty + cfg.Store.Log.Color = cfg.Log.Color + + return cfg.Store +} + func init() { register.AddCommand(StoreCommand) } diff --git a/pkg/config/config.go b/pkg/config/config.go index 41bba5e060..0a78e51382 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -12,6 +12,7 @@ import ( proxy "github.com/owncloud/ocis-proxy/pkg/config" reva "github.com/owncloud/ocis-reva/pkg/config" settings "github.com/owncloud/ocis-settings/pkg/config" + store "github.com/owncloud/ocis-store/pkg/config" thumbnails "github.com/owncloud/ocis-thumbnails/pkg/config" webdav "github.com/owncloud/ocis-webdav/pkg/config" pman "github.com/refs/pman/pkg/config" @@ -74,6 +75,7 @@ type Config struct { Thumbnails *thumbnails.Config WebDAV *webdav.Config Settings *settings.Config + Store *store.Config Runtime *pman.Config } @@ -93,6 +95,7 @@ func New() *Config { Proxy: proxy.New(), Thumbnails: thumbnails.New(), Settings: settings.New(), + Store: store.New(), Runtime: pman.NewConfig(), } } diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go index 67b88d912c..7ea0a83393 100644 --- a/pkg/runtime/runtime.go +++ b/pkg/runtime/runtime.go @@ -31,6 +31,7 @@ var ( // Extensions are ocis extension services Extensions = []string{ "proxy", + "store", "settings", "phoenix", "graph", From 5a10cbc84da3aba7d0c8ab7054bf8b912672df2f Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 22 Jul 2020 22:00:15 +0200 Subject: [PATCH 02/79] Point extensions to their respective most recent master commit id This is to get early results on CI. We need to pin releases, not commit ids. --- go.mod | 14 +++++++------- go.sum | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 0035cbbdf9..3744af5a87 100644 --- a/go.mod +++ b/go.mod @@ -23,19 +23,20 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e + github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 github.com/owncloud/ocis-glauth v0.4.0 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.1 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7 + github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81 github.com/owncloud/ocis-phoenix v0.9.0 - github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c - github.com/owncloud/ocis-proxy v0.4.0 - github.com/owncloud/ocis-reva v0.10.0 - github.com/owncloud/ocis-settings v0.0.0-20200602115916-d10179c1aa59 + github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 + github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0 + github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 + github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 + github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c github.com/owncloud/ocis-thumbnails v0.1.2 github.com/owncloud/ocis-webdav v0.1.0 github.com/refs/pman v0.0.0-20200701173654-f05b8833071a @@ -44,7 +45,6 @@ require ( go.opencensus.io v0.22.4 go.uber.org/atomic v1.5.1 // indirect go.uber.org/multierr v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect golang.org/x/text v0.3.3 // indirect diff --git a/go.sum b/go.sum index 65f360e375..f27268e520 100644 --- a/go.sum +++ b/go.sum @@ -143,6 +143,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0= +github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/ascarter/requestid v0.0.0-20170313220838-5b76ab3d4aee h1:3T/l+vMotQ7cDSLWNAn2Vg1SAQ3mdyLgBWWBitSS3uU= github.com/ascarter/requestid v0.0.0-20170313220838-5b76ab3d4aee/go.mod h1:u7Wtt4WATGGgae9mURNGQQqxAudPKrxfsbSDSGOso+g= github.com/asim/go-awsxray v0.0.0-20161209120537-0d8a60b6e205/go.mod h1:frVmN4PtXUuL1EbZn0uL4PHSTKNKFnbMpBIhngqMuNQ= @@ -172,6 +174,8 @@ github.com/aws/aws-sdk-go v1.32.13 h1:zzyXF7SUxJcJa3hTcYCl1/Ey+kh2N8TjK5tWnL0wie github.com/aws/aws-sdk-go v1.32.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.1 h1:yz9XmNzPshz/lhfAZvLfMnIS9HPo8+boGRcWqDVX+T0= github.com/aws/aws-sdk-go v1.33.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.33.7 h1:vOozL5hmWHHriRviVTQnUwz8l05RS0rehmEFymI+/x8= +github.com/aws/aws-sdk-go v1.33.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -191,6 +195,7 @@ github.com/blevesearch/bleve v1.0.9 h1:kqw/Ank/61UV9/Bx9kCcnfH6qWPgmS8O5LNfpsgzA github.com/blevesearch/bleve v1.0.9/go.mod h1:tb04/rbU29clbtNgorgFd8XdJea4x3ybYaOjWKr+UBU= github.com/blevesearch/blevex v0.0.0-20190916190636-152f0fe5c040 h1:SjYVcfJVZoCfBlg+fkaq2eoZHTf5HaJfaTeTkOtyfHQ= github.com/blevesearch/blevex v0.0.0-20190916190636-152f0fe5c040/go.mod h1:WH+MU2F4T0VmSdaPX+Wu5GYoZBrYWdOZWSjzvYcDmqQ= +github.com/blevesearch/cld2 v0.0.0-20200327141045-8b5f551d37f5/go.mod h1:PN0QNTLs9+j1bKy3d/GB/59wsNBFC4sWLWG3k69lWbc= github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo= github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M= github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= @@ -347,6 +352,8 @@ github.com/cs3org/reva v0.1.1-0.20200701152626-2f6cc60e2f66 h1:0FEaqg/OF1wci6uVs github.com/cs3org/reva v0.1.1-0.20200701152626-2f6cc60e2f66/go.mod h1:umXd+gBuq0t1hiR8f+EplUxeWPcBnAIKPNKbXtA9EWU= github.com/cs3org/reva v0.1.1-0.20200709064551-91eed007038f h1:wsQOmNJGqxiXC3uTYHy1IPi39lO+UKD1adu2V3+8YtE= github.com/cs3org/reva v0.1.1-0.20200709064551-91eed007038f/go.mod h1:VUBjQP8XCiWwFTPhE9P4I47k0NbdczQa2q6JsJN2PqY= +github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1 h1:f/XZNSkCpS0ndLzMq/IRA0k2P1B/04Qvgf7s4qtQoGQ= +github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1/go.mod h1:yPtGZIud+QVWLN7lxPwZLNj2/BCx3xu2DNUcTJE1Mkk= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -455,6 +462,8 @@ github.com/go-chi/chi v4.1.0+incompatible h1:ETj3cggsVIY2Xao5ExCu6YhEh5MD6JTfcBz github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/chi v4.1.1+incompatible h1:MmTgB0R8Bt/jccxp+t6S/1VGIKdJw5J74CK/c9tTfA4= github.com/go-chi/chi v4.1.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= +github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s= @@ -493,6 +502,8 @@ github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-ozzo/ozzo-validation/v4 v4.2.1 h1:XALUNshPYumA7UShB7iM3ZVlqIBn0jfwjqAMIoyE1N0= +github.com/go-ozzo/ozzo-validation/v4 v4.2.1/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew= github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= @@ -743,6 +754,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw 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-cmp v0.5.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 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -874,6 +886,7 @@ github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmK github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= 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/ikawaha/kagome.ipadic v1.1.2/go.mod h1:DPSBbU0czaJhAb/5uKQZHMc9MTVRpDugJfX+HddPHHg= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= @@ -1077,11 +1090,13 @@ github.com/micro/micro v1.16.0/go.mod h1:TO5Ng0KidbfRYIxVM4Q3deZ0A+qwRyP9WeXp+k2 github.com/micro/micro v1.18.0 h1:v+xiQOXbT9xxotLwu1nJM81t4FbruBxZSSyIdhUfujM= github.com/micro/micro/v2 v2.0.1-0.20200210100719-f38a1d8d5348 h1:iV75DZfKGKulOxaRehmzV6NMa0Aevtk5jKcVdv90vJQ= github.com/micro/micro/v2 v2.0.1-0.20200210100719-f38a1d8d5348/go.mod h1:MQBt/cBC7vKP6JMebU5982Umd5GIrVdhPbOGieXowyY= +github.com/micro/micro/v2 v2.5.1-0.20200418121137-24e9b206767c/go.mod h1:fqqaYbJGYzSBi7Ms2Adly7Xzw9+WIRBAucUjwGmYeFY= github.com/micro/micro/v2 v2.7.0 h1:8gF0SIHMkdsXWt4ItmnUKvEuYF4U8BSkcAXp+Li+4O8= github.com/micro/micro/v2 v2.7.0/go.mod h1:J91wOxMkyGM8q74+HUM9A47NmAPOMX+rU1IbUpwbyEw= github.com/micro/micro/v2 v2.8.0 h1:AMqpnKsOBnuGHjU0jVmTL17BRdsOx0FbvI/Gkl2uLrA= github.com/micro/micro/v2 v2.8.0/go.mod h1:VTIGqEBLAMh22q72DnGd95iJSQY/3yvXd9GIIooQ69c= github.com/micro/protoc-gen-micro v1.0.0/go.mod h1:C8ij4DJhapBmypcT00AXdb0cZ675/3PqUO02buWWqbE= +github.com/micro/protoc-gen-micro/v2 v2.3.0/go.mod h1:gcsUvKSTTTalq+pqdUbFS40OTsURpYgL5+yUguR1djk= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -1263,6 +1278,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200522103104-a5d5eac711c1 h1:VWZumx github.com/owncloud/ocis-accounts v0.1.2-0.20200522103104-a5d5eac711c1/go.mod h1:Rl7zh777O7IwEHceHFSshy/tgNpNKcitCJ7VGSNz/1s= github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e h1:FRD1/lH/6IaaWWzBXCeM4hUAoN86zQAz68nOnvCLqsY= github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e/go.mod h1:ohb58AUSUgq+kPOFAjy1s1k5Bi33YtPg45qOOPsepeM= +github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 h1:FWEs/MMLMnuo+gFKLhHVs4ZCIdCCCWcHWhfYUOPHPpo= +github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= github.com/owncloud/ocis-glauth v0.4.0 h1:L+S2UzkJJv5NWBVnTIZObdFz5zvKz8L0crIWbXtTF8o= github.com/owncloud/ocis-glauth v0.4.0/go.mod h1:dZzZdRkssaEiDg3UdlQL+kozVfpyVUhdUd0uGcTdCH8= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= @@ -1283,6 +1300,8 @@ github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iK github.com/owncloud/ocis-migration v0.2.0/go.mod h1:U6DCcHLuogHvAXg1aAyIlzJPtERIqyuigXU1BjUpu5g= github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7 h1:AHKA5xrnSBOdFjVTkaXzCyJl7vhOVklJD/b/T6Ky/oI= github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7/go.mod h1:W0ry/qPP85Yw/KKd0IoOdjOI914bvzOaEeM9bzRuwaQ= +github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81 h1:Jgje5GjSIM8qg58DQW3KGhvc8d/D6fgYLBNMXrn3Wxs= +github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= github.com/owncloud/ocis-phoenix v0.6.0 h1:p++botHH6WizAiMXELBTDRw9oVqcjyMliLf5BLgrDxw= github.com/owncloud/ocis-phoenix v0.6.0/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= github.com/owncloud/ocis-phoenix v0.7.0 h1:yJkWUm2SR55bjfOUoDhfkGhbjaXmgAA72vgcEF1H0M4= @@ -1303,6 +1322,8 @@ github.com/owncloud/ocis-pkg/v2 v2.2.1 h1:LK7WxHYugEFQ9NHTOz0EP8DRjbt51wXhyqruV0 github.com/owncloud/ocis-pkg/v2 v2.2.1/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c h1:hYhKSfMkPO4kRLrKqRHPmePGTCpGDGji+s4yW30+tmM= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= +github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPyTZbTofJjAz3LSQUIaKKcjjBBBIJGaEAkP8g= +github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-proxy v0.3.1 h1:49weyxHNQjOeWTaf31LlQp5uul8ZoJenfe9o4P4fetU= github.com/owncloud/ocis-proxy v0.3.1/go.mod h1:HwsIKM9etps19bBVwjOX+Jrv9pfDvw3azvaHaxMiBCI= github.com/owncloud/ocis-proxy v0.3.2-0.20200526160332-ea254d603659 h1:zWDmNSbhfZB5NiW63a0wCbeugH70SnlQABaRJf7WbR8= @@ -1311,6 +1332,8 @@ github.com/owncloud/ocis-proxy v0.3.2-0.20200529092045-bfe4790ab8cd h1:wsU+VOGO7 github.com/owncloud/ocis-proxy v0.3.2-0.20200529092045-bfe4790ab8cd/go.mod h1:XPqctXYxoXPmqtxuXRQ8RJ9StVrbilFLkwsWh9bcdsE= github.com/owncloud/ocis-proxy v0.4.0 h1:xPCctmBKtXEKhazh7RurursSCPEtIOkUVCkTypMYoao= github.com/owncloud/ocis-proxy v0.4.0/go.mod h1:2ZKZ7q5JMvDEoosWp9MaOYp+EkQP0ZsQV8o2gSw0PHM= +github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0 h1:VEwmTJOn5ym44oYcuMLCj+m2N2LAL5MjHNVXEXPtaTY= +github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-reva v0.2.1 h1:4aOOJT7tn9GCeNCM+qr33de2xobW4nAKJUvbb0BpL2k= github.com/owncloud/ocis-reva v0.2.1/go.mod h1:Ew9XgScQzFbdpSZySq1PHVISgd4y03Ms62lFy+mAx2s= github.com/owncloud/ocis-reva v0.2.2-0.20200513073117-ee9cd9b8d3ab h1:WNIv1WkJi5JiLEEf8OzSZXUjiad9pqYk9+EUKklwq9k= @@ -1337,11 +1360,18 @@ github.com/owncloud/ocis-reva v0.9.1 h1:FlcGcOGAZ5hseGcUuCb8Q2yxfWmJmiOQHHw7B+yj github.com/owncloud/ocis-reva v0.9.1/go.mod h1:XubCqrJYNhYONNHBo7Q6XgH1HHTdaOf7nA9IdFJNY88= github.com/owncloud/ocis-reva v0.10.0 h1:zBcbP17SZU1AEqnFW2G90PNcH68Fdie5vwvaIqSpQfg= github.com/owncloud/ocis-reva v0.10.0/go.mod h1:rPZptSdecdT0bXAGIIGXhNHkzX4y4wgm0/LDGAZZVrk= +github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 h1:el0O00ULNheJTX+QJXjEHPywHAmXkTHkUYGhgwSC6gw= +github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= github.com/owncloud/ocis-settings v0.0.0-20200511093940-0fddb624d0da/go.mod h1:1PyfbVIZMTX21JxsRT+maRIjRFD3H+yhfpr1jMz3PeA= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200602115916-d10179c1aa59 h1:/zvpEMfJYa136WCdspaX/zMu78ueXZlVIpmgoG0IWvg= github.com/owncloud/ocis-settings v0.0.0-20200602115916-d10179c1aa59/go.mod h1:xSf/8ccV12M05xVMnvJ7do3g8ZEsdqKr2Qp0GINPhxM= +github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= +github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:AeXZVHKEU+9Xt4+/lkHE5rx+sJH2if9dIrUGLhe+JOY= +github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= +github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c h1:4IOgcTMme4SEzp2bKNKZ/vfdgAcSlLGk8vD0/PSb5xY= +github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-thumbnails v0.0.0-20200318131505-e0ab0b37a5a4/go.mod h1:VmCoxwitTs6oRxIaGz6xridLPwA6ReRMej22jBhkRIM= github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb h1:eLvwnJ88x0erIsjMEa2b6dI1pBTEz52eMKrBPJfIOLM= github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb/go.mod h1:N9zPXTyUmQ7vi19Y5EO94MRw19up/3SK3SSX5P3PvFw= @@ -1589,6 +1619,7 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/tebeka/snowball v0.4.2/go.mod h1:4IfL14h1lvwZcp1sfXuuc7/7yCsvVffTWxWxCLfFpYg= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM= @@ -2114,6 +2145,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/Acconut/lockfile.v1 v1.1.0/go.mod h1:6UCz3wJ8tSFUsPR6uP/j8uegEtDuEEqFxlpi0JI4Umw= gopkg.in/DataDog/dd-trace-go.v1 v1.19.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= From 861e69d751b5bf68aac9eefaaf965b72d27b504a Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 23 Jul 2020 07:32:27 +0200 Subject: [PATCH 03/79] Pin more dependencies - Pin konnectd, glauth and webdav to current master - Update thumbnails to 0.2.0 --- go.mod | 8 ++++---- go.sum | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3744af5a87..d747c555c3 100644 --- a/go.mod +++ b/go.mod @@ -24,11 +24,11 @@ require ( github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 - github.com/owncloud/ocis-glauth v0.4.0 + github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 - github.com/owncloud/ocis-konnectd v0.3.1 + github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81 github.com/owncloud/ocis-phoenix v0.9.0 @@ -37,8 +37,8 @@ require ( github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c - github.com/owncloud/ocis-thumbnails v0.1.2 - github.com/owncloud/ocis-webdav v0.1.0 + github.com/owncloud/ocis-thumbnails v0.2.0 + github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab github.com/refs/pman v0.0.0-20200701173654-f05b8833071a github.com/restic/calens v0.2.0 github.com/valyala/fasttemplate v1.2.0 // indirect diff --git a/go.sum b/go.sum index f27268e520..50f61b8759 100644 --- a/go.sum +++ b/go.sum @@ -1278,10 +1278,13 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200522103104-a5d5eac711c1 h1:VWZumx github.com/owncloud/ocis-accounts v0.1.2-0.20200522103104-a5d5eac711c1/go.mod h1:Rl7zh777O7IwEHceHFSshy/tgNpNKcitCJ7VGSNz/1s= github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e h1:FRD1/lH/6IaaWWzBXCeM4hUAoN86zQAz68nOnvCLqsY= github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e/go.mod h1:ohb58AUSUgq+kPOFAjy1s1k5Bi33YtPg45qOOPsepeM= +github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f/go.mod h1:wxo2B5EoTQlf3ryDeOTR/RAs3z6IHkllu1CvBxrLf1A= github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 h1:FWEs/MMLMnuo+gFKLhHVs4ZCIdCCCWcHWhfYUOPHPpo= github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= github.com/owncloud/ocis-glauth v0.4.0 h1:L+S2UzkJJv5NWBVnTIZObdFz5zvKz8L0crIWbXtTF8o= github.com/owncloud/ocis-glauth v0.4.0/go.mod h1:dZzZdRkssaEiDg3UdlQL+kozVfpyVUhdUd0uGcTdCH8= +github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2 h1:jGSovZULvr765rMSWfskDp4RoWRprB71S6I90UGYIW8= +github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= @@ -1294,6 +1297,8 @@ github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 h1:8z github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96/go.mod h1:tf0EkzbgtgBynkQCQmZdVlTV3y7m6ltyMBbR5h+xMbs= github.com/owncloud/ocis-konnectd v0.3.1 h1:d886SLx6oR2ldNAvJC8TB/0+XnYCQiNFFTGzoR5giW0= github.com/owncloud/ocis-konnectd v0.3.1/go.mod h1:kOBYY8P1s2KJRmUc//bThSFtSIH6NO1+6WogmrHcMRY= +github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd h1:mSCRvNZM3RoqJ691sWhMtiKD7SraH575EQ1ZwzuUCMw= +github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd/go.mod h1:pyxlwCsLY/j54w5QVOSW8owARj6JfjH01b4hFz8XtAY= github.com/owncloud/ocis-migration v0.1.1-0.20200519133726-4c6b7daff23c h1:2yqJ86Zo7UNDpJ9SF9wR1sWgAKyHkqMabXMd00zmmMs= github.com/owncloud/ocis-migration v0.1.1-0.20200519133726-4c6b7daff23c/go.mod h1:49q0ooScsn+aT0s+rO5l9u3LEJ/TNyn4b63GdNvhQzc= github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iKXA83ta7A= @@ -1377,8 +1382,12 @@ github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb h1:eLvw github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb/go.mod h1:N9zPXTyUmQ7vi19Y5EO94MRw19up/3SK3SSX5P3PvFw= github.com/owncloud/ocis-thumbnails v0.1.2 h1:bX59AqzEeIMlzyYzA55lpgh6Mk6wHXpGmU4tVUXjCkY= github.com/owncloud/ocis-thumbnails v0.1.2/go.mod h1:N9zPXTyUmQ7vi19Y5EO94MRw19up/3SK3SSX5P3PvFw= +github.com/owncloud/ocis-thumbnails v0.2.0 h1:jHUXx5WZZxI6U3tGs53dpUfH/CwVBov1RhTi74GMltI= +github.com/owncloud/ocis-thumbnails v0.2.0/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= github.com/owncloud/ocis-webdav v0.1.0 h1:A7wI6knfIDwvlAMrW+YOmP9gxF7bxAtsgIuFs11+fM4= github.com/owncloud/ocis-webdav v0.1.0/go.mod h1:hB3KbiMS7kyq9bG/BwKSI+lLM4PIMYEckrT2IFYTGxg= +github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab h1:+5LibXqwvHe2ltrFA58et0BZXQZ8oY7Gi0mvFC/fnHo= +github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab/go.mod h1:E9OlGfvlxf1NHFOvFgbHWBe7/pw4Gqy/JaSJFEHQSzg= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= From ccd8b89d72cd6b66ddc4f9c0ada8685200b7340e Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 23 Jul 2020 16:50:55 +0200 Subject: [PATCH 04/79] Rebase & update ocis-glauth to current master --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d747c555c3..b2d742c7fc 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 - github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2 + github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 diff --git a/go.sum b/go.sum index 50f61b8759..cd86a370fc 100644 --- a/go.sum +++ b/go.sum @@ -1285,6 +1285,8 @@ github.com/owncloud/ocis-glauth v0.4.0 h1:L+S2UzkJJv5NWBVnTIZObdFz5zvKz8L0crIWbX github.com/owncloud/ocis-glauth v0.4.0/go.mod h1:dZzZdRkssaEiDg3UdlQL+kozVfpyVUhdUd0uGcTdCH8= github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2 h1:jGSovZULvr765rMSWfskDp4RoWRprB71S6I90UGYIW8= github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= +github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8 h1:91rDks8ZERsRnOmDtbpqWFnpBGP61vUFpnYHwIyHtwY= +github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= From 484b1b94d5f913f047838cfbfe93af3335b4397f Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 24 Jul 2020 14:19:32 +0200 Subject: [PATCH 05/79] Update recently released ocis-extensions --- go.mod | 10 +++++----- go.sum | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index b2d742c7fc..611038b6ed 100644 --- a/go.mod +++ b/go.mod @@ -28,17 +28,17 @@ require ( github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 - github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd + github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81 + github.com/owncloud/ocis-ocs v0.1.0 github.com/owncloud/ocis-phoenix v0.9.0 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 - github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0 + github.com/owncloud/ocis-proxy v0.5.0 github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 - github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c + github.com/owncloud/ocis-store v0.1.0 github.com/owncloud/ocis-thumbnails v0.2.0 - github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab + github.com/owncloud/ocis-webdav v0.1.1 github.com/refs/pman v0.0.0-20200701173654-f05b8833071a github.com/restic/calens v0.2.0 github.com/valyala/fasttemplate v1.2.0 // indirect diff --git a/go.sum b/go.sum index cd86a370fc..3b957e5012 100644 --- a/go.sum +++ b/go.sum @@ -1301,6 +1301,8 @@ github.com/owncloud/ocis-konnectd v0.3.1 h1:d886SLx6oR2ldNAvJC8TB/0+XnYCQiNFFTGz github.com/owncloud/ocis-konnectd v0.3.1/go.mod h1:kOBYY8P1s2KJRmUc//bThSFtSIH6NO1+6WogmrHcMRY= github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd h1:mSCRvNZM3RoqJ691sWhMtiKD7SraH575EQ1ZwzuUCMw= github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd/go.mod h1:pyxlwCsLY/j54w5QVOSW8owARj6JfjH01b4hFz8XtAY= +github.com/owncloud/ocis-konnectd v0.3.2 h1:lKXpiE44xd/yvRmnTC2UA9qE+xP/6VT3QLQp3lKnmbc= +github.com/owncloud/ocis-konnectd v0.3.2/go.mod h1:pyxlwCsLY/j54w5QVOSW8owARj6JfjH01b4hFz8XtAY= github.com/owncloud/ocis-migration v0.1.1-0.20200519133726-4c6b7daff23c h1:2yqJ86Zo7UNDpJ9SF9wR1sWgAKyHkqMabXMd00zmmMs= github.com/owncloud/ocis-migration v0.1.1-0.20200519133726-4c6b7daff23c/go.mod h1:49q0ooScsn+aT0s+rO5l9u3LEJ/TNyn4b63GdNvhQzc= github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iKXA83ta7A= @@ -1309,6 +1311,8 @@ github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7 h1:AHKA5xrnSBOdF github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7/go.mod h1:W0ry/qPP85Yw/KKd0IoOdjOI914bvzOaEeM9bzRuwaQ= github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81 h1:Jgje5GjSIM8qg58DQW3KGhvc8d/D6fgYLBNMXrn3Wxs= github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= +github.com/owncloud/ocis-ocs v0.1.0 h1:4D8B8hvRNeO1hPcSRH8jXr9Cq73BIXvqaKRO+hdf8ZQ= +github.com/owncloud/ocis-ocs v0.1.0/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= github.com/owncloud/ocis-phoenix v0.6.0 h1:p++botHH6WizAiMXELBTDRw9oVqcjyMliLf5BLgrDxw= github.com/owncloud/ocis-phoenix v0.6.0/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= github.com/owncloud/ocis-phoenix v0.7.0 h1:yJkWUm2SR55bjfOUoDhfkGhbjaXmgAA72vgcEF1H0M4= @@ -1341,6 +1345,8 @@ github.com/owncloud/ocis-proxy v0.4.0 h1:xPCctmBKtXEKhazh7RurursSCPEtIOkUVCkTypM github.com/owncloud/ocis-proxy v0.4.0/go.mod h1:2ZKZ7q5JMvDEoosWp9MaOYp+EkQP0ZsQV8o2gSw0PHM= github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0 h1:VEwmTJOn5ym44oYcuMLCj+m2N2LAL5MjHNVXEXPtaTY= github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= +github.com/owncloud/ocis-proxy v0.5.0 h1:RjMgHF0qRZPdbVSv/RCAwNmi3rJzsRHdZaq6UvQCgVk= +github.com/owncloud/ocis-proxy v0.5.0/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-reva v0.2.1 h1:4aOOJT7tn9GCeNCM+qr33de2xobW4nAKJUvbb0BpL2k= github.com/owncloud/ocis-reva v0.2.1/go.mod h1:Ew9XgScQzFbdpSZySq1PHVISgd4y03Ms62lFy+mAx2s= github.com/owncloud/ocis-reva v0.2.2-0.20200513073117-ee9cd9b8d3ab h1:WNIv1WkJi5JiLEEf8OzSZXUjiad9pqYk9+EUKklwq9k= @@ -1379,6 +1385,8 @@ github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:A github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c h1:4IOgcTMme4SEzp2bKNKZ/vfdgAcSlLGk8vD0/PSb5xY= github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= +github.com/owncloud/ocis-store v0.1.0 h1:dv3gOP54l0jNlIGCgN/HfE0ZfVh1fQh26Nwl7nGBxDo= +github.com/owncloud/ocis-store v0.1.0/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-thumbnails v0.0.0-20200318131505-e0ab0b37a5a4/go.mod h1:VmCoxwitTs6oRxIaGz6xridLPwA6ReRMej22jBhkRIM= github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb h1:eLvwnJ88x0erIsjMEa2b6dI1pBTEz52eMKrBPJfIOLM= github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb/go.mod h1:N9zPXTyUmQ7vi19Y5EO94MRw19up/3SK3SSX5P3PvFw= @@ -1390,6 +1398,8 @@ github.com/owncloud/ocis-webdav v0.1.0 h1:A7wI6knfIDwvlAMrW+YOmP9gxF7bxAtsgIuFs1 github.com/owncloud/ocis-webdav v0.1.0/go.mod h1:hB3KbiMS7kyq9bG/BwKSI+lLM4PIMYEckrT2IFYTGxg= github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab h1:+5LibXqwvHe2ltrFA58et0BZXQZ8oY7Gi0mvFC/fnHo= github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab/go.mod h1:E9OlGfvlxf1NHFOvFgbHWBe7/pw4Gqy/JaSJFEHQSzg= +github.com/owncloud/ocis-webdav v0.1.1 h1:4UN9GefQiH6RGgq2+tiYFLNw8ql6luXYH0NdCJg2n/U= +github.com/owncloud/ocis-webdav v0.1.1/go.mod h1:E9OlGfvlxf1NHFOvFgbHWBe7/pw4Gqy/JaSJFEHQSzg= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= From 60f43af3a9fc14803dd6ab508fbb112ec9bc055a Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 27 Jul 2020 09:39:16 +0200 Subject: [PATCH 06/79] Update ocis-accounts, ocis-glauth and ocis-reva to respective current master --- go.mod | 7 +++---- go.sum | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 611038b6ed..f7a72f42aa 100644 --- a/go.mod +++ b/go.mod @@ -18,13 +18,12 @@ require ( github.com/labstack/gommon v0.3.0 // indirect github.com/mattn/go-colorable v0.1.7 // indirect github.com/micro/cli/v2 v2.1.2 - github.com/micro/go-micro/v2 v2.8.0 github.com/micro/micro/v2 v2.8.0 github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 - github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8 + github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 + github.com/owncloud/ocis-glauth v0.5.0 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 @@ -34,7 +33,7 @@ require ( github.com/owncloud/ocis-phoenix v0.9.0 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.0 - github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 + github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.0 github.com/owncloud/ocis-thumbnails v0.2.0 diff --git a/go.sum b/go.sum index 3b957e5012..de039f0bb6 100644 --- a/go.sum +++ b/go.sum @@ -64,6 +64,8 @@ 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/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28= +github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= 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= @@ -176,6 +178,8 @@ github.com/aws/aws-sdk-go v1.33.1 h1:yz9XmNzPshz/lhfAZvLfMnIS9HPo8+boGRcWqDVX+T0 github.com/aws/aws-sdk-go v1.33.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.7 h1:vOozL5hmWHHriRviVTQnUwz8l05RS0rehmEFymI+/x8= github.com/aws/aws-sdk-go v1.33.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= +github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -354,6 +358,8 @@ github.com/cs3org/reva v0.1.1-0.20200709064551-91eed007038f h1:wsQOmNJGqxiXC3uTY github.com/cs3org/reva v0.1.1-0.20200709064551-91eed007038f/go.mod h1:VUBjQP8XCiWwFTPhE9P4I47k0NbdczQa2q6JsJN2PqY= github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1 h1:f/XZNSkCpS0ndLzMq/IRA0k2P1B/04Qvgf7s4qtQoGQ= github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1/go.mod h1:yPtGZIud+QVWLN7lxPwZLNj2/BCx3xu2DNUcTJE1Mkk= +github.com/cs3org/reva v0.1.1-0.20200724135750-b46288b375d6 h1:xTJzgtusJvbz08fYVnxlxNu4BhyGCS46uwiD4QrYnOI= +github.com/cs3org/reva v0.1.1-0.20200724135750-b46288b375d6/go.mod h1:qwW0YfYf6JaAcTxBXsPpa8JIn2wHxqt5j/bjH7myI1k= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -455,6 +461,8 @@ github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+Te github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-asn1-ber/asn1-ber v1.4.1 h1:qP/QDxOtmMoJVgXHCXNzDpA0+wkgYB2x5QoLMVOciyw= github.com/go-asn1-ber/asn1-ber v1.4.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8= +github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs= github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= @@ -489,6 +497,8 @@ github.com/go-ldap/ldap v3.0.2+incompatible h1:kD5HQcAzlQ7yrhfn+h+MSABeAy/jAJhvI github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= github.com/go-ldap/ldap/v3 v3.1.7 h1:aHjuWTgZsnxjMgqzx0JHwNqz4jBYZTcNarbPFkW1Oww= github.com/go-ldap/ldap/v3 v3.1.7/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q= +github.com/go-ldap/ldap/v3 v3.2.3 h1:FBt+5w3q/vPVPb4eYMQSn+pOiz4zewPamYhlGMmc7yM= +github.com/go-ldap/ldap/v3 v3.2.3/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg= github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M= github.com/go-log/log v0.2.0 h1:z8i91GBudxD5L3RmF0KVpetCbcGWAV7q1Tw1eRwQM9Q= github.com/go-log/log v0.2.0/go.mod h1:xzCnwajcues/6w7lne3yK2QU7DBPW7kqbgPGG5AF65U= @@ -754,6 +764,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw 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-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.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 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= @@ -1138,6 +1149,8 @@ github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5 github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg= github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= +github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= @@ -1281,12 +1294,16 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e/go.mod h1 github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f/go.mod h1:wxo2B5EoTQlf3ryDeOTR/RAs3z6IHkllu1CvBxrLf1A= github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 h1:FWEs/MMLMnuo+gFKLhHVs4ZCIdCCCWcHWhfYUOPHPpo= github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= +github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 h1:bAyT1wnChpJvqKxSno/i59K2a0gugTogY5eRbhTg50o= +github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= github.com/owncloud/ocis-glauth v0.4.0 h1:L+S2UzkJJv5NWBVnTIZObdFz5zvKz8L0crIWbXtTF8o= github.com/owncloud/ocis-glauth v0.4.0/go.mod h1:dZzZdRkssaEiDg3UdlQL+kozVfpyVUhdUd0uGcTdCH8= github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2 h1:jGSovZULvr765rMSWfskDp4RoWRprB71S6I90UGYIW8= github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8 h1:91rDks8ZERsRnOmDtbpqWFnpBGP61vUFpnYHwIyHtwY= github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= +github.com/owncloud/ocis-glauth v0.5.0 h1:gk1eS2p3dRSKgsGSJc0UJ+CLsQRSkzSd7BIsh75zp18= +github.com/owncloud/ocis-glauth v0.5.0/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= @@ -1375,6 +1392,8 @@ github.com/owncloud/ocis-reva v0.10.0 h1:zBcbP17SZU1AEqnFW2G90PNcH68Fdie5vwvaIqS github.com/owncloud/ocis-reva v0.10.0/go.mod h1:rPZptSdecdT0bXAGIIGXhNHkzX4y4wgm0/LDGAZZVrk= github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 h1:el0O00ULNheJTX+QJXjEHPywHAmXkTHkUYGhgwSC6gw= github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= +github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed h1:K2Ny7V/PJ3XbtxemvYK8bI4GBTEWLtKT2kqkoYi4kgY= +github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= github.com/owncloud/ocis-settings v0.0.0-20200511093940-0fddb624d0da/go.mod h1:1PyfbVIZMTX21JxsRT+maRIjRFD3H+yhfpr1jMz3PeA= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= @@ -1804,6 +1823,7 @@ golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= From 8f3962de88ad5d09e40e24c293373b5a569ea519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 24 Jul 2020 17:22:45 +0200 Subject: [PATCH 07/79] use ocis-glauth v0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- go.mod | 1 + go.sum | 2 ++ 2 files changed, 3 insertions(+) diff --git a/go.mod b/go.mod index f7a72f42aa..0094ae4db5 100644 --- a/go.mod +++ b/go.mod @@ -53,3 +53,4 @@ require ( replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 replace github.com/lucas-clemente/quic-go v0.15.7 => github.com/lucas-clemente/quic-go v0.14.1 + diff --git a/go.sum b/go.sum index de039f0bb6..8bb56e87df 100644 --- a/go.sum +++ b/go.sum @@ -176,6 +176,8 @@ github.com/aws/aws-sdk-go v1.32.13 h1:zzyXF7SUxJcJa3hTcYCl1/Ey+kh2N8TjK5tWnL0wie github.com/aws/aws-sdk-go v1.32.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.1 h1:yz9XmNzPshz/lhfAZvLfMnIS9HPo8+boGRcWqDVX+T0= github.com/aws/aws-sdk-go v1.33.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.33.6 h1:YLoUeMSx05kHwhS+HLDSpdYYpPzJMyp6hn1cWsJ6a+U= +github.com/aws/aws-sdk-go v1.33.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.7 h1:vOozL5hmWHHriRviVTQnUwz8l05RS0rehmEFymI+/x8= github.com/aws/aws-sdk-go v1.33.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= From b0513e6a387b6a590c3368631563396c6caf5c50 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 27 Jul 2020 10:42:35 +0200 Subject: [PATCH 08/79] update ocis-store to 706a465 --- go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/go.mod b/go.mod index 0094ae4db5..f7a72f42aa 100644 --- a/go.mod +++ b/go.mod @@ -53,4 +53,3 @@ require ( replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 replace github.com/lucas-clemente/quic-go v0.15.7 => github.com/lucas-clemente/quic-go v0.14.1 - From d9f4f943d8b822ba08e793902c51399da2394e90 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 27 Jul 2020 10:42:35 +0200 Subject: [PATCH 09/79] update ocis-store to 706a465 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f7a72f42aa..9b34f10be4 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/owncloud/ocis-proxy v0.5.0 github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 - github.com/owncloud/ocis-store v0.1.0 + github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.0 github.com/owncloud/ocis-webdav v0.1.1 github.com/refs/pman v0.0.0-20200701173654-f05b8833071a diff --git a/go.sum b/go.sum index 8bb56e87df..d6827b835f 100644 --- a/go.sum +++ b/go.sum @@ -1408,6 +1408,8 @@ github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c h1:4IOgcTMme4S github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-store v0.1.0 h1:dv3gOP54l0jNlIGCgN/HfE0ZfVh1fQh26Nwl7nGBxDo= github.com/owncloud/ocis-store v0.1.0/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= +github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 h1:yt1ufihhLkQQtlNO5TE3/m0jXGC3tPMOhNcUJTG9ObU= +github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6/go.mod h1:Rav5iw0fZXYFqJl81IbyTVa/FidaBhgVPtp0XqkgviM= github.com/owncloud/ocis-thumbnails v0.0.0-20200318131505-e0ab0b37a5a4/go.mod h1:VmCoxwitTs6oRxIaGz6xridLPwA6ReRMej22jBhkRIM= github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb h1:eLvwnJ88x0erIsjMEa2b6dI1pBTEz52eMKrBPJfIOLM= github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb/go.mod h1:N9zPXTyUmQ7vi19Y5EO94MRw19up/3SK3SSX5P3PvFw= From c88138239a1bea185ec437f95812b38589b9cfe4 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 27 Jul 2020 10:46:16 +0200 Subject: [PATCH 10/79] change store category to extensions instead of runtime --- pkg/command/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/command/store.go b/pkg/command/store.go index 7a5e7b92d2..c25d0bc049 100644 --- a/pkg/command/store.go +++ b/pkg/command/store.go @@ -16,7 +16,7 @@ func StoreCommand(cfg *config.Config) *cli.Command { return &cli.Command{ Name: "store", Usage: "Start a go-micro store", - Category: "Runtime", + Category: "Extensions", Flags: flagset.ServerWithConfig(cfg.Store), Action: func(ctx *cli.Context) error { storeCommand := command.Server(configureStore(cfg)) From da4ba6cb7eb5316faebb0f29d28aa74a46cf116f Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 27 Jul 2020 11:40:40 +0200 Subject: [PATCH 11/79] update ocis-glauth to c01ce16 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9b34f10be4..d0ff8c0f25 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 - github.com/owncloud/ocis-glauth v0.5.0 + github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 diff --git a/go.sum b/go.sum index d6827b835f..c84311bfce 100644 --- a/go.sum +++ b/go.sum @@ -1306,6 +1306,8 @@ github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8 h1:91rDks8Z github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.0 h1:gk1eS2p3dRSKgsGSJc0UJ+CLsQRSkzSd7BIsh75zp18= github.com/owncloud/ocis-glauth v0.5.0/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= +github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= +github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= From 7708335d5579beb5400bdf07617e5b20c546e4a1 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 27 Jul 2020 14:09:38 +0200 Subject: [PATCH 12/79] Update ocis-reva and related test-config --- .drone.star | 2 -- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 544647ad53..5777bce12e 100644 --- a/.drone.star +++ b/.drone.star @@ -969,8 +969,6 @@ def ocisServer(): 'REVA_LDAP_BIND_DN': 'cn=admin,dc=owncloud,dc=com', 'REVA_LDAP_BASE_DN': 'dc=owncloud,dc=com', 'REVA_LDAP_SCHEMA_UID': 'uid', - 'REVA_LDAP_SCHEMA_MAIL': 'mail', - 'REVA_LDAP_SCHEMA_DISPLAYNAME': 'displayName', 'REVA_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/', 'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root', 'REVA_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/reva/data', diff --git a/go.mod b/go.mod index d0ff8c0f25..f0b7b3cd57 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/owncloud/ocis-phoenix v0.9.0 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.0 - github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed + github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042 github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.0 diff --git a/go.sum b/go.sum index c84311bfce..34eabf9521 100644 --- a/go.sum +++ b/go.sum @@ -1398,6 +1398,8 @@ github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 h1:el0O00ULN github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed h1:K2Ny7V/PJ3XbtxemvYK8bI4GBTEWLtKT2kqkoYi4kgY= github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= +github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042 h1:sADjncr5kwWChl89vanfBVLnBvsrWai+4Mp804wwcp4= +github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042/go.mod h1:CCmM7nzFBymJg+oQKrwAynOEzIBSFnCKSegkX6Tk2hg= github.com/owncloud/ocis-settings v0.0.0-20200511093940-0fddb624d0da/go.mod h1:1PyfbVIZMTX21JxsRT+maRIjRFD3H+yhfpr1jMz3PeA= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= From 995a9d19bfbda3d017857f884c2cd68a3125570d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 27 Jul 2020 15:20:28 +0200 Subject: [PATCH 13/79] configure PROXY_OIDC_ISSUER and LDAP filters for tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .drone.star | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.star b/.drone.star index 5777bce12e..6612636555 100644 --- a/.drone.star +++ b/.drone.star @@ -975,9 +975,12 @@ def ocisServer(): 'REVA_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/', 'REVA_STORAGE_OWNCLOUD_REDIS_ADDR': 'redis:6379', 'REVA_OIDC_ISSUER': 'https://ocis-server:9200', + 'PROXY_OIDC_ISSUER': 'https://ocis-server:9200', 'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data', 'REVA_DATAGATEWAY_URL': 'https://ocis-server:9200/data', 'REVA_FRONTEND_URL': 'https://ocis-server:9200', + 'REVA_LDAP_USERFILTER': '(&(objectclass=posixAccount)(|(uid={{.OpaqueId}})(cn={{.OpaqueId}})))', + 'REVA_LDAP_LOGINFILTER': '(&(objectclass=posixAccount)(|(uid={{login}})(cn={{login}})(mail={{login}})))', 'PHOENIX_WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', From e8bc1358ddf11d5d1d93d9b11c7461f3be2cba86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 27 Jul 2020 16:33:39 +0200 Subject: [PATCH 14/79] run ocis with debug level logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index 6612636555..1874a08014 100644 --- a/.drone.star +++ b/.drone.star @@ -963,6 +963,7 @@ def ocisServer(): 'pull': 'always', 'detach': True, 'environment' : { + 'OCIS_LOG_LEVEL': 'debug', 'REVA_LDAP_HOSTNAME': 'ldap', 'REVA_LDAP_PORT': 636, 'REVA_LDAP_BIND_PASSWORD': 'admin', From 6a4726261b5a1ad43bfa2a2bc1603eea6650273b Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 27 Jul 2020 22:19:04 +0200 Subject: [PATCH 15/79] Update ocis-proxy to master with auto-enabled accounts --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f0b7b3cd57..b89b6438aa 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/owncloud/ocis-ocs v0.1.0 github.com/owncloud/ocis-phoenix v0.9.0 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 - github.com/owncloud/ocis-proxy v0.5.0 + github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042 github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 diff --git a/go.sum b/go.sum index 34eabf9521..49cfe3f468 100644 --- a/go.sum +++ b/go.sum @@ -1368,6 +1368,8 @@ github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0 h1:VEwmTJOn5 github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-proxy v0.5.0 h1:RjMgHF0qRZPdbVSv/RCAwNmi3rJzsRHdZaq6UvQCgVk= github.com/owncloud/ocis-proxy v0.5.0/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= +github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 h1:M8r2PcwzNNnZRoMPcpdeDJaPjyESQcSvRM8Y8XToM7I= +github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-reva v0.2.1 h1:4aOOJT7tn9GCeNCM+qr33de2xobW4nAKJUvbb0BpL2k= github.com/owncloud/ocis-reva v0.2.1/go.mod h1:Ew9XgScQzFbdpSZySq1PHVISgd4y03Ms62lFy+mAx2s= github.com/owncloud/ocis-reva v0.2.2-0.20200513073117-ee9cd9b8d3ab h1:WNIv1WkJi5JiLEEf8OzSZXUjiad9pqYk9+EUKklwq9k= From 295719416718d17b54f7d01ad91f2b9ff8b30402 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 28 Jul 2020 07:43:00 +0200 Subject: [PATCH 16/79] Pin ocis-phoenix to a commit with manually built phoenix assets. For testing. Not for release. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b89b6438aa..efd328a6da 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.1.0 - github.com/owncloud/ocis-phoenix v0.9.0 + github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042 diff --git a/go.sum b/go.sum index 49cfe3f468..d96ef0b78b 100644 --- a/go.sum +++ b/go.sum @@ -1344,6 +1344,8 @@ github.com/owncloud/ocis-phoenix v0.8.1 h1:ZV8UhCNCHmaoNtve6/7yKM09lFopDvYATmqxx github.com/owncloud/ocis-phoenix v0.8.1/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= github.com/owncloud/ocis-phoenix v0.9.0 h1:XiKKm8nzcpJMSx0V+xLCsLQRyWjtZI3vHguMBGtznxM= github.com/owncloud/ocis-phoenix v0.9.0/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= From ff57cba5f7e019009c455dfb8742e50ded22747d Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 28 Jul 2020 08:28:40 +0200 Subject: [PATCH 17/79] Update oc10-core and phoenix master commit ids for tests --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index 1874a08014..caf0cacb09 100644 --- a/.drone.star +++ b/.drone.star @@ -59,6 +59,7 @@ def getCoreApiTestPipelineNames(): return names def main(ctx): + before = testPipelines(ctx) stages = [ From 13ef57e0b614fae487fe3e7771cde60b9c0d2fcd Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 28 Jul 2020 10:43:34 +0200 Subject: [PATCH 18/79] Update ocis-reva --- go.mod | 2 +- go.sum | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index efd328a6da..6aed452302 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 - github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042 + github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.0 diff --git a/go.sum b/go.sum index d96ef0b78b..345f2886e4 100644 --- a/go.sum +++ b/go.sum @@ -362,6 +362,7 @@ github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1 h1:f/XZNSkCpS0ndLzMq github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1/go.mod h1:yPtGZIud+QVWLN7lxPwZLNj2/BCx3xu2DNUcTJE1Mkk= github.com/cs3org/reva v0.1.1-0.20200724135750-b46288b375d6 h1:xTJzgtusJvbz08fYVnxlxNu4BhyGCS46uwiD4QrYnOI= github.com/cs3org/reva v0.1.1-0.20200724135750-b46288b375d6/go.mod h1:qwW0YfYf6JaAcTxBXsPpa8JIn2wHxqt5j/bjH7myI1k= +github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0/go.mod h1:hpkioVUPS+7USJq1cW1ikT22fxeMbVvHfonQVYcix4g= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -418,6 +419,7 @@ github.com/evanphx/json-patch/v5 v5.0.0 h1:dKTrUeykyQwKb/kx7Z+4ukDs6l+4L41HqG1XH github.com/evanphx/json-patch/v5 v5.0.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0 h1:iJijjXGuAFvYA8rTypGm7xMcl3QKlhuNn+nn5dNGA/k= github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0/go.mod h1:CfBfpEHiX55nX/EXkG3bOskUPrYe51D/guFiBupNSik= +github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59/go.mod h1:XYuK1S5+kS6FGhlIUFuZFPvWiSrOIoLk6+ro33Xce3Y= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= @@ -1404,6 +1406,8 @@ github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed h1:K2Ny7V/PJ github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042 h1:sADjncr5kwWChl89vanfBVLnBvsrWai+4Mp804wwcp4= github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042/go.mod h1:CCmM7nzFBymJg+oQKrwAynOEzIBSFnCKSegkX6Tk2hg= +github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 h1:5luq6XGh9YsbKWQw3EiekgKoL7QC27QYWvkdNLRknrY= +github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-settings v0.0.0-20200511093940-0fddb624d0da/go.mod h1:1PyfbVIZMTX21JxsRT+maRIjRFD3H+yhfpr1jMz3PeA= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= @@ -1694,6 +1698,7 @@ github.com/tredoe/fileutil v1.0.0/go.mod h1:PBayWPFCURwkmW0u6E8E8C6Jtd9ZzWq/U1iM github.com/tredoe/goutil v0.0.0-20200111155331-68cefb6d3cdc/go.mod h1:dp4VPOLeEFYbsf1ikgd+uytWDnpCdMiTHMg6mh7hHuQ= github.com/tredoe/osutil v1.0.5 h1:mfXjHBJU46GoJDOUcHyV895fauUuVikR9U8yRbGBrqw= github.com/tredoe/osutil v1.0.5/go.mod h1:DDO4G4Mwys6NJi5JmEVLnfFbQWIfVVri8L6HuXb/v98= +github.com/tus/tusd v1.1.0/go.mod h1:3DWPOdeCnjBwKtv98y5dSws3itPqfce5TVa0s59LRiA= github.com/tus/tusd v1.1.1-0.20200416115059-9deabf9d80c2 h1:rcji4q9wMuSrz0tZt3kgIr/3WsB5kUqFja6RrgeCGEo= github.com/tus/tusd v1.1.1-0.20200416115059-9deabf9d80c2/go.mod h1:ygrT4B9ZSb27dx3uTnobX5nOFDnutBL6iWKLH4+KpA0= github.com/tus/tusd v1.3.0 h1:fGxm7iCUHHP2fxmV+3u7ZQcGMBWR23Y/Suxiri66+hA= From 4b3646ff4dc7b9111c49ebe9f3b5a21b23c5b1a7 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 28 Jul 2020 10:44:04 +0200 Subject: [PATCH 19/79] go mod tidy --- go.sum | 208 +-------------------------------------------------------- 1 file changed, 2 insertions(+), 206 deletions(-) diff --git a/go.sum b/go.sum index 345f2886e4..8f2ef0a9d4 100644 --- a/go.sum +++ b/go.sum @@ -160,26 +160,6 @@ github.com/aws/aws-sdk-go v1.23.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi github.com/aws/aws-sdk-go v1.25.31/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.30.12 h1:KrjyosZvkpJjcwMk0RNxMZewQ47v7+ZkbQDXjWsJMs8= -github.com/aws/aws-sdk-go v1.30.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.30.25/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.31.1 h1:5tv3VtTS/IM1yZ6lxMQQVmH28SkkR3b3w+6u+9rcLx4= -github.com/aws/aws-sdk-go v1.31.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.31.6 h1:nKjQbpXhdImctBh1e0iLg9iQW/X297LPPuY/9f92R2k= -github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.31.7 h1:TCA+pXKvzDMA3vVqhK21cCy5GarC8pTQb/DrVOWI3iY= -github.com/aws/aws-sdk-go v1.31.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.32.10/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.32.11 h1:1nYF+Tfccn/hnAZsuwPPMSCVUVnx3j6LKOpx/WhgH0A= -github.com/aws/aws-sdk-go v1.32.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.32.13 h1:zzyXF7SUxJcJa3hTcYCl1/Ey+kh2N8TjK5tWnL0wieo= -github.com/aws/aws-sdk-go v1.32.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.33.1 h1:yz9XmNzPshz/lhfAZvLfMnIS9HPo8+boGRcWqDVX+T0= -github.com/aws/aws-sdk-go v1.33.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.33.6 h1:YLoUeMSx05kHwhS+HLDSpdYYpPzJMyp6hn1cWsJ6a+U= -github.com/aws/aws-sdk-go v1.33.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.33.7 h1:vOozL5hmWHHriRviVTQnUwz8l05RS0rehmEFymI+/x8= -github.com/aws/aws-sdk-go v1.33.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= @@ -219,8 +199,6 @@ github.com/blevesearch/zap/v13 v13.0.1/go.mod h1:XmyNLMvMf8Z5FjLANXwUeDW3e1+o77T github.com/blevesearch/zap/v14 v14.0.0 h1:HF8Ysjm13qxB0jTGaKLlatNXmJbQD8bY+PrPxm5v4hE= github.com/blevesearch/zap/v14 v14.0.0/go.mod h1:sUc/gPGJlFbSQ2ZUh/wGRYwkKx+Dg/5p+dd+eq6QMXk= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= -github.com/bmatcuk/doublestar v1.3.0 h1:1jLE2y0VpSrOn/QR9G4f2RmrCtkM3AuATcWradjHUvM= -github.com/bmatcuk/doublestar v1.3.0/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmatcuk/doublestar v1.3.1 h1:rT8rxDPsavp9G+4ZULzqhhUSaI/OPsTZNG88Z3i0xvY= github.com/bmatcuk/doublestar v1.3.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= @@ -323,45 +301,16 @@ github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da h1:WXnT88cFG2davqS github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= github.com/crewjam/saml v0.4.0 h1:gvSlboe4BO1APaU2eDdsbql3itRat310Q5qs2Seim2k= github.com/crewjam/saml v0.4.0/go.mod h1:geQUbAAwmTKNJFDzoXaTssZHY26O89PHIm3K3YWjWnI= -github.com/cs3org/cato v0.0.0-20200618163134-e83dd323b17e/go.mod h1:6GOQIYvO+ZepxBKY9geuIAF7qfozDeDsTrX0BW9LZ0k= github.com/cs3org/cato v0.0.0-20200626150132-28a40e643719/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= github.com/cs3org/go-cs3apis v0.0.0-20191128165347-19746c015c83/go.mod h1:IsVGyZrOLUQD48JIhlM/xb3Vz6He5o2+W0ZTfUGY+IU= github.com/cs3org/go-cs3apis v0.0.0-20200306065539-29abc33f5be0/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200408065125-6e23f3ecec0a/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/go-cs3apis v0.0.0-20200423154403-462ce7762d4a h1:+ucCukFjYS+L7Sg3GbXoD0M0Pz6CQEhJ9HC97GHc9TU= -github.com/cs3org/go-cs3apis v0.0.0-20200423154403-462ce7762d4a/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/go-cs3apis v0.0.0-20200515145316-7048e6a5a73d h1:toZvBLH1cbHT65kv6xYPd9QqwLUHwOAVHqe9j4obAq4= -github.com/cs3org/go-cs3apis v0.0.0-20200515145316-7048e6a5a73d/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200611124600-7a1be2026543/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/go-cs3apis v0.0.0-20200625121012-96e791152b14 h1:ORPIrxw/T33ALlpaon9IMRzf54ArJQWCYlcECZiRmEc= -github.com/cs3org/go-cs3apis v0.0.0-20200625121012-96e791152b14/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad h1:XxB0h+UKILRKdr+WgPJaOfW8duVPeVKq/18aip5D/Ws= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= github.com/cs3org/reva v0.1.0/go.mod h1:8j6QyyAq9Kjj7RPfJb7M1aEmw5DmsuCJKUULXxYOyRo= -github.com/cs3org/reva v0.1.1-0.20200427161359-c1549a8110eb h1:NmIewIBHshEpn8q1pezRDoG2B7hRVgnWYLX1XSVjx1E= -github.com/cs3org/reva v0.1.1-0.20200427161359-c1549a8110eb/go.mod h1:I20R3mjgLU9y9Ol3pIckY3M948l7mkJORdpfSR9w9tM= -github.com/cs3org/reva v0.1.1-0.20200512135421-3aa67e818a8d/go.mod h1:YIgUciBl5fg6xhV+ZPWkfWlc5H4wjXg/8+ngIYPzvKI= -github.com/cs3org/reva v0.1.1-0.20200520150229-ce94fda7436f h1:SXxBH0dzdQMRkvKqVUdKPoVszngCmJQgYhy0xtCN9qk= -github.com/cs3org/reva v0.1.1-0.20200520150229-ce94fda7436f/go.mod h1:fVZ7IXTQaxNit5Q9yA+x6ciJmUpEHgBrxtwmiGGBY40= -github.com/cs3org/reva v0.1.1-0.20200528113317-f599518bd52a h1:bWnGUXh5akgmaBpNWk2rfuBMskAdPY9HX/zlc8gGKN0= -github.com/cs3org/reva v0.1.1-0.20200528113317-f599518bd52a/go.mod h1:ig/TuMCG/l6vjOvFkj/4tU27PBvcig+Kfjc4mF++BwQ= -github.com/cs3org/reva v0.1.1-0.20200528123359-7d74bf8e9928 h1:6dIWlFuZNGz3tmK8IF/1JQ/TkmTj0/v3dSt0Zi1zrX0= -github.com/cs3org/reva v0.1.1-0.20200528123359-7d74bf8e9928/go.mod h1:ig/TuMCG/l6vjOvFkj/4tU27PBvcig+Kfjc4mF++BwQ= -github.com/cs3org/reva v0.1.1-0.20200529120551-4f2d9c85d3c9 h1:j1jhTTKkXyRL4mZrfXn86poq8z3lRVV7N/KcuDVEudo= -github.com/cs3org/reva v0.1.1-0.20200529120551-4f2d9c85d3c9/go.mod h1:FOU15UeWYXIckxEOwqjjoNAK/1EQrdRTuiX6x66b3Ts= -github.com/cs3org/reva v0.1.1-0.20200626083045-8d345749ae0d/go.mod h1:wunIwvRI7Pd+QFB0YCK+jdAtq0udQzjt8iG7WQ+LLrs= -github.com/cs3org/reva v0.1.1-0.20200626111234-e21c32db9614/go.mod h1:wunIwvRI7Pd+QFB0YCK+jdAtq0udQzjt8iG7WQ+LLrs= -github.com/cs3org/reva v0.1.1-0.20200629131207-04298ea1c088 h1:oCRNwQ4M1JoROK/jlYK1Cj1ElXky7ubFO8AA/YKMNfA= -github.com/cs3org/reva v0.1.1-0.20200629131207-04298ea1c088/go.mod h1:aTjgnI4OFVK+1Ed6EtyDw5Q7Ujs9sSbY74d3I4Ph/xY= -github.com/cs3org/reva v0.1.1-0.20200701152626-2f6cc60e2f66 h1:0FEaqg/OF1wci6uVsn9VgU6BOrCYF9RUrOIzEXIfb6M= -github.com/cs3org/reva v0.1.1-0.20200701152626-2f6cc60e2f66/go.mod h1:umXd+gBuq0t1hiR8f+EplUxeWPcBnAIKPNKbXtA9EWU= -github.com/cs3org/reva v0.1.1-0.20200709064551-91eed007038f h1:wsQOmNJGqxiXC3uTYHy1IPi39lO+UKD1adu2V3+8YtE= -github.com/cs3org/reva v0.1.1-0.20200709064551-91eed007038f/go.mod h1:VUBjQP8XCiWwFTPhE9P4I47k0NbdczQa2q6JsJN2PqY= -github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1 h1:f/XZNSkCpS0ndLzMq/IRA0k2P1B/04Qvgf7s4qtQoGQ= -github.com/cs3org/reva v0.1.1-0.20200722125752-6dea7936f9d1/go.mod h1:yPtGZIud+QVWLN7lxPwZLNj2/BCx3xu2DNUcTJE1Mkk= -github.com/cs3org/reva v0.1.1-0.20200724135750-b46288b375d6 h1:xTJzgtusJvbz08fYVnxlxNu4BhyGCS46uwiD4QrYnOI= -github.com/cs3org/reva v0.1.1-0.20200724135750-b46288b375d6/go.mod h1:qwW0YfYf6JaAcTxBXsPpa8JIn2wHxqt5j/bjH7myI1k= +github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0 h1:v1+My73gml0FW0t8pokmbQ32QhJJyxiiJ8zHYL+g81I= github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0/go.mod h1:hpkioVUPS+7USJq1cW1ikT22fxeMbVvHfonQVYcix4g= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= @@ -417,8 +366,7 @@ github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.0.0 h1:dKTrUeykyQwKb/kx7Z+4ukDs6l+4L41HqG1XHnhX7WE= github.com/evanphx/json-patch/v5 v5.0.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0 h1:iJijjXGuAFvYA8rTypGm7xMcl3QKlhuNn+nn5dNGA/k= -github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0/go.mod h1:CfBfpEHiX55nX/EXkG3bOskUPrYe51D/guFiBupNSik= +github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59 h1:t2+zxJPT/jq/YOx/JRsoByAZI/GHOxYJ7MKeillEX4U= github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59/go.mod h1:XYuK1S5+kS6FGhlIUFuZFPvWiSrOIoLk6+ro33Xce3Y= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= @@ -836,8 +784,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.12.1 h1:zCy2xE9ablevUOrUZc3Dl72Dt+ya2FNAvC2yLYMHzi4= -github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.14.4 h1:IOPK2xMPP3aV6/NPt4jt//ELFo3Vv8sDVD8j3+tleDU= github.com/grpc-ecosystem/grpc-gateway v1.14.4/go.mod h1:6CwZWGDSPRJidgKAtJVvND6soZe6fT7iteq8wDPdhb0= github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o= @@ -1038,8 +984,6 @@ github.com/marten-seemann/qtls v0.4.1 h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gt github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPXTCZLQQunvRc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -1086,12 +1030,9 @@ github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E github.com/micro/go-micro v1.18.0/go.mod h1:klwUJL1gkdY1MHFyz+fFJXn52dKcty4hoe95Mp571AA= github.com/micro/go-micro/v2 v2.0.0/go.mod h1:v7QP5UhKRt37ixjJe8DouWmg0/eE6dltr5h0idJ9BpE= github.com/micro/go-micro/v2 v2.0.1-0.20200207205803-ef537270add3/go.mod h1:CDPVByZzOp1RNrJfNxEGgNOJ11wEw8NoHfADo8M3+LM= -github.com/micro/go-micro/v2 v2.0.1-0.20200212105717-d76baf59de2e/go.mod h1:CDPVByZzOp1RNrJfNxEGgNOJ11wEw8NoHfADo8M3+LM= github.com/micro/go-micro/v2 v2.5.1-0.20200417165434-16db76bee2fb/go.mod h1:qz2UT4UFdFVs+qUGMuDK3xuHgude1BgntqQ29sbpPlE= github.com/micro/go-micro/v2 v2.6.0 h1:HH6uEqTu6pkBtAlwAqQW2sf33640iEa1s9puGIctpO0= github.com/micro/go-micro/v2 v2.6.0/go.mod h1:60HMKlDN4ShZDJRrlgdcAmkCWNhQbYv+CDG3r7iLE34= -github.com/micro/go-micro/v2 v2.7.0 h1:oWmCoA81Z7kCk26hiRGNrlJ8TWmpb3/ImO0EYdhoXBw= -github.com/micro/go-micro/v2 v2.7.0/go.mod h1:bImBPfyXthPdQeVSik9sACGUxuxDE7jY8g5K7xZZV4c= github.com/micro/go-micro/v2 v2.8.0 h1:WKogg6xqJmk3CjTFscrzSKN1fSGtince4sWfaqx9844= github.com/micro/go-micro/v2 v2.8.0/go.mod h1:hSdOM6jb6aGswjBpCeB9wJ0yVH+CugevRm/CX7NlSrQ= github.com/micro/go-plugins v1.5.1 h1:swcFD7ynCTUo98APqIEIbPu2XMd6yVGTnI8PqdnCwOQ= @@ -1102,12 +1043,9 @@ github.com/micro/mdns v0.3.0 h1:bYycYe+98AXR3s8Nq5qvt6C573uFTDPIYzJemWON0QE= github.com/micro/mdns v0.3.0/go.mod h1:KJ0dW7KmicXU2BV++qkLlmHYcVv7/hHnbtguSWt9Aoc= github.com/micro/micro v1.16.0 h1:qCZV20WoTOtJ1IyLU/a0A0BMSertfu+iOj/2AJ4Uvrk= github.com/micro/micro v1.16.0/go.mod h1:TO5Ng0KidbfRYIxVM4Q3deZ0A+qwRyP9WeXp+k2fWNA= -github.com/micro/micro v1.18.0 h1:v+xiQOXbT9xxotLwu1nJM81t4FbruBxZSSyIdhUfujM= github.com/micro/micro/v2 v2.0.1-0.20200210100719-f38a1d8d5348 h1:iV75DZfKGKulOxaRehmzV6NMa0Aevtk5jKcVdv90vJQ= github.com/micro/micro/v2 v2.0.1-0.20200210100719-f38a1d8d5348/go.mod h1:MQBt/cBC7vKP6JMebU5982Umd5GIrVdhPbOGieXowyY= github.com/micro/micro/v2 v2.5.1-0.20200418121137-24e9b206767c/go.mod h1:fqqaYbJGYzSBi7Ms2Adly7Xzw9+WIRBAucUjwGmYeFY= -github.com/micro/micro/v2 v2.7.0 h1:8gF0SIHMkdsXWt4ItmnUKvEuYF4U8BSkcAXp+Li+4O8= -github.com/micro/micro/v2 v2.7.0/go.mod h1:J91wOxMkyGM8q74+HUM9A47NmAPOMX+rU1IbUpwbyEw= github.com/micro/micro/v2 v2.8.0 h1:AMqpnKsOBnuGHjU0jVmTL17BRdsOx0FbvI/Gkl2uLrA= github.com/micro/micro/v2 v2.8.0/go.mod h1:VTIGqEBLAMh22q72DnGd95iJSQY/3yvXd9GIIooQ69c= github.com/micro/protoc-gen-micro v1.0.0/go.mod h1:C8ij4DJhapBmypcT00AXdb0cZ675/3PqUO02buWWqbE= @@ -1120,8 +1058,6 @@ github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.22/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= 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/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg= -github.com/miekg/dns v1.1.29/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= @@ -1145,14 +1081,8 @@ 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.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4= -github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.3.0 h1:iDwIio/3gk2QtLLEsqU5lInaMzos0hDTz8a6lazSFVw= -github.com/mitchellh/mapstructure v1.3.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5Y5bqfLA= github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg= -github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= @@ -1265,12 +1195,6 @@ github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnh github.com/ory/fosite v0.29.0/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0= github.com/ory/fosite v0.30.2/go.mod h1:Lq9qQ9Sl6mcea2Tt8J7PU+wUeFYPZ+vg7N3zPVKGbN8= github.com/ory/fosite v0.30.4/go.mod h1:Lq9qQ9Sl6mcea2Tt8J7PU+wUeFYPZ+vg7N3zPVKGbN8= -github.com/ory/fosite v0.31.0 h1:NZ0FA4ywPEYrCGLNVBAz2dq8vTacLDbbO4Iiy68WCKQ= -github.com/ory/fosite v0.31.0/go.mod h1:lSSqjo8Kr/U1P3kJWxsNGHmq7TnH/7pS1ijvQRT7G+g= -github.com/ory/fosite v0.31.3 h1:5WjLwfs+yUALZjzKUKGN/M+ddBJ5Ol6NawxuCO2TuAg= -github.com/ory/fosite v0.31.3/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I= -github.com/ory/fosite v0.32.0 h1:g89HkBt0dgm+HPrbsYZTmyks1NIw0BH/UlEaw84e1ss= -github.com/ory/fosite v0.32.0/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I= github.com/ory/fosite v0.32.2 h1:iRV495P/9EyoYQ8qEHYxFQeeYCdDFawqjAML+qiMF9s= github.com/ory/fosite v0.32.2/go.mod h1:UeBhRgW6nAjTcd8S7kAo0IFsY/rTPyOXPq/t8N20Q8I= github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90/go.mod h1:sxnvPCxChFuSmTJGj8FdMupeq1BezCiEpDjTUXQ4hf4= @@ -1288,64 +1212,26 @@ github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/flaex v0.2.0 h1:3FLf8oyMgA6HLK7w4+VJ5N1oVA8G7MptLCVjfxxIaww= github.com/owncloud/flaex v0.2.0/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= -github.com/owncloud/ocis-accounts v0.1.0/go.mod h1:eoOPfuFCJ23n2csSMzapfjzVhG2kt8sQ2tu/9J+SwsA= -github.com/owncloud/ocis-accounts v0.1.2-0.20200511104221-f537f420c409/go.mod h1:ltC+eLvLEuIVmcGc4dwkg+24Nl7PvyqlnZp/pH8Lg8k= -github.com/owncloud/ocis-accounts v0.1.2-0.20200522102615-8c7da929195a/go.mod h1:rENi9CsW2FgWk8FyHVKFrRvtR++/EZAR1ro9XgeEXAY= -github.com/owncloud/ocis-accounts v0.1.2-0.20200522103104-a5d5eac711c1 h1:VWZumx0u0HqnqHK6047K2yGbuIs6MB/zfjN57n5T90s= -github.com/owncloud/ocis-accounts v0.1.2-0.20200522103104-a5d5eac711c1/go.mod h1:Rl7zh777O7IwEHceHFSshy/tgNpNKcitCJ7VGSNz/1s= github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e h1:FRD1/lH/6IaaWWzBXCeM4hUAoN86zQAz68nOnvCLqsY= github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e/go.mod h1:ohb58AUSUgq+kPOFAjy1s1k5Bi33YtPg45qOOPsepeM= github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f/go.mod h1:wxo2B5EoTQlf3ryDeOTR/RAs3z6IHkllu1CvBxrLf1A= -github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171 h1:FWEs/MMLMnuo+gFKLhHVs4ZCIdCCCWcHWhfYUOPHPpo= -github.com/owncloud/ocis-accounts v0.1.2-0.20200721035523-7af05fb19171/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 h1:bAyT1wnChpJvqKxSno/i59K2a0gugTogY5eRbhTg50o= github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= -github.com/owncloud/ocis-glauth v0.4.0 h1:L+S2UzkJJv5NWBVnTIZObdFz5zvKz8L0crIWbXtTF8o= -github.com/owncloud/ocis-glauth v0.4.0/go.mod h1:dZzZdRkssaEiDg3UdlQL+kozVfpyVUhdUd0uGcTdCH8= -github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2 h1:jGSovZULvr765rMSWfskDp4RoWRprB71S6I90UGYIW8= -github.com/owncloud/ocis-glauth v0.4.1-0.20200713102750-17986ac2d9a2/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= -github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8 h1:91rDks8ZERsRnOmDtbpqWFnpBGP61vUFpnYHwIyHtwY= -github.com/owncloud/ocis-glauth v0.4.1-0.20200723141434-ec6fc5ad32a8/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= -github.com/owncloud/ocis-glauth v0.5.0 h1:gk1eS2p3dRSKgsGSJc0UJ+CLsQRSkzSd7BIsh75zp18= -github.com/owncloud/ocis-glauth v0.5.0/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c/go.mod h1:zspcodmHIzGmB6Py8Ve+oO6wXFKRra5bEx1Q9HdJlrY= -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-hello v0.1.0-alpha1.0.20200207094758-c866cafca7e5 h1:s4Cz5Mj08JS7yCpwcT5MXvGsDjL1cUC2sKocHhXJejo= -github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200207094758-c866cafca7e5/go.mod h1:5E/ej0jrrU3SNaBUi7eu5iuVu5R4mTTMH1jXXiwnhqI= github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 h1:8zIKgKnJF0PvNI4BLXgYpUsV1H1zVaFFZwD8xDJvyW0= github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96/go.mod h1:tf0EkzbgtgBynkQCQmZdVlTV3y7m6ltyMBbR5h+xMbs= -github.com/owncloud/ocis-konnectd v0.3.1 h1:d886SLx6oR2ldNAvJC8TB/0+XnYCQiNFFTGzoR5giW0= -github.com/owncloud/ocis-konnectd v0.3.1/go.mod h1:kOBYY8P1s2KJRmUc//bThSFtSIH6NO1+6WogmrHcMRY= -github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd h1:mSCRvNZM3RoqJ691sWhMtiKD7SraH575EQ1ZwzuUCMw= -github.com/owncloud/ocis-konnectd v0.3.2-0.20200708111309-f4d6d46837dd/go.mod h1:pyxlwCsLY/j54w5QVOSW8owARj6JfjH01b4hFz8XtAY= github.com/owncloud/ocis-konnectd v0.3.2 h1:lKXpiE44xd/yvRmnTC2UA9qE+xP/6VT3QLQp3lKnmbc= github.com/owncloud/ocis-konnectd v0.3.2/go.mod h1:pyxlwCsLY/j54w5QVOSW8owARj6JfjH01b4hFz8XtAY= -github.com/owncloud/ocis-migration v0.1.1-0.20200519133726-4c6b7daff23c h1:2yqJ86Zo7UNDpJ9SF9wR1sWgAKyHkqMabXMd00zmmMs= -github.com/owncloud/ocis-migration v0.1.1-0.20200519133726-4c6b7daff23c/go.mod h1:49q0ooScsn+aT0s+rO5l9u3LEJ/TNyn4b63GdNvhQzc= github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iKXA83ta7A= github.com/owncloud/ocis-migration v0.2.0/go.mod h1:U6DCcHLuogHvAXg1aAyIlzJPtERIqyuigXU1BjUpu5g= -github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7 h1:AHKA5xrnSBOdFjVTkaXzCyJl7vhOVklJD/b/T6Ky/oI= -github.com/owncloud/ocis-ocs v0.0.0-20200318181133-cc66a0531da7/go.mod h1:W0ry/qPP85Yw/KKd0IoOdjOI914bvzOaEeM9bzRuwaQ= -github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81 h1:Jgje5GjSIM8qg58DQW3KGhvc8d/D6fgYLBNMXrn3Wxs= -github.com/owncloud/ocis-ocs v0.0.0-20200722134709-2f3332a55b81/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= github.com/owncloud/ocis-ocs v0.1.0 h1:4D8B8hvRNeO1hPcSRH8jXr9Cq73BIXvqaKRO+hdf8ZQ= github.com/owncloud/ocis-ocs v0.1.0/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= -github.com/owncloud/ocis-phoenix v0.6.0 h1:p++botHH6WizAiMXELBTDRw9oVqcjyMliLf5BLgrDxw= -github.com/owncloud/ocis-phoenix v0.6.0/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= -github.com/owncloud/ocis-phoenix v0.7.0 h1:yJkWUm2SR55bjfOUoDhfkGhbjaXmgAA72vgcEF1H0M4= -github.com/owncloud/ocis-phoenix v0.7.0/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= -github.com/owncloud/ocis-phoenix v0.8.0 h1:cHzhrKPY7RM9f2GsnqxmoJ/YzvHwufrhvsCFrzVBx6I= -github.com/owncloud/ocis-phoenix v0.8.0/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= -github.com/owncloud/ocis-phoenix v0.8.1 h1:ZV8UhCNCHmaoNtve6/7yKM09lFopDvYATmqxxAYJRM8= -github.com/owncloud/ocis-phoenix v0.8.1/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= -github.com/owncloud/ocis-phoenix v0.9.0 h1:XiKKm8nzcpJMSx0V+xLCsLQRyWjtZI3vHguMBGtznxM= -github.com/owncloud/ocis-phoenix v0.9.0/go.mod h1:uTJsJV9mTnWmMOgg1YaxUaqmAjH5P+sikp9tZQKSwpM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= @@ -1353,86 +1239,25 @@ github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg/v2 v2.0.1/go.mod h1:7bVnn3VUaqdmvpMkXF0QVEF1fRugs35hSkuVTAq9yjk= github.com/owncloud/ocis-pkg/v2 v2.0.3-0.20200309150924-5c659fd4b0ad/go.mod h1:TrBRa+D8mUTsl+qvQiIksJbUvxdE/Qq9jEHUcERPQ60= -github.com/owncloud/ocis-pkg/v2 v2.2.0/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-pkg/v2 v2.2.1 h1:LK7WxHYugEFQ9NHTOz0EP8DRjbt51wXhyqruV03z6zI= github.com/owncloud/ocis-pkg/v2 v2.2.1/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c h1:hYhKSfMkPO4kRLrKqRHPmePGTCpGDGji+s4yW30+tmM= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPyTZbTofJjAz3LSQUIaKKcjjBBBIJGaEAkP8g= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= -github.com/owncloud/ocis-proxy v0.3.1 h1:49weyxHNQjOeWTaf31LlQp5uul8ZoJenfe9o4P4fetU= -github.com/owncloud/ocis-proxy v0.3.1/go.mod h1:HwsIKM9etps19bBVwjOX+Jrv9pfDvw3azvaHaxMiBCI= -github.com/owncloud/ocis-proxy v0.3.2-0.20200526160332-ea254d603659 h1:zWDmNSbhfZB5NiW63a0wCbeugH70SnlQABaRJf7WbR8= -github.com/owncloud/ocis-proxy v0.3.2-0.20200526160332-ea254d603659/go.mod h1:XPqctXYxoXPmqtxuXRQ8RJ9StVrbilFLkwsWh9bcdsE= -github.com/owncloud/ocis-proxy v0.3.2-0.20200529092045-bfe4790ab8cd h1:wsU+VOGO7i8+zT8sP7RgwxwI/M83Woi47LtdqXtyagw= -github.com/owncloud/ocis-proxy v0.3.2-0.20200529092045-bfe4790ab8cd/go.mod h1:XPqctXYxoXPmqtxuXRQ8RJ9StVrbilFLkwsWh9bcdsE= -github.com/owncloud/ocis-proxy v0.4.0 h1:xPCctmBKtXEKhazh7RurursSCPEtIOkUVCkTypMYoao= -github.com/owncloud/ocis-proxy v0.4.0/go.mod h1:2ZKZ7q5JMvDEoosWp9MaOYp+EkQP0ZsQV8o2gSw0PHM= -github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0 h1:VEwmTJOn5ym44oYcuMLCj+m2N2LAL5MjHNVXEXPtaTY= -github.com/owncloud/ocis-proxy v0.4.1-0.20200722150807-7ee05765b5c0/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= -github.com/owncloud/ocis-proxy v0.5.0 h1:RjMgHF0qRZPdbVSv/RCAwNmi3rJzsRHdZaq6UvQCgVk= -github.com/owncloud/ocis-proxy v0.5.0/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 h1:M8r2PcwzNNnZRoMPcpdeDJaPjyESQcSvRM8Y8XToM7I= github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= -github.com/owncloud/ocis-reva v0.2.1 h1:4aOOJT7tn9GCeNCM+qr33de2xobW4nAKJUvbb0BpL2k= -github.com/owncloud/ocis-reva v0.2.1/go.mod h1:Ew9XgScQzFbdpSZySq1PHVISgd4y03Ms62lFy+mAx2s= -github.com/owncloud/ocis-reva v0.2.2-0.20200513073117-ee9cd9b8d3ab h1:WNIv1WkJi5JiLEEf8OzSZXUjiad9pqYk9+EUKklwq9k= -github.com/owncloud/ocis-reva v0.2.2-0.20200513073117-ee9cd9b8d3ab/go.mod h1:mO2vMom9eC3mdMKOtOIYUUlk3eocUZcVXidKk7IfSWA= -github.com/owncloud/ocis-reva v0.3.0 h1:vjgE1+Hl/BZIpFScVNd7AumqPiz7bz0f+vC6jxPKBlo= -github.com/owncloud/ocis-reva v0.3.0/go.mod h1:AHqIFXy/2mUkmDd9c6lEOze+eQn6JwOuSQmk/Skx3uM= -github.com/owncloud/ocis-reva v0.3.1-0.20200528114228-8b0fbaad324b h1:ucQ/fWHUF8klSy5sCPyhY83qRYjRhRbwI7yoXK0maM8= -github.com/owncloud/ocis-reva v0.3.1-0.20200528114228-8b0fbaad324b/go.mod h1:qArIteciv1w4gp1gII9Ghe7jozeg+aGgdFmYlDpgZfg= -github.com/owncloud/ocis-reva v0.3.1-0.20200528185917-b1aedb9f6095 h1:BfbWBzcH6zSlD7cGwYhdl2xfcMO6f4/AiHUoviTdm2c= -github.com/owncloud/ocis-reva v0.3.1-0.20200528185917-b1aedb9f6095/go.mod h1:9KcnJexYhUwOpmDvZncce2XVBuYhP/DNBqrXJP//k3g= -github.com/owncloud/ocis-reva v0.4.0 h1:roOkKHDyQ0qUhCqhZj1UR95sKtT3NFWCRHAzZPVSE1M= -github.com/owncloud/ocis-reva v0.4.0/go.mod h1:TX0wX2qaP1mAz3i0RzHCrmcr0BAZ3QPzKS0I0ayQca8= -github.com/owncloud/ocis-reva v0.6.1-0.20200626101933-c92d1e5785c6 h1:85SJXsf4PH39D0yYQOvaXj8CiFgPaXRBxqLEggrxY5s= -github.com/owncloud/ocis-reva v0.6.1-0.20200626101933-c92d1e5785c6/go.mod h1:KLhU8dSPXplONdCQw6EdyV/SdVQNtaf5DTGYBebSLrY= -github.com/owncloud/ocis-reva v0.6.1-0.20200626135341-b922f7606025 h1:K6iJNBBknxE+zK8oU5rAvd/zGdY1bXJ/wrt6zmQosX4= -github.com/owncloud/ocis-reva v0.6.1-0.20200626135341-b922f7606025/go.mod h1:S7eUlhWh0LE94JPIHxgY3FFIYSHuWQnN3r7qspssI18= -github.com/owncloud/ocis-reva v0.7.0 h1:1cdnmVD82lXCEsaTCboOBH2d6Q68j5F6lNUq4ed6Yww= -github.com/owncloud/ocis-reva v0.7.0/go.mod h1:S7eUlhWh0LE94JPIHxgY3FFIYSHuWQnN3r7qspssI18= -github.com/owncloud/ocis-reva v0.8.0 h1:m2xIkJUCkdCFi9QUyoxH2tSoQ7OCI0+3pk5uUBMD7VU= -github.com/owncloud/ocis-reva v0.8.0/go.mod h1:MAvXe+xIMGiuJ/Ct2kLykMtfSm5jmGcimvaHxQOGKnk= -github.com/owncloud/ocis-reva v0.9.0 h1:xtK20pjTt3hIeaD20toEfa6SaJl7yY7QxzEUmVOriVQ= -github.com/owncloud/ocis-reva v0.9.0/go.mod h1:XubCqrJYNhYONNHBo7Q6XgH1HHTdaOf7nA9IdFJNY88= -github.com/owncloud/ocis-reva v0.9.1 h1:FlcGcOGAZ5hseGcUuCb8Q2yxfWmJmiOQHHw7B+yjqC8= -github.com/owncloud/ocis-reva v0.9.1/go.mod h1:XubCqrJYNhYONNHBo7Q6XgH1HHTdaOf7nA9IdFJNY88= -github.com/owncloud/ocis-reva v0.10.0 h1:zBcbP17SZU1AEqnFW2G90PNcH68Fdie5vwvaIqSpQfg= -github.com/owncloud/ocis-reva v0.10.0/go.mod h1:rPZptSdecdT0bXAGIIGXhNHkzX4y4wgm0/LDGAZZVrk= -github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9 h1:el0O00ULNheJTX+QJXjEHPywHAmXkTHkUYGhgwSC6gw= -github.com/owncloud/ocis-reva v0.10.1-0.20200722150615-8627042603e9/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= -github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed h1:K2Ny7V/PJ3XbtxemvYK8bI4GBTEWLtKT2kqkoYi4kgY= -github.com/owncloud/ocis-reva v0.10.1-0.20200724115318-ef92a0b3ffed/go.mod h1:xsGko5By4YtXmZdFjK8nT958XPjZX7pAQpxwGkMfFCI= -github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042 h1:sADjncr5kwWChl89vanfBVLnBvsrWai+4Mp804wwcp4= -github.com/owncloud/ocis-reva v0.10.1-0.20200727120238-cd3009a1c042/go.mod h1:CCmM7nzFBymJg+oQKrwAynOEzIBSFnCKSegkX6Tk2hg= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 h1:5luq6XGh9YsbKWQw3EiekgKoL7QC27QYWvkdNLRknrY= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= -github.com/owncloud/ocis-settings v0.0.0-20200511093940-0fddb624d0da/go.mod h1:1PyfbVIZMTX21JxsRT+maRIjRFD3H+yhfpr1jMz3PeA= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= -github.com/owncloud/ocis-settings v0.0.0-20200602115916-d10179c1aa59 h1:/zvpEMfJYa136WCdspaX/zMu78ueXZlVIpmgoG0IWvg= -github.com/owncloud/ocis-settings v0.0.0-20200602115916-d10179c1aa59/go.mod h1:xSf/8ccV12M05xVMnvJ7do3g8ZEsdqKr2Qp0GINPhxM= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:AeXZVHKEU+9Xt4+/lkHE5rx+sJH2if9dIrUGLhe+JOY= github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= -github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c h1:4IOgcTMme4SEzp2bKNKZ/vfdgAcSlLGk8vD0/PSb5xY= -github.com/owncloud/ocis-store v0.0.0-20200722111021-8fa9c07ae95c/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= -github.com/owncloud/ocis-store v0.1.0 h1:dv3gOP54l0jNlIGCgN/HfE0ZfVh1fQh26Nwl7nGBxDo= -github.com/owncloud/ocis-store v0.1.0/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 h1:yt1ufihhLkQQtlNO5TE3/m0jXGC3tPMOhNcUJTG9ObU= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6/go.mod h1:Rav5iw0fZXYFqJl81IbyTVa/FidaBhgVPtp0XqkgviM= -github.com/owncloud/ocis-thumbnails v0.0.0-20200318131505-e0ab0b37a5a4/go.mod h1:VmCoxwitTs6oRxIaGz6xridLPwA6ReRMej22jBhkRIM= -github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb h1:eLvwnJ88x0erIsjMEa2b6dI1pBTEz52eMKrBPJfIOLM= -github.com/owncloud/ocis-thumbnails v0.1.2-0.20200422124828-f92a40879feb/go.mod h1:N9zPXTyUmQ7vi19Y5EO94MRw19up/3SK3SSX5P3PvFw= -github.com/owncloud/ocis-thumbnails v0.1.2 h1:bX59AqzEeIMlzyYzA55lpgh6Mk6wHXpGmU4tVUXjCkY= -github.com/owncloud/ocis-thumbnails v0.1.2/go.mod h1:N9zPXTyUmQ7vi19Y5EO94MRw19up/3SK3SSX5P3PvFw= github.com/owncloud/ocis-thumbnails v0.2.0 h1:jHUXx5WZZxI6U3tGs53dpUfH/CwVBov1RhTi74GMltI= github.com/owncloud/ocis-thumbnails v0.2.0/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= -github.com/owncloud/ocis-webdav v0.1.0 h1:A7wI6knfIDwvlAMrW+YOmP9gxF7bxAtsgIuFs11+fM4= -github.com/owncloud/ocis-webdav v0.1.0/go.mod h1:hB3KbiMS7kyq9bG/BwKSI+lLM4PIMYEckrT2IFYTGxg= -github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab h1:+5LibXqwvHe2ltrFA58et0BZXQZ8oY7Gi0mvFC/fnHo= -github.com/owncloud/ocis-webdav v0.1.1-0.20200713141623-8372c454ffab/go.mod h1:E9OlGfvlxf1NHFOvFgbHWBe7/pw4Gqy/JaSJFEHQSzg= github.com/owncloud/ocis-webdav v0.1.1 h1:4UN9GefQiH6RGgq2+tiYFLNw8ql6luXYH0NdCJg2n/U= github.com/owncloud/ocis-webdav v0.1.1/go.mod h1:E9OlGfvlxf1NHFOvFgbHWBe7/pw4Gqy/JaSJFEHQSzg= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= @@ -1526,14 +1351,6 @@ 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/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/refs/pman v0.0.0-20200523070049-0e3e499ca44c h1:RObWeoWH9jKuDr5XKdKIZP5nPZRYRSsJipe9UxQITKQ= -github.com/refs/pman v0.0.0-20200523070049-0e3e499ca44c/go.mod h1:0ivDlwrVfoxdAIbFV1RN1EDPJHMtUG8iJrhW3erRiwM= -github.com/refs/pman v0.0.0-20200527204655-c9ccd1c53cc3 h1:yW8kN4AEKZGKIq1fEmROGLtWe5lwmMcI7usWTjexOf8= -github.com/refs/pman v0.0.0-20200527204655-c9ccd1c53cc3/go.mod h1:fp4xg8dOs/XaZfB3abn1pxvclh10MtG4tdCc61lrmCo= -github.com/refs/pman v0.0.0-20200602090702-79950bdf64d6 h1:jbqqRCNOV7TvIR6QA8f7PHoOF7yVnduM3ZOB120690g= -github.com/refs/pman v0.0.0-20200602090702-79950bdf64d6/go.mod h1:fp4xg8dOs/XaZfB3abn1pxvclh10MtG4tdCc61lrmCo= -github.com/refs/pman v0.0.0-20200701172222-73b4b2c4ea66 h1:lrJYtPUTIoVSlI2Axrok+LAeC1eHSukD4o+eDLQOW7Y= -github.com/refs/pman v0.0.0-20200701172222-73b4b2c4ea66/go.mod h1:fp4xg8dOs/XaZfB3abn1pxvclh10MtG4tdCc61lrmCo= github.com/refs/pman v0.0.0-20200701173654-f05b8833071a h1:GCYFb7layULUl1HvZG97ur0zyqtEPo3VHcJCcBSvk7M= github.com/refs/pman v0.0.0-20200701173654-f05b8833071a/go.mod h1:fp4xg8dOs/XaZfB3abn1pxvclh10MtG4tdCc61lrmCo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= @@ -1646,7 +1463,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= -github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs= github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw= github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= @@ -1701,7 +1517,6 @@ github.com/tredoe/osutil v1.0.5/go.mod h1:DDO4G4Mwys6NJi5JmEVLnfFbQWIfVVri8L6HuX github.com/tus/tusd v1.1.0/go.mod h1:3DWPOdeCnjBwKtv98y5dSws3itPqfce5TVa0s59LRiA= github.com/tus/tusd v1.1.1-0.20200416115059-9deabf9d80c2 h1:rcji4q9wMuSrz0tZt3kgIr/3WsB5kUqFja6RrgeCGEo= github.com/tus/tusd v1.1.1-0.20200416115059-9deabf9d80c2/go.mod h1:ygrT4B9ZSb27dx3uTnobX5nOFDnutBL6iWKLH4+KpA0= -github.com/tus/tusd v1.3.0 h1:fGxm7iCUHHP2fxmV+3u7ZQcGMBWR23Y/Suxiri66+hA= github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.20.1+incompatible h1:HgqpYBng0n7tLJIlyT4kPCIv5XgCsF+kai1NnnrJzEU= @@ -1719,10 +1534,6 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4= -github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/fasttemplate v1.1.1 h1:o7HedfIt0u4jgkQnk0jkUOUI45c0CbFgcOOVUpo/txI= -github.com/valyala/fasttemplate v1.1.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.0 h1:y3yXRCoDvC2HTtIHvL2cc7Zd+bqA+zqDO6oQzsJO07E= github.com/valyala/fasttemplate v1.2.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/vimeo/go-util v1.2.0/go.mod h1:s13SMDTSO7AjH1nbgp707mfN5JFIWUFDU5MDDuRRtKs= @@ -1773,15 +1584,11 @@ 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.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.2.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0 h1:f3WCSC2KzAcBXGATIxAB1E2XuCpNU255wNKZ505qi3E= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= 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= @@ -1790,8 +1597,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= -go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= gocloud.dev v0.17.0/go.mod h1:tIHTRdR1V5dlD8sTkzYdTGizBJ314BDykJ8KmadEXwo= gocloud.dev/pubsub/rabbitpubsub v0.17.0/go.mod h1:7o1XYDiIC+b0mmcwJuofsDg08t0DtU2ubfn7C/Uz7Y0= golang.org/x/crypto v0.0.0-20170711145318-dd85ac7e6a88/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1932,8 +1737,6 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 h1:eDrdRpKgkcCqKZQwyZRyeFZgfqt37SL7Kv3tok06cKE= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2016,10 +1819,8 @@ golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200103143344-a1369afcdac7/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= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2037,8 +1838,6 @@ golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2124,8 +1923,6 @@ golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWc golang.org/x/tools v0.0.0-20200421042724-cfa8b22178d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200427214658-4697a2867c88 h1:Nj7oNnL9tSACMt2JvszZN6P4IXiy1t6E/YRMr7YtaSw= golang.org/x/tools v0.0.0-20200427214658-4697a2867c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200519205726-57a9e4404bf7 h1:nm4zDh9WvH4jiuUpMY5RUsvOwrtTVVAsUaCdLW71hfY= -golang.org/x/tools v0.0.0-20200519205726-57a9e4404bf7/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2 h1:21BqcH/onxtGHn1A2GDOJjZnbt4Nlez629S3eaR+eYs= golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2279,7 +2076,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 08a5198e3c575772187197108a445246cf3e6ab5 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Tue, 28 Jul 2020 11:26:11 +0200 Subject: [PATCH 20/79] update ocis-accounts to include cli --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6aed452302..146b2cc31b 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 + github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 8f2ef0a9d4..781a8d0124 100644 --- a/go.sum +++ b/go.sum @@ -1013,6 +1013,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 h1:Z/i1e+gTZrmcGeZyWckaLfucYG6KYOXLWo4co8pZYNY= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103/go.mod h1:o9YPB5aGP8ob35Vy6+vyq3P3bWe7NQWzf+JLiXCiMaE= +github.com/mennanov/fieldmask-utils v0.3.2/go.mod h1:JpaanSp6Ql5A8dGktEFxTmA9uBXmz3F+2LAXDZwiimU= github.com/mholt/certmagic v0.7.5/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ= github.com/mholt/certmagic v0.8.3/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ= github.com/mholt/certmagic v0.9.1/go.mod h1:nu8jbsbtwK4205EDH/ZUMTKsfYpJA1Q7MKXHfgTihNw= @@ -1217,6 +1218,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e/go.mod h1 github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f/go.mod h1:wxo2B5EoTQlf3ryDeOTR/RAs3z6IHkllu1CvBxrLf1A= github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 h1:bAyT1wnChpJvqKxSno/i59K2a0gugTogY5eRbhTg50o= github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= +github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d h1:6z1fZksjb0ER0PMYEOHvjbXuVDZv+ixqTfNrW+4l1gI= +github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= From 049f178544fb65f3737c3fb54ea95d51df939f65 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 28 Jul 2020 13:53:58 +0545 Subject: [PATCH 21/79] use proxy to access server in API tests --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index caf0cacb09..aa0e8adcd2 100644 --- a/.drone.star +++ b/.drone.star @@ -223,7 +223,7 @@ def localApiTestsOcStorage(ctx, coreBranch = 'master', coreCommit = ''): 'image': 'owncloudci/php:7.2', 'pull': 'always', 'environment' : { - 'TEST_SERVER_URL': 'http://ocis-server:9140', + 'TEST_SERVER_URL': 'https://ocis-server:9200', 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/', 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', 'TEST_EXTERNAL_USER_BACKENDS':'true', From b8a7e890bfdba5688da216be6be7f8939151da76 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 28 Jul 2020 16:58:09 +0545 Subject: [PATCH 22/79] advance core commit id --- .drone.star | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.star b/.drone.star index aa0e8adcd2..ace1f283f8 100644 --- a/.drone.star +++ b/.drone.star @@ -59,7 +59,6 @@ def getCoreApiTestPipelineNames(): return names def main(ctx): - before = testPipelines(ctx) stages = [ From fdf786fa5174ee128e57ff734d7be2c56d4c5389 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 28 Jul 2020 21:04:10 +0200 Subject: [PATCH 23/79] Update ocis-ocs, ocis-phoenix, ocis-proxy and ocis-reva --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 146b2cc31b..83d8742942 100644 --- a/go.mod +++ b/go.mod @@ -29,11 +29,11 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.0 - github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 + github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5 + github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 - github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 - github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 + github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 + github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.0 diff --git a/go.sum b/go.sum index 781a8d0124..160d83f7a6 100644 --- a/go.sum +++ b/go.sum @@ -1235,8 +1235,12 @@ github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iK github.com/owncloud/ocis-migration v0.2.0/go.mod h1:U6DCcHLuogHvAXg1aAyIlzJPtERIqyuigXU1BjUpu5g= github.com/owncloud/ocis-ocs v0.1.0 h1:4D8B8hvRNeO1hPcSRH8jXr9Cq73BIXvqaKRO+hdf8ZQ= github.com/owncloud/ocis-ocs v0.1.0/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= +github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5 h1:UxC1R3aBxHZpdC5sl9nlLO/Uq6X8mzrr8GKuf+Bxcl0= +github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= @@ -1250,8 +1254,12 @@ github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPy github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 h1:M8r2PcwzNNnZRoMPcpdeDJaPjyESQcSvRM8Y8XToM7I= github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= +github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 h1:JR4YTfxda4wH7tOisiIJf4drsRCp/t5kCdjubOb2I9M= +github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 h1:5luq6XGh9YsbKWQw3EiekgKoL7QC27QYWvkdNLRknrY= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= +github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvABCz4LqzAdiYBrpUxkXnquj8MMz57H4vGgQ= +github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= From 77850731156936d99803c4631470b4633b3588a8 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 28 Jul 2020 21:22:09 +0200 Subject: [PATCH 24/79] =?UTF-8?q?Temporarily=20pin=20ocis-accounts=20@?= =?UTF-8?q?=C2=A0b6ab351c0b944ed6dc9fa083a207550c0da0558e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 83d8742942..cf9beac677 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d + github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94 github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 160d83f7a6..9b1f2d0e45 100644 --- a/go.sum +++ b/go.sum @@ -1220,6 +1220,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 h1:bAyT1w github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d h1:6z1fZksjb0ER0PMYEOHvjbXuVDZv+ixqTfNrW+4l1gI= github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94 h1:RM7WZoAsano6ai1OlaQhj1FKuRL0XHeXUAEXDXvPGlQ= +github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= From 27f8225dde3dcd7d98dd592f29918360d76bed97 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 29 Jul 2020 15:02:08 +0200 Subject: [PATCH 25/79] update ocis-ocs to 69c4148658689aad986d3aea6f77f72151e41a86 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cf9beac677..e1ebad0a38 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5 + github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868 github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 diff --git a/go.sum b/go.sum index 9b1f2d0e45..f39bddd2e1 100644 --- a/go.sum +++ b/go.sum @@ -1239,6 +1239,8 @@ github.com/owncloud/ocis-ocs v0.1.0 h1:4D8B8hvRNeO1hPcSRH8jXr9Cq73BIXvqaKRO+hdf8 github.com/owncloud/ocis-ocs v0.1.0/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5 h1:UxC1R3aBxHZpdC5sl9nlLO/Uq6X8mzrr8GKuf+Bxcl0= github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868 h1:nVGXTRQyKvBQiR2ATnMVWCziaXefgeufCGXhhcQF+yM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= From fdfb14303e29f011496ea4763bd16d00ed790bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 29 Jul 2020 17:21:00 +0200 Subject: [PATCH 26/79] update ocis-ocs to v0.1.1-0.20200729151744-16ae852a590f MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e1ebad0a38..40d247ae80 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868 + github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 diff --git a/go.sum b/go.sum index f39bddd2e1..916d11d284 100644 --- a/go.sum +++ b/go.sum @@ -1241,6 +1241,8 @@ github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5 h1:UxC1R3aBxHZ github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868 h1:nVGXTRQyKvBQiR2ATnMVWCziaXefgeufCGXhhcQF+yM= github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f h1:3NM6lI3xwXPsNNVkkn8TNP4L3EJ9nav7opzIIPKENxM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= From 9c919a56eb959f94f820f53ad08e1534453c2741 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 30 Jul 2020 09:35:57 +0200 Subject: [PATCH 27/79] update ocis-accounts --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 40d247ae80..fb11931293 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94 + github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3 github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 916d11d284..0d4fb0888a 100644 --- a/go.sum +++ b/go.sum @@ -1222,6 +1222,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d h1:6z1fZk github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94 h1:RM7WZoAsano6ai1OlaQhj1FKuRL0XHeXUAEXDXvPGlQ= github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3 h1:KrrJRiqAObzM3PQvJlTjRZXIAFt6cXN8XGalVL70qaM= +github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= From 0070b190e1a8589cec6401f0b324167aac1768ab Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 30 Jul 2020 09:40:45 +0200 Subject: [PATCH 28/79] update ocis-proxy --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fb11931293..387bf280e3 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 - github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 + github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1 github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 diff --git a/go.sum b/go.sum index 0d4fb0888a..5a78121646 100644 --- a/go.sum +++ b/go.sum @@ -1264,6 +1264,8 @@ github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 h1:M8r2PcwzN github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 h1:JR4YTfxda4wH7tOisiIJf4drsRCp/t5kCdjubOb2I9M= github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= +github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1 h1:zBTDvQV3Dvaue9EB7qWrYZALubgM0LtMjgAo/l+qwUQ= +github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 h1:5luq6XGh9YsbKWQw3EiekgKoL7QC27QYWvkdNLRknrY= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvABCz4LqzAdiYBrpUxkXnquj8MMz57H4vGgQ= From 17809a9276c23e77134e2e32d34861e3efd052b6 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 30 Jul 2020 10:12:59 +0200 Subject: [PATCH 29/79] preliminary point to a PR using RWMutex to get around waiting for CI --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 387bf280e3..932d718e84 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3 + github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 5a78121646..3719cc0c98 100644 --- a/go.sum +++ b/go.sum @@ -1224,6 +1224,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94 h1:RM7WZo github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3 h1:KrrJRiqAObzM3PQvJlTjRZXIAFt6cXN8XGalVL70qaM= github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe h1:/6XoazfKgUtawizrS+zkB9Z+kwuoy3D7QHEEsSCRt3k= +github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= From 8ab8790da1b0a8489de7a81b128c67412cfce060 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 30 Jul 2020 10:54:06 +0200 Subject: [PATCH 30/79] update ocis-ocs@8933b604e96b2bc294f9936c22dbe13727dbceca --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 932d718e84..421f99a48e 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f + github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1 diff --git a/go.sum b/go.sum index 3719cc0c98..5d14b8bca7 100644 --- a/go.sum +++ b/go.sum @@ -1013,6 +1013,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 h1:Z/i1e+gTZrmcGeZyWckaLfucYG6KYOXLWo4co8pZYNY= github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103/go.mod h1:o9YPB5aGP8ob35Vy6+vyq3P3bWe7NQWzf+JLiXCiMaE= +github.com/mennanov/fieldmask-utils v0.3.2 h1:AkHXYBEOoyvocl8YhzoStATRnto5OH1PY4Rj78I5Cuc= github.com/mennanov/fieldmask-utils v0.3.2/go.mod h1:JpaanSp6Ql5A8dGktEFxTmA9uBXmz3F+2LAXDZwiimU= github.com/mholt/certmagic v0.7.5/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ= github.com/mholt/certmagic v0.8.3/go.mod h1:91uJzK5K8IWtYQqTi5R2tsxV1pCde+wdGfaRaOZi6aQ= @@ -1247,6 +1248,8 @@ github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868 h1:nVGXTRQyKvB github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f h1:3NM6lI3xwXPsNNVkkn8TNP4L3EJ9nav7opzIIPKENxM= github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b h1:7QPuE38OVYXw5BxpehjJwmjp5hKayn1psr4E02uQ8Ww= +github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= From 2649661fbc4c2bc49825f05f5c23476f9e10e392 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 30 Jul 2020 10:57:24 +0200 Subject: [PATCH 31/79] update ocis-accounts => 556dc80290451f70b2c044d637827c8be5992bf0 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 421f99a48e..220a431331 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe + github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045 github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 5d14b8bca7..4ea01c95c3 100644 --- a/go.sum +++ b/go.sum @@ -1227,6 +1227,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3 h1:KrrJRi github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe h1:/6XoazfKgUtawizrS+zkB9Z+kwuoy3D7QHEEsSCRt3k= github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045 h1:cf+CAw/FTHsov5jTeYs0jBuz3OinjE+6JXjZVu+HRUI= +github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= From 42d0598920c647aa55e8de29fdce99298ad13784 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 31 Jul 2020 17:39:26 +0545 Subject: [PATCH 32/79] temp use branches with test adjustments in core & phoenix --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index ace1f283f8..b875fd3854 100644 --- a/.drone.star +++ b/.drone.star @@ -61,6 +61,7 @@ def getCoreApiTestPipelineNames(): def main(ctx): before = testPipelines(ctx) + stages = [ docker(ctx, 'amd64'), docker(ctx, 'arm64'), From be18a661a6a615a69334430a344c999dc66e99b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 31 Jul 2020 13:59:41 +0200 Subject: [PATCH 33/79] update ocis-accounts to v0.1.2-0.20200731100349-e7082d364791 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- go.mod | 4 ++-- go.sum | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 220a431331..adb24fd507 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/owncloud/ocis go 1.13 require ( - contrib.go.opencensus.io/exporter/jaeger v0.2.0 + contrib.go.opencensus.io/exporter/jaeger v0.2.1 contrib.go.opencensus.io/exporter/ocagent v0.7.0 contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 @@ -22,7 +22,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045 + github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 4ea01c95c3..a2b9d350d7 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= contrib.go.opencensus.io/exporter/jaeger v0.2.0 h1:nhTv/Ry3lGmqbJ/JGvCjWxBl5ozRfqo86Ngz59UAlfk= contrib.go.opencensus.io/exporter/jaeger v0.2.0/go.mod h1:ukdzwIYYHgZ7QYtwVFQUjiT28BJHiMhTERo32s6qVgM= +contrib.go.opencensus.io/exporter/jaeger v0.2.1 h1:yGBYzYMewVL0yO9qqJv3Z5+IRhPdU7e9o/2oKpX4YvI= +contrib.go.opencensus.io/exporter/jaeger v0.2.1/go.mod h1:Y8IsLgdxqh1QxYxPC5IgXVmBaeLUeQFfBeBi9PbeZd0= contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= contrib.go.opencensus.io/exporter/ocagent v0.6.0 h1:Z1n6UAyr0QwM284yUuh5Zd8JlvxUGAhFZcgMJkMPrGM= @@ -162,6 +164,8 @@ github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.33.14 h1:ucjyVEvtIdtn4acf+RKsgk6ybAYeMLXpGZeqoVvi7Kk= +github.com/aws/aws-sdk-go v1.33.14/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -308,6 +312,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20200408065125-6e23f3ecec0a/go.mod h1:UXha4T github.com/cs3org/go-cs3apis v0.0.0-20200611124600-7a1be2026543/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad h1:XxB0h+UKILRKdr+WgPJaOfW8duVPeVKq/18aip5D/Ws= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/go-cs3apis v0.0.0-20200728114537-4efa23660dbe h1:CQ/Grq7oVFqwiUg4VA/T+fl3JHZKEyo/RcTE7C23rW4= +github.com/cs3org/go-cs3apis v0.0.0-20200728114537-4efa23660dbe/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= github.com/cs3org/reva v0.1.0/go.mod h1:8j6QyyAq9Kjj7RPfJb7M1aEmw5DmsuCJKUULXxYOyRo= github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0 h1:v1+My73gml0FW0t8pokmbQ32QhJJyxiiJ8zHYL+g81I= @@ -366,6 +372,8 @@ github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.0.0 h1:dKTrUeykyQwKb/kx7Z+4ukDs6l+4L41HqG1XHnhX7WE= github.com/evanphx/json-patch/v5 v5.0.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0 h1:iJijjXGuAFvYA8rTypGm7xMcl3QKlhuNn+nn5dNGA/k= +github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0/go.mod h1:CfBfpEHiX55nX/EXkG3bOskUPrYe51D/guFiBupNSik= github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59 h1:t2+zxJPT/jq/YOx/JRsoByAZI/GHOxYJ7MKeillEX4U= github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59/go.mod h1:XYuK1S5+kS6FGhlIUFuZFPvWiSrOIoLk6+ro33Xce3Y= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= @@ -459,6 +467,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= @@ -705,6 +714,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= +github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= 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= @@ -1229,6 +1240,9 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe h1:/6Xoaz github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045 h1:cf+CAw/FTHsov5jTeYs0jBuz3OinjE+6JXjZVu+HRUI= github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200731095153-8de0530f31ed/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 h1:1MpF0ry08Z44lFN05rBqsm1l5tVNnfXzNvANo5kp3aM= +github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= @@ -1512,6 +1526,7 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho= github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -1549,6 +1564,8 @@ github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.20.1+incompatible h1:HgqpYBng0n7tLJIlyT4kPCIv5XgCsF+kai1NnnrJzEU= github.com/uber/jaeger-client-go v2.20.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-client-go v2.25.0+incompatible h1:IxcNZ7WRY1Y3G4poYlx24szfsn/3LvK9QHCq9oQw8+U= +github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= @@ -1785,6 +1802,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/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= golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1973,6 +1992,8 @@ google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.25.0 h1:LodzhlzZEUfhXzNUMIfVlf9Gr6Ua5MMtoFWh7+f47qA= google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0 h1:BaiDisFir8O4IJxvAabCGGkQ6yCJegNQqSVoYUNAnbk= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= 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= @@ -2109,6 +2130,7 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 8ff2c4d943eee0defd211f3dad601b6140583de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 31 Jul 2020 14:02:52 +0200 Subject: [PATCH 34/79] update ocis-glauth to v0.5.1-0.20200730144039-cb095cf6bde5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index adb24fd507..721702d648 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 - github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e + github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 diff --git a/go.sum b/go.sum index a2b9d350d7..4680d4a7b7 100644 --- a/go.sum +++ b/go.sum @@ -1245,6 +1245,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 h1:1MpF0r github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= +github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5 h1:FC7D3YmdJk6cem4q1LQkFXxwwOLWcCvvvsiyXqmSPeg= +github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= From 4a1a8110dff22bc13e3331e339033dcf89bc3326 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 31 Jul 2020 17:58:10 +0545 Subject: [PATCH 35/79] get rid of all LDAP settings in drone --- .drone.star | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/.drone.star b/.drone.star index b875fd3854..ec3d8cbd52 100644 --- a/.drone.star +++ b/.drone.star @@ -226,8 +226,6 @@ def localApiTestsOcStorage(ctx, coreBranch = 'master', coreCommit = ''): 'TEST_SERVER_URL': 'https://ocis-server:9200', 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/', 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', - 'TEST_EXTERNAL_USER_BACKENDS':'true', - 'REVA_LDAP_HOSTNAME':'ldap', 'TEST_OCIS':'true', 'BEHAT_FILTER_TAGS': '~@skipOnOcis-OC-Storage', 'PATH_TO_CORE': '/srv/app/testrunner' @@ -300,7 +298,6 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n }, ], 'services': - ldap() + redis(), 'volumes': [ { @@ -350,7 +347,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = ''): 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva', 'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton', 'PHOENIX_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', - 'LDAP_SERVER_URL': 'ldap://ldap', 'TEST_TAGS': 'not @skipOnOCIS and not @skip', 'LOCAL_UPLOAD_DIR': '/uploads', 'NODE_TLS_REJECT_UNAUTHORIZED': 0, @@ -378,7 +374,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = ''): }, ], 'services': - ldap() + redis() + selenium(), 'volumes': [ @@ -965,12 +960,7 @@ def ocisServer(): 'detach': True, 'environment' : { 'OCIS_LOG_LEVEL': 'debug', - 'REVA_LDAP_HOSTNAME': 'ldap', - 'REVA_LDAP_PORT': 636, - 'REVA_LDAP_BIND_PASSWORD': 'admin', - 'REVA_LDAP_BIND_DN': 'cn=admin,dc=owncloud,dc=com', - 'REVA_LDAP_BASE_DN': 'dc=owncloud,dc=com', - 'REVA_LDAP_SCHEMA_UID': 'uid', + 'REVA_STORAGE_HOME_DATA_TEMP_FOLDER': '/srv/app/tmp/', 'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root', 'REVA_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/reva/data', @@ -981,16 +971,10 @@ def ocisServer(): 'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://ocis-server:9164/data', 'REVA_DATAGATEWAY_URL': 'https://ocis-server:9200/data', 'REVA_FRONTEND_URL': 'https://ocis-server:9200', - 'REVA_LDAP_USERFILTER': '(&(objectclass=posixAccount)(|(uid={{.OpaqueId}})(cn={{.OpaqueId}})))', - 'REVA_LDAP_LOGINFILTER': '(&(objectclass=posixAccount)(|(uid={{login}})(cn={{login}})(mail={{login}})))', 'PHOENIX_WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json', 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', 'KONNECTD_TLS': 'true', - 'LDAP_URI': 'ldap://ldap', - 'LDAP_BINDDN': 'cn=admin,dc=owncloud,dc=com', - 'LDAP_BINDPW': 'admin', - 'LDAP_BASEDN': 'dc=owncloud,dc=com' }, 'commands': [ 'apk add mailcap', # install /etc/mime.types @@ -1026,21 +1010,6 @@ def cloneCoreRepos(coreBranch, coreCommit): } ] -def ldap(): - return [ - { - 'name': 'ldap', - 'image': 'osixia/openldap', - 'pull': 'always', - 'environment': { - 'LDAP_DOMAIN': 'owncloud.com', - 'LDAP_ORGANISATION': 'ownCloud', - 'LDAP_ADMIN_PASSWORD': 'admin', - 'LDAP_TLS_VERIFY_CLIENT': 'never', - }, - } - ] - def redis(): return [ { From 55b72af77d0dc2aa423f0ca97b52f2a461c2bc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 31 Jul 2020 22:29:47 +0200 Subject: [PATCH 36/79] update ocis-glauth to v0.5.1-0.20200731165959-1081de7c60f1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 721702d648..e63475fe4d 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 - github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5 + github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 diff --git a/go.sum b/go.sum index 4680d4a7b7..29b1fb7bdd 100644 --- a/go.sum +++ b/go.sum @@ -1247,6 +1247,8 @@ github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlw github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5 h1:FC7D3YmdJk6cem4q1LQkFXxwwOLWcCvvvsiyXqmSPeg= github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= +github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 h1:YA7tS4VFSUmjeZBt4Wa+fSoreH1VJYCFlHvoRey3ngM= +github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= From 99c320e9f41716f7f80e78a1356d651d29b344d1 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 5 Aug 2020 09:36:28 +0200 Subject: [PATCH 37/79] update ocis-accounts => e8cce39cd22fd6a5c38ac66f1971c798bbed1869 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e63475fe4d..eacb6c11d9 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 + github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 29b1fb7bdd..8fc7e209f1 100644 --- a/go.sum +++ b/go.sum @@ -1243,6 +1243,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045/go.mod h1 github.com/owncloud/ocis-accounts v0.1.2-0.20200731095153-8de0530f31ed/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 h1:1MpF0ry08Z44lFN05rBqsm1l5tVNnfXzNvANo5kp3aM= github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f h1:1tNx8bC3pKeHOobc+QCLv3c1LxGM4WWhg33x7TgYl7Y= +github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5 h1:FC7D3YmdJk6cem4q1LQkFXxwwOLWcCvvvsiyXqmSPeg= From 66e79332ae4392a941df835cca14d13f1074ba29 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 5 Aug 2020 11:52:52 +0200 Subject: [PATCH 38/79] update ocis-ocs => v0.1.1-0.20200804140521-886f75d25f6f --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index eacb6c11d9..64f8a17929 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b + github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1 diff --git a/go.sum b/go.sum index 8fc7e209f1..4ebbe477cf 100644 --- a/go.sum +++ b/go.sum @@ -1272,6 +1272,8 @@ github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f h1:3NM6lI3xwXP github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b h1:7QPuE38OVYXw5BxpehjJwmjp5hKayn1psr4E02uQ8Ww= github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f h1:UL5z1uc1kmbfKU4rpzQfeP8M+I68UIhfA3EmXQX6Vh8= +github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= From de43c2b8d281f9b9a50bf276c09455eb2d5aebee Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Wed, 5 Aug 2020 12:07:20 +0200 Subject: [PATCH 39/79] update ocis-proxy => v0.5.1-0.20200731211838-9470b36c61d7 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 64f8a17929..bd82317c9e 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 - github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1 + github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 diff --git a/go.sum b/go.sum index 4ebbe477cf..1f1f2697f8 100644 --- a/go.sum +++ b/go.sum @@ -1295,6 +1295,8 @@ github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 h1:JR4YTfxda github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1 h1:zBTDvQV3Dvaue9EB7qWrYZALubgM0LtMjgAo/l+qwUQ= github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= +github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 h1:tHck5pbMT3Hw8uDHgMvDjDpH6GODiJiL9bBK463JuGg= +github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 h1:5luq6XGh9YsbKWQw3EiekgKoL7QC27QYWvkdNLRknrY= github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvABCz4LqzAdiYBrpUxkXnquj8MMz57H4vGgQ= From 62ada72b424b5fd71182d45e623ad29a7afd1f2d Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 5 Aug 2020 17:15:18 +0545 Subject: [PATCH 40/79] use master branch again for UI tests --- .drone.star | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.star b/.drone.star index ec3d8cbd52..c60c193c56 100644 --- a/.drone.star +++ b/.drone.star @@ -61,7 +61,6 @@ def getCoreApiTestPipelineNames(): def main(ctx): before = testPipelines(ctx) - stages = [ docker(ctx, 'amd64'), docker(ctx, 'arm64'), From c32d348926001d69b541b4a6c6d2d3b9b883da84 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 7 Aug 2020 10:07:19 +0200 Subject: [PATCH 41/79] Update deps again - ocis-accounts v0.1.2-0.20200805084037-bb03734c3851 - ocis-ocs v0.1.1-0.20200806061232-43514cd1725f - ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 --- go.mod | 11 +++++++---- go.sum | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index bd82317c9e..ec55dd66a3 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,11 @@ require ( github.com/bmatcuk/doublestar v1.3.1 // indirect github.com/coreos/etcd v3.3.21+incompatible // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect + github.com/creack/pty v1.1.11 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-log/log v0.2.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.10 // indirect github.com/karrick/godirwalk v1.15.6 // indirect github.com/labstack/echo v3.3.10+incompatible // indirect github.com/labstack/gommon v0.3.0 // indirect @@ -22,21 +24,21 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f + github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851 github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f + github.com/owncloud/ocis-ocs v0.1.1-0.20200806061232-43514cd1725f github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 - github.com/owncloud/ocis-thumbnails v0.2.0 + github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 github.com/owncloud/ocis-webdav v0.1.1 github.com/refs/pman v0.0.0-20200701173654-f05b8833071a github.com/restic/calens v0.2.0 @@ -44,8 +46,9 @@ require ( go.opencensus.io v0.22.4 go.uber.org/atomic v1.5.1 // indirect go.uber.org/multierr v1.4.0 // indirect + golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect - golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect + golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 // indirect golang.org/x/text v0.3.3 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect ) diff --git a/go.sum b/go.sum index 1f1f2697f8..5efe1c363a 100644 --- a/go.sum +++ b/go.sum @@ -301,6 +301,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da h1:WXnT88cFG2davqSFqvaFfzkSMC0lqh/8/rKZ+z7tYvI= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= github.com/crewjam/saml v0.4.0 h1:gvSlboe4BO1APaU2eDdsbql3itRat310Q5qs2Seim2k= @@ -863,6 +865,8 @@ github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= +github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= @@ -1245,6 +1249,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 h1:1MpF0r github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f h1:1tNx8bC3pKeHOobc+QCLv3c1LxGM4WWhg33x7TgYl7Y= github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851 h1:By0rmegSA0dnYnr7rHp52+yqaHH2i2UQvE1VxevzLJo= +github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5 h1:FC7D3YmdJk6cem4q1LQkFXxwwOLWcCvvvsiyXqmSPeg= @@ -1274,6 +1280,8 @@ github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b h1:7QPuE38OVYX github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f h1:UL5z1uc1kmbfKU4rpzQfeP8M+I68UIhfA3EmXQX6Vh8= github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200806061232-43514cd1725f h1:m6d82kDn4mtT/8qvgTYmoXw1RqQt1jdV9lHCo6mjWEQ= +github.com/owncloud/ocis-ocs v0.1.1-0.20200806061232-43514cd1725f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= @@ -1306,6 +1314,7 @@ github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/ github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:AeXZVHKEU+9Xt4+/lkHE5rx+sJH2if9dIrUGLhe+JOY= github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= +github.com/owncloud/ocis-store v0.1.0/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 h1:yt1ufihhLkQQtlNO5TE3/m0jXGC3tPMOhNcUJTG9ObU= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6/go.mod h1:Rav5iw0fZXYFqJl81IbyTVa/FidaBhgVPtp0XqkgviM= github.com/owncloud/ocis-thumbnails v0.2.0 h1:jHUXx5WZZxI6U3tGs53dpUfH/CwVBov1RhTi74GMltI= @@ -1705,6 +1714,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1897,6 +1908,8 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 h1:6cBnXxYO+CiRVrChvCosSv7magqTPbyAgz1M8iOv5wM= +golang.org/x/sys v0.0.0-20200806125547-5acd03effb82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 8fb21df5e86e1c2b50835bd31f47c39664ac2e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 10 Aug 2020 11:57:51 +0200 Subject: [PATCH 42/79] update ocis-ocs to 0938dbcaf501 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- go.mod | 4 +--- go.sum | 63 ++++------------------------------------------------------ 2 files changed, 5 insertions(+), 62 deletions(-) diff --git a/go.mod b/go.mod index ec55dd66a3..8aedc80128 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/bmatcuk/doublestar v1.3.1 // indirect github.com/coreos/etcd v3.3.21+incompatible // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect - github.com/creack/pty v1.1.11 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-log/log v0.2.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect @@ -31,7 +30,7 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200806061232-43514cd1725f + github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501 github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 @@ -50,7 +49,6 @@ require ( golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 // indirect golang.org/x/text v0.3.3 // indirect - gopkg.in/yaml.v2 v2.3.0 // indirect ) replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 diff --git a/go.sum b/go.sum index 5efe1c363a..029ec4e305 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,6 @@ github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.33.14 h1:ucjyVEvtIdtn4acf+RKsgk6ybAYeMLXpGZeqoVvi7Kk= -github.com/aws/aws-sdk-go v1.33.14/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -301,8 +299,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da h1:WXnT88cFG2davqSFqvaFfzkSMC0lqh/8/rKZ+z7tYvI= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= github.com/crewjam/saml v0.4.0 h1:gvSlboe4BO1APaU2eDdsbql3itRat310Q5qs2Seim2k= @@ -314,8 +310,6 @@ github.com/cs3org/go-cs3apis v0.0.0-20200408065125-6e23f3ecec0a/go.mod h1:UXha4T github.com/cs3org/go-cs3apis v0.0.0-20200611124600-7a1be2026543/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad h1:XxB0h+UKILRKdr+WgPJaOfW8duVPeVKq/18aip5D/Ws= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/go-cs3apis v0.0.0-20200728114537-4efa23660dbe h1:CQ/Grq7oVFqwiUg4VA/T+fl3JHZKEyo/RcTE7C23rW4= -github.com/cs3org/go-cs3apis v0.0.0-20200728114537-4efa23660dbe/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= github.com/cs3org/reva v0.1.0/go.mod h1:8j6QyyAq9Kjj7RPfJb7M1aEmw5DmsuCJKUULXxYOyRo= github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0 h1:v1+My73gml0FW0t8pokmbQ32QhJJyxiiJ8zHYL+g81I= @@ -374,8 +368,6 @@ github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.0.0 h1:dKTrUeykyQwKb/kx7Z+4ukDs6l+4L41HqG1XHnhX7WE= github.com/evanphx/json-patch/v5 v5.0.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0 h1:iJijjXGuAFvYA8rTypGm7xMcl3QKlhuNn+nn5dNGA/k= -github.com/eventials/go-tus v0.0.0-20190617130015-9db47421f6a0/go.mod h1:CfBfpEHiX55nX/EXkG3bOskUPrYe51D/guFiBupNSik= github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59 h1:t2+zxJPT/jq/YOx/JRsoByAZI/GHOxYJ7MKeillEX4U= github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59/go.mod h1:XYuK1S5+kS6FGhlIUFuZFPvWiSrOIoLk6+ro33Xce3Y= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= @@ -469,7 +461,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= @@ -716,8 +707,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= -github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= 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= @@ -1232,29 +1221,10 @@ github.com/owncloud/flaex v0.2.0/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8k github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e h1:FRD1/lH/6IaaWWzBXCeM4hUAoN86zQAz68nOnvCLqsY= github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e/go.mod h1:ohb58AUSUgq+kPOFAjy1s1k5Bi33YtPg45qOOPsepeM= github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f/go.mod h1:wxo2B5EoTQlf3ryDeOTR/RAs3z6IHkllu1CvBxrLf1A= -github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6 h1:bAyT1wnChpJvqKxSno/i59K2a0gugTogY5eRbhTg50o= -github.com/owncloud/ocis-accounts v0.1.2-0.20200727073302-229e5e01d7f6/go.mod h1:NCjk5xgHaGWSbaC34qSLCTMqUWyQGRUEtwGA/+yA2/8= github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d h1:6z1fZksjb0ER0PMYEOHvjbXuVDZv+ixqTfNrW+4l1gI= github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94 h1:RM7WZoAsano6ai1OlaQhj1FKuRL0XHeXUAEXDXvPGlQ= -github.com/owncloud/ocis-accounts v0.1.2-0.20200728145817-b6ab351c0b94/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3 h1:KrrJRiqAObzM3PQvJlTjRZXIAFt6cXN8XGalVL70qaM= -github.com/owncloud/ocis-accounts v0.1.2-0.20200730072515-0d8d2e9abbc3/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe h1:/6XoazfKgUtawizrS+zkB9Z+kwuoy3D7QHEEsSCRt3k= -github.com/owncloud/ocis-accounts v0.1.2-0.20200730081052-c432f296ebbe/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045 h1:cf+CAw/FTHsov5jTeYs0jBuz3OinjE+6JXjZVu+HRUI= -github.com/owncloud/ocis-accounts v0.1.2-0.20200730085641-556dc8029045/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200731095153-8de0530f31ed/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791 h1:1MpF0ry08Z44lFN05rBqsm1l5tVNnfXzNvANo5kp3aM= -github.com/owncloud/ocis-accounts v0.1.2-0.20200731100349-e7082d364791/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f h1:1tNx8bC3pKeHOobc+QCLv3c1LxGM4WWhg33x7TgYl7Y= -github.com/owncloud/ocis-accounts v0.1.2-0.20200804100405-e8cce39cd22f/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851 h1:By0rmegSA0dnYnr7rHp52+yqaHH2i2UQvE1VxevzLJo= github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e h1:iRH+aUlwqCo20hz5Zfk9gQ6uinuHaUzJsaPp1bxGhes= -github.com/owncloud/ocis-glauth v0.5.1-0.20200727093706-c01ce162774e/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= -github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5 h1:FC7D3YmdJk6cem4q1LQkFXxwwOLWcCvvvsiyXqmSPeg= -github.com/owncloud/ocis-glauth v0.5.1-0.20200730144039-cb095cf6bde5/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 h1:YA7tS4VFSUmjeZBt4Wa+fSoreH1VJYCFlHvoRey3ngM= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= @@ -1268,22 +1238,8 @@ github.com/owncloud/ocis-konnectd v0.3.2 h1:lKXpiE44xd/yvRmnTC2UA9qE+xP/6VT3QLQp github.com/owncloud/ocis-konnectd v0.3.2/go.mod h1:pyxlwCsLY/j54w5QVOSW8owARj6JfjH01b4hFz8XtAY= github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iKXA83ta7A= github.com/owncloud/ocis-migration v0.2.0/go.mod h1:U6DCcHLuogHvAXg1aAyIlzJPtERIqyuigXU1BjUpu5g= -github.com/owncloud/ocis-ocs v0.1.0 h1:4D8B8hvRNeO1hPcSRH8jXr9Cq73BIXvqaKRO+hdf8ZQ= -github.com/owncloud/ocis-ocs v0.1.0/go.mod h1:Ze46Jk5dlWtfAlxkRmdx0XbyLOHJet+PzUrSRmEwMjw= -github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5 h1:UxC1R3aBxHZpdC5sl9nlLO/Uq6X8mzrr8GKuf+Bxcl0= -github.com/owncloud/ocis-ocs v0.1.1-0.20200728151153-8a2cbd98a7f5/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= -github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868 h1:nVGXTRQyKvBQiR2ATnMVWCziaXefgeufCGXhhcQF+yM= -github.com/owncloud/ocis-ocs v0.1.1-0.20200729130121-69c414865868/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= -github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f h1:3NM6lI3xwXPsNNVkkn8TNP4L3EJ9nav7opzIIPKENxM= -github.com/owncloud/ocis-ocs v0.1.1-0.20200729151744-16ae852a590f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= -github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b h1:7QPuE38OVYXw5BxpehjJwmjp5hKayn1psr4E02uQ8Ww= -github.com/owncloud/ocis-ocs v0.1.1-0.20200730085317-8933b604e96b/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= -github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f h1:UL5z1uc1kmbfKU4rpzQfeP8M+I68UIhfA3EmXQX6Vh8= -github.com/owncloud/ocis-ocs v0.1.1-0.20200804140521-886f75d25f6f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= -github.com/owncloud/ocis-ocs v0.1.1-0.20200806061232-43514cd1725f h1:m6d82kDn4mtT/8qvgTYmoXw1RqQt1jdV9lHCo6mjWEQ= -github.com/owncloud/ocis-ocs v0.1.1-0.20200806061232-43514cd1725f/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0 h1:VYrI484zaBdNJA5x4W8j1oenVaRlgap04kSvSCBiA+o= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200728053952-4473d4a679b0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= +github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501 h1:Knam2EQ1KcFPQNg3KHKsM5kVr5+Fc6wgmWvK5HgNrlc= +github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= @@ -1297,16 +1253,8 @@ github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c h1:hYhKSfMk github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPyTZbTofJjAz3LSQUIaKKcjjBBBIJGaEAkP8g= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= -github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42 h1:M8r2PcwzNNnZRoMPcpdeDJaPjyESQcSvRM8Y8XToM7I= -github.com/owncloud/ocis-proxy v0.5.1-0.20200727201341-d0d85fe67a42/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= -github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8 h1:JR4YTfxda4wH7tOisiIJf4drsRCp/t5kCdjubOb2I9M= -github.com/owncloud/ocis-proxy v0.5.1-0.20200728185721-ac164bed70f8/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= -github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1 h1:zBTDvQV3Dvaue9EB7qWrYZALubgM0LtMjgAo/l+qwUQ= -github.com/owncloud/ocis-proxy v0.5.1-0.20200729133425-c1be83037ac1/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 h1:tHck5pbMT3Hw8uDHgMvDjDpH6GODiJiL9bBK463JuGg= github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= -github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790 h1:5luq6XGh9YsbKWQw3EiekgKoL7QC27QYWvkdNLRknrY= -github.com/owncloud/ocis-reva v0.10.1-0.20200728084033-8de1129e7790/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvABCz4LqzAdiYBrpUxkXnquj8MMz57H4vGgQ= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= @@ -1314,11 +1262,12 @@ github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/ github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:AeXZVHKEU+9Xt4+/lkHE5rx+sJH2if9dIrUGLhe+JOY= github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= -github.com/owncloud/ocis-store v0.1.0/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 h1:yt1ufihhLkQQtlNO5TE3/m0jXGC3tPMOhNcUJTG9ObU= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6/go.mod h1:Rav5iw0fZXYFqJl81IbyTVa/FidaBhgVPtp0XqkgviM= github.com/owncloud/ocis-thumbnails v0.2.0 h1:jHUXx5WZZxI6U3tGs53dpUfH/CwVBov1RhTi74GMltI= github.com/owncloud/ocis-thumbnails v0.2.0/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= +github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 h1:XdnNQZcR6aIukNmM9HOjZu44g19x/GrTlSqi82s9RA8= +github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= github.com/owncloud/ocis-webdav v0.1.1 h1:4UN9GefQiH6RGgq2+tiYFLNw8ql6luXYH0NdCJg2n/U= github.com/owncloud/ocis-webdav v0.1.1/go.mod h1:E9OlGfvlxf1NHFOvFgbHWBe7/pw4Gqy/JaSJFEHQSzg= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= @@ -1545,7 +1494,6 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho= github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -1906,8 +1854,6 @@ golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 h1:6cBnXxYO+CiRVrChvCosSv7magqTPbyAgz1M8iOv5wM= golang.org/x/sys v0.0.0-20200806125547-5acd03effb82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2153,7 +2099,6 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 549c0b212ea2a7f42285efd0d0ad8508f282da36 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 11 Aug 2020 17:23:23 +0200 Subject: [PATCH 43/79] Update deps Fixes pre-signed URL and some accounts concurrency issues. - ocis-accounts v0.1.2-0.20200811150802-01ede72397e8 - ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c - ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea - ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 --- go.mod | 15 +++++++++------ go.sum | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8aedc80128..ea7c8d8b18 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/go-log/log v0.2.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect github.com/imdario/mergo v0.3.10 // indirect - github.com/karrick/godirwalk v1.15.6 // indirect + github.com/karrick/godirwalk v1.15.8 // indirect github.com/labstack/echo v3.3.10+incompatible // indirect github.com/labstack/gommon v0.3.0 // indirect github.com/mattn/go-colorable v0.1.7 // indirect @@ -23,17 +23,17 @@ require ( github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 // indirect github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851 + github.com/owncloud/ocis-accounts v0.1.2-0.20200811150802-01ede72397e8 github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501 + github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f - github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 - github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 + github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea + github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 @@ -47,8 +47,11 @@ require ( go.uber.org/multierr v1.4.0 // indirect golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect - golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 // indirect + golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed // indirect golang.org/x/text v0.3.3 // indirect + golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + honnef.co/go/tools v0.0.1-2020.1.5 // indirect ) replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 diff --git a/go.sum b/go.sum index 029ec4e305..bc2c638858 100644 --- a/go.sum +++ b/go.sum @@ -903,6 +903,8 @@ github.com/karrick/godirwalk v1.7.7/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46s github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= github.com/karrick/godirwalk v1.15.6 h1:Yf2mmR8TJy+8Fa0SuQVto5SYap6IF7lNVX4Jdl8G1qA= github.com/karrick/godirwalk v1.15.6/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= +github.com/karrick/godirwalk v1.15.8 h1:7+rWAZPn9zuRxaIqqT8Ohs2Q2Ac0msBqwRdxNCr2VVs= +github.com/karrick/godirwalk v1.15.8/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= @@ -1225,6 +1227,8 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d h1:6z1fZk github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851 h1:By0rmegSA0dnYnr7rHp52+yqaHH2i2UQvE1VxevzLJo= github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= +github.com/owncloud/ocis-accounts v0.1.2-0.20200811150802-01ede72397e8 h1:3zN/6P5kRyQT2dr1qE20sB0oZvO8rzJuwd9VB2TNHw8= +github.com/owncloud/ocis-accounts v0.1.2-0.20200811150802-01ede72397e8/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 h1:YA7tS4VFSUmjeZBt4Wa+fSoreH1VJYCFlHvoRey3ngM= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= @@ -1240,6 +1244,8 @@ github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iK github.com/owncloud/ocis-migration v0.2.0/go.mod h1:U6DCcHLuogHvAXg1aAyIlzJPtERIqyuigXU1BjUpu5g= github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501 h1:Knam2EQ1KcFPQNg3KHKsM5kVr5+Fc6wgmWvK5HgNrlc= github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= +github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c h1:jOIob9ULYorfllBgTIptUPc7ni0noJzkYZcGzj0nrYs= +github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= @@ -1253,8 +1259,13 @@ github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c h1:hYhKSfMk github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPyTZbTofJjAz3LSQUIaKKcjjBBBIJGaEAkP8g= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= +github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112628-2151a60cc204/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= +github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea h1:WufXOhuSliXUNXOl1y9LZiqAE8yorSpofxRDFiHApxc= +github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 h1:tHck5pbMT3Hw8uDHgMvDjDpH6GODiJiL9bBK463JuGg= github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= +github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 h1:brxKzZ8iSL41mCmSFmFRFF1wm6rV4pvCLm52hLN3hGE= +github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvABCz4LqzAdiYBrpUxkXnquj8MMz57H4vGgQ= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= @@ -1572,6 +1583,7 @@ github.com/yaegashi/msgraph.go v0.1.1-0.20200221123608-2d438cf2a7cc h1:ejaC8rvIv github.com/yaegashi/msgraph.go v0.1.1-0.20200221123608-2d438cf2a7cc/go.mod h1:tso14hwzqX4VbnWTNsxiL0DvMb2OwbGISFA7jDibdWc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/zenazn/goji v0.9.1-0.20160507202103-64eb34159fe5/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= @@ -1751,6 +1763,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 h1:eDrdRpKgkcCqKZQwyZRyeFZgfqt37SL7Kv3tok06cKE= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1856,6 +1869,8 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 h1:6cBnXxYO+CiRVrChvCosSv7magqTPbyAgz1M8iOv5wM= golang.org/x/sys v0.0.0-20200806125547-5acd03effb82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed h1:WBkVNH1zd9jg/dK4HCM4lNANnmd12EHC9z+LmcCG4ns= +golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1941,10 +1956,14 @@ golang.org/x/tools v0.0.0-20200427214658-4697a2867c88 h1:Nj7oNnL9tSACMt2JvszZN6P golang.org/x/tools v0.0.0-20200427214658-4697a2867c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2 h1:21BqcH/onxtGHn1A2GDOJjZnbt4Nlez629S3eaR+eYs= golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea h1:9ym67RBRK/wN50W0T3g8g1n8viM1D2ofgWufDlMfWe0= +golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= 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= +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= 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.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -2110,6 +2129,8 @@ honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= +honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= 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= k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s= From 59179f4d7335c1c71cf25ff8e138ae66b4fb1c58 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 13:44:34 +0545 Subject: [PATCH 44/79] clean ldap leftovers in drone.star --- .drone.star | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index c60c193c56..67ec1bde2a 100644 --- a/.drone.star +++ b/.drone.star @@ -239,7 +239,6 @@ def localApiTestsOcStorage(ctx, coreBranch = 'master', coreCommit = ''): }, ], 'services': - ldap() + redis(), 'volumes': [ { @@ -275,11 +274,9 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'image': 'owncloudci/php:7.2', 'pull': 'always', 'environment' : { - 'TEST_SERVER_URL': 'http://ocis-server:9140', + 'TEST_SERVER_URL': 'https://ocis-server:9200', 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/', 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', - 'TEST_EXTERNAL_USER_BACKENDS':'true', - 'REVA_LDAP_HOSTNAME':'ldap', 'TEST_OCIS':'true', 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~@preview-extension-required', 'DIVIDE_INTO_NUM_PARTS': number_of_parts, From 4ae20f8c7fa0ea8400a8c43bab01d3f506a21b6e Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 14:00:38 +0545 Subject: [PATCH 45/79] update phoenix commit id --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 67ec1bde2a..756fc88814 100644 --- a/.drone.star +++ b/.drone.star @@ -6,7 +6,7 @@ config = { }, 'uiTests': { 'phoenixBranch': 'master', - 'phoenixCommit': 'ccdca163c7e9e6ecc57e08a298b08b1d1175f1d5', + 'phoenixCommit': '3cdfe5e87641d67140a69e9dc542d69f0c8fbc5d', 'suites': { 'phoenixWebUI1': [ 'webUICreateFilesFolders', From 340f92f68728f9edbea52dc08170d2c758fd2427 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 14:21:37 +0545 Subject: [PATCH 46/79] fix preview tests --- .drone.star | 2 +- tests/acceptance/expected-failures.txt | 66 +++++++++++ .../apiWebdavPreviews-previews.feature | 112 ------------------ 3 files changed, 67 insertions(+), 113 deletions(-) delete mode 100644 tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature diff --git a/.drone.star b/.drone.star index 756fc88814..4b6ffe3751 100644 --- a/.drone.star +++ b/.drone.star @@ -278,7 +278,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/reva/', 'SKELETON_DIR': '/srv/app/tmp/testing/data/apiSkeleton', 'TEST_OCIS':'true', - 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~@preview-extension-required', + 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS', 'DIVIDE_INTO_NUM_PARTS': number_of_parts, 'RUN_PART': part_number, 'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures.txt' diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index a3fe0fc840..e8071a1ee5 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -924,3 +924,69 @@ apiWebdavUpload2/uploadFileUsingOldChunking.feature:98 apiWebdavUpload2/uploadFileUsingOldChunking.feature:99 apiWebdavUpload2/uploadFileUsingOldChunking.feature:100 apiWebdavUpload2/uploadFileUsingOldChunking.feature:101 +# +# https://github.com/owncloud/ocis/issues/187 Previews via webDAV API tests fails on OCIS +apiWebdavPreviews/previews.feature:15 +apiWebdavPreviews/previews.feature:16 +apiWebdavPreviews/previews.feature:17 +apiWebdavPreviews/previews.feature:18 +apiWebdavPreviews/previews.feature:19 +apiWebdavPreviews/previews.feature:29 +apiWebdavPreviews/previews.feature:30 +apiWebdavPreviews/previews.feature:31 +apiWebdavPreviews/previews.feature:32 +apiWebdavPreviews/previews.feature:33 +apiWebdavPreviews/previews.feature:34 +apiWebdavPreviews/previews.feature:35 +apiWebdavPreviews/previews.feature:45 +apiWebdavPreviews/previews.feature:46 +apiWebdavPreviews/previews.feature:47 +apiWebdavPreviews/previews.feature:48 +apiWebdavPreviews/previews.feature:49 +apiWebdavPreviews/previews.feature:50 +apiWebdavPreviews/previews.feature:51 +apiWebdavPreviews/previews.feature:62 +apiWebdavPreviews/previews.feature:63 +apiWebdavPreviews/previews.feature:64 +apiWebdavPreviews/previews.feature:65 +apiWebdavPreviews/previews.feature:66 +apiWebdavPreviews/previews.feature:67 +apiWebdavPreviews/previews.feature:68 +apiWebdavPreviews/previews.feature:78 +apiWebdavPreviews/previews.feature:79 +apiWebdavPreviews/previews.feature:80 +apiWebdavPreviews/previews.feature:81 +apiWebdavPreviews/previews.feature:82 +apiWebdavPreviews/previews.feature:83 +apiWebdavPreviews/previews.feature:84 +apiWebdavPreviews/previews.feature:87 +apiWebdavPreviews/previews.feature:102 +apiWebdavPreviews/previews.feature:103 +apiWebdavPreviews/previews.feature:104 +apiWebdavPreviews/previews.feature:114 +apiWebdavPreviews/previews.feature:115 +apiWebdavPreviews/previews.feature:116 +apiWebdavPreviews/previews.feature:126 +apiWebdavPreviews/previews.feature:127 +apiWebdavPreviews/previews.feature:138 +apiWebdavPreviews/previews.feature:139 +apiWebdavPreviews/previews.feature:142 +apiWebdavPreviews/previews.feature:151 +apiWebdavPreviews/previews.feature:159 +apiWebdavPreviews/previews.feature:168 +apiWebdavPreviews/previews.feature:178 +apiWebdavPreviews/previews.feature:185 +apiWebdavPreviews/previews.feature:194 +apiWebdavPreviews/previews.feature:199 +apiWebdavPreviews/previews.feature:206 +apiWebdavPreviews/previews.feature:215 +apiWebdavPreviews/previews.feature:222 +apiWebdavPreviews/previews.feature:232 +apiWebdavPreviews/previews.feature:240 +apiWebdavPreviews/previews.feature:251 +apiWebdavPreviews/previews.feature:269 +apiWebdavPreviews/previews.feature:270 +apiWebdavPreviews/previews.feature:271 +apiWebdavPreviews/previews.feature:272 +apiWebdavPreviews/previews.feature:284 +apiWebdavPreviews/previews.feature:285 diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature b/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature deleted file mode 100644 index 08d796036c..0000000000 --- a/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature +++ /dev/null @@ -1,112 +0,0 @@ -@api @issue-ocis-187 -Feature: previews of files downloaded through the webdav API - - Background: - Given user "Alice" has been created with default attributes and without skeleton files - - @issue-ocis-188 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews with invalid width - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When user "Alice" downloads the preview of "/parent.txt" with width "" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - Examples: - | width | - | 0 | - | 0.5 | - | -1 | - | false | - | true | - | A | - | %2F | - - @issue-ocis-188 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews with invalid height - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When user "Alice" downloads the preview of "/parent.txt" with width "32" and height "" using the WebDAV API - Then the HTTP status code should be "200" - Examples: - | height | - | 0 | - | 0.5 | - | -1 | - | false | - | true | - | A | - | %2F | - - @issue-ocis-189 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews of file types that don't support preview - Given user "Alice" has uploaded file "filesForUpload/" to "/" - When user "Alice" downloads the preview of "/" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - Examples: - | filename | newfilename | - | simple.pdf | test.pdf | - | simple.odt | test.odt | - | new-data.zip | test.zip | - - @issue-ocis-187 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario Outline: download previews of different image file types - Given user "Alice" has uploaded file "filesForUpload/" to "/" - When user "Alice" downloads the preview of "/" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - And the downloaded image should be "1240" pixels wide and "648" pixels high - Examples: - | imageName | newImageName | - | testavatar.jpg | testimage.jpg | - | testavatar.png | testimage.png | - - @issue-ocis-187 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: download previews of image after renaming it - Given user "Alice" has uploaded file "filesForUpload/testavatar.jpg" to "/testimage.jpg" - When user "Alice" moves file "/testimage.jpg" to "/testimage.txt" using the WebDAV API - And user "Alice" downloads the preview of "/testimage.txt" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - And the downloaded image should be "1240" pixels wide and "648" pixels high - - @issue-ocis-thumbnails-191 @skipOnOcis-EOS-Storage @issue-ocis-reva-308 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: download previews of other users files - Given user "Brian" has been created with default attributes and without skeleton files - And user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When user "Brian" downloads the preview of "/parent.txt" of "Alice" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - - @issue-ocis-190 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: download previews of folders - Given user "Alice" has created folder "subfolder" - When user "Alice" downloads the preview of "/subfolder/" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "501" - - @issue-ocis-192 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: Download file previews when it is disabled by the administrator - Given the administrator has updated system config key "enable_previews" with value "false" and type "boolean" - And user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When user "Alice" downloads the preview of "/parent.txt" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - - @issue-ocis-193 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: unset maximum size of previews - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - And the administrator has updated system config key "preview_max_x" with value "null" - And the administrator has updated system config key "preview_max_y" with value "null" - When user "Alice" downloads the preview of "/parent.txt" with width "32" and height "32" using the WebDAV API - Then the HTTP status code should be "200" - - @issue-ocis-193 - # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: set maximum size of previews - Given user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt" - When the administrator updates system config key "preview_max_x" with value "null" using the occ command - And the administrator updates system config key "preview_max_y" with value "null" using the occ command - Then the HTTP status code should be "201" - When user "Alice" downloads the preview of "/parent.txt" with width "null" and height "null" using the WebDAV API - Then the HTTP status code should be "200" From 95a104637861a154bc8c425831c0a7c0501c0993 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 12 Aug 2020 10:45:50 +0200 Subject: [PATCH 47/79] Simplify tracing config for ocis-store --- changelog/unreleased/simplify-tracing.md | 1 + pkg/command/store.go | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/changelog/unreleased/simplify-tracing.md b/changelog/unreleased/simplify-tracing.md index eb8be2478c..8102f21526 100644 --- a/changelog/unreleased/simplify-tracing.md +++ b/changelog/unreleased/simplify-tracing.md @@ -5,3 +5,4 @@ to set one tracing config for all services at the same time. https://github.com/owncloud/product/issues/92 https://github.com/owncloud/ocis/pull/329 +https://github.com/owncloud/ocis/pull/409 diff --git a/pkg/command/store.go b/pkg/command/store.go index c25d0bc049..3b1f74ccfd 100644 --- a/pkg/command/store.go +++ b/pkg/command/store.go @@ -35,6 +35,14 @@ func configureStore(cfg *config.Config) *svcconfig.Config { cfg.Store.Log.Pretty = cfg.Log.Pretty cfg.Store.Log.Color = cfg.Log.Color + if cfg.Tracing.Enabled { + cfg.Store.Tracing.Enabled = cfg.Tracing.Enabled + cfg.Store.Tracing.Type = cfg.Tracing.Type + cfg.Store.Tracing.Endpoint = cfg.Tracing.Endpoint + cfg.Store.Tracing.Collector = cfg.Tracing.Collector + cfg.Store.Tracing.Service = cfg.Tracing.Service + } + return cfg.Store } From 6509fd7d20a0d67627a7e601a26d792e1c013290 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 14:33:36 +0545 Subject: [PATCH 48/79] adjust test expectations 1 --- .../apiAuthOcs-ocsDELETEAuth.feature | 43 +++++++-- .../apiAuthOcs-ocsGETAuth.feature | 96 +++++++++++++++++-- 2 files changed, 122 insertions(+), 17 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature index 8be10830f8..ce20879ac3 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature @@ -1,8 +1,8 @@ -@api +@api @issue-ocis-ocs-26 +# after fixing all issues delete these Scenarios and use the one from oC10 core + Feature: auth - @issue-ocis-reva-30 @issue-ocis-reva-65 - # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send DELETE requests to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" | endpoint | @@ -17,11 +17,36 @@ Feature: auth | /ocs/v2.php/cloud/apps/testing | | /ocs/v1.php/cloud/groups/group1 | | /ocs/v2.php/cloud/groups/group1 | - | /ocs/v1.php/cloud/users/%username% | - | /ocs/v2.php/cloud/users/%username% | - | /ocs/v1.php/cloud/users/%username%/groups | - | /ocs/v2.php/cloud/users/%username%/groups | - | /ocs/v1.php/cloud/users/%username%/subadmins | - | /ocs/v2.php/cloud/users/%username%/subadmins | Then the HTTP status code of responses on all endpoints should be "401" And the OCS status code of responses on all endpoints should be "notset" + + Scenario: send DELETE requests to OCS endpoints as admin with wrong password + When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v1.php/cloud/users/%username% | + | /ocs/v2.php/cloud/users/%username% | + | /ocs/v1.php/cloud/users/%username%/subadmins | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "998" + + Scenario: send DELETE requests to OCS endpoints as admin with wrong password + When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v1.php/cloud/users/%username%/groups | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "996" + + Scenario: send DELETE requests to OCS endpoints as admin with wrong password + When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v2.php/cloud/users/%username%/groups | + Then the HTTP status code of responses on all endpoints should be "500" + And the OCS status code of responses on all endpoints should be "996" + + Scenario: send DELETE requests to OCS endpoints as admin with wrong password + When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v2.php/cloud/users/%username% | + | /ocs/v2.php/cloud/users/%username%/subadmins | + Then the HTTP status code of responses on all endpoints should be "404" + And the OCS status code of responses on all endpoints should be "998" diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature index d48ec88c0d..3a4d60a799 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature @@ -22,8 +22,6 @@ Feature: auth | /ocs/v2.php/cloud/apps | | /ocs/v1.php/cloud/groups | | /ocs/v2.php/cloud/groups | - | /ocs/v1.php/cloud/users | - | /ocs/v2.php/cloud/users | | /ocs/v1.php/config | | /ocs/v2.php/config | | /ocs/v1.php/privatedata/getattribute | @@ -31,6 +29,21 @@ Feature: auth Then the HTTP status code of responses on all endpoints should be "401" And the OCS status code of responses on all endpoints should be "notset" + @issue-ocis-ocs-26 + # after fixing all issues delete this Scenario and use the one from oC10 core + Scenario: using OCS anonymously + When a user requests these endpoints with "GET" and no authentication + | endpoint | + | /ocs/v1.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "100" + When a user requests these endpoints with "GET" and no authentication + | endpoint | + | /ocs/v2.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "200" + + @issue-ocis-reva-11 @issue-ocis-reva-30 @issue-ocis-reva-31 @@ -72,12 +85,12 @@ Feature: auth | endpoint | | /ocs/v1.php/cloud/users | Then the HTTP status code of responses on all endpoints should be "200" - And the OCS status code of responses on all endpoints should be "403" + And the OCS status code of responses on all endpoints should be "100" When the user "Alice" requests these endpoints with "GET" with basic auth | endpoint | | /ocs/v2.php/cloud/users | - Then the HTTP status code of responses on all endpoints should be "403" - And the OCS status code of responses on all endpoints should be "403" + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "200" When the user "Alice" requests these endpoints with "GET" with basic auth | endpoint | | /ocs/v2.php/config | @@ -86,8 +99,9 @@ Feature: auth @issue-ocis-reva-29 @issue-ocis-reva-30 + @issue-ocis-accounts-73 # after fixing all issues delete this Scenario and use the one from oC10 core - Scenario: using OCS as normal user with wrong password + Scenario: using OCS as normal user (username has a capital letter) with wrong password When user "Alice" requests these endpoints with "GET" using password "invalid" | endpoint | | /ocs/v1.php/apps/files_external/api/v1/mounts | @@ -102,11 +116,77 @@ Feature: auth | /ocs/v2.php/cloud/apps | | /ocs/v1.php/cloud/groups | | /ocs/v2.php/cloud/groups | - | /ocs/v1.php/cloud/users | - | /ocs/v2.php/cloud/users | | /ocs/v1.php/config | | /ocs/v2.php/config | | /ocs/v1.php/privatedata/getattribute | | /ocs/v2.php/privatedata/getattribute | Then the HTTP status code of responses on all endpoints should be "401" And the OCS status code of responses on all endpoints should be "notset" + + @issue-ocis-reva-29 + @issue-ocis-reva-30 + @issue-ocis-accounts-73 + @issue-ocis-ocs-26 + @smokeTest + #after fixing all issues delete this Scenario and use the one above + Scenario: using OCS as normal user (username has a capital letter) with wrong password + When user "Alice" requests these endpoints with "GET" using password "invalid" + | endpoint | + | /ocs/v1.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "100" + When user "Alice" requests these endpoints with "GET" using password "invalid" + | endpoint | + | /ocs/v2.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "200" + + @skipOnOcV10 + @issue-ocis-reva-29 + @issue-ocis-reva-30 + @issue-ocis-accounts-73 + @issue-ocis-ocs-26 + @smokeTest + #after fixing all issues delete this Scenario and use the one above + Scenario: using OCS as normal user (username does not have a capital letter) with wrong password + Given user "brian" has been created with default attributes and skeleton files + When user "brian" requests these endpoints with "GET" using password "invalid" + | endpoint | + | /ocs/v1.php/apps/files_external/api/v1/mounts | + | /ocs/v2.php/apps/files_external/api/v1/mounts | + | /ocs/v1.php/apps/files_sharing/api/v1/remote_shares | + | /ocs/v2.php/apps/files_sharing/api/v1/remote_shares | + | /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending | + | /ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending | + | /ocs/v1.php/apps/files_sharing/api/v1/shares | + | /ocs/v2.php/apps/files_sharing/api/v1/shares | + | /ocs/v1.php/cloud/apps | + | /ocs/v2.php/cloud/apps | + | /ocs/v1.php/cloud/groups | + | /ocs/v2.php/cloud/groups | + | /ocs/v1.php/config | + | /ocs/v2.php/config | + | /ocs/v1.php/privatedata/getattribute | + | /ocs/v2.php/privatedata/getattribute | + Then the HTTP status code of responses on all endpoints should be "401" + And the OCS status code of responses on all endpoints should be "notset" + + @skipOnOcV10 + @issue-ocis-reva-29 + @issue-ocis-reva-30 + @issue-ocis-accounts-73 + @issue-ocis-ocs-26 + @smokeTest + #after fixing all issues delete this Scenario and use the one above + Scenario: using OCS as normal user (username does not have a capital letter) with wrong password + Given user "brian" has been created with default attributes and skeleton files + When user "brian" requests these endpoints with "GET" using password "invalid" + | endpoint | + | /ocs/v1.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "100" + When user "brian" requests these endpoints with "GET" using password "invalid" + | endpoint | + | /ocs/v2.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "200" From 6bd3feb5f3aa057e31ca2314520f3c97e1f51d88 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 12 Aug 2020 10:55:43 +0200 Subject: [PATCH 49/79] Update ocis-reva - ocis-reva v0.10.1-0.20200811144731-53a4180d0aad --- go.mod | 4 ++-- go.sum | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index ea7c8d8b18..e2aba3acd8 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-log/log v0.2.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect - github.com/imdario/mergo v0.3.10 // indirect + github.com/imdario/mergo v0.3.11 // indirect github.com/karrick/godirwalk v1.15.8 // indirect github.com/labstack/echo v3.3.10+incompatible // indirect github.com/labstack/gommon v0.3.0 // indirect @@ -34,7 +34,7 @@ require ( github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 - github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b + github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 diff --git a/go.sum b/go.sum index bc2c638858..93e8515fff 100644 --- a/go.sum +++ b/go.sum @@ -164,6 +164,7 @@ github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -310,10 +311,12 @@ github.com/cs3org/go-cs3apis v0.0.0-20200408065125-6e23f3ecec0a/go.mod h1:UXha4T github.com/cs3org/go-cs3apis v0.0.0-20200611124600-7a1be2026543/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad h1:XxB0h+UKILRKdr+WgPJaOfW8duVPeVKq/18aip5D/Ws= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= github.com/cs3org/reva v0.1.0/go.mod h1:8j6QyyAq9Kjj7RPfJb7M1aEmw5DmsuCJKUULXxYOyRo= github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0 h1:v1+My73gml0FW0t8pokmbQ32QhJJyxiiJ8zHYL+g81I= github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0/go.mod h1:hpkioVUPS+7USJq1cW1ikT22fxeMbVvHfonQVYcix4g= +github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -461,6 +464,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= @@ -707,6 +711,7 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= 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= @@ -856,6 +861,8 @@ github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= @@ -1268,6 +1275,8 @@ github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 h1:brxKzZ8iS github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvABCz4LqzAdiYBrpUxkXnquj8MMz57H4vGgQ= github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= +github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad h1:TLFX8+kQWx8GAUhqBsRRCxuNMoPIDbYVwkT9Yyb0QT4= +github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad/go.mod h1:Hy98ammIF8UBHebe/k5o0VNzO6HhsxOGUrsZSFiVSic= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= @@ -1331,6 +1340,7 @@ github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mgln github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U= github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= 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= @@ -1505,6 +1515,7 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho= github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -2118,6 +2129,7 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 6ea6c8f9f975dd8acaf3e36c04cfc88fa1a7ed4c Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 12 Aug 2020 11:11:04 +0200 Subject: [PATCH 50/79] Add redigo replace --- go.mod | 2 ++ go.sum | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/go.mod b/go.mod index e2aba3acd8..cb7edada3e 100644 --- a/go.mod +++ b/go.mod @@ -57,3 +57,5 @@ require ( replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 replace github.com/lucas-clemente/quic-go v0.15.7 => github.com/lucas-clemente/quic-go v0.14.1 + +replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.2 diff --git a/go.sum b/go.sum index 93e8515fff..6e6fd073a4 100644 --- a/go.sum +++ b/go.sum @@ -164,6 +164,7 @@ github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.33.19 h1:SMna0QLInNqm+nNL9tb7OVWTqSfNYSxrCa2adnyVth4= github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= @@ -311,11 +312,13 @@ github.com/cs3org/go-cs3apis v0.0.0-20200408065125-6e23f3ecec0a/go.mod h1:UXha4T github.com/cs3org/go-cs3apis v0.0.0-20200611124600-7a1be2026543/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad h1:XxB0h+UKILRKdr+WgPJaOfW8duVPeVKq/18aip5D/Ws= github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd h1:uMaudkC7znaiIKT9rxIhoRYzrhTg1Nc78X7XEqhmjSk= github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= github.com/cs3org/reva v0.1.0/go.mod h1:8j6QyyAq9Kjj7RPfJb7M1aEmw5DmsuCJKUULXxYOyRo= github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0 h1:v1+My73gml0FW0t8pokmbQ32QhJJyxiiJ8zHYL+g81I= github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0/go.mod h1:hpkioVUPS+7USJq1cW1ikT22fxeMbVvHfonQVYcix4g= +github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7 h1:q2lDRDnDsjNPSt3iRMtoeSETCTi0d1LmkY89aFGZyBQ= github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= @@ -711,6 +714,7 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= @@ -1340,6 +1344,7 @@ github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mgln github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U= github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= From 1c5e1ce36b8a9efbd564fe30fe594ee725cce70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 12 Aug 2020 11:28:24 +0200 Subject: [PATCH 51/79] update eos docs to use uuid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- docker-compose.yml | 2 +- docs/eos.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ebc5e89164..919b52ea98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: REVA_STORAGE_EOS_NAMESPACE: "/eos/dockertest/reva/users" REVA_STORAGE_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} REVA_STORAGE_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094} - REVA_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Username}}" + REVA_STORAGE_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}" mgm-master: container_name: mgm-master diff --git a/docs/eos.md b/docs/eos.md index be210a2c53..3a735c80b6 100644 --- a/docs/eos.md +++ b/docs/eos.md @@ -50,7 +50,7 @@ Kill the home storage. By default it uses the `owncloud` storage driver. We need ``` docker-compose exec ocis ./bin/ocis kill reva-storage-home -docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Username}}/{{.Username}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home +docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home ``` ### 4. Home data provider @@ -59,7 +59,7 @@ Kill the home data provider. By default it uses the `owncloud` storage driver. W ``` docker-compose exec ocis ./bin/ocis kill reva-storage-home-data -docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Username}}/{{.Username}}" -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data +docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DATA_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home-data ``` {{< hint info >}} @@ -80,7 +80,7 @@ docker-compose exec -e DAV_FILES_NAMESPACE="/eos/" ocis ./bin/ocis run reva-fron Login with `einstein / relativity`, upload a file to einsteins home and verify the file is there using ``` -docker-compose exec ocis eos ls -l /eos/dockertest/reva/users/e/einstein/ +docker-compose exec ocis eos ls -l /eos/dockertest/reva/users/4/4c510ada-c86b-4815-8820-42cdf82c3d51/ -rw-r--r-- 1 einstein users 10 Jul 1 15:24 newfile.txt ``` From 80a4916b9750f7cc27b7b9d67e51e2788503e527 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 15:35:26 +0545 Subject: [PATCH 52/79] adjust ocs return codes in tests --- .../apiAuthOcs-ocsDELETEAuth.feature | 8 ++- .../apiAuthOcs-ocsPOSTAuth.feature | 49 ++++++++++++++++--- .../apiAuthOcs-ocsPUTAuth.feature | 38 ++++++++++++-- 3 files changed, 82 insertions(+), 13 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature index ce20879ac3..5aa7c63dec 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature @@ -24,11 +24,17 @@ Feature: auth When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" | endpoint | | /ocs/v1.php/cloud/users/%username% | - | /ocs/v2.php/cloud/users/%username% | | /ocs/v1.php/cloud/users/%username%/subadmins | Then the HTTP status code of responses on all endpoints should be "200" And the OCS status code of responses on all endpoints should be "998" + Scenario: send DELETE requests to OCS endpoints as admin with wrong password + When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v2.php/cloud/users/%username% | + Then the HTTP status code of responses on all endpoints should be "404" + And the OCS status code of responses on all endpoints should be "998" + Scenario: send DELETE requests to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "DELETE" using password "invalid" about user "Alice" | endpoint | diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature index 3b3927e6e4..fd3b344362 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature @@ -4,7 +4,7 @@ Feature: auth Background: Given user "Alice" has been created with default attributes and skeleton files - @issue-ocis-reva-30 + @issue-ocis-ocs-26 @issue-ocis-reva-30 # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send POST requests to OCS endpoints as normal user with wrong password When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" @@ -19,12 +19,6 @@ Feature: auth | /ocs/v2.php/cloud/apps/testing | | /ocs/v1.php/cloud/groups | | /ocs/v2.php/cloud/groups | - | /ocs/v1.php/cloud/users | - | /ocs/v2.php/cloud/users | - | /ocs/v1.php/cloud/users/%username%/groups | - | /ocs/v2.php/cloud/users/%username%/groups | - | /ocs/v1.php/cloud/users/%username%/subadmins | - | /ocs/v2.php/cloud/users/%username%/subadmins | | /ocs/v1.php/person/check | | /ocs/v2.php/person/check | | /ocs/v1.php/privatedata/deleteattribute/testing/test | @@ -33,3 +27,44 @@ Feature: auth | /ocs/v2.php/privatedata/setattribute/testing/test | Then the HTTP status code of responses on all endpoints should be "401" And the OCS status code of responses on all endpoints should be "notset" + + # after fixing all issues delete this Scenario and use the one from oC10 core + Scenario: send POST requests to OCS endpoints as normal user with wrong password + When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v1.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "400" + When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v2.php/cloud/users | + Then the HTTP status code of responses on all endpoints should be "400" + And the OCS status code of responses on all endpoints should be "400" + + @issue-ocis-reva-30 + # after fixing all issues delete this Scenario and use the one from oC10 core + Scenario: send POST requests to OCS endpoints as normal user with wrong password + When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v1.php/cloud/users/%username%/groups | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "400" + When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v2.php/cloud/users/%username%/groups | + Then the HTTP status code of responses on all endpoints should be "400" + And the OCS status code of responses on all endpoints should be "400" + + @issue-ocis-reva-30 + # after fixing all issues delete this Scenario and use the one from oC10 core + Scenario: send POST requests to OCS endpoints as normal user with wrong password + When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v1.php/cloud/users/%username%/subadmins | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "998" + When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v2.php/cloud/users/%username%/subadmins | + Then the HTTP status code of responses on all endpoints should be "404" + And the OCS status code of responses on all endpoints should be "998" diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature index b8e54da9a7..1f76bdc689 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature @@ -2,17 +2,45 @@ Feature: auth @issue-ocis-reva-30 + @issue-ocis-ocs-26 + # after fixing all issues delete this Scenario and use the one from oC10 core + Scenario: send PUT request to OCS endpoints as admin with wrong password + When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v1.php/apps/files_sharing/api/v1/shares/123 | + | /ocs/v2.php/apps/files_sharing/api/v1/shares/123 | + Then the HTTP status code of responses on all endpoints should be "401" + And the OCS status code of responses on all endpoints should be "notset" + + @issue-ocis-reva-30 + @issue-ocis-ocs-26 # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: send PUT request to OCS endpoints as admin with wrong password When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" | endpoint | | /ocs/v1.php/cloud/users/%username% | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "103" + When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | | /ocs/v2.php/cloud/users/%username% | + Then the HTTP status code of responses on all endpoints should be "400" + And the OCS status code of responses on all endpoints should be "103" + + @issue-ocis-reva-30 + @issue-ocis-ocs-28 + # after fixing all issues delete this Scenario and use the one from oC10 core + Scenario: send PUT request to OCS endpoints as admin with wrong password + When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | | /ocs/v1.php/cloud/users/%username%/disable | - | /ocs/v2.php/cloud/users/%username%/disable | | /ocs/v1.php/cloud/users/%username%/enable | + Then the HTTP status code of responses on all endpoints should be "200" + And the OCS status code of responses on all endpoints should be "998" + When the administrator requests these endpoints with "PUT" with body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /ocs/v2.php/cloud/users/%username%/disable | | /ocs/v2.php/cloud/users/%username%/enable | - | /ocs/v1.php/apps/files_sharing/api/v1/shares/123 | - | /ocs/v2.php/apps/files_sharing/api/v1/shares/123 | - Then the HTTP status code of responses on all endpoints should be "401" - And the OCS status code of responses on all endpoints should be "notset" + Then the HTTP status code of responses on all endpoints should be "404" + And the OCS status code of responses on all endpoints should be "998" + From e7777a504f3458862d08022c5b64117ccb7e534c Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 15:40:09 +0545 Subject: [PATCH 53/79] enable public link tests that are passing --- tests/acceptance/expected-failures.txt | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index e8071a1ee5..eb4814073f 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -1,20 +1,3 @@ -# this file contains the scenarios from ownCloud10 core API tests that are currently expected to fail -# -# These scenarios are failing because owncloud/ocis code is out-of-date -# They should start passing when owncloud/ocis is next updated from owncloud/ocis-reva -# -apiSharePublicLink2/updatePublicLinkShare.feature:77 -apiSharePublicLink2/updatePublicLinkShare.feature:78 -apiSharePublicLink2/updatePublicLinkShare.feature:142 -apiSharePublicLink2/updatePublicLinkShare.feature:143 -apiSharePublicLink2/updatePublicLinkShare.feature:173 -apiSharePublicLink2/updatePublicLinkShare.feature:174 -apiSharePublicLink2/updatePublicLinkShare.feature:204 -apiSharePublicLink2/updatePublicLinkShare.feature:205 -apiSharePublicLink2/updatePublicLinkShare.feature:235 -apiSharePublicLink2/updatePublicLinkShare.feature:236 -apiSharePublicLink2/updatePublicLinkShare.feature:266 -apiSharePublicLink2/updatePublicLinkShare.feature:267 # # test scenarios that fail with OC storage (that were tagged skipOnOcis-OC-Storage in core) # @@ -418,9 +401,6 @@ apiSharePublicLink2/uploadToPublicLinkShare.feature:9 # https://github.com/owncloud/ocis-reva/issues/286 Upload-only shares must not overwrite but create a separate file apiSharePublicLink2/uploadToPublicLinkShare.feature:23 # -apiSharePublicLink2/uploadToPublicLinkShare.feature:48 -apiSharePublicLink2/uploadToPublicLinkShare.feature:49 -# # https://github.com/owncloud/ocis-reva/issues/290 Accessing non-existing public link should return 404, not 500 apiSharePublicLink2/uploadToPublicLinkShare.feature:62 apiSharePublicLink2/uploadToPublicLinkShare.feature:63 From 876a6790fa44c8e405b7959c1450f754880bf5bf Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 15:45:55 +0545 Subject: [PATCH 54/79] adjust preview test expectations --- tests/acceptance/expected-failures.txt | 80 ++++++-------------------- 1 file changed, 16 insertions(+), 64 deletions(-) diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index eb4814073f..b84dce4151 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -906,67 +906,19 @@ apiWebdavUpload2/uploadFileUsingOldChunking.feature:100 apiWebdavUpload2/uploadFileUsingOldChunking.feature:101 # # https://github.com/owncloud/ocis/issues/187 Previews via webDAV API tests fails on OCIS -apiWebdavPreviews/previews.feature:15 -apiWebdavPreviews/previews.feature:16 -apiWebdavPreviews/previews.feature:17 -apiWebdavPreviews/previews.feature:18 -apiWebdavPreviews/previews.feature:19 -apiWebdavPreviews/previews.feature:29 -apiWebdavPreviews/previews.feature:30 -apiWebdavPreviews/previews.feature:31 -apiWebdavPreviews/previews.feature:32 -apiWebdavPreviews/previews.feature:33 -apiWebdavPreviews/previews.feature:34 -apiWebdavPreviews/previews.feature:35 -apiWebdavPreviews/previews.feature:45 -apiWebdavPreviews/previews.feature:46 -apiWebdavPreviews/previews.feature:47 -apiWebdavPreviews/previews.feature:48 -apiWebdavPreviews/previews.feature:49 -apiWebdavPreviews/previews.feature:50 -apiWebdavPreviews/previews.feature:51 -apiWebdavPreviews/previews.feature:62 -apiWebdavPreviews/previews.feature:63 -apiWebdavPreviews/previews.feature:64 -apiWebdavPreviews/previews.feature:65 -apiWebdavPreviews/previews.feature:66 -apiWebdavPreviews/previews.feature:67 -apiWebdavPreviews/previews.feature:68 -apiWebdavPreviews/previews.feature:78 -apiWebdavPreviews/previews.feature:79 -apiWebdavPreviews/previews.feature:80 -apiWebdavPreviews/previews.feature:81 -apiWebdavPreviews/previews.feature:82 -apiWebdavPreviews/previews.feature:83 -apiWebdavPreviews/previews.feature:84 -apiWebdavPreviews/previews.feature:87 -apiWebdavPreviews/previews.feature:102 -apiWebdavPreviews/previews.feature:103 -apiWebdavPreviews/previews.feature:104 -apiWebdavPreviews/previews.feature:114 -apiWebdavPreviews/previews.feature:115 -apiWebdavPreviews/previews.feature:116 -apiWebdavPreviews/previews.feature:126 -apiWebdavPreviews/previews.feature:127 -apiWebdavPreviews/previews.feature:138 -apiWebdavPreviews/previews.feature:139 -apiWebdavPreviews/previews.feature:142 -apiWebdavPreviews/previews.feature:151 -apiWebdavPreviews/previews.feature:159 -apiWebdavPreviews/previews.feature:168 -apiWebdavPreviews/previews.feature:178 -apiWebdavPreviews/previews.feature:185 -apiWebdavPreviews/previews.feature:194 -apiWebdavPreviews/previews.feature:199 -apiWebdavPreviews/previews.feature:206 -apiWebdavPreviews/previews.feature:215 -apiWebdavPreviews/previews.feature:222 -apiWebdavPreviews/previews.feature:232 -apiWebdavPreviews/previews.feature:240 -apiWebdavPreviews/previews.feature:251 -apiWebdavPreviews/previews.feature:269 -apiWebdavPreviews/previews.feature:270 -apiWebdavPreviews/previews.feature:271 -apiWebdavPreviews/previews.feature:272 -apiWebdavPreviews/previews.feature:284 -apiWebdavPreviews/previews.feature:285 +apiWebdavPreviews/previews.feature:52 +apiWebdavPreviews/previews.feature:55 +apiWebdavPreviews/previews.feature:70 +apiWebdavPreviews/previews.feature:71 +apiWebdavPreviews/previews.feature:72 +apiWebdavPreviews/previews.feature:86 +apiWebdavPreviews/previews.feature:94 +apiWebdavPreviews/previews.feature:112 +apiWebdavPreviews/previews.feature:119 +apiWebdavPreviews/previews.feature:134 +apiWebdavPreviews/previews.feature:143 +apiWebdavPreviews/previews.feature:162 +apiWebdavPreviews/previews.feature:163 +apiWebdavPreviews/previews.feature:164 +apiWebdavPreviews/previews.feature:165 +apiWebdavPreviews/previews.feature:177 From f880730bd0926d90ef6b84872e2176718590ff98 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 16:09:05 +0545 Subject: [PATCH 55/79] adjust updateShare test expectations --- .../apiShareUpdate-updateShare.feature | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature index e2a7de59f3..16771ff4af 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature @@ -74,7 +74,7 @@ Feature: sharing And as "Alice" folder "/Alice-folder/folder2" should exist And as "Carol" folder "/Carol-folder/folder2" should not exist - @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-243 @issue-ocis-reva-349 @issue-ocis-reva-350 @issue-ocis-reva-352 @issue-37653 + @toFixOnOCIS @toFixOnOcV10 @issue-ocis-reva-350 @issue-ocis-reva-352 @issue-37653 # after fixing all issues delete this Scenario and use the one from oC10 core Scenario Outline: API responds with a full set of parameters when owner changes the permission of a share Given using OCS API version "" @@ -101,14 +101,14 @@ Feature: sharing | additional_info_owner | | | additional_info_file_owner | | | state | 0 | - | item_type | | - | item_source | | - | path | | - | mimetype | | - | storage_id | | + | item_type | folder | + | item_source | A_STRING | + | path | /Alice-folder | + | mimetype | httpd/unix-directory | + | storage_id | A_STRING | | storage | 0 | - | file_source | | - | file_target | | + | file_source | A_STRING | + | file_target | /Alice-folder | | share_with | %username% | | share_with_displayname | %displayname% | | share_with_additional_info | | From 014ee934ee99c44c8e8432d226c56ad411a9bd4e Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 16:12:23 +0545 Subject: [PATCH 56/79] more expected failures in preview tests --- tests/acceptance/expected-failures.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index b84dce4151..f415c2fac3 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -906,15 +906,37 @@ apiWebdavUpload2/uploadFileUsingOldChunking.feature:100 apiWebdavUpload2/uploadFileUsingOldChunking.feature:101 # # https://github.com/owncloud/ocis/issues/187 Previews via webDAV API tests fails on OCIS +apiWebdavPreviews/previews.feature:15 +apiWebdavPreviews/previews.feature:16 +apiWebdavPreviews/previews.feature:17 +apiWebdavPreviews/previews.feature:18 +apiWebdavPreviews/previews.feature:19 +apiWebdavPreviews/previews.feature:29 +apiWebdavPreviews/previews.feature:30 +apiWebdavPreviews/previews.feature:31 +apiWebdavPreviews/previews.feature:32 +apiWebdavPreviews/previews.feature:33 +apiWebdavPreviews/previews.feature:34 +apiWebdavPreviews/previews.feature:35 +apiWebdavPreviews/previews.feature:46 +apiWebdavPreviews/previews.feature:47 +apiWebdavPreviews/previews.feature:48 +apiWebdavPreviews/previews.feature:49 +apiWebdavPreviews/previews.feature:50 +apiWebdavPreviews/previews.feature:51 apiWebdavPreviews/previews.feature:52 apiWebdavPreviews/previews.feature:55 apiWebdavPreviews/previews.feature:70 apiWebdavPreviews/previews.feature:71 apiWebdavPreviews/previews.feature:72 +apiWebdavPreviews/previews.feature:82 +apiWebdavPreviews/previews.feature:83 apiWebdavPreviews/previews.feature:86 apiWebdavPreviews/previews.feature:94 +apiWebdavPreviews/previews.feature:103 apiWebdavPreviews/previews.feature:112 apiWebdavPreviews/previews.feature:119 +apiWebdavPreviews/previews.feature:126 apiWebdavPreviews/previews.feature:134 apiWebdavPreviews/previews.feature:143 apiWebdavPreviews/previews.feature:162 @@ -922,3 +944,4 @@ apiWebdavPreviews/previews.feature:163 apiWebdavPreviews/previews.feature:164 apiWebdavPreviews/previews.feature:165 apiWebdavPreviews/previews.feature:177 +apiWebdavPreviews/previews.feature:178 From 1ed15cd0975e841097818bba15b2663956f643e8 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 16:39:30 +0545 Subject: [PATCH 57/79] add group share tests to expected failures --- tests/acceptance/expected-failures.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index f415c2fac3..86ab133356 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -945,3 +945,11 @@ apiWebdavPreviews/previews.feature:164 apiWebdavPreviews/previews.feature:165 apiWebdavPreviews/previews.feature:177 apiWebdavPreviews/previews.feature:178 +# +# https://github.com/owncloud/ocis-ocs/issues/35 group support is not yet implemented +apiShareCreateSpecial2/createShareWithInvalidPermissions.feature:83 +apiShareCreateSpecial2/createShareWithInvalidPermissions.feature:84 +apiShareCreateSpecial2/createShareWithInvalidPermissions.feature:102 +apiShareCreateSpecial2/createShareWithInvalidPermissions.feature:103 +apiShareCreateSpecial2/createShareWithInvalidPermissions.feature:104 +apiShareCreateSpecial2/createShareWithInvalidPermissions.feature:105 From a3460c7782c045d0db0561cfa3064e24da3e2fc9 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 16:51:52 +0545 Subject: [PATCH 58/79] added more old webdav public link tests to expected failures --- tests/acceptance/expected-failures.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index 86ab133356..05af305e34 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -231,8 +231,11 @@ apiSharePublicLink1/changingPublicLinkShare.feature:63 apiSharePublicLink1/changingPublicLinkShare.feature:85 apiSharePublicLink1/changingPublicLinkShare.feature:96 apiSharePublicLink1/changingPublicLinkShare.feature:107 +apiSharePublicLink1/changingPublicLinkShare.feature:128 apiSharePublicLink1/changingPublicLinkShare.feature:151 +apiSharePublicLink1/changingPublicLinkShare.feature:174 apiSharePublicLink1/changingPublicLinkShare.feature:197 +apiSharePublicLink1/changingPublicLinkShare.feature:221 apiSharePublicLink1/changingPublicLinkShare.feature:244 apiSharePublicLink1/changingPublicLinkShare.feature:267 apiSharePublicLink1/changingPublicLinkShare.feature:278 From 03a6b0742429c701a2edb829925db87aea75f94b Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 12 Aug 2020 17:02:16 +0545 Subject: [PATCH 59/79] fix comments --- .../features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature index 3a4d60a799..b153f6faff 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature @@ -128,7 +128,7 @@ Feature: auth @issue-ocis-accounts-73 @issue-ocis-ocs-26 @smokeTest - #after fixing all issues delete this Scenario and use the one above + # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: using OCS as normal user (username has a capital letter) with wrong password When user "Alice" requests these endpoints with "GET" using password "invalid" | endpoint | @@ -147,7 +147,7 @@ Feature: auth @issue-ocis-accounts-73 @issue-ocis-ocs-26 @smokeTest - #after fixing all issues delete this Scenario and use the one above + # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: using OCS as normal user (username does not have a capital letter) with wrong password Given user "brian" has been created with default attributes and skeleton files When user "brian" requests these endpoints with "GET" using password "invalid" @@ -177,7 +177,7 @@ Feature: auth @issue-ocis-accounts-73 @issue-ocis-ocs-26 @smokeTest - #after fixing all issues delete this Scenario and use the one above + # after fixing all issues delete this Scenario and use the one from oC10 core Scenario: using OCS as normal user (username does not have a capital letter) with wrong password Given user "brian" has been created with default attributes and skeleton files When user "brian" requests these endpoints with "GET" using password "invalid" From 12c63580054b49ffab9006f9a1aaec95bccf117a Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 12 Aug 2020 14:24:25 +0200 Subject: [PATCH 60/79] Update ocis-phoenix@a1b14f0a4d3b438e72f652e5b33d1cad661af470 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cb7edada3e..4df41fb011 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c - github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f + github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad diff --git a/go.sum b/go.sum index 6e6fd073a4..05b8c0fb3a 100644 --- a/go.sum +++ b/go.sum @@ -1259,6 +1259,8 @@ github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c h1:jOIob9ULYor github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b h1:lec9orcbYHyKrCBFPhEt9HfBiqQ+mQb1k7fd6R8mTe4= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= From 9d40d05538b747d9e5b2bf4878896b907c45a612 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 12 Aug 2020 15:55:00 +0200 Subject: [PATCH 61/79] Update ocis-settings + indirectly ocis-pkg - ocis-settings master => v0.0.0-20200812135211-ec86c9ac93c6 - ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d --- go.mod | 6 +++--- go.sum | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4df41fb011..1eae617994 100644 --- a/go.mod +++ b/go.mod @@ -12,6 +12,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-log/log v0.2.0 // indirect + github.com/hashicorp/go-version v1.2.1 // indirect github.com/huandu/xstrings v1.3.2 // indirect github.com/imdario/mergo v0.3.11 // indirect github.com/karrick/godirwalk v1.15.8 // indirect @@ -32,10 +33,10 @@ require ( github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b - github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea + github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad - github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 + github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 github.com/owncloud/ocis-webdav v0.1.1 @@ -49,7 +50,6 @@ require ( golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed // indirect golang.org/x/text v0.3.3 // indirect - golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect honnef.co/go/tools v0.0.1-2020.1.5 // indirect ) diff --git a/go.sum b/go.sum index 05b8c0fb3a..d68cb9c6b9 100644 --- a/go.sum +++ b/go.sum @@ -320,6 +320,7 @@ github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0 h1:v1+My73gml0FW0t8p github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0/go.mod h1:hpkioVUPS+7USJq1cW1ikT22fxeMbVvHfonQVYcix4g= github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7 h1:q2lDRDnDsjNPSt3iRMtoeSETCTi0d1LmkY89aFGZyBQ= github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= +github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -827,6 +828,8 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/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= @@ -1054,10 +1057,12 @@ github.com/micro/go-micro/v2 v2.6.0 h1:HH6uEqTu6pkBtAlwAqQW2sf33640iEa1s9puGIctp github.com/micro/go-micro/v2 v2.6.0/go.mod h1:60HMKlDN4ShZDJRrlgdcAmkCWNhQbYv+CDG3r7iLE34= github.com/micro/go-micro/v2 v2.8.0 h1:WKogg6xqJmk3CjTFscrzSKN1fSGtince4sWfaqx9844= github.com/micro/go-micro/v2 v2.8.0/go.mod h1:hSdOM6jb6aGswjBpCeB9wJ0yVH+CugevRm/CX7NlSrQ= +github.com/micro/go-micro/v2 v2.9.1/go.mod h1:x55ZM3Puy0FyvvkR3e0ha0xsE9DFwfPSUMWAIbFY0SY= github.com/micro/go-plugins v1.5.1 h1:swcFD7ynCTUo98APqIEIbPu2XMd6yVGTnI8PqdnCwOQ= github.com/micro/go-plugins v1.5.1/go.mod h1:jcxejzJCAMH731cQHbS/hncyKe0rxAbzKkibj8glad4= github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.0.1 h1:7IkXfl94MdLZQwk0lNmu9Cg5WP42Zak9EtQMeN4SvVs= github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.0.1/go.mod h1:QrkcwcDtIs2hIJpIEhozekyf6Rfz5C36kFI8+zzCpX0= +github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.9.1/go.mod h1:26UmOLM/I487NqTg3n6zJiBrYmIb684M2Zp4WH98XzU= github.com/micro/mdns v0.3.0 h1:bYycYe+98AXR3s8Nq5qvt6C573uFTDPIYzJemWON0QE= github.com/micro/mdns v0.3.0/go.mod h1:KJ0dW7KmicXU2BV++qkLlmHYcVv7/hHnbtguSWt9Aoc= github.com/micro/micro v1.16.0 h1:qCZV20WoTOtJ1IyLU/a0A0BMSertfu+iOj/2AJ4Uvrk= @@ -1275,6 +1280,7 @@ github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112628-2151a60cc204/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea h1:WufXOhuSliXUNXOl1y9LZiqAE8yorSpofxRDFiHApxc= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= +github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 h1:tHck5pbMT3Hw8uDHgMvDjDpH6GODiJiL9bBK463JuGg= github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 h1:brxKzZ8iSL41mCmSFmFRFF1wm6rV4pvCLm52hLN3hGE= @@ -1287,6 +1293,8 @@ github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUI github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:AeXZVHKEU+9Xt4+/lkHE5rx+sJH2if9dIrUGLhe+JOY= +github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6 h1:JoyHVIzqL2Vheg43KuBhVaUXjH0bTZCQLwjgQhtaQ88= +github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6/go.mod h1:fSV96Y/yK5zCHHL9sNIPVCkHcAIDiIcylFwb5itvp+w= github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 h1:yt1ufihhLkQQtlNO5TE3/m0jXGC3tPMOhNcUJTG9ObU= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6/go.mod h1:Rav5iw0fZXYFqJl81IbyTVa/FidaBhgVPtp0XqkgviM= @@ -1976,6 +1984,8 @@ golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2 h1:21BqcH/onxtGHn1A2GDOJjZ golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea h1:9ym67RBRK/wN50W0T3g8g1n8viM1D2ofgWufDlMfWe0= golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207 h1:8Kg+JssU1jBZs8GIrL5pl4nVyaqyyhdmHAR4D1zGErg= +golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= 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= From 0a4f0d7ea404b780dc6a7bb3934dac71e380a0dd Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 13 Aug 2020 08:58:25 +0200 Subject: [PATCH 62/79] Update ocis-phoenix@907ba1a7aae225dc0bf250c101d623d84a40b475 --- go.mod | 7 +------ go.sum | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1eae617994..ee76c40337 100644 --- a/go.mod +++ b/go.mod @@ -13,8 +13,6 @@ require ( github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-log/log v0.2.0 // indirect github.com/hashicorp/go-version v1.2.1 // indirect - github.com/huandu/xstrings v1.3.2 // indirect - github.com/imdario/mergo v0.3.11 // indirect github.com/karrick/godirwalk v1.15.8 // indirect github.com/labstack/echo v3.3.10+incompatible // indirect github.com/labstack/gommon v0.3.0 // indirect @@ -32,7 +30,7 @@ require ( github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c - github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b + github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad @@ -46,12 +44,9 @@ require ( go.opencensus.io v0.22.4 go.uber.org/atomic v1.5.1 // indirect go.uber.org/multierr v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed // indirect golang.org/x/text v0.3.3 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - honnef.co/go/tools v0.0.1-2020.1.5 // indirect ) replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 diff --git a/go.sum b/go.sum index d68cb9c6b9..7ae6aab3a0 100644 --- a/go.sum +++ b/go.sum @@ -1266,6 +1266,8 @@ github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5O github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b h1:lec9orcbYHyKrCBFPhEt9HfBiqQ+mQb1k7fd6R8mTe4= github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 h1:n9qK0gUh4TEVmNWnM11d7NmJi+//YvXXqAf8l2g0bhE= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= From db8f9ae565d9fd24180e97804aee1f8dedfd4d21 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 13 Aug 2020 10:20:34 +0200 Subject: [PATCH 63/79] update ocis-reva with c61e71e --- go.mod | 2 +- go.sum | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ee76c40337..a6ec5f52b7 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 - github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad + github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914 github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 diff --git a/go.sum b/go.sum index 7ae6aab3a0..b9077c3395 100644 --- a/go.sum +++ b/go.sum @@ -166,6 +166,7 @@ github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.19 h1:SMna0QLInNqm+nNL9tb7OVWTqSfNYSxrCa2adnyVth4= github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.34.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= @@ -219,6 +220,7 @@ github.com/bwmarrin/discordgo v0.19.0/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVO github.com/bwmarrin/discordgo v0.20.1/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= github.com/bwmarrin/discordgo v0.20.2 h1:nA7jiTtqUA9lT93WL2jPjUp8ZTEInRujBdx1C9gkr20= github.com/bwmarrin/discordgo v0.20.2/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= +github.com/c-bata/go-prompt v0.2.3/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/caddyserver/certmagic v0.10.6 h1:sCya6FmfaN74oZE46kqfaFOVoROD/mF36rTQfjN7TZc= github.com/caddyserver/certmagic v0.10.6/go.mod h1:Y8jcUBctgk/IhpAzlHKfimZNyXCkfGgRTC0orl8gROQ= github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -240,6 +242,7 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/cheggaaa/pb v1.0.28/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= @@ -321,6 +324,7 @@ github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0/go.mod h1:hpkioVUPS+ github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7 h1:q2lDRDnDsjNPSt3iRMtoeSETCTi0d1LmkY89aFGZyBQ= github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= +github.com/cs3org/reva v1.1.1-0.20200812182703-f3251947b9a8/go.mod h1:XpslyNQPPVszKD6D8bel1KicZ+/ZhKyp3q+pnLjLtJQ= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -385,6 +389,7 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqL github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= @@ -1004,6 +1009,7 @@ github.com/marten-seemann/qtls v0.4.1 h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gt github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPXTCZLQQunvRc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -1011,6 +1017,7 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -1291,6 +1298,8 @@ github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvA github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad h1:TLFX8+kQWx8GAUhqBsRRCxuNMoPIDbYVwkT9Yyb0QT4= github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad/go.mod h1:Hy98ammIF8UBHebe/k5o0VNzO6HhsxOGUrsZSFiVSic= +github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914 h1:V2rGiPURf7DcOSm/Ewwez6LwMX4+hOpRlrAbRFEJUHo= +github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914/go.mod h1:QLiYoToAP7xFHD3xOcW4Yw4nnTaCBQ40zxry1vNqfKo= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= @@ -1332,6 +1341,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE 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/pkg/term v0.0.0-20200520122047-c3ffed290a03/go.mod h1:Z9+Ul5bCbBKnbCvdOWbLqTHhJiYV414CURZJba6L8qA= github.com/pkg/xattr v0.4.1 h1:dhclzL6EqOXNaPDWqoeb9tIxATfBSmjqL0b4DpSjwRw= github.com/pkg/xattr v0.4.1/go.mod h1:W2cGD0TBEus7MkUgv0tNZ9JutLtVO3cXu+IBRuHqnFs= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -1873,6 +1883,7 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 5785da629255f07ef51324b53890b348aa2d8e64 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 13 Aug 2020 10:21:50 +0200 Subject: [PATCH 64/79] update ocis-reva with 115c8e5 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a6ec5f52b7..3a4fb6604b 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 - github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914 + github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 diff --git a/go.sum b/go.sum index b9077c3395..2b8e530aa5 100644 --- a/go.sum +++ b/go.sum @@ -1300,6 +1300,8 @@ github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad h1:TLFX8+kQW github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad/go.mod h1:Hy98ammIF8UBHebe/k5o0VNzO6HhsxOGUrsZSFiVSic= github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914 h1:V2rGiPURf7DcOSm/Ewwez6LwMX4+hOpRlrAbRFEJUHo= github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914/go.mod h1:QLiYoToAP7xFHD3xOcW4Yw4nnTaCBQ40zxry1vNqfKo= +github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d h1:B1+QulxyF6JRDvvvFARCDUkcYSNg4/+2b+Op/FiN1zs= +github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d/go.mod h1:QLiYoToAP7xFHD3xOcW4Yw4nnTaCBQ40zxry1vNqfKo= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= From 577de3c0db2db98d4e80f3f0a1ae2b65c58be83f Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 13 Aug 2020 10:41:19 +0200 Subject: [PATCH 65/79] update api tests to reflect the latest changes on cs3org@reva tests --- ...apiShareManagementBasic-createShare.feature | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature b/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature index a4b6a73e74..729b53387e 100644 --- a/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature +++ b/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature @@ -101,17 +101,17 @@ Feature: sharing And user "Alice" has shared folder "/folder1/folder2" with user "Emily" When user "Alice" sends HTTP method "GET" to OCS API endpoint "/apps/files_sharing/api/v1/shares" Then the OCS status code should be "" - And the HTTP status code should be "" - # On OCIS and reva the response is currently not there -# And the response should contain 4 entries -# And folder "/folder1" should be included as path in the response -# And folder "/folder1/folder2" should be included as path in the response + And the HTTP status code should be "200" + And the response should contain 4 entries + And folder "/folder1" should be included as path in the response + # And folder "/folder1/folder2" should be included as path in the response + And folder "/folder2" should be included as path in the response And user "Alice" sends HTTP method "GET" to OCS API endpoint "/apps/files_sharing/api/v1/shares?path=/folder1/folder2" And the response should contain 2 entries And folder "/folder1" should not be included as path in the response + # And folder "/folder1/folder2" should be included as path in the response And folder "/folder2" should be included as path in the response -# And folder "/folder1/folder2" should be included as path in the response Examples: - | ocs_api_version | http_status_code | ocs_status_code | - | 1 | 200 | 996 | - | 2 | 500 | 996 | + | ocs_api_version | ocs_status_code | + | 1 | 100 | + | 2 | 200 | From 57f4953a48f44205fa44c923951782917e89e4dd Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 13 Aug 2020 10:55:57 +0200 Subject: [PATCH 66/79] Update ocis-phoenix@0369dc8abd266f3e3b19f9ce8f009fe05f31b708 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 3a4fb6604b..e0ad94b473 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c - github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 + github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d diff --git a/go.sum b/go.sum index 2b8e530aa5..991849c9bd 100644 --- a/go.sum +++ b/go.sum @@ -1275,6 +1275,8 @@ github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b h1:lec9or github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 h1:n9qK0gUh4TEVmNWnM11d7NmJi+//YvXXqAf8l2g0bhE= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26 h1:3AypyAyq3XHhcPZecUzFa3lFH2I5iTvg5b5zaSJa+GY= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= From 8455f8489d32578ba7c964186a5eb9ff9532ac09 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 13 Aug 2020 14:10:59 +0200 Subject: [PATCH 67/79] Update ocis-phoenix@f66a6435f4724632642d7ede434cd35cc2c0d73a --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e0ad94b473..f115208d2d 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c - github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26 + github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d diff --git a/go.sum b/go.sum index 991849c9bd..5be2fda471 100644 --- a/go.sum +++ b/go.sum @@ -1277,6 +1277,8 @@ github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 h1:n9qK0g github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26 h1:3AypyAyq3XHhcPZecUzFa3lFH2I5iTvg5b5zaSJa+GY= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 h1:6HVjwDQmR7rOKbx8ozp0k1Yo74NfHAs6dLWZ0ZWMBYk= +github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= From e1fbcf631b5cb62bb33ad204758417c6f959de61 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Fri, 14 Aug 2020 09:07:33 +0545 Subject: [PATCH 68/79] advance phoenix commit id for test-infrastructure --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 24551677c6..f14bf85c5f 100644 --- a/.drone.star +++ b/.drone.star @@ -6,7 +6,7 @@ config = { }, 'uiTests': { 'phoenixBranch': 'master', - 'phoenixCommit': '3cdfe5e87641d67140a69e9dc542d69f0c8fbc5d', + 'phoenixCommit': 'bf3bb5d9c678264449cfbacc1c0d0d262ad6f5f5', 'suites': { 'phoenixWebUI1': [ 'webUICreateFilesFolders', From 2bf8b02536b32de33bc0ddc369654599ebe22b41 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 14 Aug 2020 06:39:59 +0200 Subject: [PATCH 69/79] Update ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9 Update ocis-reva to v0.10.1-0.20200814043912-6361bb5cb1b9 (master). --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f115208d2d..15af149e83 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 - github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d + github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9 github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6 github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 diff --git a/go.sum b/go.sum index 5be2fda471..d1d40fd370 100644 --- a/go.sum +++ b/go.sum @@ -325,6 +325,7 @@ github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7 h1:q2lDRDnDsjNPSt3iR github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cs3org/reva v1.1.1-0.20200812182703-f3251947b9a8/go.mod h1:XpslyNQPPVszKD6D8bel1KicZ+/ZhKyp3q+pnLjLtJQ= +github.com/cs3org/reva v1.1.1-0.20200813152025-baea1c67fb87/go.mod h1:XpslyNQPPVszKD6D8bel1KicZ+/ZhKyp3q+pnLjLtJQ= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -1306,6 +1307,8 @@ github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914 h1:V2rGiPURf github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914/go.mod h1:QLiYoToAP7xFHD3xOcW4Yw4nnTaCBQ40zxry1vNqfKo= github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d h1:B1+QulxyF6JRDvvvFARCDUkcYSNg4/+2b+Op/FiN1zs= github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d/go.mod h1:QLiYoToAP7xFHD3xOcW4Yw4nnTaCBQ40zxry1vNqfKo= +github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9 h1:fP9iSmGLOPcAWvQiBx9wnp8NuPJ6NartnW1RDaGCfxs= +github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9/go.mod h1:xQ/o8K8p48/tyB5PiSwFZtygmCBd1PTqnD8ftlYBd9s= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= From a1e6a152fd53a19968f44bbc299166ca1b9f541a Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Fri, 14 Aug 2020 10:35:07 +0200 Subject: [PATCH 70/79] Update Phoenix test commit to ace991976a666cd551f1006303361897089bf59c --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index f14bf85c5f..1af809ef1f 100644 --- a/.drone.star +++ b/.drone.star @@ -6,7 +6,7 @@ config = { }, 'uiTests': { 'phoenixBranch': 'master', - 'phoenixCommit': 'bf3bb5d9c678264449cfbacc1c0d0d262ad6f5f5', + 'phoenixCommit': 'ace991976a666cd551f1006303361897089bf59c', 'suites': { 'phoenixWebUI1': [ 'webUICreateFilesFolders', From 1b508d41a4915cbbdd3e6c2b2920019a653745b4 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Mon, 17 Aug 2020 16:38:09 +0545 Subject: [PATCH 71/79] use update-deps-2020-07-22 phoenix branch to skip failing public link tests --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 1af809ef1f..da0e83fdc8 100644 --- a/.drone.star +++ b/.drone.star @@ -5,8 +5,8 @@ config = { 'numberOfParts': 2 }, 'uiTests': { - 'phoenixBranch': 'master', - 'phoenixCommit': 'ace991976a666cd551f1006303361897089bf59c', + 'phoenixBranch': 'skipPublicLinkTestsOnOcis', + 'phoenixCommit': '', 'suites': { 'phoenixWebUI1': [ 'webUICreateFilesFolders', From a467820a3012f2a3565a30c5e1dc34a64bf82396 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Mon, 17 Aug 2020 17:25:13 +0545 Subject: [PATCH 72/79] use again master of phoenix for tests - commit c1b2858608e60ef0ed51ca2fdd9fb81022a3c4f2 --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 7e0776f216..cfca42306b 100644 --- a/.drone.star +++ b/.drone.star @@ -5,8 +5,8 @@ config = { 'numberOfParts': 2 }, 'uiTests': { - 'phoenixBranch': 'skipPublicLinkTestsOnOcis', - 'phoenixCommit': '', + 'phoenixBranch': 'master', + 'phoenixCommit': 'c1b2858608e60ef0ed51ca2fdd9fb81022a3c4f2', 'suites': { 'phoenixWebUI1': [ 'webUICreateFilesFolders', From 5a271d426b34363bacaee8725a52b7b0276d72d4 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 17 Aug 2020 14:42:44 +0200 Subject: [PATCH 73/79] run go mod tidy --- go.mod | 1 - go.sum | 55 +++++++------------------------------------------------ 2 files changed, 7 insertions(+), 49 deletions(-) diff --git a/go.mod b/go.mod index 15af149e83..9638e30afc 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,6 @@ require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-log/log v0.2.0 // indirect - github.com/hashicorp/go-version v1.2.1 // indirect github.com/karrick/godirwalk v1.15.8 // indirect github.com/labstack/echo v3.3.10+incompatible // indirect github.com/labstack/gommon v0.3.0 // indirect diff --git a/go.sum b/go.sum index d1d40fd370..23a29f223f 100644 --- a/go.sum +++ b/go.sum @@ -162,10 +162,9 @@ github.com/aws/aws-sdk-go v1.23.19/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi github.com/aws/aws-sdk-go v1.25.31/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= -github.com/aws/aws-sdk-go v1.33.11 h1:A7b3mNKbh/0zrhnNN/KxWD0YZJw2RImnjFXWOquYKB4= -github.com/aws/aws-sdk-go v1.33.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.33.19 h1:SMna0QLInNqm+nNL9tb7OVWTqSfNYSxrCa2adnyVth4= github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.34.2 h1:9vCknCdTAmmV4ht7lPuda7aJXzllXwEQyCMZKJHjBrM= github.com/aws/aws-sdk-go v1.34.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= @@ -313,18 +312,12 @@ github.com/cs3org/go-cs3apis v0.0.0-20191128165347-19746c015c83/go.mod h1:IsVGyZ github.com/cs3org/go-cs3apis v0.0.0-20200306065539-29abc33f5be0/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200408065125-6e23f3ecec0a/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200611124600-7a1be2026543/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad h1:XxB0h+UKILRKdr+WgPJaOfW8duVPeVKq/18aip5D/Ws= -github.com/cs3org/go-cs3apis v0.0.0-20200709064917-d96c5f2a42ad/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd h1:uMaudkC7znaiIKT9rxIhoRYzrhTg1Nc78X7XEqhmjSk= github.com/cs3org/go-cs3apis v0.0.0-20200730121022-c4f3d4f7ddfd/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= github.com/cs3org/reva v0.1.0/go.mod h1:8j6QyyAq9Kjj7RPfJb7M1aEmw5DmsuCJKUULXxYOyRo= -github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0 h1:v1+My73gml0FW0t8pokmbQ32QhJJyxiiJ8zHYL+g81I= -github.com/cs3org/reva v0.1.1-0.20200728071211-c948977dd3a0/go.mod h1:hpkioVUPS+7USJq1cW1ikT22fxeMbVvHfonQVYcix4g= -github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7 h1:q2lDRDnDsjNPSt3iRMtoeSETCTi0d1LmkY89aFGZyBQ= -github.com/cs3org/reva v1.0.1-0.20200810113514-38919badfcc7/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= -github.com/cs3org/reva v1.1.1-0.20200812182703-f3251947b9a8/go.mod h1:XpslyNQPPVszKD6D8bel1KicZ+/ZhKyp3q+pnLjLtJQ= +github.com/cs3org/reva v1.1.1-0.20200813152025-baea1c67fb87 h1:AyAaCG63fGjLrFi0fx5MgAaFokkV1oHj3WPGdhdLaYk= github.com/cs3org/reva v1.1.1-0.20200813152025-baea1c67fb87/go.mod h1:XpslyNQPPVszKD6D8bel1KicZ+/ZhKyp3q+pnLjLtJQ= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= @@ -723,8 +716,6 @@ github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= -github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= -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= @@ -834,8 +825,6 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= -github.com/hashicorp/go-version v1.2.1/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= @@ -872,8 +861,6 @@ github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -921,8 +908,6 @@ github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNE github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= github.com/karrick/godirwalk v1.7.7/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= -github.com/karrick/godirwalk v1.15.6 h1:Yf2mmR8TJy+8Fa0SuQVto5SYap6IF7lNVX4Jdl8G1qA= -github.com/karrick/godirwalk v1.15.6/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.15.8 h1:7+rWAZPn9zuRxaIqqT8Ohs2Q2Ac0msBqwRdxNCr2VVs= github.com/karrick/godirwalk v1.15.8/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= @@ -1065,11 +1050,13 @@ github.com/micro/go-micro/v2 v2.6.0 h1:HH6uEqTu6pkBtAlwAqQW2sf33640iEa1s9puGIctp github.com/micro/go-micro/v2 v2.6.0/go.mod h1:60HMKlDN4ShZDJRrlgdcAmkCWNhQbYv+CDG3r7iLE34= github.com/micro/go-micro/v2 v2.8.0 h1:WKogg6xqJmk3CjTFscrzSKN1fSGtince4sWfaqx9844= github.com/micro/go-micro/v2 v2.8.0/go.mod h1:hSdOM6jb6aGswjBpCeB9wJ0yVH+CugevRm/CX7NlSrQ= +github.com/micro/go-micro/v2 v2.9.1 h1:+S9koIrNWARjpP6k2TZ7kt0uC9zUJtNXzIdZTZRms7Q= github.com/micro/go-micro/v2 v2.9.1/go.mod h1:x55ZM3Puy0FyvvkR3e0ha0xsE9DFwfPSUMWAIbFY0SY= github.com/micro/go-plugins v1.5.1 h1:swcFD7ynCTUo98APqIEIbPu2XMd6yVGTnI8PqdnCwOQ= github.com/micro/go-plugins v1.5.1/go.mod h1:jcxejzJCAMH731cQHbS/hncyKe0rxAbzKkibj8glad4= github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.0.1 h1:7IkXfl94MdLZQwk0lNmu9Cg5WP42Zak9EtQMeN4SvVs= github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.0.1/go.mod h1:QrkcwcDtIs2hIJpIEhozekyf6Rfz5C36kFI8+zzCpX0= +github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.9.1 h1:IaZUsLp0Omb/ozDnRKEvVY56C0UocBdPxxg2S2Pk2j0= github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.9.1/go.mod h1:26UmOLM/I487NqTg3n6zJiBrYmIb684M2Zp4WH98XzU= github.com/micro/mdns v0.3.0 h1:bYycYe+98AXR3s8Nq5qvt6C573uFTDPIYzJemWON0QE= github.com/micro/mdns v0.3.0/go.mod h1:KJ0dW7KmicXU2BV++qkLlmHYcVv7/hHnbtguSWt9Aoc= @@ -1249,8 +1236,6 @@ github.com/owncloud/ocis-accounts v0.1.2-0.20200618163128-aa8ae58dd95e/go.mod h1 github.com/owncloud/ocis-accounts v0.1.2-0.20200710152724-fa35a81beb2f/go.mod h1:wxo2B5EoTQlf3ryDeOTR/RAs3z6IHkllu1CvBxrLf1A= github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d h1:6z1fZksjb0ER0PMYEOHvjbXuVDZv+ixqTfNrW+4l1gI= github.com/owncloud/ocis-accounts v0.1.2-0.20200727195215-6816703df41d/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= -github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851 h1:By0rmegSA0dnYnr7rHp52+yqaHH2i2UQvE1VxevzLJo= -github.com/owncloud/ocis-accounts v0.1.2-0.20200805084037-bb03734c3851/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-accounts v0.1.2-0.20200811150802-01ede72397e8 h1:3zN/6P5kRyQT2dr1qE20sB0oZvO8rzJuwd9VB2TNHw8= github.com/owncloud/ocis-accounts v0.1.2-0.20200811150802-01ede72397e8/go.mod h1:gDivGEUJXhPYBvaaIxkpKMscGMavrjuLdNZTLdaSUcU= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 h1:YA7tS4VFSUmjeZBt4Wa+fSoreH1VJYCFlHvoRey3ngM= @@ -1266,18 +1251,8 @@ github.com/owncloud/ocis-konnectd v0.3.2 h1:lKXpiE44xd/yvRmnTC2UA9qE+xP/6VT3QLQp github.com/owncloud/ocis-konnectd v0.3.2/go.mod h1:pyxlwCsLY/j54w5QVOSW8owARj6JfjH01b4hFz8XtAY= github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iKXA83ta7A= github.com/owncloud/ocis-migration v0.2.0/go.mod h1:U6DCcHLuogHvAXg1aAyIlzJPtERIqyuigXU1BjUpu5g= -github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501 h1:Knam2EQ1KcFPQNg3KHKsM5kVr5+Fc6wgmWvK5HgNrlc= -github.com/owncloud/ocis-ocs v0.1.1-0.20200810093052-0938dbcaf501/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c h1:jOIob9ULYorfllBgTIptUPc7ni0noJzkYZcGzj0nrYs= github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f h1:Cv0X5OP7Cx4iE7rxSMnuql49trdn7bVQMIrB5oKhqEI= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200728190226-2508a066ba8f/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b h1:lec9orcbYHyKrCBFPhEt9HfBiqQ+mQb1k7fd6R8mTe4= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200812122242-a1b14f0a4d3b/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2 h1:n9qK0gUh4TEVmNWnM11d7NmJi+//YvXXqAf8l2g0bhE= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200813065620-907ba1a7aae2/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26 h1:3AypyAyq3XHhcPZecUzFa3lFH2I5iTvg5b5zaSJa+GY= -github.com/owncloud/ocis-phoenix v0.10.1-0.20200813085428-0369dc8abd26/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 h1:6HVjwDQmR7rOKbx8ozp0k1Yo74NfHAs6dLWZ0ZWMBYk= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= @@ -1292,21 +1267,10 @@ github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200527082518-5641fa4a4c8c/go.mod h1:s github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPyTZbTofJjAz3LSQUIaKKcjjBBBIJGaEAkP8g= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112628-2151a60cc204/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= -github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea h1:WufXOhuSliXUNXOl1y9LZiqAE8yorSpofxRDFiHApxc= -github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112833-49a2b6fd10ea/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= +github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d h1:eruHqxLfS3fiPO1ylg60T++wShVqtayI4LxUhwOEuN4= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= -github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7 h1:tHck5pbMT3Hw8uDHgMvDjDpH6GODiJiL9bBK463JuGg= -github.com/owncloud/ocis-proxy v0.5.1-0.20200731211838-9470b36c61d7/go.mod h1:HW9fg2pVnZmtlKduHHuVFSTXylDl5seKuZWkz7M0+7s= github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 h1:brxKzZ8iSL41mCmSFmFRFF1wm6rV4pvCLm52hLN3hGE= github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY= -github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b h1:3JSmFYPvABCz4LqzAdiYBrpUxkXnquj8MMz57H4vGgQ= -github.com/owncloud/ocis-reva v0.10.1-0.20200728121716-b05b139f0a8b/go.mod h1:oztN2xHWREqKvVZjIACSE/o3PBLkliiQhYr4NOrkts8= -github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad h1:TLFX8+kQWx8GAUhqBsRRCxuNMoPIDbYVwkT9Yyb0QT4= -github.com/owncloud/ocis-reva v0.10.1-0.20200811144731-53a4180d0aad/go.mod h1:Hy98ammIF8UBHebe/k5o0VNzO6HhsxOGUrsZSFiVSic= -github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914 h1:V2rGiPURf7DcOSm/Ewwez6LwMX4+hOpRlrAbRFEJUHo= -github.com/owncloud/ocis-reva v0.10.1-0.20200813081904-c61e71e61914/go.mod h1:QLiYoToAP7xFHD3xOcW4Yw4nnTaCBQ40zxry1vNqfKo= -github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d h1:B1+QulxyF6JRDvvvFARCDUkcYSNg4/+2b+Op/FiN1zs= -github.com/owncloud/ocis-reva v0.10.1-0.20200813082111-115c8e5d051d/go.mod h1:QLiYoToAP7xFHD3xOcW4Yw4nnTaCBQ40zxry1vNqfKo= github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9 h1:fP9iSmGLOPcAWvQiBx9wnp8NuPJ6NartnW1RDaGCfxs= github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9/go.mod h1:xQ/o8K8p48/tyB5PiSwFZtygmCBd1PTqnD8ftlYBd9s= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= @@ -1382,7 +1346,6 @@ github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1: 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.0.0-20191202183732-d1d2010b5bee/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20170706130215-fb369f752a7f/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= @@ -1551,6 +1514,7 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho= github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.1.1/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -1587,8 +1551,6 @@ github.com/tus/tusd v1.1.1-0.20200416115059-9deabf9d80c2 h1:rcji4q9wMuSrz0tZt3kg github.com/tus/tusd v1.1.1-0.20200416115059-9deabf9d80c2/go.mod h1:ygrT4B9ZSb27dx3uTnobX5nOFDnutBL6iWKLH4+KpA0= github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-client-go v2.20.1+incompatible h1:HgqpYBng0n7tLJIlyT4kPCIv5XgCsF+kai1NnnrJzEU= -github.com/uber/jaeger-client-go v2.20.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.25.0+incompatible h1:IxcNZ7WRY1Y3G4poYlx24szfsn/3LvK9QHCq9oQw8+U= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= @@ -1915,8 +1877,6 @@ golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 h1:6cBnXxYO+CiRVrChvCosSv7magqTPbyAgz1M8iOv5wM= -golang.org/x/sys v0.0.0-20200806125547-5acd03effb82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed h1:WBkVNH1zd9jg/dK4HCM4lNANnmd12EHC9z+LmcCG4ns= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2004,8 +1964,6 @@ golang.org/x/tools v0.0.0-20200427214658-4697a2867c88 h1:Nj7oNnL9tSACMt2JvszZN6P golang.org/x/tools v0.0.0-20200427214658-4697a2867c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2 h1:21BqcH/onxtGHn1A2GDOJjZnbt4Nlez629S3eaR+eYs= golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea h1:9ym67RBRK/wN50W0T3g8g1n8viM1D2ofgWufDlMfWe0= -golang.org/x/tools v0.0.0-20200811032001-fd80f4dbb3ea/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207 h1:8Kg+JssU1jBZs8GIrL5pl4nVyaqyyhdmHAR4D1zGErg= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2168,6 +2126,7 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 4b2a670e137f419b95f531811613fdcdb4d1d07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 17 Aug 2020 15:06:18 +0200 Subject: [PATCH 74/79] add eos truobleshooting docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- docs/eos.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/eos.md b/docs/eos.md index 3a735c80b6..691f9a3087 100644 --- a/docs/eos.md +++ b/docs/eos.md @@ -172,3 +172,15 @@ EOS Console [root://localhost] |/> But this is a different adventure. See the links at the top of this page for other sources of information on eos. + +## Troubleshooting + +Q: When running `docker-compose up -d` ocis exits right away. +A: You can check the error code using `docker-compose ps` and investigate further by running only ocis again using `docker-compose up ocis` (without `-d` so you can see whet is going on in the foreground). +One reason might be that the binary was already built and but does not match the container env. Try running `make clean` before running `docker-compose up ocis` so it gets built inside the container. + +Q: How do I update a service in the ocis container? +A: 1. `docker-compose exec ocis make clean build` to update the binary + 2. `docker-compose exec ocis ./bin/ocis kill ` to kill the service + 3. `docker-compose exec ocis ./bin/ocis run ` to start the service. Do not forget to set any env vars, eg. + `docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home` \ No newline at end of file From 29efcbbe8d96e617b9875efd41e6acc52c0ee6d2 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 17 Aug 2020 17:39:04 +0200 Subject: [PATCH 75/79] Update Phoenix commit for disabled deletion tests --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index cfca42306b..961fba7069 100644 --- a/.drone.star +++ b/.drone.star @@ -6,7 +6,7 @@ config = { }, 'uiTests': { 'phoenixBranch': 'master', - 'phoenixCommit': 'c1b2858608e60ef0ed51ca2fdd9fb81022a3c4f2', + 'phoenixCommit': '06cefd5348ee34b80e066827ce530277ecd91991', 'suites': { 'phoenixWebUI1': [ 'webUICreateFilesFolders', From ebcc8c68426785f226d5bd957cd4177459e70cfd Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 17 Aug 2020 17:43:02 +0200 Subject: [PATCH 76/79] Update modules to tagged versions - ocis-ocs v0.2.0 - ocis-pkg/v2 v2.3.0 - ocis-proxy v0.6.0 - ocis-reva v0.12.0 - ocis-settings v0.1.0 - ocis-store v0.1.1 - ocis-thumbnails v0.3.0 --- go.mod | 27 +++++++++++++++------------ go.sum | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 9638e30afc..9a50422c2e 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,14 @@ require ( contrib.go.opencensus.io/exporter/ocagent v0.7.0 contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 - github.com/bmatcuk/doublestar v1.3.1 // indirect + github.com/bmatcuk/doublestar v1.3.2 // indirect + github.com/cespare/reflex v0.3.0 // indirect github.com/coreos/etcd v3.3.21+incompatible // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-log/log v0.2.0 // indirect - github.com/karrick/godirwalk v1.15.8 // indirect + github.com/hashicorp/go-version v1.2.1 // indirect + github.com/karrick/godirwalk v1.16.1 // indirect github.com/labstack/echo v3.3.10+incompatible // indirect github.com/labstack/gommon v0.3.0 // indirect github.com/mattn/go-colorable v0.1.7 // indirect @@ -28,24 +30,25 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200604104641-f5d5d6bafa96 github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 - github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c + github.com/owncloud/ocis-ocs v0.2.0 github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 - github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d - github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 - github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9 - github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6 - github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 - github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 + github.com/owncloud/ocis-pkg/v2 v2.3.0 + github.com/owncloud/ocis-proxy v0.6.0 + github.com/owncloud/ocis-reva v0.12.0 + github.com/owncloud/ocis-settings v0.1.0 + github.com/owncloud/ocis-store v0.1.1 + github.com/owncloud/ocis-thumbnails v0.3.0 github.com/owncloud/ocis-webdav v0.1.1 github.com/refs/pman v0.0.0-20200701173654-f05b8833071a github.com/restic/calens v0.2.0 - github.com/valyala/fasttemplate v1.2.0 // indirect + github.com/valyala/fasttemplate v1.2.1 // indirect go.opencensus.io v0.22.4 go.uber.org/atomic v1.5.1 // indirect go.uber.org/multierr v1.4.0 // indirect - golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect - golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed // indirect + golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect + golang.org/x/sys v0.0.0-20200817085935-3ff754bf58a9 // indirect golang.org/x/text v0.3.3 // indirect + golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f // indirect ) replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 diff --git a/go.sum b/go.sum index 23a29f223f..9e327e4022 100644 --- a/go.sum +++ b/go.sum @@ -205,6 +205,8 @@ github.com/blevesearch/zap/v14 v14.0.0/go.mod h1:sUc/gPGJlFbSQ2ZUh/wGRYwkKx+Dg/5 github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bmatcuk/doublestar v1.3.1 h1:rT8rxDPsavp9G+4ZULzqhhUSaI/OPsTZNG88Z3i0xvY= github.com/bmatcuk/doublestar v1.3.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= +github.com/bmatcuk/doublestar v1.3.2 h1:mzUncgFmpzNUhIITFqGdZ8nUU0O7JTJzRO8VdkeLCSo= +github.com/bmatcuk/doublestar v1.3.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo= @@ -233,6 +235,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/reflex v0.2.0 h1:6d9WpWJseKjJvZEevKP7Pk42nPx2+BUTqmhNk8wZPwM= github.com/cespare/reflex v0.2.0/go.mod h1:ooqOLJ4algvHP/oYvKWfWJ9tFUzCLDk5qkIJduMYrgI= +github.com/cespare/reflex v0.3.0 h1:9q8ZXMh+oW4quohPBcLsT56TFl4/DeQsTjZASe4wgoY= +github.com/cespare/reflex v0.3.0/go.mod h1:I+0Pnu2W693i7Hv6ZZG76qHTY0mgUa7uCIfCtikXojE= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= @@ -303,6 +307,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da h1:WXnT88cFG2davqSFqvaFfzkSMC0lqh/8/rKZ+z7tYvI= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= github.com/crewjam/saml v0.4.0 h1:gvSlboe4BO1APaU2eDdsbql3itRat310Q5qs2Seim2k= @@ -825,6 +831,8 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/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= @@ -910,6 +918,8 @@ github.com/karrick/godirwalk v1.7.7/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46s github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= github.com/karrick/godirwalk v1.15.8 h1:7+rWAZPn9zuRxaIqqT8Ohs2Q2Ac0msBqwRdxNCr2VVs= github.com/karrick/godirwalk v1.15.8/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= +github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= +github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= @@ -1253,6 +1263,8 @@ github.com/owncloud/ocis-migration v0.2.0 h1:AmfXKIRlGDNkqhC4AetZ0RNNgcH3cHRl8iK github.com/owncloud/ocis-migration v0.2.0/go.mod h1:U6DCcHLuogHvAXg1aAyIlzJPtERIqyuigXU1BjUpu5g= github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c h1:jOIob9ULYorfllBgTIptUPc7ni0noJzkYZcGzj0nrYs= github.com/owncloud/ocis-ocs v0.1.1-0.20200811143120-5b2ce794900c/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= +github.com/owncloud/ocis-ocs v0.2.0 h1:XZBo3CROyd0bOWimP6i+jlNDj6LtktPw7T9YGV4hpiY= +github.com/owncloud/ocis-ocs v0.2.0/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 h1:6HVjwDQmR7rOKbx8ozp0k1Yo74NfHAs6dLWZ0ZWMBYk= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= @@ -1269,23 +1281,37 @@ github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200811112628-2151a60cc204/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d h1:eruHqxLfS3fiPO1ylg60T++wShVqtayI4LxUhwOEuN4= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= +github.com/owncloud/ocis-pkg/v2 v2.3.0 h1:bdDgfPkPdL3D6bGKhQ56pfwT1XdiKBtQ34qErVyXzys= +github.com/owncloud/ocis-pkg/v2 v2.3.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091 h1:brxKzZ8iSL41mCmSFmFRFF1wm6rV4pvCLm52hLN3hGE= github.com/owncloud/ocis-proxy v0.5.1-0.20200811152237-99c1dba7c091/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY= +github.com/owncloud/ocis-proxy v0.6.0 h1:uhbDNY5pmNDd4E/UrF32pduye9JDkaS1wPcQE+yvKCE= +github.com/owncloud/ocis-proxy v0.6.0/go.mod h1:zyAWyZXjILb3Lsotxc2a+Iwkj4jKXtT4O0ajB5b3jnY= github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9 h1:fP9iSmGLOPcAWvQiBx9wnp8NuPJ6NartnW1RDaGCfxs= github.com/owncloud/ocis-reva v0.10.1-0.20200814043912-6361bb5cb1b9/go.mod h1:xQ/o8K8p48/tyB5PiSwFZtygmCBd1PTqnD8ftlYBd9s= +github.com/owncloud/ocis-reva v0.12.0 h1:OWKNeWFyRN/hChlrh/SfNmrnIusRMuiCFA2tWwlfY2o= +github.com/owncloud/ocis-reva v0.12.0/go.mod h1:xQ/o8K8p48/tyB5PiSwFZtygmCBd1PTqnD8ftlYBd9s= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363/go.mod h1:/h0ceztOoFc3KAnm8nqZI4zwsaaZK9q4MTgtintwsXc= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43 h1:IekDKhkoaOhUnpIHSG5d02hGMOW5u4tZEEfxVC1KGgk= github.com/owncloud/ocis-settings v0.0.0-20200629120229-69693c5f8f43/go.mod h1:AeXZVHKEU+9Xt4+/lkHE5rx+sJH2if9dIrUGLhe+JOY= github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6 h1:JoyHVIzqL2Vheg43KuBhVaUXjH0bTZCQLwjgQhtaQ88= github.com/owncloud/ocis-settings v0.0.0-20200812135211-ec86c9ac93c6/go.mod h1:fSV96Y/yK5zCHHL9sNIPVCkHcAIDiIcylFwb5itvp+w= +github.com/owncloud/ocis-settings v0.1.0 h1:q0k3UvI0plDX69IyuJwNWNxlJY6aDmmTvdXXctKTx2M= +github.com/owncloud/ocis-settings v0.1.0/go.mod h1:PMkdXcRae1VoCAvfUOCrV6ex0Y4zq5vxrWR3/KWm+MA= github.com/owncloud/ocis-store v0.0.0-20200716140351-f9670592fb7b/go.mod h1:7WRMnx4ffwtckNl4qD2Gj/d5fvl84jyydOV2FbUUu3A= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6 h1:yt1ufihhLkQQtlNO5TE3/m0jXGC3tPMOhNcUJTG9ObU= github.com/owncloud/ocis-store v0.1.1-0.20200727080653-706a465a07c6/go.mod h1:Rav5iw0fZXYFqJl81IbyTVa/FidaBhgVPtp0XqkgviM= +github.com/owncloud/ocis-store v0.1.1 h1:lPvWjjPqbVqDW0sfgQdfY3dOOvXK0wC87eTL2fWxRBg= +github.com/owncloud/ocis-store v0.1.1/go.mod h1:Rav5iw0fZXYFqJl81IbyTVa/FidaBhgVPtp0XqkgviM= github.com/owncloud/ocis-thumbnails v0.2.0 h1:jHUXx5WZZxI6U3tGs53dpUfH/CwVBov1RhTi74GMltI= github.com/owncloud/ocis-thumbnails v0.2.0/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832 h1:XdnNQZcR6aIukNmM9HOjZu44g19x/GrTlSqi82s9RA8= github.com/owncloud/ocis-thumbnails v0.2.1-0.20200806144633-c15d98b30832/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= +github.com/owncloud/ocis-thumbnails v0.3.0 h1:As0wiSXwDp9JgK/FPY5h1J9HXEow9EFefgOdgEIgdP0= +github.com/owncloud/ocis-thumbnails v0.3.0/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= +github.com/owncloud/ocis-thumbnails v0.3.1-0.20200817134445-2ebf7b2f23af h1:BV1mwMfAGRoFT6a7mLbwfEbr39QZnt2emcSI3ewI9js= +github.com/owncloud/ocis-thumbnails v0.3.1-0.20200817134445-2ebf7b2f23af/go.mod h1:97QGLawjcpbhSIscbPXJAytE6vAQi5Y+Ov55h8/mq+0= github.com/owncloud/ocis-webdav v0.1.1 h1:4UN9GefQiH6RGgq2+tiYFLNw8ql6luXYH0NdCJg2n/U= github.com/owncloud/ocis-webdav v0.1.1/go.mod h1:E9OlGfvlxf1NHFOvFgbHWBe7/pw4Gqy/JaSJFEHQSzg= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= @@ -1568,6 +1594,8 @@ github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50w github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.0 h1:y3yXRCoDvC2HTtIHvL2cc7Zd+bqA+zqDO6oQzsJO07E= github.com/valyala/fasttemplate v1.2.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vimeo/go-util v1.2.0/go.mod h1:s13SMDTSO7AjH1nbgp707mfN5JFIWUFDU5MDDuRRtKs= github.com/vultr/govultr v0.1.4/go.mod h1:9H008Uxr/C4vFNGLqKx232C206GL0PBHzOP0809bGNA= github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= @@ -1775,6 +1803,8 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc h1:zK/HqS5bZxDptfPJNq8v7vJfXtkU7r9TLIoSr1bXaP4= +golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1879,6 +1909,8 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed h1:WBkVNH1zd9jg/dK4HCM4lNANnmd12EHC9z+LmcCG4ns= golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200817085935-3ff754bf58a9 h1:MEU99+Z67sctTw1UjDlQ6wjRF77I43fOt7YKWktVvXw= +golang.org/x/sys v0.0.0-20200817085935-3ff754bf58a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1966,6 +1998,8 @@ golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2 h1:21BqcH/onxtGHn1A2GDOJjZ golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207 h1:8Kg+JssU1jBZs8GIrL5pl4nVyaqyyhdmHAR4D1zGErg= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f h1:33yHANSyO/TeglgY9rBhUpX43wtonTXoFOsMRtNB6qE= +golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= 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= From ddf51d226af1eb1ffe42f80f4b7bcc18347c6110 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 17 Aug 2020 22:33:28 +0200 Subject: [PATCH 77/79] Update ocis-phoenix to 0.11.0 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9a50422c2e..9a04fc8e5c 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/owncloud/ocis-konnectd v0.3.2 github.com/owncloud/ocis-migration v0.2.0 github.com/owncloud/ocis-ocs v0.2.0 - github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 + github.com/owncloud/ocis-phoenix v0.11.0 github.com/owncloud/ocis-pkg/v2 v2.3.0 github.com/owncloud/ocis-proxy v0.6.0 github.com/owncloud/ocis-reva v0.12.0 diff --git a/go.sum b/go.sum index 9e327e4022..3ab995e2ec 100644 --- a/go.sum +++ b/go.sum @@ -1267,6 +1267,8 @@ github.com/owncloud/ocis-ocs v0.2.0 h1:XZBo3CROyd0bOWimP6i+jlNDj6LtktPw7T9YGV4hp github.com/owncloud/ocis-ocs v0.2.0/go.mod h1:xk7iq7qczDfLgVG6DWFnCq8We9bWinsLnFDJ3y67HVM= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472 h1:6HVjwDQmR7rOKbx8ozp0k1Yo74NfHAs6dLWZ0ZWMBYk= github.com/owncloud/ocis-phoenix v0.10.1-0.20200813120824-f66a6435f472/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= +github.com/owncloud/ocis-phoenix v0.11.0 h1:0aoFJWpayxlyQZMx5cYHu0e3UpSifwJkdkcI4OFKAaQ= +github.com/owncloud/ocis-phoenix v0.11.0/go.mod h1:1pwRccQdRJGOdZeC3yO+/ujPMGPBAJcIVYFYZHajbt8= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= From 829657e8bbbe18ad27948f38317f23209e241bdc Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 18 Aug 2020 11:18:53 +0545 Subject: [PATCH 78/79] Fix some typos in docs/eos.md --- docs/eos.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/eos.md b/docs/eos.md index 691f9a3087..fee2bc2de7 100644 --- a/docs/eos.md +++ b/docs/eos.md @@ -176,11 +176,11 @@ But this is a different adventure. See the links at the top of this page for oth ## Troubleshooting Q: When running `docker-compose up -d` ocis exits right away. -A: You can check the error code using `docker-compose ps` and investigate further by running only ocis again using `docker-compose up ocis` (without `-d` so you can see whet is going on in the foreground). -One reason might be that the binary was already built and but does not match the container env. Try running `make clean` before running `docker-compose up ocis` so it gets built inside the container. +A: You can check the error code using `docker-compose ps` and investigate further by running only ocis again using `docker-compose up ocis` (without `-d` so you can see what is going on in the foreground). +One reason might be that the binary was already built but does not match the container env. Try running `make clean` before running `docker-compose up ocis` so it gets built inside the container. Q: How do I update a service in the ocis container? A: 1. `docker-compose exec ocis make clean build` to update the binary 2. `docker-compose exec ocis ./bin/ocis kill ` to kill the service 3. `docker-compose exec ocis ./bin/ocis run ` to start the service. Do not forget to set any env vars, eg. - `docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home` \ No newline at end of file + `docker-compose exec -e REVA_STORAGE_EOS_LAYOUT="{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}" -e REVA_STORAGE_HOME_DRIVER=eoshome ocis ./bin/ocis run reva-storage-home` From bce5e6310c9a4712fca358413cef10bd81225b6d Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 18 Aug 2020 11:22:41 +0545 Subject: [PATCH 79/79] Put back some comment text in expected-failures.txt --- tests/acceptance/expected-failures.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/expected-failures.txt b/tests/acceptance/expected-failures.txt index ec9d6bf2d7..b8bde948d2 100644 --- a/tests/acceptance/expected-failures.txt +++ b/tests/acceptance/expected-failures.txt @@ -1,3 +1,4 @@ +# this file contains the scenarios from ownCloud10 core API tests that are currently expected to fail # # test scenarios that fail with OC storage (that were tagged skipOnOcis-OC-Storage in core) # @@ -913,7 +914,7 @@ apiWebdavUpload2/uploadFileUsingOldChunking.feature:99 apiWebdavUpload2/uploadFileUsingOldChunking.feature:100 apiWebdavUpload2/uploadFileUsingOldChunking.feature:101 # -# https://github.com/owncloud/ocis/issues/187 Previews via webDAV API tests fails on OCIS +# https://github.com/owncloud/ocis/issues/187 Previews via webDAV API tests fail on OCIS apiWebdavPreviews/previews.feature:15 apiWebdavPreviews/previews.feature:16 apiWebdavPreviews/previews.feature:17