Merge branch 'googleapis:main' into main

kevkim-codes · Dec 16, 2024 · ecca0c4 · ecca0c4
2 parents 70a1e99 + 23a2b97
commit ecca0c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/testproxy/known_failures.txt b/testproxy/known_failures.txt
@@ -3,7 +3,6 @@ TestMutateRow_Generic_DeadlineExceeded\|
 TestMutateRows_Generic_CloseClient\|
 TestMutateRows_Retry_WithRoutingCookie\|
 TestMutateRows_Generic_DeadlineExceeded\|
-TestReadModifyWriteRow_Generic_DeadlineExceeded\|
 TestReadModifyWriteRow_NoRetry_MultiValues\|
 TestReadModifyWriteRow_Generic_CloseClient\|
 TestReadModifyWriteRow_Generic_MultiStreams\|

diff --git a/testproxy/services/create-client.js b/testproxy/services/create-client.js
@@ -31,7 +31,9 @@ const createClient = ({clientMap}) =>
   normalizeCallback(async rawRequest => {
     // TODO: Handle refresh periods
     const {request} = rawRequest;
-    const clientConfig = require('../../src/v2/bigtable_client_config.json');
+    const clientConfig = JSON.parse(
+      JSON.stringify(require('../../src/v2/bigtable_client_config.json'))
+    );
     const {
       callCredential,
       clientId,
@@ -68,18 +70,8 @@ const createClient = ({clientMap}) =>
        */
       Object.entries(
         clientConfig.interfaces['google.bigtable.v2.Bigtable'].methods
-      ).forEach(([k, v]) => {
-        if (k === 'ReadRows') {
-          /*
-          TODO: In the future we should apply this for all methods, but right
-          now doing so results in regressions in the TestSampleRowKeys_Generic_MultiStreams
-          and TestSampleRowKeys_Generic_CloseClient conformance tests that need
-          to be addressed.
-          */
-          v.timeout_millis = durationToMilliseconds(
-            request.perOperationTimeout
-          );
-        }
+      ).forEach(([, v]) => {
+        v.timeout_millis = durationToMilliseconds(request.perOperationTimeout);
       });
     }
     const bigtable = new Bigtable({