Skip to content

Commit 8353c35

Browse files
jeastham1993jeastham1993
authored
Fix/int test (#462)
* feat: update Python cdk-deploy * fix: resolve function param mismatch * fix: resolve order service build issues * feat: update loyalty CDK deployment * fix: resolve log group removal issue * fix: resolve order service build issues * fix: remove ready to run from Lambda project
1 parent 3d12a69 commit 8353c35

File tree

9 files changed

+19
-24
lines changed

9 files changed

+19
-24
lines changed

‎src/loyalty-point-service/lib/constructs/lambdaFunction.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ export class InstrumentedLambdaFunction extends Construct {
8888
target: "node22",
8989
},
9090
});
91-
this.function.logGroup.applyRemovalPolicy(RemovalPolicy.DESTROY);
9291

9392
const kmsAlias = Alias.fromAliasName(this, "SSMAlias", "aws/ssm");
9493
kmsAlias.grantDecrypt(this.function);

‎src/order-service/src/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ WORKDIR /app
44
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
55

66
# Download the latest version of the tracer but don't install yet
7-
RUN curl -Lo /tmp/datadog-dotnet-apm.deb https://github.com/DataDog/dd-trace-dotnet/releases/download/v3.20.0/datadog-dotnet-apm_3.20.0_amd64.deb
7+
RUN curl -Lo /tmp/datadog-dotnet-apm.deb https://github.com/DataDog/dd-trace-dotnet/releases/download/v3.22.0/datadog-dotnet-apm_3.22.0_amd64.deb
88

99
WORKDIR /src
1010

‎src/order-service/src/Orders.Api/Orders.Api.csproj‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,21 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
13-
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.406.1" />
14-
<PackageReference Include="Datadog.Trace" Version="3.20.0" />
13+
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.3.1" />
14+
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
1515
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
1616
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
1717
<PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
18-
<!-- <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.3.0" />-->
19-
<!-- <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />-->
20-
<!-- <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />-->
2118
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
2219
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.6" />
23-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.6" />
24-
<PackageReference Include="NJsonSchema" Version="11.3.2" />
20+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.8" />
21+
<PackageReference Include="NJsonSchema" Version="11.4.0" />
2522
<PackageReference Include="Serilog" Version="4.3.0" />
2623
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
2724
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
2825
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
2926
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
30-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1" />
27+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
3128
</ItemGroup>
3229

3330
<ItemGroup>

‎src/order-service/src/Orders.BackgroundWorkers/Orders.BackgroundWorkers.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->
1010
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1111
<!-- Generate ready to run images during publishing to improvement cold starts. -->
12-
<PublishReadyToRun>true</PublishReadyToRun>
12+
<PublishReadyToRun>false</PublishReadyToRun>
1313
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
1414
</PropertyGroup>
1515
<ItemGroup>
@@ -19,12 +19,12 @@
1919
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
2020
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.2" />
2121
<PackageReference Include="AWS.Lambda.Powertools.Parameters" Version="1.3.1" />
22-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.3.1" />
22+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.6.1" />
2323
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.2.5" />
2424
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
25-
<PackageReference Include="DogStatsD-CSharp-Client" Version="8.0.0" />
25+
<PackageReference Include="DogStatsD-CSharp-Client" Version="9.0.0" />
2626
<PackageReference Include="NJsonSchema" Version="11.4.0" />
27-
<PackageReference Include="Polly" Version="8.6.2" />
27+
<PackageReference Include="Polly" Version="8.6.3" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<FrameworkReference Include="Microsoft.AspNetCore.App" />

‎src/order-service/src/Orders.Core/Orders.Core.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.3.1" />
13-
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.0.15" />
14-
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.3.1" />
12+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.6.1" />
13+
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.1.1" />
14+
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.4.1" />
1515
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.2.5" />
16-
<PackageReference Include="AWSSDK.StepFunctions" Version="4.0.0.17" />
16+
<PackageReference Include="AWSSDK.StepFunctions" Version="4.0.0.23" />
1717
<PackageReference Include="CloudNative.CloudEvents" Version="2.8.0" />
1818
<PackageReference Include="CloudNative.CloudEvents.SystemTextJson" Version="2.8.0" />
1919
<PackageReference Include="FluentValidation" Version="12.0.0" />
2020
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
2121
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
2222
<PackageReference Include="NJsonSchema" Version="11.4.0" />
23-
<PackageReference Include="Polly" Version="8.6.2" />
23+
<PackageReference Include="Polly" Version="8.6.3" />
2424
<PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
2525
<PackageReference Include="Serilog" Version="4.3.0" />
2626
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />

‎src/order-service/src/Orders.IntegrationTests/Orders.IntegrationTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.4.0" />
12-
<PackageReference Include="AWSSDK.EventBridge" Version="3.7.406.1" />
12+
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.4.1" />
1313
<PackageReference Include="coverlet.collector" Version="6.0.4">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -21,7 +21,7 @@
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.406.1" />
24+
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.2.5" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎src/order-service/src/Orders.UnitTests/Orders.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="FluentAssertions" Version="8.4.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1919
<PackageReference Include="Moq" Version="4.20.72" />
20-
<PackageReference Include="NJsonSchema" Version="11.3.2" />
20+
<PackageReference Include="NJsonSchema" Version="11.4.0" />
2121
<PackageReference Include="xunit" Version="2.9.3" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/order-service/src/TestHarness/TestHarness.Lambda/TestHarness.Lambda.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
2121
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.7.0" />
2222
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.2" />
23-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.3.1" />
23+
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.6.1" />
2424
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
2525
<PackageReference Include="NJsonSchema" Version="11.4.0" />
2626
</ItemGroup>

‎src/pricing-service/lib/pricing-api/api.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ export class Api extends Construct {
8484
},
8585
}
8686
);
87-
calculatePricingFunction.logGroup.applyRemovalPolicy(RemovalPolicy.DESTROY);
8887

8988
// Paste Datadog configuration from the workshop here.
9089
// Add Datadog configuration to your Lambda function

0 commit comments

Comments
 (0)
⚡