Skip to content

Commit

Permalink
chore(region-info): Add missing information for all supported regions (…
Browse files Browse the repository at this point in the history 
…#26951)

Checks off some items from #26936

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
@SankyRed
SankyRed authored and Mike Wrighton committed Sep 14, 2023
1 parent 44c0a01 commit 7f363c8
Show file tree
Hide file tree
Showing 14 changed files with 630 additions and 287 deletions.
4 changes: 2 additions & 2 deletions ...ing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "34.0.0",
"files": {
"1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b": {
"01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3": {
"source": {
"path": "Stack1.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json",
"objectKey": "01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
233 changes: 188 additions & 45 deletions ...g/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "34.0.0",
"files": {
"6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2": {
"e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a": {
"source": {
"path": "Stack2.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json",
"objectKey": "e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
233 changes: 188 additions & 45 deletions ...g/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json
View file

Large diffs are not rendered by default.

16 changes: 14 additions & 2 deletions ...-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json
View file
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}/1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -51,6 +51,12 @@
"data": "MyFunc11BE70A62"
}
],
"/Stack1/Adot-lambda-layerMap": [
{
"type": "aws:cdk:logicalId",
"data": "AdotlambdalayerMap"
}
],
"/Stack1/MyFunc2/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
Expand Down Expand Up @@ -154,7 +160,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}/6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -188,6 +194,12 @@
"data": "MyFunc11BE70A62"
}
],
"/Stack2/Adot-lambda-layerMap": [
{
"type": "aws:cdk:logicalId",
"data": "AdotlambdalayerMap"
}
],
"/Stack2/MyFunc2/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
Expand Down
170 changes: 78 additions & 92 deletions ...-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"JAVASCRIPTxSDKx1x15x0x1xarm64"
]
}
],
Expand Down Expand Up @@ -174,6 +171,14 @@
"version": "0.0.0"
}
},
"Adot-lambda-layerMap": {
"id": "Adot-lambda-layerMap",
"path": "Stack1/Adot-lambda-layerMap",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnMapping",
"version": "0.0.0"
}
},
"MyFunc2": {
"id": "MyFunc2",
"path": "Stack1/MyFunc2",
Expand Down Expand Up @@ -294,15 +299,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"PYTHONxSDKx1x19x0x1xx86x64"
]
}
],
Expand Down Expand Up @@ -457,15 +459,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"JAVAxSDKx1x28x1xx86x64"
]
}
],
Expand Down Expand Up @@ -620,15 +619,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64"
]
}
],
Expand Down Expand Up @@ -783,15 +779,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"GENERICx0x82x0xx86x64"
]
}
],
Expand Down Expand Up @@ -975,15 +968,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"JAVASCRIPTxSDKx1x15x0x1xx86x64"
]
}
],
Expand Down Expand Up @@ -1018,6 +1008,14 @@
"version": "0.0.0"
}
},
"Adot-lambda-layerMap": {
"id": "Adot-lambda-layerMap",
"path": "Stack2/Adot-lambda-layerMap",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnMapping",
"version": "0.0.0"
}
},
"MyFunc2": {
"id": "MyFunc2",
"path": "Stack2/MyFunc2",
Expand Down Expand Up @@ -1138,15 +1136,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"PYTHONxSDKx1x19x0x1xx86x64"
]
}
],
Expand Down Expand Up @@ -1301,15 +1296,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"JAVAxSDKx1x28x1xx86x64"
]
}
],
Expand Down Expand Up @@ -1464,15 +1456,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64"
]
}
],
Expand Down Expand Up @@ -1627,15 +1616,12 @@
"handler": "index.handler",
"layers": [
{
"Fn::Join": [
"",
[
"arn:aws:lambda:",
{
"Ref": "AWS::Region"
},
":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1"
]
"Fn::FindInMap": [
"AdotlambdalayerMap",
{
"Ref": "AWS::Region"
},
"GENERICx0x82x0xx86x64"
]
}
],
Expand Down Expand Up @@ -1705,7 +1691,7 @@
"path": "IntegTest/DefaultTest/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.69"
"version": "10.2.70"
}
},
"DeployAssert": {
Expand Down Expand Up @@ -1751,7 +1737,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.69"
"version": "10.2.70"
}
}
},
Expand Down
11 changes: 1 addition & 10 deletions ...st/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,6 @@
"ap-south-1": {
"FirehoseCidrBlock": "13.232.67.32/27"
},
"ap-south-2": {
"FirehoseCidrBlock": "18.60.192.128/27"
},
"ap-southeast-1": {
"FirehoseCidrBlock": "13.228.64.192/27"
},
Expand All @@ -258,18 +255,12 @@
"eu-central-1": {
"FirehoseCidrBlock": "35.158.127.160/27"
},
"eu-central-2": {
"FirehoseCidrBlock": "16.62.183.32/27"
},
"eu-north-1": {
"FirehoseCidrBlock": "13.53.63.224/27"
},
"eu-south-1": {
"FirehoseCidrBlock": "15.161.135.128/27"
},
"eu-south-2": {
"FirehoseCidrBlock": "18.100.71.96/27"
},
"eu-west-1": {
"FirehoseCidrBlock": "52.19.239.192/27"
},
Expand All @@ -280,7 +271,7 @@
"FirehoseCidrBlock": "35.180.1.96/27"
},
"il-central-1": {
"FirehoseCidrBlock": "51.16.102.64/27"
"FirehoseCidrBlock": "51.16.102.0/27"
},
"me-central-1": {
"FirehoseCidrBlock": "3.28.159.32/27"
Expand Down
Loading

0 comments on commit 7f363c8

Please sign in to comment.