fix: unit tests

internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go

@@ -53,8 +53,9 @@ var (
 var _ = Describe("Sharesstorageprovider", func() {
 	var (
 		config = map[string]interface{}{
-			"gateway_addr": "127.0.0.1:1234",
-			"driver":       "json",
+			"gateway_addr":         "127.0.0.1:1234",
+			"driver":               "json",
+			"usershareprovidersvc": "any",
 			"drivers": map[string]map[string]interface{}{
 				"json": {},
 			},

pkg/rgrpc/todo/pool/selector.go

@@ -81,28 +81,28 @@ func (s *Selector[T]) Next(opts ...Option) (T, error) {
 		registry: registry.GetRegistry(),
 	}
 
-	// first use selector options
-	for _, opt := range s.options {
-		opt(&options)
-	}
+	allOpts := append([]Option{}, s.options...)
+	allOpts = append(allOpts, opts...)
 
-	// then overwrite with supplied
-	for _, opt := range opts {
+	for _, opt := range allOpts {
 		opt(&options)
 	}
 
-	services, _ := options.registry.GetService(s.id)
-	address, err := registry.GetNodeAddress(services)
-	if err != nil || address == "" {
-		address = s.id
+	address := s.id
+	if options.registry != nil {
+		services, _ := options.registry.GetService(s.id)
+		nodeAddress, err := registry.GetNodeAddress(services)
+		if err == nil && nodeAddress != "" {
+			address = nodeAddress
+		}
 	}
 
 	existingClient, ok := s.clientMap.Load(address)
 	if ok {
 		return existingClient.(T), nil
 	}
 
-	conn, err := NewConn(address, append(s.options, opts...)...)
+	conn, err := NewConn(address, allOpts...)
 	if err != nil {
 		return *new(T), errors.Wrap(err, fmt.Sprintf("could not create connection for %s to %s", s.id, address))
 	}

pkg/storage/fs/ocis/ocis_test.go

@@ -39,9 +39,10 @@ var _ = Describe("Ocis", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		options = map[string]interface{}{
-			"root":         tmpRoot,
-			"enable_home":  true,
-			"share_folder": "/Shares",
+			"root":           tmpRoot,
+			"enable_home":    true,
+			"share_folder":   "/Shares",
+			"permissionssvc": "any",
 		}
 	})
 

pkg/storage/fs/s3ng/s3ng_test.go

@@ -39,14 +39,15 @@ var _ = Describe("S3ng", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		options = map[string]interface{}{
-			"root":          tmpRoot,
-			"enable_home":   true,
-			"share_folder":  "/Shares",
-			"s3.endpoint":   "http://1.2.3.4:5000",
-			"s3.region":     "default",
-			"s3.bucket":     "the-bucket",
-			"s3.access_key": "foo",
-			"s3.secret_key": "bar",
+			"root":           tmpRoot,
+			"enable_home":    true,
+			"share_folder":   "/Shares",
+			"permissionssvc": "any",
+			"s3.endpoint":    "http://1.2.3.4:5000",
+			"s3.region":      "default",
+			"s3.bucket":      "the-bucket",
+			"s3.access_key":  "foo",
+			"s3.secret_key":  "bar",
 		}
 	})
 

pkg/storage/utils/decomposedfs/decomposedfs_test.go

@@ -59,7 +59,8 @@ var _ = Describe("Decomposed", func() {
 		It("works", func() {
 			bs := &treemocks.Blobstore{}
 			_, err := decomposedfs.NewDefault(map[string]interface{}{
-				"root": env.Root,
+				"root":           env.Root,
+				"permissionssvc": "any",
 			}, bs, nil)
 			Expect(err).ToNot(HaveOccurred())
 		})