From 56026686346f42d4a7b9e12cc04b287bbb3497bd Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 3 Nov 2022 12:31:57 +0100 Subject: [PATCH] Add the missing auth providers to AUTH_BASIC_AUTH_PROVIDER description (#4923) * Add the missing auth providers to AUTH_BASIC_AUTH_PROVIDER description * fix strings on more locations * WOPIDriver * Apply suggestions from code review * Update services/users/pkg/config/config.go --- services/app-provider/pkg/config/config.go | 2 +- services/auth-basic/pkg/config/config.go | 2 +- services/groups/pkg/config/config.go | 2 +- services/users/pkg/config/config.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/app-provider/pkg/config/config.go b/services/app-provider/pkg/config/config.go index 66e6003e3..15681f07e 100644 --- a/services/app-provider/pkg/config/config.go +++ b/services/app-provider/pkg/config/config.go @@ -59,7 +59,7 @@ type GRPCConfig struct { } type Drivers struct { - WOPI WOPIDriver `yaml:"wopi" desc:"driver for the CS3org WOPI server"` + WOPI WOPIDriver `yaml:"wopi" desc:"Driver for the CS3org WOPI server"` } type WOPIDriver struct { diff --git a/services/auth-basic/pkg/config/config.go b/services/auth-basic/pkg/config/config.go index d9ed81ebb..e3c277443 100644 --- a/services/auth-basic/pkg/config/config.go +++ b/services/auth-basic/pkg/config/config.go @@ -19,7 +19,7 @@ type Config struct { Reva *shared.Reva `yaml:"reva"` SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"AUTH_BASIC_SKIP_USER_GROUPS_IN_TOKEN" desc:"Disables the encoding of the user's group memberships in the reva access token. This reduces the token size, especially when users are members of a large number of groups."` - AuthProvider string `yaml:"auth_provider" env:"AUTH_BASIC_AUTH_PROVIDER" desc:"The auth provider which should be used by the service like 'ldap'."` + AuthProvider string `yaml:"auth_provider" env:"AUTH_BASIC_AUTH_PROVIDER" desc:"The authentication provider to check if credentials are valid. Supported values are 'ldap' and 'owncloudsql'."` AuthProviders AuthProviders `yaml:"auth_providers"` Supervised bool `yaml:"-"` diff --git a/services/groups/pkg/config/config.go b/services/groups/pkg/config/config.go index ee6a903a6..7b4417e09 100644 --- a/services/groups/pkg/config/config.go +++ b/services/groups/pkg/config/config.go @@ -20,7 +20,7 @@ type Config struct { SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"GROUPS_SKIP_USER_GROUPS_IN_TOKEN" desc:"Disables the loading of user's group memberships from the reva access token."` - Driver string `yaml:"driver" desc:"The driver which should be used by the groups service like 'ldap'."` + Driver string `yaml:"driver" env:"GROUPS_DRIVER" desc:"The driver which should be used by the groups service. Supported values are 'ldap' and 'owncloudsql'."` Drivers Drivers `yaml:"drivers"` Supervised bool `yaml:"-"` diff --git a/services/users/pkg/config/config.go b/services/users/pkg/config/config.go index f109c4373..859112437 100644 --- a/services/users/pkg/config/config.go +++ b/services/users/pkg/config/config.go @@ -20,7 +20,7 @@ type Config struct { SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"USERS_SKIP_USER_GROUPS_IN_TOKEN" desc:"Disables the loading of user's group memberships from the reva access token."` - Driver string `yaml:"driver" env:"USERS_DRIVER" desc:"The user driver which should be used by the users service. Supported values are 'ldap', 'owncloudsql', 'json' and 'rest'."` + Driver string `yaml:"driver" env:"USERS_DRIVER" desc:"The driver which should be used by the users service. Supported values are 'ldap' and 'owncloudsql'."` Drivers Drivers `yaml:"drivers"` Supervised bool `yaml:"-"`