Skip to content

Commit c4c58ef

Browse files
TalUsvyatskyTalUsvyatsky
committed
Fill in integration tests for newer runtimes
1 parent 565083f commit c4c58ef

8 files changed

Lines changed: 4122 additions & 825 deletions

‎integration_tests/correct_extension_apigateway_snapshot.json‎

Lines changed: 1048 additions & 79 deletions
Large diffs are not rendered by default.

‎integration_tests/correct_extension_snapshot.json‎

Lines changed: 1096 additions & 101 deletions
Large diffs are not rendered by default.

‎integration_tests/correct_forwarder_snapshot.json‎

Lines changed: 1220 additions & 68 deletions
Large diffs are not rendered by default.

‎integration_tests/serverless-extension-apigateway.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,21 @@ functions:
3232
PythonHello39:
3333
handler: py_handler.hello
3434
runtime: python3.9
35+
PythonHello310:
36+
handler: py_handler.hello
37+
runtime: python3.10
38+
PythonHello311:
39+
handler: py_handler.hello
40+
runtime: python3.11
41+
PythonHello312:
42+
handler: py_handler.hello
43+
runtime: python3.12
44+
PythonHello313:
45+
handler: py_handler.hello
46+
runtime: python3.13
47+
PythonHello314:
48+
handler: py_handler.hello
49+
runtime: python3.14
3550
events:
3651
- http:
3752
path: users/create
@@ -54,6 +69,12 @@ functions:
5469
JavascriptHello18-x:
5570
handler: js_handler.hello
5671
runtime: nodejs18.x
72+
JavascriptHello22-x:
73+
handler: js_handler.hello
74+
runtime: nodejs22.x
75+
JavascriptHello24-x:
76+
handler: js_handler.hello
77+
runtime: nodejs24.x
5778
JavascriptHello20-x:
5879
handler: js_handler.hello
5980
runtime: nodejs20.x
@@ -69,9 +90,27 @@ functions:
6990
JavaHello11:
7091
handler: java_handler.hello
7192
runtime: java11
93+
JavaHello17:
94+
handler: java_handler.hello
95+
runtime: java17
96+
JavaHello21:
97+
handler: java_handler.hello
98+
runtime: java21
7299
providedHello:
73100
handler: provided_handler.hello
74101
runtime: provided
102+
providedAl2Hello:
103+
handler: provided_handler.hello
104+
runtime: provided.al2
105+
providedAl2023Hello:
106+
handler: provided_handler.hello
107+
runtime: provided.al2023
75108
RubyHello32:
76109
handler: rb_handler.hello
77110
runtime: ruby3.2
111+
RubyHello33:
112+
handler: rb_handler.hello
113+
runtime: ruby3.3
114+
RubyHello34:
115+
handler: rb_handler.hello
116+
runtime: ruby3.4

‎integration_tests/serverless-extension.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,21 @@ functions:
3030
PythonHello39:
3131
handler: py_handler.hello
3232
runtime: python3.9
33+
PythonHello310:
34+
handler: py_handler.hello
35+
runtime: python3.10
36+
PythonHello311:
37+
handler: py_handler.hello
38+
runtime: python3.11
39+
PythonHello312:
40+
handler: py_handler.hello
41+
runtime: python3.12
42+
PythonHello313:
43+
handler: py_handler.hello
44+
runtime: python3.13
45+
PythonHello314:
46+
handler: py_handler.hello
47+
runtime: python3.14
3348
JavascriptHello16-x:
3449
handler: js_handler.hello
3550
runtime: nodejs16.x
@@ -41,6 +56,12 @@ functions:
4156
JavascriptHello20-x:
4257
handler: js_handler.hello
4358
runtime: nodejs20.x
59+
JavascriptHello22-x:
60+
handler: js_handler.hello
61+
runtime: nodejs22.x
62+
JavascriptHello24-x:
63+
handler: js_handler.hello
64+
runtime: nodejs24.x
4465
ExcludeThis:
4566
handler: js_handler.hello
4667
runtime: nodejs20.x
@@ -64,12 +85,30 @@ functions:
6485
JavaHello11:
6586
handler: java_handler.hello
6687
runtime: java11
88+
JavaHello17:
89+
handler: java_handler.hello
90+
runtime: java17
91+
JavaHello21:
92+
handler: java_handler.hello
93+
runtime: java21
6794
providedHello:
6895
handler: provided_handler.hello
6996
runtime: provided
97+
providedAl2Hello:
98+
handler: provided_handler.hello
99+
runtime: provided.al2
100+
providedAl2023Hello:
101+
handler: provided_handler.hello
102+
runtime: provided.al2023
70103
RubyHello32:
71104
handler: rb_handler.hello
72105
runtime: ruby3.2
106+
RubyHello33:
107+
handler: rb_handler.hello
108+
runtime: ruby3.3
109+
RubyHello34:
110+
handler: rb_handler.hello
111+
runtime: ruby3.4
73112
layers:
74113
ProviderLevelLayer:
75114
path: ProviderLevelLayer # required, path to layer contents on disk

‎integration_tests/serverless-forwarder.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,21 @@ functions:
4646
path: /users/update
4747
method: put
4848
- websocket: $connect
49+
PythonHello310:
50+
handler: py_handler.hello
51+
runtime: python3.10
52+
PythonHello311:
53+
handler: py_handler.hello
54+
runtime: python3.11
55+
PythonHello312:
56+
handler: py_handler.hello
57+
runtime: python3.12
58+
PythonHello313:
59+
handler: py_handler.hello
60+
runtime: python3.13
61+
PythonHello314:
62+
handler: py_handler.hello
63+
runtime: python3.14
4964
JavascriptHello16-x:
5065
handler: js_handler.hello
5166
runtime: nodejs16.x
@@ -63,6 +78,12 @@ functions:
6378
JavascriptHello20-x:
6479
handler: js_handler.hello
6580
runtime: nodejs20.x
81+
JavascriptHello22-x:
82+
handler: js_handler.hello
83+
runtime: nodejs22.x
84+
JavascriptHello24-x:
85+
handler: js_handler.hello
86+
runtime: nodejs24.x
6687
ExcludeThis:
6788
handler: js_handler.hello
6889
runtime: nodejs20.x
@@ -81,12 +102,30 @@ functions:
81102
JavaHello11:
82103
handler: java_handler.hello
83104
runtime: java11
105+
JavaHello17:
106+
handler: java_handler.hello
107+
runtime: java17
108+
JavaHello21:
109+
handler: java_handler.hello
110+
runtime: java21
84111
providedHello:
85112
handler: provided_handler.hello
86113
runtime: provided
114+
providedAl2Hello:
115+
handler: provided_handler.hello
116+
runtime: provided.al2
117+
providedAl2023Hello:
118+
handler: provided_handler.hello
119+
runtime: provided.al2023
87120
RubyHello32:
88121
handler: rb_handler.hello
89122
runtime: ruby3.2
123+
RubyHello33:
124+
handler: rb_handler.hello
125+
runtime: ruby3.3
126+
RubyHello34:
127+
handler: rb_handler.hello
128+
runtime: ruby3.4
90129

91130
resources:
92131
Resources:

‎scripts/run_integration_tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ for ((i = 0; i < ${#SERVERLESS_CONFIGS[@]}; i++)); do
5151
# Normalize dd_sls_plugin version tag value
5252
perl -p -i -e 's/(v\d+.\d+.\d+)/vX.XX.X/g' ${RAW_CFN_TEMPLATE}
5353
# Normalize Datadog Layer Arn versions
54-
perl -p -i -e 's/(arn:aws:lambda:sa-east-1:464622532012:layer:(Datadog-(Python37|Python38|Python39|Ruby2-7|Ruby3-2|Node12-x|Node14-x|Node16-x|Node18-x|Node20-x|Extension)|dd-trace-(dotnet|java))(-ARM)?:\d+)/arn:aws:lambda:sa-east-1:464622532012:layer:\2:XXX/g' ${RAW_CFN_TEMPLATE}
54+
perl -p -i -e 's/(arn:aws:lambda:sa-east-1:464622532012:layer:(Datadog-(Python37|Python38|Python39|Python310|Python311|Python312|Python313|Python314|Ruby2-7|Ruby3-2|Ruby3-3|Ruby3-4|Node12-x|Node14-x|Node16-x|Node18-x|Node20-x|Node22-x|Node24-x|Extension)|dd-trace-(dotnet|java))(-ARM)?:\d+)/arn:aws:lambda:sa-east-1:464622532012:layer:\2:XXX/g' ${RAW_CFN_TEMPLATE}
5555
# Normalize API Gateway timestamps
5656
perl -p -i -e 's/("ApiGatewayDeployment.*")/"ApiGatewayDeploymentxxxx"/g' ${RAW_CFN_TEMPLATE}
5757
# Normalize layer timestamps

0 commit comments

Comments
 (0)