PSMDB-1786: fix variable declarations in audit jstests

plebioda · plebioda · commit 4126669d47f3 · 2025-12-08T09:43:44.000+01:00
diff --git a/jstests/audit/audit_add_shard.js b/jstests/audit/audit_add_shard.js
@@ -24,7 +24,7 @@ auditTestShard('addShard', function(st) {
     assert.commandWorked(st.s0.adminCommand({addshard: connstr}));
 
     const beforeLoad = Date.now();
-    auditColl = loadAuditEventsIntoCollection(
+    let auditColl = loadAuditEventsIntoCollection(
         st.s0, getDBPath() + '/auditLog-s0.json', jsTestName(), 'auditEvents');
     assert.eq(1,
               auditColl.count({
diff --git a/jstests/audit/audit_authz_application_message.js b/jstests/audit/audit_authz_application_message.js
@@ -22,7 +22,7 @@ auditTest('auth_logApplicationMessage', function(m) {
     assert.commandWorked(adminDB.runCommand({logApplicationMessage: msg}));
 
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    const auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
     assert.eq(1,
               auditColl.count({
                   atype: "applicationMessage",
diff --git a/jstests/audit/audit_authz_command.js b/jstests/audit/audit_authz_command.js
@@ -40,7 +40,7 @@ auditTest('authzCommand', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom.
     assert.eq(1,
diff --git a/jstests/audit/audit_authz_current_op.js b/jstests/audit/audit_authz_current_op.js
@@ -43,7 +43,7 @@ auditTest('authzInProg', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom
     assert.eq(1,
diff --git a/jstests/audit/audit_authz_delete.js b/jstests/audit/audit_authz_delete.js
@@ -43,7 +43,7 @@ auditTest('authzDelete', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom.
     assert.eq(1,
diff --git a/jstests/audit/audit_authz_find.js b/jstests/audit/audit_authz_find.js
@@ -53,7 +53,7 @@ auditTest('authzQuery', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom
     assert.eq(1,
diff --git a/jstests/audit/audit_authz_get_more.js b/jstests/audit/audit_authz_get_more.js
@@ -70,7 +70,7 @@ auditTest('authzGetMore', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom
     assert.eq(1,
diff --git a/jstests/audit/audit_authz_insert.js b/jstests/audit/audit_authz_insert.js
@@ -40,7 +40,7 @@ auditTest('authzInsert', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom
     assert.eq(1,
diff --git a/jstests/audit/audit_authz_kill_op.js b/jstests/audit/audit_authz_kill_op.js
@@ -54,7 +54,7 @@ auditTest('authzKillOp', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom
     assert.eq(1,
diff --git a/jstests/audit/audit_authz_update.js b/jstests/audit/audit_authz_update.js
@@ -41,7 +41,7 @@ auditTest('authzUpdate', function(m) {
 
     // Verify that audit event was inserted.
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
+    var auditColl = getAuditEventsCollection(m, testDBName, undefined, true);
 
     // Audit event for user tom.
     assert.eq(1,
diff --git a/jstests/audit/audit_create_collection.js b/jstests/audit/audit_create_collection.js
@@ -9,12 +9,12 @@ if (TestData.testData !== undefined) {
 var testDBName = 'audit_create_collection';
 
 auditTest('createCollection', function(m) {
-    testDB = m.getDB(testDBName);
+    const testDB = m.getDB(testDBName);
     const beforeCmd = Date.now();
     assert.commandWorked(testDB.createCollection('foo'));
 
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName);
+    const auditColl = getAuditEventsCollection(m, testDBName);
     assert.eq(1,
               auditColl.count({
                   atype: "createCollection",
diff --git a/jstests/audit/audit_create_database.js b/jstests/audit/audit_create_database.js
@@ -9,13 +9,13 @@ if (TestData.testData !== undefined) {
 var testDBName = 'audit_create_database';
 
 auditTest('createDatabase', function(m) {
-    testDB = m.getDB(testDBName);
+    var testDB = m.getDB(testDBName);
     assert.commandWorked(testDB.dropDatabase());
     const beforeCmd = Date.now();
     assert.commandWorked(testDB.createCollection('foo'));
 
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName);
+    const auditColl = getAuditEventsCollection(m, testDBName);
     assert.eq(1,
               auditColl.count({
                   atype: "createDatabase",
diff --git a/jstests/audit/audit_create_index.js b/jstests/audit/audit_create_index.js
@@ -9,7 +9,7 @@ if (TestData.testData !== undefined) {
 var testDBName = 'audit_create_index';
 
 auditTest('createIndex', function(m) {
-    testDB = m.getDB(testDBName);
+    var testDB = m.getDB(testDBName);
     assert.commandWorked(testDB.dropDatabase());
 
     // insert some data to index
@@ -23,7 +23,7 @@ auditTest('createIndex', function(m) {
     assert.commandWorked(testDB.coll.createIndex({a: 1}, {name: 'idx_a'}));
 
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName);
+    var auditColl = getAuditEventsCollection(m, testDBName);
 
     // two records are logged with param.indexBuildState:
     // - IndexBuildStarted
diff --git a/jstests/audit/audit_drop_collection.js b/jstests/audit/audit_drop_collection.js
@@ -9,7 +9,7 @@ if (TestData.testData !== undefined) {
 var testDBName = 'audit_drop_collection';
 
 auditTest('dropCollection', function(m) {
-    testDB = m.getDB(testDBName);
+    var testDB = m.getDB(testDBName);
     var collName = 'foo';
     var coll = testDB.getCollection(collName);
     assert.writeOK(coll.insert({a: 17}));
diff --git a/jstests/audit/audit_drop_database.js b/jstests/audit/audit_drop_database.js
@@ -9,7 +9,7 @@ if (TestData.testData !== undefined) {
 var testDBName = 'audit_drop_database';
 
 auditTest('dropDatabase', function(m) {
-    testDB = m.getDB(testDBName);
+    var testDB = m.getDB(testDBName);
     assert.writeOK(testDB.getCollection('foo').insert({a: 1}));
     const beforeCmd = Date.now();
     assert.commandWorked(testDB.dropDatabase());
diff --git a/jstests/audit/audit_drop_index.js b/jstests/audit/audit_drop_index.js
@@ -9,7 +9,7 @@ if (TestData.testData !== undefined) {
 var testDBName = 'audit_drop_index';
 
 auditTest('dropIndex', function(m) {
-    testDB = m.getDB(testDBName);
+    var testDB = m.getDB(testDBName);
     var collName = 'foo';
     var idxName = 'fooIdx';
     var coll = testDB.getCollection(collName);
diff --git a/jstests/audit/audit_enable_sharding.js b/jstests/audit/audit_enable_sharding.js
@@ -7,13 +7,13 @@ if (TestData.testData !== undefined) {
 }
 
 auditTestShard('enableSharding', function(st) {
-    testDB = st.s0.getDB(jsTestName());
+    let testDB = st.s0.getDB(jsTestName());
     assert.commandWorked(testDB.dropDatabase());
     const beforeCmd = Date.now();
     assert.commandWorked(st.s0.adminCommand({enableSharding: jsTestName()}));
 
     const beforeLoad = Date.now();
-    auditColl = loadAuditEventsIntoCollection(
+    const auditColl = loadAuditEventsIntoCollection(
         st.s0, getDBPath() + '/auditLog-c0.json', testDB.getName(), 'auditEvents');
     assert.eq(1,
               auditColl.count({
diff --git a/jstests/audit/audit_log_application_message.js b/jstests/audit/audit_log_application_message.js
@@ -14,7 +14,7 @@ auditTest('logApplicationMessage', function(m) {
     assert.commandWorked(m.getDB('admin').runCommand({logApplicationMessage: msg}));
 
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName);
+    var auditColl = getAuditEventsCollection(m, testDBName);
     assert.eq(1,
               auditColl.count({
                   atype: "applicationMessage",
diff --git a/jstests/audit/audit_log_rotate.js b/jstests/audit/audit_log_rotate.js
@@ -32,7 +32,7 @@ auditTest('logRotate',
 
               const beforeCmd = Date.now();
               // This should generate a few new audit log entries on ns 'test.foo'
-              testDB = m.getDB(testDBName);
+              var testDB = m.getDB(testDBName);
               assert.commandWorked(testDB.createCollection('foo'));
               assert(testDB.getCollection('foo').drop());
 
@@ -93,7 +93,7 @@ auditTest('logRotateReopen',
 
               const beforeCmd = Date.now();
               // This should generate a few new audit log entries on ns 'test.foo'
-              testDB = m.getDB(testDBName);
+              var testDB = m.getDB(testDBName);
               assert.commandWorked(testDB.createCollection('foo'));
               assert(testDB.getCollection('foo').drop());
 
diff --git a/jstests/audit/audit_no_createdb_restart.js b/jstests/audit/audit_no_createdb_restart.js
@@ -9,7 +9,7 @@ if (TestData.testData !== undefined) {
 var testDBName = 'audit_no_createdb_restart';
 
 auditTest('noCreateDatabaseRestart', function(m, restartServer) {
-    testDB = m.getDB(testDBName);
+    var testDB = m.getDB(testDBName);
     assert.commandWorked(testDB.dropDatabase());
     assert.commandWorked(testDB.createCollection('foo'));
 
@@ -20,7 +20,7 @@ auditTest('noCreateDatabaseRestart', function(m, restartServer) {
     m = restartServer();
 
     const beforeLoad = Date.now();
-    auditColl = getAuditEventsCollection(m, testDBName);
+    const auditColl = getAuditEventsCollection(m, testDBName);
     assert.eq(0,
               auditColl.count({
                   atype: "createDatabase",
diff --git a/jstests/audit/audit_remove_shard.js b/jstests/audit/audit_remove_shard.js
@@ -33,7 +33,7 @@ auditTestShard('removeShard', function(st) {
     } while (removeRet.state != 'completed');
 
     const beforeLoad = Date.now();
-    auditColl = loadAuditEventsIntoCollection(
+    let auditColl = loadAuditEventsIntoCollection(
         st.s0, getDBPath() + '/auditLog-c0.json', jsTestName(), 'auditEvents');
     assert.eq(cmdcnt,
               auditColl.count({
diff --git a/jstests/audit/audit_shard_collection.js b/jstests/audit/audit_shard_collection.js
@@ -7,15 +7,15 @@ if (TestData.testData !== undefined) {
 }
 
 auditTestShard('shardCollection', function(st) {
-    testDB = st.s0.getDB(jsTestName());
+    let testDB = st.s0.getDB(jsTestName());
     assert.commandWorked(testDB.dropDatabase());
     const beforeCmd = Date.now();
     assert.commandWorked(st.s0.adminCommand({enableSharding: jsTestName()}));
     assert.commandWorked(
         st.s0.adminCommand({shardCollection: jsTestName() + '.foo', key: {a: 1, b: 1}}));
 
     const beforeLoad = Date.now();
-    auditColl = loadAuditEventsIntoCollection(
+    let auditColl = loadAuditEventsIntoCollection(
         st.s0, getDBPath() + '/auditLog-c0.json', testDB.getName(), 'auditEvents');
     assert.eq(1,
               auditColl.count({
diff --git a/jstests/audit/audit_shutdown.js b/jstests/audit/audit_shutdown.js
@@ -14,7 +14,7 @@ auditTest('shutdown', function(m, restartServer) {
     m = restartServer();
 
     const beforeLoad = Date.now();
-    auditColl =
+    var auditColl =
         getAuditEventsCollection(m, testDBName, undefined, undefined, /*loadRotated =*/ true);
     assert.eq(1,
               auditColl.count({
