Skip to content
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

Jump to bottom

CSHARP-5035: Improve serverless tests to obtain secrets from vault #1314

Merged
merged 1 commit into from
Apr 29, 2024
Merged

CSHARP-5035: Improve serverless tests to obtain secrets from vault #1314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
99 changes: 41 additions & 58 deletions evergreen/evergreen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,9 +738,6 @@ functions:
- "FLE_AZURE_CLIENT_SECRET"
- "FLE_GCP_EMAIL"
- "FLE_GCP_PRIVATE_KEY"
- "SERVERLESS_ATLAS_USER"
Copy link
Member Author

Choose a reason for hiding this comment

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

Credentials is being fetched from the vault now.

- "SERVERLESS_ATLAS_PASSWORD"
- "SERVERLESS_URI"
script: |
${PREPARE_SHELL}
AUTH=${AUTH} \
Expand Down Expand Up @@ -769,47 +766,6 @@ functions:
FRAMEWORK=${FRAMEWORK} \
evergreen/run-tests.sh

create-serverless-instance:
Copy link
Member Author

Choose a reason for hiding this comment

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

I've deleted create-serverless-instance and delete-serverless-instance-if-configured tasks by moving them into setup and teardown of serverless-task-group.

- command: shell.exec
params:
shell: bash
include_expansions_in_env:
- "SERVERLESS_API_PUBLIC_KEY"
- "SERVERLESS_API_PRIVATE_KEY"
script: |
${PREPARE_SHELL}
if [ "Terminating" = "${SERVERLESS_PROXY_TYPE}" ]; then
SERVERLESS_GROUP="${TERMINATING_PROXY_SERVERLESS_DRIVERS_GROUP}"
else
SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
fi
SERVERLESS_DRIVERS_GROUP="$SERVERLESS_GROUP" \
LOADBALANCED=ON \
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
- command: expansions.update
params:
file: serverless-expansion.yml

delete-serverless-instance-if-configured:
- command: shell.exec
params:
shell: bash
include_expansions_in_env:
- "SERVERLESS_API_PUBLIC_KEY"
- "SERVERLESS_API_PRIVATE_KEY"
script: |
if [ "" != "${SERVERLESS}" ]; then
${PREPARE_SHELL}
if [ "Terminating" = "${SERVERLESS_PROXY_TYPE}" ]; then
SERVERLESS_GROUP="${TERMINATING_PROXY_SERVERLESS_DRIVERS_GROUP}"
else
SERVERLESS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
fi
SERVERLESS_DRIVERS_GROUP="$SERVERLESS_GROUP" \
SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
fi

start-kms-mock-servers:
- command: shell.exec
params:
Expand Down Expand Up @@ -1059,9 +1015,6 @@ pre:
- func: make-files-executable

post:
# Removed, causing timeouts
# - func: upload-working-dir
- func: delete-serverless-instance-if-configured
Copy link
Member Author

Choose a reason for hiding this comment

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

Do not need it here, because serverless tests have it's own task group now.

- func: upload-mo-artifacts
- func: upload-test-results
- func: cleanup
Expand Down Expand Up @@ -1279,7 +1232,6 @@ tasks:
- name: test-serverless
exec_timeout_secs: 2700 # 45 minutes: 15 for setup + 30 for tests
commands:
- func: create-serverless-instance
Copy link
Member Author

Choose a reason for hiding this comment

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

Moved to setup of serverless-task-group.

- func: run-serverless-tests

- name: test-ocsp-rsa-valid-cert-server-staples-ca-responder
Expand Down Expand Up @@ -1949,17 +1901,17 @@ axes:
variables:
FRAMEWORK: netstandard21

- id: serverless_proxy_type
display_name: Serverless Proxy Type
- id: serverless
display_name: Serverless
values:
- id: "Passthrough"
display_name: "Serverless Passthrough Proxy"
variables:
SERVERLESS_PROXY_TYPE: Passthrough
VAULT_NAME: "serverless"
- id: "Terminating"
display_name: "Serverless Terminating Proxy"
variables:
SERVERLESS_PROXY_TYPE: Terminating
VAULT_NAME: "serverless_next"

- id: build-target
display_name: CI build target
Expand Down Expand Up @@ -2194,6 +2146,35 @@ task_groups:
tasks:
- test-oidc-azure

- name: serverless-task-group
setup_group_can_fail_task: true
setup_group_timeout_secs: 1800 # 30 minutes
setup_group:
- func: fetch-source
- func: prepare-resources
- func: fix-absolute-paths
- func: make-files-executable
- func: assume-ec2-role
- command: subprocess.exec
params:
binary: bash
env:
VAULT_NAME: ${VAULT_NAME}
args:
- ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
- command: expansions.update
params:
file: serverless-expansion.yml
teardown_group:
- func: upload-test-results
- command: subprocess.exec
params:
binary: bash
args:
- ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
tasks:
- test-serverless

buildvariants:
- matrix_name: stable-api-tests
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
Expand Down Expand Up @@ -2388,16 +2369,18 @@ buildvariants:

# Serverless tests
- matrix_name: serverless-tests-windows
Copy link
Member Author

Choose a reason for hiding this comment

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

Some of evergreen-tools scripts were not happy with Windows host (I've got error: jq: command not found). I think it should be enough to run serverless tests on Ubuntu only. But if it's vital for us to have Windows tests as well - I can dig deeper to understand what we can do.

matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: "*", serverless_proxy_type: "*" }
display_name: "${serverless_proxy_type} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: ["net472", "netstandard20", "netstandard21"], serverless: "*" }
display_name: "${serverless} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
batchtime: 10080 # 7 days
tasks:
- name: test-serverless
- name: serverless-task-group

- matrix_name: serverless-tests-ubuntu
matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-2004", target_framework: ["netstandard20", "netstandard21"], serverless_proxy_type: "*" }
display_name: "${serverless_proxy_type} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-2004", target_framework: ["netstandard20", "netstandard21"], serverless: "*" }
display_name: "${serverless} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
batchtime: 10080 # 7 days
tasks:
- name: test-serverless
- name: serverless-task-group

# Performance tests
- name: driver-performance-tests
Expand Down
5 changes: 2 additions & 3 deletions evergreen/run-serverless-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ set -o errexit # Exit the script with error if any of the commands fail
# AUTH Authentication flag, must be "auth"
# FRAMEWORK Used in build.cake "TestServerless" task, must be set
# OS Operating system, must be set
# SERVERLESS_ATLAS_USER Authentication user, must be set
# SERVERLESS_ATLAS_PASSWORD Authentiction password, must be set
# SERVERLESS_URI Single atlas proxy serverless uri, must be set
# SSL TLS connection flag, must be "ssl"
# CRYPT_SHARED_LIB_PATH The path to crypt_shared library
# Modified/exported environment variables:
Expand Down Expand Up @@ -49,6 +46,8 @@ else
done
fi

source ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh

# Assume "mongodb+srv" protocol
export MONGODB_URI="mongodb+srv://${SERVERLESS_ATLAS_USER}:${SERVERLESS_ATLAS_PASSWORD}@${SERVERLESS_URI:14}"
export SERVERLESS="true"
Expand Down