mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-29 07:19:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove all "omitempty" from config structs to bring back full configuration file documentation

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-28 15:08:40 +02:00
parent aba2ee0c39
commit ab254b05d0
31 changed files with 802 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/group/pkg/config/config.go
+33 -33
View File
@@ -5,20 +5,20 @@ import "github.com/owncloud/ocis/ocis-pkg/shared"
type Config struct {
*shared.Commons `yaml:"-"`
Service Service `yaml:"-"`
Tracing *Tracing `yaml:"tracing,omitempty"`
Logging *Logging `yaml:"log,omitempty"`
Debug Debug `yaml:"debug,omitempty"`
Supervised bool `yaml:"supervised,omitempty"`
Tracing *Tracing `yaml:"tracing"`
Logging *Logging `yaml:"log"`
Debug Debug `yaml:"debug"`
Supervised bool `yaml:"supervised"`
GRPC GRPCConfig `yaml:"grpc,omitempty"`
GRPC GRPCConfig `yaml:"grpc"`
TokenManager *TokenManager `yaml:"token_manager,omitempty"`
Reva *Reva `yaml:"reva,omitempty"`
TokenManager *TokenManager `yaml:"token_manager"`
Reva *Reva `yaml:"reva"`
SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token,omitempty"`
GroupMembersCacheExpiration int `yaml:"group_members_cache_expiration,omitempty"`
Driver string `yaml:"driver,omitempty"`
Drivers Drivers `yaml:"drivers,omitempty"`
SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token"`
GroupMembersCacheExpiration int `yaml:"group_members_cache_expiration"`
Driver string `yaml:"driver"`
Drivers Drivers `yaml:"drivers"`
}
type Tracing struct {
Enabled bool `yaml:"enabled" env:"OCIS_TRACING_ENABLED;GROUPS_TRACING_ENABLED" desc:"Activates tracing."`
@@ -51,34 +51,34 @@ type GRPCConfig struct {
}
type Drivers struct {
JSON JSONDriver `yaml:",omitempty"`
LDAP LDAPDriver `yaml:",omitempty"`
OwnCloudSQL OwnCloudSQLDriver `yaml:",omitempty"`
REST RESTProvider `yaml:",omitempty"`
JSON JSONDriver `yaml:""`
LDAP LDAPDriver `yaml:""`
OwnCloudSQL OwnCloudSQLDriver `yaml:""`
REST RESTProvider `yaml:""`
}
type JSONDriver struct {
File string
}
type LDAPDriver struct {
URI string `yaml:",omitempty" env:"LDAP_URI;GROUPS_LDAP_URI"`
CACert string `yaml:",omitempty" env:"LDAP_CACERT;GROUPS_LDAP_CACERT"`
Insecure bool `yaml:",omitempty" env:"LDAP_INSECURE;GROUPS_LDAP_INSECURE"`
BindDN string `yaml:",omitempty" env:"LDAP_BIND_DN;GROUPS_LDAP_BIND_DN"`
BindPassword string `yaml:",omitempty" env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"`
UserBaseDN string `yaml:",omitempty" env:"LDAP_USER_BASE_DN;GROUPS_LDAP_USER_BASE_DN"`
GroupBaseDN string `yaml:",omitempty" env:"LDAP_GROUP_BASE_DN;GROUPS_LDAP_GROUP_BASE_DN"`
UserScope string `yaml:",omitempty" env:"LDAP_USER_SCOPE;GROUPS_LDAP_USER_SCOPE"`
GroupScope string `yaml:",omitempty" env:"LDAP_GROUP_SCOPE;GROUPS_LDAP_GROUP_SCOPE"`
UserFilter string `yaml:",omitempty" env:"LDAP_USERFILTER;GROUPS_LDAP_USERFILTER"`
GroupFilter string `yaml:",omitempty" env:"LDAP_GROUPFILTER;GROUPS_LDAP_USERFILTER"`
UserObjectClass string `yaml:",omitempty" env:"LDAP_USER_OBJECTCLASS;GROUPS_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `yaml:",omitempty" env:"LDAP_GROUP_OBJECTCLASS;GROUPS_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `yaml:",omitempty" env:"LDAP_LOGIN_ATTRIBUTES;GROUPS_LDAP_LOGIN_ATTRIBUTES"`
IDP string `yaml:",omitempty" env:"OCIS_URL;GROUPS_IDP_URL"` // TODO what is this for?
GatewayEndpoint string `yaml:",omitempty"` // TODO do we need this here?
UserSchema LDAPUserSchema `yaml:",omitempty"`
GroupSchema LDAPGroupSchema `yaml:",omitempty"`
URI string `yaml:"" env:"LDAP_URI;GROUPS_LDAP_URI"`
CACert string `yaml:"" env:"LDAP_CACERT;GROUPS_LDAP_CACERT"`
Insecure bool `yaml:"" env:"LDAP_INSECURE;GROUPS_LDAP_INSECURE"`
BindDN string `yaml:"" env:"LDAP_BIND_DN;GROUPS_LDAP_BIND_DN"`
BindPassword string `yaml:"" env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"`
UserBaseDN string `yaml:"" env:"LDAP_USER_BASE_DN;GROUPS_LDAP_USER_BASE_DN"`
GroupBaseDN string `yaml:"" env:"LDAP_GROUP_BASE_DN;GROUPS_LDAP_GROUP_BASE_DN"`
UserScope string `yaml:"" env:"LDAP_USER_SCOPE;GROUPS_LDAP_USER_SCOPE"`
GroupScope string `yaml:"" env:"LDAP_GROUP_SCOPE;GROUPS_LDAP_GROUP_SCOPE"`
UserFilter string `yaml:"" env:"LDAP_USERFILTER;GROUPS_LDAP_USERFILTER"`
GroupFilter string `yaml:"" env:"LDAP_GROUPFILTER;GROUPS_LDAP_USERFILTER"`
UserObjectClass string `yaml:"" env:"LDAP_USER_OBJECTCLASS;GROUPS_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `yaml:"" env:"LDAP_GROUP_OBJECTCLASS;GROUPS_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `yaml:"" env:"LDAP_LOGIN_ATTRIBUTES;GROUPS_LDAP_LOGIN_ATTRIBUTES"`
IDP string `yaml:"" env:"OCIS_URL;GROUPS_IDP_URL"` // TODO what is this for?
GatewayEndpoint string `yaml:""` // TODO do we need this here?
UserSchema LDAPUserSchema `yaml:""`
GroupSchema LDAPGroupSchema `yaml:""`
}
type LDAPUserSchema struct {