Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Coscine
backend
libraries
ResourceTypeWaterbutlerRdsS3
Commits
7a00a076
Commit
7a00a076
authored
Jun 08, 2021
by
Petar Hristov
💬
Browse files
Merge branch 'Hotfix/1551-missingPrincipal' into 'master'
Fix: added missing principal coscine/issues#1551 See merge request
!10
parents
50464852
26a22766
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/ResourceTypeWaterbutlerRdsS3.Tests/ResourceTypeWaterbutlerS3Tests.cs
View file @
7a00a076
...
...
@@ -30,6 +30,7 @@ namespace Coscine.ResourceTypeWaterbutlerRdsS3.Test
private
string
_readUser
;
private
string
_writeUser
;
private
string
_accessKey
;
[
OneTimeSetUp
]
public
void
Setup
()
...
...
@@ -45,7 +46,7 @@ namespace Coscine.ResourceTypeWaterbutlerRdsS3.Test
_readUser
=
$"
{
_testPrefix
}
.read_
{
_guid
}
"
;
_writeUser
=
$"
{
_testPrefix
}
.write_
{
_guid
}
"
;
_endpoint
=
_configuration
.
GetString
(
"coscine/global/rds/ecs-rwth/rds-s3/s3_endpoint"
);
_accessKey
=
_configuration
.
GetString
(
"coscine/global/rds/ecs-rwth/rds-s3/object_user_name"
);
_rdsS3EcsManager
=
new
EcsManager
{
EcsManagerConfiguration
=
new
EcsManagerConfiguration
...
...
@@ -101,6 +102,7 @@ namespace Coscine.ResourceTypeWaterbutlerRdsS3.Test
resourceType
.
CreateResource
(
new
Dictionary
<
string
,
string
>
{
{
"bucketname"
,
_bucketName
},
{
"size"
,
$"
{
_quota
}
"
},
{
"accessKey"
,
""
},
{
"accessKeyRead"
,
_readUser
},
{
"secretKeyRead"
,
_secretKey
},
{
"accessKeyWrite"
,
_writeUser
},
...
...
src/ResourceTypeWaterbutlerRdsS3/ResourceTypeWaterbutlerRdsS3.cs
View file @
7a00a076
...
...
@@ -229,7 +229,7 @@ namespace Coscine.ResourceTypeWaterbutlerRdsS3
""
Action
""
:
[
""
s3
:
PutObject
""
,
""
s3
:
GetObject
""
,
""
s3
:
GetObjectAcl
""
,
""
s3
:
GetObjectVersion
""
,
""
s3
:
DeleteObject
""
,
""
s3
:
DeleteObjectVersion
""
],
""
Effect
""
:
""
Allow
""
,
""
Resource
""
:
[
""
{
options
[
"bucketname"
]}/*
""
],
""
Principal
""
:
[
""
{
options
[
"accessKeyWrite"
]}
""
]
""
Principal
""
:
[
""
{
options
[
"accessKeyWrite"
]}
""
,
""
{
options
[
"accessKey"
]}
""
]
}},
{{
""
Action
""
:
[
""
s3
:
GetObject
""
,
""
s3
:
GetObjectAcl
""
,
""
s3
:
GetObjectVersion
""
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment