Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename micro services #27

Merged
merged 4 commits into from
Jan 16, 2025
Merged

Rename micro services #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caa3121
Remove all comments file
rhafer Jan 15, 2025
213e966
Rename go-micro services
rhafer Jan 15, 2025
a11de74
re-generate env_vars.yaml
rhafer Jan 15, 2025
0854735
fix github url in services/proxy/README.md
rhafer Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion deployments/examples/ocis_full/collabora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions deployments/examples/ocis_hello/config/ocis/proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
1,890 changes: 950 additions & 940 deletions docs/helpers/env_vars.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/config/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
61 changes: 0 additions & 61 deletions pkg/registry/register_test.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/shared/reva.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
)

var defaultRevaConfig = Reva{
Address: "com.owncloud.api.gateway",
Address: "eu.opencloud.api.gateway",
}

func DefaultRevaConfig() *Reva {
Expand Down
4 changes: 2 additions & 2 deletions services/activitylog/pkg/command/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion services/activitylog/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
4 changes: 2 additions & 2 deletions services/app-provider/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion services/app-registry/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion services/auth-app/pkg/command/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions services/auth-app/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{"*"},
Expand Down
2 changes: 1 addition & 1 deletion services/auth-basic/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion services/auth-bearer/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion services/auth-machine/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion services/auth-service/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions services/collaboration/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion services/eventhistory/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion services/frontend/pkg/command/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++ {
Expand Down
4 changes: 2 additions & 2 deletions services/frontend/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions services/gateway/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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.
28 changes: 14 additions & 14 deletions services/gateway/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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",
Expand Down
Loading
Loading