Skip to content
This repository has been archived by the owner on Sep 5, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
chore: use gapic-generator-python 0.53.4 (#136)
- [ ] Regenerate this pull request now.

docs: list oneofs in docstring
fix(deps): require google-api-core >= 1.28.0
fix(deps): drop packaging dependency
fix: fix extras_require typo in setup.py

committer: busunkim96@
PiperOrigin-RevId: 406468269

Source-Link: googleapis/googleapis@83d81b0

Source-Link: googleapis/googleapis-gen@2ff001f
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
  • Loading branch information
gcf-owl-bot[bot] committed Nov 1, 2021
1 parent 5877245 commit d6e1bd6
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 152 deletions.
Expand Up @@ -19,13 +19,15 @@
from typing import Dict, Sequence, Tuple, Type, Union
import pkg_resources

import google.api_core.client_options as ClientOptions # type: ignore
from google.api_core.client_options import ClientOptions # type: ignore
from google.api_core import exceptions as core_exceptions # type: ignore
from google.api_core import gapic_v1 # type: ignore
from google.api_core import retry as retries # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.accessapproval_v1.services.access_approval import pagers
from google.cloud.accessapproval_v1.types import accessapproval
from google.protobuf import field_mask_pb2 # type: ignore
Expand Down Expand Up @@ -198,10 +200,10 @@ def __init__(

async def list_approval_requests(
self,
request: accessapproval.ListApprovalRequestsMessage = None,
request: Union[accessapproval.ListApprovalRequestsMessage, dict] = None,
*,
parent: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> pagers.ListApprovalRequestsAsyncPager:
Expand All @@ -211,7 +213,7 @@ async def list_approval_requests(
order is reverse chronological.
Args:
request (:class:`google.cloud.accessapproval_v1.types.ListApprovalRequestsMessage`):
request (Union[google.cloud.accessapproval_v1.types.ListApprovalRequestsMessage, dict]):
The request object. Request to list approval requests.
parent (:class:`str`):
The parent resource. This may be
Expand Down Expand Up @@ -290,18 +292,18 @@ async def list_approval_requests(

async def get_approval_request(
self,
request: accessapproval.GetApprovalRequestMessage = None,
request: Union[accessapproval.GetApprovalRequestMessage, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.ApprovalRequest:
r"""Gets an approval request. Returns NOT_FOUND if the request does
not exist.
Args:
request (:class:`google.cloud.accessapproval_v1.types.GetApprovalRequestMessage`):
request (Union[google.cloud.accessapproval_v1.types.GetApprovalRequestMessage, dict]):
The request object. Request to get an approval request.
name (:class:`str`):
Name of the approval request to
Expand Down Expand Up @@ -370,9 +372,9 @@ async def get_approval_request(

async def approve_approval_request(
self,
request: accessapproval.ApproveApprovalRequestMessage = None,
request: Union[accessapproval.ApproveApprovalRequestMessage, dict] = None,
*,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.ApprovalRequest:
Expand All @@ -383,7 +385,7 @@ async def approve_approval_request(
pending state.
Args:
request (:class:`google.cloud.accessapproval_v1.types.ApproveApprovalRequestMessage`):
request (Union[google.cloud.accessapproval_v1.types.ApproveApprovalRequestMessage, dict]):
The request object. Request to approve an
ApprovalRequest.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
Expand Down Expand Up @@ -423,9 +425,9 @@ async def approve_approval_request(

async def dismiss_approval_request(
self,
request: accessapproval.DismissApprovalRequestMessage = None,
request: Union[accessapproval.DismissApprovalRequestMessage, dict] = None,
*,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.ApprovalRequest:
Expand All @@ -441,7 +443,7 @@ async def dismiss_approval_request(
a pending state.
Args:
request (:class:`google.cloud.accessapproval_v1.types.DismissApprovalRequestMessage`):
request (Union[google.cloud.accessapproval_v1.types.DismissApprovalRequestMessage, dict]):
The request object. Request to dismiss an approval
request.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
Expand Down Expand Up @@ -481,18 +483,18 @@ async def dismiss_approval_request(

async def get_access_approval_settings(
self,
request: accessapproval.GetAccessApprovalSettingsMessage = None,
request: Union[accessapproval.GetAccessApprovalSettingsMessage, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.AccessApprovalSettings:
r"""Gets the settings associated with a project, folder,
or organization.
Args:
request (:class:`google.cloud.accessapproval_v1.types.GetAccessApprovalSettingsMessage`):
request (Union[google.cloud.accessapproval_v1.types.GetAccessApprovalSettingsMessage, dict]):
The request object. Request to get access approval
settings.
name (:class:`str`):
Expand Down Expand Up @@ -563,11 +565,11 @@ async def get_access_approval_settings(

async def update_access_approval_settings(
self,
request: accessapproval.UpdateAccessApprovalSettingsMessage = None,
request: Union[accessapproval.UpdateAccessApprovalSettingsMessage, dict] = None,
*,
settings: accessapproval.AccessApprovalSettings = None,
update_mask: field_mask_pb2.FieldMask = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.AccessApprovalSettings:
Expand All @@ -576,7 +578,7 @@ async def update_access_approval_settings(
field_mask.
Args:
request (:class:`google.cloud.accessapproval_v1.types.UpdateAccessApprovalSettingsMessage`):
request (Union[google.cloud.accessapproval_v1.types.UpdateAccessApprovalSettingsMessage, dict]):
The request object. Request to update access approval
settings.
settings (:class:`google.cloud.accessapproval_v1.types.AccessApprovalSettings`):
Expand Down Expand Up @@ -656,10 +658,10 @@ async def update_access_approval_settings(

async def delete_access_approval_settings(
self,
request: accessapproval.DeleteAccessApprovalSettingsMessage = None,
request: Union[accessapproval.DeleteAccessApprovalSettingsMessage, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> None:
Expand All @@ -673,7 +675,7 @@ async def delete_access_approval_settings(
inherited.
Args:
request (:class:`google.cloud.accessapproval_v1.types.DeleteAccessApprovalSettingsMessage`):
request (Union[google.cloud.accessapproval_v1.types.DeleteAccessApprovalSettingsMessage, dict]):
The request object. Request to delete access approval
settings.
name (:class:`str`):
Expand Down
Expand Up @@ -30,6 +30,8 @@
from google.auth.exceptions import MutualTLSChannelError # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.accessapproval_v1.services.access_approval import pagers
from google.cloud.accessapproval_v1.types import accessapproval
from google.protobuf import field_mask_pb2 # type: ignore
Expand Down Expand Up @@ -373,7 +375,7 @@ def list_approval_requests(
request: Union[accessapproval.ListApprovalRequestsMessage, dict] = None,
*,
parent: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> pagers.ListApprovalRequestsPager:
Expand Down Expand Up @@ -456,7 +458,7 @@ def get_approval_request(
request: Union[accessapproval.GetApprovalRequestMessage, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.ApprovalRequest:
Expand Down Expand Up @@ -526,7 +528,7 @@ def approve_approval_request(
self,
request: Union[accessapproval.ApproveApprovalRequestMessage, dict] = None,
*,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.ApprovalRequest:
Expand Down Expand Up @@ -580,7 +582,7 @@ def dismiss_approval_request(
self,
request: Union[accessapproval.DismissApprovalRequestMessage, dict] = None,
*,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.ApprovalRequest:
Expand Down Expand Up @@ -640,7 +642,7 @@ def get_access_approval_settings(
request: Union[accessapproval.GetAccessApprovalSettingsMessage, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.AccessApprovalSettings:
Expand Down Expand Up @@ -716,7 +718,7 @@ def update_access_approval_settings(
*,
settings: accessapproval.AccessApprovalSettings = None,
update_mask: field_mask_pb2.FieldMask = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> accessapproval.AccessApprovalSettings:
Expand Down Expand Up @@ -810,7 +812,7 @@ def delete_access_approval_settings(
request: Union[accessapproval.DeleteAccessApprovalSettingsMessage, dict] = None,
*,
name: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> None:
Expand Down
Expand Up @@ -15,7 +15,6 @@
#
import abc
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
import packaging.version
import pkg_resources

import google.auth # type: ignore
Expand All @@ -38,15 +37,6 @@
except pkg_resources.DistributionNotFound:
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()

try:
# google.auth.__version__ was added in 1.26.0
_GOOGLE_AUTH_VERSION = google.auth.__version__
except AttributeError:
try: # try pkg_resources if it is available
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
except pkg_resources.DistributionNotFound: # pragma: NO COVER
_GOOGLE_AUTH_VERSION = None


class AccessApprovalTransport(abc.ABC):
"""Abstract transport class for AccessApproval."""
Expand Down Expand Up @@ -96,7 +86,7 @@ def __init__(
host += ":443"
self._host = host

scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}

# Save the scopes.
self._scopes = scopes
Expand Down Expand Up @@ -129,29 +119,6 @@ def __init__(
# Save the credentials.
self._credentials = credentials

# TODO(busunkim): This method is in the base transport
# to avoid duplicating code across the transport classes. These functions
# should be deleted once the minimum required versions of google-auth is increased.

# TODO: Remove this function once google-auth >= 1.25.0 is required
@classmethod
def _get_scopes_kwargs(
cls, host: str, scopes: Optional[Sequence[str]]
) -> Dict[str, Optional[Sequence[str]]]:
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""

scopes_kwargs = {}

if _GOOGLE_AUTH_VERSION and (
packaging.version.parse(_GOOGLE_AUTH_VERSION)
>= packaging.version.parse("1.25.0")
):
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
else:
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}

return scopes_kwargs

def _prep_wrapped_messages(self, client_info):
# Precompute the wrapped methods.
self._wrapped_methods = {
Expand Down
Expand Up @@ -20,7 +20,6 @@
from google.api_core import grpc_helpers_async # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
import packaging.version

import grpc # type: ignore
from grpc.experimental import aio # type: ignore
Expand Down
9 changes: 9 additions & 0 deletions google/cloud/accessapproval_v1/types/accessapproval.py
Expand Up @@ -163,6 +163,13 @@ class ResourceProperties(proto.Message):
class ApprovalRequest(proto.Message):
r"""A request for the customer to approve access to a resource.
This message has `oneof`_ fields (mutually exclusive fields).
For each oneof, at most one member field can be set at the same time.
Setting any member of the oneof automatically clears all other
members.
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
Attributes:
name (str):
The resource name of the request. Format is
Expand Down Expand Up @@ -194,8 +201,10 @@ class ApprovalRequest(proto.Message):
time.
approve (google.cloud.accessapproval_v1.types.ApproveDecision):
Access was approved.
This field is a member of `oneof`_ ``decision``.
dismiss (google.cloud.accessapproval_v1.types.DismissDecision):
The request was dismissed.
This field is a member of `oneof`_ ``decision``.
"""

name = proto.Field(proto.STRING, number=1,)
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Expand Up @@ -28,9 +28,8 @@
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
# Until this issue is closed
# https://github.com/googleapis/google-cloud-python/issues/10566
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
"proto-plus >= 1.4.0",
"packaging >= 14.3",
]

extras = {"libcst": "libcst >= 0.2.5"}
Expand Down Expand Up @@ -81,7 +80,7 @@
scripts=["scripts/fixup_accessapproval_v1_keywords.py"],
namespace_packages=namespaces,
install_requires=dependencies,
extras_requires=extras,
extras_require=extras,
include_package_data=True,
zip_safe=False,
)
4 changes: 1 addition & 3 deletions testing/constraints-3.6.txt
Expand Up @@ -4,8 +4,6 @@
# Pin the version to the lower bound.
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
# Then this file should have google-cloud-foo==1.14.0
google-api-core==1.26.0
google-api-core==1.28.0
proto-plus==1.10.0
libcst==0.2.5
packaging==14.3
google-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 si transitively required through google-api-core

0 comments on commit d6e1bd6

Please sign in to comment.