fix(storage): str() metadata for for blob (#9796)

* fix(storage): fix stringify metadata for blob * fix(storage): fix lint fail * fix(storage): stringify labels for bucket * fix(storage): fix lint

Author: HemangChothani

storage/google/cloud/storage/blob.py

@@ -1911,6 +1911,7 @@ def metadata(self, value):
  :type value: dict
  :param value: (Optional) The blob metadata to set.
  """
+ value = {k: str(v) for k, v in value.items()}
  self._patch_property("metadata", value)
 
  @property

storage/google/cloud/storage/bucket.py

@@ -1366,6 +1366,7 @@ def labels(self, mapping):
  existing = set([k for k in self.labels.keys()])
  incoming = set([k for k in mapping.keys()])
  self._label_removals = self._label_removals.union(existing.difference(incoming))
+ mapping = {k: str(v) for k, v in mapping.items()}
 
  # Actually update the labels on the object.
  self._patch_property("labels", copy.deepcopy(mapping))

storage/tests/unit/test_blob.py

@@ -2913,6 +2913,16 @@ def test_metadata_setter(self):
  blob.metadata = METADATA
  self.assertEqual(blob.metadata, METADATA)
 
+ def test_metadata_setter_w_nan(self):
+ BLOB_NAME = "blob-name"
+ METADATA = {"foo": float("nan")}
+ bucket = _Bucket()
+ blob = self._make_one(BLOB_NAME, bucket=bucket)
+ self.assertIsNone(blob.metadata)
+ blob.metadata = METADATA
+ value = blob.metadata["foo"]
+ self.assertIsInstance(value, str)
+
  def test_metageneration(self):
  BUCKET = object()
  METAGENERATION = 42

storage/tests/unit/test_bucket.py

@@ -1651,6 +1651,16 @@ def test_labels_setter(self):
  self.assertIsNot(bucket._properties["labels"], LABELS)
  self.assertIn("labels", bucket._changes)
 
+ def test_labels_setter_with_nan(self):
+ NAME = "name"
+ LABELS = {"color": "red", "foo": float("nan")}
+ bucket = self._make_one(name=NAME)
+
+ self.assertEqual(bucket.labels, {})
+ bucket.labels = LABELS
+ value = bucket.labels["foo"]
+ self.assertIsInstance(value, str)
+
  def test_labels_setter_with_removal(self):
  # Make sure the bucket labels look correct and follow the expected
  # public structure.