Skip to content

Commit

Permalink
Two more constructs
Browse files Browse the repository at this point in the history
  • Loading branch information
@biffgaut
biffgaut committed Apr 15, 2023
1 parent b5389e3 commit 6e722c1
Show file tree
Hide file tree
Showing 9 changed files with 333 additions and 18 deletions.
39 changes: 37 additions & 2 deletions ...ns-constructs/aws-fargate-kinesisfirehose/test/integ.existingFargateService.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,6 @@
"destinationfirehoseS3LoggingBucket19A32AC0": {
"Type": "AWS::S3::Bucket",
"Properties": {
"AccessControl": "LogDeliveryWrite",
"BucketEncryption": {
"ServerSideEncryptionConfiguration": [
{
Expand Down Expand Up @@ -954,6 +953,42 @@
]
}
]
},
{
"Action": "s3:PutObject",
"Condition": {
"ArnLike": {
"aws:SourceArn": {
"Fn::GetAtt": [
"destinationfirehoseS3BucketEC05EE08",
"Arn"
]
}
},
"StringEquals": {
"aws:SourceAccount": {
"Ref": "AWS::AccountId"
}
}
},
"Effect": "Allow",
"Principal": {
"Service": "logging.s3.amazonaws.com"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"destinationfirehoseS3LoggingBucket19A32AC0",
"Arn"
]
},
"/*"
]
]
}
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -1348,7 +1383,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "3f51abb709b8e65167a45aeed02bab11540603d909005d7148230ba5ce6c74d7.zip"
"S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
39 changes: 37 additions & 2 deletions ...aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.existingVpc.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,6 @@
"destinationfirehoseS3LoggingBucket19A32AC0": {
"Type": "AWS::S3::Bucket",
"Properties": {
"AccessControl": "LogDeliveryWrite",
"BucketEncryption": {
"ServerSideEncryptionConfiguration": [
{
Expand Down Expand Up @@ -954,6 +953,42 @@
]
}
]
},
{
"Action": "s3:PutObject",
"Condition": {
"ArnLike": {
"aws:SourceArn": {
"Fn::GetAtt": [
"destinationfirehoseS3BucketEC05EE08",
"Arn"
]
}
},
"StringEquals": {
"aws:SourceAccount": {
"Ref": "AWS::AccountId"
}
}
},
"Effect": "Allow",
"Principal": {
"Service": "logging.s3.amazonaws.com"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"destinationfirehoseS3LoggingBucket19A32AC0",
"Arn"
]
},
"/*"
]
]
}
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -1348,7 +1383,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "3f51abb709b8e65167a45aeed02bab11540603d909005d7148230ba5ce6c74d7.zip"
"S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
39 changes: 37 additions & 2 deletions ...s-constructs/aws-fargate-kinesisfirehose/test/integ.fargateServiceFromProps.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"destinationfirehoseS3LoggingBucket19A32AC0": {
"Type": "AWS::S3::Bucket",
"Properties": {
"AccessControl": "LogDeliveryWrite",
"BucketEncryption": {
"ServerSideEncryptionConfiguration": [
{
Expand Down Expand Up @@ -121,6 +120,42 @@
]
}
]
},
{
"Action": "s3:PutObject",
"Condition": {
"ArnLike": {
"aws:SourceArn": {
"Fn::GetAtt": [
"destinationfirehoseS3BucketEC05EE08",
"Arn"
]
}
},
"StringEquals": {
"aws:SourceAccount": {
"Ref": "AWS::AccountId"
}
}
},
"Effect": "Allow",
"Principal": {
"Service": "logging.s3.amazonaws.com"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"destinationfirehoseS3LoggingBucket19A32AC0",
"Arn"
]
},
"/*"
]
]
}
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -515,7 +550,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "3f51abb709b8e65167a45aeed02bab11540603d909005d7148230ba5ce6c74d7.zip"
"S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
39 changes: 37 additions & 2 deletions ...aws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.noArguments.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"destinationfirehoseS3LoggingBucket19A32AC0": {
"Type": "AWS::S3::Bucket",
"Properties": {
"AccessControl": "LogDeliveryWrite",
"BucketEncryption": {
"ServerSideEncryptionConfiguration": [
{
Expand Down Expand Up @@ -121,6 +120,42 @@
]
}
]
},
{
"Action": "s3:PutObject",
"Condition": {
"ArnLike": {
"aws:SourceArn": {
"Fn::GetAtt": [
"destinationfirehoseS3BucketEC05EE08",
"Arn"
]
}
},
"StringEquals": {
"aws:SourceAccount": {
"Ref": "AWS::AccountId"
}
}
},
"Effect": "Allow",
"Principal": {
"Service": "logging.s3.amazonaws.com"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"destinationfirehoseS3LoggingBucket19A32AC0",
"Arn"
]
},
"/*"
]
]
}
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -511,7 +546,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-us-east-1"
},
"S3Key": "3f51abb709b8e65167a45aeed02bab11540603d909005d7148230ba5ce6c74d7.zip"
"S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
39 changes: 37 additions & 2 deletions ...ws-solutions-constructs/aws-fargate-kinesisfirehose/test/integ.vpcFromprops.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"destinationfirehoseS3LoggingBucket19A32AC0": {
"Type": "AWS::S3::Bucket",
"Properties": {
"AccessControl": "LogDeliveryWrite",
"BucketEncryption": {
"ServerSideEncryptionConfiguration": [
{
Expand Down Expand Up @@ -121,6 +120,42 @@
]
}
]
},
{
"Action": "s3:PutObject",
"Condition": {
"ArnLike": {
"aws:SourceArn": {
"Fn::GetAtt": [
"destinationfirehoseS3BucketEC05EE08",
"Arn"
]
}
},
"StringEquals": {
"aws:SourceAccount": {
"Ref": "AWS::AccountId"
}
}
},
"Effect": "Allow",
"Principal": {
"Service": "logging.s3.amazonaws.com"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"destinationfirehoseS3LoggingBucket19A32AC0",
"Arn"
]
},
"/*"
]
]
}
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -515,7 +550,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "3f51abb709b8e65167a45aeed02bab11540603d909005d7148230ba5ce6c74d7.zip"
"S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
39 changes: 37 additions & 2 deletions ...olutions-constructs/aws-lambda-kinesisfirehose/test/integ.existing-function.expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"destinationfirehoseS3LoggingBucket19A32AC0": {
"Type": "AWS::S3::Bucket",
"Properties": {
"AccessControl": "LogDeliveryWrite",
"BucketEncryption": {
"ServerSideEncryptionConfiguration": [
{
Expand Down Expand Up @@ -121,6 +120,42 @@
]
}
]
},
{
"Action": "s3:PutObject",
"Condition": {
"ArnLike": {
"aws:SourceArn": {
"Fn::GetAtt": [
"destinationfirehoseS3BucketEC05EE08",
"Arn"
]
}
},
"StringEquals": {
"aws:SourceAccount": {
"Ref": "AWS::AccountId"
}
}
},
"Effect": "Allow",
"Principal": {
"Service": "logging.s3.amazonaws.com"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"destinationfirehoseS3LoggingBucket19A32AC0",
"Arn"
]
},
"/*"
]
]
}
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -515,7 +550,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "3f51abb709b8e65167a45aeed02bab11540603d909005d7148230ba5ce6c74d7.zip"
"S3Key": "40aa87cdf43c4095cec18bc443965f22ab2f8c1ace47e482a0ba4e35d83b0cc9.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down
Loading

0 comments on commit 6e722c1

Please sign in to comment.