diff --git a/packages/google-cloud-ids/.github/.OwlBot.lock.yaml b/packages/google-cloud-ids/.github/.OwlBot.lock.yaml index bc893c979e20..7c454abf76f3 100644 --- a/packages/google-cloud-ids/.github/.OwlBot.lock.yaml +++ b/packages/google-cloud-ids/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:8a5d3f6a2e43ed8293f34e06a2f56931d1e88a2694c3bb11b15df4eb256ad163 -# created: 2022-04-06T10:30:21.687684602Z + digest: sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416 +# created: 2022-04-20T23:42:53.970438194Z diff --git a/packages/google-cloud-ids/docs/conf.py b/packages/google-cloud-ids/docs/conf.py index 3818ca332b37..c18ce6511fa7 100644 --- a/packages/google-cloud-ids/docs/conf.py +++ b/packages/google-cloud-ids/docs/conf.py @@ -24,9 +24,9 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys import os import shlex +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/packages/google-cloud-ids/google/cloud/ids/__init__.py b/packages/google-cloud-ids/google/cloud/ids/__init__.py index 29f06cde8e0d..92bb4b8db15c 100644 --- a/packages/google-cloud-ids/google/cloud/ids/__init__.py +++ b/packages/google-cloud-ids/google/cloud/ids/__init__.py @@ -14,16 +14,17 @@ # limitations under the License. # -from google.cloud.ids_v1.services.ids.client import IDSClient from google.cloud.ids_v1.services.ids.async_client import IDSAsyncClient - -from google.cloud.ids_v1.types.ids import CreateEndpointRequest -from google.cloud.ids_v1.types.ids import DeleteEndpointRequest -from google.cloud.ids_v1.types.ids import Endpoint -from google.cloud.ids_v1.types.ids import GetEndpointRequest -from google.cloud.ids_v1.types.ids import ListEndpointsRequest -from google.cloud.ids_v1.types.ids import ListEndpointsResponse -from google.cloud.ids_v1.types.ids import OperationMetadata +from google.cloud.ids_v1.services.ids.client import IDSClient +from google.cloud.ids_v1.types.ids import ( + CreateEndpointRequest, + DeleteEndpointRequest, + Endpoint, + GetEndpointRequest, + ListEndpointsRequest, + ListEndpointsResponse, + OperationMetadata, +) __all__ = ( "IDSClient", diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py b/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py index 23194919c95d..3be162849d4b 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/__init__.py @@ -14,16 +14,16 @@ # limitations under the License. # -from .services.ids import IDSClient -from .services.ids import IDSAsyncClient - -from .types.ids import CreateEndpointRequest -from .types.ids import DeleteEndpointRequest -from .types.ids import Endpoint -from .types.ids import GetEndpointRequest -from .types.ids import ListEndpointsRequest -from .types.ids import ListEndpointsResponse -from .types.ids import OperationMetadata +from .services.ids import IDSAsyncClient, IDSClient +from .types.ids import ( + CreateEndpointRequest, + DeleteEndpointRequest, + Endpoint, + GetEndpointRequest, + ListEndpointsRequest, + ListEndpointsResponse, + OperationMetadata, +) __all__ = ( "IDSAsyncClient", diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/__init__.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/__init__.py index 9ea62610671b..a1ea5e1a09ec 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/__init__.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import IDSClient from .async_client import IDSAsyncClient +from .client import IDSClient __all__ = ( "IDSClient", diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py index 0760ecd0ed56..d5c91db0edb9 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/async_client.py @@ -17,14 +17,14 @@ import functools import re from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources -from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries +from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +import pkg_resources try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -33,13 +33,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.ids_v1.services.ids import pagers -from google.cloud.ids_v1.types import ids from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import IDSTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import IDSGrpcAsyncIOTransport + +from google.cloud.ids_v1.services.ids import pagers +from google.cloud.ids_v1.types import ids + from .client import IDSClient +from .transports.base import DEFAULT_CLIENT_INFO, IDSTransport +from .transports.grpc_asyncio import IDSGrpcAsyncIOTransport class IDSAsyncClient: diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py index dfd745a253b9..2e138b11ae50 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/client.py @@ -17,17 +17,17 @@ import os import re from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +import pkg_resources try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -36,11 +36,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.ids_v1.services.ids import pagers -from google.cloud.ids_v1.types import ids from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import IDSTransport, DEFAULT_CLIENT_INFO + +from google.cloud.ids_v1.services.ids import pagers +from google.cloud.ids_v1.types import ids + +from .transports.base import DEFAULT_CLIENT_INFO, IDSTransport from .transports.grpc import IDSGrpcTransport from .transports.grpc_asyncio import IDSGrpcAsyncIOTransport diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py index fdaa82c4338a..5b79e97586f3 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/pagers.py @@ -18,10 +18,10 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) from google.cloud.ids_v1.types import ids diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/__init__.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/__init__.py index 2a1ade5052b8..a6aa114efd1f 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/__init__.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import IDSGrpcTransport from .grpc_asyncio import IDSGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[IDSTransport]] _transport_registry["grpc"] = IDSGrpcTransport diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py index 442d097a4019..c09fef11f4b1 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/base.py @@ -15,19 +15,18 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import pkg_resources -import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1 +from google.api_core import gapic_v1, operations_v1 from google.api_core import retry as retries -from google.api_core import operations_v1 +import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore +import pkg_resources from google.cloud.ids_v1.types import ids -from google.longrunning import operations_pb2 # type: ignore try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py index 8fdb6bfde656..8be6bb8650c3 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc.py @@ -13,21 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import warnings from typing import Callable, Dict, Optional, Sequence, Tuple, Union +import warnings -from google.api_core import grpc_helpers -from google.api_core import operations_v1 -from google.api_core import gapic_v1 +from google.api_core import gapic_v1, grpc_helpers, operations_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - +from google.longrunning import operations_pb2 # type: ignore import grpc # type: ignore from google.cloud.ids_v1.types import ids -from google.longrunning import operations_pb2 # type: ignore -from .base import IDSTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, IDSTransport class IDSGrpcTransport(IDSTransport): diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py index 9982b838fc96..4f7d55fbe562 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/services/ids/transports/grpc_asyncio.py @@ -13,21 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import warnings from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import warnings -from google.api_core import gapic_v1 -from google.api_core import grpc_helpers_async -from google.api_core import operations_v1 +from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - +from google.longrunning import operations_pb2 # type: ignore import grpc # type: ignore from grpc.experimental import aio # type: ignore from google.cloud.ids_v1.types import ids -from google.longrunning import operations_pb2 # type: ignore -from .base import IDSTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, IDSTransport from .grpc import IDSGrpcTransport diff --git a/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py b/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py index a9ff2931fa7e..459e6bf4e008 100644 --- a/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py +++ b/packages/google-cloud-ids/google/cloud/ids_v1/types/ids.py @@ -13,10 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import proto # type: ignore - from google.protobuf import timestamp_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.ids.v1", diff --git a/packages/google-cloud-ids/noxfile.py b/packages/google-cloud-ids/noxfile.py index 6ee5e8ab96d9..7c1742d2cc93 100644 --- a/packages/google-cloud-ids/noxfile.py +++ b/packages/google-cloud-ids/noxfile.py @@ -17,6 +17,7 @@ # Generated by synthtool. DO NOT EDIT! from __future__ import absolute_import + import os import pathlib import shutil @@ -25,7 +26,8 @@ import nox BLACK_VERSION = "black==22.3.0" -BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] +ISORT_VERSION = "isort==5.10.1" +LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.8" @@ -83,7 +85,7 @@ def lint(session): session.run( "black", "--check", - *BLACK_PATHS, + *LINT_PATHS, ) session.run("flake8", "google", "tests") @@ -94,7 +96,27 @@ def blacken(session): session.install(BLACK_VERSION) session.run( "black", - *BLACK_PATHS, + *LINT_PATHS, + ) + + +@nox.session(python=DEFAULT_PYTHON_VERSION) +def format(session): + """ + Run isort to sort imports. Then run black + to format code to uniform standard. + """ + session.install(BLACK_VERSION, ISORT_VERSION) + # Use the --fss option to sort imports using strict alphabetical order. + # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections + session.run( + "isort", + "--fss", + *LINT_PATHS, + ) + session.run( + "black", + *LINT_PATHS, ) diff --git a/packages/google-cloud-ids/setup.py b/packages/google-cloud-ids/setup.py index e4049fd83cad..e9c713df8f0b 100644 --- a/packages/google-cloud-ids/setup.py +++ b/packages/google-cloud-ids/setup.py @@ -19,7 +19,6 @@ import setuptools - name = "google-cloud-ids" description = "Cloud IDS API client library" version = "1.1.1" diff --git a/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py b/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py index fa2cf410e29f..1ab40516165b 100644 --- a/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py +++ b/packages/google-cloud-ids/tests/unit/gapic/ids_v1/test_ids.py @@ -13,37 +13,40 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import os -import mock - -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule - +import os +from google.api_core import ( + future, + gapic_v1, + grpc_helpers, + grpc_helpers_async, + operation, + operations_v1, + path_template, +) from google.api_core import client_options from google.api_core import exceptions as core_exceptions -from google.api_core import future -from google.api_core import gapic_v1 -from google.api_core import grpc_helpers -from google.api_core import grpc_helpers_async -from google.api_core import operation from google.api_core import operation_async # type: ignore -from google.api_core import operations_v1 -from google.api_core import path_template +import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.ids_v1.services.ids import IDSAsyncClient -from google.cloud.ids_v1.services.ids import IDSClient -from google.cloud.ids_v1.services.ids import pagers -from google.cloud.ids_v1.services.ids import transports -from google.cloud.ids_v1.types import ids from google.longrunning import operations_pb2 from google.oauth2 import service_account from google.protobuf import timestamp_pb2 # type: ignore -import google.auth +import grpc +from grpc.experimental import aio +import mock +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + +from google.cloud.ids_v1.services.ids import ( + IDSAsyncClient, + IDSClient, + pagers, + transports, +) +from google.cloud.ids_v1.types import ids def client_cert_source_callback():