[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/gateway/pkg/command/server.go

@@ -10,7 +10,7 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
+	"github.com/owncloud/ocis/v2/ocis-pkg/registry"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 	"github.com/owncloud/ocis/v2/services/gateway/pkg/config"
 	"github.com/owncloud/ocis/v2/services/gateway/pkg/config/parser"
@@ -41,12 +41,16 @@ func Server(cfg *config.Config) *cli.Command {
 
 			defer cancel()
 
-			pidFile := path.Join(os.TempDir(), "revad-"+cfg.Service.Name+"-"+uuid.Must(uuid.NewV4()).String()+".pid")
-
-			rcfg := revaconfig.GatewayConfigFromStruct(cfg, logger)
-
 			gr.Add(func() error {
-				runtime.RunWithOptions(rcfg, pidFile, runtime.WithLogger(&logger.Logger))
+				pidFile := path.Join(os.TempDir(), "revad-"+cfg.Service.Name+"-"+uuid.Must(uuid.NewV4()).String()+".pid")
+				rCfg := revaconfig.GatewayConfigFromStruct(cfg, logger)
+				reg := registry.GetRegistry()
+
+				runtime.RunWithOptions(rCfg, pidFile,
+					runtime.WithLogger(&logger.Logger),
+					runtime.WithRegistry(reg),
+				)
+
 				return nil
 			}, func(err error) {
 				logger.Error().
@@ -72,15 +76,9 @@ func Server(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if err := external.RegisterGRPCEndpoint(
-				ctx,
-				cfg.GRPC.Namespace+"."+cfg.Service.Name,
-				uuid.Must(uuid.NewV4()).String(),
-				cfg.GRPC.Addr,
-				version.GetString(),
-				logger,
-			); err != nil {
-				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")
+			grpcSvc := registry.BuildGRPCService(cfg.GRPC.Namespace+"."+cfg.Service.Name, uuid.Must(uuid.NewV4()).String(), cfg.GRPC.Addr, version.GetString())
+			if err := registry.RegisterService(ctx, grpcSvc, logger); err != nil {
+				logger.Fatal().Err(err).Msg("failed to register the grpc service")
 			}
 
 			return gr.Run()

services/gateway/pkg/config/defaults/defaultconfig.go

@@ -52,16 +52,16 @@ func DefaultConfig() *config.Config {
 
 		FrontendPublicURL: "https://localhost:9200",
 
-		AppRegistryEndpoint:       "localhost:9242",
-		AuthBasicEndpoint:         "localhost:9146",
-		AuthMachineEndpoint:       "localhost:9166",
-		GroupsEndpoint:            "localhost:9160",
-		PermissionsEndpoint:       "localhost:9191",
-		SharingEndpoint:           "localhost:9150",
-		StoragePublicLinkEndpoint: "localhost:9178",
-		StorageSharesEndpoint:     "localhost:9154",
-		StorageUsersEndpoint:      "localhost:9157",
-		UsersEndpoint:             "localhost:9144",
+		AppRegistryEndpoint:       "com.owncloud.api.app-registry",
+		AuthBasicEndpoint:         "com.owncloud.api.auth-basic",
+		AuthMachineEndpoint:       "com.owncloud.api.auth-machine",
+		GroupsEndpoint:            "com.owncloud.api.groups",
+		PermissionsEndpoint:       "com.owncloud.api.settings",
+		SharingEndpoint:           "com.owncloud.api.sharing",
+		StoragePublicLinkEndpoint: "com.owncloud.api.storage-publiclink",
+		StorageSharesEndpoint:     "com.owncloud.api.storage-shares",
+		StorageUsersEndpoint:      "com.owncloud.api.storage-users",
+		UsersEndpoint:             "com.owncloud.api.users",
 
 		StorageRegistry: config.StorageRegistry{
 			Driver: "spaces",

services/gateway/pkg/revaconfig/config.go

@@ -6,9 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/owncloud/ocis/v2/ocis-pkg/log"
-
 	"github.com/cs3org/reva/v2/pkg/utils"
+	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"github.com/owncloud/ocis/v2/services/gateway/pkg/config"
 )