diff --git a/accounts/go.mod b/accounts/go.mod index 726ba74c3f..3fc1370062 100644 --- a/accounts/go.mod +++ b/accounts/go.mod @@ -7,7 +7,7 @@ require ( contrib.go.opencensus.io/exporter/ocagent v0.6.0 contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 + github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 github.com/go-chi/chi v4.1.2+incompatible github.com/go-chi/render v1.0.1 github.com/gofrs/uuid v3.3.0+incompatible diff --git a/accounts/go.sum b/accounts/go.sum index ffcf8a4168..26807d57db 100644 --- a/accounts/go.sum +++ b/accounts/go.sum @@ -187,6 +187,8 @@ github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e h1:khITGSnfDXtByQsLe github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 h1:FV4bVGg+22YVyWXlj5VG35/fESoOZBokZiOH2E69PiU= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/changelog/unreleased/update-reva.md b/changelog/unreleased/update-reva.md new file mode 100644 index 0000000000..29ce43e35b --- /dev/null +++ b/changelog/unreleased/update-reva.md @@ -0,0 +1,7 @@ +Enhancement: Update reva to 063b3db9162b + +- bring public link removal changes to OCIS. +- fix subcommand name collision from renaming phoenix -> web. + +https://github.com/owncloud/ocis/pull/1091 +https://github.com/owncloud/ocis/issues/1098 diff --git a/glauth/go.sum b/glauth/go.sum index 6ce37bc0d3..a942bfb1c0 100644 --- a/glauth/go.sum +++ b/glauth/go.sum @@ -230,6 +230,8 @@ github.com/cs3org/reva v1.4.1-0.20201120104232-f5afafc04c3b/go.mod h1:oqkkfe0g/d github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48= github.com/cs3org/reva v1.4.1-0.20201203135805-655c9babdc3f/go.mod h1:3Bz9oExBSgKjDspq3pBso31HlLSD98SlcURV54N3yPs= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/konnectd/go.mod b/konnectd/go.mod index 78297ec2f2..1605db5d90 100644 --- a/konnectd/go.mod +++ b/konnectd/go.mod @@ -7,6 +7,7 @@ require ( contrib.go.opencensus.io/exporter/ocagent v0.6.0 contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 + github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 // indirect github.com/go-chi/chi v4.1.2+incompatible github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d // indirect github.com/gorilla/mux v1.8.0 diff --git a/konnectd/go.sum b/konnectd/go.sum index 1da7df2aaa..baa3f05ddf 100644 --- a/konnectd/go.sum +++ b/konnectd/go.sum @@ -222,6 +222,8 @@ github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8 github.com/cs3org/reva v1.4.1-0.20201203135805-655c9babdc3f h1:3Y1TbQCN9s8+eWjfnUVlnVA7YlZJdxMTffmMVxZwMP8= github.com/cs3org/reva v1.4.1-0.20201203135805-655c9babdc3f/go.mod h1:3Bz9oExBSgKjDspq3pBso31HlLSD98SlcURV54N3yPs= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/ocis-pkg/go.mod b/ocis-pkg/go.mod index 924c92719f..fd8a24d5b2 100644 --- a/ocis-pkg/go.mod +++ b/ocis-pkg/go.mod @@ -7,7 +7,7 @@ require ( github.com/ascarter/requestid v0.0.0-20170313220838-5b76ab3d4aee github.com/coreos/go-oidc v2.2.1+incompatible github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 + github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 github.com/go-chi/chi v4.1.2+incompatible github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 github.com/iancoleman/strcase v0.1.2 diff --git a/ocis-pkg/go.sum b/ocis-pkg/go.sum index 47ddfda4d4..2ac32eb531 100644 --- a/ocis-pkg/go.sum +++ b/ocis-pkg/go.sum @@ -217,6 +217,8 @@ github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e h1:khITGSnfDXtByQsLe github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 h1:FV4bVGg+22YVyWXlj5VG35/fESoOZBokZiOH2E69PiU= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/ocis/go.mod b/ocis/go.mod index eddcdcb149..07f27a68c5 100644 --- a/ocis/go.mod +++ b/ocis/go.mod @@ -7,6 +7,7 @@ require ( contrib.go.opencensus.io/exporter/ocagent v0.7.0 contrib.go.opencensus.io/exporter/zipkin v0.1.2 github.com/UnnoTed/fileb0x v1.1.4 + github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 // indirect github.com/go-test/deep v1.0.6 // indirect github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect github.com/micro/cli/v2 v2.1.2 diff --git a/ocis/go.sum b/ocis/go.sum index 8b6ff1b8d0..e6f535b063 100644 --- a/ocis/go.sum +++ b/ocis/go.sum @@ -308,6 +308,10 @@ github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 h1:FV4bVGg+22YVyWXlj5VG35/fESoOZBokZiOH2E69PiU= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201214141740-063b3db9162b h1:wL1Q4eX3LNZmuDXQhefTxYKisHdiyrsuinLWYiWD+6s= +github.com/cs3org/reva v1.4.1-0.20201214141740-063b3db9162b/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= 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= diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go index de4bde3dc8..de5061a4a9 100644 --- a/ocis/pkg/runtime/runtime.go +++ b/ocis/pkg/runtime/runtime.go @@ -13,7 +13,6 @@ import ( cli "github.com/micro/cli/v2" "github.com/micro/micro/v2/client/api" - "github.com/micro/micro/v2/client/web" "github.com/micro/micro/v2/service/registry" "github.com/refs/pman/pkg/process" @@ -146,7 +145,7 @@ func AddMicroPlatform(app *cli.App, opts micro.Options) { setDefaults() app.Commands = append(app.Commands, api.Commands(micro.Registry(opts.Registry))...) - app.Commands = append(app.Commands, web.Commands(micro.Registry(opts.Registry))...) + //app.Commands = append(app.Commands, web.Commands(micro.Registry(opts.Registry))...) app.Commands = append(app.Commands, registry.Commands(micro.Registry(opts.Registry))...) } diff --git a/ocs/go.mod b/ocs/go.mod index ed31a7d247..e458d274d8 100644 --- a/ocs/go.mod +++ b/ocs/go.mod @@ -8,7 +8,7 @@ require ( contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/UnnoTed/fileb0x v1.1.4 github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 + github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 github.com/go-chi/chi v4.1.2+incompatible github.com/go-chi/render v1.0.1 github.com/golang/protobuf v1.4.3 diff --git a/ocs/go.sum b/ocs/go.sum index 2476d77d1f..9320532713 100644 --- a/ocs/go.sum +++ b/ocs/go.sum @@ -198,6 +198,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21/go.mod h1:UXha4T github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 h1:FV4bVGg+22YVyWXlj5VG35/fESoOZBokZiOH2E69PiU= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= diff --git a/proxy/go.mod b/proxy/go.mod index 6bce45b1da..a0da92f11f 100644 --- a/proxy/go.mod +++ b/proxy/go.mod @@ -8,7 +8,7 @@ require ( contrib.go.opencensus.io/exporter/zipkin v0.1.1 github.com/coreos/go-oidc v2.2.1+incompatible github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 - github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 + github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/justinas/alice v1.2.0 github.com/micro/cli/v2 v2.1.2 diff --git a/proxy/go.sum b/proxy/go.sum index 3bdd20e93a..a5c7ac854a 100644 --- a/proxy/go.sum +++ b/proxy/go.sum @@ -196,6 +196,8 @@ github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21/go.mod h1:UXha4T github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 h1:FV4bVGg+22YVyWXlj5VG35/fESoOZBokZiOH2E69PiU= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= diff --git a/storage/go.mod b/storage/go.mod index f731d62ca0..aaef573ce8 100644 --- a/storage/go.mod +++ b/storage/go.mod @@ -3,7 +3,7 @@ module github.com/owncloud/ocis/storage go 1.13 require ( - github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 + github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 github.com/gofrs/uuid v3.3.0+incompatible github.com/micro/cli/v2 v2.1.2 github.com/micro/go-micro/v2 v2.9.1 diff --git a/storage/go.sum b/storage/go.sum index edbddf0b54..467c3b00ab 100644 --- a/storage/go.sum +++ b/storage/go.sum @@ -199,6 +199,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89 h1:FV4bVGg+22YVyWXlj5VG35/fESoOZBokZiOH2E69PiU= github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8= +github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=