From 1b0e46356202af54344b117079a10d66798ce09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 17 Jan 2025 11:50:39 +0100 Subject: [PATCH] users MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/users/pkg/command/root.go | 4 ++-- services/users/pkg/command/server.go | 2 +- services/users/pkg/config/config.go | 4 ++-- services/users/pkg/revaconfig/config.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/users/pkg/command/root.go b/services/users/pkg/command/root.go index 4b4143bc8..ee8af27d5 100644 --- a/services/users/pkg/command/root.go +++ b/services/users/pkg/command/root.go @@ -22,11 +22,11 @@ func GetCommands(cfg *config.Config) cli.Commands { } } -// Execute is the entry point for the ocis-user command. +// Execute is the entry point for the opencloud-user command. func Execute(cfg *config.Config) error { app := clihelper.DefaultApp(&cli.App{ Name: "user", - Usage: "Provide users for oCIS", + Usage: "Provide users for OpenCloud", Commands: GetCommands(cfg), }) diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go index e71e14d9c..919a7de3e 100644 --- a/services/users/pkg/command/server.go +++ b/services/users/pkg/command/server.go @@ -42,7 +42,7 @@ func Server(cfg *config.Config) *cli.Command { defer cancel() - // the reva runtime calls os.Exit in the case of a failure and there is no way for the oCIS + // the reva runtime calls os.Exit in the case of a failure and there is no way for the OpenCloud // runtime to catch it and restart a reva service. Therefore we need to ensure the service has // everything it needs, before starting the service. // In this case: CA certificates diff --git a/services/users/pkg/config/config.go b/services/users/pkg/config/config.go index bc3e8b846..2b5695cc2 100644 --- a/services/users/pkg/config/config.go +++ b/services/users/pkg/config/config.go @@ -54,8 +54,8 @@ type Drivers struct { LDAP LDAPDriver `yaml:"ldap"` OwnCloudSQL OwnCloudSQLDriver `yaml:"owncloudsql"` - JSON JSONDriver `yaml:"json,omitempty"` // not supported by the oCIS product, therefore not part of docs - REST RESTProvider `yaml:"rest,omitempty"` // not supported by the oCIS product, therefore not part of docs + JSON JSONDriver `yaml:"json,omitempty"` // not supported by the OpenCloud product, therefore not part of docs + REST RESTProvider `yaml:"rest,omitempty"` // not supported by the OpenCloud product, therefore not part of docs } type JSONDriver struct { diff --git a/services/users/pkg/revaconfig/config.go b/services/users/pkg/revaconfig/config.go index a70aff768..8f72b2e78 100644 --- a/services/users/pkg/revaconfig/config.go +++ b/services/users/pkg/revaconfig/config.go @@ -4,7 +4,7 @@ import ( "github.com/opencloud-eu/opencloud/services/users/pkg/config" ) -// UsersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. +// UsersConfigFromStruct will adapt an OpenCloud config struct into a reva mapstructure to start a reva service. func UsersConfigFromStruct(cfg *config.Config) map[string]interface{} { rcfg := map[string]interface{}{ "shared": map[string]interface{}{