Merge pull request #2642 from dhermes/register-type-optional

Make type_url optional when registering types.

Author: dhermes

packages/google-cloud-bigtable/google/cloud/bigtable/cluster.py

@@ -22,8 +22,7 @@
 from google.cloud.bigtable._generated import (
     bigtable_instance_admin_pb2 as messages_v2_pb2)
 from google.cloud.operation import Operation
-from google.cloud.operation import _compute_type_url
-from google.cloud.operation import register_type_url
+from google.cloud.operation import register_type
 
 
 _CLUSTER_NAME_RE = re.compile(r'^projects/(?P<project>[^/]+)/'
@@ -34,10 +33,7 @@
 """Default number of nodes to use when creating a cluster."""
 
 
-_UPDATE_CLUSTER_METADATA_URL = _compute_type_url(
-    messages_v2_pb2.UpdateClusterMetadata)
-register_type_url(
-    _UPDATE_CLUSTER_METADATA_URL, messages_v2_pb2.UpdateClusterMetadata)
+register_type(messages_v2_pb2.UpdateClusterMetadata)
 
 
 def _prepare_create_request(cluster):

packages/google-cloud-bigtable/google/cloud/bigtable/instance.py

@@ -27,21 +27,16 @@
 from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES
 from google.cloud.bigtable.table import Table
 from google.cloud.operation import Operation
-from google.cloud.operation import _compute_type_url
-from google.cloud.operation import register_type_url
+from google.cloud.operation import register_type
 
 
 _EXISTING_INSTANCE_LOCATION_ID = 'see-existing-cluster'
 _INSTANCE_NAME_RE = re.compile(r'^projects/(?P<project>[^/]+)/'
                                r'instances/(?P<instance_id>[a-z][-a-z0-9]*)$')
 
 
-_CREATE_INSTANCE_METADATA_URL = _compute_type_url(
-    messages_v2_pb2.CreateInstanceMetadata)
-register_type_url(
-    _CREATE_INSTANCE_METADATA_URL, messages_v2_pb2.CreateInstanceMetadata)
-_INSTANCE_METADATA_URL = _compute_type_url(data_v2_pb2.Instance)
-register_type_url(_INSTANCE_METADATA_URL, data_v2_pb2.Instance)
+register_type(messages_v2_pb2.CreateInstanceMetadata)
+register_type(data_v2_pb2.Instance)
 
 
 def _prepare_create_request(instance):

packages/google-cloud-bigtable/unit_tests/test_cluster.py

@@ -283,7 +283,6 @@ def test_update(self):
         from google.cloud.bigtable._generated import (
             bigtable_instance_admin_pb2 as messages_v2_pb2)
         from unit_tests._testing import _FakeStub
-        from google.cloud.bigtable.cluster import _UPDATE_CLUSTER_METADATA_URL
 
         NOW = datetime.datetime.utcnow()
         NOW_PB = _datetime_to_pb_timestamp(NOW)
@@ -307,10 +306,12 @@ def test_update(self):
             'operations/projects/%s/instances/%s/clusters/%s/operations/%d' %
             (self.PROJECT, self.INSTANCE_ID, self.CLUSTER_ID, OP_ID))
         metadata = messages_v2_pb2.UpdateClusterMetadata(request_time=NOW_PB)
+        type_url = 'type.googleapis.com/%s' % (
+            messages_v2_pb2.UpdateClusterMetadata.DESCRIPTOR.full_name,)
         response_pb = operations_pb2.Operation(
             name=OP_NAME,
             metadata=Any(
-                type_url=_UPDATE_CLUSTER_METADATA_URL,
+                type_url=type_url,
                 value=metadata.SerializeToString()
             )
         )

packages/google-cloud-bigtable/unit_tests/test_instance.py

@@ -236,8 +236,6 @@ def test_create(self):
         from unit_tests._testing import _FakeStub
         from google.cloud.operation import Operation
         from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES
-        from google.cloud.bigtable.instance import (
-            _CREATE_INSTANCE_METADATA_URL)
 
         NOW = datetime.datetime.utcnow()
         NOW_PB = _datetime_to_pb_timestamp(NOW)
@@ -247,10 +245,12 @@ def test_create(self):
 
         # Create response_pb
         metadata = messages_v2_pb2.CreateInstanceMetadata(request_time=NOW_PB)
+        type_url = 'type.googleapis.com/%s' % (
+            messages_v2_pb2.CreateInstanceMetadata.DESCRIPTOR.full_name,)
         response_pb = operations_pb2.Operation(
             name=self.OP_NAME,
             metadata=Any(
-                type_url=_CREATE_INSTANCE_METADATA_URL,
+                type_url=type_url,
                 value=metadata.SerializeToString(),
                 )
             )