Merge branch 'main' into direct-read-main-code

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:3e3800bb100af5d7f9e810d48212b37812c1856d20ffeafb99ebe66461b61fc7
-# created: 2023-08-02T10:53:29.114535628Z
+  digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
+# created: 2023-11-08T19:46:45.022803742Z

.gitignore

@@ -50,6 +50,7 @@ docs.metadata
 
 # Virtual environment
 env/
+venv/
 
 # Test logs
 coverage.xml

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.7.0
     hooks:
     - id: black
 -   repo: https://github.com/pycqa/flake8

docs/index.rst

@@ -36,13 +36,13 @@ API Documentation
   spanner_v1/transaction
   spanner_v1/streamed
 
-  spanner_v1/services
-  spanner_v1/types
-  spanner_admin_database_v1/services
-  spanner_admin_database_v1/types
+  spanner_v1/services_
+  spanner_v1/types_
+  spanner_admin_database_v1/services_
+  spanner_admin_database_v1/types_
   spanner_admin_database_v1/database_admin
-  spanner_admin_instance_v1/services
-  spanner_admin_instance_v1/types
+  spanner_admin_instance_v1/services_
+  spanner_admin_instance_v1/types_
   spanner_admin_instance_v1/instance_admin
 
 

google/cloud/spanner_admin_database_v1/services/database_admin/async_client.py

@@ -51,7 +51,7 @@
 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
+from google.longrunning import operations_pb2  # type: ignore
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import field_mask_pb2  # type: ignore
@@ -1257,8 +1257,8 @@ async def sample_set_iam_policy():
                 The request object. Request message for ``SetIamPolicy`` method.
             resource (:class:`str`):
                 REQUIRED: The resource for which the
-                policy is being specified.
-                See the operation documentation for the
+                policy is being specified. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -1400,8 +1400,8 @@ async def sample_get_iam_policy():
                 The request object. Request message for ``GetIamPolicy`` method.
             resource (:class:`str`):
                 REQUIRED: The resource for which the
-                policy is being requested.
-                See the operation documentation for the
+                policy is being requested. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -1555,8 +1555,8 @@ async def sample_test_iam_permissions():
                 The request object. Request message for ``TestIamPermissions`` method.
             resource (:class:`str`):
                 REQUIRED: The resource for which the
-                policy detail is being requested.
-                See the operation documentation for the
+                policy detail is being requested. See
+                the operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field

google/cloud/spanner_admin_database_v1/services/database_admin/client.py

@@ -55,7 +55,7 @@
 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
+from google.longrunning import operations_pb2  # type: ignore
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import field_mask_pb2  # type: ignore
@@ -1523,8 +1523,8 @@ def sample_set_iam_policy():
                 The request object. Request message for ``SetIamPolicy`` method.
             resource (str):
                 REQUIRED: The resource for which the
-                policy is being specified.
-                See the operation documentation for the
+                policy is being specified. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -1663,8 +1663,8 @@ def sample_get_iam_policy():
                 The request object. Request message for ``GetIamPolicy`` method.
             resource (str):
                 REQUIRED: The resource for which the
-                policy is being requested.
-                See the operation documentation for the
+                policy is being requested. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -1805,8 +1805,8 @@ def sample_test_iam_permissions():
                 The request object. Request message for ``TestIamPermissions`` method.
             resource (str):
                 REQUIRED: The resource for which the
-                policy detail is being requested.
-                See the operation documentation for the
+                policy detail is being requested. See
+                the operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field

google/cloud/spanner_admin_database_v1/services/database_admin/transports/base.py

@@ -32,7 +32,6 @@
 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
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf import empty_pb2  # type: ignore
 

google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py

@@ -30,7 +30,6 @@
 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
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf import empty_pb2  # type: ignore
 from .base import DatabaseAdminTransport, DEFAULT_CLIENT_INFO

google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc_asyncio.py

@@ -30,7 +30,6 @@
 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
 from google.longrunning import operations_pb2  # type: ignore
 from google.protobuf import empty_pb2  # type: ignore
 from .base import DatabaseAdminTransport, DEFAULT_CLIENT_INFO

google/cloud/spanner_admin_database_v1/services/database_admin/transports/rest.py

@@ -28,7 +28,6 @@
 
 from google.protobuf import json_format
 from google.api_core import operations_v1
-from google.longrunning import operations_pb2
 from requests import __version__ as requests_version
 import dataclasses
 import re
@@ -46,8 +45,8 @@
 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.protobuf import empty_pb2  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
 
 from .base import (
     DatabaseAdminTransport,
@@ -3184,7 +3183,6 @@ def __call__(
             timeout: Optional[float] = None,
             metadata: Sequence[Tuple[str, str]] = (),
         ) -> None:
-
             r"""Call the cancel operation method over HTTP.
 
             Args:
@@ -3259,7 +3257,6 @@ def __call__(
             timeout: Optional[float] = None,
             metadata: Sequence[Tuple[str, str]] = (),
         ) -> None:
-
             r"""Call the delete operation method over HTTP.
 
             Args:
@@ -3334,7 +3331,6 @@ def __call__(
             timeout: Optional[float] = None,
             metadata: Sequence[Tuple[str, str]] = (),
         ) -> operations_pb2.Operation:
-
             r"""Call the get operation method over HTTP.
 
             Args:
@@ -3413,7 +3409,6 @@ def __call__(
             timeout: Optional[float] = None,
             metadata: Sequence[Tuple[str, str]] = (),
         ) -> operations_pb2.ListOperationsResponse:
-
             r"""Call the list operations method over HTTP.
 
             Args:

google/cloud/spanner_admin_database_v1/types/spanner_database_admin.py

@@ -131,6 +131,7 @@ class Database(proto.Message):
             the encryption information for the database,
             such as encryption state and the Cloud KMS key
             versions that are in use.
+
             For databases that are using Google default or
             other types of encryption, this field is empty.
 

google/cloud/spanner_admin_instance_v1/__init__.py

@@ -22,6 +22,7 @@
 from .services.instance_admin import InstanceAdminAsyncClient
 
 from .types.common import OperationProgress
+from .types.spanner_instance_admin import AutoscalingConfig
 from .types.spanner_instance_admin import CreateInstanceConfigMetadata
 from .types.spanner_instance_admin import CreateInstanceConfigRequest
 from .types.spanner_instance_admin import CreateInstanceMetadata
@@ -46,6 +47,7 @@
 
 __all__ = (
     "InstanceAdminAsyncClient",
+    "AutoscalingConfig",
     "CreateInstanceConfigMetadata",
     "CreateInstanceConfigRequest",
     "CreateInstanceMetadata",

google/cloud/spanner_admin_instance_v1/services/instance_admin/async_client.py

@@ -58,10 +58,12 @@
 
 class InstanceAdminAsyncClient:
     """Cloud Spanner Instance Admin API
+
     The Cloud Spanner Instance Admin API can be used to create,
     delete, modify and list instances. Instances are dedicated Cloud
     Spanner serving and storage resources to be used by Cloud
     Spanner databases.
+
     Each instance has a "configuration", which dictates where the
     serving resources for the Cloud Spanner instance are located
     (e.g., US-central, Europe). Configurations are created by Google
@@ -1879,8 +1881,8 @@ async def sample_set_iam_policy():
                 The request object. Request message for ``SetIamPolicy`` method.
             resource (:class:`str`):
                 REQUIRED: The resource for which the
-                policy is being specified.
-                See the operation documentation for the
+                policy is being specified. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -2018,8 +2020,8 @@ async def sample_get_iam_policy():
                 The request object. Request message for ``GetIamPolicy`` method.
             resource (:class:`str`):
                 REQUIRED: The resource for which the
-                policy is being requested.
-                See the operation documentation for the
+                policy is being requested. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -2170,8 +2172,8 @@ async def sample_test_iam_permissions():
                 The request object. Request message for ``TestIamPermissions`` method.
             resource (:class:`str`):
                 REQUIRED: The resource for which the
-                policy detail is being requested.
-                See the operation documentation for the
+                policy detail is being requested. See
+                the operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field

google/cloud/spanner_admin_instance_v1/services/instance_admin/client.py

@@ -98,10 +98,12 @@ def get_transport_class(
 
 class InstanceAdminClient(metaclass=InstanceAdminClientMeta):
     """Cloud Spanner Instance Admin API
+
     The Cloud Spanner Instance Admin API can be used to create,
     delete, modify and list instances. Instances are dedicated Cloud
     Spanner serving and storage resources to be used by Cloud
     Spanner databases.
+
     Each instance has a "configuration", which dictates where the
     serving resources for the Cloud Spanner instance are located
     (e.g., US-central, Europe). Configurations are created by Google
@@ -2073,8 +2075,8 @@ def sample_set_iam_policy():
                 The request object. Request message for ``SetIamPolicy`` method.
             resource (str):
                 REQUIRED: The resource for which the
-                policy is being specified.
-                See the operation documentation for the
+                policy is being specified. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -2209,8 +2211,8 @@ def sample_get_iam_policy():
                 The request object. Request message for ``GetIamPolicy`` method.
             resource (str):
                 REQUIRED: The resource for which the
-                policy is being requested.
-                See the operation documentation for the
+                policy is being requested. See the
+                operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field
@@ -2348,8 +2350,8 @@ def sample_test_iam_permissions():
                 The request object. Request message for ``TestIamPermissions`` method.
             resource (str):
                 REQUIRED: The resource for which the
-                policy detail is being requested.
-                See the operation documentation for the
+                policy detail is being requested. See
+                the operation documentation for the
                 appropriate value for this field.
 
                 This corresponds to the ``resource`` field

google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py

@@ -37,10 +37,12 @@ class InstanceAdminGrpcTransport(InstanceAdminTransport):
     """gRPC backend transport for InstanceAdmin.
 
     Cloud Spanner Instance Admin API
+
     The Cloud Spanner Instance Admin API can be used to create,
     delete, modify and list instances. Instances are dedicated Cloud
     Spanner serving and storage resources to be used by Cloud
     Spanner databases.
+
     Each instance has a "configuration", which dictates where the
     serving resources for the Cloud Spanner instance are located
     (e.g., US-central, Europe). Configurations are created by Google

google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc_asyncio.py

@@ -38,10 +38,12 @@ class InstanceAdminGrpcAsyncIOTransport(InstanceAdminTransport):
     """gRPC AsyncIO backend transport for InstanceAdmin.
 
     Cloud Spanner Instance Admin API
+
     The Cloud Spanner Instance Admin API can be used to create,
     delete, modify and list instances. Instances are dedicated Cloud
     Spanner serving and storage resources to be used by Cloud
     Spanner databases.
+
     Each instance has a "configuration", which dictates where the
     serving resources for the Cloud Spanner instance are located
     (e.g., US-central, Europe). Configurations are created by Google

google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/rest.py

@@ -43,8 +43,8 @@
 from google.cloud.spanner_admin_instance_v1.types import spanner_instance_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.protobuf import empty_pb2  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
 
 from .base import (
     InstanceAdminTransport,
@@ -505,10 +505,12 @@ class InstanceAdminRestTransport(InstanceAdminTransport):
     """REST backend transport for InstanceAdmin.
 
     Cloud Spanner Instance Admin API
+
     The Cloud Spanner Instance Admin API can be used to create,
     delete, modify and list instances. Instances are dedicated Cloud
     Spanner serving and storage resources to be used by Cloud
     Spanner databases.
+
     Each instance has a "configuration", which dictates where the
     serving resources for the Cloud Spanner instance are located
     (e.g., US-central, Europe). Configurations are created by Google

google/cloud/spanner_admin_instance_v1/types/__init__.py

@@ -17,6 +17,7 @@
     OperationProgress,
 )
 from .spanner_instance_admin import (
+    AutoscalingConfig,
     CreateInstanceConfigMetadata,
     CreateInstanceConfigRequest,
     CreateInstanceMetadata,
@@ -42,6 +43,7 @@
 
 __all__ = (
     "OperationProgress",
+    "AutoscalingConfig",
     "CreateInstanceConfigMetadata",
     "CreateInstanceConfigRequest",
     "CreateInstanceMetadata",