sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert empty yaml tags

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-28 15:14:56 +02:00
parent b515d7f83f
commit 1b2cc6df3e
6 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/auth-basic/pkg/config/config.go
+18 -18
View File
@@ -60,24 +60,24 @@ type JSONProvider struct {
}
type LDAPProvider struct {
URI string `yaml:"" env:"LDAP_URI;AUTH_BASIC_LDAP_URI"`
CACert string `yaml:"" env:"LDAP_CACERT;AUTH_BASIC_LDAP_CACERT"`
Insecure bool `yaml:"" env:"LDAP_INSECURE;AUTH_BASIC_LDAP_INSECURE"`
BindDN string `yaml:"" env:"LDAP_BIND_DN;AUTH_BASIC_LDAP_BIND_DN"`
BindPassword string `yaml:"" env:"LDAP_BIND_PASSWORD;AUTH_BASIC_LDAP_BIND_PASSWORD"`
UserBaseDN string `yaml:"" env:"LDAP_USER_BASE_DN;AUTH_BASIC_LDAP_USER_BASE_DN"`
GroupBaseDN string `yaml:"" env:"LDAP_GROUP_BASE_DN;AUTH_BASIC_LDAP_GROUP_BASE_DN"`
UserScope string `yaml:"" env:"LDAP_USER_SCOPE;AUTH_BASIC_LDAP_USER_SCOPE"`
GroupScope string `yaml:"" env:"LDAP_GROUP_SCOPE;AUTH_BASIC_LDAP_GROUP_SCOPE"`
UserFilter string `yaml:"" env:"LDAP_USERFILTER;AUTH_BASIC_LDAP_USERFILTER"`
GroupFilter string `yaml:"" env:"LDAP_GROUPFILTER;AUTH_BASIC_LDAP_USERFILTER"`
UserObjectClass string `yaml:"" env:"LDAP_USER_OBJECTCLASS;AUTH_BASIC_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `yaml:"" env:"LDAP_GROUP_OBJECTCLASS;AUTH_BASIC_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `yaml:"" env:"LDAP_LOGIN_ATTRIBUTES;AUTH_BASIC_LDAP_LOGIN_ATTRIBUTES"`
IDP string `yaml:"" env:"OCIS_URL;AUTH_BASIC_IDP_URL"` // TODO what is this for?
GatewayEndpoint string `yaml:""` // TODO do we need this here?
UserSchema LDAPUserSchema `yaml:""`
GroupSchema LDAPGroupSchema `yaml:""`
URI string `env:"LDAP_URI;AUTH_BASIC_LDAP_URI"`
CACert string `env:"LDAP_CACERT;AUTH_BASIC_LDAP_CACERT"`
Insecure bool `env:"LDAP_INSECURE;AUTH_BASIC_LDAP_INSECURE"`
BindDN string `env:"LDAP_BIND_DN;AUTH_BASIC_LDAP_BIND_DN"`
BindPassword string `env:"LDAP_BIND_PASSWORD;AUTH_BASIC_LDAP_BIND_PASSWORD"`
UserBaseDN string `env:"LDAP_USER_BASE_DN;AUTH_BASIC_LDAP_USER_BASE_DN"`
GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;AUTH_BASIC_LDAP_GROUP_BASE_DN"`
UserScope string `env:"LDAP_USER_SCOPE;AUTH_BASIC_LDAP_USER_SCOPE"`
GroupScope string `env:"LDAP_GROUP_SCOPE;AUTH_BASIC_LDAP_GROUP_SCOPE"`
UserFilter string `env:"LDAP_USERFILTER;AUTH_BASIC_LDAP_USERFILTER"`
GroupFilter string `env:"LDAP_GROUPFILTER;AUTH_BASIC_LDAP_USERFILTER"`
UserObjectClass string `env:"LDAP_USER_OBJECTCLASS;AUTH_BASIC_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `env:"LDAP_GROUP_OBJECTCLASS;AUTH_BASIC_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `env:"LDAP_LOGIN_ATTRIBUTES;AUTH_BASIC_LDAP_LOGIN_ATTRIBUTES"`
IDP string `env:"OCIS_URL;AUTH_BASIC_IDP_URL"` // TODO what is this for?
GatewayEndpoint string // TODO do we need this here?
UserSchema LDAPUserSchema
GroupSchema LDAPGroupSchema
}
type LDAPUserSchema struct {
extensions/gateway/pkg/config/config.go
+1 -1
View File
@@ -16,7 +16,7 @@ type Config struct {
TokenManager *TokenManager `yaml:"token_manager"`
Reva *Reva `yaml:"reva"`
SkipUserGroupsInToken bool `yaml:""`
SkipUserGroupsInToken bool
CommitShareToStorageGrant bool `yaml:"commit_share_to_storage_grant"`
CommitShareToStorageRef bool `yaml:"commit_share_to_storage_ref"`
extensions/group/pkg/config/config.go
+22 -22
View File
@@ -51,34 +51,34 @@ type GRPCConfig struct {
}
type Drivers struct {
JSON JSONDriver `yaml:""`
LDAP LDAPDriver `yaml:""`
OwnCloudSQL OwnCloudSQLDriver `yaml:""`
REST RESTProvider `yaml:""`
JSON JSONDriver
LDAP LDAPDriver
OwnCloudSQL OwnCloudSQLDriver
REST RESTProvider
}
type JSONDriver struct {
File string
}
type LDAPDriver struct {
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:""`
URI string `env:"LDAP_URI;GROUPS_LDAP_URI"`
CACert string `env:"LDAP_CACERT;GROUPS_LDAP_CACERT"`
Insecure bool `env:"LDAP_INSECURE;GROUPS_LDAP_INSECURE"`
BindDN string `env:"LDAP_BIND_DN;GROUPS_LDAP_BIND_DN"`
BindPassword string `env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"`
UserBaseDN string `env:"LDAP_USER_BASE_DN;GROUPS_LDAP_USER_BASE_DN"`
GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;GROUPS_LDAP_GROUP_BASE_DN"`
UserScope string `env:"LDAP_USER_SCOPE;GROUPS_LDAP_USER_SCOPE"`
GroupScope string `env:"LDAP_GROUP_SCOPE;GROUPS_LDAP_GROUP_SCOPE"`
UserFilter string `env:"LDAP_USERFILTER;GROUPS_LDAP_USERFILTER"`
GroupFilter string `env:"LDAP_GROUPFILTER;GROUPS_LDAP_USERFILTER"`
UserObjectClass string `env:"LDAP_USER_OBJECTCLASS;GROUPS_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `env:"LDAP_GROUP_OBJECTCLASS;GROUPS_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `env:"LDAP_LOGIN_ATTRIBUTES;GROUPS_LDAP_LOGIN_ATTRIBUTES"`
IDP string `env:"OCIS_URL;GROUPS_IDP_URL"` // TODO what is this for?
GatewayEndpoint string // TODO do we need this here?
UserSchema LDAPUserSchema
GroupSchema LDAPGroupSchema
}
type LDAPUserSchema struct {
extensions/storage/pkg/config/config.go
+2 -2
View File
@@ -188,7 +188,7 @@ type Auth struct {
// DataGatewayPort has a public url
type DataGatewayPort struct {
Port
PublicURL string `yaml:""`
PublicURL string
}
type DataProvider struct {
@@ -522,7 +522,7 @@ type Asset struct {
// Config combines all available configuration parts.
type Config struct {
*shared.Commons `yaml:""`
*shared.Commons
File string `yaml:"file"`
Log *shared.Log `yaml:"log"`
extensions/user/pkg/config/config.go
+22 -22
View File
@@ -51,34 +51,34 @@ type GRPCConfig struct {
}
type Drivers struct {
JSON JSONDriver `yaml:""`
LDAP LDAPDriver `yaml:""`
OwnCloudSQL OwnCloudSQLDriver `yaml:""`
REST RESTProvider `yaml:""`
JSON JSONDriver
LDAP LDAPDriver
OwnCloudSQL OwnCloudSQLDriver
REST RESTProvider
}
type JSONDriver struct {
File string
}
type LDAPDriver struct {
URI string `yaml:"" env:"LDAP_URI;USERS_LDAP_URI"`
CACert string `yaml:"" env:"LDAP_CACERT;USERS_LDAP_CACERT"`
Insecure bool `yaml:"" env:"LDAP_INSECURE;USERS_LDAP_INSECURE"`
BindDN string `yaml:"" env:"LDAP_BIND_DN;USERS_LDAP_BIND_DN"`
BindPassword string `yaml:"" env:"LDAP_BIND_PASSWORD;USERS_LDAP_BIND_PASSWORD"`
UserBaseDN string `yaml:"" env:"LDAP_USER_BASE_DN;USERS_LDAP_USER_BASE_DN"`
GroupBaseDN string `yaml:"" env:"LDAP_GROUP_BASE_DN;USERS_LDAP_GROUP_BASE_DN"`
UserScope string `yaml:"" env:"LDAP_USER_SCOPE;USERS_LDAP_USER_SCOPE"`
GroupScope string `yaml:"" env:"LDAP_GROUP_SCOPE;USERS_LDAP_GROUP_SCOPE"`
UserFilter string `yaml:"" env:"LDAP_USERFILTER;USERS_LDAP_USERFILTER"`
GroupFilter string `yaml:"" env:"LDAP_GROUPFILTER;USERS_LDAP_USERFILTER"`
UserObjectClass string `yaml:"" env:"LDAP_USER_OBJECTCLASS;USERS_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `yaml:"" env:"LDAP_GROUP_OBJECTCLASS;USERS_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `yaml:"" env:"LDAP_LOGIN_ATTRIBUTES;USERS_LDAP_LOGIN_ATTRIBUTES"`
IDP string `yaml:"" env:"OCIS_URL;USERS_IDP_URL"` // TODO what is this for?
GatewayEndpoint string `yaml:""` // TODO do we need this here?
UserSchema LDAPUserSchema `yaml:""`
GroupSchema LDAPGroupSchema `yaml:""`
URI string `env:"LDAP_URI;USERS_LDAP_URI"`
CACert string `env:"LDAP_CACERT;USERS_LDAP_CACERT"`
Insecure bool `env:"LDAP_INSECURE;USERS_LDAP_INSECURE"`
BindDN string `env:"LDAP_BIND_DN;USERS_LDAP_BIND_DN"`
BindPassword string `env:"LDAP_BIND_PASSWORD;USERS_LDAP_BIND_PASSWORD"`
UserBaseDN string `env:"LDAP_USER_BASE_DN;USERS_LDAP_USER_BASE_DN"`
GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;USERS_LDAP_GROUP_BASE_DN"`
UserScope string `env:"LDAP_USER_SCOPE;USERS_LDAP_USER_SCOPE"`
GroupScope string `env:"LDAP_GROUP_SCOPE;USERS_LDAP_GROUP_SCOPE"`
UserFilter string `env:"LDAP_USERFILTER;USERS_LDAP_USERFILTER"`
GroupFilter string `env:"LDAP_GROUPFILTER;USERS_LDAP_USERFILTER"`
UserObjectClass string `env:"LDAP_USER_OBJECTCLASS;USERS_LDAP_USER_OBJECTCLASS"`
GroupObjectClass string `env:"LDAP_GROUP_OBJECTCLASS;USERS_LDAP_GROUP_OBJECTCLASS"`
LoginAttributes []string `env:"LDAP_LOGIN_ATTRIBUTES;USERS_LDAP_LOGIN_ATTRIBUTES"`
IDP string `env:"OCIS_URL;USERS_IDP_URL"` // TODO what is this for?
GatewayEndpoint string // TODO do we need this here?
UserSchema LDAPUserSchema
GroupSchema LDAPGroupSchema
}
type LDAPUserSchema struct {
ocis-pkg/config/config.go
+2 -2
View File
@@ -64,8 +64,8 @@ type Config struct {
Tracing *shared.Tracing `yaml:"tracing"`
Log *shared.Log `yaml:"log"`
Mode Mode `yaml:""` // DEPRECATED
File string `yaml:""`
Mode Mode // DEPRECATED
File string
OcisURL string `yaml:"ocis_url"`
Registry string `yaml:"registry"`