SERVER-65398 Remove featureFlagUpdateDocumentShardKeyUsingTransactionApi tag for tests

6 files changed, 10 insertions, 13 deletions

diff --git a/jstests/sharding/internal_txns/retryable_writes_aborted_before_resharding.js b/jstests/sharding/internal_txns/retryable_writes_aborted_before_resharding.js
index 427eaa1b645..ac1d49e230b 100644
--- a/jstests/sharding/internal_txns/retryable_writes_aborted_before_resharding.js
+++ b/jstests/sharding/internal_txns/retryable_writes_aborted_before_resharding.js
@@ -3,7 +3,7 @@
  * transactions that start and abort on the donor(s) before resharding are not retryable on the
  * recipient after resharding.
  *
- * @tags: [requires_fcv_60]
+ * @tags: [requires_fcv_60, uses_transactions]
  */
 (function() {
 "use strict";
diff --git a/jstests/sharding/move_chunk_update_shard_key_in_retryable_write.js b/jstests/sharding/move_chunk_update_shard_key_in_retryable_write.js
index 04dd3e68c0d..8678e35a79d 100644
--- a/jstests/sharding/move_chunk_update_shard_key_in_retryable_write.js
+++ b/jstests/sharding/move_chunk_update_shard_key_in_retryable_write.js
@@ -6,8 +6,7 @@
  * error saying that the write can't be retried since it was upgraded to a transaction as part of
  * the update. This should be true whether or not a migration occurs on the chunk containing the
  * original value of the document's shard key. This file tests that behavior.
- * @tags: [uses_transactions, uses_multi_shard_transaction,
- * featureFlagUpdateDocumentShardKeyUsingTransactionApi]
+ * @tags: [uses_transactions, uses_multi_shard_transaction,]
  */
 (function() {
 
@@ -390,7 +389,7 @@ test(
              const findAndModifyUpsertCmdObj = attachTxnFields(findAndModifyUpsertCmdObjBase);
              runCommandDuringChunkMigration(findAndModifyUpsertCmdObj);
              // Retry the command. This should retry against shard2.
-             if (areInternalTransactionsEnabled(st.s0)) {
+             if (isUpdateDocumentShardKeyUsingTransactionApiEnabled(st.s0)) {
                  // If internal transactions are enabled, shard2 is expected to throw
                  // IncompleteTransactionHistory since it should have the WouldChangeOwningShard
                  // noop oplog entry copied from shard0 during the migration.
diff --git a/jstests/sharding/resharding_coordinator_recovers_abort_decision.js b/jstests/sharding/resharding_coordinator_recovers_abort_decision.js
index dc740640bd2..c06474cd527 100644
--- a/jstests/sharding/resharding_coordinator_recovers_abort_decision.js
+++ b/jstests/sharding/resharding_coordinator_recovers_abort_decision.js
@@ -1,6 +1,5 @@
 /**
  * Tests that the resharding coordinator recovers its abort decision after a primary failover.
- * @tags: [featureFlagUpdateDocumentShardKeyUsingTransactionApi]
  */
 (function() {
 "use strict";
diff --git a/jstests/sharding/resharding_replicate_updates_as_insert_delete.js b/jstests/sharding/resharding_replicate_updates_as_insert_delete.js
index a5dbe08660b..41ce0efd0f4 100644
--- a/jstests/sharding/resharding_replicate_updates_as_insert_delete.js
+++ b/jstests/sharding/resharding_replicate_updates_as_insert_delete.js
@@ -3,7 +3,6 @@
 // insert, delete pair.
 // @tags: [
 //   uses_atclustertime,
-//   featureFlagUpdateDocumentShardKeyUsingTransactionApi,
 // ]
 //
 
@@ -35,7 +34,8 @@ let txnWriteTs;
 
 const mongos = testColl.getMongo();
 
-const internalTransactionsEnabled = areInternalTransactionsEnabled(mongos);
+const updateDocumentShardKeyUsingTransactionApiEnabled =
+    isUpdateDocumentShardKeyUsingTransactionApiEnabled(mongos);
 
 const recipientShardNames = reshardingTest.recipientShardNames;
 reshardingTest.withReshardingInBackground(  //
@@ -109,7 +109,7 @@ reshardingTest.withReshardingInBackground(  //
             // version to be bumped. The StaleConfig error won't be automatically retried by mongos
             // for the second statement in the transaction (the insert) and would lead to a
             // NoSuchTransaction error.
-            if (internalTransactionsEnabled) {
+            if (updateDocumentShardKeyUsingTransactionApiEnabled) {
                 // The handling of WCOS errors with internal transactions advances the router's
                 // notion of the transaction "statement" number between the initial update, the
                 // delete, and the insert, so if the shard version changes and is detected by the
@@ -134,7 +134,7 @@ const donorOplogColl0 = donor0.getCollection('local.oplog.rs');
 
 function assertOplogEntryIsDeleteInsertApplyOps(entry, isRetryableWrite) {
     assert(entry.o.hasOwnProperty('applyOps'), entry);
-    if (internalTransactionsEnabled && isRetryableWrite) {
+    if (updateDocumentShardKeyUsingTransactionApiEnabled && isRetryableWrite) {
         // With internal transactions the applyOps array for a retryable write update will have a
         // noop entry at the front.
         assert.eq(entry.o.applyOps.length, 3, entry);
diff --git a/jstests/sharding/resharding_update_shard_key_in_retryable_write.js b/jstests/sharding/resharding_update_shard_key_in_retryable_write.js
index cff7324ced2..0bbeae98089 100644
--- a/jstests/sharding/resharding_update_shard_key_in_retryable_write.js
+++ b/jstests/sharding/resharding_update_shard_key_in_retryable_write.js
@@ -3,7 +3,7 @@
  * its shard key value during resharding is not retryable on the recipient after resharding
  * completes.
  *
- * @tags: [requires_fcv_60, featureFlagUpdateDocumentShardKeyUsingTransactionApi]
+ * @tags: [requires_fcv_60]
  */
 (function() {
 
@@ -47,8 +47,8 @@ function runTest(reshardInPlace) {
     const mongosTestDB = mongosConn.getDB(dbName);
 
     // Test commands that the shard key of a document in the test collection from change its shard
-    // key Note we don't test the remove:true case because the document can't move shards if it is
-    // being delete.
+    // key. Note we don't test the remove:true case because the document can't move shards if it is
+    // being deleted.
     const updateCmdObj = {
         update: collName,
         updates: [
diff --git a/jstests/sharding/update_shard_key_doc_moves_shards.js b/jstests/sharding/update_shard_key_doc_moves_shards.js
index 5cc060905e1..f0725a3ad2c 100644
--- a/jstests/sharding/update_shard_key_doc_moves_shards.js
+++ b/jstests/sharding/update_shard_key_doc_moves_shards.js
@@ -4,7 +4,6 @@
  * @tags: [
  *   uses_multi_shard_transaction,
  *   uses_transactions,
- *   featureFlagUpdateDocumentShardKeyUsingTransactionApi,
  * ]
  */