Skip to content

Commit 221aef1

Browse files
GarrettBeattyGarrettBeatty
authored
Merge pull request #1937 from aws/dev
Merge dev into lambda test tool branch
2 parents 5f90129 + e11b987 commit 221aef1

File tree

178 files changed

+1592
-534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+1592
-534
lines changed

‎.autover/autover.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,14 @@
127127
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester80-pack.csproj",
128128
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester90-pack.csproj"
129129
]
130+
},
131+
{
132+
"Name": "Amazon.Lambda.Templates",
133+
"Path": "Blueprints/BlueprintDefinitions/vs2022/Templates.csproj"
134+
},
135+
{
136+
"Name": "SnapshotRestore.Registry",
137+
"Path": "Libraries/src/SnapshotRestore.Registry/SnapshotRestore.Registry.csproj"
130138
}
131139
],
132140
"UseCommitsForChangelog": false,

‎.autover/changes/5f868ca3-fd40-4adc-8f0b-3b492276cc77.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/workflows/change-file-in-pr.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Change File Included in PR
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, labeled]
6+
7+
jobs:
8+
check-files-in-directory:
9+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'Release Not Needed') && !contains(github.event.pull_request.labels.*.name, 'Release PR') }}
10+
name: Change File Included in PR
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout PR code
15+
uses: actions/checkout@v3
16+
17+
- name: Get List of Changed Files
18+
id: changed-files
19+
uses: tj-actions/changed-files@4edd678ac3f81e2dc578756871e4d00c19191daf #v45
20+
21+
- name: Check for Change File(s) in .autover/changes/
22+
run: |
23+
DIRECTORY=".autover/changes/"
24+
if echo "${{ steps.changed-files.outputs.all_changed_files }}" | grep -q "$DIRECTORY"; then
25+
echo "✅ One or more change files in '$DIRECTORY' are included in this PR."
26+
else
27+
echo "❌ No change files in '$DIRECTORY' are included in this PR."
28+
echo "Refer to the 'Adding a change file to your contribution branch' section of https://github.com/aws/aws-lambda-dotnet/blob/master/CONTRIBUTING.md"
29+
exit 1
30+
fi

‎.github/workflows/create-release-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ jobs:
4242
with:
4343
fetch-depth: '0'
4444
token: ${{ env.AWS_SECRET_TOKEN }}
45-
# Install .NET8 which is needed for AutoVer
46-
- name: Setup .NET 8.0
45+
# Install .NET9 which is needed for AutoVer
46+
- name: Setup .NET 9.0
4747
uses: actions/setup-dotnet@v4
4848
with:
49-
dotnet-version: 8.0.x
49+
dotnet-version: 9.0.x
5050
# Install AutoVer to automate versioning and changelog creation
5151
- name: Install AutoVer
5252
run: dotnet tool install --global AutoVer --version 0.0.24

‎.github/workflows/update-Dockerfiles.yml

Lines changed: 54 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,32 @@ on:
1818
description: ".NET 6 Next Version"
1919
type: string
2020
required: true
21-
NET_7_AMD64:
22-
description: ".NET 7 AMD64"
21+
NET_8_AMD64:
22+
description: ".NET 8 AMD64"
2323
type: boolean
2424
required: true
2525
default: "true"
26-
NET_7_ARM64:
27-
description: ".NET 7 ARM64"
26+
NET_8_ARM64:
27+
description: ".NET 8 ARM64"
2828
type: boolean
2929
required: true
3030
default: "true"
31-
NET_7_NEXT_VERSION:
32-
description: ".NET 7 Next Version"
31+
NET_8_NEXT_VERSION:
32+
description: ".NET 8 Next Version"
3333
type: string
3434
required: true
35-
NET_8_AMD64:
36-
description: ".NET 8 AMD64"
35+
NET_9_AMD64:
36+
description: ".NET 9 AMD64"
3737
type: boolean
3838
required: true
3939
default: "true"
40-
NET_8_ARM64:
41-
description: ".NET 8 ARM64"
40+
NET_9_ARM64:
41+
description: ".NET 9 ARM64"
4242
type: boolean
4343
required: true
4444
default: "true"
45-
NET_8_NEXT_VERSION:
46-
description: ".NET 8 Next Version"
45+
NET_9_NEXT_VERSION:
46+
description: ".NET 9 Next Version"
4747
type: string
4848
required: true
4949

@@ -53,10 +53,10 @@ jobs:
5353
env:
5454
NET_6_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net6/amd64/Dockerfile"
5555
NET_6_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net6/arm64/Dockerfile"
56-
NET_7_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net7/amd64/Dockerfile"
57-
NET_7_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net7/arm64/Dockerfile"
5856
NET_8_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net8/amd64/Dockerfile"
5957
NET_8_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net8/arm64/Dockerfile"
58+
NET_9_AMD64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net9/amd64/Dockerfile"
59+
NET_9_ARM64_Dockerfile: "LambdaRuntimeDockerfiles/Images/net9/arm64/Dockerfile"
6060

6161
# Steps represent a sequence of tasks that will be executed as part of the job
6262
steps:
@@ -68,45 +68,63 @@ jobs:
6868
- name: Update .NET 6 AMD64
6969
id: update-net6-amd64
7070
shell: pwsh
71+
env:
72+
DOCKERFILE_PATH: ${{ env.NET_6_AMD64_Dockerfile }}
73+
NEXT_VERSION: ${{ github.event.inputs.NET_6_NEXT_VERSION }}
7174
run: |
72-
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_6_AMD64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_6_NEXT_VERSION }}
75+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
7376
if: ${{ github.event.inputs.NET_6_AMD64 == 'true' }}
7477

7578
- name: Update .NET 6 ARM64
7679
id: update-net6-arm64
7780
shell: pwsh
81+
env:
82+
DOCKERFILE_PATH: ${{ env.NET_6_ARM64_Dockerfile }}
83+
NEXT_VERSION: ${{ github.event.inputs.NET_6_NEXT_VERSION }}
7884
run: |
79-
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_6_ARM64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_6_NEXT_VERSION }}
85+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
8086
if: ${{ github.event.inputs.NET_6_ARM64 == 'true' }}
8187

82-
- name: Update .NET 7 AMD64
83-
id: update-net7-amd64
84-
shell: pwsh
85-
run: |
86-
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_7_AMD64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_7_NEXT_VERSION }}
87-
if: ${{ github.event.inputs.NET_7_AMD64 == 'true' }}
88-
89-
- name: Update .NET 7 ARM64
90-
id: update-net7-arm64
91-
shell: pwsh
92-
run: |
93-
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_7_ARM64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_7_NEXT_VERSION }}
94-
if: ${{ github.event.inputs.NET_7_ARM64 == 'true' }}
95-
9688
- name: Update .NET 8 AMD64
9789
id: update-net8-amd64
9890
shell: pwsh
91+
env:
92+
DOCKERFILE_PATH: ${{ env.NET_8_AMD64_Dockerfile }}
93+
NEXT_VERSION: ${{ github.event.inputs.NET_8_NEXT_VERSION }}
9994
run: |
100-
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_8_AMD64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_8_NEXT_VERSION }}
95+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
10196
if: ${{ github.event.inputs.NET_8_AMD64 == 'true' }}
10297

10398
- name: Update .NET 8 ARM64
10499
id: update-net8-arm64
105100
shell: pwsh
101+
env:
102+
DOCKERFILE_PATH: ${{ env.NET_8_ARM64_Dockerfile }}
103+
NEXT_VERSION: ${{ github.event.inputs.NET_8_NEXT_VERSION }}
106104
run: |
107-
.\LambdaRuntimeDockerfiles/update-dockerfile.ps1 -DockerfilePath ${{ env.NET_8_ARM64_Dockerfile }} -NextVersion ${{ github.event.inputs.NET_8_NEXT_VERSION }}
105+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
108106
if: ${{ github.event.inputs.NET_8_ARM64 == 'true' }}
109107

108+
- name: Update .NET 9 AMD64
109+
id: update-net9-amd64
110+
shell: pwsh
111+
env:
112+
DOCKERFILE_PATH: ${{ env.NET_9_AMD64_Dockerfile }}
113+
NEXT_VERSION: ${{ github.event.inputs.NET_9_NEXT_VERSION }}
114+
run: |
115+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
116+
if: ${{ github.event.inputs.NET_9_AMD64 == 'true' }}
117+
118+
- name: Update .NET 9 ARM64
119+
id: update-net9-arm64
120+
shell: pwsh
121+
env:
122+
DOCKERFILE_PATH: ${{ env.NET_9_ARM64_Dockerfile }}
123+
NEXT_VERSION: ${{ github.event.inputs.NET_9_NEXT_VERSION }}
124+
run: |
125+
.\LambdaRuntimeDockerfiles\update-dockerfile.ps1 -DockerfilePath "${{ env.DOCKERFILE_PATH }}" -NextVersion "${{ env.NEXT_VERSION }}"
126+
if: ${{ github.event.inputs.NET_9_ARM64 == 'true' }}
127+
110128
# Update Dockerfiles if newer version of ASP.NET Core is available
111129
- name: Commit and Push
112130
id: commit-push
@@ -140,11 +158,12 @@ jobs:
140158
'{0}\n{1}\n{2}\n{3}\n{4}\n{5}',
141159
join(steps.update-net6-amd64.outputs.MESSAGE, '\n'),
142160
join(steps.update-net6-arm64.outputs.MESSAGE, '\n'),
143-
join(steps.update-net7-amd64.outputs.MESSAGE, '\n'),
144-
join(steps.update-net7-arm64.outputs.MESSAGE, '\n'),
145161
join(steps.update-net8-amd64.outputs.MESSAGE, '\n'),
146-
join(steps.update-net8-arm64.outputs.MESSAGE, '\n')
162+
join(steps.update-net8-arm64.outputs.MESSAGE, '\n'),
163+
join(steps.update-net9-amd64.outputs.MESSAGE, '\n'),
164+
join(steps.update-net9-arm64.outputs.MESSAGE, '\n')
147165
)
148166
}}"
149167
github_token: ${{ secrets.GITHUB_TOKEN }}
150168
pr_label: "auto-pr"
169+

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
**/packages
1919
**/launchSettings.json
2020
**/Debug/
21+
**/build/
2122

2223
**/project.lock.json
2324

‎Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/BlueprintBaseName.1.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<PublishReadyToRun>true</PublishReadyToRun>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
16-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
17-
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.1" />
18-
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.3.0" />
15+
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.0" />
16+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
17+
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
18+
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.6.1" />
1919
</ItemGroup>
2020
<!--
2121
The FrameworkReference is used to reduce the deployment bundle size by not having to include

‎Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/src/BlueprintBaseName.1/serverless.template

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
33
"Transform": "AWS::Serverless-2016-10-31",
4-
"Description": "An AWS Serverless Application. This template is partially managed by Amazon.Lambda.Annotations (v1.2.0.0).",
4+
"Description": "An AWS Serverless Application. This template is partially managed by Amazon.Lambda.Annotations (v1.6.1.0).",
55
"Resources": {
66
"BlueprintBaseName1FunctionsDefaultGenerated": {
77
"Type": "AWS::Serverless::Function",
88
"Metadata": {
99
"Tool": "Amazon.Lambda.Annotations",
1010
"SyncedEvents": [
1111
"RootGet"
12-
]
12+
],
13+
"SyncedEventProperties": {
14+
"RootGet": [
15+
"Path",
16+
"Method"
17+
]
18+
}
1319
},
1420
"Properties": {
1521
"Runtime": "dotnet8",
@@ -38,7 +44,13 @@
3844
"Tool": "Amazon.Lambda.Annotations",
3945
"SyncedEvents": [
4046
"RootGet"
41-
]
47+
],
48+
"SyncedEventProperties": {
49+
"RootGet": [
50+
"Path",
51+
"Method"
52+
]
53+
}
4254
},
4355
"Properties": {
4456
"Runtime": "dotnet8",
@@ -67,7 +79,13 @@
6779
"Tool": "Amazon.Lambda.Annotations",
6880
"SyncedEvents": [
6981
"RootGet"
70-
]
82+
],
83+
"SyncedEventProperties": {
84+
"RootGet": [
85+
"Path",
86+
"Method"
87+
]
88+
}
7189
},
7290
"Properties": {
7391
"Runtime": "dotnet8",
@@ -96,7 +114,13 @@
96114
"Tool": "Amazon.Lambda.Annotations",
97115
"SyncedEvents": [
98116
"RootGet"
99-
]
117+
],
118+
"SyncedEventProperties": {
119+
"RootGet": [
120+
"Path",
121+
"Method"
122+
]
123+
}
100124
},
101125
"Properties": {
102126
"Runtime": "dotnet8",
@@ -125,7 +149,13 @@
125149
"Tool": "Amazon.Lambda.Annotations",
126150
"SyncedEvents": [
127151
"RootGet"
128-
]
152+
],
153+
"SyncedEventProperties": {
154+
"RootGet": [
155+
"Path",
156+
"Method"
157+
]
158+
}
129159
},
130160
"Properties": {
131161
"Runtime": "dotnet8",

‎Blueprints/BlueprintDefinitions/vs2022/AnnotationsFramework/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<IsTestProject>true</IsTestProject>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
9+
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.0" />
1010
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
11-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
13-
<PackageReference Include="xunit" Version="2.4.2" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
15-
<PackageReference Include="Moq" Version="4.18.2" />
11+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13+
<PackageReference Include="xunit" Version="2.9.2" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
15+
<PackageReference Include="Moq" Version="4.20.72" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<ProjectReference Include="..\..\src\BlueprintBaseName.1\BlueprintBaseName.1.csproj" />

‎Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-FSharp/template/src/BlueprintBaseName.1/BlueprintBaseName.1.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<None Include="serverless.template" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.0.0" />
21+
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.0.2" />
2222
</ItemGroup>
2323
</Project>

‎Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-FSharp/template/test/BlueprintBaseName.1.Tests/BlueprintBaseName.1.Tests.fsproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<IsPackable>false</IsPackable>
55
<TargetFramework>net8.0</TargetFramework>
66
<EnableDefaultContentItems>False</EnableDefaultContentItems>
7+
<IsTestProject>true</IsTestProject>
78
</PropertyGroup>
89
<ItemGroup>
910
<Compile Include="ValuesControllerTests.fs" />
@@ -14,12 +15,12 @@
1415
</Content>
1516
</ItemGroup>
1617
<ItemGroup>
17-
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
18+
<PackageReference Include="Amazon.Lambda.Core" Version="2.5.0" />
1819
<PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
19-
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
21-
<PackageReference Include="xunit" Version="2.3.1" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
20+
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.1" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
22+
<PackageReference Include="xunit" Version="2.9.2" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
2324
</ItemGroup>
2425
<ItemGroup>
2526
<ProjectReference Include="..\..\src\BlueprintBaseName.1\BlueprintBaseName.1.fsproj" />

‎Blueprints/BlueprintDefinitions/vs2022/AspNetCoreWebAPI-FSharp/template/test/BlueprintBaseName.1.Tests/ValuesControllerTests.fs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,3 @@ module ValuesControllerTests =
2525
Assert.True(response.MultiValueHeaders.ContainsKey("Content-Type"))
2626
Assert.Equal("application/json; charset=utf-8", response.MultiValueHeaders.Item("Content-Type").[0])
2727
}
28-
29-
[<EntryPoint>]
30-
let main _ = 0

0 commit comments

Comments
 (0)