Skip to content
This repository was archived by the owner on Nov 29, 2023. It is now read-only.

Commit 5bec6f4

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.56.2 (#169)
* 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 8d3e93d commit 5bec6f4

File tree

14 files changed

+1271
-440
lines changed

14 files changed

+1271
-440
lines changed

‎google/cloud/container_v1/services/cluster_manager/async_client.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
import pkg_resources
2121
import warnings
2222

23-
from google.api_core.client_options import ClientOptions # 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
23+
from google.api_core.client_options import ClientOptions
24+
from google.api_core import exceptions as core_exceptions
25+
from google.api_core import gapic_v1
26+
from google.api_core import retry as retries
2727
from google.auth import credentials as ga_credentials # type: ignore
2828
from google.oauth2 import service_account # type: ignore
2929

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

3235
from google.cloud.container_v1.services.cluster_manager import pagers
3336
from google.cloud.container_v1.types import cluster_service

‎google/cloud/container_v1/services/cluster_manager/client.py‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,26 @@
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
import warnings
2322

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

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

3638
from google.cloud.container_v1.services.cluster_manager import pagers
3739
from google.cloud.container_v1.types import cluster_service
@@ -268,8 +270,15 @@ def __init__(
268270
client_options = client_options_lib.ClientOptions()
269271

270272
# Create SSL credentials for mutual TLS if needed.
271-
use_client_cert = bool(
272-
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
273+
if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
274+
"true",
275+
"false",
276+
):
277+
raise ValueError(
278+
"Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
279+
)
280+
use_client_cert = (
281+
os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
273282
)
274283

275284
client_cert_source_func = None

‎google/cloud/container_v1/services/cluster_manager/transports/base.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
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
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
2525
from google.auth import credentials as ga_credentials # type: ignore
2626
from google.oauth2 import service_account # type: ignore
2727

‎google/cloud/container_v1/services/cluster_manager/transports/grpc.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
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 gapic_v1 # type: ignore
19+
from google.api_core import grpc_helpers
20+
from google.api_core import gapic_v1
2121
import google.auth # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore

‎google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
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
19+
from google.api_core import gapic_v1
20+
from google.api_core import grpc_helpers_async
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
2323

‎google/cloud/container_v1/types/cluster_service.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,13 +1621,16 @@ class Metric(proto.Message):
16211621
"percent done".
16221622
int_value (int):
16231623
For metrics with integer value.
1624+
16241625
This field is a member of `oneof`_ ``value``.
16251626
double_value (float):
16261627
For metrics with floating point value.
1628+
16271629
This field is a member of `oneof`_ ``value``.
16281630
string_value (str):
16291631
For metrics with custom values (ratios,
16301632
visual progress, etc.).
1633+
16311634
This field is a member of `oneof`_ ``value``.
16321635
"""
16331636

@@ -2731,13 +2734,15 @@ class MaintenanceWindow(proto.Message):
27312734
daily_maintenance_window (google.cloud.container_v1.types.DailyMaintenanceWindow):
27322735
DailyMaintenanceWindow specifies a daily
27332736
maintenance operation window.
2737+
27342738
This field is a member of `oneof`_ ``policy``.
27352739
recurring_window (google.cloud.container_v1.types.RecurringTimeWindow):
27362740
RecurringWindow specifies some number of
27372741
recurring time periods for maintenance to occur.
27382742
The time windows may be overlapping. If no
27392743
maintenance windows are set, maintenance can
27402744
occur at any time.
2745+
27412746
This field is a member of `oneof`_ ``policy``.
27422747
maintenance_exclusions (Sequence[google.cloud.container_v1.types.MaintenanceWindow.MaintenanceExclusionsEntry]):
27432748
Exceptions to maintenance window. Non-

‎google/cloud/container_v1beta1/services/cluster_manager/async_client.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
import pkg_resources
2121
import warnings
2222

23-
from google.api_core.client_options import ClientOptions # 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
23+
from google.api_core.client_options import ClientOptions
24+
from google.api_core import exceptions as core_exceptions
25+
from google.api_core import gapic_v1
26+
from google.api_core import retry as retries
2727
from google.auth import credentials as ga_credentials # type: ignore
2828
from google.oauth2 import service_account # type: ignore
2929

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

3235
from google.cloud.container_v1beta1.services.cluster_manager import pagers
3336
from google.cloud.container_v1beta1.types import cluster_service

‎google/cloud/container_v1beta1/services/cluster_manager/client.py‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,26 @@
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
import warnings
2322

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

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

3638
from google.cloud.container_v1beta1.services.cluster_manager import pagers
3739
from google.cloud.container_v1beta1.types import cluster_service
@@ -280,8 +282,15 @@ def __init__(
280282
client_options = client_options_lib.ClientOptions()
281283

282284
# Create SSL credentials for mutual TLS if needed.
283-
use_client_cert = bool(
284-
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
285+
if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
286+
"true",
287+
"false",
288+
):
289+
raise ValueError(
290+
"Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
291+
)
292+
use_client_cert = (
293+
os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
285294
)
286295

287296
client_cert_source_func = None

‎google/cloud/container_v1beta1/services/cluster_manager/transports/base.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
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
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
2525
from google.auth import credentials as ga_credentials # type: ignore
2626
from google.oauth2 import service_account # type: ignore
2727

‎google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
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 gapic_v1 # type: ignore
19+
from google.api_core import grpc_helpers
20+
from google.api_core import gapic_v1
2121
import google.auth # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore

0 commit comments

Comments
 (0)