Skip to content

Commit 40e1810

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: Allow Protobuf 5.x (googleapis#12866)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 649277844 Source-Link: googleapis/googleapis@fd7efa2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/50be251329d8db5b555626ebd4886721f547d3cc Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRhdGFwcm9jLW1ldGFzdG9yZS8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRhdGFwcm9jLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRhdGFzdHJlYW0vLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRlcGxveS8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRldmVsb3BlcmNvbm5lY3QvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRpYWxvZ2Zsb3ctY3gvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRpYWxvZ2Zsb3cvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRscC8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRtcy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRvY3VtZW50YWkvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRvbWFpbnMvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWVkZ2Vjb250YWluZXIvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWVkZ2VuZXR3b3JrLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWVudGVycHJpc2Vrbm93bGVkZ2VncmFwaC8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWVzc2VudGlhbC1jb250YWN0cy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWV2ZW50YXJjLXB1Ymxpc2hpbmcvLk93bEJvdC55YW1sIiwiaCI6IjUwYmUyNTEzMjlkOGRiNWI1NTU2MjZlYmQ0ODg2NzIxZjU0N2QzY2MifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWV2ZW50YXJjLy5Pd2xCb3QueWFtbCIsImgiOiI1MGJlMjUxMzI5ZDhkYjViNTU1NjI2ZWJkNDg4NjcyMWY1NDdkM2NjIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWZpbGVzdG9yZS8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWZ1bmN0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdkY2hhcmR3YXJlbWFuYWdlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiNTBiZTI1MTMyOWQ4ZGI1YjU1NTYyNmViZDQ4ODY3MjFmNTQ3ZDNjYyJ9 --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 3362176 commit 40e1810

File tree

472 files changed

+2566
-5650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

472 files changed

+2566
-5650
lines changed

‎packages/google-cloud-dataproc-metastore/README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Python Client for Dataproc Metastore
1515
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dataproc-metastore.svg
1616
:target: https://pypi.org/project/google-cloud-dataproc-metastore/
1717
.. _Dataproc Metastore: https://cloud.google.com/dataproc-metastore/
18-
.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/metastore/latest
18+
.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/metastore/latest/summary_overview
1919
.. _Product Documentation: https://cloud.google.com/dataproc-metastore/
2020

2121
Quick Start

‎packages/google-cloud-dataproc-metastore/docs/index.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,8 @@ For a list of all ``google-cloud-dataproc-metastore`` releases:
4040
:maxdepth: 2
4141

4242
CHANGELOG
43+
44+
.. toctree::
45+
:hidden:
46+
47+
summary_overview.md

‎packages/google-cloud-dataproc-metastore/docs/summary_overview.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[
2+
This is a templated file. Adding content to this file may result in it being
3+
reverted. Instead, if you want to place additional content, create an
4+
"overview_content.md" file in `docs/` directory. The Sphinx tool will
5+
pick up on the content and merge the content.
6+
]: #
7+
8+
# Dataproc Metastore API
9+
10+
Overview of the APIs available for Dataproc Metastore API.
11+
12+
## All entries
13+
14+
Classes, methods and properties & attributes for
15+
Dataproc Metastore API.
16+
17+
[classes](https://cloud.google.com/python/docs/reference/metastore/latest/summary_class.html)
18+
19+
[methods](https://cloud.google.com/python/docs/reference/metastore/latest/summary_method.html)
20+
21+
[properties and
22+
attributes](https://cloud.google.com/python/docs/reference/metastore/latest/summary_property.html)

‎packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/base.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ def __init__(
8585

8686
# Save the scopes.
8787
self._scopes = scopes
88+
if not hasattr(self, "_ignore_credentials"):
89+
self._ignore_credentials: bool = False
8890

8991
# If no credentials are provided, then determine the appropriate
9092
# defaults.
@@ -97,7 +99,7 @@ def __init__(
9799
credentials, _ = google.auth.load_credentials_from_file(
98100
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
99101
)
100-
elif credentials is None:
102+
elif credentials is None and not self._ignore_credentials:
101103
credentials, _ = google.auth.default(
102104
**scopes_kwargs, quota_project_id=quota_project_id
103105
)

‎packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ def __init__(
147147

148148
if isinstance(channel, grpc.Channel):
149149
# Ignore credentials if a channel was passed.
150-
credentials = False
150+
credentials = None
151+
self._ignore_credentials = True
151152
# If a channel was explicitly provided, set it.
152153
self._grpc_channel = channel
153154
self._ssl_channel_credentials = None

‎packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore/transports/grpc_asyncio.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ def __init__(
194194

195195
if isinstance(channel, aio.Channel):
196196
# Ignore credentials if a channel was passed.
197-
credentials = False
197+
credentials = None
198+
self._ignore_credentials = True
198199
# If a channel was explicitly provided, set it.
199200
self._grpc_channel = channel
200201
self._ssl_channel_credentials = None

‎packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/base.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ def __init__(
8585

8686
# Save the scopes.
8787
self._scopes = scopes
88+
if not hasattr(self, "_ignore_credentials"):
89+
self._ignore_credentials: bool = False
8890

8991
# If no credentials are provided, then determine the appropriate
9092
# defaults.
@@ -97,7 +99,7 @@ def __init__(
9799
credentials, _ = google.auth.load_credentials_from_file(
98100
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
99101
)
100-
elif credentials is None:
102+
elif credentials is None and not self._ignore_credentials:
101103
credentials, _ = google.auth.default(
102104
**scopes_kwargs, quota_project_id=quota_project_id
103105
)

‎packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ def __init__(
140140

141141
if isinstance(channel, grpc.Channel):
142142
# Ignore credentials if a channel was passed.
143-
credentials = False
143+
credentials = None
144+
self._ignore_credentials = True
144145
# If a channel was explicitly provided, set it.
145146
self._grpc_channel = channel
146147
self._ssl_channel_credentials = None

‎packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/services/dataproc_metastore_federation/transports/grpc_asyncio.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ def __init__(
189189

190190
if isinstance(channel, aio.Channel):
191191
# Ignore credentials if a channel was passed.
192-
credentials = False
192+
credentials = None
193+
self._ignore_credentials = True
193194
# If a channel was explicitly provided, set it.
194195
self._grpc_channel = channel
195196
self._ssl_channel_credentials = None

‎packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/services/dataproc_metastore/transports/base.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ def __init__(
8585

8686
# Save the scopes.
8787
self._scopes = scopes
88+
if not hasattr(self, "_ignore_credentials"):
89+
self._ignore_credentials: bool = False
8890

8991
# If no credentials are provided, then determine the appropriate
9092
# defaults.
@@ -97,7 +99,7 @@ def __init__(
9799
credentials, _ = google.auth.load_credentials_from_file(
98100
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
99101
)
100-
elif credentials is None:
102+
elif credentials is None and not self._ignore_credentials:
101103
credentials, _ = google.auth.default(
102104
**scopes_kwargs, quota_project_id=quota_project_id
103105
)

0 commit comments

Comments
 (0)