feat!: microgenerator changes

docs/snippets.py

@@ -704,13 +704,13 @@ def test_bigtable_cluster_name():
 def test_bigtable_instance_from_pb():
     # [START bigtable_api_instance_from_pb]
     from google.cloud.bigtable import Client
-    from google.cloud.bigtable_admin_v2.types import instance
+    from google.cloud.bigtable_admin_v2.types import instance as data_v2_pb2
 
     client = Client(admin=True)
     instance = client.instance(INSTANCE_ID)
 
     name = instance.name
-    instance_pb = instance.Instance(
+    instance_pb = data_v2_pb2.Instance(
         name=name, display_name=INSTANCE_ID, type=PRODUCTION, labels=LABELS
     )
 
@@ -723,7 +723,7 @@ def test_bigtable_instance_from_pb():
 def test_bigtable_cluster_from_pb():
     # [START bigtable_api_cluster_from_pb]
     from google.cloud.bigtable import Client
-    from google.cloud.bigtable_admin_v2.types import instance
+    from google.cloud.bigtable_admin_v2.types import instance as data_v2_pb2
 
     client = Client(admin=True)
     instance = client.instance(INSTANCE_ID)
@@ -732,7 +732,7 @@ def test_bigtable_cluster_from_pb():
     name = cluster.name
     cluster_state = cluster.state
     serve_nodes = 1
-    cluster_pb = instance.Cluster(
+    cluster_pb = data_v2_pb2.Cluster(
         name=name,
         location=LOCATION_ID,
         state=cluster_state,

google/cloud/bigtable/client.py

@@ -217,7 +217,7 @@ def project_path(self):
         :rtype: str
         :returns: Return a fully-qualified project string.
         """
-        return "projects/{project}".format(project=self.project)
+        return self.instance_admin_client.common_project_path(self.project)
 
     @property
     def table_data_client(self):

google/cloud/bigtable/table.py

@@ -1094,7 +1094,7 @@ def _do_mutate_retryable_rows(self):
                 entries=entries,
                 app_profile_id=self.app_profile_id,
                 retry=None,
-                # **kwargs
+                **kwargs
             )
         except (ServiceUnavailable, DeadlineExceeded, Aborted):
             # If an exception, considered retryable by `RETRY_CODES`, is

tests/unit/test_app_profile.py

@@ -562,15 +562,16 @@ def test_update_app_profile_routing_any(self):
 
         instance_api.update_app_profile.return_value = response_pb
         app_profile._instance._client._instance_admin_client = instance_api
-        app_profile.update(ignore_warnings=ignore_warnings)
+        result = app_profile.update(ignore_warnings=ignore_warnings)
         actual_request = client._instance_admin_client.update_app_profile.call_args_list[
             0
         ].kwargs
 
         self.assertEqual(actual_request, expected_request)
-        # self.assertIsInstance(result, operation.Operation)
-        # self.assertEqual(result.operation.name, self.OP_NAME)
-        # self.assertIsInstance(result.metadata, messages_v2_pb2.UpdateAppProfileMetadata)
+        self.assertEqual(
+            result.metadata.type_url,
+            "type.googleapis.com/google.bigtable.admin.v2.UpdateAppProfileMetadata",
+        )
 
     def test_update_app_profile_routing_single(self):
         from google.longrunning import operations_pb2
@@ -626,14 +627,15 @@ def test_update_app_profile_routing_single(self):
             }
         }
 
-        app_profile.update(ignore_warnings=ignore_warnings)
+        result = app_profile.update(ignore_warnings=ignore_warnings)
         actual_request = client._instance_admin_client.update_app_profile.call_args_list[
             0
         ].kwargs
         self.assertEqual(actual_request, expected_request)
-        # self.assertIsInstance(result, operation.Operation)
-        # self.assertEqual(result.operation.name, self.OP_NAME)
-        # self.assertIsInstance(result.metadata, messages_v2_pb2.UpdateAppProfileMetadata)
+        self.assertEqual(
+            result.metadata.type_url,
+            "type.googleapis.com/google.bigtable.admin.v2.UpdateAppProfileMetadata",
+        )
 
     def test_update_app_profile_with_wrong_routing_policy(self):
         credentials = _make_credentials()

tests/unit/test_cluster.py

@@ -391,9 +391,6 @@ def test_create(self):
             0
         ].kwargs
         self.assertEqual(actual_request, expected_request)
-        # self.assertIsInstance(result, operation.Operation)
-        # self.assertEqual(result.operation.name, self.OP_NAME)
-        # self.assertIsInstance(result.metadata, messages_v2_pb2.CreateClusterMetadata)
 
     def test_update(self):
         import datetime
@@ -456,9 +453,6 @@ def test_update(self):
         ].kwargs
 
         self.assertEqual(actual_request, expected_request)
-        # self.assertIsInstance(result, operation.Operation)
-        # self.assertEqual(result.operation.name, self.OP_NAME)
-        # self.assertIsInstance(result.metadata, messages_v2_pb2.UpdateClusterMetadata)
 
     def test_delete(self):
         from google.protobuf import empty_pb2

tests/unit/test_instance.py

@@ -316,6 +316,7 @@ def test_create(self):
             self.LABELS,
         )
         instance_api, response = self._instance_api_response_for_create()
+        instance_api.common_project_path.return_value = "projects/project"
         client._instance_admin_client = instance_api
         serve_nodes = 3
 
@@ -367,6 +368,7 @@ def test_create_w_clusters(self):
             self.LABELS,
         )
         instance_api, response = self._instance_api_response_for_create()
+        instance_api.common_project_path.return_value = "projects/project"
         client._instance_admin_client = instance_api
 
         # Perform the method and check the result.

tests/unit/test_table.py

@@ -143,7 +143,7 @@ class TestTable(unittest.TestCase):
     ROW_KEY_1 = b"row-key-1"
     ROW_KEY_2 = b"row-key-2"
     ROW_KEY_3 = b"row-key-3"
-    FAMILY_NAME = u"family"
+    FAMILY_NAME = "family"
     QUALIFIER = b"qualifier"
     TIMESTAMP_MICROS = 100
     VALUE = b"value"
@@ -525,9 +525,9 @@ def test_get_cluster_states(self):
 
         # build expected result
         expected_result = {
-            u"cluster-id1": ClusterState(INITIALIZING),
-            u"cluster-id2": ClusterState(PLANNED_MAINTENANCE),
-            u"cluster-id3": ClusterState(READY),
+            "cluster-id1": ClusterState(INITIALIZING),
+            "cluster-id2": ClusterState(PLANNED_MAINTENANCE),
+            "cluster-id3": ClusterState(READY),
         }
 
         # Perform the method and check the result.
@@ -858,22 +858,7 @@ def test_read_retry_rows(self):
         response_iterator = _MockReadRowsIterator(response_2)
 
         # Patch the stub used by the API method.
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+        data_api.table_path.return_value = f"projects/{self.PROJECT_ID}/instances/{self.INSTANCE_ID}/tables/{self.TABLE_ID}"
 
         client._table_data_client.read_rows = mock.Mock(
             side_effect=[
@@ -1547,9 +1532,6 @@ def test_callable_empty_rows(self):
 
         data_api = mock.create_autospec(BigtableClient)
         table_api = mock.create_autospec(bigtable_table_admin.BigtableTableAdminClient)
-        table_api.table_path.return_value = (
-            "projects/self.PROJECT_ID/instances/self.INSTANCE_ID/tables/self.TABLE_ID"
-        )
         credentials = _make_credentials()
         client = self._make_client(
             project="project-id", credentials=credentials, admin=True
@@ -1604,22 +1586,6 @@ def test_callable_no_retry_strategy(self):
         response = self._make_responses(response_codes)
         data_api.mutate_rows = mock.MagicMock(return_value=[response])
 
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
         table._instance._client._table_data_client = data_api
         table._instance._client._table_admin_client = table_api
 
@@ -1654,22 +1620,7 @@ def test_callable_retry(self):
 
         data_api = mock.create_autospec(BigtableClient)
         table_api = mock.create_autospec(bigtable_table_admin.BigtableTableAdminClient)
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+
         credentials = _make_credentials()
         client = self._make_client(
             project="project-id", credentials=credentials, admin=True
@@ -1740,22 +1691,7 @@ def test_do_mutate_retryable_rows(self):
 
         data_api = mock.create_autospec(BigtableClient)
         table_api = mock.create_autospec(bigtable_table_admin.BigtableTableAdminClient)
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+
         credentials = _make_credentials()
         client = self._make_client(
             project="project-id", credentials=credentials, admin=True
@@ -1826,22 +1762,7 @@ def test_do_mutate_retryable_rows_retry(self):
 
         # Patch the stub used by the API method.
         client._table_data_client.mutate_rows.side_effect = [[response]]
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+
         table._instance._client._table_data_client = data_api
         table._instance._client._table_admin_client = table_api
 
@@ -1902,22 +1823,7 @@ def test_do_mutate_retryable_rows_second_retry(self):
 
         # Patch the stub used by the API method.
         client._table_data_client.mutate_rows.side_effect = [[response]]
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+
         table._instance._client._table_data_client = data_api
         table._instance._client._table_admin_client = table_api
 
@@ -1981,22 +1887,7 @@ def test_do_mutate_retryable_rows_second_try(self):
 
         # Patch the stub used by the API method.
         client._table_data_client.mutate_rows.side_effect = [[response]]
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+
         table._instance._client._table_data_client = data_api
         table._instance._client._table_admin_client = table_api
 
@@ -2049,14 +1940,7 @@ def test_do_mutate_retryable_rows_second_try_no_retryable(self):
         worker.responses_statuses = self._make_responses_statuses(
             [self.SUCCESS, self.NON_RETRYABLE]
         )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+
         table._instance._client._table_admin_client = table_api
 
         statuses = worker._do_mutate_retryable_rows()
@@ -2093,22 +1977,7 @@ def test_do_mutate_retryable_rows_mismatch_num_responses(self):
 
         # Patch the stub used by the API method.
         client._table_data_client.mutate_rows.side_effect = [[response]]
-        data_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
-        table_api.table_path.return_value = (
-            "projects/"
-            + self.PROJECT_ID
-            + "/instances/"
-            + self.INSTANCE_ID
-            + "/tables/"
-            + self.TABLE_ID
-        )
+
         table._instance._client._table_data_client = data_api
         table._instance._client._table_admin_client = table_api