Pass 'encryption_key' through 'Bucket.blob' factory.

tseaver · tseaver · commit cf451cf12590 · 2016-10-06T17:02:16.000-04:00
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
@@ -111,7 +111,7 @@ def client(self):
         """The client bound to this bucket."""
         return self._client
 
-    def blob(self, blob_name, chunk_size=None):
+    def blob(self, blob_name, chunk_size=None, encryption_key=None):
         """Factory constructor for blob object.
 
         .. note::
@@ -126,10 +126,15 @@ def blob(self, blob_name, chunk_size=None):
                            (1 MB). This must be a multiple of 256 KB per the
                            API specification.
 
+        :type encryption_key: bytes
+        :param encryption_key:
+            Optional 32 byte encryption key for customer-supplied encryption.
+
         :rtype: :class:`google.cloud.storage.blob.Blob`
         :returns: The blob object created.
         """
-        return Blob(name=blob_name, bucket=self, chunk_size=chunk_size)
+        return Blob(name=blob_name, bucket=self, chunk_size=chunk_size,
+                    encryption_key=encryption_key)
 
     def exists(self, client=None):
         """Determines whether or not this bucket exists.
diff --git a/storage/unit_tests/test_bucket.py b/storage/unit_tests/test_bucket.py
@@ -113,14 +113,17 @@ def test_blob(self):
         BUCKET_NAME = 'BUCKET_NAME'
         BLOB_NAME = 'BLOB_NAME'
         CHUNK_SIZE = 1024 * 1024
+        KEY = b'01234567890123456789012345678901'  # 32 bytes
 
         bucket = self._makeOne(name=BUCKET_NAME)
-        blob = bucket.blob(BLOB_NAME, chunk_size=CHUNK_SIZE)
+        blob = bucket.blob(
+            BLOB_NAME, chunk_size=CHUNK_SIZE, encryption_key=KEY)
         self.assertIsInstance(blob, Blob)
         self.assertIs(blob.bucket, bucket)
         self.assertIs(blob.client, bucket.client)
         self.assertEqual(blob.name, BLOB_NAME)
         self.assertEqual(blob.chunk_size, CHUNK_SIZE)
+        self.assertEqual(blob._encryption_key, KEY)
 
     def test_exists_miss(self):
         from google.cloud.exceptions import NotFound
