Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] config env #3589

Merged
merged 51 commits into from
May 3, 2022
Merged

[full-ci] config env #3589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
f588e90
reenable parallel deployment tests
wkloucek Apr 26, 2022
47ed302
add config docs for services
wkloucek Apr 26, 2022
061808c
remove unsupported drivers from the documentation
wkloucek May 2, 2022
ef6d32a
remove `extensions/storage` leftovers
wkloucek May 2, 2022
5e48b30
add all extensions to extensions list and ensure the Makefile
wkloucek May 2, 2022
eb82c64
app provider config docs
wkloucek May 2, 2022
18296ce
auth basic config docs
wkloucek May 2, 2022
b351785
auth bearer config docs
wkloucek May 2, 2022
f643de2
machine auth config docs
wkloucek May 2, 2022
977c4fd
ensure commands for all services
wkloucek May 3, 2022
b6f03f9
frontend config docs
wkloucek May 3, 2022
ba2fbee
fix makefile names
wkloucek May 3, 2022
26a92f2
add app-registry service
wkloucek May 3, 2022
6c2b9cb
gateway config docs
wkloucek May 3, 2022
ecb3d4b
fix app registry default config
wkloucek May 3, 2022
859ae54
groups config docs
wkloucek May 3, 2022
c0c19dc
fix app registry port
wkloucek May 3, 2022
dde2d41
ocdav config docs
wkloucek May 3, 2022
c6af86c
sharing config docs
wkloucek May 3, 2022
f501814
storage-metadata config docs
wkloucek May 3, 2022
d2edd6e
storage-publiclink config docs
wkloucek May 3, 2022
b3c8ee3
storage sahres config docs
wkloucek May 3, 2022
fd44da4
storage-users config docs
wkloucek May 3, 2022
2df402c
user config docs
wkloucek May 3, 2022
9268fdc
fix ocis build
wkloucek May 3, 2022
771bfb6
remove rest default config from user provider
wkloucek May 3, 2022
2be54a8
fix owner on ocis config files
wkloucek May 3, 2022
59c4727
temporarily revert back to json sharing drivers
wkloucek May 3, 2022
49e39f3
remove artifacts from ports docs
wkloucek May 3, 2022
3ad56ed
bring back folde precreation for sharing service
wkloucek May 3, 2022
e97ec5e
reintroduce Skip users groups in token option
wkloucek May 3, 2022
7c6cdf0
Apply suggestions from code review
butonic May 3, 2022
28978e8
fix env var typo
butonic May 3, 2022
003945e
Update group service usage
butonic May 3, 2022
4f6cc66
fix metadata storage permissions endpoint
wkloucek May 3, 2022
eac18a9
Update group doc
butonic May 3, 2022
b65936f
strip `ocis-` from command name for all standalone services
wkloucek May 3, 2022
b13a9d7
ocdav env typo
butonic May 3, 2022
8ded0ce
fix doc typo
butonic May 3, 2022
0fe6676
drop specific service name from tracing docs
butonic May 3, 2022
2c49a47
fix misnamed owncloudsql driver
butonic May 3, 2022
68ccfa3
owncloudsql driver typo
butonic May 3, 2022
201722a
Update extensions/storage-metadata/pkg/command/root.go
butonic May 3, 2022
e32f909
oc10-sql -> owncloudsql
butonic May 3, 2022
5bf8f25
expose owncloudsql sharing driver
wkloucek May 3, 2022
90e0eb4
update owncloudsql sharing settings in CI
wkloucek May 3, 2022
e14952a
update environment variables for parallel deployment in CI
wkloucek May 3, 2022
56261e3
Merge branch 'master' into config-env
wkloucek May 3, 2022
2310417
reintroduce redis in ci
wkloucek May 3, 2022
39cc17b
fix typo
butonic May 3, 2022
3d2c804
Revert "reenable parallel deployment tests"
butonic May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extensions/sharing/pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ type GRPCConfig struct {
}

type UserSharingDrivers struct {
JSON UserSharingJSONDriver `yaml:"json"`
CS3 UserSharingCS3Driver `yaml:"cs3"`
SQL UserSharingSQLDriver `yaml:"sql,omitempty"` // not supported by the oCIS product, therefore not part of docs
JSON UserSharingJSONDriver `yaml:"json"`
CS3 UserSharingCS3Driver `yaml:"cs3"`
OwnCloudSQL UserSharingOwnCloudSQLDriver `yaml:"owncloudsql"`

SQL UserSharingSQLDriver `yaml:"sql,omitempty"` // not supported by the oCIS product, therefore not part of docs
}

type UserSharingJSONDriver struct {
Expand All @@ -82,6 +84,15 @@ type UserSharingSQLDriver struct {
UserStorageMountID string `yaml:"user_storage_mount_id"`
}

type UserSharingOwnCloudSQLDriver struct {
DBUsername string `yaml:"db_username" env:"SHARING_USER_OWNCLOUDSQL_DB_USERNAME"`
DBPassword string `yaml:"db_password" env:"SHARING_USER_OWNCLOUDSQL_DB_PASSWORD"`
DBHost string `yaml:"db_host" env:"SHARING_USER_OWNCLOUDSQL_DB_HOST"`
DBPort int `yaml:"db_port" env:"SHARING_USER_OWNCLOUDSQL_DB_PORT"`
DBName string `yaml:"db_name" env:"SHARING_USER_OWNCLOUDSQL_DB_NAME"`
UserStorageMountID string `yaml:"user_storage_mount_id" env:"SHARING_USER_OWNCLOUDSQL_USER_STORAGE_MOUNT_ID"`
}

type UserSharingCS3Driver struct {
ProviderAddr string `yaml:"provider_addr" env:"SHARING_USER_CS3_PROVIDER_ADDR"`
ServiceUserID string `yaml:"service_user_id" env:"SHARING_USER_CS3_SERVICE_USER_ID"`
Expand All @@ -92,7 +103,8 @@ type UserSharingCS3Driver struct {
type PublicSharingDrivers struct {
JSON PublicSharingJSONDriver `yaml:"json"`
CS3 PublicSharingCS3Driver `yaml:"cs3"`
SQL PublicSharingSQLDriver `yaml:"sql,omitempty"` // not supported by the oCIS product, therefore not part of docs

SQL PublicSharingSQLDriver `yaml:"sql,omitempty"` // not supported by the oCIS product, therefore not part of docs
}

type PublicSharingJSONDriver struct {
Expand Down
23 changes: 6 additions & 17 deletions extensions/sharing/pkg/revaconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
"janitor_run_interval": cfg.UserSharingDrivers.SQL.JanitorRunInterval,
},
"owncloudsql": map[string]interface{}{
"storage_mount_id": cfg.UserSharingDrivers.SQL.UserStorageMountID,
"db_username": cfg.UserSharingDrivers.SQL.DBUsername,
"db_password": cfg.UserSharingDrivers.SQL.DBPassword,
"db_host": cfg.UserSharingDrivers.SQL.DBHost,
"db_port": cfg.UserSharingDrivers.SQL.DBPort,
"db_name": cfg.UserSharingDrivers.SQL.DBName,
"storage_mount_id": cfg.UserSharingDrivers.OwnCloudSQL.UserStorageMountID,
"db_username": cfg.UserSharingDrivers.OwnCloudSQL.DBUsername,
"db_password": cfg.UserSharingDrivers.OwnCloudSQL.DBPassword,
"db_host": cfg.UserSharingDrivers.OwnCloudSQL.DBHost,
"db_port": cfg.UserSharingDrivers.OwnCloudSQL.DBPort,
"db_name": cfg.UserSharingDrivers.OwnCloudSQL.DBName,
},
"cs3": map[string]interface{}{
"provider_addr": cfg.UserSharingDrivers.CS3.ProviderAddr,
Expand All @@ -73,17 +73,6 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
"enable_expired_shares_cleanup": cfg.PublicSharingDrivers.SQL.EnableExpiredSharesCleanup,
"janitor_run_interval": cfg.PublicSharingDrivers.SQL.JanitorRunInterval,
},
"owncloudsql": map[string]interface{}{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove the PublicSharingDrivers?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because there is no owncloudsql publicshare driver in reva: https://github.com/cs3org/reva/blob/afc8ead0c9a6a0acc5b46bf27a8b18ad458c098d/pkg/publicshare/manager/loader/loader.go#L23-L25

package loader

import (
	// Load core share manager drivers.
	_ "github.com/cs3org/reva/v2/pkg/publicshare/manager/cs3"
	_ "github.com/cs3org/reva/v2/pkg/publicshare/manager/json"
	_ "github.com/cs3org/reva/v2/pkg/publicshare/manager/memory"
	// Add your own here
)

"storage_mount_id": cfg.PublicSharingDrivers.SQL.UserStorageMountID,
"db_username": cfg.PublicSharingDrivers.SQL.DBUsername,
"db_password": cfg.PublicSharingDrivers.SQL.DBPassword,
"db_host": cfg.PublicSharingDrivers.SQL.DBHost,
"db_port": cfg.PublicSharingDrivers.SQL.DBPort,
"db_name": cfg.PublicSharingDrivers.SQL.DBName,
"password_hash_cost": cfg.PublicSharingDrivers.SQL.PasswordHashCost,
"enable_expired_shares_cleanup": cfg.PublicSharingDrivers.SQL.EnableExpiredSharesCleanup,
"janitor_run_interval": cfg.PublicSharingDrivers.SQL.JanitorRunInterval,
},
"cs3": map[string]interface{}{
"provider_addr": cfg.PublicSharingDrivers.CS3.ProviderAddr,
"service_user_id": cfg.PublicSharingDrivers.CS3.ServiceUserID,
Expand Down