Skip to content

CSHARP-5479: Fix AWS lambda tests #1606

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
merged 3 commits into from
Feb 4, 2025
Merged

CSHARP-5479: Fix AWS lambda tests #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d29659
CSHARP-5479: Fix aws lambda tests
adelinowona Jan 29, 2025
fd1a4da
some evergreen cleanup
adelinowona Jan 31, 2025
91a5841
remove application insights monitoring
adelinowona Feb 3, 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
16 changes: 8 additions & 8 deletions evergreen/evergreen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,9 @@ tasks:
params:
role_arn: ${LAMBDA_AWS_ROLE_ARN}
duration_seconds: 3600
- func: install-dotnet
vars:
DOTNET_SDK_VERSION: 8.0
- command: shell.exec
params:
working_dir: mongo-csharp-driver
Expand All @@ -1529,6 +1532,7 @@ tasks:
${PREPARE_SHELL}
evergreen/run-deployed-lambda-aws-tests.sh
env:
LAMBDA_STACK_NAME: dbx-csharp-lambda
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/tests/FaasTests/LambdaTests
AWS_REGION: us-east-1

Expand Down Expand Up @@ -2067,8 +2071,6 @@ task_groups:
- "AWS_ACCESS_KEY_ID"
- "AWS_SECRET_ACCESS_KEY"
- "AWS_SESSION_TOKEN"
env:
VAULT_NAME: "azurekms"
args:
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
- command: subprocess.exec
Expand Down Expand Up @@ -2115,8 +2117,6 @@ task_groups:
- "AWS_ACCESS_KEY_ID"
- "AWS_SECRET_ACCESS_KEY"
- "AWS_SESSION_TOKEN"
env:
VAULT_NAME: "gcpkms"
args:
- ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup-secrets.sh
- command: subprocess.exec
Expand Down Expand Up @@ -2161,10 +2161,9 @@ task_groups:
- "AWS_ACCESS_KEY_ID"
- "AWS_SECRET_ACCESS_KEY"
- "AWS_SESSION_TOKEN"
env:
VAULT_NAME: "atlas"
args:
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-secrets.sh
- "atlas"
- command: subprocess.exec
params:
binary: bash
Expand Down Expand Up @@ -2196,17 +2195,18 @@ task_groups:
- command: subprocess.exec
params:
binary: bash
add_expansions_to_env: true
env:
LAMBDA_STACK_NAME: dbx-csharp-lambda
args:
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
- command: expansions.update
params:
file: atlas-expansion.yml
redact_file_expansions: true
teardown_group:
- command: subprocess.exec
params:
binary: bash
add_expansions_to_env: true
args:
- ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
tasks:
Expand Down
18 changes: 5 additions & 13 deletions evergreen/run-deployed-lambda-aws-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,10 @@
set -o xtrace # Write all commands first to stderr
set -o errexit # Exit the script with error if any of the commands fail

LOCALTOOLPATH=$TEST_LAMBDA_DIRECTORY/localtool
# SAM CLI installs the "Amazon.Lambda.Tools" tool in this location so we need to add it to our PATH
export PATH="$PATH:$HOME/.dotnet/tools"

echo "Installing aws lambda tool to a custom location"
dotnet tool install "Amazon.Lambda.Tools" --tool-path $LOCALTOOLPATH
# setting this as SAM CLI seems to check DOTNET_ROOT directly instead of the PATH
export DOTNET_ROOT=$DOTNET_SDK_PATH

# makes the "sam build" command use the local version of the lambda tool
export PATH="$PATH:$LOCALTOOLPATH"

. ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh

# uninstall global version installed by the "sam build" command
dotnet tool uninstall -g "Amazon.Lambda.Tools"

# uninstall our local version
dotnet tool uninstall "Amazon.Lambda.Tools" --tool-path $LOCALTOOLPATH
. ${DRIVERS_TOOLS}/.evergreen/aws_lambda/run-deployed-lambda-aws-tests.sh
2 changes: 1 addition & 1 deletion tests/FaasTests/LambdaTests/MongoDB.Driver.LambdaTest/MongoDB.Driver.LambdaTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<AWSProjectType>Lambda</AWSProjectType>
<IsPackable>false</IsPackable>
Expand Down
16 changes: 1 addition & 15 deletions tests/FaasTests/LambdaTests/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Resources:
Properties:
CodeUri: MongoDB.Driver.LambdaTest/
Handler: MongoDB.Driver.LambdaTest::MongoDB.Driver.LambdaTest.LambdaFunction::LambdaFunctionHandlerAsync
Runtime: dotnet6
Runtime: dotnet8
Architectures:
- x86_64
Environment:
Expand All @@ -33,20 +33,6 @@ Resources:
Properties:
Path: /mongodb
Method: get

ApplicationResourceGroup:
Type: AWS::ResourceGroups::Group
Properties:
Name:
Fn::Sub: ApplicationInsights-SAM-${AWS::StackName}
ResourceQuery:
Type: CLOUDFORMATION_STACK_1_0
ApplicationInsightsMonitoring:
Type: AWS::ApplicationInsights::Application
Properties:
ResourceGroupName:
Ref: ApplicationResourceGroup
AutoConfigurationEnabled: 'true'
Outputs:
Comment on lines -37 to 36
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this as it is not needed and was causing errors

LambdaTestApi:
Description: API Gateway endpoint URL for Prod stage for C# Driver Lambda Test function
Expand Down