diff --git a/ocis-pkg/go.mod b/ocis-pkg/go.mod index 69478e537..03ff7c525 100644 --- a/ocis-pkg/go.mod +++ b/ocis-pkg/go.mod @@ -36,6 +36,7 @@ require ( ) replace ( + github.com/asim/go-micro/plugins/server/http/v3 => github.com/refs/go-micro/plugins/server/http/v3 v3.0.0-20210217152250-44857d6dc4f6 github.com/owncloud/ocis/accounts => ../accounts github.com/owncloud/ocis/settings => ../settings github.com/owncloud/ocis/storage => ../storage diff --git a/ocis-pkg/go.sum b/ocis-pkg/go.sum index a208a7f05..79922b333 100644 --- a/ocis-pkg/go.sum +++ b/ocis-pkg/go.sum @@ -145,8 +145,6 @@ github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210202145831-070250 github.com/asim/go-micro/plugins/registry/memory/v3 v3.0.0-20210202145831-070250155285/go.mod h1:AU0vyZvsO1lpuQr/DUG4CnNRvITXqQcJRRAzBATR6Jo= github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:WaTi2EiBXi48uXmlGTb7h+QxSqmhm6A6r5P2idxvLrM= github.com/asim/go-micro/plugins/server/grpc/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:4cS4mKqylPAybKUO8/mdjTGlBImeAL1RWA2rV/mObPQ= -github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:fZuMpX1tMJKD93MdCsHTzSld6yAzdeZvzDgvKVT8ON8= -github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws= github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285 h1:3YQx0EQbHNYpp1FwnHrgU0oRFISjZvBGL7UhpA8/Nas= github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285/go.mod h1:FXWwzJ74gGEIY/gOdDHJqCQuago+tLSkcUPayf9daGM= github.com/asim/go-micro/plugins/transport/tcp/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:VW8tZWJYqfn6l9RctPE1SbXsdoaiw1bvc4aXTsSorX0= @@ -1215,6 +1213,8 @@ github.com/prometheus/statsd_exporter v0.15.0/go.mod h1:Dv8HnkoLQkeEjkIE4/2ndAA7 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= 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/refs/go-micro/plugins/server/http/v3 v3.0.0-20210217152250-44857d6dc4f6 h1:K94q5Cw19sn7K25RPb2wVVWMOuJ3fX18fDOhqUACq2o= +github.com/refs/go-micro/plugins/server/http/v3 v3.0.0-20210217152250-44857d6dc4f6/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/restic/calens v0.2.0 h1:LVNAtmFc+Pb4ODX66qdX1T3Di1P0OTLyUsVyvM/xD7E= github.com/restic/calens v0.2.0/go.mod h1:UXwyAKS4wsgUZGEc7NrzzygJbLsQZIo3wl+62Q1wvmU= diff --git a/ocis-pkg/service/http/service.go b/ocis-pkg/service/http/service.go index 7a780540a..e7206071b 100644 --- a/ocis-pkg/service/http/service.go +++ b/ocis-pkg/service/http/service.go @@ -7,7 +7,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/registry" - //"github.com/asim/go-micro/plugins/server/http/v3" + "github.com/asim/go-micro/plugins/server/http/v3" "github.com/asim/go-micro/plugins/transport/tcp/v3" "github.com/asim/go-micro/v3" "github.com/asim/go-micro/v3/server" @@ -28,7 +28,7 @@ func NewService(opts ...Option) Service { Msg("starting server") wopts := []micro.Option{ - micro.Server(server.NewServer()), + micro.Server(http.NewServer(server.TLSConfig(sopts.TLSConfig))), micro.Transport(getTransport(sopts.TLSConfig)), micro.Registry(*registry.GetRegistry()), micro.Address(sopts.Address), diff --git a/ocis/go.mod b/ocis/go.mod index f6f6818c1..aec305913 100644 --- a/ocis/go.mod +++ b/ocis/go.mod @@ -56,4 +56,5 @@ replace ( github.com/owncloud/ocis/thumbnails => ../thumbnails github.com/owncloud/ocis/web => ../web github.com/owncloud/ocis/webdav => ../webdav + github.com/asim/go-micro/plugins/server/http/v3 => github.com/refs/go-micro/plugins/server/http/v3 v3.0.0-20210217152250-44857d6dc4f6 ) diff --git a/ocis/go.sum b/ocis/go.sum index 387feb508..3f661e9d5 100644 --- a/ocis/go.sum +++ b/ocis/go.sum @@ -1355,6 +1355,8 @@ 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/go-micro/plugins/server/http/v3 v3.0.0-20210217152250-44857d6dc4f6 h1:K94q5Cw19sn7K25RPb2wVVWMOuJ3fX18fDOhqUACq2o= +github.com/refs/go-micro/plugins/server/http/v3 v3.0.0-20210217152250-44857d6dc4f6/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= diff --git a/proxy/go.mod b/proxy/go.mod index 413b2552f..078317f8d 100644 --- a/proxy/go.mod +++ b/proxy/go.mod @@ -38,5 +38,6 @@ replace ( github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg github.com/owncloud/ocis/settings => ../settings github.com/owncloud/ocis/store => ../store + github.com/asim/go-micro/plugins/server/http/v3 => github.com/refs/go-micro/plugins/server/http/v3 v3.0.0-20210217152250-44857d6dc4f6 google.golang.org/grpc => google.golang.org/grpc v1.26.0 ) diff --git a/proxy/go.sum b/proxy/go.sum index 948d3e07f..52a5c4818 100644 --- a/proxy/go.sum +++ b/proxy/go.sum @@ -147,6 +147,8 @@ github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210210071449-f9f5e7422d github.com/asim/go-micro/plugins/server/http/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:Oe0f4zsBx6if1scvMrL/4mNfkD7URaqkvhQWnWogcws= github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285 h1:3YQx0EQbHNYpp1FwnHrgU0oRFISjZvBGL7UhpA8/Nas= github.com/asim/go-micro/plugins/transport/grpc/v3 v3.0.0-20210202145831-070250155285/go.mod h1:FXWwzJ74gGEIY/gOdDHJqCQuago+tLSkcUPayf9daGM= +github.com/asim/go-micro/plugins/transport/tcp/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:VW8tZWJYqfn6l9RctPE1SbXsdoaiw1bvc4aXTsSorX0= +github.com/asim/go-micro/plugins/transport/tcp/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:B/8oFICkffCt1oNooseSEaeiqmR0v10XWuACDuFymi4= github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210210071449-f9f5e7422d8f h1:OUIw+swBpGSD3PQF/T6GMnNkSkOnO4vYe4t4KNb2jLI= github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210210071449-f9f5e7422d8f/go.mod h1:iCbpezORppbnxDxG/TEAoLsoxkAvEfcq2Fo1WOClNjY= github.com/asim/go-micro/v3 v3.0.0-20210120135431-d94936f6c97c/go.mod h1:fAeb2KUnD3z4XwtQ91XFxw5zgGKhoTsLc6Ie81QdER4= diff --git a/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json deleted file mode 100644 index 43fcad9b6..000000000 --- a/vendor-bin/behat/composer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "config" : { - "platform": { - "php": "7.4" - } - }, - "require": { - "behat/behat": "^3.8", - "behat/gherkin": "4.7.1", - "behat/mink": "1.7.1", - "behat/mink-extension": "^2.3", - "behat/mink-selenium2-driver": "^1.4", - "ciaranmcnulty/behat-stepthroughextension" : "dev-master", - "jarnaiz/behat-junit-formatter": "^1.3", - "rdx/behat-variables": "^1.2", - "sensiolabs/behat-page-object-extension": "^2.3", - "symfony/translation": "^4.4", - "sabre/xml": "^2.2", - "guzzlehttp/guzzle": "^7.2", - "phpunit/phpunit": "^9.4", - "laminas/laminas-ldap": "^2.10", - "ankitpokhrel/tus-php": "^2.1" - } -}