Fixes registration and naming of services (cs3org#4287)

* removed unused code + fix ocm http service name * register sql preference's driver * add changelog * fix ocm http service name * renamed ocm service in integration tests
gmgigi96 · Oct 26, 2023 · 9eab1e6 · 9eab1e6
1 parent d38ed8b
commit 9eab1e6
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 1,240 deletions.
diff --git a/changelog/unreleased/public-share-owner.md b/changelog/unreleased/public-share-owner.md
@@ -0,0 +1,3 @@
+Bugfix: Fixes registration and naming of services
+
+https://github.com/cs3org/reva/pull/4287
diff --git a/internal/http/services/ocmd/ocm.go b/internal/http/services/ocmd/ocm.go
@@ -30,7 +30,7 @@ import (
 )
 
 func init() {
-	global.Register("ocmd", New)
+	global.Register("ocm", New)
 }
 
 type config struct {

diff --git a/pkg/preferences/loader/loader.go b/pkg/preferences/loader/loader.go
@@ -21,5 +21,6 @@ package loader
 import (
 	// Load preferences drivers.
 	_ "github.com/cs3org/reva/pkg/preferences/memory"
+	_ "github.com/cs3org/reva/pkg/preferences/sql"
 	// Add your own here.
 )
diff --git a/pkg/share/manager/loader/loader.go b/pkg/share/manager/loader/loader.go
@@ -22,6 +22,5 @@ import (
 	// Load core share manager drivers.
 	_ "github.com/cs3org/reva/pkg/share/manager/json"
 	_ "github.com/cs3org/reva/pkg/share/manager/memory"
-	_ "github.com/cs3org/reva/pkg/share/manager/sql"
 	// Add your own here.
 )
diff --git a/pkg/share/manager/sql/conversions.go b/pkg/share/manager/sql/conversions.go
diff --git a/pkg/share/manager/sql/mocks/UserConverter.go b/pkg/share/manager/sql/mocks/UserConverter.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Bugfix: Fixes registration and naming of services

		https://github.com/cs3org/reva/pull/4287