diff --git a/packages/service-provider-core/package-lock.json b/packages/service-provider-core/package-lock.json index 876f23ed97..ac1a842614 100644 --- a/packages/service-provider-core/package-lock.json +++ b/packages/service-provider-core/package-lock.json @@ -4,21 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/bl": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/bl/-/bl-2.1.0.tgz", - "integrity": "sha512-1TdA9IXOy4sdqn8vgieQ6GZAiHiPNrOiO1s2GJjuYPw4QVY7gYoVjkW049avj33Ez7IcIvu43hQsMsoUFbCn2g==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/node": { - "version": "14.14.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz", - "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==", - "dev": true - }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", @@ -265,9 +250,9 @@ } }, "mongodb-build-info": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.1.1.tgz", - "integrity": "sha512-HC4ZG98ObbWGM3ikL3VfSvuug3iQVpA2kBob/MxK+mn2PNdVTvR5lShio+Ev1rDqODfq3ePcfO6prfi0agQp8g==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.2.0.tgz", + "integrity": "sha512-HsAk6w9TZ7erX+DGP81T9G7dA6JV3etT5VC5GGGvNqSg4NojVRdn5rij4kD4vSUz75LgcAbGbUZ/QHvlpb/UfQ==" }, "mongodb-client-encryption": { "version": "1.2.5", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 6affde3c2f..d9a6951ca7 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -31,7 +31,7 @@ "@mongosh/i18n": "0.0.0-dev.0", "bson": "^4.4.0", "mongodb": "4.0.0-beta.5", - "mongodb-build-info": "^1.1.1", + "mongodb-build-info": "^1.2.0", "mongodb-connection-string-url": "^1.0.0" }, "optionalDependencies": { diff --git a/packages/service-provider-core/src/connect-info.spec.ts b/packages/service-provider-core/src/connect-info.spec.ts index 939a1fa1b7..5ee6b5af27 100644 --- a/packages/service-provider-core/src/connect-info.spec.ts +++ b/packages/service-provider-core/src/connect-info.spec.ts @@ -82,6 +82,7 @@ describe('getConnectInfo', function() { const output = { is_atlas: true, is_localhost: false, + is_do: false, server_version: '3.2.0-rc2', mongosh_version: '0.0.6', is_enterprise: true, @@ -109,6 +110,7 @@ describe('getConnectInfo', function() { const output = { is_atlas: true, is_localhost: false, + is_do: false, server_version: '3.2.0-rc2', mongosh_version: '0.0.6', is_enterprise: true, @@ -136,6 +138,7 @@ describe('getConnectInfo', function() { const output = { is_atlas: false, is_localhost: false, + is_do: false, server_version: '3.2.0-rc2', mongosh_version: '0.0.6', is_enterprise: true, @@ -163,6 +166,7 @@ describe('getConnectInfo', function() { const output = { is_atlas: false, is_localhost: false, + is_do: false, server_version: undefined, mongosh_version: '0.0.6', is_enterprise: false, diff --git a/packages/service-provider-core/src/connect-info.ts b/packages/service-provider-core/src/connect-info.ts index f91bf1b6d2..cfd77ec790 100644 --- a/packages/service-provider-core/src/connect-info.ts +++ b/packages/service-provider-core/src/connect-info.ts @@ -6,6 +6,7 @@ import getBuildInfo from 'mongodb-build-info'; export interface ConnectInfo { is_atlas: boolean; is_localhost: boolean; + is_do: boolean; server_version: string; mongosh_version: string; server_os?: string; @@ -38,6 +39,7 @@ export default function getConnectInfo(uri: string, mongoshVersion: string, buil return { is_atlas: !!atlasVersion?.atlasVersion || getBuildInfo.isAtlas(uri), is_localhost: getBuildInfo.isLocalhost(uri), + is_do: getBuildInfo.isDigitalOcean(uri), server_version: buildInfo.version, node_version: process.version, mongosh_version: mongoshVersion, diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 9beb1d536f..d4dc9f4af4 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -34,6 +34,7 @@ export interface ShowEvent { export interface ConnectEvent { is_atlas: boolean; is_localhost: boolean; + is_do: boolean; server_version: string; server_os?: string; server_arch?: string;