diff --git a/docs/admin_client/admin_client_usage.rst b/docs/admin_client/admin_client_usage.rst new file mode 100644 index 000000000..8c6f4a5dc --- /dev/null +++ b/docs/admin_client/admin_client_usage.rst @@ -0,0 +1,11 @@ +Admin Client +============ +.. toctree:: + :maxdepth: 2 + + services_ + types_ + +.. + This should be the only handwritten RST file in this directory. + Everything else should be autogenerated. diff --git a/docs/admin_client/bigtable_instance_admin.rst b/docs/admin_client/bigtable_instance_admin.rst new file mode 100644 index 000000000..acfcc3401 --- /dev/null +++ b/docs/admin_client/bigtable_instance_admin.rst @@ -0,0 +1,10 @@ +BigtableInstanceAdmin +--------------------------------------- + +.. automodule:: google.cloud.bigtable.admin_v2.services.bigtable_instance_admin + :members: + :inherited-members: + +.. automodule:: google.cloud.bigtable.admin_v2.services.bigtable_instance_admin.pagers + :members: + :inherited-members: diff --git a/docs/admin_client/bigtable_table_admin.rst b/docs/admin_client/bigtable_table_admin.rst new file mode 100644 index 000000000..5937faa66 --- /dev/null +++ b/docs/admin_client/bigtable_table_admin.rst @@ -0,0 +1,10 @@ +BigtableTableAdmin +------------------------------------ + +.. automodule:: google.cloud.bigtable.admin_v2.overlay.services.bigtable_table_admin + :members: + :inherited-members: + +.. automodule:: google.cloud.bigtable.admin_v2.services.bigtable_table_admin.pagers + :members: + :inherited-members: diff --git a/docs/admin_client/services_.rst b/docs/admin_client/services_.rst new file mode 100644 index 000000000..ea55c7da1 --- /dev/null +++ b/docs/admin_client/services_.rst @@ -0,0 +1,7 @@ +Services for Google Cloud Bigtable Admin v2 API +=============================================== +.. toctree:: + :maxdepth: 2 + + bigtable_instance_admin + bigtable_table_admin diff --git a/docs/admin_client/types_.rst b/docs/admin_client/types_.rst new file mode 100644 index 000000000..60ad3229b --- /dev/null +++ b/docs/admin_client/types_.rst @@ -0,0 +1,10 @@ +Types for Google Cloud Bigtable Admin v2 API +============================================ + +.. automodule:: google.cloud.bigtable.admin_v2.types + :members: + :show-inheritance: + +.. automodule:: google.cloud.bigtable.admin_v2.overlay.types + :members: + :show-inheritance: diff --git a/docs/index.rst b/docs/index.rst index c7f9721f3..0694c8bb0 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -9,7 +9,7 @@ Client Types data_client/data_client_usage classic_client/usage - + admin_client/admin_client_usage Changelog --------- diff --git a/docs/scripts/patch_devsite_toc.py b/docs/scripts/patch_devsite_toc.py index 5889300d2..f9ccc4c2a 100644 --- a/docs/scripts/patch_devsite_toc.py +++ b/docs/scripts/patch_devsite_toc.py @@ -20,6 +20,7 @@ """ +import glob import yaml import os import shutil @@ -153,6 +154,81 @@ def copy_markdown(self): f"_build/html/docfx_yaml", ) + def validate_section(self, toc): + # Make sure each rst file is listed in the toc. + items_in_toc = [ + d["items"] for d in toc[0]["items"] if d["name"] == self.title and ".rst" + ][0] + items_in_dir = [f for f in os.listdir(self.dir_name) if f.endswith(".rst")] + # subtract 1 for index + assert len(items_in_toc) == len(items_in_dir) - 1 + for file in items_in_dir: + if file != self.index_file_name: + base_name, _ = os.path.splitext(file) + assert any(d["href"] == f"{base_name}.md" for d in items_in_toc) + # make sure the markdown files are present in the docfx_yaml directory + md_files = [d["href"] for d in items_in_toc] + for file in md_files: + assert os.path.exists(f"_build/html/docfx_yaml/{file}") + + +class UIDFilteredTocSection(TocSection): + def __init__(self, toc_file_path, section_name, title, uid_prefix): + """Creates a filtered section denoted by section_name in the toc_file_path to items with the given UID prefix. + + The section is then renamed to the title. + """ + current_toc = yaml.safe_load(open(toc_file_path, "r")) + self.uid_prefix = uid_prefix + + # Since we are looking for a specific section_name there should only + # be one match. + section_items = [ + d for d in current_toc[0]["items"] if d["name"] == section_name + ][0]["items"] + filtered_items = [d for d in section_items if d["uid"].startswith(uid_prefix)] + self.items = filtered_items + self.title = title + + def copy_markdown(self): + """ + No-op because we are filtering on UIDs, not markdown files. + """ + pass + + def validate_section(self, toc): + uids_in_toc = set() + + # A UID-filtered TOC tree looks like the following: + # - items: + # items: + # name: + # uid: + # + # Walk through the TOC tree to find all UIDs recursively. + def find_uids_in_items(items): + uids_in_toc.add(items["uid"]) + for subitem in items.get("items", []): + find_uids_in_items(subitem) + + items_in_toc = [d["items"] for d in toc[0]["items"] if d["name"] == self.title][ + 0 + ] + for item in items_in_toc: + find_uids_in_items(item) + + # Now that we have all the UIDs, first match all of them + # with corresponding .yml files. + for uid in uids_in_toc: + assert os.path.exists(f"_build/html/docfx_yaml/{uid}.yml") + + # Also validate that every uid yml file that starts with the uid_prefix + # exists in the section. + for filename in glob.glob( + f"{self.uid_prefix}*.yml", root_dir="_build/html/docfx_yaml" + ): + assert filename[:-4] in uids_in_toc + def validate_toc(toc_file_path, expected_section_list, added_sections): current_toc = yaml.safe_load(open(toc_file_path, "r")) @@ -164,38 +240,22 @@ def validate_toc(toc_file_path, expected_section_list, added_sections): # make sure each customs ection is in the toc for section in added_sections: assert section.title in found_sections - # make sure each rst file in each custom section dir is listed in the toc - for section in added_sections: - items_in_toc = [ - d["items"] - for d in current_toc[0]["items"] - if d["name"] == section.title and ".rst" - ][0] - items_in_dir = [f for f in os.listdir(section.dir_name) if f.endswith(".rst")] - # subtract 1 for index - assert len(items_in_toc) == len(items_in_dir) - 1 - for file in items_in_dir: - if file != section.index_file_name: - base_name, _ = os.path.splitext(file) - assert any(d["href"] == f"{base_name}.md" for d in items_in_toc) - # make sure the markdown files are present in the docfx_yaml directory - for section in added_sections: - items_in_toc = [ - d["items"] - for d in current_toc[0]["items"] - if d["name"] == section.title and ".rst" - ][0] - md_files = [d["href"] for d in items_in_toc] - for file in md_files: - assert os.path.exists(f"_build/html/docfx_yaml/{file}") + section.validate_section(current_toc) print("Toc validation passed") if __name__ == "__main__": # Add secrtions for the async_data_client and classic_client directories toc_path = "_build/html/docfx_yaml/toc.yml" + custom_sections = [ TocSection(dir_name="data_client", index_file_name="data_client_usage.rst"), + UIDFilteredTocSection( + toc_file_path=toc_path, + section_name="Bigtable", + title="Admin Client", + uid_prefix="google.cloud.bigtable.admin_v2", + ), TocSection(dir_name="classic_client", index_file_name="usage.rst"), ] add_sections(toc_path, custom_sections) @@ -210,6 +270,7 @@ def validate_toc(toc_file_path, expected_section_list, added_sections): "Changelog", "Multiprocessing", "Data Client", + "Admin Client", "Classic Client", ], added_sections=custom_sections, diff --git a/google/cloud/bigtable/admin/__init__.py b/google/cloud/bigtable/admin/__init__.py index e3b8e87f0..832d712d0 100644 --- a/google/cloud/bigtable/admin/__init__.py +++ b/google/cloud/bigtable/admin/__init__.py @@ -408,3 +408,8 @@ "RestoreSourceType", "Type", ) + +import google.cloud.bigtable.admin_v2.overlay # noqa: F401 +from google.cloud.bigtable.admin_v2.overlay import * # noqa: F401, F403 + +__all__ += google.cloud.bigtable.admin_v2.overlay.__all__ diff --git a/google/cloud/bigtable/admin_v2/__init__.py b/google/cloud/bigtable/admin_v2/__init__.py index cdb3345fb..01c218109 100644 --- a/google/cloud/bigtable/admin_v2/__init__.py +++ b/google/cloud/bigtable/admin_v2/__init__.py @@ -248,3 +248,7 @@ "UpdateTableMetadata", "UpdateTableRequest", ) + +from .overlay import * # noqa: F403 + +__all__ += overlay.__all__ # noqa: F405 diff --git a/google/cloud/bigtable/admin_v2/overlay/__init__.py b/google/cloud/bigtable/admin_v2/overlay/__init__.py index 3b85e4989..352f1af7e 100644 --- a/google/cloud/bigtable/admin_v2/overlay/__init__.py +++ b/google/cloud/bigtable/admin_v2/overlay/__init__.py @@ -25,7 +25,7 @@ # a polling future class for automatically polling check_consistency. # # This directory is structured to mirror that of a typical autogenerated library (e.g. -# services/types subdirectories), and the aforementioned handwritten additions are +# services/types subdirectories), and the aforementioned handwritten additions are # currently implemented as either types under overlay/types or in methods in an overwritten # client class under overlay/services. diff --git a/google/cloud/bigtable/admin_v2/overlay/services/bigtable_table_admin/client.py b/google/cloud/bigtable/admin_v2/overlay/services/bigtable_table_admin/client.py index e7ee4db3a..3977cd6ea 100644 --- a/google/cloud/bigtable/admin_v2/overlay/services/bigtable_table_admin/client.py +++ b/google/cloud/bigtable/admin_v2/overlay/services/bigtable_table_admin/client.py @@ -58,15 +58,15 @@ def restore_table( metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ) -> restore_table.RestoreTableOperation: r"""Create a new table by restoring from a completed backup. The - returned table :ref:`long-running operation - <:class:google.cloud.bigtable.admin_v2.overlay.types.restore_table.RestoreTableOperation>` + returned table :class:`long-running operation + ` can be used to track the progress of the operation, and to cancel it. The - :ref:`metadata <:attr:google.api_core.operation.Operation.metadata>` field type is - :ref:`RestoreTableMetadata <:class:google.bigtable.admin_v2.types.RestoreTableMetadata>`. - The :ref:`response <:meth:google.api_core.operation.Operation.result>` type is + :attr:`metadata ` field type is + :class:`RestoreTableMetadata `. + The :meth:`response ` type is :class:`google.cloud.bigtable.admin_v2.types.Table`, if successful. - Additionally, the returned :ref:`long-running-operation <:class:google.cloud.bigtable.admin_v2.overlay.types.restore_table.RestoreTableOperation>` + Additionally, the returned :class:`long-running-operation ` provides a method, :meth:`google.cloud.bigtable.admin_v2.overlay.types.restore_table.RestoreTableOperation.optimize_restore_table_operation` that provides access to a :class:`google.api_core.operation.Operation` object representing the OptimizeRestoreTable long-running-operation after the current one has completed. diff --git a/google/cloud/bigtable/admin_v2/overlay/types/consistency.py b/google/cloud/bigtable/admin_v2/overlay/types/consistency.py index f5775b697..9c3772f2d 100644 --- a/google/cloud/bigtable/admin_v2/overlay/types/consistency.py +++ b/google/cloud/bigtable/admin_v2/overlay/types/consistency.py @@ -17,7 +17,7 @@ from google.api_core.future import polling from google.api_core import gapic_v1 from google.api_core import retry as retries -from google.bigtable.admin_v2.types import bigtable_table_admin +from google.cloud.bigtable.admin_v2.types import bigtable_table_admin try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -29,26 +29,37 @@ class CheckConsistencyPollingFuture(polling.PollingFuture): """A Future that polls an underlying `check_consistency` operation until it returns True. **This class should not be instantiated by users** and should only be instantiated by the admin - client's `google.cloud.bigtable.admin_v2.overlay.services.BigtableTableAdminClient.wait_for_consistency` or - :meth:`google.cloud.bigtable.admin_v2.overlay.services.BigtableTableAdminClient.wait_for_replication` methods. + client's + :meth:`google.cloud.bigtable.admin_v2.overlay.services.bigtable_table_admin.BigtableTableAdminClient.wait_for_consistency` + or + :meth:`google.cloud.bigtable.admin_v2.overlay.services.bigtable_table_admin.BigtableTableAdminClient.wait_for_replication` + methods. Args: check_consistency_call(Callable[ [Optional[google.api_core.retry.Retry], google.cloud.bigtable.admin_v2.types.CheckConsistencyResponse]): - A :meth:`google.cloud.bigtable.admin_v2.overlay.services.BigtableTableAdminClient.check_consistency` call - from :class:`google.cloud.bigtable.admin_v2.overlay.services.BigtableTableAdminClient`. The call should fix - every user parameter except for retry, which will be done via :meth:`functools.partial`. - default_retry(Optional[google.api_core.retry.Retry]): The `retry` parameter passed in to either `wait_for_consistency` - or `wait_for_replication`. + A :meth:`check_consistency + ` + call from the admin client. The call should fix every user parameter except for retry, + which will be done via :meth:`functools.partial`. + default_retry(Optional[google.api_core.retry.Retry]): The `retry` parameter passed in to either + :meth:`wait_for_consistency + ` + or :meth:`wait_for_replication + ` polling (google.api_core.retry.Retry): The configuration used for polling. This parameter controls how often :meth:`done` is polled. If the - ``timeout`` argument is specified in :meth:`result` method it will + ``timeout`` argument is specified in the :meth:`result + ` method it will override the ``polling.timeout`` property. """ + def __init__( self, - check_consistency_call: Callable[[OptionalRetry], bigtable_table_admin.CheckConsistencyResponse], + check_consistency_call: Callable[ + [OptionalRetry], bigtable_table_admin.CheckConsistencyResponse + ], default_retry: OptionalRetry = gapic_v1.method.DEFAULT, polling: retries.Retry = polling.DEFAULT_POLLING, **kwargs @@ -62,18 +73,20 @@ def __init__( self._default_retry = default_retry def done(self, retry: OptionalRetry = None): - """Checks to see if the operation is complete. + """Polls the underlying `check_consistency` call to see if the future is complete. - This will be return True when the underlying check_consistency call returns - True while polling. + This should not be used by the user to wait until the `check_consistency` call finishes; + use the :meth:`result ` method of + this class instead. Args: retry (google.api_core.retry.Retry): (Optional) How to retry the polling RPC (to not be confused with polling configuration. See - the documentation for :meth:`result` for details). + the documentation for :meth:`result ` + for details). Returns: - bool: True if the operation is complete, False otherwise. + bool: True if the future is complete, False otherwise. """ if self._result_set: diff --git a/google/cloud/bigtable/admin_v2/overlay/types/restore_table.py b/google/cloud/bigtable/admin_v2/overlay/types/restore_table.py index 495fbdf3a..c346a6b79 100644 --- a/google/cloud/bigtable/admin_v2/overlay/types/restore_table.py +++ b/google/cloud/bigtable/admin_v2/overlay/types/restore_table.py @@ -12,35 +12,44 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import Optional +import enum +from typing import Optional, Union +from google.api_core import retry from google.api_core import operation from google.protobuf import empty_pb2 from google.cloud.bigtable.admin_v2.types import OptimizeRestoredTableMetadata +# This is needed due to a documentation issue with using object() as the default +# value for a parameter. +class Timeout(enum.Enum): + DEFAULT_TIMEOUT = "DEFAULT_TIMEOUT" + + class RestoreTableOperation(operation.Operation): """A Future for interacting with Bigtable Admin's RestoreTable Long-Running Operation. This is needed to expose a potential long-running operation that might run after this operation - finishes, OptimizeRestoreTable. This is exposed via the the :meth:`optimize_restore_table` method. + finishes, OptimizeRestoreTable. This is exposed via the the :meth:`optimize_restore_table_operation` + method. **This class should not be instantiated by users** and should only be instantiated by the admin - client's `google.cloud.bigtable.admin_v2.overlay.services.BigtableTableAdminClient.restore_table` + client's :meth:`restore_table + ` method. Args: operations_client (google.api_core.operations_v1.AbstractOperationsClient): The operations - client from the :class:`google.cloud.bigtable.admin_v2.overlay.services.BigtableTableAdminClient`'s - transport. + client from the admin client class's transport. restore_table_operation (google.api_core.operation.Operation): A :class:`google.api_core.operation.Operation` instance resembling a RestoreTable long-running operation """ def __init__(self, operations_client, restore_table_operation: operation.Operation): self._operations_client = operations_client - self._optimize_restore_table_operation = None + self._optimize_restored_table_operation = None super().__init__( restore_table_operation._operation, restore_table_operation._refresh, @@ -50,27 +59,44 @@ def __init__(self, operations_client, restore_table_operation: operation.Operati polling=restore_table_operation._polling, ) - def optimize_restore_table_operation( - self, timeout=operation.Operation._DEFAULT_VALUE, retry=None, polling=None + def optimize_restored_table_operation( + self, + timeout: Optional[Union[int, Timeout]] = Timeout.DEFAULT_TIMEOUT, + retry: Optional[retry.Retry] = None, + polling: Optional[retry.Retry] = None, ) -> Optional[operation.Operation]: - """Gets the OptimizeRestoreTable long-running operation that runs after this operation finishes. + """Gets the OptimizeRestoredTable long-running operation that runs after this operation finishes. This is a blocking call that will return the operation after this current long-running operation - finishes, just like :meth:`result`. The follow-up operation has - :ref:`metadata <:attr:google.api_core.operation.Operation.metadata>` type - :ref:`OptimizeRestoreTableMetadata <:class:google.bigtable.admin_v2.types.OptimizeRestoreTableMetadata>` + finishes, just like :meth:`google.api_core.operation.Operation.result`. The follow-up operation has + :attr:`metadata ` type + :class:`OptimizeRestoredTableMetadata + ` and no return value, but can be waited for with `result`. - - The current operation might not trigger a follow-up OptimizeRestoreTable operation, in which case, this + + The current operation might not trigger a follow-up OptimizeRestoredTable operation, in which case, this method will return `None`. - For more documentation on the parameters for this method, see the documentation on :meth:`result`. + Args: + timeout (Optional[int | google.cloud.bigtable.admin_v2.overlay.types.restore_table.Timeout]): + How long (in seconds) to wait for the operation to complete. If None, wait indefinitely. If + `Timeout.DEFAULT_TIMEOUT`, wait the default amount. + retry (Optional[google.api_core.retry.Retry]): How to retry the polling RPC. This defines ONLY + how the polling RPC call is retried (i.e. what to do if the RPC we used for polling returned + an error). It does NOT define how the polling is done (i.e. how frequently and for how long + to call the polling RPC). + polling (Optional[google.api_core.retry.Retry]): How often and for how long to call polling RPC + periodically. This parameter does NOT define how to retry each individual polling RPC call + (use the `retry` parameter for that). Returns: Optional[google.api_core.operation.Operation]: - An object representing a long-running operation, or None if there is no OptimizeRestoreTable operation + An object representing a long-running operation, or None if there is no OptimizeRestoredTable operation after this one. """ + if timeout == Timeout.DEFAULT_TIMEOUT: + timeout = operation.Operation._DEFAULT_VALUE + self._blocking_poll(timeout=timeout, retry=retry, polling=polling) if self._exception is not None: @@ -78,20 +104,20 @@ def optimize_restore_table_operation( # Pylint doesn't recognize that this is valid in this case. raise self._exception - return self._optimize_restore_table_operation + return self._optimize_restored_table_operation def set_result(self, response): - optimize_restore_table_operation_name = ( + optimize_restored_table_operation_name = ( self.metadata.optimize_table_operation_name ) # When the RestoreTable operation finishes, it might not necessarily trigger # an optimize operation. - if optimize_restore_table_operation_name: + if optimize_restored_table_operation_name: optimize_restore_table_operation = self._operations_client.get_operation( - name=optimize_restore_table_operation_name + name=optimize_restored_table_operation_name ) - self._optimize_restore_table_operation = operation.from_gapic( + self._optimize_restored_table_operation = operation.from_gapic( optimize_restore_table_operation, self._operations_client, empty_pb2.Empty, diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/async_client.py b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/async_client.py index 750c0d80a..1d89dc172 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/async_client.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/async_client.py @@ -37,6 +37,7 @@ from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +import google.protobuf try: @@ -4332,5 +4333,8 @@ async def __aexit__(self, exc_type, exc, tb): gapic_version=package_version.__version__ ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ + __all__ = ("BigtableInstanceAdminAsyncClient",) diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/client.py b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/client.py index b40f58647..7e3fea9d5 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/client.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/client.py @@ -45,6 +45,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +import google.protobuf try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -4811,5 +4812,7 @@ def __exit__(self, type, value, traceback): gapic_version=package_version.__version__ ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ __all__ = ("BigtableInstanceAdminClient",) diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/base.py b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/base.py index 1aa44b2d3..d0846b3e6 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/base.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/base.py @@ -26,6 +26,7 @@ from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +import google.protobuf from google.cloud.bigtable.admin_v2.types import bigtable_instance_admin from google.cloud.bigtable.admin_v2.types import instance @@ -38,6 +39,9 @@ gapic_version=package_version.__version__ ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ + class BigtableInstanceAdminTransport(abc.ABC): """Abstract transport class for BigtableInstanceAdmin.""" diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/rest.py b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/rest.py index ab0ab2c60..f4254434d 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/rest.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_instance_admin/transports/rest.py @@ -23,6 +23,7 @@ from google.api_core import rest_helpers from google.api_core import rest_streaming from google.api_core import gapic_v1 +import google.protobuf from google.protobuf import json_format from google.api_core import operations_v1 @@ -64,6 +65,9 @@ rest_version=f"requests@{requests_version}", ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ + class BigtableInstanceAdminRestInterceptor: """Interceptor for BigtableInstanceAdmin. diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/async_client.py b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/async_client.py index 087b313d0..09b6a747f 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/async_client.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/async_client.py @@ -37,6 +37,7 @@ from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +import google.protobuf try: @@ -354,7 +355,7 @@ async def create_table( async def sample_create_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CreateTableRequest( @@ -500,7 +501,7 @@ async def create_table_from_snapshot( async def sample_create_table_from_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CreateTableFromSnapshotRequest( @@ -657,7 +658,7 @@ async def list_tables( async def sample_list_tables(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListTablesRequest( @@ -784,7 +785,7 @@ async def get_table( async def sample_get_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetTableRequest( @@ -899,7 +900,7 @@ async def update_table( async def sample_update_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.UpdateTableRequest( @@ -1049,7 +1050,7 @@ async def delete_table( async def sample_delete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteTableRequest( @@ -1152,7 +1153,7 @@ async def undelete_table( async def sample_undelete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.UndeleteTableRequest( @@ -1283,7 +1284,7 @@ async def create_authorized_view( async def sample_create_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CreateAuthorizedViewRequest( @@ -1435,7 +1436,7 @@ async def list_authorized_views( async def sample_list_authorized_views(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListAuthorizedViewsRequest( @@ -1564,7 +1565,7 @@ async def get_authorized_view( async def sample_get_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetAuthorizedViewRequest( @@ -1683,7 +1684,7 @@ async def update_authorized_view( async def sample_update_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.UpdateAuthorizedViewRequest( @@ -1830,7 +1831,7 @@ async def delete_authorized_view( async def sample_delete_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteAuthorizedViewRequest( @@ -1941,7 +1942,7 @@ async def _modify_column_families( async def sample_modify_column_families(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ModifyColumnFamiliesRequest( @@ -2071,7 +2072,7 @@ async def drop_row_range( async def sample_drop_row_range(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DropRowRangeRequest( @@ -2153,7 +2154,7 @@ async def generate_consistency_token( async def sample_generate_consistency_token(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GenerateConsistencyTokenRequest( @@ -2273,7 +2274,7 @@ async def check_consistency( async def sample_check_consistency(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CheckConsistencyRequest( @@ -2409,7 +2410,7 @@ async def _snapshot_table( async def sample_snapshot_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.SnapshotTableRequest( @@ -2588,7 +2589,7 @@ async def _get_snapshot( async def sample_get_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetSnapshotRequest( @@ -2727,7 +2728,7 @@ async def _list_snapshots( async def sample_list_snapshots(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListSnapshotsRequest( @@ -2880,7 +2881,7 @@ async def _delete_snapshot( async def sample_delete_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteSnapshotRequest( @@ -2997,7 +2998,7 @@ async def create_backup( async def sample_create_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) backup = admin_v2.Backup() @@ -3152,7 +3153,7 @@ async def get_backup( async def sample_get_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetBackupRequest( @@ -3262,7 +3263,7 @@ async def update_backup( async def sample_update_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) backup = admin_v2.Backup() @@ -3394,7 +3395,7 @@ async def delete_backup( async def sample_delete_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteBackupRequest( @@ -3495,7 +3496,7 @@ async def list_backups( async def sample_list_backups(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListBackupsRequest( @@ -3631,7 +3632,7 @@ async def _restore_table( async def sample_restore_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.RestoreTableRequest( @@ -3740,7 +3741,7 @@ async def copy_backup( async def sample_copy_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CopyBackupRequest( @@ -3914,7 +3915,7 @@ async def get_iam_policy( async def sample_get_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = iam_policy_pb2.GetIamPolicyRequest( @@ -4053,7 +4054,7 @@ async def set_iam_policy( async def sample_set_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = iam_policy_pb2.SetIamPolicyRequest( @@ -4193,7 +4194,7 @@ async def test_iam_permissions( async def sample_test_iam_permissions(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = iam_policy_pb2.TestIamPermissionsRequest( @@ -4299,5 +4300,8 @@ async def __aexit__(self, exc_type, exc, tb): gapic_version=package_version.__version__ ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ + __all__ = ("BaseBigtableTableAdminAsyncClient",) diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/client.py b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/client.py index 1811f65a1..1cc5b2252 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/client.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/client.py @@ -45,6 +45,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +import google.protobuf try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -894,7 +895,7 @@ def create_table( def sample_create_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CreateTableRequest( @@ -1037,7 +1038,7 @@ def create_table_from_snapshot( def sample_create_table_from_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CreateTableFromSnapshotRequest( @@ -1193,7 +1194,7 @@ def list_tables( def sample_list_tables(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListTablesRequest( @@ -1317,7 +1318,7 @@ def get_table( def sample_get_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetTableRequest( @@ -1429,7 +1430,7 @@ def update_table( def sample_update_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.UpdateTableRequest( @@ -1576,7 +1577,7 @@ def delete_table( def sample_delete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteTableRequest( @@ -1676,7 +1677,7 @@ def undelete_table( def sample_undelete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.UndeleteTableRequest( @@ -1804,7 +1805,7 @@ def create_authorized_view( def sample_create_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CreateAuthorizedViewRequest( @@ -1953,7 +1954,7 @@ def list_authorized_views( def sample_list_authorized_views(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListAuthorizedViewsRequest( @@ -2079,7 +2080,7 @@ def get_authorized_view( def sample_get_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetAuthorizedViewRequest( @@ -2195,7 +2196,7 @@ def update_authorized_view( def sample_update_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.UpdateAuthorizedViewRequest( @@ -2339,7 +2340,7 @@ def delete_authorized_view( def sample_delete_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteAuthorizedViewRequest( @@ -2447,7 +2448,7 @@ def _modify_column_families( def sample_modify_column_families(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ModifyColumnFamiliesRequest( @@ -2574,7 +2575,7 @@ def drop_row_range( def sample_drop_row_range(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DropRowRangeRequest( @@ -2654,7 +2655,7 @@ def generate_consistency_token( def sample_generate_consistency_token(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GenerateConsistencyTokenRequest( @@ -2773,7 +2774,7 @@ def check_consistency( def sample_check_consistency(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CheckConsistencyRequest( @@ -2906,7 +2907,7 @@ def _snapshot_table( def sample_snapshot_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.SnapshotTableRequest( @@ -3082,7 +3083,7 @@ def _get_snapshot( def sample_get_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetSnapshotRequest( @@ -3218,7 +3219,7 @@ def _list_snapshots( def sample_list_snapshots(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListSnapshotsRequest( @@ -3368,7 +3369,7 @@ def _delete_snapshot( def sample_delete_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteSnapshotRequest( @@ -3482,7 +3483,7 @@ def create_backup( def sample_create_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) backup = admin_v2.Backup() @@ -3634,7 +3635,7 @@ def get_backup( def sample_get_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetBackupRequest( @@ -3741,7 +3742,7 @@ def update_backup( def sample_update_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) backup = admin_v2.Backup() @@ -3870,7 +3871,7 @@ def delete_backup( def sample_delete_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteBackupRequest( @@ -3968,7 +3969,7 @@ def list_backups( def sample_list_backups(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListBackupsRequest( @@ -4101,7 +4102,7 @@ def _restore_table( def sample_restore_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.RestoreTableRequest( @@ -4208,7 +4209,7 @@ def copy_backup( def sample_copy_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CopyBackupRequest( @@ -4379,7 +4380,7 @@ def get_iam_policy( def sample_get_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = iam_policy_pb2.GetIamPolicyRequest( @@ -4519,7 +4520,7 @@ def set_iam_policy( def sample_set_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = iam_policy_pb2.SetIamPolicyRequest( @@ -4660,7 +4661,7 @@ def test_iam_permissions( def sample_test_iam_permissions(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = iam_policy_pb2.TestIamPermissionsRequest( @@ -4774,5 +4775,7 @@ def __exit__(self, type, value, traceback): gapic_version=package_version.__version__ ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ __all__ = ("BaseBigtableTableAdminClient",) diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/base.py b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/base.py index c2087d6be..d64b50d40 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/base.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/base.py @@ -26,6 +26,7 @@ from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +import google.protobuf from google.cloud.bigtable.admin_v2.types import bigtable_table_admin from google.cloud.bigtable.admin_v2.types import table @@ -39,6 +40,9 @@ gapic_version=package_version.__version__ ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ + class BigtableTableAdminTransport(abc.ABC): """Abstract transport class for BigtableTableAdmin.""" diff --git a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/rest.py b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/rest.py index 4f03a65cf..8ea058de1 100644 --- a/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/rest.py +++ b/google/cloud/bigtable/admin_v2/services/bigtable_table_admin/transports/rest.py @@ -23,6 +23,7 @@ from google.api_core import rest_helpers from google.api_core import rest_streaming from google.api_core import gapic_v1 +import google.protobuf from google.protobuf import json_format from google.api_core import operations_v1 @@ -65,6 +66,9 @@ rest_version=f"requests@{requests_version}", ) +if hasattr(DEFAULT_CLIENT_INFO, "protobuf_runtime_version"): # pragma: NO COVER + DEFAULT_CLIENT_INFO.protobuf_runtime_version = google.protobuf.__version__ + class BigtableTableAdminRestInterceptor: """Interceptor for BigtableTableAdmin. diff --git a/google/cloud/bigtable/admin_v2/types/table.py b/google/cloud/bigtable/admin_v2/types/table.py index 0486db019..8705b731b 100644 --- a/google/cloud/bigtable/admin_v2/types/table.py +++ b/google/cloud/bigtable/admin_v2/types/table.py @@ -179,21 +179,36 @@ class Table(proto.Message): For example, if \_key = "some_id#2024-04-30#\x00\x13\x00\xf3" with the following - schema: { fields { field_name: "id" type { string { - encoding: utf8_bytes {} } } } fields { field_name: "date" - type { string { encoding: utf8_bytes {} } } } fields { - field_name: "product_code" type { int64 { encoding: - big_endian_bytes {} } } } encoding { delimited_bytes { - delimiter: "#" } } } - - | The decoded key parts would be: id = "some_id", date = - "2024-04-30", product_code = 1245427 The query "SELECT - \_key, product_code FROM table" will return two columns: - /------------------------------------------------------ - | \| \_key \| product_code \| \| - --------------------------------------|--------------\| \| - "some_id#2024-04-30#\x00\x13\x00\xf3" \| 1245427 \| - ------------------------------------------------------/ + schema: + + .. code-block:: + + { + fields { + field_name: "id" + type { string { encoding: utf8_bytes {} } } + } + fields { + field_name: "date" + type { string { encoding: utf8_bytes {} } } + } + fields { + field_name: "product_code" + type { int64 { encoding: big_endian_bytes {} } } + } + encoding { delimited_bytes { delimiter: "#" } } + } + + The decoded key parts would be: + id = "some_id", date = "2024-04-30", product_code = 1245427 + The query "SELECT \_key, product_code FROM table" will return + two columns: + + +========================================+==============+ + | \_key | product_code | + +========================================+==============+ + | "some_id#2024-04-30#\x00\x13\x00\xf3" | 1245427 | + +----------------------------------------+--------------+ The schema has the following invariants: (1) The decoded field values are order-preserved. For read, the field values diff --git a/owlbot.py b/owlbot.py index 611916706..8f8de3024 100644 --- a/owlbot.py +++ b/owlbot.py @@ -16,6 +16,7 @@ from pathlib import Path import re +import textwrap from typing import List, Optional import synthtool as s @@ -80,6 +81,7 @@ def get_staging_dirs( s.move(library / "tests") s.move(library / "samples") s.move(library / "scripts") + s.move(library / "docs/admin_v2", destination="docs/admin_client") s.remove_staging_dirs() @@ -113,4 +115,127 @@ def get_staging_dirs( """# todo(kolea2): temporary workaround to install pinned dep version INSTALL_LIBRARY_FROM_SOURCE = False""") +# -------------------------------------------------------------------------- +# Admin Overlay work +# -------------------------------------------------------------------------- + +# Add overlay imports to top level __init__.py files in admin_v2 and admin at the end +# of each file, after the __all__ definition. +def add_overlay_to_init_py(init_py_location, import_statements): + s.replace( + init_py_location, + r"(?s)(^__all__ = \(.*\)$)", + r"\1\n\n" + import_statements + ) + +add_overlay_to_init_py( + "google/cloud/bigtable/admin_v2/__init__.py", + """from .overlay import * # noqa: F403 +__all__ += overlay.__all__ # noqa: F405 +""" +) + +add_overlay_to_init_py( + "google/cloud/bigtable/admin/__init__.py", + """import google.cloud.bigtable.admin_v2.overlay # noqa: F401 +from google.cloud.bigtable.admin_v2.overlay import * # noqa: F401, F403 + +__all__ += google.cloud.bigtable.admin_v2.overlay.__all__ +""" +) + +# Replace all instances of BaseBigtableTableAdminClient/BaseBigtableAdminAsyncClient +# in samples and docstrings with BigtableTableAdminClient/BigtableTableAdminAsyncClient +s.replace( + [ + "google/cloud/bigtable/admin_v2/services/*/client.py", + "google/cloud/bigtable/admin_v2/services/*/async_client.py", + "samples/generated_samples/bigtableadmin_v2_*.py" + ], + r"client = admin_v2\.Base(BigtableTableAdmin(Async)?Client\(\))", + r"client = admin_v2.\1" +) + +# Fix an improperly formatted table that breaks nox -s docs. +s.replace( + "google/cloud/bigtable/admin_v2/types/table.py", + """ For example, if \\\\_key = + "some_id#2024-04-30#\\\\x00\\\\x13\\\\x00\\\\xf3" with the following + schema: \\{ fields \\{ field_name: "id" type \\{ string \\{ + encoding: utf8_bytes \\{\\} \\} \\} \\} fields \\{ field_name: "date" + type \\{ string \\{ encoding: utf8_bytes \\{\\} \\} \\} \\} fields \\{ + field_name: "product_code" type \\{ int64 \\{ encoding: + big_endian_bytes \\{\\} \\} \\} \\} encoding \\{ delimited_bytes \\{ + delimiter: "#" \\} \\} \\} + + \\| The decoded key parts would be: id = "some_id", date = + "2024-04-30", product_code = 1245427 The query "SELECT + \\\\_key, product_code FROM table" will return two columns: + /------------------------------------------------------ + \\| \\\\\\| \\\\_key \\\\\\| product_code \\\\\\| \\\\\\| + --------------------------------------\\|--------------\\\\\\| \\\\\\| + "some_id#2024-04-30#\\\\x00\\\\x13\\\\x00\\\\xf3" \\\\\\| 1245427 \\\\\\| + ------------------------------------------------------/ +""", + textwrap.indent( + """For example, if \\\\_key = +"some_id#2024-04-30#\\\\x00\\\\x13\\\\x00\\\\xf3" with the following +schema: + +.. code-block:: + + { + fields { + field_name: "id" + type { string { encoding: utf8_bytes {} } } + } + fields { + field_name: "date" + type { string { encoding: utf8_bytes {} } } + } + fields { + field_name: "product_code" + type { int64 { encoding: big_endian_bytes {} } } + } + encoding { delimited_bytes { delimiter: "#" } } + } + +The decoded key parts would be: +id = "some_id", date = "2024-04-30", product_code = 1245427 +The query "SELECT \\\\_key, product_code FROM table" will return +two columns: + ++========================================+==============+ +| \\\\_key | product_code | ++========================================+==============+ +| "some_id#2024-04-30#\\\\x00\\\\x13\\\\x00\\\\xf3" | 1245427 | ++----------------------------------------+--------------+ +""", + " " * 12, + ), +) + +# Change the subpackage for clients with overridden internal methods in them +# from service to overlay.service. +s.replace( + "docs/admin_client/bigtable_table_admin.rst", + r"^\.\. automodule:: google\.cloud\.bigtable\.admin_v2\.services\.bigtable_table_admin$", + ".. automodule:: google.cloud.bigtable.admin_v2.overlay.services.bigtable_table_admin" +) + +# Add overlay types to types documentation +s.replace( + "docs/admin_client/types_.rst", + r"""(\.\. automodule:: google\.cloud\.bigtable\.admin_v2\.types + :members: + :show-inheritance:) +""", + r"""\1 + +.. automodule:: google.cloud.bigtable.admin_v2.overlay.types + :members: + :show-inheritance: +""" +) + s.shell.run(["nox", "-s", "blacken"], hide_output=False) diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_async.py index 1ec8d8ea2..8a5d6a984 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_async.py @@ -36,7 +36,7 @@ async def sample_check_consistency(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CheckConsistencyRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_sync.py index 71251dcf6..887eb0705 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_check_consistency_sync.py @@ -36,7 +36,7 @@ def sample_check_consistency(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CheckConsistencyRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_async.py index ea750a75e..d8dbbef74 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_async.py @@ -36,7 +36,7 @@ async def sample_copy_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CopyBackupRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_sync.py index f335d7644..39e4701d8 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_copy_backup_sync.py @@ -36,7 +36,7 @@ def sample_copy_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CopyBackupRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_async.py index e2de2ddd6..8b632a1ca 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_async.py @@ -36,7 +36,7 @@ async def sample_create_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CreateAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_sync.py index 7e53e9f1f..301a0232a 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_authorized_view_sync.py @@ -36,7 +36,7 @@ def sample_create_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CreateAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_async.py index fd941b483..84d7ebcf6 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_async.py @@ -36,7 +36,7 @@ async def sample_create_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) backup = admin_v2.Backup() diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_sync.py index c3648d197..ed83c6248 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_backup_sync.py @@ -36,7 +36,7 @@ def sample_create_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) backup = admin_v2.Backup() diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_async.py index 9c848d52a..01fdbd7e7 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_async.py @@ -36,7 +36,7 @@ async def sample_create_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CreateTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_async.py index 21f9672a3..2d961b900 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_async.py @@ -36,7 +36,7 @@ async def sample_create_table_from_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.CreateTableFromSnapshotRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_sync.py index 0551c49d9..d19c11811 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_from_snapshot_sync.py @@ -36,7 +36,7 @@ def sample_create_table_from_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CreateTableFromSnapshotRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_sync.py index 24bca818e..97aaf4179 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_create_table_sync.py @@ -36,7 +36,7 @@ def sample_create_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.CreateTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_async.py index ad4daf1aa..e6d0cb2ae 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_async.py @@ -36,7 +36,7 @@ async def sample_delete_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_sync.py index a7fe32c6c..d4ad2f571 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_authorized_view_sync.py @@ -36,7 +36,7 @@ def sample_delete_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_async.py index 948e55ae7..5e1952fdf 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_async.py @@ -36,7 +36,7 @@ async def sample_delete_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteBackupRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_sync.py index 804d94c09..6426c9248 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_backup_sync.py @@ -36,7 +36,7 @@ def sample_delete_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteBackupRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_async_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_async_internal.py index 338c05840..2a9effc87 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_async_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_async_internal.py @@ -36,7 +36,7 @@ async def sample_delete_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteSnapshotRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_sync_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_sync_internal.py index 5890db2c2..bb9182e43 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_sync_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_snapshot_sync_internal.py @@ -36,7 +36,7 @@ def sample_delete_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteSnapshotRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_async.py index 30aa326c2..ba4f00c75 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_async.py @@ -36,7 +36,7 @@ async def sample_delete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DeleteTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_sync.py index e1de0ad7b..fd644a496 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_delete_table_sync.py @@ -36,7 +36,7 @@ def sample_delete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DeleteTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_async.py index 986072792..c1c4b1288 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_async.py @@ -36,7 +36,7 @@ async def sample_drop_row_range(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.DropRowRangeRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_sync.py index 89a8d1cb7..47aa42590 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_drop_row_range_sync.py @@ -36,7 +36,7 @@ def sample_drop_row_range(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.DropRowRangeRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_async.py index f19549f94..30551723b 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_async.py @@ -36,7 +36,7 @@ async def sample_generate_consistency_token(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GenerateConsistencyTokenRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_sync.py index 438e884a7..87029cbf8 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_generate_consistency_token_sync.py @@ -36,7 +36,7 @@ def sample_generate_consistency_token(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GenerateConsistencyTokenRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_async.py index 70e8ec180..a1adeb95c 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_async.py @@ -36,7 +36,7 @@ async def sample_get_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_sync.py index ca946469b..bcc602987 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_authorized_view_sync.py @@ -36,7 +36,7 @@ def sample_get_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_async.py index b5af64ecd..25edad609 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_async.py @@ -36,7 +36,7 @@ async def sample_get_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetBackupRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_sync.py index e1a89b4bf..ab404f469 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_backup_sync.py @@ -36,7 +36,7 @@ def sample_get_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetBackupRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_async.py index e5704ca88..e947fec4e 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_async.py @@ -37,7 +37,7 @@ async def sample_get_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = iam_policy_pb2.GetIamPolicyRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_sync.py index 5b68a7c06..600df5cf3 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_iam_policy_sync.py @@ -37,7 +37,7 @@ def sample_get_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = iam_policy_pb2.GetIamPolicyRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_async_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_async_internal.py index 63c65a957..73e60f2ca 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_async_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_async_internal.py @@ -36,7 +36,7 @@ async def sample_get_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetSnapshotRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_sync_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_sync_internal.py index 357999aad..71dc8082d 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_sync_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_snapshot_sync_internal.py @@ -36,7 +36,7 @@ def sample_get_snapshot(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetSnapshotRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_async.py index 68a58dedd..ca8e8dcf2 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_async.py @@ -36,7 +36,7 @@ async def sample_get_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.GetTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_sync.py index a99053bb3..4290ace56 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_get_table_sync.py @@ -36,7 +36,7 @@ def sample_get_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.GetTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_async.py index 8f17ee2a8..cf00011cd 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_async.py @@ -36,7 +36,7 @@ async def sample_list_authorized_views(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListAuthorizedViewsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_sync.py index 2c8c5d82e..84155ebc7 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_authorized_views_sync.py @@ -36,7 +36,7 @@ def sample_list_authorized_views(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListAuthorizedViewsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_async.py index 481b54c57..277090e32 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_async.py @@ -36,7 +36,7 @@ async def sample_list_backups(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListBackupsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_sync.py index a380b2a70..748a30bde 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_backups_sync.py @@ -36,7 +36,7 @@ def sample_list_backups(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListBackupsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_async_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_async_internal.py index 8bb78a034..185015327 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_async_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_async_internal.py @@ -36,7 +36,7 @@ async def sample_list_snapshots(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListSnapshotsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_sync_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_sync_internal.py index f8dc368ce..751112a88 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_sync_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_snapshots_sync_internal.py @@ -36,7 +36,7 @@ def sample_list_snapshots(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListSnapshotsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_async.py index 50418e240..66279c620 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_async.py @@ -36,7 +36,7 @@ async def sample_list_tables(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ListTablesRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_sync.py index 216a412c0..ede2435e6 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_list_tables_sync.py @@ -36,7 +36,7 @@ def sample_list_tables(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ListTablesRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_async_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_async_internal.py index 1efd07c54..9baf95ae3 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_async_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_async_internal.py @@ -36,7 +36,7 @@ async def sample_modify_column_families(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.ModifyColumnFamiliesRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_sync_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_sync_internal.py index e336eb8f0..72e81dff0 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_sync_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_modify_column_families_sync_internal.py @@ -36,7 +36,7 @@ def sample_modify_column_families(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.ModifyColumnFamiliesRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_async_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_async_internal.py index 55473e379..94424547d 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_async_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_async_internal.py @@ -36,7 +36,7 @@ async def sample_restore_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.RestoreTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_sync_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_sync_internal.py index da50d3e6c..3df90ebd0 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_sync_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_restore_table_sync_internal.py @@ -36,7 +36,7 @@ def sample_restore_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.RestoreTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_async.py index 1e10c988c..2920dfb45 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_async.py @@ -37,7 +37,7 @@ async def sample_set_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = iam_policy_pb2.SetIamPolicyRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_sync.py index 86822d9fb..97d38d723 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_set_iam_policy_sync.py @@ -37,7 +37,7 @@ def sample_set_iam_policy(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = iam_policy_pb2.SetIamPolicyRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_async_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_async_internal.py index 8ccf047e6..d2294ebc9 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_async_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_async_internal.py @@ -36,7 +36,7 @@ async def sample_snapshot_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.SnapshotTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_sync_internal.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_sync_internal.py index 0561f0558..670e2d4a3 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_sync_internal.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_snapshot_table_sync_internal.py @@ -36,7 +36,7 @@ def sample_snapshot_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.SnapshotTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_async.py index 6cbd43ffb..3b6d093ad 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_async.py @@ -37,7 +37,7 @@ async def sample_test_iam_permissions(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = iam_policy_pb2.TestIamPermissionsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_sync.py index b573e2337..0b12ef63d 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_test_iam_permissions_sync.py @@ -37,7 +37,7 @@ def sample_test_iam_permissions(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = iam_policy_pb2.TestIamPermissionsRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_async.py index 6743efead..242e598ea 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_async.py @@ -36,7 +36,7 @@ async def sample_undelete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.UndeleteTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_sync.py index a63b41196..08e69142f 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_undelete_table_sync.py @@ -36,7 +36,7 @@ def sample_undelete_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.UndeleteTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_async.py index 3dfdfcbf3..15d983359 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_async.py @@ -36,7 +36,7 @@ async def sample_update_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.UpdateAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_sync.py index 39be72057..247d5ee47 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_authorized_view_sync.py @@ -36,7 +36,7 @@ def sample_update_authorized_view(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.UpdateAuthorizedViewRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_async.py index bd21e2ce2..1a7e51e93 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_async.py @@ -36,7 +36,7 @@ async def sample_update_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) backup = admin_v2.Backup() diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_sync.py index 59035f2c1..bdbafc9f9 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_backup_sync.py @@ -36,7 +36,7 @@ def sample_update_backup(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) backup = admin_v2.Backup() diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_async.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_async.py index 6ab29e699..27cd8789b 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_async.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_async.py @@ -36,7 +36,7 @@ async def sample_update_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminAsyncClient() + client = admin_v2.BigtableTableAdminAsyncClient() # Initialize request argument(s) request = admin_v2.UpdateTableRequest( diff --git a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_sync.py b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_sync.py index 32049d888..f8c743b71 100644 --- a/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_sync.py +++ b/samples/generated_samples/bigtableadmin_v2_generated_bigtable_table_admin_update_table_sync.py @@ -36,7 +36,7 @@ def sample_update_table(): # Create a client - client = admin_v2.BaseBigtableTableAdminClient() + client = admin_v2.BigtableTableAdminClient() # Initialize request argument(s) request = admin_v2.UpdateTableRequest( diff --git a/tests/unit/admin_overlay/test_admin_packaging.py b/tests/unit/admin_overlay/test_admin_packaging.py new file mode 100644 index 000000000..97302c66e --- /dev/null +++ b/tests/unit/admin_overlay/test_admin_packaging.py @@ -0,0 +1,41 @@ +# Copyright 2025 Google LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import importlib + +import pytest + + +@pytest.mark.parametrize( + "module", ["google.cloud.bigtable.admin", "google.cloud.bigtable.admin_v2"] +) +def test_admin_overlay_imports(module): + # Simulate from import dynamically using importlib + mod = importlib.import_module(module) + + # Check that the import aliasing works as expected for overlay/autogenerated clients/types. + classes_to_modules = { + "BigtableTableAdminClient": "google.cloud.bigtable.admin_v2.overlay.services.bigtable_table_admin.client", + "RestoreTableOperation": "google.cloud.bigtable.admin_v2.overlay.types.restore_table", + "BigtableInstanceAdminClient": "google.cloud.bigtable.admin_v2.services.bigtable_instance_admin.client", + "RestoreTableRequest": "google.cloud.bigtable.admin_v2.types.bigtable_table_admin", + } + + for cls_name, submodule_name in classes_to_modules.items(): + cls = getattr(mod, cls_name) + submodule = importlib.import_module(submodule_name) + assert cls == getattr(submodule, cls_name) + + # Check that from import * has the class inside. + assert cls_name in mod.__all__