Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .librarian/state.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-li
libraries:
- id: google-cloud-spanner
version: 3.63.0
last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7
last_generated_commit: 59d5f2b46924714af627ac29ea6de78641a00835
apis:
- path: google/spanner/admin/instance/v1
service_config: spanner.yaml
Expand Down
142 changes: 68 additions & 74 deletions google/cloud/spanner_admin_database_v1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
import sys
from google.cloud.spanner_admin_database_v1 import gapic_version as package_version

import google.api_core as api_core

from google.cloud.spanner_admin_database_v1 import gapic_version as package_version
import sys

__version__ = package_version.__version__

Expand All @@ -28,76 +27,71 @@
# this code path once we drop support for Python 3.7
import importlib_metadata as metadata

from .services.database_admin import DatabaseAdminAsyncClient, DatabaseAdminClient
from .types.backup import (
Backup,
BackupInfo,
BackupInstancePartition,
CopyBackupEncryptionConfig,
CopyBackupMetadata,
CopyBackupRequest,
CreateBackupEncryptionConfig,
CreateBackupMetadata,
CreateBackupRequest,
DeleteBackupRequest,
FullBackupSpec,
GetBackupRequest,
IncrementalBackupSpec,
ListBackupOperationsRequest,
ListBackupOperationsResponse,
ListBackupsRequest,
ListBackupsResponse,
UpdateBackupRequest,
)
from .types.backup_schedule import (
BackupSchedule,
BackupScheduleSpec,
CreateBackupScheduleRequest,
CrontabSpec,
DeleteBackupScheduleRequest,
GetBackupScheduleRequest,
ListBackupSchedulesRequest,
ListBackupSchedulesResponse,
UpdateBackupScheduleRequest,
)
from .types.common import (
DatabaseDialect,
EncryptionConfig,
EncryptionInfo,
OperationProgress,
)
from .types.spanner_database_admin import (
AddSplitPointsRequest,
AddSplitPointsResponse,
CreateDatabaseMetadata,
CreateDatabaseRequest,
Database,
DatabaseRole,
DdlStatementActionInfo,
DropDatabaseRequest,
GetDatabaseDdlRequest,
GetDatabaseDdlResponse,
GetDatabaseRequest,
InternalUpdateGraphOperationRequest,
InternalUpdateGraphOperationResponse,
ListDatabaseOperationsRequest,
ListDatabaseOperationsResponse,
ListDatabaseRolesRequest,
ListDatabaseRolesResponse,
ListDatabasesRequest,
ListDatabasesResponse,
OptimizeRestoredDatabaseMetadata,
RestoreDatabaseEncryptionConfig,
RestoreDatabaseMetadata,
RestoreDatabaseRequest,
RestoreInfo,
RestoreSourceType,
SplitPoints,
UpdateDatabaseDdlMetadata,
UpdateDatabaseDdlRequest,
UpdateDatabaseMetadata,
UpdateDatabaseRequest,
)

from .services.database_admin import DatabaseAdminClient
from .services.database_admin import DatabaseAdminAsyncClient

from .types.backup import Backup
from .types.backup import BackupInfo
from .types.backup import BackupInstancePartition
from .types.backup import CopyBackupEncryptionConfig
from .types.backup import CopyBackupMetadata
from .types.backup import CopyBackupRequest
from .types.backup import CreateBackupEncryptionConfig
from .types.backup import CreateBackupMetadata
from .types.backup import CreateBackupRequest
from .types.backup import DeleteBackupRequest
from .types.backup import FullBackupSpec
from .types.backup import GetBackupRequest
from .types.backup import IncrementalBackupSpec
from .types.backup import ListBackupOperationsRequest
from .types.backup import ListBackupOperationsResponse
from .types.backup import ListBackupsRequest
from .types.backup import ListBackupsResponse
from .types.backup import UpdateBackupRequest
from .types.backup_schedule import BackupSchedule
from .types.backup_schedule import BackupScheduleSpec
from .types.backup_schedule import CreateBackupScheduleRequest
from .types.backup_schedule import CrontabSpec
from .types.backup_schedule import DeleteBackupScheduleRequest
from .types.backup_schedule import GetBackupScheduleRequest
from .types.backup_schedule import ListBackupSchedulesRequest
from .types.backup_schedule import ListBackupSchedulesResponse
from .types.backup_schedule import UpdateBackupScheduleRequest
from .types.common import EncryptionConfig
from .types.common import EncryptionInfo
from .types.common import OperationProgress
from .types.common import DatabaseDialect
from .types.spanner_database_admin import AddSplitPointsRequest
from .types.spanner_database_admin import AddSplitPointsResponse
from .types.spanner_database_admin import CreateDatabaseMetadata
from .types.spanner_database_admin import CreateDatabaseRequest
from .types.spanner_database_admin import Database
from .types.spanner_database_admin import DatabaseRole
from .types.spanner_database_admin import DdlStatementActionInfo
from .types.spanner_database_admin import DropDatabaseRequest
from .types.spanner_database_admin import GetDatabaseDdlRequest
from .types.spanner_database_admin import GetDatabaseDdlResponse
from .types.spanner_database_admin import GetDatabaseRequest
from .types.spanner_database_admin import InternalUpdateGraphOperationRequest
from .types.spanner_database_admin import InternalUpdateGraphOperationResponse
from .types.spanner_database_admin import ListDatabaseOperationsRequest
from .types.spanner_database_admin import ListDatabaseOperationsResponse
from .types.spanner_database_admin import ListDatabaseRolesRequest
from .types.spanner_database_admin import ListDatabaseRolesResponse
from .types.spanner_database_admin import ListDatabasesRequest
from .types.spanner_database_admin import ListDatabasesResponse
from .types.spanner_database_admin import OptimizeRestoredDatabaseMetadata
from .types.spanner_database_admin import RestoreDatabaseEncryptionConfig
from .types.spanner_database_admin import RestoreDatabaseMetadata
from .types.spanner_database_admin import RestoreDatabaseRequest
from .types.spanner_database_admin import RestoreInfo
from .types.spanner_database_admin import SplitPoints
from .types.spanner_database_admin import UpdateDatabaseDdlMetadata
from .types.spanner_database_admin import UpdateDatabaseDdlRequest
from .types.spanner_database_admin import UpdateDatabaseMetadata
from .types.spanner_database_admin import UpdateDatabaseRequest
from .types.spanner_database_admin import RestoreSourceType

if hasattr(api_core, "check_python_version") and hasattr(
api_core, "check_dependency_versions"
Expand All @@ -108,8 +102,8 @@
# An older version of api_core is installed which does not define the
# functions above. We do equivalent checks manually.
try:
import sys
import warnings
import sys

_py_version_str = sys.version.split()[0]
_package_label = "google.cloud.spanner_admin_database_v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
from .async_client import DatabaseAdminAsyncClient
from .client import DatabaseAdminClient
from .async_client import DatabaseAdminAsyncClient

__all__ = (
"DatabaseAdminClient",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
from collections import OrderedDict
import logging as std_logging
from collections import OrderedDict
import re
from typing import (
Callable,
Dict,
Callable,
Mapping,
MutableMapping,
MutableSequence,
Expand All @@ -30,15 +30,16 @@
)
import uuid

from google.cloud.spanner_admin_database_v1 import gapic_version as package_version

from google.api_core.client_options import ClientOptions
from google.api_core import exceptions as core_exceptions
from google.api_core import gapic_v1
from google.api_core import retry_async as retries
from google.api_core.client_options import ClientOptions
from google.auth import credentials as ga_credentials # type: ignore
from google.oauth2 import service_account # type: ignore
import google.protobuf

from google.cloud.spanner_admin_database_v1 import gapic_version as package_version

try:
OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
Expand All @@ -47,26 +48,26 @@

from google.api_core import operation # type: ignore
from google.api_core import operation_async # type: ignore
from google.cloud.spanner_admin_database_v1.services.database_admin import pagers
from google.cloud.spanner_admin_database_v1.types import backup
from google.cloud.spanner_admin_database_v1.types import backup as gsad_backup
from google.cloud.spanner_admin_database_v1.types import backup_schedule
from google.cloud.spanner_admin_database_v1.types import (
backup_schedule as gsad_backup_schedule,
)
from google.cloud.spanner_admin_database_v1.types import common
from google.cloud.spanner_admin_database_v1.types import spanner_database_admin
from google.iam.v1 import iam_policy_pb2 # type: ignore
from google.iam.v1 import policy_pb2 # type: ignore
from google.longrunning import operations_pb2 # type: ignore
from google.longrunning import operations_pb2 # type: ignore
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This import of google.longrunning.operations_pb2 is a duplicate of the one on the preceding line. Please remove it to improve code clarity.

from google.protobuf import duration_pb2 # type: ignore
from google.protobuf import empty_pb2 # type: ignore
from google.protobuf import field_mask_pb2 # type: ignore
from google.protobuf import timestamp_pb2 # type: ignore

from google.cloud.spanner_admin_database_v1.services.database_admin import pagers
from google.cloud.spanner_admin_database_v1.types import common, spanner_database_admin
from google.cloud.spanner_admin_database_v1.types import (
backup_schedule as gsad_backup_schedule,
)
from google.cloud.spanner_admin_database_v1.types import backup
from google.cloud.spanner_admin_database_v1.types import backup as gsad_backup
from google.cloud.spanner_admin_database_v1.types import backup_schedule

from .client import DatabaseAdminClient
from .transports.base import DEFAULT_CLIENT_INFO, DatabaseAdminTransport
from .transports.base import DatabaseAdminTransport, DEFAULT_CLIENT_INFO
from .transports.grpc_asyncio import DatabaseAdminGrpcAsyncIOTransport
from .client import DatabaseAdminClient

try:
from google.api_core import client_logging # type: ignore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import os
import re
from typing import (
Callable,
Dict,
Callable,
Mapping,
MutableMapping,
MutableSequence,
Expand All @@ -35,19 +35,19 @@
import uuid
import warnings

from google.cloud.spanner_admin_database_v1 import gapic_version as package_version

from google.api_core import client_options as client_options_lib
from google.api_core import exceptions as core_exceptions
from google.api_core import gapic_v1
from google.api_core import retry as retries
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.exceptions import MutualTLSChannelError # type: ignore
from google.auth.transport import mtls # type: ignore
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

from google.cloud.spanner_admin_database_v1 import gapic_version as package_version

try:
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
except AttributeError: # pragma: NO COVER
Expand All @@ -64,24 +64,24 @@

from google.api_core import operation # type: ignore
from google.api_core import operation_async # type: ignore
from google.cloud.spanner_admin_database_v1.services.database_admin import pagers
from google.cloud.spanner_admin_database_v1.types import backup
from google.cloud.spanner_admin_database_v1.types import backup as gsad_backup
from google.cloud.spanner_admin_database_v1.types import backup_schedule
from google.cloud.spanner_admin_database_v1.types import (
backup_schedule as gsad_backup_schedule,
)
from google.cloud.spanner_admin_database_v1.types import common
from google.cloud.spanner_admin_database_v1.types import spanner_database_admin
from google.iam.v1 import iam_policy_pb2 # type: ignore
from google.iam.v1 import policy_pb2 # type: ignore
from google.longrunning import operations_pb2 # type: ignore
from google.longrunning import operations_pb2 # type: ignore
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This import of google.longrunning.operations_pb2 is a duplicate of the one on the preceding line. Please remove it to improve code clarity.

from google.protobuf import duration_pb2 # type: ignore
from google.protobuf import empty_pb2 # type: ignore
from google.protobuf import field_mask_pb2 # type: ignore
from google.protobuf import timestamp_pb2 # type: ignore

from google.cloud.spanner_admin_database_v1.services.database_admin import pagers
from google.cloud.spanner_admin_database_v1.types import common, spanner_database_admin
from google.cloud.spanner_admin_database_v1.types import (
backup_schedule as gsad_backup_schedule,
)
from google.cloud.spanner_admin_database_v1.types import backup
from google.cloud.spanner_admin_database_v1.types import backup as gsad_backup
from google.cloud.spanner_admin_database_v1.types import backup_schedule

from .transports.base import DEFAULT_CLIENT_INFO, DatabaseAdminTransport
from .transports.base import DatabaseAdminTransport, DEFAULT_CLIENT_INFO
from .transports.grpc import DatabaseAdminGrpcTransport
from .transports.grpc_asyncio import DatabaseAdminGrpcAsyncIOTransport
from .transports.rest import DatabaseAdminRestTransport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
from google.api_core import gapic_v1
from google.api_core import retry as retries
from google.api_core import retry_async as retries_async
from typing import (
Any,
AsyncIterator,
Awaitable,
Callable,
Iterator,
Optional,
Sequence,
Tuple,
Optional,
Iterator,
Union,
)

from google.api_core import gapic_v1
from google.api_core import retry as retries
from google.api_core import retry_async as retries_async

try:
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
OptionalAsyncRetry = Union[
Expand All @@ -38,14 +37,11 @@
OptionalRetry = Union[retries.Retry, object, None] # type: ignore
OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore

from google.cloud.spanner_admin_database_v1.types import backup
from google.cloud.spanner_admin_database_v1.types import backup_schedule
from google.cloud.spanner_admin_database_v1.types import spanner_database_admin
from google.longrunning import operations_pb2 # type: ignore

from google.cloud.spanner_admin_database_v1.types import (
backup,
backup_schedule,
spanner_database_admin,
)


class ListDatabasesPager:
"""A pager for iterating through ``list_databases`` requests.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
from .base import DatabaseAdminTransport
from .grpc import DatabaseAdminGrpcTransport
from .grpc_asyncio import DatabaseAdminGrpcAsyncIOTransport
from .rest import DatabaseAdminRestInterceptor, DatabaseAdminRestTransport
from .rest import DatabaseAdminRestTransport
from .rest import DatabaseAdminRestInterceptor


# Compile a registry of transports.
_transport_registry = OrderedDict() # type: Dict[str, Type[DatabaseAdminTransport]]
Expand Down
Loading
Loading