diff --git a/.evergreen.yml b/.evergreen.yml index 895ca6cb8..f35a98c84 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -1190,8 +1190,8 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1199,13 +1199,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xc_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1213,13 +1213,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xe_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1227,13 +1227,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xc_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1241,13 +1241,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xe_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1255,13 +1255,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xc_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1269,13 +1269,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xe_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-mlatest_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n20_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-mlatest_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1283,13 +1283,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-mlatest_n20_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-mlatest_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1297,13 +1297,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xc_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m60xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m60xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1311,13 +1311,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m60xe_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m60xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1325,13 +1325,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xc_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m70xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m70xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1339,13 +1339,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m70xe_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m70xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1353,13 +1353,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xc_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-m80xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-m80xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m80xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1367,13 +1367,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-m80xe_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-m80xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz + local_file: src/nyc-output-darwin_unit-mlatest_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -1381,7 +1381,7 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz + tar xvzf nyc-output-darwin_unit-mlatest_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} @@ -3374,8 +3374,8 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m42xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m42xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3383,13 +3383,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m42xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m42xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3397,13 +3397,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3411,13 +3411,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3425,13 +3425,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3439,13 +3439,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3453,13 +3453,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3467,13 +3467,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3481,13 +3481,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3495,13 +3495,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3509,13 +3509,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xc_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3523,13 +3523,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xe_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-mlatest_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n20_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-mlatest_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3537,13 +3537,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-mlatest_n20_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-mlatest_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m42xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3551,13 +3551,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m42xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3565,13 +3565,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m44xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3579,13 +3579,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m44xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3593,13 +3593,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m50xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3607,13 +3607,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m50xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3621,13 +3621,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m60xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m60xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3635,13 +3635,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m60xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m60xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3649,13 +3649,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m70xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m70xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3663,13 +3663,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m70xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m70xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3677,13 +3677,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xc_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-m80xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-m80xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m80xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3691,13 +3691,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-m80xe_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-m80xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz + local_file: src/nyc-output-linux_unit-mlatest_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -3705,7 +3705,7 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz + tar xvzf nyc-output-linux_unit-mlatest_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} @@ -5586,8 +5586,8 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5595,13 +5595,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5609,13 +5609,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5623,13 +5623,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5637,13 +5637,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5651,13 +5651,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5665,13 +5665,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5679,13 +5679,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5693,13 +5693,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5707,13 +5707,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5721,13 +5721,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xc_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xc_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5735,13 +5735,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xc_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xc_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xe_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xe_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5749,13 +5749,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xe_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xe_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-mlatest_n20_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5763,13 +5763,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-mlatest_n20_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5777,13 +5777,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m42xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5791,13 +5791,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m42xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5805,13 +5805,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m44xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5819,13 +5819,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m44xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5833,13 +5833,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m50xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5847,13 +5847,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m50xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5861,13 +5861,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m60xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5875,13 +5875,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m60xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5889,13 +5889,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m70xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5903,13 +5903,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m70xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xc_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xc_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xc_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5917,13 +5917,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xc_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xc_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-m80xe_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-m80xe_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m80xe_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5931,13 +5931,13 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-m80xe_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-m80xe_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz - remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz + local_file: src/nyc-output-win32_unit-mlatest_n16_service_provider_node_driver.tgz + remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_service_provider_node_driver.tgz bucket: mciuploads - command: shell.exec params: @@ -5945,7 +5945,7 @@ functions: shell: bash script: | set -e - tar xvzf nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz + tar xvzf nyc-output-win32_unit-mlatest_n16_service_provider_node_driver.tgz - command: s3.get params: aws_key: ${aws_key} @@ -9991,7 +9991,7 @@ tasks: mongosh_skip_node_version_check: "" mongosh_test_id: "n16_service_provider_core" mongosh_run_only_in_package: "service-provider-core" - - name: test_m42xc_n20_service_provider_server + - name: test_m42xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10006,9 +10006,9 @@ tasks: mongosh_server_test_version: "4.2.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m42xe_n20_service_provider_server + mongosh_test_id: "m42xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m42xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10023,9 +10023,9 @@ tasks: mongosh_server_test_version: "4.2.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xc_n20_service_provider_server + mongosh_test_id: "m42xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10040,9 +10040,9 @@ tasks: mongosh_server_test_version: "4.4.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xe_n20_service_provider_server + mongosh_test_id: "m44xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10057,9 +10057,9 @@ tasks: mongosh_server_test_version: "4.4.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xc_n20_service_provider_server + mongosh_test_id: "m44xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10074,9 +10074,9 @@ tasks: mongosh_server_test_version: "5.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xe_n20_service_provider_server + mongosh_test_id: "m50xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10091,9 +10091,9 @@ tasks: mongosh_server_test_version: "5.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xc_n20_service_provider_server + mongosh_test_id: "m50xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10108,9 +10108,9 @@ tasks: mongosh_server_test_version: "6.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xe_n20_service_provider_server + mongosh_test_id: "m60xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10125,9 +10125,9 @@ tasks: mongosh_server_test_version: "6.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xc_n20_service_provider_server + mongosh_test_id: "m60xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10142,9 +10142,9 @@ tasks: mongosh_server_test_version: "7.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xe_n20_service_provider_server + mongosh_test_id: "m70xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10159,9 +10159,9 @@ tasks: mongosh_server_test_version: "7.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xc_n20_service_provider_server + mongosh_test_id: "m70xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xc_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10176,9 +10176,9 @@ tasks: mongosh_server_test_version: "8.0.x" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xc_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xe_n20_service_provider_server + mongosh_test_id: "m80xc_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xe_n20_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10193,9 +10193,9 @@ tasks: mongosh_server_test_version: "8.0.x-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xe_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_mlatest_n20_service_provider_server + mongosh_test_id: "m80xe_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_mlatest_n20_service_provider_node_driver tags: ["unit-test","mlatest"] depends_on: - name: compile_ts @@ -10210,9 +10210,9 @@ tasks: mongosh_server_test_version: "latest-alpha-enterprise" node_js_version: "20.18.0" mongosh_skip_node_version_check: "" - mongosh_test_id: "mlatest_n20_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m42xc_n16_service_provider_server + mongosh_test_id: "mlatest_n20_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m42xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10227,9 +10227,9 @@ tasks: mongosh_server_test_version: "4.2.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m42xe_n16_service_provider_server + mongosh_test_id: "m42xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m42xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10244,9 +10244,9 @@ tasks: mongosh_server_test_version: "4.2.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m42xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xc_n16_service_provider_server + mongosh_test_id: "m42xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10261,9 +10261,9 @@ tasks: mongosh_server_test_version: "4.4.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m44xe_n16_service_provider_server + mongosh_test_id: "m44xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m44xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10278,9 +10278,9 @@ tasks: mongosh_server_test_version: "4.4.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m44xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xc_n16_service_provider_server + mongosh_test_id: "m44xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10295,9 +10295,9 @@ tasks: mongosh_server_test_version: "5.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m50xe_n16_service_provider_server + mongosh_test_id: "m50xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m50xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10312,9 +10312,9 @@ tasks: mongosh_server_test_version: "5.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m50xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xc_n16_service_provider_server + mongosh_test_id: "m50xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10329,9 +10329,9 @@ tasks: mongosh_server_test_version: "6.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m60xe_n16_service_provider_server + mongosh_test_id: "m60xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m60xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10346,9 +10346,9 @@ tasks: mongosh_server_test_version: "6.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m60xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xc_n16_service_provider_server + mongosh_test_id: "m60xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10363,9 +10363,9 @@ tasks: mongosh_server_test_version: "7.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m70xe_n16_service_provider_server + mongosh_test_id: "m70xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m70xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10380,9 +10380,9 @@ tasks: mongosh_server_test_version: "7.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m70xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xc_n16_service_provider_server + mongosh_test_id: "m70xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xc_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10397,9 +10397,9 @@ tasks: mongosh_server_test_version: "8.0.x" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xc_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_m80xe_n16_service_provider_server + mongosh_test_id: "m80xc_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_m80xe_n16_service_provider_node_driver tags: ["unit-test"] depends_on: - name: compile_ts @@ -10414,9 +10414,9 @@ tasks: mongosh_server_test_version: "8.0.x-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "m80xe_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" - - name: test_mlatest_n16_service_provider_server + mongosh_test_id: "m80xe_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" + - name: test_mlatest_n16_service_provider_node_driver tags: ["unit-test","mlatest"] depends_on: - name: compile_ts @@ -10431,8 +10431,8 @@ tasks: mongosh_server_test_version: "latest-alpha-enterprise" node_js_version: "16.20.2" mongosh_skip_node_version_check: "" - mongosh_test_id: "mlatest_n16_service_provider_server" - mongosh_run_only_in_package: "service-provider-server" + mongosh_test_id: "mlatest_n16_service_provider_node_driver" + mongosh_run_only_in_package: "service-provider-node-driver" - name: test_m42xc_n20_shell_api tags: ["unit-test"] depends_on: @@ -16445,20 +16445,20 @@ buildvariants: - name: test_mlatest_n16_node_runtime_worker_thread - name: test_n20_service_provider_core - name: test_n16_service_provider_core - - name: test_m60xc_n20_service_provider_server - - name: test_m60xe_n20_service_provider_server - - name: test_m70xc_n20_service_provider_server - - name: test_m70xe_n20_service_provider_server - - name: test_m80xc_n20_service_provider_server - - name: test_m80xe_n20_service_provider_server - - name: test_mlatest_n20_service_provider_server - - name: test_m60xc_n16_service_provider_server - - name: test_m60xe_n16_service_provider_server - - name: test_m70xc_n16_service_provider_server - - name: test_m70xe_n16_service_provider_server - - name: test_m80xc_n16_service_provider_server - - name: test_m80xe_n16_service_provider_server - - name: test_mlatest_n16_service_provider_server + - name: test_m60xc_n20_service_provider_node_driver + - name: test_m60xe_n20_service_provider_node_driver + - name: test_m70xc_n20_service_provider_node_driver + - name: test_m70xe_n20_service_provider_node_driver + - name: test_m80xc_n20_service_provider_node_driver + - name: test_m80xe_n20_service_provider_node_driver + - name: test_mlatest_n20_service_provider_node_driver + - name: test_m60xc_n16_service_provider_node_driver + - name: test_m60xe_n16_service_provider_node_driver + - name: test_m70xc_n16_service_provider_node_driver + - name: test_m70xe_n16_service_provider_node_driver + - name: test_m80xc_n16_service_provider_node_driver + - name: test_m80xe_n16_service_provider_node_driver + - name: test_mlatest_n16_service_provider_node_driver - name: test_m60xc_n20_shell_api - name: test_m60xe_n20_shell_api - name: test_m70xc_n20_shell_api @@ -16629,30 +16629,30 @@ buildvariants: - name: test_mlatest_n16_node_runtime_worker_thread - name: test_n20_service_provider_core - name: test_n16_service_provider_core - - name: test_m42xc_n20_service_provider_server - - name: test_m44xc_n20_service_provider_server - - name: test_m44xe_n20_service_provider_server - - name: test_m50xc_n20_service_provider_server - - name: test_m50xe_n20_service_provider_server - - name: test_m60xc_n20_service_provider_server - - name: test_m60xe_n20_service_provider_server - - name: test_m70xc_n20_service_provider_server - - name: test_m70xe_n20_service_provider_server - - name: test_m80xc_n20_service_provider_server - - name: test_m80xe_n20_service_provider_server - - name: test_mlatest_n20_service_provider_server - - name: test_m42xc_n16_service_provider_server - - name: test_m44xc_n16_service_provider_server - - name: test_m44xe_n16_service_provider_server - - name: test_m50xc_n16_service_provider_server - - name: test_m50xe_n16_service_provider_server - - name: test_m60xc_n16_service_provider_server - - name: test_m60xe_n16_service_provider_server - - name: test_m70xc_n16_service_provider_server - - name: test_m70xe_n16_service_provider_server - - name: test_m80xc_n16_service_provider_server - - name: test_m80xe_n16_service_provider_server - - name: test_mlatest_n16_service_provider_server + - name: test_m42xc_n20_service_provider_node_driver + - name: test_m44xc_n20_service_provider_node_driver + - name: test_m44xe_n20_service_provider_node_driver + - name: test_m50xc_n20_service_provider_node_driver + - name: test_m50xe_n20_service_provider_node_driver + - name: test_m60xc_n20_service_provider_node_driver + - name: test_m60xe_n20_service_provider_node_driver + - name: test_m70xc_n20_service_provider_node_driver + - name: test_m70xe_n20_service_provider_node_driver + - name: test_m80xc_n20_service_provider_node_driver + - name: test_m80xe_n20_service_provider_node_driver + - name: test_mlatest_n20_service_provider_node_driver + - name: test_m42xc_n16_service_provider_node_driver + - name: test_m44xc_n16_service_provider_node_driver + - name: test_m44xe_n16_service_provider_node_driver + - name: test_m50xc_n16_service_provider_node_driver + - name: test_m50xe_n16_service_provider_node_driver + - name: test_m60xc_n16_service_provider_node_driver + - name: test_m60xe_n16_service_provider_node_driver + - name: test_m70xc_n16_service_provider_node_driver + - name: test_m70xe_n16_service_provider_node_driver + - name: test_m80xc_n16_service_provider_node_driver + - name: test_m80xe_n16_service_provider_node_driver + - name: test_mlatest_n16_service_provider_node_driver - name: test_m42xc_n20_shell_api - name: test_m44xc_n20_shell_api - name: test_m44xe_n20_shell_api @@ -17203,32 +17203,32 @@ buildvariants: - name: test_mlatest_n16_node_runtime_worker_thread - name: test_n20_service_provider_core - name: test_n16_service_provider_core - - name: test_m42xc_n20_service_provider_server - - name: test_m42xe_n20_service_provider_server - - name: test_m44xc_n20_service_provider_server - - name: test_m44xe_n20_service_provider_server - - name: test_m50xc_n20_service_provider_server - - name: test_m50xe_n20_service_provider_server - - name: test_m60xc_n20_service_provider_server - - name: test_m60xe_n20_service_provider_server - - name: test_m70xc_n20_service_provider_server - - name: test_m70xe_n20_service_provider_server - - name: test_m80xc_n20_service_provider_server - - name: test_m80xe_n20_service_provider_server - - name: test_mlatest_n20_service_provider_server - - name: test_m42xc_n16_service_provider_server - - name: test_m42xe_n16_service_provider_server - - name: test_m44xc_n16_service_provider_server - - name: test_m44xe_n16_service_provider_server - - name: test_m50xc_n16_service_provider_server - - name: test_m50xe_n16_service_provider_server - - name: test_m60xc_n16_service_provider_server - - name: test_m60xe_n16_service_provider_server - - name: test_m70xc_n16_service_provider_server - - name: test_m70xe_n16_service_provider_server - - name: test_m80xc_n16_service_provider_server - - name: test_m80xe_n16_service_provider_server - - name: test_mlatest_n16_service_provider_server + - name: test_m42xc_n20_service_provider_node_driver + - name: test_m42xe_n20_service_provider_node_driver + - name: test_m44xc_n20_service_provider_node_driver + - name: test_m44xe_n20_service_provider_node_driver + - name: test_m50xc_n20_service_provider_node_driver + - name: test_m50xe_n20_service_provider_node_driver + - name: test_m60xc_n20_service_provider_node_driver + - name: test_m60xe_n20_service_provider_node_driver + - name: test_m70xc_n20_service_provider_node_driver + - name: test_m70xe_n20_service_provider_node_driver + - name: test_m80xc_n20_service_provider_node_driver + - name: test_m80xe_n20_service_provider_node_driver + - name: test_mlatest_n20_service_provider_node_driver + - name: test_m42xc_n16_service_provider_node_driver + - name: test_m42xe_n16_service_provider_node_driver + - name: test_m44xc_n16_service_provider_node_driver + - name: test_m44xe_n16_service_provider_node_driver + - name: test_m50xc_n16_service_provider_node_driver + - name: test_m50xe_n16_service_provider_node_driver + - name: test_m60xc_n16_service_provider_node_driver + - name: test_m60xe_n16_service_provider_node_driver + - name: test_m70xc_n16_service_provider_node_driver + - name: test_m70xe_n16_service_provider_node_driver + - name: test_m80xc_n16_service_provider_node_driver + - name: test_m80xe_n16_service_provider_node_driver + - name: test_mlatest_n16_service_provider_node_driver - name: test_m42xc_n20_shell_api - name: test_m42xe_n20_shell_api - name: test_m44xc_n20_shell_api diff --git a/package-lock.json b/package-lock.json index a34dd609f..43cc9ee0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "packages/logging", "packages/service-provider-core", "packages/arg-parser", - "packages/service-provider-server", + "packages/service-provider-node-driver", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", @@ -6647,8 +6647,8 @@ "resolved": "packages/service-provider-core", "link": true }, - "node_modules/@mongosh/service-provider-server": { - "resolved": "packages/service-provider-server", + "node_modules/@mongosh/service-provider-node-driver": { + "resolved": "packages/service-provider-node-driver", "link": true }, "node_modules/@mongosh/shell-api": { @@ -31156,7 +31156,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", @@ -31247,7 +31247,7 @@ "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", "@mongosh/logging": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/snippet-manager": "0.0.0-dev.0", @@ -31676,7 +31676,7 @@ "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/browser-runtime-electron": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", "depcheck": "^1.4.7", @@ -31717,9 +31717,42 @@ "mongodb-client-encryption": "^6.1.0" } }, + "packages/service-provider-node-driver": { + "name": "@mongosh/service-provider-node-driver", + "version": "0.0.0-dev.0", + "license": "Apache-2.0", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.3.0", + "@mongodb-js/oidc-plugin": "^1.1.1", + "@mongosh/errors": "0.0.0-dev.0", + "@mongosh/service-provider-core": "0.0.0-dev.0", + "@mongosh/types": "0.0.0-dev.0", + "aws4": "^1.12.0", + "mongodb": "^6.9.0", + "mongodb-connection-string-url": "^3.0.1", + "socks": "^2.8.3" + }, + "devDependencies": { + "@mongodb-js/eslint-config-mongosh": "^1.0.0", + "@mongodb-js/prettier-config-devtools": "^1.0.1", + "@mongodb-js/tsconfig-mongosh": "^1.0.0", + "@types/sinon-chai": "^3.2.4", + "depcheck": "^1.4.7", + "eslint": "^7.25.0", + "prettier": "^2.8.8" + }, + "engines": { + "node": ">=14.15.1" + }, + "optionalDependencies": { + "kerberos": "2.1.0", + "mongodb-client-encryption": "^6.1.0" + } + }, "packages/service-provider-server": { "name": "@mongosh/service-provider-server", "version": "0.0.0-dev.0", + "extraneous": true, "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.0", @@ -37229,7 +37262,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", @@ -37314,7 +37347,7 @@ "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", "@mongosh/logging": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/snippet-manager": "0.0.0-dev.0", @@ -37584,7 +37617,7 @@ "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/browser-runtime-electron": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", "depcheck": "^1.4.7", @@ -37616,8 +37649,8 @@ "prettier": "^2.8.8" } }, - "@mongosh/service-provider-server": { - "version": "file:packages/service-provider-server", + "@mongosh/service-provider-node-driver": { + "version": "file:packages/service-provider-node-driver", "requires": { "@mongodb-js/devtools-connect": "^3.3.0", "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/package.json b/package.json index 1b9716b8c..a77ff1d9b 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "packages/logging", "packages/service-provider-core", "packages/arg-parser", - "packages/service-provider-server", + "packages/service-provider-node-driver", "packages/shell-api", "packages/autocomplete", "packages/shell-evaluator", diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json index 7be04ec3e..5a77f920b 100644 --- a/packages/browser-runtime-electron/package.json +++ b/packages/browser-runtime-electron/package.json @@ -41,7 +41,7 @@ "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@types/sinon": "^7.5.1", "@types/sinon-chai": "^3.2.4", "depcheck": "^1.4.7", diff --git a/packages/browser-runtime-electron/src/electron-runtime.spec.ts b/packages/browser-runtime-electron/src/electron-runtime.spec.ts index f9645b7d0..2465265a3 100644 --- a/packages/browser-runtime-electron/src/electron-runtime.spec.ts +++ b/packages/browser-runtime-electron/src/electron-runtime.spec.ts @@ -5,20 +5,20 @@ import sinonChai from 'sinon-chai'; chai.use(sinonChai); const { expect } = chai; -import { CliServiceProvider } from '@mongosh/service-provider-server'; +import { NodeDriverServiceProvider } from '@mongosh/service-provider-node-driver'; import { bson } from '@mongosh/service-provider-core'; import { ElectronRuntime } from './electron-runtime'; import { EventEmitter } from 'events'; import type { RuntimeEvaluationListener } from '@mongosh/browser-runtime-core'; describe('Electron runtime', function () { - let serviceProvider: SinonStubbedInstance; + let serviceProvider: SinonStubbedInstance; let messageBus: SinonStubbedInstance; let evaluationListener: SinonStubbedInstance; let electronRuntime: ElectronRuntime; beforeEach(function () { - serviceProvider = sinon.createStubInstance(CliServiceProvider); + serviceProvider = sinon.createStubInstance(NodeDriverServiceProvider); serviceProvider.bsonLibrary = bson; serviceProvider.getConnectionInfo.resolves({ extraInfo: { uri: '' }, diff --git a/packages/build/src/compile/signable-compiler.ts b/packages/build/src/compile/signable-compiler.ts index cf591129a..c7cab80ff 100644 --- a/packages/build/src/compile/signable-compiler.ts +++ b/packages/build/src/compile/signable-compiler.ts @@ -10,7 +10,7 @@ import { compileJSFileAsBinary } from 'boxednode'; async function preCompileHook(nodeSourceTree: string) { const fleAddonVersion = require(path.join( await findModulePath( - 'service-provider-server', + 'service-provider-node-driver', 'mongodb-client-encryption' ), 'package.json' @@ -108,17 +108,20 @@ export class SignableCompiler { async compile(): Promise { const fleAddon = { path: await findModulePath( - 'service-provider-server', + 'service-provider-node-driver', 'mongodb-client-encryption' ), requireRegexp: /\bmongocrypt\.node$/, }; const kerberosAddon = { - path: await findModulePath('service-provider-server', 'kerberos'), + path: await findModulePath('service-provider-node-driver', 'kerberos'), requireRegexp: /\bkerberos\.node$/, }; const osDnsAddon = { - path: await findModulePath('service-provider-server', 'os-dns-native'), + path: await findModulePath( + 'service-provider-node-driver', + 'os-dns-native' + ), requireRegexp: /\bos_dns_native\.node$/, }; const cryptLibraryVersionAddon = { @@ -130,7 +133,7 @@ export class SignableCompiler { requireRegexp: /\bglibc_version\.node$/, }; // Warning! Until https://jira.mongodb.org/browse/MONGOSH-990, - // packages/service-provider-server *also* has a copy of these. + // packages/service-provider-node-driver *also* has a copy of these. // We use the versions included in packages/cli-repl here, so these // should be kept in sync! const winCAAddon = diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index 3dc9c2af3..9f3dbb40f 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -71,7 +71,7 @@ "@mongosh/js-multiline-to-singleline": "0.0.0-dev.0", "@mongosh/logging": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/snippet-manager": "0.0.0-dev.0", diff --git a/packages/cli-repl/src/build-info.ts b/packages/cli-repl/src/build-info.ts index 650f69245..99c138a4c 100644 --- a/packages/cli-repl/src/build-info.ts +++ b/packages/cli-repl/src/build-info.ts @@ -1,5 +1,5 @@ import os from 'os'; -import { CliServiceProvider } from '@mongosh/service-provider-server'; +import { NodeDriverServiceProvider } from '@mongosh/service-provider-node-driver'; export interface BuildInfo { version: string; @@ -16,7 +16,7 @@ export interface BuildInfo { sharedOpenssl: boolean; segmentApiKey?: string; runtimeGlibcVersion: string; - deps: ReturnType; + deps: ReturnType; } function getSystemArch(): (typeof process)['arch'] { @@ -79,7 +79,7 @@ export async function buildInfo({ withSegmentApiKey?: boolean; } = {}): Promise { const dependencyVersionInfo: BuildInfo['deps'] = { - ...CliServiceProvider.getVersionInformation(), + ...NodeDriverServiceProvider.getVersionInformation(), }; const buildInfo = { ...baseBuildInfo(), deps: { ...dependencyVersionInfo } }; diff --git a/packages/cli-repl/src/cli-repl.spec.ts b/packages/cli-repl/src/cli-repl.spec.ts index 37b1a24bf..a63894311 100644 --- a/packages/cli-repl/src/cli-repl.spec.ts +++ b/packages/cli-repl/src/cli-repl.spec.ts @@ -29,7 +29,7 @@ import ConnectionString from 'mongodb-connection-string-url'; import type { CliReplOptions } from './cli-repl'; import { CliRepl } from './cli-repl'; import { CliReplErrors } from './error-codes'; -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; import type { AddressInfo } from 'net'; const { EJSON } = bson; diff --git a/packages/cli-repl/src/cli-repl.ts b/packages/cli-repl/src/cli-repl.ts index db97e18de..e69350f6d 100644 --- a/packages/cli-repl/src/cli-repl.ts +++ b/packages/cli-repl/src/cli-repl.ts @@ -7,7 +7,7 @@ import { redactURICredentials } from '@mongosh/history'; import i18n from '@mongosh/i18n'; import type { AutoEncryptionOptions } from '@mongosh/service-provider-core'; import { bson } from '@mongosh/service-provider-core'; -import { CliServiceProvider } from '@mongosh/service-provider-server'; +import { NodeDriverServiceProvider } from '@mongosh/service-provider-node-driver'; import type { CliOptions, DevtoolsConnectOptions } from '@mongosh/arg-parser'; import { SnippetManager } from '@mongosh/snippet-manager'; import { Editor } from '@mongosh/editor'; @@ -829,7 +829,7 @@ export class CliRepl implements MongoshIOProvider { async connect( driverUri: string, driverOptions: DevtoolsConnectOptions - ): Promise { + ): Promise { const { quiet } = CliRepl.getFileAndEvalInfo(this.cliOptions); if (!this.cliOptions.nodb && !quiet) { this.output.write( @@ -839,7 +839,7 @@ export class CliRepl implements MongoshIOProvider { '\n' ); } - return await CliServiceProvider.connect( + return await NodeDriverServiceProvider.connect( driverUri, driverOptions, this.cliOptions, diff --git a/packages/i18n/src/locales/en_US.ts b/packages/i18n/src/locales/en_US.ts index 0da1ae248..5272483c2 100644 --- a/packages/i18n/src/locales/en_US.ts +++ b/packages/i18n/src/locales/en_US.ts @@ -128,7 +128,7 @@ const translations: Catalog = { }, 'service-provider-browser': {}, 'service-provider-core': {}, - 'service-provider-server': {}, + 'service-provider-node-driver': {}, 'shell-api': { classes: { ShellApi: { diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index c6c1d7e64..e162cf72a 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -40,7 +40,7 @@ "@mongosh/browser-runtime-core": "0.0.0-dev.0", "@mongosh/browser-runtime-electron": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", - "@mongosh/service-provider-server": "0.0.0-dev.0", + "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "bson": "^6.8.0", "depcheck": "^1.4.7", diff --git a/packages/node-runtime-worker-thread/src/index.spec.ts b/packages/node-runtime-worker-thread/src/index.spec.ts index a1aa5e909..88b626c03 100644 --- a/packages/node-runtime-worker-thread/src/index.spec.ts +++ b/packages/node-runtime-worker-thread/src/index.spec.ts @@ -5,7 +5,7 @@ import type { MongoshBus } from '@mongosh/types'; import { startSharedTestServer } from '../../../testing/integration-testing-hooks'; import { WorkerRuntime } from '../dist/index'; -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; export const dummyOptions: DevtoolsConnectOptions = Object.freeze({ productName: 'Test Product', diff --git a/packages/node-runtime-worker-thread/src/index.ts b/packages/node-runtime-worker-thread/src/index.ts index 5c417977c..e3bff7288 100644 --- a/packages/node-runtime-worker-thread/src/index.ts +++ b/packages/node-runtime-worker-thread/src/index.ts @@ -17,7 +17,7 @@ import { deserializeEvaluationResult, serializeConnectOptions, } from './serializer'; -import type { CompassServiceProvider } from '@mongosh/service-provider-server'; +import type { CompassServiceProvider } from '@mongosh/service-provider-node-driver'; import type { InterruptHandle } from 'interruptor'; import { interrupt as nativeInterrupt } from 'interruptor'; import { WorkerThreadEvaluationListener } from './worker-thread-evaluation-listener'; diff --git a/packages/node-runtime-worker-thread/src/serializer.spec.ts b/packages/node-runtime-worker-thread/src/serializer.spec.ts index 0b956b35d..e0a5f763c 100644 --- a/packages/node-runtime-worker-thread/src/serializer.spec.ts +++ b/packages/node-runtime-worker-thread/src/serializer.spec.ts @@ -1,4 +1,4 @@ -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server/lib/cli-service-provider'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; import { expect } from 'chai'; import { UUID, Long } from 'bson'; import { diff --git a/packages/node-runtime-worker-thread/src/serializer.ts b/packages/node-runtime-worker-thread/src/serializer.ts index d4b6f6b2f..3453fb6d6 100644 --- a/packages/node-runtime-worker-thread/src/serializer.ts +++ b/packages/node-runtime-worker-thread/src/serializer.ts @@ -1,7 +1,7 @@ import { inspect } from 'util'; import { EJSON } from 'bson'; import type { RuntimeEvaluationResult } from '@mongosh/browser-runtime-core'; -import type { DevtoolsConnectOptions } from '@mongosh/service-provider-server'; +import type { DevtoolsConnectOptions } from '@mongosh/service-provider-node-driver'; function isPrimitive( val: any diff --git a/packages/node-runtime-worker-thread/src/worker-runtime.ts b/packages/node-runtime-worker-thread/src/worker-runtime.ts index 8176ca4fa..e46f50ed5 100644 --- a/packages/node-runtime-worker-thread/src/worker-runtime.ts +++ b/packages/node-runtime-worker-thread/src/worker-runtime.ts @@ -9,7 +9,7 @@ import type { } from '@mongosh/browser-runtime-core'; import { ElectronRuntime } from '@mongosh/browser-runtime-electron'; import type { ServiceProvider } from '@mongosh/service-provider-core'; -import { CompassServiceProvider } from '@mongosh/service-provider-server'; +import { CompassServiceProvider } from '@mongosh/service-provider-node-driver'; import { exposeAll, createCaller } from './rpc'; import { serializeEvaluationResult, diff --git a/packages/service-provider-server/.depcheckrc b/packages/service-provider-node-driver/.depcheckrc similarity index 100% rename from packages/service-provider-server/.depcheckrc rename to packages/service-provider-node-driver/.depcheckrc diff --git a/packages/service-provider-server/.eslintignore b/packages/service-provider-node-driver/.eslintignore similarity index 100% rename from packages/service-provider-server/.eslintignore rename to packages/service-provider-node-driver/.eslintignore diff --git a/packages/service-provider-server/.eslintrc.js b/packages/service-provider-node-driver/.eslintrc.js similarity index 100% rename from packages/service-provider-server/.eslintrc.js rename to packages/service-provider-node-driver/.eslintrc.js diff --git a/packages/service-provider-server/.gitignore b/packages/service-provider-node-driver/.gitignore similarity index 100% rename from packages/service-provider-server/.gitignore rename to packages/service-provider-node-driver/.gitignore diff --git a/packages/service-provider-server/.prettierignore b/packages/service-provider-node-driver/.prettierignore similarity index 100% rename from packages/service-provider-server/.prettierignore rename to packages/service-provider-node-driver/.prettierignore diff --git a/packages/service-provider-server/.prettierrc.json b/packages/service-provider-node-driver/.prettierrc.json similarity index 100% rename from packages/service-provider-server/.prettierrc.json rename to packages/service-provider-node-driver/.prettierrc.json diff --git a/packages/service-provider-server/AUTHORS b/packages/service-provider-node-driver/AUTHORS similarity index 100% rename from packages/service-provider-server/AUTHORS rename to packages/service-provider-node-driver/AUTHORS diff --git a/packages/service-provider-server/LICENSE b/packages/service-provider-node-driver/LICENSE similarity index 100% rename from packages/service-provider-server/LICENSE rename to packages/service-provider-node-driver/LICENSE diff --git a/packages/service-provider-server/package.json b/packages/service-provider-node-driver/package.json similarity index 97% rename from packages/service-provider-server/package.json rename to packages/service-provider-node-driver/package.json index 4eced5a8b..633c7c810 100644 --- a/packages/service-provider-server/package.json +++ b/packages/service-provider-node-driver/package.json @@ -1,5 +1,5 @@ { - "name": "@mongosh/service-provider-server", + "name": "@mongosh/service-provider-node-driver", "version": "0.0.0-dev.0", "description": "MongoDB Shell Server Service Provider Package", "main": "lib/index.js", diff --git a/packages/service-provider-server/src/compass/compass-service-provider.ts b/packages/service-provider-node-driver/src/compass/compass-service-provider.ts similarity index 79% rename from packages/service-provider-server/src/compass/compass-service-provider.ts rename to packages/service-provider-node-driver/src/compass/compass-service-provider.ts index 41153a645..bb87f3ae6 100644 --- a/packages/service-provider-server/src/compass/compass-service-provider.ts +++ b/packages/service-provider-node-driver/src/compass/compass-service-provider.ts @@ -1,5 +1,5 @@ -import type { DevtoolsConnectOptions } from '../cli-service-provider'; -import CliServiceProvider from '../cli-service-provider'; +import type { DevtoolsConnectOptions } from '../node-driver-service-provider'; +import { NodeDriverServiceProvider } from '../node-driver-service-provider'; import type { MongoClient } from 'mongodb'; import type { ReplPlatform } from '@mongosh/service-provider-core'; import type ConnectionString from 'mongodb-connection-string-url'; @@ -8,7 +8,7 @@ import type { EventEmitter } from 'events'; /** * A service provider that is meant to be used in compass. */ -class CompassServiceProvider extends CliServiceProvider { +export class CompassServiceProvider extends NodeDriverServiceProvider { public readonly platform: ReplPlatform; /** * Instantiate a new CompassServiceProvider with the data-service's connected @@ -28,5 +28,3 @@ class CompassServiceProvider extends CliServiceProvider { this.platform = 'Compass'; } } - -export default CompassServiceProvider; diff --git a/packages/service-provider-node-driver/src/index.ts b/packages/service-provider-node-driver/src/index.ts new file mode 100644 index 000000000..2d6ba2543 --- /dev/null +++ b/packages/service-provider-node-driver/src/index.ts @@ -0,0 +1,4 @@ +import { NodeDriverServiceProvider } from './node-driver-service-provider'; +import { CompassServiceProvider } from './compass/compass-service-provider'; +export type { DevtoolsConnectOptions } from '@mongodb-js/devtools-connect'; +export { NodeDriverServiceProvider, CompassServiceProvider }; diff --git a/packages/service-provider-server/src/mongodb-patches.spec.ts b/packages/service-provider-node-driver/src/mongodb-patches.spec.ts similarity index 100% rename from packages/service-provider-server/src/mongodb-patches.spec.ts rename to packages/service-provider-node-driver/src/mongodb-patches.spec.ts diff --git a/packages/service-provider-server/src/mongodb-patches.ts b/packages/service-provider-node-driver/src/mongodb-patches.ts similarity index 100% rename from packages/service-provider-server/src/mongodb-patches.ts rename to packages/service-provider-node-driver/src/mongodb-patches.ts diff --git a/packages/service-provider-server/src/cli-service-provider.integration.spec.ts b/packages/service-provider-node-driver/src/node-driver-provider.integration.spec.ts similarity index 94% rename from packages/service-provider-server/src/cli-service-provider.integration.spec.ts rename to packages/service-provider-node-driver/src/node-driver-provider.integration.spec.ts index eab0d25d7..ef55af294 100644 --- a/packages/service-provider-server/src/cli-service-provider.integration.spec.ts +++ b/packages/service-provider-node-driver/src/node-driver-provider.integration.spec.ts @@ -1,6 +1,6 @@ -import type { DropDatabaseResult } from './cli-service-provider'; -import CliServiceProvider from './cli-service-provider'; -import CompassServiceProvider from './compass/compass-service-provider'; +import type { DropDatabaseResult } from './node-driver-service-provider'; +import { NodeDriverServiceProvider } from './node-driver-service-provider'; +import { CompassServiceProvider } from './compass/compass-service-provider'; import { expect } from 'chai'; import { EventEmitter } from 'events'; import { MongoClient } from 'mongodb'; @@ -24,12 +24,12 @@ import type { MongoClientOptions, } from '@mongosh/service-provider-core'; import ConnectionString from 'mongodb-connection-string-url'; -import { dummyOptions } from './cli-service-provider.spec'; +import { dummyOptions } from './node-driver-service-provider.spec'; -describe('CliServiceProvider [integration]', function () { +describe('NodeDriverServiceProvider [integration]', function () { const testServer = startSharedTestServer(); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let client: MongoClient; let dbName: string; let db: Db; @@ -46,7 +46,7 @@ describe('CliServiceProvider [integration]', function () { dbName = `test-db-${Date.now()}`; db = client.db(dbName); bus = new EventEmitter(); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( client, bus, dummyOptions, @@ -59,9 +59,9 @@ describe('CliServiceProvider [integration]', function () { }); describe('.connect', function () { - let instance: CliServiceProvider; + let instance: NodeDriverServiceProvider; beforeEach(async function () { - instance = await CliServiceProvider.connect( + instance = await NodeDriverServiceProvider.connect( connectionString, dummyOptions, {}, @@ -73,13 +73,13 @@ describe('CliServiceProvider [integration]', function () { await instance.close(true); }); - it('returns a CliServiceProvider', function () { - expect(instance).to.be.instanceOf(CliServiceProvider); + it('returns a NodeDriverServiceProvider', function () { + expect(instance).to.be.instanceOf(NodeDriverServiceProvider); }); }); describe('.getNewConnection', function () { - let instance: CliServiceProvider; + let instance: NodeDriverServiceProvider; beforeEach(async function () { instance = await serviceProvider.getNewConnection(connectionString); @@ -89,17 +89,17 @@ describe('CliServiceProvider [integration]', function () { await instance.close(true); }); - it('returns a CliServiceProvider', function () { - expect(instance).to.be.instanceOf(CliServiceProvider); + it('returns a NodeDriverServiceProvider', function () { + expect(instance).to.be.instanceOf(NodeDriverServiceProvider); }); - it('differs from the original CliServiceProvider', function () { + it('differs from the original NodeDriverServiceProvider', function () { expect(instance).to.not.equal(serviceProvider); }); }); describe('.suspend', function () { - it('allows disconnecting and reconnecting the CliServiceProvider', async function () { + it('allows disconnecting and reconnecting the NodeDriverServiceProvider', async function () { await serviceProvider.runCommandWithCheck('admin', { ping: 1 }); const reconnect = await serviceProvider.suspend(); try { @@ -155,7 +155,7 @@ describe('CliServiceProvider [integration]', function () { describe('.getConnectionInfo', function () { context('when a uri has been passed', function () { it("returns the connection's info", async function () { - const instance = new CliServiceProvider( + const instance = new NodeDriverServiceProvider( client, bus, dummyOptions, @@ -174,7 +174,11 @@ describe('CliServiceProvider [integration]', function () { context('when the optional uri has not been passed', function () { it("returns the connection's info", async function () { - const instance = new CliServiceProvider(client, bus, dummyOptions); + const instance = new NodeDriverServiceProvider( + client, + bus, + dummyOptions + ); const connectionInfo = await instance.getConnectionInfo(); expect(Object.keys(connectionInfo)).to.deep.equal([ @@ -816,7 +820,7 @@ describe('CliServiceProvider [integration]', function () { }); describe('CompassServiceProvider', function () { - let instance: CliServiceProvider; + let instance: NodeDriverServiceProvider; afterEach(async function () { await instance?.close(true); diff --git a/packages/service-provider-server/src/cli-service-provider.spec.ts b/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts similarity index 90% rename from packages/service-provider-server/src/cli-service-provider.spec.ts rename to packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts index f295ba9ac..0d73b4499 100644 --- a/packages/service-provider-server/src/cli-service-provider.spec.ts +++ b/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts @@ -5,8 +5,8 @@ import { Collection, Db, MongoClient } from 'mongodb'; import sinonChai from 'sinon-chai'; import type { StubbedInstance } from 'ts-sinon'; import sinon, { stubInterface } from 'ts-sinon'; -import type { DevtoolsConnectOptions } from './cli-service-provider'; -import CliServiceProvider from './cli-service-provider'; +import type { DevtoolsConnectOptions } from './node-driver-service-provider'; +import { NodeDriverServiceProvider } from './node-driver-service-provider'; import ConnectionString from 'mongodb-connection-string-url'; import { EventEmitter } from 'events'; import type { @@ -47,21 +47,29 @@ const createClientStub = ( return clientStub; }; -describe('CliServiceProvider', function () { - let serviceProvider: CliServiceProvider; +describe('NodeDriverServiceProvider', function () { + let serviceProvider: NodeDriverServiceProvider; let collectionStub: StubbedInstance; let bus: EventEmitter; beforeEach(function () { bus = new EventEmitter(); collectionStub = stubInterface(); - serviceProvider = new CliServiceProvider({} as any, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + {} as any, + bus, + dummyOptions + ); }); describe('#constructor', function () { const mongoClient: any = sinon.spy(); beforeEach(function () { - serviceProvider = new CliServiceProvider(mongoClient, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + mongoClient, + bus, + dummyOptions + ); }); it('sets the mongo client on the instance', function () { @@ -78,7 +86,7 @@ describe('CliServiceProvider', function () { collectionStub.aggregate.returns({ toArray: () => Promise.resolve(aggResult), } as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -100,7 +108,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.bulkWrite.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -124,7 +132,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.countDocuments.resolves(countResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -144,7 +152,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.deleteMany.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -164,7 +172,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.deleteOne.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -184,7 +192,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.distinct.resolves(distinctResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -208,7 +216,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.estimatedDocumentCount.resolves(countResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -236,7 +244,7 @@ describe('CliServiceProvider', function () { collectionStub.find.returns({ toArray: () => Promise.resolve(findResult), } as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -265,7 +273,7 @@ describe('CliServiceProvider', function () { collectionStub.find.returns({ toArray: () => Promise.resolve(findResult), } as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -291,7 +299,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.findOneAndDelete.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -317,7 +325,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.findOneAndReplace.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -347,7 +355,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.findOneAndUpdate.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -376,7 +384,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.insertMany.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -397,7 +405,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.insertOne.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -419,7 +427,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.replaceOne.resolves(commandResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -451,7 +459,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.command.resolves(commandResult); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database', async function () { @@ -471,7 +483,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.command.resolves(commandResult); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database and throws if ok: 0', async function () { @@ -497,7 +513,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.runCursorCommand.returns(commandResult); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database', function () { @@ -519,7 +539,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.updateOne.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -546,7 +566,7 @@ describe('CliServiceProvider', function () { beforeEach(function () { collectionStub = stubInterface(); collectionStub.updateMany.resolves(commandResult as any); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -574,7 +594,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('returns ok: 1 if dropped', async function () { @@ -624,7 +648,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.createIndexes.resolves(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -656,7 +680,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.listIndexes.returns(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -690,7 +714,11 @@ describe('CliServiceProvider', function () { }, } as any); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command', async function () { @@ -718,7 +746,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.renameCollection.resolves({ ok: 1 } as any); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command against the database', async function () { @@ -751,7 +783,11 @@ describe('CliServiceProvider', function () { clientStub = stubInterface(); dbStub.createCollection.resolves({} as any); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes the command', async function () { @@ -791,7 +827,11 @@ describe('CliServiceProvider', function () { dbStub = stubInterface(); clientStub = stubInterface(); clientStub.db.returns(dbStub); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); libmongoc = stubInterface(); }); @@ -827,12 +867,16 @@ describe('CliServiceProvider', function () { describe('sessions', function () { let clientStub: StubbedInstance; - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let db: StubbedInstance; let driverSession: ClientSession; beforeEach(function () { clientStub = stubInterface(); - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); driverSession = { dSession: 1 } as any; clientStub.startSession.returns(driverSession); db = stubInterface(); @@ -889,7 +933,11 @@ describe('CliServiceProvider', function () { watch: watchMock as any, }) as any; - serviceProvider = new CliServiceProvider(clientStub, bus, dummyOptions); + serviceProvider = new NodeDriverServiceProvider( + clientStub, + bus, + dummyOptions + ); }); it('executes watch on MongoClient', function () { @@ -938,7 +986,7 @@ describe('CliServiceProvider', function () { }), }, }; - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -962,7 +1010,7 @@ describe('CliServiceProvider', function () { context('when connected to an Atlas deployment', function () { it('correctly gathers info on the fake deployment', async function () { - const serviceProvider = new CliServiceProvider( + const serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -979,7 +1027,7 @@ describe('CliServiceProvider', function () { context('when connected to a DocumentDB deployment', function () { it('correctly gathers info on the fake deployment', async function () { - const serviceProvider = new CliServiceProvider( + const serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -996,7 +1044,7 @@ describe('CliServiceProvider', function () { context('when connected to a CosmosDB deployment', function () { it('correctly gathers info on the fake deployment', async function () { - const serviceProvider = new CliServiceProvider( + const serviceProvider = new NodeDriverServiceProvider( clientStub, bus, dummyOptions, @@ -1014,7 +1062,7 @@ describe('CliServiceProvider', function () { // Security-relevant tests -- description covered in e2e-oidc tests. describe('processDriverOptions', function () { - it('shares user configuration options from an existing CliServiceProvider instance', function () { + it('shares user configuration options from an existing NodeDriverServiceProvider instance', function () { const cloneableOidcOptions = { redirectURI: 'http://localhost', openBrowser: { command: '/usr/bin/browser' }, @@ -1026,7 +1074,7 @@ describe('CliServiceProvider', function () { productName: 'test', }; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { currentClientOptions: { oidc: { @@ -1051,7 +1099,7 @@ describe('CliServiceProvider', function () { const parentState: any = {}; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { uri: new ConnectionString('mongodb://localhost/'), currentClientOptions: { @@ -1069,7 +1117,7 @@ describe('CliServiceProvider', function () { const parentState: any = {}; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { uri: new ConnectionString('mongodb://localhost/'), currentClientOptions: { @@ -1087,7 +1135,7 @@ describe('CliServiceProvider', function () { const parentState: any = {}; expect( - CliServiceProvider.prototype.processDriverOptions.call( + NodeDriverServiceProvider.prototype.processDriverOptions.call( { uri: new ConnectionString('mongodb://localhost/'), currentClientOptions: { @@ -1120,7 +1168,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.listSearchIndexes.returns(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -1173,7 +1221,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.createSearchIndexes.resolves(nativeMethodResult); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -1201,7 +1249,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.dropSearchIndex.resolves(); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions @@ -1230,7 +1278,7 @@ describe('CliServiceProvider', function () { collectionStub = stubInterface(); collectionStub.updateSearchIndex.resolves(); - serviceProvider = new CliServiceProvider( + serviceProvider = new NodeDriverServiceProvider( createClientStub(collectionStub), bus, dummyOptions diff --git a/packages/service-provider-server/src/cli-service-provider.ts b/packages/service-provider-node-driver/src/node-driver-service-provider.ts similarity index 99% rename from packages/service-provider-server/src/cli-service-provider.ts rename to packages/service-provider-node-driver/src/node-driver-service-provider.ts index 328845315..559538677 100644 --- a/packages/service-provider-server/src/cli-service-provider.ts +++ b/packages/service-provider-node-driver/src/node-driver-service-provider.ts @@ -189,7 +189,7 @@ interface DependencyVersionInfo { /** * Encapsulates logic for the service provider for the mongosh CLI. */ -class CliServiceProvider +export class NodeDriverServiceProvider extends ServiceProviderCore implements ServiceProvider { @@ -203,12 +203,12 @@ class CliServiceProvider * @returns {Promise} The promise with cli service provider. */ static async connect( - this: typeof CliServiceProvider, + this: typeof NodeDriverServiceProvider, uri: string, driverOptions: DevtoolsConnectOptions, cliOptions: { nodb?: boolean } = {}, bus: MongoshBus = new EventEmitter() // TODO: Change VSCode to pass all arguments, then remove defaults - ): Promise { + ): Promise { const connectionString = new ConnectionString(uri || 'mongodb://nodb/'); const clientOptions = this.processDriverOptions( null, @@ -292,7 +292,7 @@ class CliServiceProvider private _lastSeenTopology: TopologyDescription | undefined; /** - * Instantiate a new CliServiceProvider with the Node driver's connected + * Instantiate a new NodeDriverServiceProvider with the Node driver's connected * MongoClient instance. * * @param {MongoClient} mongoClient - The Node drivers' MongoClient instance. @@ -418,7 +418,7 @@ class CliServiceProvider async getNewConnection( uri: string, options: Partial = {} - ): Promise { + ): Promise { const connectionString = new ConnectionString(uri); const clientOptions = this.processDriverOptions(connectionString, options); @@ -427,7 +427,7 @@ class CliServiceProvider clientOptions ); clientOptions.parentState = state; - return new CliServiceProvider( + return new NodeDriverServiceProvider( client, this.bus, clientOptions, @@ -1404,7 +1404,7 @@ class CliServiceProvider // Internal, only exposed for testing static processDriverOptions( - currentProviderInstance: CliServiceProvider | null, + currentProviderInstance: NodeDriverServiceProvider | null, uri: ConnectionString, opts: DevtoolsConnectOptions ): DevtoolsConnectOptions { @@ -1469,7 +1469,7 @@ class CliServiceProvider uri: ConnectionString, opts: Partial ): DevtoolsConnectOptions { - return CliServiceProvider.processDriverOptions(this, uri, { + return NodeDriverServiceProvider.processDriverOptions(this, uri, { productName: this.currentClientOptions.productName, productDocsLink: this.currentClientOptions.productDocsLink, ...opts, @@ -1533,5 +1533,4 @@ class CliServiceProvider } } -export default CliServiceProvider; export { DevtoolsConnectOptions }; diff --git a/packages/service-provider-server/tsconfig-lint.json b/packages/service-provider-node-driver/tsconfig-lint.json similarity index 100% rename from packages/service-provider-server/tsconfig-lint.json rename to packages/service-provider-node-driver/tsconfig-lint.json diff --git a/packages/service-provider-server/tsconfig.json b/packages/service-provider-node-driver/tsconfig.json similarity index 100% rename from packages/service-provider-server/tsconfig.json rename to packages/service-provider-node-driver/tsconfig.json diff --git a/packages/service-provider-server/src/index.ts b/packages/service-provider-server/src/index.ts deleted file mode 100644 index bdd49e343..000000000 --- a/packages/service-provider-server/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import CliServiceProvider from './cli-service-provider'; -import CompassServiceProvider from './compass/compass-service-provider'; -export type { DevtoolsConnectOptions } from '@mongodb-js/devtools-connect'; -export { CliServiceProvider, CompassServiceProvider }; diff --git a/packages/shell-api/src/change-stream-cursor.spec.ts b/packages/shell-api/src/change-stream-cursor.spec.ts index 368f74c59..83fd198e0 100644 --- a/packages/shell-api/src/change-stream-cursor.spec.ts +++ b/packages/shell-api/src/change-stream-cursor.spec.ts @@ -13,7 +13,7 @@ import { } from './enums'; import type { ChangeStream, Document } from '@mongosh/service-provider-core'; import { startTestCluster } from '../../../testing/integration-testing-hooks'; -import { CliServiceProvider } from '../../service-provider-server/lib'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import ShellInstanceState from './shell-instance-state'; import Mongo from './mongo'; import { ensureMaster, ensureResult } from '../test/helpers'; @@ -121,7 +121,7 @@ describe('ChangeStreamCursor', function () { const [srv0] = startTestCluster('change-stream-cursor', { topology: 'replset', }); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let mongo: Mongo; let db: Database; @@ -130,7 +130,7 @@ describe('ChangeStreamCursor', function () { before(async function () { this.timeout(100_000); - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await srv0.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/field-level-encryption.spec.ts b/packages/shell-api/src/field-level-encryption.spec.ts index e2f12ca00..6225a036e 100644 --- a/packages/shell-api/src/field-level-encryption.spec.ts +++ b/packages/shell-api/src/field-level-encryption.spec.ts @@ -28,7 +28,7 @@ import type { ClientSideFieldLevelEncryptionOptions } from './field-level-encryp import { ClientEncryption, KeyVault } from './field-level-encryption'; import Mongo from './mongo'; import ShellInstanceState from './shell-instance-state'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { startSharedTestServer } from '../../../testing/integration-testing-hooks'; import { makeFakeHTTPConnection, @@ -762,7 +762,7 @@ describe('Field Level Encryption', function () { beforeEach(async function () { dbname = `test_fle_${Date.now()}`; uri = await testServer.connectionString(); - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( uri, dummyOptions, {}, diff --git a/packages/shell-api/src/helpers.spec.ts b/packages/shell-api/src/helpers.spec.ts index b33cdae55..381c97b03 100644 --- a/packages/shell-api/src/helpers.spec.ts +++ b/packages/shell-api/src/helpers.spec.ts @@ -11,8 +11,8 @@ import { Database, Mongo, ShellInstanceState } from './index'; import constructShellBson from './shell-bson'; import type { ServiceProvider } from '@mongosh/service-provider-core'; import { bson } from '@mongosh/service-provider-core'; -import type { DevtoolsConnectOptions } from '../../service-provider-server'; -import { CliServiceProvider } from '../../service-provider-server'; // avoid cyclic dep just for test +import type { DevtoolsConnectOptions } from '../../service-provider-node-driver'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; // avoid cyclic dep just for test import { startSharedTestServer } from '../../../testing/integration-testing-hooks'; import { makeFakeConfigDatabase } from '../test/shard-test-fake-data'; import sinon from 'ts-sinon'; @@ -134,7 +134,7 @@ describe('getPrintableShardStatus', function () { let inBalancerRound = false; beforeEach(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await testServer.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/integration.spec.ts b/packages/shell-api/src/integration.spec.ts index e759bc644..58f15ce4e 100644 --- a/packages/shell-api/src/integration.spec.ts +++ b/packages/shell-api/src/integration.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { CliServiceProvider } from '../../service-provider-server'; // avoid cyclic dep just for test +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; // avoid cyclic dep just for test import ShellInstanceState from './shell-instance-state'; import type Cursor from './cursor'; import Explainable from './explainable'; @@ -33,7 +33,7 @@ const compileExpr = (templ: TemplateStringsArray, ...subs: string[]): any => { describe('Shell API (integration)', function () { const testServer = startSharedTestServer(); this.timeout(60000); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; const getIndexNames = async ( dbName: string, @@ -209,7 +209,7 @@ describe('Shell API (integration)', function () { }; before(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await testServer.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/mongo.spec.ts b/packages/shell-api/src/mongo.spec.ts index da3780fd4..dcbd6556a 100644 --- a/packages/shell-api/src/mongo.spec.ts +++ b/packages/shell-api/src/mongo.spec.ts @@ -29,7 +29,7 @@ import { MongoshInternalError, MongoshUnimplementedError, } from '@mongosh/errors'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { skipIfServerVersion, startSharedTestServer, @@ -967,7 +967,7 @@ describe('Mongo', function () { beforeEach(async function () { uri = await testServer.connectionString(); - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( uri, dummyOptions, {}, diff --git a/packages/shell-api/src/replica-set.spec.ts b/packages/shell-api/src/replica-set.spec.ts index b2610d4e8..f03129b3c 100644 --- a/packages/shell-api/src/replica-set.spec.ts +++ b/packages/shell-api/src/replica-set.spec.ts @@ -22,7 +22,7 @@ import { startTestCluster, skipIfApiStrict, } from '../../../testing/integration-testing-hooks'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import Database from './database'; import { ADMIN_DB, @@ -830,7 +830,7 @@ describe('ReplicaSet', function () { let cfg: Partial; let additionalServer: MongodSetup; - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let db: Database; let rs: ReplicaSet; @@ -847,7 +847,7 @@ describe('ReplicaSet', function () { }; additionalServer = srv3; - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( `${await srv0.connectionString()}?directConnection=true`, dummyOptions, {}, @@ -1103,10 +1103,10 @@ describe('ReplicaSet', function () { { args: ['--replSet', replId] } ); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; beforeEach(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( `${await srv0.connectionString()}?directConnection=true`, dummyOptions, {}, diff --git a/packages/shell-api/src/session.spec.ts b/packages/shell-api/src/session.spec.ts index c6133100f..f3003caeb 100644 --- a/packages/shell-api/src/session.spec.ts +++ b/packages/shell-api/src/session.spec.ts @@ -18,7 +18,7 @@ import { ALL_SERVER_VERSIONS, ALL_TOPOLOGIES, } from './enums'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { startTestCluster, skipIfServerVersion, @@ -178,7 +178,7 @@ describe('Session', function () { }); describe('integration', function () { const [srv0] = startTestCluster('session', { topology: 'replset' }); - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let mongo: Mongo; let session: Session; @@ -194,7 +194,7 @@ describe('Session', function () { beforeEach(async function () { databaseName = `test-${Date.now()}`; - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await srv0.connectionString(), dummyOptions, {}, diff --git a/packages/shell-api/src/shard.spec.ts b/packages/shell-api/src/shard.spec.ts index c8ec6a3cd..9910c0496 100644 --- a/packages/shell-api/src/shard.spec.ts +++ b/packages/shell-api/src/shard.spec.ts @@ -23,7 +23,7 @@ import { bson } from '@mongosh/service-provider-core'; import { EventEmitter } from 'events'; import ShellInstanceState from './shell-instance-state'; import { UpdateResult } from './result'; -import { CliServiceProvider } from '../../service-provider-server'; +import { NodeDriverServiceProvider } from '../../service-provider-node-driver'; import { startTestCluster, skipIfServerVersion, @@ -1986,7 +1986,7 @@ describe('Shard', function () { }); describe('integration', function () { - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let sh: Shard; const dbName = 'test'; @@ -2005,7 +2005,7 @@ describe('Shard', function () { ); before(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await mongos.connectionString(), dummyOptions, {}, @@ -2065,7 +2065,7 @@ describe('Shard', function () { before(async function () { try { - apiStrictServiceProvider = await CliServiceProvider.connect( + apiStrictServiceProvider = await NodeDriverServiceProvider.connect( await mongos.connectionString(), { ...dummyOptions, @@ -2986,7 +2986,7 @@ describe('Shard', function () { }); describe('integration chunks', function () { - let serviceProvider: CliServiceProvider; + let serviceProvider: NodeDriverServiceProvider; let instanceState: ShellInstanceState; let sh: Shard; const dbName = 'test'; @@ -3005,7 +3005,7 @@ describe('Shard', function () { ); before(async function () { - serviceProvider = await CliServiceProvider.connect( + serviceProvider = await NodeDriverServiceProvider.connect( await mongos.connectionString(), dummyOptions, {},