Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(region-info): register eu-central-2, fix firehose cidr blocks for ap-south-2, eu-south-2, me-central-1 #25572

Merged
merged 21 commits into from
Jul 3, 2023
Merged

chore(region-info): register eu-central-2, fix firehose cidr blocks for ap-south-2, eu-south-2, me-central-1 #25572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3eb137b
add available info for eu-central-2 to fact-tables.ts
sumupitchayan May 12, 2023
a1f0158
Merge branch 'main' into sumughan/register-eu-central-2
sumupitchayan May 27, 2023
06fea99
run integ tests on @aws-cdk, no changes from aws-cdk-lib
sumupitchayan May 27, 2023
b778eb9
update region-info snapshot
sumupitchayan May 27, 2023
28fb5d9
Merge branch 'main' into sumughan/register-eu-central-2
sumupitchayan Jun 6, 2023
195690c
Merge branch 'main' into sumughan/register-eu-central-2
sumupitchayan Jun 26, 2023
ac1f7e4
comment out metadata resource for ap-south-2 and eu-central-2
sumupitchayan Jun 26, 2023
213992f
Merge branch 'main' into sumughan/register-eu-central-2
sumupitchayan Jun 29, 2023
79bbf5a
update region info unit test snapshot
sumupitchayan Jun 29, 2023
6600001
Merge branch 'main' into sumughan/register-eu-central-2
sumupitchayan Jun 29, 2023
6ba81ce
fix cidr value for ap-south-2
sumupitchayan Jun 29, 2023
03c8aed
fix cidr value for eu-central-2
sumupitchayan Jun 29, 2023
a39909c
fix cidr value for eu-south-2
sumupitchayan Jun 29, 2023
2b20964
Merge branch 'sumughan/register-eu-central-2' of https://github.com/a…
sumupitchayan Jun 29, 2023
43b21f9
fix cidr value for me-central-1
sumupitchayan Jun 29, 2023
c77fee7
update integ snapshots on packages/@aws-cdk
sumupitchayan Jun 29, 2023
5fdca3d
fix me-central-1 cidr block value again
sumupitchayan Jul 2, 2023
f0f2ff0
revert change to FEATURE_FLAGS.md
sumupitchayan Jul 2, 2023
4996ab8
rerun integ tests on @aws-cdk
sumupitchayan Jul 3, 2023
cbf727b
Merge branch 'main' into sumughan/register-eu-central-2
sumupitchayan Jul 3, 2023
e93637a
Merge branch 'main' into sumughan/register-eu-central-2
mergify[bot] Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"32.0.0"}
{"version":"32.0.0"}
2 changes: 1 addition & 1 deletion ...ns-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/manifest.json
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.assets.json
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...st/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ctions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/tree.json
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.assets.json
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...pha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...s/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/manifest.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/tree.json
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...ream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.assets.json
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...am.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/manifest.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion .../aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/tree.json
View file
Open in desktop
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
0 ...a33cac70da555408ccfbdb7/index.js/index.js → ...bb172f5c6068cd093f6d061160f48cee/index.js
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ....s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.assets.json
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions ...3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/manifest.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/tree.json
View file
Open in desktop
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