apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-11-03 10:30:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix S3 storage parsing from environment variable

Browse Source
This commit is contained in:
Ingo Oppermann
2023-04-05 14:43:45 +02:00
parent 51cbb8e74e
commit 98c561554d
2 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/value/s3_test.go
View File

@@ -12,7 +12,7 @@ func TestS3Value(t *testing.T) {
v := NewS3StorageListValue(&filesystems, nil, " ")
require.Equal(t, "(empty)", v.String())
v.Set("https://access_key_id1:secret_access_id1@region1.endpoint1.com/bucket1?name=aaa1&mount=/abc1&username=xxx1&password=yyy1 http://access_key_id2:secret_access_id2@region2.endpoint2.com/bucket2?name=aaa2&mount=/abc2&username=xxx2&password=yyy2")
v.Set("https://access_key_id1:secret_access_id1@region1.subdomain.endpoint1.com/bucket1?name=aaa1&mount=/abc1&username=xxx1&password=yyy1 http://access_key_id2:secret_access_id2@region2.endpoint2.com/bucket2?name=aaa2&mount=/abc2&username=xxx2&password=yyy2")
require.Equal(t, []S3Storage{
{
Name: "aaa1",
@@ -22,7 +22,7 @@ func TestS3Value(t *testing.T) {
Username: "xxx1",
Password: "yyy1",
},
Endpoint: "endpoint1.com",
Endpoint: "subdomain.endpoint1.com",
AccessKeyID: "access_key_id1",
SecretAccessKey: "secret_access_id1",
Bucket: "bucket1",
@@ -45,7 +45,7 @@ func TestS3Value(t *testing.T) {
UseSSL: false,
},
}, filesystems)
require.Equal(t, "https://access_key_id1:---@region1.endpoint1.com/bucket1?mount=%2Fabc1&name=aaa1&password=---&username=xxx1 http://access_key_id2:---@region2.endpoint2.com/bucket2?mount=%2Fabc2&name=aaa2&password=---&username=xxx2", v.String())
require.Equal(t, "https://access_key_id1:---@region1.subdomain.endpoint1.com/bucket1?mount=%2Fabc1&name=aaa1&password=---&username=xxx1 http://access_key_id2:---@region2.endpoint2.com/bucket2?mount=%2Fabc2&name=aaa2&password=---&username=xxx2", v.String())
require.NoError(t, v.Validate())
v.Set("https://access_key_id1:secret_access_id1@region1.endpoint1.com/bucket1?name=djk*;..&mount=/abc1&username=xxx1&password=yyy1")