Skip to content

Commit 92abb2d

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#206)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency committer: busunkim96@ PiperOrigin-RevId: 406468269 Source-Link: googleapis/googleapis@83d81b0 Source-Link: googleapis/googleapis-gen@2ff001f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent c60779e commit 92abb2d

File tree

7 files changed

+35
-139
lines changed

7 files changed

+35
-139
lines changed

‎packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/async_client.py‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
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]
30+
2931
from google.cloud.devtools.containeranalysis_v1.types import containeranalysis
3032
from google.iam.v1 import iam_policy_pb2 # type: ignore
3133
from google.iam.v1 import policy_pb2 # type: ignore
@@ -190,10 +192,10 @@ def get_grafeas_client(self) -> grafeas_v1.GrafeasClient:
190192

191193
async def set_iam_policy(
192194
self,
193-
request: iam_policy_pb2.SetIamPolicyRequest = None,
195+
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
194196
*,
195197
resource: str = None,
196-
retry: retries.Retry = gapic_v1.method.DEFAULT,
198+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
197199
timeout: float = None,
198200
metadata: Sequence[Tuple[str, str]] = (),
199201
) -> policy_pb2.Policy:
@@ -208,7 +210,7 @@ async def set_iam_policy(
208210
occurrences.
209211
210212
Args:
211-
request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`):
213+
request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]):
212214
The request object. Request message for `SetIamPolicy`
213215
method.
214216
resource (:class:`str`):
@@ -324,10 +326,10 @@ async def set_iam_policy(
324326

325327
async def get_iam_policy(
326328
self,
327-
request: iam_policy_pb2.GetIamPolicyRequest = None,
329+
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
328330
*,
329331
resource: str = None,
330-
retry: retries.Retry = gapic_v1.method.DEFAULT,
332+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
331333
timeout: float = None,
332334
metadata: Sequence[Tuple[str, str]] = (),
333335
) -> policy_pb2.Policy:
@@ -342,7 +344,7 @@ async def get_iam_policy(
342344
occurrences.
343345
344346
Args:
345-
request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`):
347+
request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]):
346348
The request object. Request message for `GetIamPolicy`
347349
method.
348350
resource (:class:`str`):
@@ -458,11 +460,11 @@ async def get_iam_policy(
458460

459461
async def test_iam_permissions(
460462
self,
461-
request: iam_policy_pb2.TestIamPermissionsRequest = None,
463+
request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
462464
*,
463465
resource: str = None,
464466
permissions: Sequence[str] = None,
465-
retry: retries.Retry = gapic_v1.method.DEFAULT,
467+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
466468
timeout: float = None,
467469
metadata: Sequence[Tuple[str, str]] = (),
468470
) -> iam_policy_pb2.TestIamPermissionsResponse:
@@ -476,7 +478,7 @@ async def test_iam_permissions(
476478
occurrences.
477479
478480
Args:
479-
request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`):
481+
request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]):
480482
The request object. Request message for
481483
`TestIamPermissions` method.
482484
resource (:class:`str`):
@@ -548,19 +550,21 @@ async def test_iam_permissions(
548550

549551
async def get_vulnerability_occurrences_summary(
550552
self,
551-
request: containeranalysis.GetVulnerabilityOccurrencesSummaryRequest = None,
553+
request: Union[
554+
containeranalysis.GetVulnerabilityOccurrencesSummaryRequest, dict
555+
] = None,
552556
*,
553557
parent: str = None,
554558
filter: str = None,
555-
retry: retries.Retry = gapic_v1.method.DEFAULT,
559+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
556560
timeout: float = None,
557561
metadata: Sequence[Tuple[str, str]] = (),
558562
) -> containeranalysis.VulnerabilityOccurrencesSummary:
559563
r"""Gets a summary of the number and severity of
560564
occurrences.
561565
562566
Args:
563-
request (:class:`google.cloud.devtools.containeranalysis_v1.types.GetVulnerabilityOccurrencesSummaryRequest`):
567+
request (Union[google.cloud.devtools.containeranalysis_v1.types.GetVulnerabilityOccurrencesSummaryRequest, dict]):
564568
The request object. Request to get a vulnerability
565569
summary for some set of occurrences.
566570
parent (:class:`str`):

‎packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.cloud.devtools.containeranalysis_v1.types import containeranalysis
3436
from google.iam.v1 import iam_policy_pb2 # type: ignore
3537
from google.iam.v1 import policy_pb2 # type: ignore
@@ -367,7 +369,7 @@ def set_iam_policy(
367369
request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
368370
*,
369371
resource: str = None,
370-
retry: retries.Retry = gapic_v1.method.DEFAULT,
372+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
371373
timeout: float = None,
372374
metadata: Sequence[Tuple[str, str]] = (),
373375
) -> policy_pb2.Policy:
@@ -500,7 +502,7 @@ def get_iam_policy(
500502
request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
501503
*,
502504
resource: str = None,
503-
retry: retries.Retry = gapic_v1.method.DEFAULT,
505+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
504506
timeout: float = None,
505507
metadata: Sequence[Tuple[str, str]] = (),
506508
) -> policy_pb2.Policy:
@@ -634,7 +636,7 @@ def test_iam_permissions(
634636
*,
635637
resource: str = None,
636638
permissions: Sequence[str] = None,
637-
retry: retries.Retry = gapic_v1.method.DEFAULT,
639+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
638640
timeout: float = None,
639641
metadata: Sequence[Tuple[str, str]] = (),
640642
) -> iam_policy_pb2.TestIamPermissionsResponse:
@@ -725,7 +727,7 @@ def get_vulnerability_occurrences_summary(
725727
*,
726728
parent: str = None,
727729
filter: str = None,
728-
retry: retries.Retry = gapic_v1.method.DEFAULT,
730+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
729731
timeout: float = None,
730732
metadata: Sequence[Tuple[str, str]] = (),
731733
) -> containeranalysis.VulnerabilityOccurrencesSummary:

‎packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/base.py‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -39,15 +38,6 @@
3938
except pkg_resources.DistributionNotFound:
4039
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4140

42-
try:
43-
# google.auth.__version__ was added in 1.26.0
44-
_GOOGLE_AUTH_VERSION = google.auth.__version__
45-
except AttributeError:
46-
try: # try pkg_resources if it is available
47-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
48-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
49-
_GOOGLE_AUTH_VERSION = None
50-
5141

5242
class ContainerAnalysisTransport(abc.ABC):
5343
"""Abstract transport class for ContainerAnalysis."""
@@ -97,7 +87,7 @@ def __init__(
9787
host += ":443"
9888
self._host = host
9989

100-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
90+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10191

10292
# Save the scopes.
10393
self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
130120
# Save the credentials.
131121
self._credentials = credentials
132122

133-
# TODO(busunkim): This method is in the base transport
134-
# to avoid duplicating code across the transport classes. These functions
135-
# should be deleted once the minimum required versions of google-auth is increased.
136-
137-
# TODO: Remove this function once google-auth >= 1.25.0 is required
138-
@classmethod
139-
def _get_scopes_kwargs(
140-
cls, host: str, scopes: Optional[Sequence[str]]
141-
) -> Dict[str, Optional[Sequence[str]]]:
142-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
143-
144-
scopes_kwargs = {}
145-
146-
if _GOOGLE_AUTH_VERSION and (
147-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
148-
>= packaging.version.parse("1.25.0")
149-
):
150-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
151-
else:
152-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
153-
154-
return scopes_kwargs
155-
156123
def _prep_wrapped_messages(self, client_info):
157124
# Precompute the wrapped methods.
158125
self._wrapped_methods = {

‎packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/transports/grpc_asyncio.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from google.api_core import grpc_helpers_async # type: ignore
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
23-
import packaging.version
2423

2524
import grpc # type: ignore
2625
from grpc.experimental import aio # type: ignore

‎packages/google-cloud-containeranalysis/setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@
2828
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
2929
# Until this issue is closed
3030
# https://github.com/googleapis/google-cloud-python/issues/10566
31-
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
31+
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
3232
"grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
3333
"proto-plus >= 1.4.0",
34-
"packaging >= 14.3",
3534
"grafeas >=1.0.0, <2.0dev",
3635
]
3736
extras = {"libcst": "libcst >= 0.2.5"}

‎packages/google-cloud-containeranalysis/testing/constraints-3.6.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
#
66
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
77
# Then this file should have foo==1.14.0
8-
google-api-core==1.26.0
8+
google-api-core==1.28.0
99
grpc-google-iam-v1==0.12.3
1010
proto-plus==1.4.0
1111
libcst==0.2.5
1212
grafeas==1.0.0
13-
packaging==14.3
14-
google-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 is transitively required through google-api-core

0 commit comments

Comments
 (0)