Merge branch 'fix-compile-time-options' into fix-deployment-examples

owncloud · May 5, 2022 · bba70c5 · bba70c5
2 parents bd83771 + 9e22484
commit bba70c5
Show file tree

Hide file tree

Showing 48 changed files with 113 additions and 113 deletions.
diff --git a/.drone.star b/.drone.star
@@ -55,7 +55,7 @@ config = {
         "extensions/glauth",
         "extensions/graph-explorer",
         "extensions/graph",
-        "extensions/group",
+        "extensions/groups",
         "extensions/idm",
         "extensions/idp",
         "extensions/nats",
@@ -71,7 +71,7 @@ config = {
         "extensions/storage-users",
         "extensions/store",
         "extensions/thumbnails",
-        "extensions/user",
+        "extensions/users",
         "extensions/web",
         "extensions/webdav",
         "ocis-pkg",
@@ -1721,7 +1721,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             "SHARING_USER_OWNCLOUDSQL_DB_NAME": "owncloud",
             # General oCIS config
             # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
-            "OCIS_RUN_EXTENSIONS": "settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats,ocdav",
+            "OCIS_RUN_EXTENSIONS": "settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats,ocdav",
             "OCIS_LOG_LEVEL": "info",
             "OCIS_URL": OCIS_URL,
             "OCIS_BASE_DATA_PATH": "/mnt/data/ocis",

diff --git a/.make/go.mk b/.make/go.mk
@@ -1,4 +1,4 @@
-OCIS_REPO := github.com/owncloud/ocis
+OCIS_REPO := github.com/owncloud/ocis/v2
 IMPORT := ($OCIS_REPO)/$(NAME)
 BIN := bin
 DIST := dist

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -22,7 +22,7 @@
                 // demo users
                 "IDM_CREATE_DEMO_USERS": "true",
                 // OCIS_RUN_EXTENSIONS allows to start a subset of extensions even in the supervised mode
-                //"OCIS_RUN_EXTENSIONS": "settings,storage-system,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,accounts,proxy,ocdav",
+                //"OCIS_RUN_EXTENSIONS": "settings,storage-system,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,accounts,proxy,ocdav",
 
                 /*
                  * Keep secrets and passwords in one block to allow easy uncommenting

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ OCIS_MODULES = \
 	extensions/glauth \
 	extensions/graph \
 	extensions/graph-explorer \
-	extensions/group \
+	extensions/groups \
 	extensions/idm \
 	extensions/idp \
 	extensions/nats \
@@ -44,7 +44,7 @@ OCIS_MODULES = \
 	extensions/storage-users \
 	extensions/store \
 	extensions/thumbnails \
-	extensions/user \
+	extensions/users \
 	extensions/web \
 	extensions/webdav\
 	ocis \

diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
@@ -108,7 +108,7 @@ services:
       OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
       # General oCIS config
       # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
-      OCIS_RUN_EXTENSIONS: settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,app-provider,storage-sharing,proxy,nats
+      OCIS_RUN_EXTENSIONS: settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
       OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test}
       PROXY_TLS: "false" # do not use SSL between Traefik and oCIS

diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml
@@ -589,22 +589,22 @@ services:
       driver: "local"
     restart: always
 
-  storage-userprovider:
+  users:
     image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
     deploy:
       replicas: ${OCIS_SCALE:-1}
     networks:
       ocis-net:
     entrypoint:
       - ocis
-      - storage-userprovider
+      - users
       - server
     environment:
       OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
       OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
       OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
 
-      STORAGE_USERPROVIDER_ENDPOINT: storage-userprovider:9144
+      STORAGE_USERPROVIDER_ENDPOINT: users:9144
       STORAGE_USERPROVIDER_ADDR: 0.0.0.0:9144
 
       STORAGE_USERPROVIDER_DRIVER: ldap
@@ -619,22 +619,22 @@ services:
       driver: "local"
     restart: always
 
-  storage-groupprovider:
+  groups:
     image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
     deploy:
       replicas: ${OCIS_SCALE:-1}
     networks:
       ocis-net:
     entrypoint:
       - ocis
-      - storage-groupprovider
+      - groups
       - server
     environment:
       OCIS_LOG_LEVEL: "${OCIS_LOG_LEVEL:-error}"
       OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
       OCIS_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}"
 
-      STORAGE_GROUPPROVIDER_ENDPOINT: storage-groupprovider:9160
+      STORAGE_GROUPPROVIDER_ENDPOINT: groups:9160
       STORAGE_GROUPPROVIDER_ADDR: 0.0.0.0:9160
 
       STORAGE_GROUPPROVIDER_DRIVER: ldap
@@ -708,10 +708,10 @@ services:
       STORAGE_AUTH_MACHINE_ENDPOINT: storage-authmachine:9148
 
       STORAGE_SHARES_ENDPOINT: storage-shares:9154
-      STORAGE_SHARING_ENDPOINT: storage-sharing:9150
+      STORAGE_SHARING_ENDPOINT: sharing:9150
 
-      STORAGE_GROUPPROVIDER_ENDPOINT: storage-groupprovider:9160
-      STORAGE_USERPROVIDER_ENDPOINT: storage-userprovider:9144
+      STORAGE_GROUPPROVIDER_ENDPOINT: groups:9160
+      STORAGE_USERPROVIDER_ENDPOINT: users:9144
       STORAGE_PERMISSIONS_ENDPOINT: settings:9191
 
       STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}

diff --git a/...oyments/examples/ocis_individual_services/monitoring_tracing/docker-compose-additions.yml b/...oyments/examples/ocis_individual_services/monitoring_tracing/docker-compose-additions.yml
@@ -163,15 +163,15 @@ services:
       OCIS_TRACING_ENDPOINT: jaeger-agent:6831
       # metrics
       STORAGE_SHARING_DEBUG_ADDR: 0.0.0.0:9151
-  storage-userprovider:
+  users:
     environment:
       # tracing
       OCIS_TRACING_ENABLED: "true"
       OCIS_TRACING_TYPE: jaeger
       OCIS_TRACING_ENDPOINT: jaeger-agent:6831
       # metrics
       STORAGE_USERPROVIDER_DEBUG_ADDR: 0.0.0.0:9145
-  storage-groupprovider:
+  groups:
     environment:
       # tracing
       OCIS_TRACING_ENABLED: "true"

diff --git a/docs/extensions/group/_index.md → docs/extensions/groups/_index.md b/docs/extensions/group/_index.md → docs/extensions/groups/_index.md
@@ -3,7 +3,7 @@ title: Group
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/group
+geekdocEditPath: edit/master/docs/extensions/groups
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

diff --git a/docs/extensions/user/configuration.md → docs/extensions/groups/configuration.md b/docs/extensions/user/configuration.md → docs/extensions/groups/configuration.md
@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/user
+geekdocEditPath: edit/master/docs/extensions/groups
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/user-config-example.yaml"  language="yaml" >}}
+{{< include file="extensions/_includes/groups-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/user_configvars.md" >}}
+{{< include file="extensions/_includes/groups_configvars.md" >}}
diff --git a/docs/extensions/storage/ports.md b/docs/extensions/storage/ports.md
@@ -34,8 +34,8 @@ For now, the storage service uses these ports to preconfigure those services:
 | 9159      | storage users debug                           |
 | 9160      | groups                                        |
 | 9161      | groups debug                                  |
-| 9164      | storage app-provider                           |
-| 9165      | storage app-provider debug                     |
+| 9164      | storage app-provider                          |
+| 9165      | storage app-provider debug                    |
 | 9178      | storage public link                           |
 | 9179      | storage public link data                      |
 | 9180      | accounts grpc                                 |

diff --git a/docs/extensions/user/_index.md → docs/extensions/users/_index.md b/docs/extensions/user/_index.md → docs/extensions/users/_index.md
@@ -3,7 +3,7 @@ title: User
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/user
+geekdocEditPath: edit/master/docs/extensions/users
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

diff --git a/docs/extensions/group/configuration.md → docs/extensions/users/configuration.md b/docs/extensions/group/configuration.md → docs/extensions/users/configuration.md
@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/group
+geekdocEditPath: edit/master/docs/extensions/users
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/group-config-example.yaml"  language="yaml" >}}
+{{< include file="extensions/_includes/users-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/group_configvars.md" >}}
+{{< include file="extensions/_includes/users_configvars.md" >}}
diff --git a/extensions/user/Makefile → extensions/groups/Makefile b/extensions/user/Makefile → extensions/groups/Makefile
@@ -1,5 +1,5 @@
 SHELL := bash
-NAME := user
+NAME := groups
 
 include ../../.make/recursion.mk
 

diff --git a/extensions/user/cmd/user/main.go → extensions/groups/cmd/groups/main.go b/extensions/user/cmd/user/main.go → extensions/groups/cmd/groups/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/command"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/defaults"
 )
 
 func main() {

diff --git a/extensions/user/pkg/command/health.go → extensions/groups/pkg/command/health.go b/extensions/user/pkg/command/health.go → extensions/groups/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 

diff --git a/extensions/group/pkg/command/root.go → extensions/groups/pkg/command/root.go b/extensions/group/pkg/command/root.go → extensions/groups/pkg/command/root.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"
@@ -48,9 +48,9 @@ type SutureService struct {
 
 // NewSutureService creates a new group.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Group.Commons = cfg.Commons
+	cfg.Groups.Commons = cfg.Commons
 	return SutureService{
-		cfg: cfg.Group,
+		cfg: cfg.Groups,
 	}
 }
 

diff --git a/extensions/group/pkg/command/server.go → extensions/groups/pkg/command/server.go b/extensions/group/pkg/command/server.go → extensions/groups/pkg/command/server.go
@@ -9,12 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/logging"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/revaconfig"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/server/debug"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/tracing"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/revaconfig"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/server/debug"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/tracing"
 	"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
 	"github.com/owncloud/ocis/v2/ocis-pkg/sync"

diff --git a/extensions/group/pkg/command/version.go → extensions/groups/pkg/command/version.go b/extensions/group/pkg/command/version.go → extensions/groups/pkg/command/version.go
@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

diff --git a/extensions/group/pkg/config/config.go → extensions/groups/pkg/config/config.go b/extensions/group/pkg/config/config.go → extensions/groups/pkg/config/config.go
diff --git a/...roup/pkg/config/defaults/defaultconfig.go → ...oups/pkg/config/defaults/defaultconfig.go b/...roup/pkg/config/defaults/defaultconfig.go → ...oups/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,7 @@ package defaults
 import (
 	"path/filepath"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
 )
 
@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
 			Protocol:  "tcp",
 		},
 		Service: config.Service{
-			Name: "group",
+			Name: "groups",
 		},
 		GroupMembersCacheExpiration: 5,
 		Reva: &config.Reva{

diff --git a/extensions/group/pkg/config/parser/parse.go → extensions/groups/pkg/config/parser/parse.go b/extensions/group/pkg/config/parser/parse.go → extensions/groups/pkg/config/parser/parse.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 

diff --git a/extensions/group/pkg/config/reva.go → extensions/groups/pkg/config/reva.go b/extensions/group/pkg/config/reva.go → extensions/groups/pkg/config/reva.go
diff --git a/extensions/group/pkg/logging/logging.go → extensions/groups/pkg/logging/logging.go b/extensions/group/pkg/logging/logging.go → extensions/groups/pkg/logging/logging.go
@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 

diff --git a/extensions/group/pkg/revaconfig/config.go → extensions/groups/pkg/revaconfig/config.go b/extensions/group/pkg/revaconfig/config.go → extensions/groups/pkg/revaconfig/config.go
@@ -1,7 +1,7 @@
 package revaconfig
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 )
 
 // GroupsConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.

diff --git a/extensions/group/pkg/server/debug/option.go → extensions/groups/pkg/server/debug/option.go b/extensions/group/pkg/server/debug/option.go → extensions/groups/pkg/server/debug/option.go
@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 

diff --git a/extensions/user/pkg/server/debug/server.go → extensions/groups/pkg/server/debug/server.go b/extensions/user/pkg/server/debug/server.go → extensions/groups/pkg/server/debug/server.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 )

diff --git a/extensions/user/pkg/tracing/tracing.go → extensions/groups/pkg/tracing/tracing.go b/extensions/user/pkg/tracing/tracing.go → extensions/groups/pkg/tracing/tracing.go
@@ -1,7 +1,7 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
 	"go.opentelemetry.io/otel/trace"

diff --git a/extensions/group/Makefile → extensions/users/Makefile b/extensions/group/Makefile → extensions/users/Makefile
@@ -1,5 +1,5 @@
 SHELL := bash
-NAME := group
+NAME := users
 
 include ../../.make/recursion.mk
 

diff --git a/extensions/group/cmd/group/main.go → extensions/users/cmd/user/main.go b/extensions/group/cmd/group/main.go → extensions/users/cmd/user/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/command"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/defaults"
 )
 
 func main() {