Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7b7172d

Browse filesBrowse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.56.2 (googleapis#138)
* chore: update Java and Python dependencies PiperOrigin-RevId: 408420890 Source-Link: googleapis/googleapis@2921f9f Source-Link: https://github.com/googleapis/googleapis-gen/commit/6598ca8cbbf5226733a099c4506518a5af6ff74c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjU5OGNhOGNiYmY1MjI2NzMzYTA5OWM0NTA2NTE4YTVhZjZmZjc0YyJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent cd15fc7 commit 7b7172d
Copy full SHA for 7b7172d

File tree

Expand file treeCollapse file tree

14 files changed

+272
-120
lines changed
Filter options
Expand file treeCollapse file tree

14 files changed

+272
-120
lines changed

‎google/cloud/redis_v1/services/cloud_redis/async_client.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1/services/cloud_redis/async_client.py
+8-5Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
from google.api_core.client_options import ClientOptions # type: ignore
23-
from google.api_core import exceptions as core_exceptions # type: ignore
24-
from google.api_core import gapic_v1 # type: ignore
25-
from google.api_core import retry as retries # type: ignore
22+
from google.api_core.client_options import ClientOptions
23+
from google.api_core import exceptions as core_exceptions
24+
from google.api_core import gapic_v1
25+
from google.api_core import retry as retries
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29-
OptionalRetry = Union[retries.Retry, object]
29+
try:
30+
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
31+
except AttributeError: # pragma: NO COVER
32+
OptionalRetry = Union[retries.Retry, object] # type: ignore
3033

3134
from google.api_core import operation # type: ignore
3235
from google.api_core import operation_async # type: ignore

‎google/cloud/redis_v1/services/cloud_redis/client.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1/services/cloud_redis/client.py
+17-8Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@
1414
# limitations under the License.
1515
#
1616
from collections import OrderedDict
17-
from distutils import util
1817
import os
1918
import re
2019
from typing import Dict, Optional, Sequence, Tuple, Type, Union
2120
import pkg_resources
2221

23-
from google.api_core import client_options as client_options_lib # type: ignore
24-
from google.api_core import exceptions as core_exceptions # type: ignore
25-
from google.api_core import gapic_v1 # type: ignore
26-
from google.api_core import retry as retries # type: ignore
22+
from google.api_core import client_options as client_options_lib
23+
from google.api_core import exceptions as core_exceptions
24+
from google.api_core import gapic_v1
25+
from google.api_core import retry as retries
2726
from google.auth import credentials as ga_credentials # type: ignore
2827
from google.auth.transport import mtls # type: ignore
2928
from google.auth.transport.grpc import SslCredentials # type: ignore
3029
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3130
from google.oauth2 import service_account # type: ignore
3231

33-
OptionalRetry = Union[retries.Retry, object]
32+
try:
33+
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
34+
except AttributeError: # pragma: NO COVER
35+
OptionalRetry = Union[retries.Retry, object] # type: ignore
3436

3537
from google.api_core import operation # type: ignore
3638
from google.api_core import operation_async # type: ignore
@@ -307,8 +309,15 @@ def __init__(
307309
client_options = client_options_lib.ClientOptions()
308310

309311
# Create SSL credentials for mutual TLS if needed.
310-
use_client_cert = bool(
311-
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
312+
if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
313+
"true",
314+
"false",
315+
):
316+
raise ValueError(
317+
"Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
318+
)
319+
use_client_cert = (
320+
os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
312321
)
313322

314323
client_cert_source_func = None

‎google/cloud/redis_v1/services/cloud_redis/transports/base.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1/services/cloud_redis/transports/base.py
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import pkg_resources
1919

2020
import google.auth # type: ignore
21-
import google.api_core # type: ignore
22-
from google.api_core import exceptions as core_exceptions # type: ignore
23-
from google.api_core import gapic_v1 # type: ignore
24-
from google.api_core import retry as retries # type: ignore
25-
from google.api_core import operations_v1 # type: ignore
21+
import google.api_core
22+
from google.api_core import exceptions as core_exceptions
23+
from google.api_core import gapic_v1
24+
from google.api_core import retry as retries
25+
from google.api_core import operations_v1
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

‎google/cloud/redis_v1/services/cloud_redis/transports/grpc.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1/services/cloud_redis/transports/grpc.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import warnings
1717
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1818

19-
from google.api_core import grpc_helpers # type: ignore
20-
from google.api_core import operations_v1 # type: ignore
21-
from google.api_core import gapic_v1 # type: ignore
19+
from google.api_core import grpc_helpers
20+
from google.api_core import operations_v1
21+
from google.api_core import gapic_v1
2222
import google.auth # type: ignore
2323
from google.auth import credentials as ga_credentials # type: ignore
2424
from google.auth.transport.grpc import SslCredentials # type: ignore

‎google/cloud/redis_v1/services/cloud_redis/transports/grpc_asyncio.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1/services/cloud_redis/transports/grpc_asyncio.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import warnings
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
1818

19-
from google.api_core import gapic_v1 # type: ignore
20-
from google.api_core import grpc_helpers_async # type: ignore
21-
from google.api_core import operations_v1 # type: ignore
19+
from google.api_core import gapic_v1
20+
from google.api_core import grpc_helpers_async
21+
from google.api_core import operations_v1
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
2424

‎google/cloud/redis_v1/types/cloud_redis.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1/types/cloud_redis.py
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ class InputConfig(proto.Message):
444444
gcs_source (google.cloud.redis_v1.types.GcsSource):
445445
Google Cloud Storage location where input
446446
content is located.
447+
447448
This field is a member of `oneof`_ ``source``.
448449
"""
449450

@@ -491,6 +492,7 @@ class OutputConfig(proto.Message):
491492
gcs_destination (google.cloud.redis_v1.types.GcsDestination):
492493
Google Cloud Storage destination for output
493494
content.
495+
494496
This field is a member of `oneof`_ ``destination``.
495497
"""
496498

‎google/cloud/redis_v1beta1/services/cloud_redis/async_client.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1beta1/services/cloud_redis/async_client.py
+8-5Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
from google.api_core.client_options import ClientOptions # type: ignore
23-
from google.api_core import exceptions as core_exceptions # type: ignore
24-
from google.api_core import gapic_v1 # type: ignore
25-
from google.api_core import retry as retries # type: ignore
22+
from google.api_core.client_options import ClientOptions
23+
from google.api_core import exceptions as core_exceptions
24+
from google.api_core import gapic_v1
25+
from google.api_core import retry as retries
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29-
OptionalRetry = Union[retries.Retry, object]
29+
try:
30+
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
31+
except AttributeError: # pragma: NO COVER
32+
OptionalRetry = Union[retries.Retry, object] # type: ignore
3033

3134
from google.api_core import operation # type: ignore
3235
from google.api_core import operation_async # type: ignore

‎google/cloud/redis_v1beta1/services/cloud_redis/client.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1beta1/services/cloud_redis/client.py
+17-8Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@
1414
# limitations under the License.
1515
#
1616
from collections import OrderedDict
17-
from distutils import util
1817
import os
1918
import re
2019
from typing import Dict, Optional, Sequence, Tuple, Type, Union
2120
import pkg_resources
2221

23-
from google.api_core import client_options as client_options_lib # type: ignore
24-
from google.api_core import exceptions as core_exceptions # type: ignore
25-
from google.api_core import gapic_v1 # type: ignore
26-
from google.api_core import retry as retries # type: ignore
22+
from google.api_core import client_options as client_options_lib
23+
from google.api_core import exceptions as core_exceptions
24+
from google.api_core import gapic_v1
25+
from google.api_core import retry as retries
2726
from google.auth import credentials as ga_credentials # type: ignore
2827
from google.auth.transport import mtls # type: ignore
2928
from google.auth.transport.grpc import SslCredentials # type: ignore
3029
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3130
from google.oauth2 import service_account # type: ignore
3231

33-
OptionalRetry = Union[retries.Retry, object]
32+
try:
33+
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
34+
except AttributeError: # pragma: NO COVER
35+
OptionalRetry = Union[retries.Retry, object] # type: ignore
3436

3537
from google.api_core import operation # type: ignore
3638
from google.api_core import operation_async # type: ignore
@@ -308,8 +310,15 @@ def __init__(
308310
client_options = client_options_lib.ClientOptions()
309311

310312
# Create SSL credentials for mutual TLS if needed.
311-
use_client_cert = bool(
312-
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
313+
if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
314+
"true",
315+
"false",
316+
):
317+
raise ValueError(
318+
"Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
319+
)
320+
use_client_cert = (
321+
os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
313322
)
314323

315324
client_cert_source_func = None

‎google/cloud/redis_v1beta1/services/cloud_redis/transports/base.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1beta1/services/cloud_redis/transports/base.py
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import pkg_resources
1919

2020
import google.auth # type: ignore
21-
import google.api_core # type: ignore
22-
from google.api_core import exceptions as core_exceptions # type: ignore
23-
from google.api_core import gapic_v1 # type: ignore
24-
from google.api_core import retry as retries # type: ignore
25-
from google.api_core import operations_v1 # type: ignore
21+
import google.api_core
22+
from google.api_core import exceptions as core_exceptions
23+
from google.api_core import gapic_v1
24+
from google.api_core import retry as retries
25+
from google.api_core import operations_v1
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

‎google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import warnings
1717
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
1818

19-
from google.api_core import grpc_helpers # type: ignore
20-
from google.api_core import operations_v1 # type: ignore
21-
from google.api_core import gapic_v1 # type: ignore
19+
from google.api_core import grpc_helpers
20+
from google.api_core import operations_v1
21+
from google.api_core import gapic_v1
2222
import google.auth # type: ignore
2323
from google.auth import credentials as ga_credentials # type: ignore
2424
from google.auth.transport.grpc import SslCredentials # type: ignore

‎google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc_asyncio.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc_asyncio.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import warnings
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
1818

19-
from google.api_core import gapic_v1 # type: ignore
20-
from google.api_core import grpc_helpers_async # type: ignore
21-
from google.api_core import operations_v1 # type: ignore
19+
from google.api_core import gapic_v1
20+
from google.api_core import grpc_helpers_async
21+
from google.api_core import operations_v1
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
2424

‎google/cloud/redis_v1beta1/types/cloud_redis.py

Copy file name to clipboardExpand all lines: google/cloud/redis_v1beta1/types/cloud_redis.py
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ class InputConfig(proto.Message):
443443
gcs_source (google.cloud.redis_v1beta1.types.GcsSource):
444444
Google Cloud Storage location where input
445445
content is located.
446+
446447
This field is a member of `oneof`_ ``source``.
447448
"""
448449

@@ -490,6 +491,7 @@ class OutputConfig(proto.Message):
490491
gcs_destination (google.cloud.redis_v1beta1.types.GcsDestination):
491492
Google Cloud Storage destination for output
492493
content.
494+
493495
This field is a member of `oneof`_ ``destination``.
494496
"""
495497

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.