diff --git a/.github/release-please.yml b/.github/release-please.yml index 466597e..9c4ba94 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,2 +1,3 @@ releaseType: python +manifest: true handleGHRelease: true diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..1adaf63 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "1.5.3" +} diff --git a/docs/conf.py b/docs/conf.py index 0d9d28a..5f040ab 100644 --- a/docs/conf.py +++ b/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/google/cloud/appengine_admin/__init__.py b/google/cloud/appengine_admin/__init__.py index 0dc3839..5f52a1f 100644 --- a/google/cloud/appengine_admin/__init__.py +++ b/google/cloud/appengine_admin/__init__.py @@ -13,167 +13,169 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.appengine_admin import gapic_version as package_version + +__version__ = package_version.__version__ + -from google.cloud.appengine_admin_v1.services.applications.client import ( - ApplicationsClient, -) from google.cloud.appengine_admin_v1.services.applications.async_client import ( ApplicationsAsyncClient, ) -from google.cloud.appengine_admin_v1.services.authorized_certificates.client import ( - AuthorizedCertificatesClient, +from google.cloud.appengine_admin_v1.services.applications.client import ( + ApplicationsClient, ) from google.cloud.appengine_admin_v1.services.authorized_certificates.async_client import ( AuthorizedCertificatesAsyncClient, ) -from google.cloud.appengine_admin_v1.services.authorized_domains.client import ( - AuthorizedDomainsClient, +from google.cloud.appengine_admin_v1.services.authorized_certificates.client import ( + AuthorizedCertificatesClient, ) from google.cloud.appengine_admin_v1.services.authorized_domains.async_client import ( AuthorizedDomainsAsyncClient, ) -from google.cloud.appengine_admin_v1.services.domain_mappings.client import ( - DomainMappingsClient, +from google.cloud.appengine_admin_v1.services.authorized_domains.client import ( + AuthorizedDomainsClient, ) from google.cloud.appengine_admin_v1.services.domain_mappings.async_client import ( DomainMappingsAsyncClient, ) -from google.cloud.appengine_admin_v1.services.firewall.client import FirewallClient +from google.cloud.appengine_admin_v1.services.domain_mappings.client import ( + DomainMappingsClient, +) from google.cloud.appengine_admin_v1.services.firewall.async_client import ( FirewallAsyncClient, ) -from google.cloud.appengine_admin_v1.services.instances.client import InstancesClient +from google.cloud.appengine_admin_v1.services.firewall.client import FirewallClient from google.cloud.appengine_admin_v1.services.instances.async_client import ( InstancesAsyncClient, ) -from google.cloud.appengine_admin_v1.services.services.client import ServicesClient +from google.cloud.appengine_admin_v1.services.instances.client import InstancesClient from google.cloud.appengine_admin_v1.services.services.async_client import ( ServicesAsyncClient, ) -from google.cloud.appengine_admin_v1.services.versions.client import VersionsClient +from google.cloud.appengine_admin_v1.services.services.client import ServicesClient from google.cloud.appengine_admin_v1.services.versions.async_client import ( VersionsAsyncClient, ) - -from google.cloud.appengine_admin_v1.types.app_yaml import ApiConfigHandler -from google.cloud.appengine_admin_v1.types.app_yaml import ApiEndpointHandler -from google.cloud.appengine_admin_v1.types.app_yaml import ErrorHandler -from google.cloud.appengine_admin_v1.types.app_yaml import HealthCheck -from google.cloud.appengine_admin_v1.types.app_yaml import Library -from google.cloud.appengine_admin_v1.types.app_yaml import LivenessCheck -from google.cloud.appengine_admin_v1.types.app_yaml import ReadinessCheck -from google.cloud.appengine_admin_v1.types.app_yaml import ScriptHandler -from google.cloud.appengine_admin_v1.types.app_yaml import StaticFilesHandler -from google.cloud.appengine_admin_v1.types.app_yaml import UrlMap -from google.cloud.appengine_admin_v1.types.app_yaml import AuthFailAction -from google.cloud.appengine_admin_v1.types.app_yaml import LoginRequirement -from google.cloud.appengine_admin_v1.types.app_yaml import SecurityLevel -from google.cloud.appengine_admin_v1.types.appengine import ( - BatchUpdateIngressRulesRequest, +from google.cloud.appengine_admin_v1.services.versions.client import VersionsClient +from google.cloud.appengine_admin_v1.types.app_yaml import ( + ApiConfigHandler, + ApiEndpointHandler, + AuthFailAction, + ErrorHandler, + HealthCheck, + Library, + LivenessCheck, + LoginRequirement, + ReadinessCheck, + ScriptHandler, + SecurityLevel, + StaticFilesHandler, + UrlMap, ) from google.cloud.appengine_admin_v1.types.appengine import ( + AuthorizedCertificateView, + BatchUpdateIngressRulesRequest, BatchUpdateIngressRulesResponse, -) -from google.cloud.appengine_admin_v1.types.appengine import CreateApplicationRequest -from google.cloud.appengine_admin_v1.types.appengine import ( + CreateApplicationRequest, CreateAuthorizedCertificateRequest, -) -from google.cloud.appengine_admin_v1.types.appengine import CreateDomainMappingRequest -from google.cloud.appengine_admin_v1.types.appengine import CreateIngressRuleRequest -from google.cloud.appengine_admin_v1.types.appengine import CreateVersionRequest -from google.cloud.appengine_admin_v1.types.appengine import DebugInstanceRequest -from google.cloud.appengine_admin_v1.types.appengine import ( + CreateDomainMappingRequest, + CreateIngressRuleRequest, + CreateVersionRequest, + DebugInstanceRequest, DeleteAuthorizedCertificateRequest, -) -from google.cloud.appengine_admin_v1.types.appengine import DeleteDomainMappingRequest -from google.cloud.appengine_admin_v1.types.appengine import DeleteIngressRuleRequest -from google.cloud.appengine_admin_v1.types.appengine import DeleteInstanceRequest -from google.cloud.appengine_admin_v1.types.appengine import DeleteServiceRequest -from google.cloud.appengine_admin_v1.types.appengine import DeleteVersionRequest -from google.cloud.appengine_admin_v1.types.appengine import GetApplicationRequest -from google.cloud.appengine_admin_v1.types.appengine import ( + DeleteDomainMappingRequest, + DeleteIngressRuleRequest, + DeleteInstanceRequest, + DeleteServiceRequest, + DeleteVersionRequest, + DomainOverrideStrategy, + GetApplicationRequest, GetAuthorizedCertificateRequest, -) -from google.cloud.appengine_admin_v1.types.appengine import GetDomainMappingRequest -from google.cloud.appengine_admin_v1.types.appengine import GetIngressRuleRequest -from google.cloud.appengine_admin_v1.types.appengine import GetInstanceRequest -from google.cloud.appengine_admin_v1.types.appengine import GetServiceRequest -from google.cloud.appengine_admin_v1.types.appengine import GetVersionRequest -from google.cloud.appengine_admin_v1.types.appengine import ( + GetDomainMappingRequest, + GetIngressRuleRequest, + GetInstanceRequest, + GetServiceRequest, + GetVersionRequest, ListAuthorizedCertificatesRequest, -) -from google.cloud.appengine_admin_v1.types.appengine import ( ListAuthorizedCertificatesResponse, -) -from google.cloud.appengine_admin_v1.types.appengine import ListAuthorizedDomainsRequest -from google.cloud.appengine_admin_v1.types.appengine import ( + ListAuthorizedDomainsRequest, ListAuthorizedDomainsResponse, -) -from google.cloud.appengine_admin_v1.types.appengine import ListDomainMappingsRequest -from google.cloud.appengine_admin_v1.types.appengine import ListDomainMappingsResponse -from google.cloud.appengine_admin_v1.types.appengine import ListIngressRulesRequest -from google.cloud.appengine_admin_v1.types.appengine import ListIngressRulesResponse -from google.cloud.appengine_admin_v1.types.appengine import ListInstancesRequest -from google.cloud.appengine_admin_v1.types.appengine import ListInstancesResponse -from google.cloud.appengine_admin_v1.types.appengine import ListServicesRequest -from google.cloud.appengine_admin_v1.types.appengine import ListServicesResponse -from google.cloud.appengine_admin_v1.types.appengine import ListVersionsRequest -from google.cloud.appengine_admin_v1.types.appengine import ListVersionsResponse -from google.cloud.appengine_admin_v1.types.appengine import RepairApplicationRequest -from google.cloud.appengine_admin_v1.types.appengine import UpdateApplicationRequest -from google.cloud.appengine_admin_v1.types.appengine import ( + ListDomainMappingsRequest, + ListDomainMappingsResponse, + ListIngressRulesRequest, + ListIngressRulesResponse, + ListInstancesRequest, + ListInstancesResponse, + ListServicesRequest, + ListServicesResponse, + ListVersionsRequest, + ListVersionsResponse, + RepairApplicationRequest, + UpdateApplicationRequest, UpdateAuthorizedCertificateRequest, + UpdateDomainMappingRequest, + UpdateIngressRuleRequest, + UpdateServiceRequest, + UpdateVersionRequest, + VersionView, +) +from google.cloud.appengine_admin_v1.types.application import ( + Application, + UrlDispatchRule, +) +from google.cloud.appengine_admin_v1.types.audit_data import ( + AuditData, + CreateVersionMethod, + UpdateServiceMethod, +) +from google.cloud.appengine_admin_v1.types.certificate import ( + AuthorizedCertificate, + CertificateRawData, + ManagedCertificate, + ManagementStatus, +) +from google.cloud.appengine_admin_v1.types.deploy import ( + CloudBuildOptions, + ContainerInfo, + Deployment, + FileInfo, + ZipInfo, ) -from google.cloud.appengine_admin_v1.types.appengine import UpdateDomainMappingRequest -from google.cloud.appengine_admin_v1.types.appengine import UpdateIngressRuleRequest -from google.cloud.appengine_admin_v1.types.appengine import UpdateServiceRequest -from google.cloud.appengine_admin_v1.types.appengine import UpdateVersionRequest -from google.cloud.appengine_admin_v1.types.appengine import AuthorizedCertificateView -from google.cloud.appengine_admin_v1.types.appengine import DomainOverrideStrategy -from google.cloud.appengine_admin_v1.types.appengine import VersionView -from google.cloud.appengine_admin_v1.types.application import Application -from google.cloud.appengine_admin_v1.types.application import UrlDispatchRule -from google.cloud.appengine_admin_v1.types.audit_data import AuditData -from google.cloud.appengine_admin_v1.types.audit_data import CreateVersionMethod -from google.cloud.appengine_admin_v1.types.audit_data import UpdateServiceMethod -from google.cloud.appengine_admin_v1.types.certificate import AuthorizedCertificate -from google.cloud.appengine_admin_v1.types.certificate import CertificateRawData -from google.cloud.appengine_admin_v1.types.certificate import ManagedCertificate -from google.cloud.appengine_admin_v1.types.certificate import ManagementStatus -from google.cloud.appengine_admin_v1.types.deploy import CloudBuildOptions -from google.cloud.appengine_admin_v1.types.deploy import ContainerInfo -from google.cloud.appengine_admin_v1.types.deploy import Deployment -from google.cloud.appengine_admin_v1.types.deploy import FileInfo -from google.cloud.appengine_admin_v1.types.deploy import ZipInfo from google.cloud.appengine_admin_v1.types.domain import AuthorizedDomain -from google.cloud.appengine_admin_v1.types.domain_mapping import DomainMapping -from google.cloud.appengine_admin_v1.types.domain_mapping import ResourceRecord -from google.cloud.appengine_admin_v1.types.domain_mapping import SslSettings +from google.cloud.appengine_admin_v1.types.domain_mapping import ( + DomainMapping, + ResourceRecord, + SslSettings, +) from google.cloud.appengine_admin_v1.types.firewall import FirewallRule from google.cloud.appengine_admin_v1.types.instance import Instance from google.cloud.appengine_admin_v1.types.location import LocationMetadata from google.cloud.appengine_admin_v1.types.network_settings import NetworkSettings -from google.cloud.appengine_admin_v1.types.operation import CreateVersionMetadataV1 -from google.cloud.appengine_admin_v1.types.operation import OperationMetadataV1 -from google.cloud.appengine_admin_v1.types.service import Service -from google.cloud.appengine_admin_v1.types.service import TrafficSplit -from google.cloud.appengine_admin_v1.types.version import AutomaticScaling -from google.cloud.appengine_admin_v1.types.version import BasicScaling -from google.cloud.appengine_admin_v1.types.version import CpuUtilization -from google.cloud.appengine_admin_v1.types.version import DiskUtilization -from google.cloud.appengine_admin_v1.types.version import EndpointsApiService -from google.cloud.appengine_admin_v1.types.version import Entrypoint -from google.cloud.appengine_admin_v1.types.version import ManualScaling -from google.cloud.appengine_admin_v1.types.version import Network -from google.cloud.appengine_admin_v1.types.version import NetworkUtilization -from google.cloud.appengine_admin_v1.types.version import RequestUtilization -from google.cloud.appengine_admin_v1.types.version import Resources -from google.cloud.appengine_admin_v1.types.version import StandardSchedulerSettings -from google.cloud.appengine_admin_v1.types.version import Version -from google.cloud.appengine_admin_v1.types.version import Volume -from google.cloud.appengine_admin_v1.types.version import VpcAccessConnector -from google.cloud.appengine_admin_v1.types.version import InboundServiceType -from google.cloud.appengine_admin_v1.types.version import ServingStatus +from google.cloud.appengine_admin_v1.types.operation import ( + CreateVersionMetadataV1, + OperationMetadataV1, +) +from google.cloud.appengine_admin_v1.types.service import Service, TrafficSplit +from google.cloud.appengine_admin_v1.types.version import ( + AutomaticScaling, + BasicScaling, + CpuUtilization, + DiskUtilization, + EndpointsApiService, + Entrypoint, + InboundServiceType, + ManualScaling, + Network, + NetworkUtilization, + RequestUtilization, + Resources, + ServingStatus, + StandardSchedulerSettings, + Version, + Volume, + VpcAccessConnector, +) __all__ = ( "ApplicationsClient", diff --git a/google/cloud/appengine_admin/gapic_version.py b/google/cloud/appengine_admin/gapic_version.py new file mode 100644 index 0000000..9437340 --- /dev/null +++ b/google/cloud/appengine_admin/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +__version__ = "1.5.3" # {x-release-please-version} diff --git a/google/cloud/appengine_admin_v1/__init__.py b/google/cloud/appengine_admin_v1/__init__.py index d67f02d..38164c2 100644 --- a/google/cloud/appengine_admin_v1/__init__.py +++ b/google/cloud/appengine_admin_v1/__init__.py @@ -13,125 +13,129 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.appengine_admin import gapic_version as package_version -from .services.applications import ApplicationsClient -from .services.applications import ApplicationsAsyncClient -from .services.authorized_certificates import AuthorizedCertificatesClient -from .services.authorized_certificates import AuthorizedCertificatesAsyncClient -from .services.authorized_domains import AuthorizedDomainsClient -from .services.authorized_domains import AuthorizedDomainsAsyncClient -from .services.domain_mappings import DomainMappingsClient -from .services.domain_mappings import DomainMappingsAsyncClient -from .services.firewall import FirewallClient -from .services.firewall import FirewallAsyncClient -from .services.instances import InstancesClient -from .services.instances import InstancesAsyncClient -from .services.services import ServicesClient -from .services.services import ServicesAsyncClient -from .services.versions import VersionsClient -from .services.versions import VersionsAsyncClient +__version__ = package_version.__version__ -from .types.app_yaml import ApiConfigHandler -from .types.app_yaml import ApiEndpointHandler -from .types.app_yaml import ErrorHandler -from .types.app_yaml import HealthCheck -from .types.app_yaml import Library -from .types.app_yaml import LivenessCheck -from .types.app_yaml import ReadinessCheck -from .types.app_yaml import ScriptHandler -from .types.app_yaml import StaticFilesHandler -from .types.app_yaml import UrlMap -from .types.app_yaml import AuthFailAction -from .types.app_yaml import LoginRequirement -from .types.app_yaml import SecurityLevel -from .types.appengine import BatchUpdateIngressRulesRequest -from .types.appengine import BatchUpdateIngressRulesResponse -from .types.appengine import CreateApplicationRequest -from .types.appengine import CreateAuthorizedCertificateRequest -from .types.appengine import CreateDomainMappingRequest -from .types.appengine import CreateIngressRuleRequest -from .types.appengine import CreateVersionRequest -from .types.appengine import DebugInstanceRequest -from .types.appengine import DeleteAuthorizedCertificateRequest -from .types.appengine import DeleteDomainMappingRequest -from .types.appengine import DeleteIngressRuleRequest -from .types.appengine import DeleteInstanceRequest -from .types.appengine import DeleteServiceRequest -from .types.appengine import DeleteVersionRequest -from .types.appengine import GetApplicationRequest -from .types.appengine import GetAuthorizedCertificateRequest -from .types.appengine import GetDomainMappingRequest -from .types.appengine import GetIngressRuleRequest -from .types.appengine import GetInstanceRequest -from .types.appengine import GetServiceRequest -from .types.appengine import GetVersionRequest -from .types.appengine import ListAuthorizedCertificatesRequest -from .types.appengine import ListAuthorizedCertificatesResponse -from .types.appengine import ListAuthorizedDomainsRequest -from .types.appengine import ListAuthorizedDomainsResponse -from .types.appengine import ListDomainMappingsRequest -from .types.appengine import ListDomainMappingsResponse -from .types.appengine import ListIngressRulesRequest -from .types.appengine import ListIngressRulesResponse -from .types.appengine import ListInstancesRequest -from .types.appengine import ListInstancesResponse -from .types.appengine import ListServicesRequest -from .types.appengine import ListServicesResponse -from .types.appengine import ListVersionsRequest -from .types.appengine import ListVersionsResponse -from .types.appengine import RepairApplicationRequest -from .types.appengine import UpdateApplicationRequest -from .types.appengine import UpdateAuthorizedCertificateRequest -from .types.appengine import UpdateDomainMappingRequest -from .types.appengine import UpdateIngressRuleRequest -from .types.appengine import UpdateServiceRequest -from .types.appengine import UpdateVersionRequest -from .types.appengine import AuthorizedCertificateView -from .types.appengine import DomainOverrideStrategy -from .types.appengine import VersionView -from .types.application import Application -from .types.application import UrlDispatchRule -from .types.audit_data import AuditData -from .types.audit_data import CreateVersionMethod -from .types.audit_data import UpdateServiceMethod -from .types.certificate import AuthorizedCertificate -from .types.certificate import CertificateRawData -from .types.certificate import ManagedCertificate -from .types.certificate import ManagementStatus -from .types.deploy import CloudBuildOptions -from .types.deploy import ContainerInfo -from .types.deploy import Deployment -from .types.deploy import FileInfo -from .types.deploy import ZipInfo + +from .services.applications import ApplicationsAsyncClient, ApplicationsClient +from .services.authorized_certificates import ( + AuthorizedCertificatesAsyncClient, + AuthorizedCertificatesClient, +) +from .services.authorized_domains import ( + AuthorizedDomainsAsyncClient, + AuthorizedDomainsClient, +) +from .services.domain_mappings import DomainMappingsAsyncClient, DomainMappingsClient +from .services.firewall import FirewallAsyncClient, FirewallClient +from .services.instances import InstancesAsyncClient, InstancesClient +from .services.services import ServicesAsyncClient, ServicesClient +from .services.versions import VersionsAsyncClient, VersionsClient +from .types.app_yaml import ( + ApiConfigHandler, + ApiEndpointHandler, + AuthFailAction, + ErrorHandler, + HealthCheck, + Library, + LivenessCheck, + LoginRequirement, + ReadinessCheck, + ScriptHandler, + SecurityLevel, + StaticFilesHandler, + UrlMap, +) +from .types.appengine import ( + AuthorizedCertificateView, + BatchUpdateIngressRulesRequest, + BatchUpdateIngressRulesResponse, + CreateApplicationRequest, + CreateAuthorizedCertificateRequest, + CreateDomainMappingRequest, + CreateIngressRuleRequest, + CreateVersionRequest, + DebugInstanceRequest, + DeleteAuthorizedCertificateRequest, + DeleteDomainMappingRequest, + DeleteIngressRuleRequest, + DeleteInstanceRequest, + DeleteServiceRequest, + DeleteVersionRequest, + DomainOverrideStrategy, + GetApplicationRequest, + GetAuthorizedCertificateRequest, + GetDomainMappingRequest, + GetIngressRuleRequest, + GetInstanceRequest, + GetServiceRequest, + GetVersionRequest, + ListAuthorizedCertificatesRequest, + ListAuthorizedCertificatesResponse, + ListAuthorizedDomainsRequest, + ListAuthorizedDomainsResponse, + ListDomainMappingsRequest, + ListDomainMappingsResponse, + ListIngressRulesRequest, + ListIngressRulesResponse, + ListInstancesRequest, + ListInstancesResponse, + ListServicesRequest, + ListServicesResponse, + ListVersionsRequest, + ListVersionsResponse, + RepairApplicationRequest, + UpdateApplicationRequest, + UpdateAuthorizedCertificateRequest, + UpdateDomainMappingRequest, + UpdateIngressRuleRequest, + UpdateServiceRequest, + UpdateVersionRequest, + VersionView, +) +from .types.application import Application, UrlDispatchRule +from .types.audit_data import AuditData, CreateVersionMethod, UpdateServiceMethod +from .types.certificate import ( + AuthorizedCertificate, + CertificateRawData, + ManagedCertificate, + ManagementStatus, +) +from .types.deploy import ( + CloudBuildOptions, + ContainerInfo, + Deployment, + FileInfo, + ZipInfo, +) from .types.domain import AuthorizedDomain -from .types.domain_mapping import DomainMapping -from .types.domain_mapping import ResourceRecord -from .types.domain_mapping import SslSettings +from .types.domain_mapping import DomainMapping, ResourceRecord, SslSettings from .types.firewall import FirewallRule from .types.instance import Instance from .types.location import LocationMetadata from .types.network_settings import NetworkSettings -from .types.operation import CreateVersionMetadataV1 -from .types.operation import OperationMetadataV1 -from .types.service import Service -from .types.service import TrafficSplit -from .types.version import AutomaticScaling -from .types.version import BasicScaling -from .types.version import CpuUtilization -from .types.version import DiskUtilization -from .types.version import EndpointsApiService -from .types.version import Entrypoint -from .types.version import ManualScaling -from .types.version import Network -from .types.version import NetworkUtilization -from .types.version import RequestUtilization -from .types.version import Resources -from .types.version import StandardSchedulerSettings -from .types.version import Version -from .types.version import Volume -from .types.version import VpcAccessConnector -from .types.version import InboundServiceType -from .types.version import ServingStatus +from .types.operation import CreateVersionMetadataV1, OperationMetadataV1 +from .types.service import Service, TrafficSplit +from .types.version import ( + AutomaticScaling, + BasicScaling, + CpuUtilization, + DiskUtilization, + EndpointsApiService, + Entrypoint, + InboundServiceType, + ManualScaling, + Network, + NetworkUtilization, + RequestUtilization, + Resources, + ServingStatus, + StandardSchedulerSettings, + Version, + Volume, + VpcAccessConnector, +) __all__ = ( "ApplicationsAsyncClient", diff --git a/google/cloud/appengine_admin_v1/services/applications/__init__.py b/google/cloud/appengine_admin_v1/services/applications/__init__.py index 5a89ba0..e2150ba 100644 --- a/google/cloud/appengine_admin_v1/services/applications/__init__.py +++ b/google/cloud/appengine_admin_v1/services/applications/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import ApplicationsClient from .async_client import ApplicationsAsyncClient +from .client import ApplicationsClient __all__ = ( "ApplicationsClient", diff --git a/google/cloud/appengine_admin_v1/services/applications/async_client.py b/google/cloud/appengine_admin_v1/services/applications/async_client.py index 1c88e92..a01b26b 100644 --- a/google/cloud/appengine_admin_v1/services/applications/async_client.py +++ b/google/cloud/appengine_admin_v1/services/applications/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,14 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import application -from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.protobuf import duration_pb2 # type: ignore -from .transports.base import ApplicationsTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import ApplicationsGrpcAsyncIOTransport + +from google.cloud.appengine_admin_v1.types import appengine, application +from google.cloud.appengine_admin_v1.types import operation as ga_operation + from .client import ApplicationsClient +from .transports.base import DEFAULT_CLIENT_INFO, ApplicationsTransport +from .transports.grpc_asyncio import ApplicationsGrpcAsyncIOTransport class ApplicationsAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/applications/client.py b/google/cloud/appengine_admin_v1/services/applications/client.py index eb68fa6..cf1eb83 100644 --- a/google/cloud/appengine_admin_v1/services/applications/client.py +++ b/google/cloud/appengine_admin_v1/services/applications/client.py @@ -16,18 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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,12 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import application -from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.protobuf import duration_pb2 # type: ignore -from .transports.base import ApplicationsTransport, DEFAULT_CLIENT_INFO + +from google.cloud.appengine_admin_v1.types import appengine, application +from google.cloud.appengine_admin_v1.types import operation as ga_operation + +from .transports.base import DEFAULT_CLIENT_INFO, ApplicationsTransport from .transports.grpc import ApplicationsGrpcTransport from .transports.grpc_asyncio import ApplicationsGrpcAsyncIOTransport @@ -313,7 +314,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, ApplicationsTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the applications client. @@ -327,7 +328,7 @@ def __init__( transport (Union[str, ApplicationsTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -357,6 +358,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/applications/transports/__init__.py b/google/cloud/appengine_admin_v1/services/applications/transports/__init__.py index 27d1aad..d911b25 100644 --- a/google/cloud/appengine_admin_v1/services/applications/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/applications/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import ApplicationsGrpcTransport from .grpc_asyncio import ApplicationsGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ApplicationsTransport]] _transport_registry["grpc"] = ApplicationsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/applications/transports/base.py b/google/cloud/appengine_admin_v1/services/applications/transports/base.py index 099d857..f004538 100644 --- a/google/cloud/appengine_admin_v1/services/applications/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/applications/transports/base.py @@ -15,20 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import application -from google.longrunning import operations_pb2 # type: ignore +from google.cloud.appengine_admin_v1.types import appengine, application try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py b/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py index 29f6f96..e62a9a3 100644 --- a/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/applications/transports/grpc.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import application -from google.longrunning import operations_pb2 # type: ignore -from .base import ApplicationsTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, application + +from .base import DEFAULT_CLIENT_INFO, ApplicationsTransport class ApplicationsGrpcTransport(ApplicationsTransport): diff --git a/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py index 2b3d91f..3e04368 100644 --- a/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import application -from google.longrunning import operations_pb2 # type: ignore -from .base import ApplicationsTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, application + +from .base import DEFAULT_CLIENT_INFO, ApplicationsTransport from .grpc import ApplicationsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/__init__.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/__init__.py index 9f07aa4..957935a 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/__init__.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import AuthorizedCertificatesClient from .async_client import AuthorizedCertificatesAsyncClient +from .client import AuthorizedCertificatesClient __all__ = ( "AuthorizedCertificatesClient", diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py index d4972c5..3b13e69 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py @@ -17,27 +17,28 @@ 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] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.appengine_admin_v1.services.authorized_certificates import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import certificate from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import AuthorizedCertificatesTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import AuthorizedCertificatesGrpcAsyncIOTransport + +from google.cloud.appengine_admin_v1.services.authorized_certificates import pagers +from google.cloud.appengine_admin_v1.types import appengine, certificate + from .client import AuthorizedCertificatesClient +from .transports.base import DEFAULT_CLIENT_INFO, AuthorizedCertificatesTransport +from .transports.grpc_asyncio import AuthorizedCertificatesGrpcAsyncIOTransport class AuthorizedCertificatesAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py index 547b6e0..2a5b15a 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/client.py @@ -16,29 +16,30 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.appengine_admin_v1.services.authorized_certificates import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import certificate from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import AuthorizedCertificatesTransport, DEFAULT_CLIENT_INFO + +from google.cloud.appengine_admin_v1.services.authorized_certificates import pagers +from google.cloud.appengine_admin_v1.types import appengine, certificate + +from .transports.base import DEFAULT_CLIENT_INFO, AuthorizedCertificatesTransport from .transports.grpc import AuthorizedCertificatesGrpcTransport from .transports.grpc_asyncio import AuthorizedCertificatesGrpcAsyncIOTransport @@ -316,7 +317,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, AuthorizedCertificatesTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the authorized certificates client. @@ -330,7 +331,7 @@ def __init__( transport (Union[str, AuthorizedCertificatesTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -360,6 +361,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py index 8b6797c..dd6e8bc 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py @@ -18,14 +18,13 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import certificate +from google.cloud.appengine_admin_v1.types import appengine, certificate class ListAuthorizedCertificatesPager: diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py index 8b42e99..659030c 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import AuthorizedCertificatesGrpcTransport from .grpc_asyncio import AuthorizedCertificatesGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = ( OrderedDict() diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py index efdba67..52c1708 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/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 retry as retries +import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore - -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import certificate from google.protobuf import empty_pb2 # type: ignore +import pkg_resources + +from google.cloud.appengine_admin_v1.types import appengine, certificate try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py index 4d9d7c8..01b0060 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/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 gapic_v1 +from google.api_core import gapic_v1, grpc_helpers 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.protobuf import empty_pb2 # type: ignore import grpc # type: ignore -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import certificate -from google.protobuf import empty_pb2 # type: ignore -from .base import AuthorizedCertificatesTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, certificate + +from .base import DEFAULT_CLIENT_INFO, AuthorizedCertificatesTransport class AuthorizedCertificatesGrpcTransport(AuthorizedCertificatesTransport): diff --git a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py index ddd61b9..0ba8371 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/authorized_certificates/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 gapic_v1, grpc_helpers_async from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - +from google.protobuf import empty_pb2 # type: ignore import grpc # type: ignore from grpc.experimental import aio # type: ignore -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import certificate -from google.protobuf import empty_pb2 # type: ignore -from .base import AuthorizedCertificatesTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, certificate + +from .base import DEFAULT_CLIENT_INFO, AuthorizedCertificatesTransport from .grpc import AuthorizedCertificatesGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/__init__.py b/google/cloud/appengine_admin_v1/services/authorized_domains/__init__.py index caf4e2e..e73333e 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/__init__.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import AuthorizedDomainsClient from .async_client import AuthorizedDomainsAsyncClient +from .client import AuthorizedDomainsClient __all__ = ( "AuthorizedDomainsClient", diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py b/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py index 7d0e420..4af4c0d 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/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] @@ -32,11 +32,11 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.appengine_admin_v1.services.authorized_domains import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain -from .transports.base import AuthorizedDomainsTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import AuthorizedDomainsGrpcAsyncIOTransport +from google.cloud.appengine_admin_v1.types import appengine, domain + from .client import AuthorizedDomainsClient +from .transports.base import DEFAULT_CLIENT_INFO, AuthorizedDomainsTransport +from .transports.grpc_asyncio import AuthorizedDomainsGrpcAsyncIOTransport class AuthorizedDomainsAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/client.py b/google/cloud/appengine_admin_v1/services/authorized_domains/client.py index 3c048c8..aa4cba1 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/client.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/client.py @@ -16,18 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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] @@ -35,9 +35,9 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.appengine_admin_v1.services.authorized_domains import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain -from .transports.base import AuthorizedDomainsTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, domain + +from .transports.base import DEFAULT_CLIENT_INFO, AuthorizedDomainsTransport from .transports.grpc import AuthorizedDomainsGrpcTransport from .transports.grpc_asyncio import AuthorizedDomainsGrpcAsyncIOTransport @@ -315,7 +315,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, AuthorizedDomainsTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the authorized domains client. @@ -329,7 +329,7 @@ def __init__( transport (Union[str, AuthorizedDomainsTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -359,6 +359,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py b/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py index f250a7a..d790841 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py @@ -18,14 +18,13 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain +from google.cloud.appengine_admin_v1.types import appengine, domain class ListAuthorizedDomainsPager: diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/__init__.py b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/__init__.py index 09deb66..5938ca9 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import AuthorizedDomainsGrpcTransport from .grpc_asyncio import AuthorizedDomainsGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[AuthorizedDomainsTransport]] _transport_registry["grpc"] = AuthorizedDomainsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py index db83423..a943bee 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py @@ -15,15 +15,15 @@ # 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 retry as retries +import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +import pkg_resources from google.cloud.appengine_admin_v1.types import appengine diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py index c8959d7..69c2624 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py @@ -13,19 +13,18 @@ # 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 gapic_v1 +from google.api_core import gapic_v1, grpc_helpers import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - import grpc # type: ignore from google.cloud.appengine_admin_v1.types import appengine -from .base import AuthorizedDomainsTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, AuthorizedDomainsTransport class AuthorizedDomainsGrpcTransport(AuthorizedDomainsTransport): diff --git a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py index 16207f5..823f236 100644 --- a/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py @@ -13,19 +13,18 @@ # 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 gapic_v1, grpc_helpers_async from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - import grpc # type: ignore from grpc.experimental import aio # type: ignore from google.cloud.appengine_admin_v1.types import appengine -from .base import AuthorizedDomainsTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, AuthorizedDomainsTransport from .grpc import AuthorizedDomainsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/__init__.py b/google/cloud/appengine_admin_v1/services/domain_mappings/__init__.py index c900f1f..e019b68 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/__init__.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import DomainMappingsClient from .async_client import DomainMappingsAsyncClient +from .client import DomainMappingsClient __all__ = ( "DomainMappingsClient", diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py b/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py index 66fa3b1..272c227 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/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,14 +33,15 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore +from google.protobuf import empty_pb2 # type: ignore + from google.cloud.appengine_admin_v1.services.domain_mappings import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain_mapping +from google.cloud.appengine_admin_v1.types import appengine, domain_mapping from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.protobuf import empty_pb2 # type: ignore -from .transports.base import DomainMappingsTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import DomainMappingsGrpcAsyncIOTransport + from .client import DomainMappingsClient +from .transports.base import DEFAULT_CLIENT_INFO, DomainMappingsTransport +from .transports.grpc_asyncio import DomainMappingsGrpcAsyncIOTransport class DomainMappingsAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/client.py b/google/cloud/appengine_admin_v1/services/domain_mappings/client.py index ea01f3f..e5e7e90 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/client.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/client.py @@ -16,18 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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,12 +36,13 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore +from google.protobuf import empty_pb2 # type: ignore + from google.cloud.appengine_admin_v1.services.domain_mappings import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain_mapping +from google.cloud.appengine_admin_v1.types import appengine, domain_mapping from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.protobuf import empty_pb2 # type: ignore -from .transports.base import DomainMappingsTransport, DEFAULT_CLIENT_INFO + +from .transports.base import DEFAULT_CLIENT_INFO, DomainMappingsTransport from .transports.grpc import DomainMappingsGrpcTransport from .transports.grpc_asyncio import DomainMappingsGrpcAsyncIOTransport @@ -316,7 +317,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, DomainMappingsTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the domain mappings client. @@ -330,7 +331,7 @@ def __init__( transport (Union[str, DomainMappingsTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -360,6 +361,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py b/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py index 9eef25f..6a71967 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py @@ -18,14 +18,13 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain_mapping +from google.cloud.appengine_admin_v1.types import appengine, domain_mapping class ListDomainMappingsPager: diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/__init__.py b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/__init__.py index f4abef8..1883c69 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import DomainMappingsGrpcTransport from .grpc_asyncio import DomainMappingsGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[DomainMappingsTransport]] _transport_registry["grpc"] = DomainMappingsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py index 25d9be8..a38b79c 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py @@ -15,20 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain_mapping -from google.longrunning import operations_pb2 # type: ignore +from google.cloud.appengine_admin_v1.types import appengine, domain_mapping try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py index 01492e9..15b61c6 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain_mapping -from google.longrunning import operations_pb2 # type: ignore -from .base import DomainMappingsTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, domain_mapping + +from .base import DEFAULT_CLIENT_INFO, DomainMappingsTransport class DomainMappingsGrpcTransport(DomainMappingsTransport): diff --git a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py index ca7c706..80fb4cf 100644 --- a/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain_mapping -from google.longrunning import operations_pb2 # type: ignore -from .base import DomainMappingsTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, domain_mapping + +from .base import DEFAULT_CLIENT_INFO, DomainMappingsTransport from .grpc import DomainMappingsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/firewall/__init__.py b/google/cloud/appengine_admin_v1/services/firewall/__init__.py index 2a1dc5a..417aec0 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/__init__.py +++ b/google/cloud/appengine_admin_v1/services/firewall/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import FirewallClient from .async_client import FirewallAsyncClient +from .client import FirewallClient __all__ = ( "FirewallClient", diff --git a/google/cloud/appengine_admin_v1/services/firewall/async_client.py b/google/cloud/appengine_admin_v1/services/firewall/async_client.py index 6b03245..c064b0a 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/async_client.py +++ b/google/cloud/appengine_admin_v1/services/firewall/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] @@ -32,11 +32,11 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.appengine_admin_v1.services.firewall import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import firewall -from .transports.base import FirewallTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import FirewallGrpcAsyncIOTransport +from google.cloud.appengine_admin_v1.types import appengine, firewall + from .client import FirewallClient +from .transports.base import DEFAULT_CLIENT_INFO, FirewallTransport +from .transports.grpc_asyncio import FirewallGrpcAsyncIOTransport class FirewallAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/firewall/client.py b/google/cloud/appengine_admin_v1/services/firewall/client.py index 0e8b5c1..f0cea22 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/client.py +++ b/google/cloud/appengine_admin_v1/services/firewall/client.py @@ -16,18 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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] @@ -35,9 +35,9 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore from google.cloud.appengine_admin_v1.services.firewall import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import firewall -from .transports.base import FirewallTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, firewall + +from .transports.base import DEFAULT_CLIENT_INFO, FirewallTransport from .transports.grpc import FirewallGrpcTransport from .transports.grpc_asyncio import FirewallGrpcAsyncIOTransport @@ -321,7 +321,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, FirewallTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the firewall client. @@ -335,7 +335,7 @@ def __init__( transport (Union[str, FirewallTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -365,6 +365,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/firewall/pagers.py b/google/cloud/appengine_admin_v1/services/firewall/pagers.py index 1e3aa6f..2703da0 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/pagers.py +++ b/google/cloud/appengine_admin_v1/services/firewall/pagers.py @@ -18,14 +18,13 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import firewall +from google.cloud.appengine_admin_v1.types import appengine, firewall class ListIngressRulesPager: diff --git a/google/cloud/appengine_admin_v1/services/firewall/transports/__init__.py b/google/cloud/appengine_admin_v1/services/firewall/transports/__init__.py index 8fe35b5..382119f 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/firewall/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import FirewallGrpcTransport from .grpc_asyncio import FirewallGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[FirewallTransport]] _transport_registry["grpc"] = FirewallGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/firewall/transports/base.py b/google/cloud/appengine_admin_v1/services/firewall/transports/base.py index 4e4bbb7..f643e88 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/firewall/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 retry as retries +import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore - -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import firewall from google.protobuf import empty_pb2 # type: ignore +import pkg_resources + +from google.cloud.appengine_admin_v1.types import appengine, firewall try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py b/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py index cdf8c0c..1d75599 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/firewall/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 gapic_v1 +from google.api_core import gapic_v1, grpc_helpers 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.protobuf import empty_pb2 # type: ignore import grpc # type: ignore -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import firewall -from google.protobuf import empty_pb2 # type: ignore -from .base import FirewallTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, firewall + +from .base import DEFAULT_CLIENT_INFO, FirewallTransport class FirewallGrpcTransport(FirewallTransport): diff --git a/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py index a49184d..4d1ca72 100644 --- a/google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/firewall/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 gapic_v1, grpc_helpers_async from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - +from google.protobuf import empty_pb2 # type: ignore import grpc # type: ignore from grpc.experimental import aio # type: ignore -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import firewall -from google.protobuf import empty_pb2 # type: ignore -from .base import FirewallTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, firewall + +from .base import DEFAULT_CLIENT_INFO, FirewallTransport from .grpc import FirewallGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/instances/__init__.py b/google/cloud/appengine_admin_v1/services/instances/__init__.py index a655183..e1d8945 100644 --- a/google/cloud/appengine_admin_v1/services/instances/__init__.py +++ b/google/cloud/appengine_admin_v1/services/instances/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import InstancesClient from .async_client import InstancesAsyncClient +from .client import InstancesClient __all__ = ( "InstancesClient", diff --git a/google/cloud/appengine_admin_v1/services/instances/async_client.py b/google/cloud/appengine_admin_v1/services/instances/async_client.py index 0e999ae..eee9e33 100644 --- a/google/cloud/appengine_admin_v1/services/instances/async_client.py +++ b/google/cloud/appengine_admin_v1/services/instances/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,15 +33,16 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.appengine_admin_v1.services.instances import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import instance -from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import InstancesTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import InstancesGrpcAsyncIOTransport + +from google.cloud.appengine_admin_v1.services.instances import pagers +from google.cloud.appengine_admin_v1.types import appengine, instance +from google.cloud.appengine_admin_v1.types import operation as ga_operation + from .client import InstancesClient +from .transports.base import DEFAULT_CLIENT_INFO, InstancesTransport +from .transports.grpc_asyncio import InstancesGrpcAsyncIOTransport class InstancesAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/instances/client.py b/google/cloud/appengine_admin_v1/services/instances/client.py index 90e97b6..f12dcbb 100644 --- a/google/cloud/appengine_admin_v1/services/instances/client.py +++ b/google/cloud/appengine_admin_v1/services/instances/client.py @@ -16,18 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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,13 +36,14 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.appengine_admin_v1.services.instances import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import instance -from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import InstancesTransport, DEFAULT_CLIENT_INFO + +from google.cloud.appengine_admin_v1.services.instances import pagers +from google.cloud.appengine_admin_v1.types import appengine, instance +from google.cloud.appengine_admin_v1.types import operation as ga_operation + +from .transports.base import DEFAULT_CLIENT_INFO, InstancesTransport from .transports.grpc import InstancesGrpcTransport from .transports.grpc_asyncio import InstancesGrpcAsyncIOTransport @@ -339,7 +340,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, InstancesTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the instances client. @@ -353,7 +354,7 @@ def __init__( transport (Union[str, InstancesTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -383,6 +384,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/instances/pagers.py b/google/cloud/appengine_admin_v1/services/instances/pagers.py index da63e00..8459277 100644 --- a/google/cloud/appengine_admin_v1/services/instances/pagers.py +++ b/google/cloud/appengine_admin_v1/services/instances/pagers.py @@ -18,14 +18,13 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import instance +from google.cloud.appengine_admin_v1.types import appengine, instance class ListInstancesPager: diff --git a/google/cloud/appengine_admin_v1/services/instances/transports/__init__.py b/google/cloud/appengine_admin_v1/services/instances/transports/__init__.py index a977af3..5a5096b 100644 --- a/google/cloud/appengine_admin_v1/services/instances/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/instances/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import InstancesGrpcTransport from .grpc_asyncio import InstancesGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[InstancesTransport]] _transport_registry["grpc"] = InstancesGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/instances/transports/base.py b/google/cloud/appengine_admin_v1/services/instances/transports/base.py index 1b81edd..e8492c5 100644 --- a/google/cloud/appengine_admin_v1/services/instances/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/instances/transports/base.py @@ -15,20 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import instance -from google.longrunning import operations_pb2 # type: ignore +from google.cloud.appengine_admin_v1.types import appengine, instance try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py b/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py index ebdf3e0..4cc0dc3 100644 --- a/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/instances/transports/grpc.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import instance -from google.longrunning import operations_pb2 # type: ignore -from .base import InstancesTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, instance + +from .base import DEFAULT_CLIENT_INFO, InstancesTransport class InstancesGrpcTransport(InstancesTransport): diff --git a/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py index 2289fea..01c418a 100644 --- a/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import instance -from google.longrunning import operations_pb2 # type: ignore -from .base import InstancesTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, instance + +from .base import DEFAULT_CLIENT_INFO, InstancesTransport from .grpc import InstancesGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/services/__init__.py b/google/cloud/appengine_admin_v1/services/services/__init__.py index f8e9062..3916f58 100644 --- a/google/cloud/appengine_admin_v1/services/services/__init__.py +++ b/google/cloud/appengine_admin_v1/services/services/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import ServicesClient from .async_client import ServicesAsyncClient +from .client import ServicesClient __all__ = ( "ServicesClient", diff --git a/google/cloud/appengine_admin_v1/services/services/async_client.py b/google/cloud/appengine_admin_v1/services/services/async_client.py index 3fd6da3..636c963 100644 --- a/google/cloud/appengine_admin_v1/services/services/async_client.py +++ b/google/cloud/appengine_admin_v1/services/services/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,15 +33,16 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore +from google.protobuf import empty_pb2 # type: ignore + from google.cloud.appengine_admin_v1.services.services import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.cloud.appengine_admin_v1.types import service -from google.protobuf import empty_pb2 # type: ignore -from .transports.base import ServicesTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import ServicesGrpcAsyncIOTransport + from .client import ServicesClient +from .transports.base import DEFAULT_CLIENT_INFO, ServicesTransport +from .transports.grpc_asyncio import ServicesGrpcAsyncIOTransport class ServicesAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/services/client.py b/google/cloud/appengine_admin_v1/services/services/client.py index 2eb5429..0c47b3f 100644 --- a/google/cloud/appengine_admin_v1/services/services/client.py +++ b/google/cloud/appengine_admin_v1/services/services/client.py @@ -16,18 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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,13 +36,14 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore +from google.protobuf import empty_pb2 # type: ignore + from google.cloud.appengine_admin_v1.services.services import pagers -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import network_settings +from google.cloud.appengine_admin_v1.types import appengine, network_settings from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.cloud.appengine_admin_v1.types import service -from google.protobuf import empty_pb2 # type: ignore -from .transports.base import ServicesTransport, DEFAULT_CLIENT_INFO + +from .transports.base import DEFAULT_CLIENT_INFO, ServicesTransport from .transports.grpc import ServicesGrpcTransport from .transports.grpc_asyncio import ServicesGrpcAsyncIOTransport @@ -315,7 +316,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, ServicesTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the services client. @@ -329,7 +330,7 @@ def __init__( transport (Union[str, ServicesTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -359,6 +360,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/services/pagers.py b/google/cloud/appengine_admin_v1/services/services/pagers.py index fa99c03..798651d 100644 --- a/google/cloud/appengine_admin_v1/services/services/pagers.py +++ b/google/cloud/appengine_admin_v1/services/services/pagers.py @@ -18,14 +18,13 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import service +from google.cloud.appengine_admin_v1.types import appengine, service class ListServicesPager: diff --git a/google/cloud/appengine_admin_v1/services/services/transports/__init__.py b/google/cloud/appengine_admin_v1/services/services/transports/__init__.py index 7597c5d..f362184 100644 --- a/google/cloud/appengine_admin_v1/services/services/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/services/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import ServicesGrpcTransport from .grpc_asyncio import ServicesGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ServicesTransport]] _transport_registry["grpc"] = ServicesGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/services/transports/base.py b/google/cloud/appengine_admin_v1/services/services/transports/base.py index 872bfb8..3b68e2b 100644 --- a/google/cloud/appengine_admin_v1/services/services/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/services/transports/base.py @@ -15,20 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import service -from google.longrunning import operations_pb2 # type: ignore +from google.cloud.appengine_admin_v1.types import appengine, service try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/appengine_admin_v1/services/services/transports/grpc.py b/google/cloud/appengine_admin_v1/services/services/transports/grpc.py index 2f3fc04..f35d7c8 100644 --- a/google/cloud/appengine_admin_v1/services/services/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/services/transports/grpc.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import service -from google.longrunning import operations_pb2 # type: ignore -from .base import ServicesTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, service + +from .base import DEFAULT_CLIENT_INFO, ServicesTransport class ServicesGrpcTransport(ServicesTransport): diff --git a/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py index 0858cb6..92c4ff3 100644 --- a/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import service -from google.longrunning import operations_pb2 # type: ignore -from .base import ServicesTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, service + +from .base import DEFAULT_CLIENT_INFO, ServicesTransport from .grpc import ServicesGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/versions/__init__.py b/google/cloud/appengine_admin_v1/services/versions/__init__.py index 78f73aa..2e962bc 100644 --- a/google/cloud/appengine_admin_v1/services/versions/__init__.py +++ b/google/cloud/appengine_admin_v1/services/versions/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import VersionsClient from .async_client import VersionsAsyncClient +from .client import VersionsClient __all__ = ( "VersionsClient", diff --git a/google/cloud/appengine_admin_v1/services/versions/async_client.py b/google/cloud/appengine_admin_v1/services/versions/async_client.py index ecc29d5..fc652e5 100644 --- a/google/cloud/appengine_admin_v1/services/versions/async_client.py +++ b/google/cloud/appengine_admin_v1/services/versions/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,18 +33,18 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.appengine_admin_v1.services.versions import pagers -from google.cloud.appengine_admin_v1.types import app_yaml -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import deploy -from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version from google.protobuf import duration_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import VersionsTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import VersionsGrpcAsyncIOTransport + +from google.cloud.appengine_admin_v1.services.versions import pagers +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import operation as ga_operation +from google.cloud.appengine_admin_v1.types import version + from .client import VersionsClient +from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport +from .transports.grpc_asyncio import VersionsGrpcAsyncIOTransport class VersionsAsyncClient: diff --git a/google/cloud/appengine_admin_v1/services/versions/client.py b/google/cloud/appengine_admin_v1/services/versions/client.py index 8334f50..e765f75 100644 --- a/google/cloud/appengine_admin_v1/services/versions/client.py +++ b/google/cloud/appengine_admin_v1/services/versions/client.py @@ -16,18 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union -import pkg_resources +from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast 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,16 +36,16 @@ from google.api_core import operation as gac_operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.appengine_admin_v1.services.versions import pagers -from google.cloud.appengine_admin_v1.types import app_yaml -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import deploy -from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version from google.protobuf import duration_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import VersionsTransport, DEFAULT_CLIENT_INFO + +from google.cloud.appengine_admin_v1.services.versions import pagers +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import operation as ga_operation +from google.cloud.appengine_admin_v1.types import version + +from .transports.base import DEFAULT_CLIENT_INFO, VersionsTransport from .transports.grpc import VersionsGrpcTransport from .transports.grpc_asyncio import VersionsGrpcAsyncIOTransport @@ -318,7 +318,7 @@ def __init__( *, credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, VersionsTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the versions client. @@ -332,7 +332,7 @@ def __init__( transport (Union[str, VersionsTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -362,6 +362,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options diff --git a/google/cloud/appengine_admin_v1/services/versions/pagers.py b/google/cloud/appengine_admin_v1/services/versions/pagers.py index 35654e9..df6f2e5 100644 --- a/google/cloud/appengine_admin_v1/services/versions/pagers.py +++ b/google/cloud/appengine_admin_v1/services/versions/pagers.py @@ -18,14 +18,13 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import version +from google.cloud.appengine_admin_v1.types import appengine, version class ListVersionsPager: diff --git a/google/cloud/appengine_admin_v1/services/versions/transports/__init__.py b/google/cloud/appengine_admin_v1/services/versions/transports/__init__.py index ab80b3b..e31c216 100644 --- a/google/cloud/appengine_admin_v1/services/versions/transports/__init__.py +++ b/google/cloud/appengine_admin_v1/services/versions/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import VersionsGrpcTransport from .grpc_asyncio import VersionsGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[VersionsTransport]] _transport_registry["grpc"] = VersionsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/services/versions/transports/base.py b/google/cloud/appengine_admin_v1/services/versions/transports/base.py index f8ddd2c..d9ae526 100644 --- a/google/cloud/appengine_admin_v1/services/versions/transports/base.py +++ b/google/cloud/appengine_admin_v1/services/versions/transports/base.py @@ -15,20 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import version -from google.longrunning import operations_pb2 # type: ignore +from google.cloud.appengine_admin_v1.types import appengine, version try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py b/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py index 8d3657e..c31a651 100644 --- a/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py +++ b/google/cloud/appengine_admin_v1/services/versions/transports/grpc.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import version -from google.longrunning import operations_pb2 # type: ignore -from .base import VersionsTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, version + +from .base import DEFAULT_CLIENT_INFO, VersionsTransport class VersionsGrpcTransport(VersionsTransport): diff --git a/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py b/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py index d91e4a7..b33f64f 100644 --- a/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py +++ b/google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py @@ -13,22 +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.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import version -from google.longrunning import operations_pb2 # type: ignore -from .base import VersionsTransport, DEFAULT_CLIENT_INFO +from google.cloud.appengine_admin_v1.types import appengine, version + +from .base import DEFAULT_CLIENT_INFO, VersionsTransport from .grpc import VersionsGrpcTransport diff --git a/google/cloud/appengine_admin_v1/types/__init__.py b/google/cloud/appengine_admin_v1/types/__init__.py index 92e52a7..aa1134f 100644 --- a/google/cloud/appengine_admin_v1/types/__init__.py +++ b/google/cloud/appengine_admin_v1/types/__init__.py @@ -16,19 +16,20 @@ from .app_yaml import ( ApiConfigHandler, ApiEndpointHandler, + AuthFailAction, ErrorHandler, HealthCheck, Library, LivenessCheck, + LoginRequirement, ReadinessCheck, ScriptHandler, + SecurityLevel, StaticFilesHandler, UrlMap, - AuthFailAction, - LoginRequirement, - SecurityLevel, ) from .appengine import ( + AuthorizedCertificateView, BatchUpdateIngressRulesRequest, BatchUpdateIngressRulesResponse, CreateApplicationRequest, @@ -43,6 +44,7 @@ DeleteInstanceRequest, DeleteServiceRequest, DeleteVersionRequest, + DomainOverrideStrategy, GetApplicationRequest, GetAuthorizedCertificateRequest, GetDomainMappingRequest, @@ -71,60 +73,25 @@ UpdateIngressRuleRequest, UpdateServiceRequest, UpdateVersionRequest, - AuthorizedCertificateView, - DomainOverrideStrategy, VersionView, ) -from .application import ( - Application, - UrlDispatchRule, -) -from .audit_data import ( - AuditData, - CreateVersionMethod, - UpdateServiceMethod, -) +from .application import Application, UrlDispatchRule +from .audit_data import AuditData, CreateVersionMethod, UpdateServiceMethod from .certificate import ( AuthorizedCertificate, CertificateRawData, ManagedCertificate, ManagementStatus, ) -from .deploy import ( - CloudBuildOptions, - ContainerInfo, - Deployment, - FileInfo, - ZipInfo, -) -from .domain import ( - AuthorizedDomain, -) -from .domain_mapping import ( - DomainMapping, - ResourceRecord, - SslSettings, -) -from .firewall import ( - FirewallRule, -) -from .instance import ( - Instance, -) -from .location import ( - LocationMetadata, -) -from .network_settings import ( - NetworkSettings, -) -from .operation import ( - CreateVersionMetadataV1, - OperationMetadataV1, -) -from .service import ( - Service, - TrafficSplit, -) +from .deploy import CloudBuildOptions, ContainerInfo, Deployment, FileInfo, ZipInfo +from .domain import AuthorizedDomain +from .domain_mapping import DomainMapping, ResourceRecord, SslSettings +from .firewall import FirewallRule +from .instance import Instance +from .location import LocationMetadata +from .network_settings import NetworkSettings +from .operation import CreateVersionMetadataV1, OperationMetadataV1 +from .service import Service, TrafficSplit from .version import ( AutomaticScaling, BasicScaling, @@ -132,17 +99,17 @@ DiskUtilization, EndpointsApiService, Entrypoint, + InboundServiceType, ManualScaling, Network, NetworkUtilization, RequestUtilization, Resources, + ServingStatus, StandardSchedulerSettings, Version, Volume, VpcAccessConnector, - InboundServiceType, - ServingStatus, ) __all__ = ( diff --git a/google/cloud/appengine_admin_v1/types/app_yaml.py b/google/cloud/appengine_admin_v1/types/app_yaml.py index e2c84db..7afff2e 100644 --- a/google/cloud/appengine_admin_v1/types/app_yaml.py +++ b/google/cloud/appengine_admin_v1/types/app_yaml.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 duration_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.appengine.v1", diff --git a/google/cloud/appengine_admin_v1/types/appengine.py b/google/cloud/appengine_admin_v1/types/appengine.py index f4427c2..e706bc6 100644 --- a/google/cloud/appengine_admin_v1/types/appengine.py +++ b/google/cloud/appengine_admin_v1/types/appengine.py @@ -13,18 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore +from google.cloud.appengine_admin_v1.types import domain_mapping as ga_domain_mapping from google.cloud.appengine_admin_v1.types import application as ga_application from google.cloud.appengine_admin_v1.types import certificate as ga_certificate from google.cloud.appengine_admin_v1.types import domain -from google.cloud.appengine_admin_v1.types import domain_mapping as ga_domain_mapping -from google.cloud.appengine_admin_v1.types import firewall -from google.cloud.appengine_admin_v1.types import instance +from google.cloud.appengine_admin_v1.types import firewall, instance from google.cloud.appengine_admin_v1.types import service as ga_service from google.cloud.appengine_admin_v1.types import version as ga_version -from google.protobuf import field_mask_pb2 # type: ignore - __protobuf__ = proto.module( package="google.appengine.v1", diff --git a/google/cloud/appengine_admin_v1/types/application.py b/google/cloud/appengine_admin_v1/types/application.py index f7687e5..c51e52e 100644 --- a/google/cloud/appengine_admin_v1/types/application.py +++ b/google/cloud/appengine_admin_v1/types/application.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 duration_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.appengine.v1", diff --git a/google/cloud/appengine_admin_v1/types/audit_data.py b/google/cloud/appengine_admin_v1/types/audit_data.py index 69de0cf..5de1cad 100644 --- a/google/cloud/appengine_admin_v1/types/audit_data.py +++ b/google/cloud/appengine_admin_v1/types/audit_data.py @@ -17,7 +17,6 @@ from google.cloud.appengine_admin_v1.types import appengine - __protobuf__ = proto.module( package="google.appengine.v1", manifest={ diff --git a/google/cloud/appengine_admin_v1/types/certificate.py b/google/cloud/appengine_admin_v1/types/certificate.py index 5288637..8466750 100644 --- a/google/cloud/appengine_admin_v1/types/certificate.py +++ b/google/cloud/appengine_admin_v1/types/certificate.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.appengine.v1", diff --git a/google/cloud/appengine_admin_v1/types/deploy.py b/google/cloud/appengine_admin_v1/types/deploy.py index 857564e..4f48d4c 100644 --- a/google/cloud/appengine_admin_v1/types/deploy.py +++ b/google/cloud/appengine_admin_v1/types/deploy.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 duration_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.appengine.v1", diff --git a/google/cloud/appengine_admin_v1/types/domain.py b/google/cloud/appengine_admin_v1/types/domain.py index 92c3b53..5217582 100644 --- a/google/cloud/appengine_admin_v1/types/domain.py +++ b/google/cloud/appengine_admin_v1/types/domain.py @@ -15,7 +15,6 @@ # import proto # type: ignore - __protobuf__ = proto.module( package="google.appengine.v1", manifest={ diff --git a/google/cloud/appengine_admin_v1/types/domain_mapping.py b/google/cloud/appengine_admin_v1/types/domain_mapping.py index ba055ab..1a0227b 100644 --- a/google/cloud/appengine_admin_v1/types/domain_mapping.py +++ b/google/cloud/appengine_admin_v1/types/domain_mapping.py @@ -15,7 +15,6 @@ # import proto # type: ignore - __protobuf__ = proto.module( package="google.appengine.v1", manifest={ diff --git a/google/cloud/appengine_admin_v1/types/firewall.py b/google/cloud/appengine_admin_v1/types/firewall.py index 4c35c94..bfca05e 100644 --- a/google/cloud/appengine_admin_v1/types/firewall.py +++ b/google/cloud/appengine_admin_v1/types/firewall.py @@ -15,7 +15,6 @@ # import proto # type: ignore - __protobuf__ = proto.module( package="google.appengine.v1", manifest={ diff --git a/google/cloud/appengine_admin_v1/types/instance.py b/google/cloud/appengine_admin_v1/types/instance.py index 29ec859..48479fc 100644 --- a/google/cloud/appengine_admin_v1/types/instance.py +++ b/google/cloud/appengine_admin_v1/types/instance.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.appengine.v1", diff --git a/google/cloud/appengine_admin_v1/types/location.py b/google/cloud/appengine_admin_v1/types/location.py index 2d333a6..d38b301 100644 --- a/google/cloud/appengine_admin_v1/types/location.py +++ b/google/cloud/appengine_admin_v1/types/location.py @@ -15,7 +15,6 @@ # import proto # type: ignore - __protobuf__ = proto.module( package="google.appengine.v1", manifest={ diff --git a/google/cloud/appengine_admin_v1/types/network_settings.py b/google/cloud/appengine_admin_v1/types/network_settings.py index f931b83..4a27b4d 100644 --- a/google/cloud/appengine_admin_v1/types/network_settings.py +++ b/google/cloud/appengine_admin_v1/types/network_settings.py @@ -15,7 +15,6 @@ # import proto # type: ignore - __protobuf__ = proto.module( package="google.appengine.v1", manifest={ diff --git a/google/cloud/appengine_admin_v1/types/operation.py b/google/cloud/appengine_admin_v1/types/operation.py index 873d2f5..6510e77 100644 --- a/google/cloud/appengine_admin_v1/types/operation.py +++ b/google/cloud/appengine_admin_v1/types/operation.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.appengine.v1", diff --git a/google/cloud/appengine_admin_v1/types/service.py b/google/cloud/appengine_admin_v1/types/service.py index c42ffec..86d8437 100644 --- a/google/cloud/appengine_admin_v1/types/service.py +++ b/google/cloud/appengine_admin_v1/types/service.py @@ -19,7 +19,6 @@ network_settings as ga_network_settings, ) - __protobuf__ = proto.module( package="google.appengine.v1", manifest={ diff --git a/google/cloud/appengine_admin_v1/types/version.py b/google/cloud/appengine_admin_v1/types/version.py index 0bd5458..fe48d5e 100644 --- a/google/cloud/appengine_admin_v1/types/version.py +++ b/google/cloud/appengine_admin_v1/types/version.py @@ -13,13 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import proto # type: ignore - -from google.cloud.appengine_admin_v1.types import app_yaml -from google.cloud.appengine_admin_v1.types import deploy from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import proto # type: ignore +from google.cloud.appengine_admin_v1.types import app_yaml, deploy __protobuf__ = proto.module( package="google.appengine.v1", diff --git a/noxfile.py b/noxfile.py index 35f3976..29d0200 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,6 +17,7 @@ # Generated by synthtool. DO NOT EDIT! from __future__ import absolute_import + import os import pathlib import re diff --git a/owlbot.py b/owlbot.py index afb7005..13fffb7 100644 --- a/owlbot.py +++ b/owlbot.py @@ -1,10 +1,10 @@ -# Copyright 2021 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -12,40 +12,50 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""This script is used to synthesize generated parts of this library.""" - -import os +import json +from pathlib import Path +import shutil import synthtool as s import synthtool.gcp as gcp from synthtool.languages import python -common = gcp.CommonTemplates() +# ---------------------------------------------------------------------------- +# Copy the generated client from the owl-bot staging directory +# ---------------------------------------------------------------------------- + +clean_up_generated_samples = True -default_version = "v1" +# Load the default version defined in .repo-metadata.json. +default_version = json.load(open(".repo-metadata.json", "rt")).get( + "default_version" +) for library in s.get_staging_dirs(default_version): - excludes=["setup.py", "README.rst", "docs/index.rst"] + if clean_up_generated_samples: + shutil.rmtree("samples/generated_samples", ignore_errors=True) + clean_up_generated_samples = False - # See https://github.com/googleapis/gapic-generator-python/issues/825 - excludes.extend(["docs/appengine_admin_v1/services.rst"]) + excludes=["**/gapic_version.py"] - s.move(library, excludes=excludes) + # See https://github.com/googleapis/gapic-generator-python/issues/825 + excludes.extend(["docs/appengine_admin_v1/services.rst", "docs/index.rst"]) + s.move([library], excludes=excludes) s.remove_staging_dirs() # ---------------------------------------------------------------------------- # Add templated files # ---------------------------------------------------------------------------- -templated_files = common.py_library(cov_level=100, microgenerator=True) - -# the microgenerator has a good coveragerc file -excludes = [".coveragerc"] -s.move( - templated_files, excludes=excludes +templated_files = gcp.CommonTemplates().py_library( + cov_level=100, + microgenerator=True, ) +s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"]) python.py_samples(skip_readmes=True) -s.shell.run(["nox", "-s", "blacken"], hide_output=False) +# run format session for all directories which have a noxfile +for noxfile in Path(".").glob("**/noxfile.py"): + s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False) diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..fcf159e --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "packages": { + ".": { + "release-type": "python", + "extra-files": [ + "google/cloud/appengine_admin/gapic_version.py" + ] + } + }, + "release-type": "python", + "plugins": [ + { + "type": "sentence-case" + } + ], + "initial-version": "0.1.0" +} diff --git a/setup.py b/setup.py index 753c20e..922a440 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -# Copyright 2020 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,22 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # - import io import os + import setuptools # type: ignore +package_root = os.path.abspath(os.path.dirname(__file__)) + name = "google-cloud-appengine-admin" -version = "1.5.3" -description = "App Engine Admin API client library" -release_status = "Development Status :: 5 - Production/Stable" -url = "https://github.com/googleapis/python-appengine-admin" + + +description = "Google Cloud Appengine Admin API client library" + +version = {} +with open( + os.path.join(package_root, "google/cloud/appengine_admin/gapic_version.py") +) as fp: + exec(fp.read(), version) +version = version["__version__"] + +if version[0] == "0": + release_status = "Development Status :: 4 - Beta" +else: + release_status = "Development Status :: 5 - Production/Stable" + dependencies = [ - "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", + "google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", "proto-plus >= 1.22.0, <2.0.0dev", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", - "grpc-google-iam-v1 >=0.12.4, <1.0.0dev", ] +url = "https://github.com/googleapis/python-appengine-admin" package_root = os.path.abspath(os.path.dirname(__file__)) @@ -37,6 +50,16 @@ with io.open(readme_filename, encoding="utf-8") as readme_file: readme = readme_file.read() +packages = [ + package + for package in setuptools.PEP420PackageFinder.find() + if package.startswith("google") +] + +namespaces = ["google"] +if "google.cloud" in packages: + namespaces.append("google.cloud") + setuptools.setup( name=name, version=version, @@ -46,26 +69,24 @@ author_email="googleapis-packages@google.com", license="Apache 2.0", url=url, - packages=[ - package - for package in setuptools.PEP420PackageFinder.find() - if package.startswith("google") - ], - namespace_packages=("google", "google.cloud"), - platforms="Posix; MacOS X; Windows", - include_package_data=True, - install_requires=dependencies, - python_requires=">=3.7", classifiers=[ release_status, "Intended Audience :: Developers", - "Operating System :: OS Independent", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Operating System :: OS Independent", "Topic :: Internet", - "Topic :: Software Development :: Libraries :: Python Modules", ], + platforms="Posix; MacOS X; Windows", + packages=packages, + python_requires=">=3.7", + namespace_packages=namespaces, + install_requires=dependencies, + include_package_data=True, zip_safe=False, ) diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt index e69de29..ed7f9ae 100644 --- a/testing/constraints-3.10.txt +++ b/testing/constraints-3.10.txt @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt index e69de29..ed7f9ae 100644 --- a/testing/constraints-3.11.txt +++ b/testing/constraints-3.11.txt @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index fb33557..aca9f2d 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -1,11 +1,11 @@ # This constraints file is used to check that lower bounds # are correct in setup.py -# List *all* library dependencies and extras in this file. +# List all library dependencies and extras in this file. # Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.32.0 +# 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 +# This file is intentionally left empty to test the +# latest versions of dependencies. +google-api-core==1.33.2 proto-plus==1.22.0 -grpc-google-iam-v1==0.12.4 protobuf==3.19.5 diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt index e69de29..ed7f9ae 100644 --- a/testing/constraints-3.8.txt +++ b/testing/constraints-3.8.txt @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt index e69de29..ed7f9ae 100644 --- a/testing/constraints-3.9.txt +++ b/testing/constraints-3.9.txt @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf diff --git a/tests/unit/gapic/appengine_admin_v1/test_applications.py b/tests/unit/gapic/appengine_admin_v1/test_applications.py index 4760c52..cdb6687 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_applications.py +++ b/tests/unit/gapic/appengine_admin_v1/test_applications.py @@ -22,38 +22,40 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +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.appengine_admin_v1.services.applications import ( - ApplicationsAsyncClient, -) -from google.cloud.appengine_admin_v1.services.applications import ApplicationsClient -from google.cloud.appengine_admin_v1.services.applications import transports -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import application -from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.longrunning import operations_pb2 from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore -import google.auth +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + +from google.cloud.appengine_admin_v1.services.applications import ( + ApplicationsAsyncClient, + ApplicationsClient, + transports, +) +from google.cloud.appengine_admin_v1.types import appengine, application +from google.cloud.appengine_admin_v1.types import operation as ga_operation def client_cert_source_callback(): diff --git a/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py b/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py index e11ac46..60d680e 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py +++ b/tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py @@ -22,35 +22,30 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions -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 path_template +import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + from google.cloud.appengine_admin_v1.services.authorized_certificates import ( AuthorizedCertificatesAsyncClient, -) -from google.cloud.appengine_admin_v1.services.authorized_certificates import ( AuthorizedCertificatesClient, + pagers, + transports, ) -from google.cloud.appengine_admin_v1.services.authorized_certificates import pagers -from google.cloud.appengine_admin_v1.services.authorized_certificates import transports -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import certificate -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -import google.auth +from google.cloud.appengine_admin_v1.types import appengine, certificate def client_cert_source_callback(): diff --git a/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py b/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py index 71acc23..faee289 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py +++ b/tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py @@ -22,33 +22,28 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions -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 path_template +import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + from google.cloud.appengine_admin_v1.services.authorized_domains import ( AuthorizedDomainsAsyncClient, -) -from google.cloud.appengine_admin_v1.services.authorized_domains import ( AuthorizedDomainsClient, + pagers, + transports, ) -from google.cloud.appengine_admin_v1.services.authorized_domains import pagers -from google.cloud.appengine_admin_v1.services.authorized_domains import transports -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain -from google.oauth2 import service_account -import google.auth +from google.cloud.appengine_admin_v1.types import appengine, domain def client_cert_source_callback(): diff --git a/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py b/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py index e902ca3..e7095b9 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py +++ b/tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py @@ -22,40 +22,41 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +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.longrunning import operations_pb2 +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + from google.cloud.appengine_admin_v1.services.domain_mappings import ( DomainMappingsAsyncClient, -) -from google.cloud.appengine_admin_v1.services.domain_mappings import ( DomainMappingsClient, + pagers, + transports, ) -from google.cloud.appengine_admin_v1.services.domain_mappings import pagers -from google.cloud.appengine_admin_v1.services.domain_mappings import transports -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import domain_mapping +from google.cloud.appengine_admin_v1.types import appengine, domain_mapping from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.longrunning import operations_pb2 -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -import google.auth def client_cert_source_callback(): diff --git a/tests/unit/gapic/appengine_admin_v1/test_firewall.py b/tests/unit/gapic/appengine_admin_v1/test_firewall.py index e71fa0e..b0fef84 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_firewall.py +++ b/tests/unit/gapic/appengine_admin_v1/test_firewall.py @@ -22,30 +22,29 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions -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 path_template +import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.appengine_admin_v1.services.firewall import FirewallAsyncClient -from google.cloud.appengine_admin_v1.services.firewall import FirewallClient -from google.cloud.appengine_admin_v1.services.firewall import pagers -from google.cloud.appengine_admin_v1.services.firewall import transports -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import firewall from google.oauth2 import service_account from google.protobuf import field_mask_pb2 # type: ignore -import google.auth +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + +from google.cloud.appengine_admin_v1.services.firewall import ( + FirewallAsyncClient, + FirewallClient, + pagers, + transports, +) +from google.cloud.appengine_admin_v1.types import appengine, firewall def client_cert_source_callback(): diff --git a/tests/unit/gapic/appengine_admin_v1/test_instances.py b/tests/unit/gapic/appengine_admin_v1/test_instances.py index b1fa2a9..9c35b1e 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_instances.py +++ b/tests/unit/gapic/appengine_admin_v1/test_instances.py @@ -22,36 +22,41 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +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.appengine_admin_v1.services.instances import InstancesAsyncClient -from google.cloud.appengine_admin_v1.services.instances import InstancesClient -from google.cloud.appengine_admin_v1.services.instances import pagers -from google.cloud.appengine_admin_v1.services.instances import transports -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import instance -from google.cloud.appengine_admin_v1.types import operation as ga_operation from google.longrunning import operations_pb2 from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -import google.auth +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + +from google.cloud.appengine_admin_v1.services.instances import ( + InstancesAsyncClient, + InstancesClient, + pagers, + transports, +) +from google.cloud.appengine_admin_v1.types import appengine, instance +from google.cloud.appengine_admin_v1.types import operation as ga_operation def client_cert_source_callback(): diff --git a/tests/unit/gapic/appengine_admin_v1/test_services.py b/tests/unit/gapic/appengine_admin_v1/test_services.py index 289b785..fea1894 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_services.py +++ b/tests/unit/gapic/appengine_admin_v1/test_services.py @@ -22,37 +22,42 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +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.appengine_admin_v1.services.services import ServicesAsyncClient -from google.cloud.appengine_admin_v1.services.services import ServicesClient -from google.cloud.appengine_admin_v1.services.services import pagers -from google.cloud.appengine_admin_v1.services.services import transports -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import network_settings -from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import service from google.longrunning import operations_pb2 from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore -import google.auth +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + +from google.cloud.appengine_admin_v1.services.services import ( + ServicesAsyncClient, + ServicesClient, + pagers, + transports, +) +from google.cloud.appengine_admin_v1.types import appengine, network_settings +from google.cloud.appengine_admin_v1.types import operation as ga_operation +from google.cloud.appengine_admin_v1.types import service def client_cert_source_callback(): diff --git a/tests/unit/gapic/appengine_admin_v1/test_versions.py b/tests/unit/gapic/appengine_admin_v1/test_versions.py index e1d0d3d..5cd663b 100644 --- a/tests/unit/gapic/appengine_admin_v1/test_versions.py +++ b/tests/unit/gapic/appengine_admin_v1/test_versions.py @@ -22,40 +22,44 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers +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.appengine_admin_v1.services.versions import VersionsAsyncClient -from google.cloud.appengine_admin_v1.services.versions import VersionsClient -from google.cloud.appengine_admin_v1.services.versions import pagers -from google.cloud.appengine_admin_v1.services.versions import transports -from google.cloud.appengine_admin_v1.types import app_yaml -from google.cloud.appengine_admin_v1.types import appengine -from google.cloud.appengine_admin_v1.types import deploy -from google.cloud.appengine_admin_v1.types import operation as ga_operation -from google.cloud.appengine_admin_v1.types import version from google.longrunning import operations_pb2 from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -import google.auth +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + +from google.cloud.appengine_admin_v1.services.versions import ( + VersionsAsyncClient, + VersionsClient, + pagers, + transports, +) +from google.cloud.appengine_admin_v1.types import app_yaml, appengine, deploy +from google.cloud.appengine_admin_v1.types import operation as ga_operation +from google.cloud.appengine_admin_v1.types import version def client_cert_source_callback():