Merge pull request #27 from opencloud-eu/rename-micro-services

Rename micro services
opencloud-eu · Jan 16, 2025 · d25e5af · d25e5af
2 parents 6833ccc + 0854735
commit d25e5af
Show file tree

Hide file tree

Showing 81 changed files with 1,153 additions and 1,204 deletions.
diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml
@@ -34,17 +34,17 @@ policies:
         endpoint: /webdav/?preview=1
         backend: http://localhost:9115
       - endpoint: /remote.php/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /dav/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /webdav/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /status.php
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /index.php/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /apps/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /data
         backend: http://localhost:9140
       - endpoint: /app/

diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml
@@ -9,7 +9,7 @@ services:
   ocis:
     environment:
       # make collabora the secure view app
-      FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration.CollaboraOnline
+      FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: eu.opencloud.api.collaboration.CollaboraOnline
       GRAPH_AVAILABLE_ROLES: "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6"
 
   collaboration:

diff --git a/deployments/examples/ocis_hello/config/ocis/proxy.yaml b/deployments/examples/ocis_hello/config/ocis/proxy.yaml
@@ -34,17 +34,17 @@ policies:
         endpoint: /webdav/?preview=1
         backend: http://localhost:9115
       - endpoint: /remote.php/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /dav/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /webdav/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /status.php
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /index.php/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /apps/
-        service: com.owncloud.web.ocdav
+        service: eu.opencloud.web.ocdav
       - endpoint: /data
         backend: http://localhost:9140
       - endpoint: /app/

diff --git a/docs/helpers/env_vars.yaml b/docs/helpers/env_vars.yaml
diff --git a/pkg/config/defaultconfig.go b/pkg/config/defaultconfig.go
@@ -54,7 +54,7 @@ func DefaultConfig() *Config {
 			Host: "localhost",
 		},
 		Reva: &shared.Reva{
-			Address: "com.owncloud.api.gateway",
+			Address: "eu.opencloud.api.gateway",
 		},
 
 		Activitylog:       activitylog.DefaultConfig(),

diff --git a/pkg/registry/register_test.go b/pkg/registry/register_test.go
diff --git a/pkg/shared/reva.go b/pkg/shared/reva.go
@@ -5,7 +5,7 @@ import (
 )
 
 var defaultRevaConfig = Reva{
-	Address: "com.owncloud.api.gateway",
+	Address: "eu.opencloud.api.gateway",
 }
 
 func DefaultRevaConfig() *Reva {

diff --git a/services/activitylog/pkg/command/server.go b/services/activitylog/pkg/command/server.go
@@ -109,8 +109,8 @@ func Server(cfg *config.Config) *cli.Command {
 				return err
 			}
 
-			hClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", grpcClient)
-			vClient := settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
+			hClient := ehsvc.NewEventHistoryService("eu.opencloud.api.eventhistory", grpcClient)
+			vClient := settingssvc.NewValueService("eu.opencloud.api.settings", grpcClient)
 
 			{
 				svc, err := http.Server(

diff --git a/services/activitylog/pkg/config/defaults/defaultconfig.go b/services/activitylog/pkg/config/defaults/defaultconfig.go
@@ -42,7 +42,7 @@ func DefaultConfig() *config.Config {
 		HTTP: config.HTTP{
 			Addr:      "127.0.0.1:9195",
 			Root:      "/",
-			Namespace: "com.owncloud.web",
+			Namespace: "eu.opencloud.web",
 			CORS: config.CORS{
 				AllowedOrigins:   []string{"*"},
 				AllowedMethods:   []string{"GET"},

diff --git a/services/app-provider/pkg/config/defaults/defaultconfig.go b/services/app-provider/pkg/config/defaults/defaultconfig.go
@@ -25,14 +25,14 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9164",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		Service: config.Service{
 			Name: "app-provider",
 		},
 		Reva:         shared.DefaultRevaConfig(),
-		ExternalAddr: "com.owncloud.api.app-provider",
+		ExternalAddr: "eu.opencloud.api.app-provider",
 		Driver:       "",
 		Drivers: config.Drivers{
 			WOPI: config.WOPIDriver{

diff --git a/services/app-registry/pkg/config/defaults/defaultconfig.go b/services/app-registry/pkg/config/defaults/defaultconfig.go
@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9242",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		Service: config.Service{

diff --git a/services/auth-app/pkg/command/server.go b/services/auth-app/pkg/command/server.go
@@ -128,7 +128,7 @@ func Server(cfg *config.Config) *cli.Command {
 				return err
 			}
 
-			rClient := settingssvc.NewRoleService("com.owncloud.api.settings", grpcClient)
+			rClient := settingssvc.NewRoleService("eu.opencloud.api.settings", grpcClient)
 			server, err := http.Server(
 				http.Logger(logger),
 				http.Context(ctx),

diff --git a/services/auth-app/pkg/config/defaults/defaultconfig.go b/services/auth-app/pkg/config/defaults/defaultconfig.go
@@ -27,12 +27,12 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9246",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		HTTP: config.HTTP{
 			Addr:      "127.0.0.1:9247",
-			Namespace: "com.owncloud.web",
+			Namespace: "eu.opencloud.web",
 			Root:      "/",
 			CORS: config.CORS{
 				AllowedOrigins:   []string{"*"},

diff --git a/services/auth-basic/pkg/config/defaults/defaultconfig.go b/services/auth-basic/pkg/config/defaults/defaultconfig.go
@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9146",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		Service: config.Service{

diff --git a/services/auth-bearer/pkg/config/defaults/defaultconfig.go b/services/auth-bearer/pkg/config/defaults/defaultconfig.go
@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9148",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		Service: config.Service{

diff --git a/services/auth-machine/pkg/config/defaults/defaultconfig.go b/services/auth-machine/pkg/config/defaults/defaultconfig.go
@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9166",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		Service: config.Service{

diff --git a/services/auth-service/pkg/config/defaults/defaultconfig.go b/services/auth-service/pkg/config/defaults/defaultconfig.go
@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9199",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		Service: config.Service{

diff --git a/services/collaboration/pkg/config/defaults/defaultconfig.go b/services/collaboration/pkg/config/defaults/defaultconfig.go
@@ -43,11 +43,11 @@ func DefaultConfig() *config.Config {
 		GRPC: config.GRPC{
 			Addr:      "127.0.0.1:9301",
 			Protocol:  "tcp",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 		},
 		HTTP: config.HTTP{
 			Addr:      "127.0.0.1:9300",
-			Namespace: "com.owncloud.web",
+			Namespace: "eu.opencloud.web",
 		},
 		Debug: config.Debug{
 			Addr:   "127.0.0.1:9304",

diff --git a/services/eventhistory/pkg/config/defaults/defaultconfig.go b/services/eventhistory/pkg/config/defaults/defaultconfig.go
@@ -41,7 +41,7 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9274",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 		},
 	}
 }

diff --git a/services/frontend/pkg/command/events.go b/services/frontend/pkg/command/events.go
@@ -80,7 +80,7 @@ func ListenForEvents(ctx context.Context, cfg *config.Config, l log.Logger) erro
 		return err
 	}
 
-	valueService := settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
+	valueService := settingssvc.NewValueService("eu.opencloud.api.settings", grpcClient)
 
 	wg := sync.WaitGroup{}
 	for i := 0; i < cfg.MaxConcurrency; i++ {

diff --git a/services/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go
@@ -27,7 +27,7 @@ func DefaultConfig() *config.Config {
 		},
 		HTTP: config.HTTPConfig{
 			Addr:      "127.0.0.1:9140",
-			Namespace: "com.owncloud.web",
+			Namespace: "eu.opencloud.web",
 			Protocol:  "tcp",
 			Prefix:    "",
 			CORS: config.CORS{
@@ -94,7 +94,7 @@ func DefaultConfig() *config.Config {
 		},
 		AppHandler: config.AppHandler{
 			Prefix:            "app",
-			SecureViewAppAddr: "com.owncloud.api.collaboration",
+			SecureViewAppAddr: "eu.opencloud.api.collaboration",
 		},
 		Archiver: config.Archiver{
 			Insecure:    false,

diff --git a/services/gateway/README.md b/services/gateway/README.md
@@ -42,7 +42,7 @@ The scheme for this setup is the following. Note that there is, except storage,
 |------|------|------|
 | OC_GRPC_PROTOCOL or <br> `<service>`_GRPC_PROTOCOL | tcp | unix |
 | `<service>`_GRPC_ADDR | 127.0.0.1:`<port>` | /var/run/ocis/`<service>`.sock |
-| GATEWAY_`<service>`_ENDPOINT | com.owncloud.api.`<service>` | unix:/var/run/ocis/`<service>`.sock <br> dns: ... <br> kubernetes: ... |
+| GATEWAY_`<service>`_ENDPOINT | eu.opencloud.api.`<service>` | unix:/var/run/ocis/`<service>`.sock <br> dns: ... <br> kubernetes: ... |
 
 ```console
 USERS_GRPC_PROTOCOL=unix"
@@ -108,7 +108,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
 
 ```json
 {
-  "com.owncloud.api.storage-users": {
+  "eu.opencloud.api.storage-users": {
     "providerid": "{storage-users-mount-uuid}",
     "spaces": {
       "personal": {
@@ -121,7 +121,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
       }
     }
   },
-  "com.owncloud.api.storage-shares": {
+  "eu.opencloud.api.storage-shares": {
     "providerid": "a0ca6a90-a365-4782-871e-d44447bbc668",
     "spaces": {
       "virtual": {
@@ -136,7 +136,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
       }
     }
   },
-  "com.owncloud.api.storage-publiclink": {
+  "eu.opencloud.api.storage-publiclink": {
     "providerid": "7993447f-687f-490d-875c-ac95e89a62a4",
     "spaces": {
       "grant": {
@@ -148,7 +148,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
       }
     }
   },
-  "com.owncloud.api.ocm": {
+  "eu.opencloud.api.ocm": {
     "providerid": "89f37a33-858b-45fa-8890-a1f2b27d90e1",
     "spaces": {
       "grant": {
@@ -160,7 +160,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
       }
     }
   },
-  "com.owncloud.api.storage-hello": {
+  "eu.opencloud.api.storage-hello": {
     "providerid": "hello-storage-id",
     "spaces": {
       "project": {
@@ -172,4 +172,4 @@ In order to add another storage provider the CS3 storage registry that is runnin
 }
 ```
 
-In the above replace `{storage-users-mount-uuid}` with the mount UUID that was generated for the storage-users service. You can find it in the `config.yaml` generated on by `ocis init`. The last entry `com.owncloud.api.storage-hello` and its `providerid` `"hello-storage-id"` are an example for in additional storage provider, in this case running `hellofs`, an example minimal storage driver.
+In the above replace `{storage-users-mount-uuid}` with the mount UUID that was generated for the storage-users service. You can find it in the `config.yaml` generated on by `ocis init`. The last entry `eu.opencloud.api.storage-hello` and its `providerid` `"hello-storage-id"` are an example for in additional storage provider, in this case running `hellofs`, an example minimal storage driver.
diff --git a/services/gateway/pkg/config/defaults/defaultconfig.go b/services/gateway/pkg/config/defaults/defaultconfig.go
@@ -27,7 +27,7 @@ func DefaultConfig() *config.Config {
 		},
 		GRPC: config.GRPCConfig{
 			Addr:      "127.0.0.1:9142",
-			Namespace: "com.owncloud.api",
+			Namespace: "eu.opencloud.api",
 			Protocol:  "tcp",
 		},
 		Service: config.Service{
@@ -51,19 +51,19 @@ func DefaultConfig() *config.Config {
 
 		FrontendPublicURL: "https://localhost:9200",
 
-		AppRegistryEndpoint:       "com.owncloud.api.app-registry",
-		AuthAppEndpoint:           "com.owncloud.api.auth-app",
-		AuthBasicEndpoint:         "com.owncloud.api.auth-basic",
-		AuthMachineEndpoint:       "com.owncloud.api.auth-machine",
-		AuthServiceEndpoint:       "com.owncloud.api.auth-service",
-		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",
-		OCMEndpoint:               "com.owncloud.api.ocm",
+		AppRegistryEndpoint:       "eu.opencloud.api.app-registry",
+		AuthAppEndpoint:           "eu.opencloud.api.auth-app",
+		AuthBasicEndpoint:         "eu.opencloud.api.auth-basic",
+		AuthMachineEndpoint:       "eu.opencloud.api.auth-machine",
+		AuthServiceEndpoint:       "eu.opencloud.api.auth-service",
+		GroupsEndpoint:            "eu.opencloud.api.groups",
+		PermissionsEndpoint:       "eu.opencloud.api.settings",
+		SharingEndpoint:           "eu.opencloud.api.sharing",
+		StoragePublicLinkEndpoint: "eu.opencloud.api.storage-publiclink",
+		StorageSharesEndpoint:     "eu.opencloud.api.storage-shares",
+		StorageUsersEndpoint:      "eu.opencloud.api.storage-users",
+		UsersEndpoint:             "eu.opencloud.api.users",
+		OCMEndpoint:               "eu.opencloud.api.ocm",
 
 		StorageRegistry: config.StorageRegistry{
 			Driver: "spaces",