fix: revise and rename is_etag_in_json(data)

google/cloud/storage/retry.py

@@ -125,6 +125,8 @@ def is_etag_in_json(data):
 
     Indended for use on calls with relatively short JSON payloads."""
     try:
+        if isinstance(data, dict) and data.get("etag"):
+            return True
         content = json.loads(data)
         if content.get("etag"):
             return True

tests/unit/test_retry.py

@@ -193,6 +193,11 @@ def test_w_empty_data(self):
 
         self.assertFalse(self._call_fut(data))
 
+    def test_w_etag_in_dict(self):
+        data = {"etag": "123"}
+
+        self.assertTrue(self._call_fut(data))
+
 
 class Test_default_conditional_retry_policies(unittest.TestCase):
     def test_is_generation_specified_match_generation_match(self):