Skip to content

Commit

Permalink
Merge branch 'main' into 652
Browse files Browse the repository at this point in the history
  • Loading branch information
@biffgaut
biffgaut committed Apr 28, 2022
2 parents a9e9c7f + 824bb19 commit 3455d9b
Show file tree
Hide file tree
Showing 23 changed files with 7,469 additions and 1,794 deletions.
269 changes: 126 additions & 143 deletions source/use_cases/aws-custom-glue-etl/test/integ.gluejob.expected.json
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
{
"Description": "Integration Test for sample application that uses aws-kineisstream-glue-job construct",
"Parameters": {
"AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3Bucket96760533": {
"Type": "String",
"Description": "S3 bucket for asset \"d4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4\""
},
"AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3VersionKey856519B9": {
"Type": "String",
"Description": "S3 key for asset version \"d4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4\""
},
"AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4ArtifactHashC026BAAB": {
"Type": "String",
"Description": "Artifact hash for asset \"d4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4\""
}
},
"Resources": {
"CustomETLKinesisStreamB4F1869F": {
"Type": "AWS::Kinesis::Stream",
"Properties": {
"ShardCount": 1,
"RetentionPeriodHours": 24,
"ShardCount": 1,
"StreamEncryption": {
"EncryptionType": "KMS",
"KeyId": "alias/aws/kinesis"
},
"StreamModeDetails": {
"StreamMode": "PROVISIONED"
}
}
},
Expand Down Expand Up @@ -135,7 +124,11 @@
"s3:GetBucket*",
"s3:List*",
"s3:DeleteObject*",
"s3:PutObject*",
"s3:PutObject",
"s3:PutObjectLegalHold",
"s3:PutObjectRetention",
"s3:PutObjectTagging",
"s3:PutObjectVersionTagging",
"s3:Abort*"
],
"Effect": "Allow",
Expand Down Expand Up @@ -180,34 +173,7 @@
},
":s3:::",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3Bucket96760533"
},
"/",
{
"Fn::Select": [
0,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3VersionKey856519B9"
}
]
}
]
},
{
"Fn::Select": [
1,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3VersionKey856519B9"
}
]
}
]
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
}
]
]
Expand All @@ -222,34 +188,7 @@
},
":s3:::",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3Bucket96760533"
},
"/",
{
"Fn::Select": [
0,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3VersionKey856519B9"
}
]
}
]
},
{
"Fn::Select": [
1,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3VersionKey856519B9"
}
]
}
]
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/*"
]
Expand Down Expand Up @@ -286,6 +225,9 @@
"BlockPublicPolicy": true,
"IgnorePublicAcls": true,
"RestrictPublicBuckets": true
},
"VersioningConfiguration": {
"Status": "Enabled"
}
},
"UpdateReplacePolicy": "Retain",
Expand All @@ -310,7 +252,7 @@
"PolicyDocument": {
"Statement": [
{
"Action": "*",
"Action": "s3:*",
"Condition": {
"Bool": {
"aws:SecureTransport": "false"
Expand All @@ -320,21 +262,28 @@
"Principal": {
"AWS": "*"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"CustomETLS3LoggingBucketBBDD45CB",
"Arn"
]
},
"/*"
"Resource": [
{
"Fn::GetAtt": [
"CustomETLS3LoggingBucketBBDD45CB",
"Arn"
]
]
},
"Sid": "HttpsOnly"
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"CustomETLS3LoggingBucketBBDD45CB",
"Arn"
]
},
"/*"
]
]
}
]
}
],
"Version": "2012-10-17"
Expand Down Expand Up @@ -393,7 +342,7 @@
"PolicyDocument": {
"Statement": [
{
"Action": "*",
"Action": "s3:*",
"Condition": {
"Bool": {
"aws:SecureTransport": "false"
Expand All @@ -403,21 +352,28 @@
"Principal": {
"AWS": "*"
},
"Resource": {
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"CustomETLS3Bucket3EE58725",
"Arn"
]
},
"/*"
"Resource": [
{
"Fn::GetAtt": [
"CustomETLS3Bucket3EE58725",
"Arn"
]
]
},
"Sid": "HttpsOnly"
},
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"CustomETLS3Bucket3EE58725",
"Arn"
]
},
"/*"
]
]
}
]
}
],
"Version": "2012-10-17"
Expand All @@ -431,42 +387,7 @@
"Name": "gluestreaming",
"PythonVersion": "3",
"ScriptLocation": {
"Fn::Join": [
"",
[
"s3://",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3Bucket96760533"
},
"/",
{
"Fn::Select": [
0,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3VersionKey856519B9"
}
]
}
]
},
{
"Fn::Select": [
1,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersd4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4S3VersionKey856519B9"
}
]
}
]
}
]
]
"Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d4dd6643ee852c9578ae2d36cf2dc8a48630fd2219a15e74502c7ea75bff70c4.py"
}
},
"Role": {
Expand All @@ -488,7 +409,7 @@
"Fn::Join": [
"",
[
"s3://",
"s3a://",
{
"Ref": "CustomETLS3Bucket3EE58725"
},
Expand All @@ -498,7 +419,35 @@
}
},
"GlueVersion": "2.0",
"SecurityConfiguration": "ETLJobSecurityConfig"
"NumberOfWorkers": 2,
"SecurityConfiguration": "ETLJobSecurityConfig",
"WorkerType": "G.1X"
}
},
"CustomETLKinesisStreamGetRecordsIteratorAgeAlarmCD7F4E34": {
"Type": "AWS::CloudWatch::Alarm",
"Properties": {
"ComparisonOperator": "GreaterThanOrEqualToThreshold",
"EvaluationPeriods": 1,
"AlarmDescription": "Consumer Record Processing Falling Behind, there is risk for data loss due to record expiration.",
"MetricName": "GetRecords.IteratorAgeMilliseconds",
"Namespace": "AWS/Kinesis",
"Period": 300,
"Statistic": "Maximum",
"Threshold": 43200
}
},
"CustomETLKinesisStreamReadProvisionedThroughputExceededAlarm6AB32664": {
"Type": "AWS::CloudWatch::Alarm",
"Properties": {
"ComparisonOperator": "GreaterThanThreshold",
"EvaluationPeriods": 1,
"AlarmDescription": "Consumer Application is Reading at a Slower Rate Than Expected.",
"MetricName": "ReadProvisionedThroughputExceeded",
"Namespace": "AWS/Kinesis",
"Period": 300,
"Statistic": "Average",
"Threshold": 0
}
},
"GlueDatabase": {
Expand All @@ -523,7 +472,7 @@
},
"TableInput": {
"Parameters": {
"classication": "json"
"classification": "json"
},
"StorageDescriptor": {
"Columns": [
Expand Down Expand Up @@ -599,7 +548,7 @@
}
}
},
"GlueJobPolicyAEA4B94E": {
"CustomETLGlueJobPolicy0AE5B5CB": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
Expand Down Expand Up @@ -745,7 +694,7 @@
],
"Version": "2012-10-17"
},
"PolicyName": "GlueJobPolicyAEA4B94E",
"PolicyName": "CustomETLGlueJobPolicy0AE5B5CB",
"Roles": [
{
"Ref": "CustomETLJobRole53A1671F"
Expand Down Expand Up @@ -783,5 +732,39 @@
]
}
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}
3 changes: 2 additions & 1 deletion source/use_cases/aws-restaurant-management-demo/.eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ test/*.js
bin/*.js
*.d.ts
coverage
test/lambda/index.js
test/lambda/index.js
*/lambda/**/*.js
Loading

0 comments on commit 3455d9b

Please sign in to comment.