diff --git a/.evergreen.yml b/.evergreen.yml index 206c3f1bc..136132e7c 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -1194,8 +1194,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: @@ -1203,13 +1203,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: @@ -1217,13 +1217,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: @@ -1231,13 +1231,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: @@ -1245,13 +1245,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: @@ -1259,13 +1259,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: @@ -1273,13 +1273,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: @@ -1287,13 +1287,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: @@ -1301,13 +1301,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: @@ -1315,13 +1315,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: @@ -1329,13 +1329,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: @@ -1343,13 +1343,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: @@ -1357,13 +1357,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: @@ -1371,13 +1371,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: @@ -1385,7 +1385,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} @@ -3378,8 +3378,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: @@ -3387,13 +3387,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: @@ -3401,13 +3401,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: @@ -3415,13 +3415,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: @@ -3429,13 +3429,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: @@ -3443,13 +3443,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: @@ -3457,13 +3457,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: @@ -3471,13 +3471,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: @@ -3485,13 +3485,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: @@ -3499,13 +3499,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: @@ -3513,13 +3513,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: @@ -3527,13 +3527,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: @@ -3541,13 +3541,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: @@ -3555,13 +3555,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: @@ -3569,13 +3569,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: @@ -3583,13 +3583,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: @@ -3597,13 +3597,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: @@ -3611,13 +3611,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: @@ -3625,13 +3625,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: @@ -3639,13 +3639,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: @@ -3653,13 +3653,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: @@ -3667,13 +3667,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: @@ -3681,13 +3681,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: @@ -3695,13 +3695,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: @@ -3709,7 +3709,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} @@ -5590,8 +5590,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: @@ -5599,13 +5599,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: @@ -5613,13 +5613,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: @@ -5627,13 +5627,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: @@ -5641,13 +5641,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: @@ -5655,13 +5655,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: @@ -5669,13 +5669,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: @@ -5683,13 +5683,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: @@ -5697,13 +5697,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: @@ -5711,13 +5711,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: @@ -5725,13 +5725,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: @@ -5739,13 +5739,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: @@ -5753,13 +5753,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: @@ -5767,13 +5767,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: @@ -5781,13 +5781,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: @@ -5795,13 +5795,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: @@ -5809,13 +5809,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: @@ -5823,13 +5823,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: @@ -5837,13 +5837,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: @@ -5851,13 +5851,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: @@ -5865,13 +5865,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: @@ -5879,13 +5879,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: @@ -5893,13 +5893,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: @@ -5907,13 +5907,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: @@ -5921,13 +5921,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: @@ -5935,13 +5935,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: @@ -5949,7 +5949,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} @@ -16669,20 +16669,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 @@ -16853,30 +16853,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 @@ -17427,32 +17427,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 3fc63358e..2e0a59245 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", @@ -6599,8 +6599,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": { @@ -31198,7 +31198,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", @@ -31289,7 +31289,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", @@ -31718,7 +31718,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", @@ -31759,9 +31759,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", @@ -37238,7 +37271,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", @@ -37323,7 +37356,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", @@ -37593,7 +37626,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", @@ -37625,8 +37658,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 abb343dee..c46657fed 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 55a084540..70946b7d0 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 d2cabb9ab..ae7e4d19d 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 234c3d4d8..5205581c9 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 def35f83c..733cb7102 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, {},