Spanner: pick up fixes to GAPIC generator. (#6576)

Includes fixes from these PRs:

- googleapis/gapic-generator#2407 (closing googleapis/gapic-generator#2389)
- googleapis/gapic-generator#2396 (for #5523 and dupes).

Includes changes to *all* generated tests.

Removes now-spurious docstring fixups.

Closes #6507.

spanner/google/cloud/spanner_admin_database_v1/gapic/database_admin_client.py

@@ -104,7 +104,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=database_admin_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -137,13 +137,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = database_admin_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

spanner/google/cloud/spanner_admin_database_v1/gapic/transports/database_admin_grpc_transport.py

@@ -66,6 +66,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -102,6 +104,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def list_databases(self):
         """Return the gRPC stub for {$apiMethod.name}.

spanner/google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py

@@ -128,7 +128,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=instance_admin_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -161,13 +161,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = instance_admin_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

spanner/google/cloud/spanner_admin_instance_v1/gapic/transports/instance_admin_grpc_transport.py

@@ -66,6 +66,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -102,6 +104,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def list_instance_configs(self):
         """Return the gRPC stub for {$apiMethod.name}.

spanner/google/cloud/spanner_v1/gapic/spanner_client.py

@@ -106,7 +106,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=spanner_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -139,13 +139,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = spanner_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

spanner/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py

@@ -71,6 +71,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -103,6 +105,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def create_session(self):
         """Return the gRPC stub for {$apiMethod.name}.

spanner/synth.py

@@ -30,6 +30,7 @@
 
 s.move(library / 'google/cloud/spanner_v1/proto')
 s.move(library / 'google/cloud/spanner_v1/gapic')
+s.move(library / 'tests')
 
 # Add grpcio-gcp options
 s.replace(
@@ -58,6 +59,11 @@
     '\g<1>options = [(grpc_gcp.API_CONFIG_CHANNEL_ARG, grpc_gcp_config)]'
     '\g<0>',
 )
+s.replace(
+    "tests/unit/gapic/v1/test_spanner_client_v1.py",
+    "from google.cloud import spanner_v1",
+    "from google.cloud.spanner_v1.gapic import spanner_client as spanner_v1",
+)
 
 #----------------------------------------------------------------------------
 # Generate instance admin client
@@ -88,114 +94,6 @@
 )
 
 # Fix docstrings
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* The instance is readable via the API, with all requested attributes
-        but no allocated resources. Its state is `CREATING`.""",
-    r"""
-        * The instance is readable via the API, with all requested attributes
-          but no allocated resources. Its state is `CREATING`.""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* Cancelling the operation renders the instance immediately unreadable
-        via the API.""",
-    r"""
-        * Cancelling the operation renders the instance immediately unreadable
-          via the API.""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* Billing for all successfully-allocated resources begins \(some types
-        may have lower than the requested levels\).""",
-    r"""
-        * Billing for all successfully-allocated resources begins (some types
-          may have lower than the requested levels).""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* The instance and \*all of its databases\* immediately and
-        irrevocably disappear from the API. All data in the databases
-        is permanently deleted.""",
-    r"""
-        * The instance and *all of its databases* immediately and
-          irrevocably disappear from the API. All data in the databases
-          is permanently deleted.""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-                  \* ``labels.env:dev`` --> The instance has the label \\"env\\" and the value of
-                ::
-
-                                       the label contains the string \\"dev\\".""",
-    r"""
-                  * ``labels.env:dev`` --> The instance has the label \\"env\\"
-                    and the value of the label contains the string \\"dev\\".""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-                  \* ``name:howl labels.env:dev`` --> The instance's name contains \\"howl\\" and
-                ::
-
-                                                 it has the label \\"env\\" with its value
-                                                 containing \\"dev\\".""",
-    r"""
-                  * ``name:howl labels.env:dev`` --> The instance's name
-                    contains \\"howl\\" and it has the label \\"env\\" with
-                    its value containing \\"dev\\".""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* For resource types for which a decrease in the instance's allocation
-        has been requested, billing is based on the newly-requested level.""",
-    r"""
-        * For resource types for which a decrease in the instance's allocation
-          has been requested, billing is based on the newly-requested level.""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* Cancelling the operation sets its metadata's
-        \[cancel_time\]\[google.spanner.admin.instance.v1.UpdateInstanceMetadata.cancel_time\], and begins
-        restoring resources to their pre-request values. The operation
-        is guaranteed to succeed at undoing all resource changes,
-        after which point it terminates with a `CANCELLED` status.""",
-    r"""
-        * Cancelling the operation sets its metadata's
-          [cancel_time][google.spanner.admin.instance.v1.UpdateInstanceMetadata.cancel_time],
-          and begins restoring resources to their pre-request values.
-          The operation is guaranteed to succeed at undoing all resource
-          changes, after which point it terminates with a `CANCELLED` status.""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* Reading the instance via the API continues to give the pre-request
-        resource levels.""",
-    r"""
-        * Reading the instance via the API continues to give the pre-request
-          resource levels.""",
-)
-s.replace(
-    'google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py',
-    r"""
-        \* Billing begins for all successfully-allocated resources \(some types
-        may have lower than the requested levels\).
-        \* All newly-reserved resources are available for serving the instance's
-        tables.""",
-    r"""
-        * Billing begins for all successfully-allocated resources (some types
-          may have lower than the requested levels).
-        * All newly-reserved resources are available for serving the instance's
-          tables.""",
-)
 s.replace(
     'google/cloud/spanner_v1/proto/transaction_pb2.py',
     r"""====*""",
@@ -239,10 +137,3 @@
     'from google\.cloud\.spanner\.admin\.database_v1.proto',
     'from google.cloud.spanner_admin_database_v1.proto',
 )
-
-# Fix docstrings
-s.replace(
-    'google/cloud/spanner_admin_database_v1/gapic/database_admin_client.py',
-    r'database ID must be enclosed in backticks \(`` `` ``\).',
-    r'database ID must be enclosed in backticks.',
-)