Skip to content

Fix/int test #462

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
jeastham1993 merged 13 commits into from
Sep 3, 2025
Merged

Fix/int test #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1b8681d
feat: update Python cdk-deploy
jeastham1993 Jul 25, 2025
738752e
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Jul 28, 2025
8c7e540
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Aug 8, 2025
07f7b7d
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Aug 29, 2025
c5a9a32
fix: resolve function param mismatch
jeastham1993 Aug 29, 2025
ac36e9e
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Aug 29, 2025
0468e42
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Sep 1, 2025
dc3bf80
Merge branch 'main' of github.com:DataDog/serverless-sample-app
jeastham1993 Sep 2, 2025
5ca19e2
fix: resolve order service build issues
jeastham1993 Sep 2, 2025
418c2cd
feat: update loyalty CDK deployment
jeastham1993 Sep 2, 2025
f26f2df
fix: resolve log group removal issue
jeastham1993 Sep 2, 2025
f9e4b55
fix: resolve order service build issues
jeastham1993 Sep 2, 2025
83b25cc
fix: remove ready to run from Lambda project
jeastham1993 Sep 2, 2025
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
1 change: 0 additions & 1 deletion src/loyalty-point-service/lib/constructs/lambdaFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ export class InstrumentedLambdaFunction extends Construct {
target: "node22",
},
});
this.function.logGroup.applyRemovalPolicy(RemovalPolicy.DESTROY);

const kmsAlias = Alias.fromAliasName(this, "SSMAlias", "aws/ssm");
kmsAlias.grantDecrypt(this.function);
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /app
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build

# Download the latest version of the tracer but don't install yet
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
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

WORKDIR /src

Expand Down
13 changes: 5 additions & 8 deletions src/order-service/src/Orders.Api/Orders.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,21 @@

<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.406.1" />
<PackageReference Include="Datadog.Trace" Version="3.20.0" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.3.1" />
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
<PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
<!-- <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.3.0" />-->
<!-- <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />-->
<!-- <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />-->
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.6" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.6" />
<PackageReference Include="NJsonSchema" Version="11.3.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.8" />
<PackageReference Include="NJsonSchema" Version="11.4.0" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/order-service/src/Orders.BackgroundWorkers/Orders.BackgroundWorkers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<!-- Generate ready to run images during publishing to improvement cold starts. -->
<PublishReadyToRun>true</PublishReadyToRun>
<PublishReadyToRun>false</PublishReadyToRun>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
Expand All @@ -19,12 +19,12 @@
<PackageReference Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.2" />
<PackageReference Include="AWS.Lambda.Powertools.Parameters" Version="1.3.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.3.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.6.1" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.2.5" />
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
<PackageReference Include="DogStatsD-CSharp-Client" Version="8.0.0" />
<PackageReference Include="DogStatsD-CSharp-Client" Version="9.0.0" />
<PackageReference Include="NJsonSchema" Version="11.4.0" />
<PackageReference Include="Polly" Version="8.6.2" />
<PackageReference Include="Polly" Version="8.6.3" />
</ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
Expand Down
10 changes: 5 additions & 5 deletions src/order-service/src/Orders.Core/Orders.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.3.1" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.0.15" />
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.3.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.6.1" />
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.1.1" />
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.4.1" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.2.5" />
<PackageReference Include="AWSSDK.StepFunctions" Version="4.0.0.17" />
<PackageReference Include="AWSSDK.StepFunctions" Version="4.0.0.23" />
<PackageReference Include="CloudNative.CloudEvents" Version="2.8.0" />
<PackageReference Include="CloudNative.CloudEvents.SystemTextJson" Version="2.8.0" />
<PackageReference Include="FluentValidation" Version="12.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
<PackageReference Include="NJsonSchema" Version="11.4.0" />
<PackageReference Include="Polly" Version="8.6.2" />
<PackageReference Include="Polly" Version="8.6.3" />
<PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/order-service/src/Orders.IntegrationTests/Orders.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Amazon.Lambda.CloudWatchEvents" Version="4.4.0" />
<PackageReference Include="AWSSDK.EventBridge" Version="3.7.406.1" />
<PackageReference Include="AWSSDK.EventBridge" Version="4.0.4.1" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -21,7 +21,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.406.1" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.2.5" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/src/Orders.UnitTests/Orders.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="FluentAssertions" Version="8.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NJsonSchema" Version="11.3.2" />
<PackageReference Include="NJsonSchema" Version="11.4.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion src/order-service/src/TestHarness/TestHarness.Lambda/TestHarness.Lambda.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
<PackageReference Include="Amazon.Lambda.Annotations" Version="1.7.0" />
<PackageReference Include="AWS.Lambda.Powertools.Logging" Version="2.0.2" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.3.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.6.1" />
<PackageReference Include="Datadog.Trace" Version="3.22.0" />
<PackageReference Include="NJsonSchema" Version="11.4.0" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/pricing-service/lib/pricing-api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ export class Api extends Construct {
},
}
);
calculatePricingFunction.logGroup.applyRemovalPolicy(RemovalPolicy.DESTROY);

// Paste Datadog configuration from the workshop here.
// Add Datadog configuration to your Lambda function
Expand Down
Loading
⚡