updated classic client references

Author: daniel-sanche

google/cloud/bigtable/classic/app_profile.py

@@ -18,7 +18,7 @@
 import re
 
 from .enums import RoutingPolicyType
-from google.cloud.bigtable_admin_v2.types import instance
+from google.cloud.bigtable.admin.types import instance
 from google.protobuf import field_mask_pb2
 from google.api_core.exceptions import NotFound
 

google/cloud/bigtable/classic/backup.py

@@ -17,8 +17,8 @@
 import re
 
 from google.cloud._helpers import _datetime_to_pb_timestamp  # type: ignore
-from google.cloud.bigtable_admin_v2 import BigtableTableAdminClient
-from google.cloud.bigtable_admin_v2.types import table
+from google.cloud.bigtable.admin import BigtableTableAdminClient
+from google.cloud.bigtable.admin.types import table
 from .encryption_info import EncryptionInfo
 from .policy import Policy
 from google.cloud.exceptions import NotFound  # type: ignore
@@ -226,7 +226,7 @@ def size_bytes(self):
     def state(self):
         """The current state of this Backup.
 
-        :rtype: :class:`~google.cloud.bigtable_admin_v2.gapic.enums.Backup.State`
+        :rtype: :class:`~google.cloud.bigtable.admin.gapic.enums.Backup.State`
         :returns: The current state of this Backup.
         """
         return self._state
@@ -305,7 +305,7 @@ def create(self, cluster_id=None):
                            created Backup.
 
         :rtype: :class:`~google.api_core.operation.Operation`
-        :returns: :class:`~google.cloud.bigtable_admin_v2.types._OperationFuture`
+        :returns: :class:`~google.cloud.bigtable.admin.types._OperationFuture`
                   instance, to be used to poll the status of the 'create' request
         :raises Conflict: if the Backup already exists
         :raises NotFound: if the Instance owning the Backup does not exist
@@ -343,7 +343,7 @@ def get(self):
         """Retrieves metadata of a pending or completed Backup.
 
         :returns: An instance of
-                 :class:`~google.cloud.bigtable_admin_v2.types.Backup`
+                 :class:`~google.cloud.bigtable.admin.types.Backup`
 
         :raises google.api_core.exceptions.GoogleAPICallError: If the request
                 failed for any reason.
@@ -412,7 +412,7 @@ def restore(self, table_id, instance_id=None):
         :param instance_id: (Optional) The ID of the Instance to restore the
                             backup into, if different from the current one.
 
-        :rtype: :class:`~google.cloud.bigtable_admin_v2.types._OperationFuture`
+        :rtype: :class:`~google.cloud.bigtable.admin.types._OperationFuture`
         :returns: A future to be used to poll the status of the 'restore'
                   request.
 

google/cloud/bigtable/classic/client.py

@@ -35,12 +35,12 @@
 from google.auth.credentials import AnonymousCredentials  # type: ignore
 
 from google.cloud import bigtable_v2
-from google.cloud import bigtable_admin_v2
+from google.cloud.bigtable import admin as bigtable_admin_v2
 from google.cloud.bigtable_v2.services.bigtable.transports import BigtableGrpcTransport
-from google.cloud.bigtable_admin_v2.services.bigtable_instance_admin.transports import (
+from google.cloud.bigtable.admin.services.bigtable_instance_admin.transports import (
     BigtableInstanceAdminGrpcTransport,
 )
-from google.cloud.bigtable_admin_v2.services.bigtable_table_admin.transports import (
+from google.cloud.bigtable.admin.services.bigtable_table_admin.transports import (
     BigtableTableAdminGrpcTransport,
 )
 
@@ -50,7 +50,7 @@
 
 from google.cloud.client import ClientWithProject  # type: ignore
 
-from google.cloud.bigtable_admin_v2.types import instance
+from google.cloud.bigtable.admin.types import instance
 from .cluster import _CLUSTER_NAME_RE
 from google.cloud.environment_vars import BIGTABLE_EMULATOR  # type: ignore
 
@@ -325,11 +325,11 @@ def table_admin_client(self):
                 raise ValueError("Client is not an admin client.")
 
             transport = self._create_gapic_client_channel(
-                bigtable_admin_v2.BigtableTableAdminClient,
+                bigtable.admin.BigtableTableAdminClient,
                 BigtableTableAdminGrpcTransport,
             )
             klass = _create_gapic_client(
-                bigtable_admin_v2.BigtableTableAdminClient,
+                bigtable.admin.BigtableTableAdminClient,
                 client_options=self._admin_client_options,
                 transport=transport,
             )
@@ -358,11 +358,11 @@ def instance_admin_client(self):
                 raise ValueError("Client is not an admin client.")
 
             transport = self._create_gapic_client_channel(
-                bigtable_admin_v2.BigtableInstanceAdminClient,
+                bigtable.admin.BigtableInstanceAdminClient,
                 BigtableInstanceAdminGrpcTransport,
             )
             klass = _create_gapic_client(
-                bigtable_admin_v2.BigtableInstanceAdminClient,
+                bigtable.admin.BigtableInstanceAdminClient,
                 client_options=self._admin_client_options,
                 transport=transport,
             )

google/cloud/bigtable/classic/cluster.py

@@ -16,7 +16,7 @@
 
 
 import re
-from google.cloud.bigtable_admin_v2.types import instance
+from google.cloud.bigtable.admin.types import instance
 from google.api_core.exceptions import NotFound
 from google.protobuf import field_mask_pb2
 

google/cloud/bigtable/classic/column_family.py

@@ -16,8 +16,8 @@
 
 
 from google.cloud import _helpers
-from google.cloud.bigtable_admin_v2.types import table as table_v2_pb2
-from google.cloud.bigtable_admin_v2.types import (
+from google.cloud.bigtable.admin.types import table as table_v2_pb2
+from google.cloud.bigtable.admin.types import (
     bigtable_table_admin as table_admin_v2_pb2,
 )
 from google.api_core.gapic_v1.method import DEFAULT

google/cloud/bigtable/classic/enums.py

@@ -13,9 +13,9 @@
 # limitations under the License.
 """Wrappers for gapic enum types."""
 
-from google.cloud.bigtable_admin_v2.types import common
-from google.cloud.bigtable_admin_v2.types import instance
-from google.cloud.bigtable_admin_v2.types import table
+from google.cloud.bigtable.admin.types import common
+from google.cloud.bigtable.admin.types import instance
+from google.cloud.bigtable.admin.types import table
 
 
 class StorageType(object):

google/cloud/bigtable/classic/instance.py

@@ -22,7 +22,7 @@
 
 from google.protobuf import field_mask_pb2
 
-from google.cloud.bigtable_admin_v2.types import instance
+from google.cloud.bigtable.admin.types import instance
 
 from google.iam.v1 import options_pb2  # type: ignore
 

google/cloud/bigtable/classic/table.py

@@ -47,9 +47,9 @@
 from .row_set import RowRange
 from . import enums
 from google.cloud.bigtable_v2.types import bigtable as data_messages_v2_pb2
-from google.cloud.bigtable_admin_v2 import BigtableTableAdminClient
-from google.cloud.bigtable_admin_v2.types import table as admin_messages_v2_pb2
-from google.cloud.bigtable_admin_v2.types import (
+from google.cloud.bigtable.admin import BigtableTableAdminClient
+from google.cloud.bigtable.admin.types import table as admin_messages_v2_pb2
+from google.cloud.bigtable.admin.types import (
     bigtable_table_admin as table_admin_messages_v2_pb2,
 )
 
@@ -1037,7 +1037,7 @@ def restore(self, new_table_id, cluster_id=None, backup_id=None, backup_name=Non
                             and `backup_id` parameters even of such specified.
 
         :return: An instance of
-             :class:`~google.cloud.bigtable_admin_v2.types._OperationFuture`.
+             :class:`~google.cloud.bigtable.admin.types._OperationFuture`.
 
         :raises: google.api_core.exceptions.AlreadyExists: If the table
                  already exists.