feat!: microgenerator changes

google/cloud/bigtable/client.py

@@ -35,10 +35,12 @@
 
 from google.cloud import bigtable_v2
 from google.cloud import bigtable_admin_v2
-from google.cloud.bigtable_v2.gapic.transports import bigtable_grpc_transport
-from google.cloud.bigtable_admin_v2.gapic.transports import (
-    bigtable_table_admin_grpc_transport,
-    bigtable_instance_admin_grpc_transport,
+from google.cloud.bigtable_v2.services.bigtable.transports import BigtableGrpcTransport
+from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports import (
+    BigtableInstanceAdminGrpcTransport,
+)
+from google.cloud.bigtable_admin_v2.services.bigtable_table_admin.transports import (
+    BigtableTableAdminGrpcTransport,
 )
 
 from google.cloud.bigtable import __version__
@@ -210,23 +212,19 @@ def _create_gapic_client_channel(self, client_class, grpc_transport):
         if self._client_options and self._client_options.api_endpoint:
             api_endpoint = self._client_options.api_endpoint
         else:
-            api_endpoint = client_class.SERVICE_ADDRESS
+            api_endpoint = client_class.DEFAULT_ENDPOINT
 
         channel = grpc_transport.create_channel(
-            api_endpoint,
-            self._credentials,
+            host=api_endpoint,
+            credentials=self._credentials,
             options={
                 "grpc.max_send_message_length": -1,
                 "grpc.max_receive_message_length": -1,
                 "grpc.keepalive_time_ms": 30000,
                 "grpc.keepalive_timeout_ms": 10000,
             }.items(),
         )
-        transport = grpc_transport(
-            address=api_endpoint,
-            channel=channel,
-            credentials=None,
-        )
+        transport = grpc_transport(channel=channel, host=api_endpoint)
         return transport
 
     @property
@@ -270,8 +268,7 @@ def table_data_client(self):
         """
         if self._table_data_client is None:
             transport = self._create_gapic_client_channel(
-                bigtable_v2.BigtableClient,
-                bigtable_grpc_transport.BigtableGrpcTransport,
+                bigtable_v2.BigtableClient, BigtableGrpcTransport,
             )
             klass = _create_gapic_client(
                 bigtable_v2.BigtableClient,
@@ -304,7 +301,7 @@ def table_admin_client(self):
 
             transport = self._create_gapic_client_channel(
                 bigtable_admin_v2.BigtableTableAdminClient,
-                bigtable_table_admin_grpc_transport.BigtableTableAdminGrpcTransport,
+                BigtableTableAdminGrpcTransport,
             )
             klass = _create_gapic_client(
                 bigtable_admin_v2.BigtableTableAdminClient,
@@ -337,7 +334,7 @@ def instance_admin_client(self):
 
             transport = self._create_gapic_client_channel(
                 bigtable_admin_v2.BigtableInstanceAdminClient,
-                bigtable_instance_admin_grpc_transport.BigtableInstanceAdminGrpcTransport,
+                BigtableInstanceAdminGrpcTransport,
             )
             klass = _create_gapic_client(
                 bigtable_admin_v2.BigtableInstanceAdminClient,

google/cloud/bigtable/column_family.py

@@ -348,8 +348,6 @@ def _gc_rule_from_pb(gc_rule_pb):
     if rule_name == "max_num_versions":
         return MaxVersionsGCRule(gc_rule_pb.max_num_versions)
     elif rule_name == "max_age":
-        # todo check this is right
-        # max_age = _helpers._duration_pb_to_timedelta(gc_rule_pb.max_age)
         return MaxAgeGCRule(gc_rule_pb.max_age)
     elif rule_name == "union":
         return GCRuleUnion([_gc_rule_from_pb(rule) for rule in gc_rule_pb.union.rules])

samples/beam/noxfile.py

@@ -87,7 +87,8 @@ def get_pytest_env_vars():
 
 TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS])
 
-INSTALL_LIBRARY_FROM_SOURCE = bool(os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False))
+# todo(kolea2): temporary workaround to install pinned dep version
+INSTALL_LIBRARY_FROM_SOURCE = False
 #
 # Style Checks
 #

samples/beam/requirements.txt

@@ -1,3 +1,3 @@
 apache-beam==2.27.0
-google-cloud-bigtable==1.6.1
+google-cloud-bigtable==1.0.0
 google-cloud-core==1.6.0

setup.py

@@ -22,7 +22,7 @@
 
 name = "google-cloud-bigtable"
 description = "Google Cloud Bigtable API client library"
-version = "1.6.1"
+version = "1.7.0"
 # Should be one of:
 # 'Development Status :: 3 - Alpha'
 # 'Development Status :: 4 - Beta'

tests/unit/test_client.py

@@ -223,7 +223,6 @@ def test_table_data_client_not_initialized(self):
 
         table_data_client = client.table_data_client
         self.assertIsInstance(table_data_client, BigtableClient)
-        # todo is this expected?
         self.assertIs(client._client_info, _CLIENT_INFO)
         self.assertIs(client._table_data_client, table_data_client)
 

tests/unit/test_table.py

@@ -923,22 +923,9 @@ def test_yield_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}"
+        table_api.table_path.return_value = f"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
         client._table_data_client.read_rows.side_effect = [
@@ -1014,22 +1001,9 @@ def test_yield_rows_with_row_set(self):
         response_iterator = _MockReadRowsIterator(response_1, response_2, response_3)
 
         # 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}"
+        table_api.table_path.return_value = f"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
         client._table_data_client.read_rows.side_effect = [response_iterator]