Skip to content

Commit 48c2472

Browse files
nina9753nina9753
authored
Merge branch 'main' into nina.rei/SVLS-7706/SSM_API_KEY_Support
2 parents a11f227 + 08ada35 commit 48c2472

10 files changed

Lines changed: 580 additions & 44 deletions

‎integration_tests/correct_extension_apigateway_snapshot.json‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,18 @@
161161
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetHello8"
162162
}
163163
},
164+
"DotnetHello10LogGroup": {
165+
"Type": "AWS::Logs::LogGroup",
166+
"Properties": {
167+
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetHello10"
168+
}
169+
},
170+
"DotnetArmHello10LogGroup": {
171+
"Type": "AWS::Logs::LogGroup",
172+
"Properties": {
173+
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetArmHello10"
174+
}
175+
},
164176
"JavaHello8LogGroup": {
165177
"Type": "AWS::Logs::LogGroup",
166178
"Properties": {
@@ -1060,6 +1072,109 @@
10601072
"DotnetHello8LogGroup"
10611073
]
10621074
},
1075+
"DotnetHello10LambdaFunction": {
1076+
"Type": "AWS::Lambda::Function",
1077+
"Properties": {
1078+
"Code": {
1079+
"S3Bucket": {
1080+
"Ref": "ServerlessDeploymentBucket"
1081+
},
1082+
"S3Key": "serverless/dd-sls-plugin-integration-test/dev/XXXXXXXXXXXXX-XXXX-XX-XXXXX:XX:XX.XXXX/dd-sls-plugin-integration-test.zip"
1083+
},
1084+
"Handler": "dotnet_handler.hello",
1085+
"Runtime": "dotnet10",
1086+
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetHello10",
1087+
"MemorySize": 1024,
1088+
"Timeout": 6,
1089+
"Tags": [
1090+
{
1091+
"Key": "dd_sls_plugin",
1092+
"Value": "vX.XX.X"
1093+
}
1094+
],
1095+
"Environment": {
1096+
"Variables": {
1097+
"DD_API_KEY": 1234,
1098+
"DD_SITE": "datadoghq.com",
1099+
"DD_LOG_LEVEL": "info",
1100+
"DD_TRACE_ENABLED": true,
1101+
"DD_MERGE_XRAY_TRACES": false,
1102+
"DD_LOGS_INJECTION": false,
1103+
"DD_SERVERLESS_LOGS_ENABLED": true,
1104+
"DD_CAPTURE_LAMBDA_PAYLOAD": false,
1105+
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
1106+
"DD_SERVICE": "dd-sls-plugin-integration-test",
1107+
"DD_ENV": "dev"
1108+
}
1109+
},
1110+
"Role": {
1111+
"Fn::GetAtt": [
1112+
"IamRoleLambdaExecution",
1113+
"Arn"
1114+
]
1115+
},
1116+
"Layers": [
1117+
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
1118+
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
1119+
]
1120+
},
1121+
"DependsOn": [
1122+
"DotnetHello10LogGroup"
1123+
]
1124+
},
1125+
"DotnetArmHello10LambdaFunction": {
1126+
"Type": "AWS::Lambda::Function",
1127+
"Properties": {
1128+
"Code": {
1129+
"S3Bucket": {
1130+
"Ref": "ServerlessDeploymentBucket"
1131+
},
1132+
"S3Key": "serverless/dd-sls-plugin-integration-test/dev/XXXXXXXXXXXXX-XXXX-XX-XXXXX:XX:XX.XXXX/dd-sls-plugin-integration-test.zip"
1133+
},
1134+
"Handler": "dotnet_handler.hello",
1135+
"Runtime": "dotnet10",
1136+
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetArmHello10",
1137+
"MemorySize": 1024,
1138+
"Timeout": 6,
1139+
"Architectures": [
1140+
"arm64"
1141+
],
1142+
"Tags": [
1143+
{
1144+
"Key": "dd_sls_plugin",
1145+
"Value": "vX.XX.X"
1146+
}
1147+
],
1148+
"Environment": {
1149+
"Variables": {
1150+
"DD_API_KEY": 1234,
1151+
"DD_SITE": "datadoghq.com",
1152+
"DD_LOG_LEVEL": "info",
1153+
"DD_TRACE_ENABLED": true,
1154+
"DD_MERGE_XRAY_TRACES": false,
1155+
"DD_LOGS_INJECTION": false,
1156+
"DD_SERVERLESS_LOGS_ENABLED": true,
1157+
"DD_CAPTURE_LAMBDA_PAYLOAD": false,
1158+
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
1159+
"DD_SERVICE": "dd-sls-plugin-integration-test",
1160+
"DD_ENV": "dev"
1161+
}
1162+
},
1163+
"Role": {
1164+
"Fn::GetAtt": [
1165+
"IamRoleLambdaExecution",
1166+
"Arn"
1167+
]
1168+
},
1169+
"Layers": [
1170+
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
1171+
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
1172+
]
1173+
},
1174+
"DependsOn": [
1175+
"DotnetArmHello10LogGroup"
1176+
]
1177+
},
10631178
"JavaHello8LambdaFunction": {
10641179
"Type": "AWS::Lambda::Function",
10651180
"Properties": {
@@ -1701,6 +1816,26 @@
17011816
"CodeSha256": "XXXX"
17021817
}
17031818
},
1819+
"DotnetHello10LambdaVersionXXXX": {
1820+
"Type": "AWS::Lambda::Version",
1821+
"DeletionPolicy": "Retain",
1822+
"Properties": {
1823+
"FunctionName": {
1824+
"Ref": "DotnetHello10LambdaFunction"
1825+
},
1826+
"CodeSha256": "XXXX"
1827+
}
1828+
},
1829+
"DotnetArmHello10LambdaVersionXXXX": {
1830+
"Type": "AWS::Lambda::Version",
1831+
"DeletionPolicy": "Retain",
1832+
"Properties": {
1833+
"FunctionName": {
1834+
"Ref": "DotnetArmHello10LambdaFunction"
1835+
},
1836+
"CodeSha256": "XXXX"
1837+
}
1838+
},
17041839
"JavaHello8LambdaVersionXXXX": {
17051840
"Type": "AWS::Lambda::Version",
17061841
"DeletionPolicy": "Retain",
@@ -2677,6 +2812,24 @@
26772812
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetHello8LambdaFunctionQualifiedArn"
26782813
}
26792814
},
2815+
"DotnetHello10LambdaFunctionQualifiedArn": {
2816+
"Description": "Current Lambda function version",
2817+
"Value": {
2818+
"Ref": "DotnetHello10LambdaVersionXXXX"
2819+
},
2820+
"Export": {
2821+
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetHello10LambdaFunctionQualifiedArn"
2822+
}
2823+
},
2824+
"DotnetArmHello10LambdaFunctionQualifiedArn": {
2825+
"Description": "Current Lambda function version",
2826+
"Value": {
2827+
"Ref": "DotnetArmHello10LambdaVersionXXXX"
2828+
},
2829+
"Export": {
2830+
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetArmHello10LambdaFunctionQualifiedArn"
2831+
}
2832+
},
26802833
"JavaHello8LambdaFunctionQualifiedArn": {
26812834
"Description": "Current Lambda function version",
26822835
"Value": {

‎integration_tests/correct_extension_snapshot.json‎

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,18 @@
179179
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetArmHello8"
180180
}
181181
},
182+
"DotnetHello10LogGroup": {
183+
"Type": "AWS::Logs::LogGroup",
184+
"Properties": {
185+
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetHello10"
186+
}
187+
},
188+
"DotnetArmHello10LogGroup": {
189+
"Type": "AWS::Logs::LogGroup",
190+
"Properties": {
191+
"LogGroupName": "/aws/lambda/dd-sls-plugin-integration-test-dev-DotnetArmHello10"
192+
}
193+
},
182194
"JavaHello8LogGroup": {
183195
"Type": "AWS::Logs::LogGroup",
184196
"Properties": {
@@ -1269,6 +1281,113 @@
12691281
"DotnetArmHello8LogGroup"
12701282
]
12711283
},
1284+
"DotnetHello10LambdaFunction": {
1285+
"Type": "AWS::Lambda::Function",
1286+
"Properties": {
1287+
"Code": {
1288+
"S3Bucket": {
1289+
"Ref": "ServerlessDeploymentBucket"
1290+
},
1291+
"S3Key": "serverless/dd-sls-plugin-integration-test/dev/XXXXXXXXXXXXX-XXXX-XX-XXXXX:XX:XX.XXXX/dd-sls-plugin-integration-test.zip"
1292+
},
1293+
"Handler": "dotnet_handler.hello",
1294+
"Runtime": "dotnet10",
1295+
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetHello10",
1296+
"MemorySize": 1024,
1297+
"Timeout": 6,
1298+
"Tags": [
1299+
{
1300+
"Key": "dd_sls_plugin",
1301+
"Value": "vX.XX.X"
1302+
}
1303+
],
1304+
"Environment": {
1305+
"Variables": {
1306+
"DD_API_KEY": 1234,
1307+
"DD_SITE": "datadoghq.com",
1308+
"DD_TRACE_ENABLED": true,
1309+
"DD_MERGE_XRAY_TRACES": false,
1310+
"DD_LOGS_INJECTION": false,
1311+
"DD_SERVERLESS_LOGS_ENABLED": true,
1312+
"DD_CAPTURE_LAMBDA_PAYLOAD": false,
1313+
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
1314+
"DD_SERVICE": "dd-sls-plugin-integration-test",
1315+
"DD_ENV": "dev"
1316+
}
1317+
},
1318+
"Role": {
1319+
"Fn::GetAtt": [
1320+
"IamRoleLambdaExecution",
1321+
"Arn"
1322+
]
1323+
},
1324+
"Layers": [
1325+
{
1326+
"Ref": "ProviderLevelLayerLambdaLayer"
1327+
},
1328+
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
1329+
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
1330+
]
1331+
},
1332+
"DependsOn": [
1333+
"DotnetHello10LogGroup"
1334+
]
1335+
},
1336+
"DotnetArmHello10LambdaFunction": {
1337+
"Type": "AWS::Lambda::Function",
1338+
"Properties": {
1339+
"Code": {
1340+
"S3Bucket": {
1341+
"Ref": "ServerlessDeploymentBucket"
1342+
},
1343+
"S3Key": "serverless/dd-sls-plugin-integration-test/dev/XXXXXXXXXXXXX-XXXX-XX-XXXXX:XX:XX.XXXX/dd-sls-plugin-integration-test.zip"
1344+
},
1345+
"Handler": "dotnet_handler.hello",
1346+
"Runtime": "dotnet10",
1347+
"FunctionName": "dd-sls-plugin-integration-test-dev-DotnetArmHello10",
1348+
"MemorySize": 1024,
1349+
"Timeout": 6,
1350+
"Architectures": [
1351+
"arm64"
1352+
],
1353+
"Tags": [
1354+
{
1355+
"Key": "dd_sls_plugin",
1356+
"Value": "vX.XX.X"
1357+
}
1358+
],
1359+
"Environment": {
1360+
"Variables": {
1361+
"DD_API_KEY": 1234,
1362+
"DD_SITE": "datadoghq.com",
1363+
"DD_TRACE_ENABLED": true,
1364+
"DD_MERGE_XRAY_TRACES": false,
1365+
"DD_LOGS_INJECTION": false,
1366+
"DD_SERVERLESS_LOGS_ENABLED": true,
1367+
"DD_CAPTURE_LAMBDA_PAYLOAD": false,
1368+
"AWS_LAMBDA_EXEC_WRAPPER": "/opt/datadog_wrapper",
1369+
"DD_SERVICE": "dd-sls-plugin-integration-test",
1370+
"DD_ENV": "dev"
1371+
}
1372+
},
1373+
"Role": {
1374+
"Fn::GetAtt": [
1375+
"IamRoleLambdaExecution",
1376+
"Arn"
1377+
]
1378+
},
1379+
"Layers": [
1380+
{
1381+
"Ref": "ProviderLevelLayerLambdaLayer"
1382+
},
1383+
"arn:aws:lambda:sa-east-1:464622532012:layer:dd-trace-dotnet:XXX",
1384+
"arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Extension:XXX"
1385+
]
1386+
},
1387+
"DependsOn": [
1388+
"DotnetArmHello10LogGroup"
1389+
]
1390+
},
12721391
"JavaHello8LambdaFunction": {
12731392
"Type": "AWS::Lambda::Function",
12741393
"Properties": {
@@ -1950,6 +2069,26 @@
19502069
"CodeSha256": "XXXX"
19512070
}
19522071
},
2072+
"DotnetHello10LambdaVersionXXXX": {
2073+
"Type": "AWS::Lambda::Version",
2074+
"DeletionPolicy": "Retain",
2075+
"Properties": {
2076+
"FunctionName": {
2077+
"Ref": "DotnetHello10LambdaFunction"
2078+
},
2079+
"CodeSha256": "XXXX"
2080+
}
2081+
},
2082+
"DotnetArmHello10LambdaVersionXXXX": {
2083+
"Type": "AWS::Lambda::Version",
2084+
"DeletionPolicy": "Retain",
2085+
"Properties": {
2086+
"FunctionName": {
2087+
"Ref": "DotnetArmHello10LambdaFunction"
2088+
},
2089+
"CodeSha256": "XXXX"
2090+
}
2091+
},
19532092
"JavaHello8LambdaVersionXXXX": {
19542093
"Type": "AWS::Lambda::Version",
19552094
"DeletionPolicy": "Retain",
@@ -2269,6 +2408,24 @@
22692408
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetArmHello8LambdaFunctionQualifiedArn"
22702409
}
22712410
},
2411+
"DotnetHello10LambdaFunctionQualifiedArn": {
2412+
"Description": "Current Lambda function version",
2413+
"Value": {
2414+
"Ref": "DotnetHello10LambdaVersionXXXX"
2415+
},
2416+
"Export": {
2417+
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetHello10LambdaFunctionQualifiedArn"
2418+
}
2419+
},
2420+
"DotnetArmHello10LambdaFunctionQualifiedArn": {
2421+
"Description": "Current Lambda function version",
2422+
"Value": {
2423+
"Ref": "DotnetArmHello10LambdaVersionXXXX"
2424+
},
2425+
"Export": {
2426+
"Name": "sls-dd-sls-plugin-integration-test-dev-DotnetArmHello10LambdaFunctionQualifiedArn"
2427+
}
2428+
},
22722429
"JavaHello8LambdaFunctionQualifiedArn": {
22732430
"Description": "Current Lambda function version",
22742431
"Value": {

0 commit comments

Comments
 (0)