Skip to content

Sync dev from master #2404

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

Merged
GarrettBeatty merged 4 commits into from
Jun 3, 2026
+33 −7
Merged

Sync dev from master #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ca993d
Fix ARM integ tests
normj Jun 2, 2026
58abb00
Fix ARM integ tests
normj Jun 2, 2026
5fcf49c
Reapply Lambda Architecture when deploy test app
normj Jun 2, 2026
26bd69d
Reapply Lambda Architecture when deploy test app
normj Jun 3, 2026
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
14 changes: 8 additions & 6 deletions ...ntimeSupport.Tests/Amazon.Lambda.RuntimeSupport.IntegrationTests/BaseCustomRuntimeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
using Amazon.IdentityManagement;
using Amazon.IdentityManagement.Model;
using Amazon.Lambda.Model;
using Amazon.S3;
using Amazon.S3.Model;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Amazon.IdentityManagement;
using Amazon.IdentityManagement.Model;
using Amazon.Lambda.Model;
using Amazon.S3;
using Amazon.S3.Model;

namespace Amazon.Lambda.RuntimeSupport.IntegrationTests
{
Expand Down Expand Up @@ -291,7 +292,8 @@ protected async Task CreateFunctionAsync(IAmazonLambda lambdaClient, string buck
MemorySize = FUNCTION_MEMORY_MB,
Timeout = 30,
Runtime = runtime,
Role = ExecutionRoleArn
Role = ExecutionRoleArn,
Architectures = new List<string> { RuntimeInformation.OSArchitecture == System.Runtime.InteropServices.Architecture.Arm64 ? Architecture.Arm64 : Architecture.X86_64 }
};

var startTime = DateTime.Now;
Expand Down
26 changes: 25 additions & 1 deletion Libraries/test/TestServerlessApp/serverless.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,30 @@
"AWSTemplateFormatVersion": "2010-09-09",
"Transform": "AWS::Serverless-2016-10-31",
"Description": "This template is partially managed by Amazon.Lambda.Annotations (v2.0.1.0).",
"Parameters": {
"ArchitectureTypeParameter": {
"Type": "String",
"Default": "x86_64",
"AllowedValues": [
"x86_64",
"arm64"
],
"Description": "The architecture of the Lambda function."
}
},
"Globals": {
"Function": {
"Architectures": [
{
"Ref": "ArchitectureTypeParameter"
}
],
"Tags": {
"aws-tests": "TestServerlessApp",
"aws-repo": "aws-lambda-dotnet"
}
}
},
"Resources": {
"AnnotationsHttpApi": {
"Type": "AWS::Serverless::HttpApi",
Expand Down Expand Up @@ -1569,4 +1593,4 @@
"Type": "AWS::DynamoDB::Table"
}
}
}
}
Loading