From bc6a4c99d9b33d114bbb1e1074d523464faf267b Mon Sep 17 00:00:00 2001
From: Neal Beeken <neal.beeken@mongodb.com>
Date: Fri, 13 Sep 2024 14:39:18 -0400
Subject: [PATCH 1/2] feat(NODE-5844): add iscryptd to ServerDescription

---
 src/sdam/server_description.ts                |  4 ++
 .../server_description.test.ts                | 58 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 test/integration/server-discovery-and-monitoring/server_description.test.ts

diff --git a/src/sdam/server_description.ts b/src/sdam/server_description.ts
index cd32f4968b..d5b67c1808 100644
--- a/src/sdam/server_description.ts
+++ b/src/sdam/server_description.ts
@@ -69,6 +69,8 @@ export class ServerDescription {
   setVersion: number | null;
   electionId: ObjectId | null;
   logicalSessionTimeoutMinutes: number | null;
+  /** Indicates server is a mongocryptd instance. */
+  iscryptd: boolean;
 
   // NOTE: does this belong here? It seems we should gossip the cluster time at the CMAP level
   $clusterTime?: ClusterTime;
@@ -114,6 +116,7 @@ export class ServerDescription {
     this.primary = hello?.primary ?? null;
     this.me = hello?.me?.toLowerCase() ?? null;
     this.$clusterTime = hello?.$clusterTime ?? null;
+    this.iscryptd = Boolean(hello?.iscryptd);
   }
 
   get hostAddress(): HostAddress {
@@ -167,6 +170,7 @@ export class ServerDescription {
 
     return (
       other != null &&
+      other.iscryptd === this.iscryptd &&
       errorStrictEqual(this.error, other.error) &&
       this.type === other.type &&
       this.minWireVersion === other.minWireVersion &&
diff --git a/test/integration/server-discovery-and-monitoring/server_description.test.ts b/test/integration/server-discovery-and-monitoring/server_description.test.ts
new file mode 100644
index 0000000000..2199510493
--- /dev/null
+++ b/test/integration/server-discovery-and-monitoring/server_description.test.ts
@@ -0,0 +1,58 @@
+import { type ChildProcess, spawn } from 'node:child_process';
+
+import { expect } from 'chai';
+
+import { MongoClient } from '../../mongodb';
+
+describe('class ServerDescription', function () {
+  describe('when connecting to mongocryptd', { requires: { mongodb: '>=4.4' } }, function () {
+    let client: MongoClient;
+    const mongocryptdTestPort = '27022';
+    let childProcess: ChildProcess;
+
+    beforeEach(async function () {
+      childProcess = spawn('mongocryptd', ['--port', mongocryptdTestPort, '--ipv6'], {
+        stdio: 'ignore',
+        detached: true
+      });
+
+      childProcess.on('error', error =>
+        console.warn('class ServerDescription when connecting to mongocryptd:', error)
+      );
+      client = new MongoClient(`mongodb://localhost:${mongocryptdTestPort}`);
+    });
+
+    afterEach(async function () {
+      await client?.close();
+      childProcess.kill('SIGKILL');
+    });
+
+    it('iscryptd is set to true ', async function () {
+      const descriptions = [];
+      client.on('serverDescriptionChanged', description => descriptions.push(description));
+      const hello = await client.db().command({ hello: true });
+      expect(hello).to.have.property('iscryptd', true);
+      expect(descriptions.at(-1)).to.have.nested.property('newDescription.iscryptd', true);
+    });
+  });
+
+  describe('when connecting to anything other than mongocryptd', function () {
+    let client: MongoClient;
+
+    beforeEach(async function () {
+      client = this.configuration.newClient();
+    });
+
+    afterEach(async function () {
+      await client?.close();
+    });
+
+    it('iscryptd is set to false ', async function () {
+      const descriptions = [];
+      client.on('serverDescriptionChanged', description => descriptions.push(description));
+      const hello = await client.db().command({ hello: true });
+      expect(hello).to.not.have.property('iscryptd');
+      expect(descriptions.at(-1)).to.have.nested.property('newDescription.iscryptd', false);
+    });
+  });
+});

From 5b78763f2e4006ceb485f7d205e7ca854209db4a Mon Sep 17 00:00:00 2001
From: Neal Beeken <neal.beeken@mongodb.com>
Date: Mon, 16 Sep 2024 14:37:29 -0400
Subject: [PATCH 2/2] chore: grab the test name

---
 .../server_description.test.ts                                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/integration/server-discovery-and-monitoring/server_description.test.ts b/test/integration/server-discovery-and-monitoring/server_description.test.ts
index 2199510493..0a3c7eecbf 100644
--- a/test/integration/server-discovery-and-monitoring/server_description.test.ts
+++ b/test/integration/server-discovery-and-monitoring/server_description.test.ts
@@ -16,9 +16,7 @@ describe('class ServerDescription', function () {
         detached: true
       });
 
-      childProcess.on('error', error =>
-        console.warn('class ServerDescription when connecting to mongocryptd:', error)
-      );
+      childProcess.on('error', error => console.warn(this.currentTest?.fullTitle(), error));
       client = new MongoClient(`mongodb://localhost:${mongocryptdTestPort}`);
     });