Skip to content

Commit

Permalink
Revert "feat(IAM): Optimize IAM policy statements for size (#916)" (#958
Browse files Browse the repository at this point in the history
)

This reverts commit 5996442.

Fixes #957
Reverts #916
  • Loading branch information
Elad Ben-Israel authored Oct 18, 2018
1 parent 7ee91cf commit 5bb7c93
Show file tree
Hide file tree
Showing 102 changed files with 2,775 additions and 3,469 deletions.
124 changes: 49 additions & 75 deletions packages/@aws-cdk/applet-js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,31 @@
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*"
],
"Effect": "Allow",
"Resource": [
{
"Fn::Join": [
"",
[
"arn:",
"arn",
":",
{
"Ref": "AWS::Partition"
},
":s3:::",
":",
"s3",
":",
"",
":",
"",
":",
{
"Ref": "SampleAssetS3BucketE6B2908E"
}
Expand All @@ -50,11 +56,18 @@
"Fn::Join": [
"",
[
"arn:",
"arn",
":",
{
"Ref": "AWS::Partition"
},
":s3:::",
":",
"s3",
":",
"",
":",
"",
":",
{
"Ref": "SampleAssetS3BucketE6B2908E"
}
Expand Down Expand Up @@ -88,7 +101,8 @@
}
]
}
]
],
"Version": "2012-10-17"
},
"PolicyName": "MyUserDefaultPolicy7B897426",
"Users": [
Expand Down
30 changes: 22 additions & 8 deletions packages/@aws-cdk/assets/test/integ.assets.file.lit.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,31 @@
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*"
],
"Effect": "Allow",
"Resource": [
{
"Fn::Join": [
"",
[
"arn:",
"arn",
":",
{
"Ref": "AWS::Partition"
},
":s3:::",
":",
"s3",
":",
"",
":",
"",
":",
{
"Ref": "SampleAssetS3BucketE6B2908E"
}
Expand All @@ -50,11 +56,18 @@
"Fn::Join": [
"",
[
"arn:",
"arn",
":",
{
"Ref": "AWS::Partition"
},
":s3:::",
":",
"s3",
":",
"",
":",
"",
":",
{
"Ref": "SampleAssetS3BucketE6B2908E"
}
Expand Down Expand Up @@ -88,7 +101,8 @@
}
]
}
]
],
"Version": "2012-10-17"
},
"PolicyName": "MyUserDefaultPolicy7B897426",
"Users": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,31 @@
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"s3:GetBucket*",
"s3:GetObject*",
"s3:GetBucket*",
"s3:List*"
],
"Effect": "Allow",
"Resource": [
{
"Fn::Join": [
"",
[
"arn:",
"arn",
":",
{
"Ref": "AWS::Partition"
},
":s3:::",
":",
"s3",
":",
"",
":",
"",
":",
{
"Ref": "MyFileS3BucketACE13C36"
}
Expand All @@ -50,11 +56,18 @@
"Fn::Join": [
"",
[
"arn:",
"arn",
":",
{
"Ref": "AWS::Partition"
},
":s3:::",
":",
"s3",
":",
"",
":",
"",
":",
{
"Ref": "MyFileS3BucketACE13C36"
}
Expand Down Expand Up @@ -88,7 +101,8 @@
}
]
}
]
],
"Version": "2012-10-17"
},
"PolicyName": "MyUserGroupDefaultPolicy50C5D742",
"Groups": [
Expand Down
Loading

0 comments on commit 5bb7c93

Please sign in to comment.