From 5c7a1759bcc9ea2af4648e56d45cfae8220f1de5 Mon Sep 17 00:00:00 2001
From: Sergey Petushkov <petushkov.sergey@gmail.com>
Date: Wed, 17 Nov 2021 15:47:56 +0100
Subject: [PATCH] chore(data-service): Rename killSession to killSessions

Co-Authored-By: Maurizio Casimirri <maurizio.cas@gmail.com>
---
 packages/compass-crud/src/stores/crud-store.js            | 2 +-
 .../compass-crud/src/utils/cancellable-queries.spec.js    | 6 +++---
 packages/data-service/src/data-service.spec.ts            | 8 ++++----
 packages/data-service/src/data-service.ts                 | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/compass-crud/src/stores/crud-store.js b/packages/compass-crud/src/stores/crud-store.js
index 571b1b332e5..73eeffda1ba 100644
--- a/packages/compass-crud/src/stores/crud-store.js
+++ b/packages/compass-crud/src/stores/crud-store.js
@@ -1150,7 +1150,7 @@ const configureStore = (options = {}) => {
       }
       this.setState({ sessions: null });
       try {
-        await this.dataService.killSession(sessions);
+        await this.dataService.killSessions(sessions);
       } catch (err) {
         log.warn(mongoLogId(1001000096), 'Documents', 'Attempting to kill the session failed');
       }
diff --git a/packages/compass-crud/src/utils/cancellable-queries.spec.js b/packages/compass-crud/src/utils/cancellable-queries.spec.js
index 62e302e3576..1a8f949aa31 100644
--- a/packages/compass-crud/src/utils/cancellable-queries.spec.js
+++ b/packages/compass-crud/src/utils/cancellable-queries.spec.js
@@ -116,7 +116,7 @@ describe('cancellable-queries', function() {
       await expect(promise).to.be.rejectedWith(Error, OPERATION_CANCELLED_MESSAGE);
 
       // kill the session
-      await dataService.killSession(session);
+      await dataService.killSessions(session);
 
       // give it enough time to be killed
       await delay(100);
@@ -180,7 +180,7 @@ describe('cancellable-queries', function() {
       // kill the session
       // (unfortunately I can't think of a way to slow the query down enough so
       //  we can make sure the operation appeared and then disappeared)
-      await dataService.killSession(session);
+      await dataService.killSessions(session);
     });
   });
 
@@ -204,7 +204,7 @@ describe('cancellable-queries', function() {
 
       // kill the session
       // (same problem with testing that this actually worked as for count queries above)
-      await dataService.killSession(session);
+      await dataService.killSessions(session);
     });
 
     // TODO: if (configDocs && configDocs.length) { implies that configDocs could be empty?
diff --git a/packages/data-service/src/data-service.spec.ts b/packages/data-service/src/data-service.spec.ts
index 98a73bf2fc5..b8ad43662f6 100644
--- a/packages/data-service/src/data-service.spec.ts
+++ b/packages/data-service/src/data-service.spec.ts
@@ -1313,16 +1313,16 @@ describe('DataService', function () {
           const session = dataService.startSession();
           expect(session.constructor.name).to.equal('ClientSession');
 
-          // used by killSession, must be a bson UUID in order to work
+          // used by killSessions, must be a bson UUID in order to work
           expect(session.id!.id._bsontype).to.equal('Binary');
           expect(session.id!.id.sub_type).to.equal(4);
         });
       });
 
-      describe('#killSession', function () {
+      describe('#killSessions', function () {
         it('does not throw if kill a non existing session', async function () {
           const session = dataService.startSession();
-          await dataService.killSession(session);
+          await dataService.killSessions(session);
         });
 
         it('kills a command with a session', async function () {
@@ -1337,7 +1337,7 @@ describe('DataService', function () {
           );
 
           const session = dataService.startSession();
-          await dataService.killSession(session);
+          await dataService.killSessions(session);
 
           expect(commandSpy.args[0][0]).to.deep.equal({
             killSessions: [session.id],
diff --git a/packages/data-service/src/data-service.ts b/packages/data-service/src/data-service.ts
index 4ab84b77e15..98baadf2641 100644
--- a/packages/data-service/src/data-service.ts
+++ b/packages/data-service/src/data-service.ts
@@ -1420,7 +1420,7 @@ class DataService extends EventEmitter {
    * Kill a session and terminate all in progress operations.
    * @param clientSession - a ClientSession (can be created with startSession())
    */
-  killSession(sessions: ClientSession | ClientSession[]): Promise<Document> {
+  killSessions(sessions: ClientSession | ClientSession[]): Promise<Document> {
     return this._initializedClient.db('admin').command({
       killSessions: Array.isArray(sessions)
         ? sessions.map((s) => s.id)