From 3588d42001ca1fe0c74e931411f874aff61fc3f9 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 30 Sep 2021 10:44:52 +0200 Subject: [PATCH 1/2] add the reva gateway flag to groups --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++-------------- ocs/pkg/service/v0/groups.go | 6 +++--- ocs/pkg/service/v0/users.go | 3 --- storage/pkg/command/groups.go | 1 + storage/pkg/flagset/groups.go | 10 ++++++++++ 6 files changed, 30 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 7ec387f62e..5aaa90ec2b 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/blevesearch/bleve/v2 v2.1.0 github.com/coreos/go-oidc/v3 v3.0.0 github.com/cs3org/go-cs3apis v0.0.0-20210922150613-cb9e3c99f8de - github.com/cs3org/reva v1.13.1-0.20210927074430-7c8d9947ad32 + github.com/cs3org/reva v1.13.1-0.20210930071148-6823079c1702 github.com/disintegration/imaging v1.6.2 github.com/glauth/glauth v1.1.3-0.20210729125545-b9aecdfcac31 github.com/go-chi/chi/v5 v5.0.4 @@ -57,11 +57,11 @@ require ( github.com/urfave/cli/v2 v2.3.0 github.com/yaegashi/msgraph.go v0.1.4 go.opencensus.io v0.23.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0 - go.opentelemetry.io/otel v1.0.0-RC3 - go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3 - go.opentelemetry.io/otel/sdk v1.0.0-RC3 - go.opentelemetry.io/otel/trace v1.0.0-RC3 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 + go.opentelemetry.io/otel v1.0.0 + go.opentelemetry.io/otel/exporters/jaeger v1.0.0 + go.opentelemetry.io/otel/sdk v1.0.0 + go.opentelemetry.io/otel/trace v1.0.0 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 golang.org/x/net v0.0.0-20210614182718-04defd469f4e diff --git a/go.sum b/go.sum index 321f1db02d..da92ee0802 100644 --- a/go.sum +++ b/go.sum @@ -291,8 +291,6 @@ github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= github.com/cs3org/go-cs3apis v0.0.0-20210922150613-cb9e3c99f8de h1:N+AI8wz7yhDDqHDuq9EGaqQoFhAOi9XW37xt0ormflw= github.com/cs3org/go-cs3apis v0.0.0-20210922150613-cb9e3c99f8de/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva v1.13.1-0.20210927074430-7c8d9947ad32 h1:ncv6WXy9TE14XCGv6F/5SOcGi0bCnF3vHklmTS6tE30= -github.com/cs3org/reva v1.13.1-0.20210927074430-7c8d9947ad32/go.mod h1:UNDzJq0lPzgKgWSgW1o2g6vqGkaHZKJeR7iWCB3NCIE= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= @@ -1160,18 +1158,16 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/contrib v0.23.0 h1:MgRuo0JZZX8J9WLRjyd7OpTSbaLOdQXXJa6SnZvlWLM= -go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0 h1:mMzWiJCJv7iC8yOFI0azfmmTuMFaaWVEObHH8LQaw8o= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0/go.mod h1:RlEDuaJ0wF4rNG/GOd8zknRW44rKISkcdsp46kt+FcA= -go.opentelemetry.io/otel v1.0.0-RC3 h1:kvwiyEkiUT/JaadXzVLI/R1wDO934A7r3Bs2wEe6wqA= -go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6P2lz//nKQ= -go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3 h1:pKXuRvOc+5NgM0vv05PVIUetreuM57mcC6QQAKkcqZA= -go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3/go.mod h1:UbP19Xlhk9tcRZ+A3PfvyN5ld4X4YrSnzXaYzx1yNLc= -go.opentelemetry.io/otel/sdk v1.0.0-RC3 h1:iRMkET+EmJUn5mW0hJzygBraXRmrUwzbOtNvTCh/oKs= -go.opentelemetry.io/otel/sdk v1.0.0-RC3/go.mod h1:78H6hyg2fka0NYT9fqGuFLvly2yCxiBXDJAgLKo/2Us= -go.opentelemetry.io/otel/trace v1.0.0-RC3 h1:9F0ayEvlxv8BmNmPbU005WK7hC+7KbOazCPZjNa1yME= -go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= +go.opentelemetry.io/otel v1.0.0 h1:qTTn6x71GVBvoafHK/yaRUmFzI4LcONZD0/kXxl5PHI= +go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg= +go.opentelemetry.io/otel/exporters/jaeger v1.0.0 h1:cLhx8llHw02h5JTqGqaRbYn+QVKHmrzD9vEbKnSPk5U= +go.opentelemetry.io/otel/exporters/jaeger v1.0.0/go.mod h1:q10N1AolE1JjqKrFJK2tYw0iZpmX+HBaXBtuCzRnBGQ= +go.opentelemetry.io/otel/sdk v1.0.0 h1:BNPMYUONPNbLneMttKSjQhOTlFLOD9U22HNG1KrIN2Y= +go.opentelemetry.io/otel/sdk v1.0.0/go.mod h1:PCrDHlSy5x1kjezSdL37PhbFUMjrsLRshJ2zCzeXwbM= +go.opentelemetry.io/otel/trace v1.0.0 h1:TSBr8GTEtKevYMG/2d21M989r5WJYVimhTHBKVEZuh4= +go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/ocs/pkg/service/v0/groups.go b/ocs/pkg/service/v0/groups.go index c26d8ca00d..a019663e47 100644 --- a/ocs/pkg/service/v0/groups.go +++ b/ocs/pkg/service/v0/groups.go @@ -38,7 +38,7 @@ func (o Ocs) ListUserGroups(w http.ResponseWriter, r *http.Request) { Start(r.Context(), "ListUserGroups") defer span.End() - span.SetAttributes(attribute.Any("groups", u.Groups)) + span.SetAttributes(attribute.StringSlice("groups", u.Groups)) if len(u.Groups) > 0 { mustNotFail(render.Render(w, r, response.DataRender(&data.Groups{Groups: u.Groups}))) @@ -96,7 +96,7 @@ func (o Ocs) ListUserGroups(w http.ResponseWriter, r *http.Request) { Start(r.Context(), "ListUserGroups") defer span.End() - span.SetAttributes(attribute.Any("groups", groups)) + span.SetAttributes(attribute.StringSlice("groups", groups)) mustNotFail(render.Render(w, r, response.DataRender(&data.Groups{Groups: groups}))) } @@ -266,7 +266,7 @@ func (o Ocs) ListGroups(w http.ResponseWriter, r *http.Request) { Start(r.Context(), "ListGroups") defer span.End() - span.SetAttributes(attribute.Any("groups", groups)) + span.SetAttributes(attribute.StringSlice("groups", groups)) mustNotFail(render.Render(w, r, response.DataRender(&data.Groups{Groups: groups}))) } diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index 3f4bc3f1f7..1a7fc01f48 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -27,7 +27,6 @@ import ( ocstracing "github.com/owncloud/ocis/ocs/pkg/tracing" storepb "github.com/owncloud/ocis/store/pkg/proto/v0" "github.com/pkg/errors" - "go.opentelemetry.io/otel/attribute" "google.golang.org/genproto/protobuf/field_mask" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/fieldmaskpb" @@ -150,8 +149,6 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) { Start(r.Context(), "GetUser") defer span.End() - span.SetAttributes(attribute.Any("user", d)) - mustNotFail(render.Render(w, r, response.DataRender(d))) } diff --git a/storage/pkg/command/groups.go b/storage/pkg/command/groups.go index 8cbe3d3391..c46e72ff93 100644 --- a/storage/pkg/command/groups.go +++ b/storage/pkg/command/groups.go @@ -103,6 +103,7 @@ func groupsConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inter }, "shared": map[string]interface{}{ "jwt_secret": cfg.Reva.JWTSecret, + "gatewaysvc": cfg.Reva.Gateway.Endpoint, }, "grpc": map[string]interface{}{ "network": cfg.Reva.Groups.GRPCNetwork, diff --git a/storage/pkg/flagset/groups.go b/storage/pkg/flagset/groups.go index 2ab099ed04..80c0b4e0cc 100644 --- a/storage/pkg/flagset/groups.go +++ b/storage/pkg/flagset/groups.go @@ -21,6 +21,16 @@ func GroupsWithConfig(cfg *config.Config) []cli.Flag { // Services + // Gateway + + &cli.StringFlag{ + Name: "gateway-url", + Value: flags.OverrideDefaultString(cfg.Reva.Gateway.Endpoint, "localhost:9142"), + Usage: "URL to use for the storage gateway service", + EnvVars: []string{"STORAGE_GATEWAY_ENDPOINT"}, + Destination: &cfg.Reva.Gateway.Endpoint, + }, + // Groupprovider &cli.StringFlag{ From 1dca2ae21924e8a9ebaaf509dde82d0eb6d279ba Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 30 Sep 2021 10:58:35 +0200 Subject: [PATCH 2/2] update go.sum --- go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.sum b/go.sum index da92ee0802..5380e499c7 100644 --- a/go.sum +++ b/go.sum @@ -291,6 +291,8 @@ github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= github.com/cs3org/go-cs3apis v0.0.0-20210922150613-cb9e3c99f8de h1:N+AI8wz7yhDDqHDuq9EGaqQoFhAOi9XW37xt0ormflw= github.com/cs3org/go-cs3apis v0.0.0-20210922150613-cb9e3c99f8de/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/reva v1.13.1-0.20210930071148-6823079c1702 h1:/z6evkFEnUOHg/1BaWGoaLmvd+zQIUn7SGZVn9aYtho= +github.com/cs3org/reva v1.13.1-0.20210930071148-6823079c1702/go.mod h1:fLBEUChifLlv/b2cmkOB5E4jeD7xvyXbD6yZ6G4va0s= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=