Skip to content

Commit 9cf8df4

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into mrgrain/fix/log-retention-lambda-timeout
2 parents 2bce5f1 + 1604cf4 commit 9cf8df4

35 files changed

Lines changed: 1809 additions & 1319 deletions

File tree

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.assets.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "34.0.0",
33
"files": {
4-
"1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b": {
4+
"01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3": {
55
"source": {
66
"path": "Stack1.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json",
12+
"objectKey": "01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack1.template.json‎

Lines changed: 188 additions & 45 deletions
Large diffs are not rendered by default.

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.assets.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "34.0.0",
33
"files": {
4-
"6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2": {
4+
"e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a": {
55
"source": {
66
"path": "Stack2.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json",
12+
"objectKey": "e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/Stack2.template.json‎

Lines changed: 188 additions & 45 deletions
Large diffs are not rendered by default.

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/manifest.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/1595b714f06f04cf3b2e60976e8389a8d554ffffa4eca3eb8438f9a15d67116b.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/01afe8da9ea87a08ed5fcd6d1210bdfcbf70eb76bc879920d41504c4dd273cd3.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [
@@ -51,6 +51,12 @@
5151
"data": "MyFunc11BE70A62"
5252
}
5353
],
54+
"/Stack1/Adot-lambda-layerMap": [
55+
{
56+
"type": "aws:cdk:logicalId",
57+
"data": "AdotlambdalayerMap"
58+
}
59+
],
5460
"/Stack1/MyFunc2/ServiceRole/Resource": [
5561
{
5662
"type": "aws:cdk:logicalId",
@@ -154,7 +160,7 @@
154160
"validateOnSynth": false,
155161
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
156162
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
157-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6010a807a17c346691761911ce5d79987064910e874698ffba25d2bb3fa856c2.json",
163+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/e1c2a4ae63b9add2950b0c729d6797444548224838167f8f20396b4852ad246a.json",
158164
"requiresBootstrapStackVersion": 6,
159165
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
160166
"additionalDependencies": [
@@ -188,6 +194,12 @@
188194
"data": "MyFunc11BE70A62"
189195
}
190196
],
197+
"/Stack2/Adot-lambda-layerMap": [
198+
{
199+
"type": "aws:cdk:logicalId",
200+
"data": "AdotlambdalayerMap"
201+
}
202+
],
191203
"/Stack2/MyFunc2/ServiceRole/Resource": [
192204
{
193205
"type": "aws:cdk:logicalId",

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.lambda-adot.js.snapshot/tree.json‎

Lines changed: 78 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,12 @@
131131
"handler": "index.handler",
132132
"layers": [
133133
{
134-
"Fn::Join": [
135-
"",
136-
[
137-
"arn:aws:lambda:",
138-
{
139-
"Ref": "AWS::Region"
140-
},
141-
":901920570463:layer:aws-otel-nodejs-arm64-ver-1-15-0:2"
142-
]
134+
"Fn::FindInMap": [
135+
"AdotlambdalayerMap",
136+
{
137+
"Ref": "AWS::Region"
138+
},
139+
"JAVASCRIPTxSDKx1x15x0x1xarm64"
143140
]
144141
}
145142
],
@@ -174,6 +171,14 @@
174171
"version": "0.0.0"
175172
}
176173
},
174+
"Adot-lambda-layerMap": {
175+
"id": "Adot-lambda-layerMap",
176+
"path": "Stack1/Adot-lambda-layerMap",
177+
"constructInfo": {
178+
"fqn": "aws-cdk-lib.CfnMapping",
179+
"version": "0.0.0"
180+
}
181+
},
177182
"MyFunc2": {
178183
"id": "MyFunc2",
179184
"path": "Stack1/MyFunc2",
@@ -294,15 +299,12 @@
294299
"handler": "index.handler",
295300
"layers": [
296301
{
297-
"Fn::Join": [
298-
"",
299-
[
300-
"arn:aws:lambda:",
301-
{
302-
"Ref": "AWS::Region"
303-
},
304-
":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2"
305-
]
302+
"Fn::FindInMap": [
303+
"AdotlambdalayerMap",
304+
{
305+
"Ref": "AWS::Region"
306+
},
307+
"PYTHONxSDKx1x19x0x1xx86x64"
306308
]
307309
}
308310
],
@@ -457,15 +459,12 @@
457459
"handler": "index.handler",
458460
"layers": [
459461
{
460-
"Fn::Join": [
461-
"",
462-
[
463-
"arn:aws:lambda:",
464-
{
465-
"Ref": "AWS::Region"
466-
},
467-
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1"
468-
]
462+
"Fn::FindInMap": [
463+
"AdotlambdalayerMap",
464+
{
465+
"Ref": "AWS::Region"
466+
},
467+
"JAVAxSDKx1x28x1xx86x64"
469468
]
470469
}
471470
],
@@ -620,15 +619,12 @@
620619
"handler": "index.handler",
621620
"layers": [
622621
{
623-
"Fn::Join": [
624-
"",
625-
[
626-
"arn:aws:lambda:",
627-
{
628-
"Ref": "AWS::Region"
629-
},
630-
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1"
631-
]
622+
"Fn::FindInMap": [
623+
"AdotlambdalayerMap",
624+
{
625+
"Ref": "AWS::Region"
626+
},
627+
"JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64"
632628
]
633629
}
634630
],
@@ -783,15 +779,12 @@
783779
"handler": "index.handler",
784780
"layers": [
785781
{
786-
"Fn::Join": [
787-
"",
788-
[
789-
"arn:aws:lambda:",
790-
{
791-
"Ref": "AWS::Region"
792-
},
793-
":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1"
794-
]
782+
"Fn::FindInMap": [
783+
"AdotlambdalayerMap",
784+
{
785+
"Ref": "AWS::Region"
786+
},
787+
"GENERICx0x82x0xx86x64"
795788
]
796789
}
797790
],
@@ -975,15 +968,12 @@
975968
"handler": "index.handler",
976969
"layers": [
977970
{
978-
"Fn::Join": [
979-
"",
980-
[
981-
"arn:aws:lambda:",
982-
{
983-
"Ref": "AWS::Region"
984-
},
985-
":901920570463:layer:aws-otel-nodejs-amd64-ver-1-15-0:2"
986-
]
971+
"Fn::FindInMap": [
972+
"AdotlambdalayerMap",
973+
{
974+
"Ref": "AWS::Region"
975+
},
976+
"JAVASCRIPTxSDKx1x15x0x1xx86x64"
987977
]
988978
}
989979
],
@@ -1018,6 +1008,14 @@
10181008
"version": "0.0.0"
10191009
}
10201010
},
1011+
"Adot-lambda-layerMap": {
1012+
"id": "Adot-lambda-layerMap",
1013+
"path": "Stack2/Adot-lambda-layerMap",
1014+
"constructInfo": {
1015+
"fqn": "aws-cdk-lib.CfnMapping",
1016+
"version": "0.0.0"
1017+
}
1018+
},
10211019
"MyFunc2": {
10221020
"id": "MyFunc2",
10231021
"path": "Stack2/MyFunc2",
@@ -1138,15 +1136,12 @@
11381136
"handler": "index.handler",
11391137
"layers": [
11401138
{
1141-
"Fn::Join": [
1142-
"",
1143-
[
1144-
"arn:aws:lambda:",
1145-
{
1146-
"Ref": "AWS::Region"
1147-
},
1148-
":901920570463:layer:aws-otel-python-amd64-ver-1-19-0:2"
1149-
]
1139+
"Fn::FindInMap": [
1140+
"AdotlambdalayerMap",
1141+
{
1142+
"Ref": "AWS::Region"
1143+
},
1144+
"PYTHONxSDKx1x19x0x1xx86x64"
11501145
]
11511146
}
11521147
],
@@ -1301,15 +1296,12 @@
13011296
"handler": "index.handler",
13021297
"layers": [
13031298
{
1304-
"Fn::Join": [
1305-
"",
1306-
[
1307-
"arn:aws:lambda:",
1308-
{
1309-
"Ref": "AWS::Region"
1310-
},
1311-
":901920570463:layer:aws-otel-java-wrapper-amd64-ver-1-28-1:1"
1312-
]
1299+
"Fn::FindInMap": [
1300+
"AdotlambdalayerMap",
1301+
{
1302+
"Ref": "AWS::Region"
1303+
},
1304+
"JAVAxSDKx1x28x1xx86x64"
13131305
]
13141306
}
13151307
],
@@ -1464,15 +1456,12 @@
14641456
"handler": "index.handler",
14651457
"layers": [
14661458
{
1467-
"Fn::Join": [
1468-
"",
1469-
[
1470-
"arn:aws:lambda:",
1471-
{
1472-
"Ref": "AWS::Region"
1473-
},
1474-
":901920570463:layer:aws-otel-java-agent-amd64-ver-1-28-1:1"
1475-
]
1459+
"Fn::FindInMap": [
1460+
"AdotlambdalayerMap",
1461+
{
1462+
"Ref": "AWS::Region"
1463+
},
1464+
"JAVAxAUTOxINSTRUMENTATIONx1x28x1xx86x64"
14761465
]
14771466
}
14781467
],
@@ -1627,15 +1616,12 @@
16271616
"handler": "index.handler",
16281617
"layers": [
16291618
{
1630-
"Fn::Join": [
1631-
"",
1632-
[
1633-
"arn:aws:lambda:",
1634-
{
1635-
"Ref": "AWS::Region"
1636-
},
1637-
":901920570463:layer:aws-otel-collector-amd64-ver-0-82-0:1"
1638-
]
1619+
"Fn::FindInMap": [
1620+
"AdotlambdalayerMap",
1621+
{
1622+
"Ref": "AWS::Region"
1623+
},
1624+
"GENERICx0x82x0xx86x64"
16391625
]
16401626
}
16411627
],
@@ -1705,7 +1691,7 @@
17051691
"path": "IntegTest/DefaultTest/Default",
17061692
"constructInfo": {
17071693
"fqn": "constructs.Construct",
1708-
"version": "10.2.69"
1694+
"version": "10.2.70"
17091695
}
17101696
},
17111697
"DeployAssert": {
@@ -1751,7 +1737,7 @@
17511737
"path": "Tree",
17521738
"constructInfo": {
17531739
"fqn": "constructs.Construct",
1754-
"version": "10.2.69"
1740+
"version": "10.2.70"
17551741
}
17561742
}
17571743
},

packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.ab0afc2f801b8ac11473bad4d9f22578919d8959b5f1bcd21b05c4ac895dbcab/__entrypoint__.js renamed to packages/@aws-cdk-testing/framework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/asset.79d89314ddbd33f89269ebfdd0cab9c219b5f5d59c210d4847fd849b9c341563/__entrypoint__.js

File renamed without changes.

0 commit comments

Comments
 (0)