Skip to content

Commit 6d63fac

Browse files
hjgracahjgraca
committed
Merge branch 'develop' of https://github.com/hjgraca/powertools-lambda-dotnet into fix(metrics)-dimessions-with-missing-array
2 parents df3709e + a08c5cb commit 6d63fac

File tree

10 files changed

+63
-19
lines changed

10 files changed

+63
-19
lines changed

‎.github/workflows/e2e-tests.yml

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,15 @@ jobs:
5151
cdk deploy --require-approval never
5252
5353
deploy-aot-stack:
54-
runs-on: ubuntu-latest
54+
strategy:
55+
matrix:
56+
os: [ubuntu-24.04-arm, ubuntu-latest]
57+
include:
58+
- os: ubuntu-24.04-arm
59+
arch: arm64
60+
- os: ubuntu-latest
61+
arch: x86_64
62+
runs-on: ${{ matrix.os }}
5563
steps:
5664
- name: Checkout code
5765
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -73,10 +81,10 @@ jobs:
7381
- name: Install AWS Lambda .NET CLI Tools
7482
run: dotnet tool install -g Amazon.Lambda.Tools
7583

76-
- name: Deploy AOT Stack x86_64
84+
- name: Deploy AOT Stack
7785
run: |
7886
cd libraries/tests/e2e/infra-aot
79-
cdk deploy -c architecture=x86_64 --require-approval never
87+
cdk deploy -c architecture=${{ matrix.arch }} --require-approval never
8088
8189
run-tests:
8290
runs-on: ubuntu-latest
@@ -132,8 +140,38 @@ jobs:
132140
run: |
133141
cd libraries/tests/e2e/infra
134142
cdk destroy --force
135-
136-
- name: Destroy AOT Core Stack
143+
144+
destroy-aot-stack:
145+
strategy:
146+
matrix:
147+
os: [ubuntu-24.04-arm, ubuntu-latest]
148+
include:
149+
- os: ubuntu-24.04-arm
150+
arch: arm64
151+
- os: ubuntu-latest
152+
arch: x86_64
153+
runs-on: ${{ matrix.os }}
154+
needs: run-tests
155+
if: always()
156+
steps:
157+
- name: Checkout code
158+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
159+
160+
- name: Configure AWS credentials
161+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502
162+
with:
163+
role-to-assume: ${{ secrets.E2E_DEPLOY_ROLE }}
164+
aws-region: us-east-1
165+
mask-aws-account-id: true
166+
167+
- name: Install CDK
168+
run: npm install -g aws-cdk
169+
170+
- name: Install AWS Lambda .NET CLI Tools
171+
run: dotnet tool install -g Amazon.Lambda.Tools
172+
173+
- name: Destroy arm64 AOT Core Stack
137174
run: |
138175
cd libraries/tests/e2e/infra-aot
139-
cdk destroy -c architecture=x86_64 --force
176+
cdk destroy -c architecture=${{ matrix.arch }} --force
177+

‎examples/AOT/AOT_Logging/src/AOT_Logging/AOT_Logging.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0"/>
2121
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0"/>
2222
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3"/>
23-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.0" />
23+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.3" />
2424
</ItemGroup>
25-
</Project>
25+
</Project>

‎examples/AOT/AOT_Tracing/src/AOT_Tracing/AOT_Tracing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0"/>
2121
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0"/>
2222
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3"/>
23-
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.5.1" />
23+
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.6.0" />
2424
</ItemGroup>
2525
</Project>

‎examples/BatchProcessing/src/HelloWorld/HelloWorld.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
99
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
1010
<PackageReference Include="AWS.Lambda.Powertools.BatchProcessing" Version="1.1.2" />
11-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.0" />
11+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.3" />
1212
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
1313
</ItemGroup>
1414
</Project>

‎examples/Idempotency/src/HelloWorld/HelloWorld.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
1010
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
1111
<PackageReference Include="AWS.Lambda.Powertools.Idempotency" Version="1.2.2" />
12-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.0" />
12+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.3" />
1313
</ItemGroup>
1414
</Project>

‎examples/Logging/src/HelloWorld/HelloWorld.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
99
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
1010
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
11-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.0" />
11+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.3" />
1212
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.301.18" />
1313
</ItemGroup>
1414
</Project>

‎examples/Metrics/src/HelloWorld/HelloWorld.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
99
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
1010
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
11-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.0" />
11+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.3" />
1212
<PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="1.7.1" />
1313
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.301.18" />
1414
</ItemGroup>

‎examples/ServerlessApi/src/LambdaPowertoolsAPI/LambdaPowertoolsAPI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<PackageReference Include="Amazon.Lambda.AspNetCoreServer" Version="9.0.0" />
16-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.0" />
16+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.3" />
1717
<PackageReference Include="AWS.Lambda.Powertools.Metrics" Version="1.7.1" />
18-
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.5.1" />
18+
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.6.0" />
1919
</ItemGroup>
2020
</Project>

‎examples/Tracing/src/HelloWorld/HelloWorld.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
99
<PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
1010
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
11-
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.0" />
12-
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.5.1" />
11+
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.6.3" />
12+
<PackageReference Include="AWS.Lambda.Powertools.Tracing" Version="1.6.0" />
1313
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.301.18" />
1414
</ItemGroup>
1515
</Project>

‎libraries/tests/e2e/infra-aot/Program.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,17 @@ public static void Main(string[] args)
1919
throw new System.ArgumentException("architecture context must be either arm64 or x86_64");
2020
}
2121

22-
_ = new CoreAotStack(app, "CoreAotStack", new AotStackProps
22+
var id = "CoreAotStack";
23+
if(architecture == "arm64")
24+
{
25+
id = $"CoreAotStack-{architecture}";
26+
}
27+
28+
_ = new CoreAotStack(app, id, new AotStackProps
2329
{
2430
Architecture = architecture
2531
});
2632
app.Synth();
2733
}
2834
}
29-
}
35+
}

0 commit comments

Comments
 (0)