Skip to content

Commit

Permalink
Merge branch 'main' into feat/flex-execution-class
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jul 3, 2023
2 parents eb0f3aa + 1f81718 commit 7bf5ce0
Show file tree
Hide file tree
Showing 262 changed files with 2,295 additions and 668 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"cdk-generate-synthetic-examples": "^0.1.269",
"cdk-generate-synthetic-examples": "^0.1.287",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"32.0.0"}
{"version":"32.0.0"}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ccba2c7f389f66409665f07bcb2666a07a8c23938ebc9b56a50efab196a77ed4.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c4721f164de83c1379bfc3e5bdaa871656ead17b9124d58d6f57190dc616b215.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "32.0.0",
"files": {
"ccba2c7f389f66409665f07bcb2666a07a8c23938ebc9b56a50efab196a77ed4": {
"c4721f164de83c1379bfc3e5bdaa871656ead17b9124d58d6f57190dc616b215": {
"source": {
"path": "test-stack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "ccba2c7f389f66409665f07bcb2666a07a8c23938ebc9b56a50efab196a77ed4.json",
"objectKey": "c4721f164de83c1379bfc3e5bdaa871656ead17b9124d58d6f57190dc616b215.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
"FirehoseCidrBlock": "13.232.67.32/27"
},
"ap-south-2": {
"FirehoseCidrBlock": "18.60.192.128/27/27"
"FirehoseCidrBlock": "18.60.192.128/27"
},
"ap-southeast-1": {
"FirehoseCidrBlock": "13.228.64.192/27"
Expand Down Expand Up @@ -282,7 +282,7 @@
"FirehoseCidrBlock": "15.161.135.128/27"
},
"eu-south-2": {
"FirehoseCidrBlock": "18.100.194.0/26/27"
"FirehoseCidrBlock": "18.100.71.96/27"
},
"eu-west-1": {
"FirehoseCidrBlock": "52.19.239.192/27"
Expand All @@ -294,7 +294,7 @@
"FirehoseCidrBlock": "35.180.1.96/27"
},
"me-central-1": {
"FirehoseCidrBlock": "3.28.159.64/26/27"
"FirehoseCidrBlock": "3.28.159.32/27"
},
"me-south-1": {
"FirehoseCidrBlock": "15.185.91.0/27"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.26"
"version": "10.2.55"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "32.0.0",
"files": {
"67bc58d61807d4199cfee4e3648f547f9166e2cfd4daff09c30e062dc39836bb": {
"34085a156be7581e436eea82acdd24e3f389a1c3ac4b2e0e935e9397cdc6f494": {
"source": {
"path": "aws-cdk-firehose-delivery-stream.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "67bc58d61807d4199cfee4e3648f547f9166e2cfd4daff09c30e062dc39836bb.json",
"objectKey": "34085a156be7581e436eea82acdd24e3f389a1c3ac4b2e0e935e9397cdc6f494.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
"FirehoseCidrBlock": "13.232.67.32/27"
},
"ap-south-2": {
"FirehoseCidrBlock": "18.60.192.128/27/27"
"FirehoseCidrBlock": "18.60.192.128/27"
},
"ap-southeast-1": {
"FirehoseCidrBlock": "13.228.64.192/27"
Expand Down Expand Up @@ -245,7 +245,7 @@
"FirehoseCidrBlock": "15.161.135.128/27"
},
"eu-south-2": {
"FirehoseCidrBlock": "18.100.194.0/26/27"
"FirehoseCidrBlock": "18.100.71.96/27"
},
"eu-west-1": {
"FirehoseCidrBlock": "52.19.239.192/27"
Expand All @@ -257,7 +257,7 @@
"FirehoseCidrBlock": "35.180.1.96/27"
},
"me-central-1": {
"FirehoseCidrBlock": "3.28.159.64/26/27"
"FirehoseCidrBlock": "3.28.159.32/27"
},
"me-south-1": {
"FirehoseCidrBlock": "15.185.91.0/27"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/67bc58d61807d4199cfee4e3648f547f9166e2cfd4daff09c30e062dc39836bb.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/34085a156be7581e436eea82acdd24e3f389a1c3ac4b2e0e935e9397cdc6f494.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.26"
"version": "10.2.55"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "32.0.0",
"files": {
"2cf7703fe55148d123cd83ca24670c1150ca46d90df2ee140e32782ad3fb1136": {
"10e54a44cd2b6f73e19dab6bb92ac8ecc3e61ee0afe895acc57cd610ac5e1120": {
"source": {
"path": "aws-cdk-firehose-delivery-stream-source-stream.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "2cf7703fe55148d123cd83ca24670c1150ca46d90df2ee140e32782ad3fb1136.json",
"objectKey": "10e54a44cd2b6f73e19dab6bb92ac8ecc3e61ee0afe895acc57cd610ac5e1120.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
"FirehoseCidrBlock": "13.232.67.32/27"
},
"ap-south-2": {
"FirehoseCidrBlock": "18.60.192.128/27/27"
"FirehoseCidrBlock": "18.60.192.128/27"
},
"ap-southeast-1": {
"FirehoseCidrBlock": "13.228.64.192/27"
Expand Down Expand Up @@ -261,7 +261,7 @@
"FirehoseCidrBlock": "15.161.135.128/27"
},
"eu-south-2": {
"FirehoseCidrBlock": "18.100.194.0/26/27"
"FirehoseCidrBlock": "18.100.71.96/27"
},
"eu-west-1": {
"FirehoseCidrBlock": "52.19.239.192/27"
Expand All @@ -273,7 +273,7 @@
"FirehoseCidrBlock": "35.180.1.96/27"
},
"me-central-1": {
"FirehoseCidrBlock": "3.28.159.64/26/27"
"FirehoseCidrBlock": "3.28.159.32/27"
},
"me-south-1": {
"FirehoseCidrBlock": "15.185.91.0/27"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/2cf7703fe55148d123cd83ca24670c1150ca46d90df2ee140e32782ad3fb1136.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/10e54a44cd2b6f73e19dab6bb92ac8ecc3e61ee0afe895acc57cd610ac5e1120.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.26"
"version": "10.2.55"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "32.0.0",
"files": {
"f26622ca3477134f226bcbfd161988e8b7bfd0eb4a33cac70da555408ccfbdb7": {
"2575608c9455922c199396dd056f7479bb172f5c6068cd093f6d061160f48cee": {
"source": {
"path": "asset.f26622ca3477134f226bcbfd161988e8b7bfd0eb4a33cac70da555408ccfbdb7",
"path": "asset.2575608c9455922c199396dd056f7479bb172f5c6068cd093f6d061160f48cee",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "f26622ca3477134f226bcbfd161988e8b7bfd0eb4a33cac70da555408ccfbdb7.zip",
"objectKey": "2575608c9455922c199396dd056f7479bb172f5c6068cd093f6d061160f48cee.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand All @@ -27,15 +27,15 @@
}
}
},
"0654178c2e8d0b200d13e08bf7506131fee4d25b379a4bc18413f9af11f397f3": {
"55042edc1476b0946b499146ce55ad62b3aef0fb7fe88908cc81f8cf4936c070": {
"source": {
"path": "aws-cdk-firehose-delivery-stream-s3-all-properties.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "0654178c2e8d0b200d13e08bf7506131fee4d25b379a4bc18413f9af11f397f3.json",
"objectKey": "55042edc1476b0946b499146ce55ad62b3aef0fb7fe88908cc81f8cf4936c070.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "f26622ca3477134f226bcbfd161988e8b7bfd0eb4a33cac70da555408ccfbdb7.zip"
"S3Key": "2575608c9455922c199396dd056f7479bb172f5c6068cd093f6d061160f48cee.zip"
},
"Timeout": 900,
"MemorySize": 128,
Expand Down Expand Up @@ -827,7 +827,7 @@
"FirehoseCidrBlock": "13.232.67.32/27"
},
"ap-south-2": {
"FirehoseCidrBlock": "18.60.192.128/27/27"
"FirehoseCidrBlock": "18.60.192.128/27"
},
"ap-southeast-1": {
"FirehoseCidrBlock": "13.228.64.192/27"
Expand Down Expand Up @@ -860,7 +860,7 @@
"FirehoseCidrBlock": "15.161.135.128/27"
},
"eu-south-2": {
"FirehoseCidrBlock": "18.100.194.0/26/27"
"FirehoseCidrBlock": "18.100.71.96/27"
},
"eu-west-1": {
"FirehoseCidrBlock": "52.19.239.192/27"
Expand All @@ -872,7 +872,7 @@
"FirehoseCidrBlock": "35.180.1.96/27"
},
"me-central-1": {
"FirehoseCidrBlock": "3.28.159.64/26/27"
"FirehoseCidrBlock": "3.28.159.32/27"
},
"me-south-1": {
"FirehoseCidrBlock": "15.185.91.0/27"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0654178c2e8d0b200d13e08bf7506131fee4d25b379a4bc18413f9af11f397f3.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/55042edc1476b0946b499146ce55ad62b3aef0fb7fe88908cc81f8cf4936c070.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.54"
"version": "10.2.55"
}
}
},
Expand Down
Loading

0 comments on commit 7bf5ce0

Please sign in to comment.