[full-ci] enhancement: use reva client pool selectors (#6452)

* enhancement: use reva client pool selectors

register mock service to registry and pass tests

* enhancement: bump reva

* Fix a couple of linter issues

---------

Co-authored-by: Ralf Haferkamp <rhaferkamp@owncloud.com>

services/thumbnails/pkg/service/grpc/v0/option.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
-
+	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"github.com/owncloud/ocis/v2/services/thumbnails/pkg/config"
 	"github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail/imgsource"
@@ -22,7 +22,7 @@ type Options struct {
 	ThumbnailStorage storage.Storage
 	ImageSource      imgsource.Source
 	CS3Source        imgsource.Source
-	CS3Client        gateway.GatewayAPIClient
+	GatewaySelector  pool.Selectable[gateway.GatewayAPIClient]
 }
 
 // newOptions initializes the available default options.
@@ -71,14 +71,16 @@ func ThumbnailSource(val imgsource.Source) Option {
 	}
 }
 
+// CS3Source provides a function to set the CS3Source option
 func CS3Source(val imgsource.Source) Option {
 	return func(o *Options) {
 		o.CS3Source = val
 	}
 }
 
-func CS3Client(c gateway.GatewayAPIClient) Option {
+// GatewaySelector adds a grpc client selector for the gateway service
+func GatewaySelector(val pool.Selectable[gateway.GatewayAPIClient]) Option {
 	return func(o *Options) {
-		o.CS3Client = c
+		o.GatewaySelector = val
 	}
 }

services/thumbnails/pkg/service/grpc/v0/service.go

@@ -12,6 +12,7 @@ import (
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	revactx "github.com/cs3org/reva/v2/pkg/ctx"
+	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
 	"github.com/cs3org/reva/v2/pkg/storagespace"
 	"github.com/cs3org/reva/v2/pkg/utils"
 	"github.com/golang-jwt/jwt/v4"
@@ -45,7 +46,7 @@ func NewService(opts ...Option) decorators.DecoratedService {
 		webdavSource: options.ImageSource,
 		cs3Source:    options.CS3Source,
 		logger:       logger,
-		cs3Client:    options.CS3Client,
+		selector:     options.GatewaySelector,
 		preprocessorOpts: PreprocessorOpts{
 			TxtFontFileMap: options.Config.Thumbnail.FontMapFile,
 		},
@@ -65,10 +66,11 @@ type Thumbnail struct {
 	webdavSource     imgsource.Source
 	cs3Source        imgsource.Source
 	logger           log.Logger
-	cs3Client        gateway.GatewayAPIClient
+	selector         pool.Selectable[gateway.GatewayAPIClient]
 	preprocessorOpts PreprocessorOpts
 }
 
+// PreprocessorOpts holds the options for the preprocessor
 type PreprocessorOpts struct {
 	TxtFontFileMap string
 }
@@ -161,21 +163,24 @@ func (g Thumbnail) handleWebdavSource(ctx context.Context, req *thumbnailssvc.Ge
 	}
 
 	var auth, statPath string
-
 	if src.IsPublicLink {
 		q := imgURL.Query()
 		var rsp *gateway.AuthenticateResponse
+		client, err := g.selector.Next()
+		if err != nil {
+			return "", merrors.InternalServerError(g.serviceID, "could not select next gateway client: %s", err.Error())
+		}
 		if q.Get("signature") != "" && q.Get("expiration") != "" {
 			// Handle pre-signed public links
 			sig := q.Get("signature")
 			exp := q.Get("expiration")
-			rsp, err = g.cs3Client.Authenticate(ctx, &gateway.AuthenticateRequest{
+			rsp, err = client.Authenticate(ctx, &gateway.AuthenticateRequest{
 				Type:         "publicshares",
 				ClientId:     src.PublicLinkToken,
 				ClientSecret: strings.Join([]string{"signature", sig, exp}, "|"),
 			})
 		} else {
-			rsp, err = g.cs3Client.Authenticate(ctx, &gateway.AuthenticateRequest{
+			rsp, err = client.Authenticate(ctx, &gateway.AuthenticateRequest{
 				Type:     "publicshares",
 				ClientId: src.PublicLinkToken,
 				// We pass an empty password because we expect non pre-signed public links
@@ -248,8 +253,12 @@ func (g Thumbnail) stat(path, auth string) (*provider.StatResponse, error) {
 		}
 	}
 
+	client, err := g.selector.Next()
+	if err != nil {
+		return nil, merrors.InternalServerError(g.serviceID, "could not select next gateway client: %s", err.Error())
+	}
 	req := &provider.StatRequest{Ref: &ref}
-	rsp, err := g.cs3Client.Stat(ctx, req)
+	rsp, err := client.Stat(ctx, req)
 	if err != nil {
 		g.logger.Error().Err(err).Str("path", path).Msg("could not stat file")
 		return nil, merrors.InternalServerError(g.serviceID, "could not stat file: %s", err.Error())