From bb8e4ebb72177f3387f1efc4640f52685650902d Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 6 Sep 2023 10:38:04 -0400 Subject: [PATCH 1/3] chore: Prepare for mono repository migration (#531) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Prepare for mono repository migration * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Tomo Suzuki --- docs/conf.py | 2 +- google/cloud/dataproc/__init__.py | 293 ++++++++--------- google/cloud/dataproc_v1/__init__.py | 305 ++++++++++-------- .../autoscaling_policy_service/__init__.py | 2 +- .../async_client.py | 16 +- .../autoscaling_policy_service/client.py | 14 +- .../autoscaling_policy_service/pagers.py | 4 +- .../transports/__init__.py | 7 +- .../transports/base.py | 11 +- .../transports/grpc.py | 15 +- .../transports/grpc_asyncio.py | 17 +- .../transports/rest.py | 33 +- .../services/batch_controller/__init__.py | 2 +- .../services/batch_controller/async_client.py | 18 +- .../services/batch_controller/client.py | 16 +- .../services/batch_controller/pagers.py | 4 +- .../batch_controller/transports/__init__.py | 4 +- .../batch_controller/transports/base.py | 15 +- .../batch_controller/transports/grpc.py | 17 +- .../transports/grpc_asyncio.py | 19 +- .../batch_controller/transports/rest.py | 40 +-- .../services/cluster_controller/__init__.py | 2 +- .../cluster_controller/async_client.py | 17 +- .../services/cluster_controller/client.py | 15 +- .../services/cluster_controller/pagers.py | 4 +- .../cluster_controller/transports/__init__.py | 4 +- .../cluster_controller/transports/base.py | 15 +- .../cluster_controller/transports/grpc.py | 17 +- .../transports/grpc_asyncio.py | 17 +- .../cluster_controller/transports/rest.py | 40 +-- .../services/job_controller/__init__.py | 2 +- .../services/job_controller/async_client.py | 16 +- .../services/job_controller/client.py | 14 +- .../services/job_controller/pagers.py | 4 +- .../job_controller/transports/__init__.py | 4 +- .../job_controller/transports/base.py | 15 +- .../job_controller/transports/grpc.py | 17 +- .../job_controller/transports/grpc_asyncio.py | 19 +- .../job_controller/transports/rest.py | 40 +-- .../node_group_controller/__init__.py | 2 +- .../node_group_controller/async_client.py | 16 +- .../services/node_group_controller/client.py | 14 +- .../transports/__init__.py | 4 +- .../node_group_controller/transports/base.py | 16 +- .../node_group_controller/transports/grpc.py | 18 +- .../transports/grpc_asyncio.py | 20 +- .../node_group_controller/transports/rest.py | 41 ++- .../workflow_template_service/__init__.py | 2 +- .../workflow_template_service/async_client.py | 16 +- .../workflow_template_service/client.py | 14 +- .../workflow_template_service/pagers.py | 4 +- .../transports/__init__.py | 7 +- .../transports/base.py | 15 +- .../transports/grpc.py | 17 +- .../transports/grpc_asyncio.py | 19 +- .../transports/rest.py | 40 +-- google/cloud/dataproc_v1/types/__init__.py | 4 +- .../dataproc_v1/types/autoscaling_policies.py | 4 +- google/cloud/dataproc_v1/types/batches.py | 3 +- google/cloud/dataproc_v1/types/clusters.py | 5 +- google/cloud/dataproc_v1/types/jobs.py | 4 +- google/cloud/dataproc_v1/types/node_groups.py | 3 +- google/cloud/dataproc_v1/types/operations.py | 4 +- google/cloud/dataproc_v1/types/shared.py | 4 +- .../dataproc_v1/types/workflow_templates.py | 5 +- noxfile.py | 3 +- owlbot.py | 9 +- .../v1/test_system_cluster_controller_v1.py | 1 + .../test_autoscaling_policy_service.py | 42 ++- .../dataproc_v1/test_batch_controller.py | 53 ++- .../dataproc_v1/test_cluster_controller.py | 53 ++- .../gapic/dataproc_v1/test_job_controller.py | 49 +-- .../dataproc_v1/test_node_group_controller.py | 53 ++- .../test_workflow_template_service.py | 56 ++-- 74 files changed, 832 insertions(+), 904 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 63128462..2b294037 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/dataproc/__init__.py b/google/cloud/dataproc/__init__.py index 82aa640c..962abee9 100644 --- a/google/cloud/dataproc/__init__.py +++ b/google/cloud/dataproc/__init__.py @@ -18,202 +18,185 @@ __version__ = package_version.__version__ -from google.cloud.dataproc_v1.services.autoscaling_policy_service.client import ( - AutoscalingPolicyServiceClient, -) from google.cloud.dataproc_v1.services.autoscaling_policy_service.async_client import ( AutoscalingPolicyServiceAsyncClient, ) -from google.cloud.dataproc_v1.services.batch_controller.client import ( - BatchControllerClient, +from google.cloud.dataproc_v1.services.autoscaling_policy_service.client import ( + AutoscalingPolicyServiceClient, ) from google.cloud.dataproc_v1.services.batch_controller.async_client import ( BatchControllerAsyncClient, ) -from google.cloud.dataproc_v1.services.cluster_controller.client import ( - ClusterControllerClient, +from google.cloud.dataproc_v1.services.batch_controller.client import ( + BatchControllerClient, ) from google.cloud.dataproc_v1.services.cluster_controller.async_client import ( ClusterControllerAsyncClient, ) -from google.cloud.dataproc_v1.services.job_controller.client import JobControllerClient +from google.cloud.dataproc_v1.services.cluster_controller.client import ( + ClusterControllerClient, +) from google.cloud.dataproc_v1.services.job_controller.async_client import ( JobControllerAsyncClient, ) -from google.cloud.dataproc_v1.services.node_group_controller.client import ( - NodeGroupControllerClient, -) +from google.cloud.dataproc_v1.services.job_controller.client import JobControllerClient from google.cloud.dataproc_v1.services.node_group_controller.async_client import ( NodeGroupControllerAsyncClient, ) -from google.cloud.dataproc_v1.services.workflow_template_service.client import ( - WorkflowTemplateServiceClient, +from google.cloud.dataproc_v1.services.node_group_controller.client import ( + NodeGroupControllerClient, ) from google.cloud.dataproc_v1.services.workflow_template_service.async_client import ( WorkflowTemplateServiceAsyncClient, ) - -from google.cloud.dataproc_v1.types.autoscaling_policies import AutoscalingPolicy -from google.cloud.dataproc_v1.types.autoscaling_policies import ( - BasicAutoscalingAlgorithm, +from google.cloud.dataproc_v1.services.workflow_template_service.client import ( + WorkflowTemplateServiceClient, ) from google.cloud.dataproc_v1.types.autoscaling_policies import ( + AutoscalingPolicy, + BasicAutoscalingAlgorithm, BasicYarnAutoscalingConfig, -) -from google.cloud.dataproc_v1.types.autoscaling_policies import ( CreateAutoscalingPolicyRequest, -) -from google.cloud.dataproc_v1.types.autoscaling_policies import ( DeleteAutoscalingPolicyRequest, -) -from google.cloud.dataproc_v1.types.autoscaling_policies import ( GetAutoscalingPolicyRequest, -) -from google.cloud.dataproc_v1.types.autoscaling_policies import ( InstanceGroupAutoscalingPolicyConfig, -) -from google.cloud.dataproc_v1.types.autoscaling_policies import ( ListAutoscalingPoliciesRequest, -) -from google.cloud.dataproc_v1.types.autoscaling_policies import ( ListAutoscalingPoliciesResponse, -) -from google.cloud.dataproc_v1.types.autoscaling_policies import ( UpdateAutoscalingPolicyRequest, ) -from google.cloud.dataproc_v1.types.batches import Batch -from google.cloud.dataproc_v1.types.batches import CreateBatchRequest -from google.cloud.dataproc_v1.types.batches import DeleteBatchRequest -from google.cloud.dataproc_v1.types.batches import GetBatchRequest -from google.cloud.dataproc_v1.types.batches import ListBatchesRequest -from google.cloud.dataproc_v1.types.batches import ListBatchesResponse -from google.cloud.dataproc_v1.types.batches import PySparkBatch -from google.cloud.dataproc_v1.types.batches import SparkBatch -from google.cloud.dataproc_v1.types.batches import SparkRBatch -from google.cloud.dataproc_v1.types.batches import SparkSqlBatch -from google.cloud.dataproc_v1.types.clusters import AcceleratorConfig -from google.cloud.dataproc_v1.types.clusters import AutoscalingConfig -from google.cloud.dataproc_v1.types.clusters import AuxiliaryNodeGroup -from google.cloud.dataproc_v1.types.clusters import AuxiliaryServicesConfig -from google.cloud.dataproc_v1.types.clusters import Cluster -from google.cloud.dataproc_v1.types.clusters import ClusterConfig -from google.cloud.dataproc_v1.types.clusters import ClusterMetrics -from google.cloud.dataproc_v1.types.clusters import ClusterStatus -from google.cloud.dataproc_v1.types.clusters import ConfidentialInstanceConfig -from google.cloud.dataproc_v1.types.clusters import CreateClusterRequest -from google.cloud.dataproc_v1.types.clusters import DataprocMetricConfig -from google.cloud.dataproc_v1.types.clusters import DeleteClusterRequest -from google.cloud.dataproc_v1.types.clusters import DiagnoseClusterRequest -from google.cloud.dataproc_v1.types.clusters import DiagnoseClusterResults -from google.cloud.dataproc_v1.types.clusters import DiskConfig -from google.cloud.dataproc_v1.types.clusters import EncryptionConfig -from google.cloud.dataproc_v1.types.clusters import EndpointConfig -from google.cloud.dataproc_v1.types.clusters import GceClusterConfig -from google.cloud.dataproc_v1.types.clusters import GetClusterRequest -from google.cloud.dataproc_v1.types.clusters import IdentityConfig -from google.cloud.dataproc_v1.types.clusters import InstanceFlexibilityPolicy -from google.cloud.dataproc_v1.types.clusters import InstanceGroupConfig -from google.cloud.dataproc_v1.types.clusters import InstanceReference -from google.cloud.dataproc_v1.types.clusters import KerberosConfig -from google.cloud.dataproc_v1.types.clusters import LifecycleConfig -from google.cloud.dataproc_v1.types.clusters import ListClustersRequest -from google.cloud.dataproc_v1.types.clusters import ListClustersResponse -from google.cloud.dataproc_v1.types.clusters import ManagedGroupConfig -from google.cloud.dataproc_v1.types.clusters import MetastoreConfig -from google.cloud.dataproc_v1.types.clusters import NodeGroup -from google.cloud.dataproc_v1.types.clusters import NodeGroupAffinity -from google.cloud.dataproc_v1.types.clusters import NodeInitializationAction -from google.cloud.dataproc_v1.types.clusters import ReservationAffinity -from google.cloud.dataproc_v1.types.clusters import SecurityConfig -from google.cloud.dataproc_v1.types.clusters import ShieldedInstanceConfig -from google.cloud.dataproc_v1.types.clusters import SoftwareConfig -from google.cloud.dataproc_v1.types.clusters import StartClusterRequest -from google.cloud.dataproc_v1.types.clusters import StopClusterRequest -from google.cloud.dataproc_v1.types.clusters import UpdateClusterRequest -from google.cloud.dataproc_v1.types.clusters import VirtualClusterConfig -from google.cloud.dataproc_v1.types.jobs import CancelJobRequest -from google.cloud.dataproc_v1.types.jobs import DeleteJobRequest -from google.cloud.dataproc_v1.types.jobs import DriverSchedulingConfig -from google.cloud.dataproc_v1.types.jobs import GetJobRequest -from google.cloud.dataproc_v1.types.jobs import HadoopJob -from google.cloud.dataproc_v1.types.jobs import HiveJob -from google.cloud.dataproc_v1.types.jobs import Job -from google.cloud.dataproc_v1.types.jobs import JobMetadata -from google.cloud.dataproc_v1.types.jobs import JobPlacement -from google.cloud.dataproc_v1.types.jobs import JobReference -from google.cloud.dataproc_v1.types.jobs import JobScheduling -from google.cloud.dataproc_v1.types.jobs import JobStatus -from google.cloud.dataproc_v1.types.jobs import ListJobsRequest -from google.cloud.dataproc_v1.types.jobs import ListJobsResponse -from google.cloud.dataproc_v1.types.jobs import LoggingConfig -from google.cloud.dataproc_v1.types.jobs import PigJob -from google.cloud.dataproc_v1.types.jobs import PrestoJob -from google.cloud.dataproc_v1.types.jobs import PySparkJob -from google.cloud.dataproc_v1.types.jobs import QueryList -from google.cloud.dataproc_v1.types.jobs import SparkJob -from google.cloud.dataproc_v1.types.jobs import SparkRJob -from google.cloud.dataproc_v1.types.jobs import SparkSqlJob -from google.cloud.dataproc_v1.types.jobs import SubmitJobRequest -from google.cloud.dataproc_v1.types.jobs import TrinoJob -from google.cloud.dataproc_v1.types.jobs import UpdateJobRequest -from google.cloud.dataproc_v1.types.jobs import YarnApplication -from google.cloud.dataproc_v1.types.node_groups import CreateNodeGroupRequest -from google.cloud.dataproc_v1.types.node_groups import GetNodeGroupRequest -from google.cloud.dataproc_v1.types.node_groups import ResizeNodeGroupRequest -from google.cloud.dataproc_v1.types.operations import BatchOperationMetadata -from google.cloud.dataproc_v1.types.operations import ClusterOperationMetadata -from google.cloud.dataproc_v1.types.operations import ClusterOperationStatus -from google.cloud.dataproc_v1.types.operations import NodeGroupOperationMetadata -from google.cloud.dataproc_v1.types.shared import EnvironmentConfig -from google.cloud.dataproc_v1.types.shared import ExecutionConfig -from google.cloud.dataproc_v1.types.shared import GkeClusterConfig -from google.cloud.dataproc_v1.types.shared import GkeNodePoolConfig -from google.cloud.dataproc_v1.types.shared import GkeNodePoolTarget -from google.cloud.dataproc_v1.types.shared import KubernetesClusterConfig -from google.cloud.dataproc_v1.types.shared import KubernetesSoftwareConfig -from google.cloud.dataproc_v1.types.shared import PeripheralsConfig -from google.cloud.dataproc_v1.types.shared import RuntimeConfig -from google.cloud.dataproc_v1.types.shared import RuntimeInfo -from google.cloud.dataproc_v1.types.shared import SparkHistoryServerConfig -from google.cloud.dataproc_v1.types.shared import UsageMetrics -from google.cloud.dataproc_v1.types.shared import UsageSnapshot -from google.cloud.dataproc_v1.types.shared import Component -from google.cloud.dataproc_v1.types.shared import FailureAction -from google.cloud.dataproc_v1.types.workflow_templates import ClusterOperation -from google.cloud.dataproc_v1.types.workflow_templates import ClusterSelector -from google.cloud.dataproc_v1.types.workflow_templates import ( - CreateWorkflowTemplateRequest, +from google.cloud.dataproc_v1.types.batches import ( + Batch, + CreateBatchRequest, + DeleteBatchRequest, + GetBatchRequest, + ListBatchesRequest, + ListBatchesResponse, + PySparkBatch, + SparkBatch, + SparkRBatch, + SparkSqlBatch, ) -from google.cloud.dataproc_v1.types.workflow_templates import ( - DeleteWorkflowTemplateRequest, +from google.cloud.dataproc_v1.types.clusters import ( + AcceleratorConfig, + AutoscalingConfig, + AuxiliaryNodeGroup, + AuxiliaryServicesConfig, + Cluster, + ClusterConfig, + ClusterMetrics, + ClusterStatus, + ConfidentialInstanceConfig, + CreateClusterRequest, + DataprocMetricConfig, + DeleteClusterRequest, + DiagnoseClusterRequest, + DiagnoseClusterResults, + DiskConfig, + EncryptionConfig, + EndpointConfig, + GceClusterConfig, + GetClusterRequest, + IdentityConfig, + InstanceFlexibilityPolicy, + InstanceGroupConfig, + InstanceReference, + KerberosConfig, + LifecycleConfig, + ListClustersRequest, + ListClustersResponse, + ManagedGroupConfig, + MetastoreConfig, + NodeGroup, + NodeGroupAffinity, + NodeInitializationAction, + ReservationAffinity, + SecurityConfig, + ShieldedInstanceConfig, + SoftwareConfig, + StartClusterRequest, + StopClusterRequest, + UpdateClusterRequest, + VirtualClusterConfig, ) -from google.cloud.dataproc_v1.types.workflow_templates import GetWorkflowTemplateRequest -from google.cloud.dataproc_v1.types.workflow_templates import ( - InstantiateInlineWorkflowTemplateRequest, +from google.cloud.dataproc_v1.types.jobs import ( + CancelJobRequest, + DeleteJobRequest, + DriverSchedulingConfig, + GetJobRequest, + HadoopJob, + HiveJob, + Job, + JobMetadata, + JobPlacement, + JobReference, + JobScheduling, + JobStatus, + ListJobsRequest, + ListJobsResponse, + LoggingConfig, + PigJob, + PrestoJob, + PySparkJob, + QueryList, + SparkJob, + SparkRJob, + SparkSqlJob, + SubmitJobRequest, + TrinoJob, + UpdateJobRequest, + YarnApplication, ) -from google.cloud.dataproc_v1.types.workflow_templates import ( - InstantiateWorkflowTemplateRequest, +from google.cloud.dataproc_v1.types.node_groups import ( + CreateNodeGroupRequest, + GetNodeGroupRequest, + ResizeNodeGroupRequest, ) -from google.cloud.dataproc_v1.types.workflow_templates import ( - ListWorkflowTemplatesRequest, +from google.cloud.dataproc_v1.types.operations import ( + BatchOperationMetadata, + ClusterOperationMetadata, + ClusterOperationStatus, + NodeGroupOperationMetadata, ) -from google.cloud.dataproc_v1.types.workflow_templates import ( - ListWorkflowTemplatesResponse, +from google.cloud.dataproc_v1.types.shared import ( + Component, + EnvironmentConfig, + ExecutionConfig, + FailureAction, + GkeClusterConfig, + GkeNodePoolConfig, + GkeNodePoolTarget, + KubernetesClusterConfig, + KubernetesSoftwareConfig, + PeripheralsConfig, + RuntimeConfig, + RuntimeInfo, + SparkHistoryServerConfig, + UsageMetrics, + UsageSnapshot, ) -from google.cloud.dataproc_v1.types.workflow_templates import ManagedCluster -from google.cloud.dataproc_v1.types.workflow_templates import OrderedJob -from google.cloud.dataproc_v1.types.workflow_templates import ParameterValidation -from google.cloud.dataproc_v1.types.workflow_templates import RegexValidation -from google.cloud.dataproc_v1.types.workflow_templates import TemplateParameter from google.cloud.dataproc_v1.types.workflow_templates import ( + ClusterOperation, + ClusterSelector, + CreateWorkflowTemplateRequest, + DeleteWorkflowTemplateRequest, + GetWorkflowTemplateRequest, + InstantiateInlineWorkflowTemplateRequest, + InstantiateWorkflowTemplateRequest, + ListWorkflowTemplatesRequest, + ListWorkflowTemplatesResponse, + ManagedCluster, + OrderedJob, + ParameterValidation, + RegexValidation, + TemplateParameter, UpdateWorkflowTemplateRequest, + ValueValidation, + WorkflowGraph, + WorkflowMetadata, + WorkflowNode, + WorkflowTemplate, + WorkflowTemplatePlacement, ) -from google.cloud.dataproc_v1.types.workflow_templates import ValueValidation -from google.cloud.dataproc_v1.types.workflow_templates import WorkflowGraph -from google.cloud.dataproc_v1.types.workflow_templates import WorkflowMetadata -from google.cloud.dataproc_v1.types.workflow_templates import WorkflowNode -from google.cloud.dataproc_v1.types.workflow_templates import WorkflowTemplate -from google.cloud.dataproc_v1.types.workflow_templates import WorkflowTemplatePlacement __all__ = ( "AutoscalingPolicyServiceClient", diff --git a/google/cloud/dataproc_v1/__init__.py b/google/cloud/dataproc_v1/__init__.py index b967fef5..1325e8c4 100644 --- a/google/cloud/dataproc_v1/__init__.py +++ b/google/cloud/dataproc_v1/__init__.py @@ -18,148 +18,169 @@ __version__ = package_version.__version__ -from .services.autoscaling_policy_service import AutoscalingPolicyServiceClient -from .services.autoscaling_policy_service import AutoscalingPolicyServiceAsyncClient -from .services.batch_controller import BatchControllerClient -from .services.batch_controller import BatchControllerAsyncClient -from .services.cluster_controller import ClusterControllerClient -from .services.cluster_controller import ClusterControllerAsyncClient -from .services.job_controller import JobControllerClient -from .services.job_controller import JobControllerAsyncClient -from .services.node_group_controller import NodeGroupControllerClient -from .services.node_group_controller import NodeGroupControllerAsyncClient -from .services.workflow_template_service import WorkflowTemplateServiceClient -from .services.workflow_template_service import WorkflowTemplateServiceAsyncClient - -from .types.autoscaling_policies import AutoscalingPolicy -from .types.autoscaling_policies import BasicAutoscalingAlgorithm -from .types.autoscaling_policies import BasicYarnAutoscalingConfig -from .types.autoscaling_policies import CreateAutoscalingPolicyRequest -from .types.autoscaling_policies import DeleteAutoscalingPolicyRequest -from .types.autoscaling_policies import GetAutoscalingPolicyRequest -from .types.autoscaling_policies import InstanceGroupAutoscalingPolicyConfig -from .types.autoscaling_policies import ListAutoscalingPoliciesRequest -from .types.autoscaling_policies import ListAutoscalingPoliciesResponse -from .types.autoscaling_policies import UpdateAutoscalingPolicyRequest -from .types.batches import Batch -from .types.batches import CreateBatchRequest -from .types.batches import DeleteBatchRequest -from .types.batches import GetBatchRequest -from .types.batches import ListBatchesRequest -from .types.batches import ListBatchesResponse -from .types.batches import PySparkBatch -from .types.batches import SparkBatch -from .types.batches import SparkRBatch -from .types.batches import SparkSqlBatch -from .types.clusters import AcceleratorConfig -from .types.clusters import AutoscalingConfig -from .types.clusters import AuxiliaryNodeGroup -from .types.clusters import AuxiliaryServicesConfig -from .types.clusters import Cluster -from .types.clusters import ClusterConfig -from .types.clusters import ClusterMetrics -from .types.clusters import ClusterStatus -from .types.clusters import ConfidentialInstanceConfig -from .types.clusters import CreateClusterRequest -from .types.clusters import DataprocMetricConfig -from .types.clusters import DeleteClusterRequest -from .types.clusters import DiagnoseClusterRequest -from .types.clusters import DiagnoseClusterResults -from .types.clusters import DiskConfig -from .types.clusters import EncryptionConfig -from .types.clusters import EndpointConfig -from .types.clusters import GceClusterConfig -from .types.clusters import GetClusterRequest -from .types.clusters import IdentityConfig -from .types.clusters import InstanceFlexibilityPolicy -from .types.clusters import InstanceGroupConfig -from .types.clusters import InstanceReference -from .types.clusters import KerberosConfig -from .types.clusters import LifecycleConfig -from .types.clusters import ListClustersRequest -from .types.clusters import ListClustersResponse -from .types.clusters import ManagedGroupConfig -from .types.clusters import MetastoreConfig -from .types.clusters import NodeGroup -from .types.clusters import NodeGroupAffinity -from .types.clusters import NodeInitializationAction -from .types.clusters import ReservationAffinity -from .types.clusters import SecurityConfig -from .types.clusters import ShieldedInstanceConfig -from .types.clusters import SoftwareConfig -from .types.clusters import StartClusterRequest -from .types.clusters import StopClusterRequest -from .types.clusters import UpdateClusterRequest -from .types.clusters import VirtualClusterConfig -from .types.jobs import CancelJobRequest -from .types.jobs import DeleteJobRequest -from .types.jobs import DriverSchedulingConfig -from .types.jobs import GetJobRequest -from .types.jobs import HadoopJob -from .types.jobs import HiveJob -from .types.jobs import Job -from .types.jobs import JobMetadata -from .types.jobs import JobPlacement -from .types.jobs import JobReference -from .types.jobs import JobScheduling -from .types.jobs import JobStatus -from .types.jobs import ListJobsRequest -from .types.jobs import ListJobsResponse -from .types.jobs import LoggingConfig -from .types.jobs import PigJob -from .types.jobs import PrestoJob -from .types.jobs import PySparkJob -from .types.jobs import QueryList -from .types.jobs import SparkJob -from .types.jobs import SparkRJob -from .types.jobs import SparkSqlJob -from .types.jobs import SubmitJobRequest -from .types.jobs import TrinoJob -from .types.jobs import UpdateJobRequest -from .types.jobs import YarnApplication -from .types.node_groups import CreateNodeGroupRequest -from .types.node_groups import GetNodeGroupRequest -from .types.node_groups import ResizeNodeGroupRequest -from .types.operations import BatchOperationMetadata -from .types.operations import ClusterOperationMetadata -from .types.operations import ClusterOperationStatus -from .types.operations import NodeGroupOperationMetadata -from .types.shared import EnvironmentConfig -from .types.shared import ExecutionConfig -from .types.shared import GkeClusterConfig -from .types.shared import GkeNodePoolConfig -from .types.shared import GkeNodePoolTarget -from .types.shared import KubernetesClusterConfig -from .types.shared import KubernetesSoftwareConfig -from .types.shared import PeripheralsConfig -from .types.shared import RuntimeConfig -from .types.shared import RuntimeInfo -from .types.shared import SparkHistoryServerConfig -from .types.shared import UsageMetrics -from .types.shared import UsageSnapshot -from .types.shared import Component -from .types.shared import FailureAction -from .types.workflow_templates import ClusterOperation -from .types.workflow_templates import ClusterSelector -from .types.workflow_templates import CreateWorkflowTemplateRequest -from .types.workflow_templates import DeleteWorkflowTemplateRequest -from .types.workflow_templates import GetWorkflowTemplateRequest -from .types.workflow_templates import InstantiateInlineWorkflowTemplateRequest -from .types.workflow_templates import InstantiateWorkflowTemplateRequest -from .types.workflow_templates import ListWorkflowTemplatesRequest -from .types.workflow_templates import ListWorkflowTemplatesResponse -from .types.workflow_templates import ManagedCluster -from .types.workflow_templates import OrderedJob -from .types.workflow_templates import ParameterValidation -from .types.workflow_templates import RegexValidation -from .types.workflow_templates import TemplateParameter -from .types.workflow_templates import UpdateWorkflowTemplateRequest -from .types.workflow_templates import ValueValidation -from .types.workflow_templates import WorkflowGraph -from .types.workflow_templates import WorkflowMetadata -from .types.workflow_templates import WorkflowNode -from .types.workflow_templates import WorkflowTemplate -from .types.workflow_templates import WorkflowTemplatePlacement +from .services.autoscaling_policy_service import ( + AutoscalingPolicyServiceAsyncClient, + AutoscalingPolicyServiceClient, +) +from .services.batch_controller import BatchControllerAsyncClient, BatchControllerClient +from .services.cluster_controller import ( + ClusterControllerAsyncClient, + ClusterControllerClient, +) +from .services.job_controller import JobControllerAsyncClient, JobControllerClient +from .services.node_group_controller import ( + NodeGroupControllerAsyncClient, + NodeGroupControllerClient, +) +from .services.workflow_template_service import ( + WorkflowTemplateServiceAsyncClient, + WorkflowTemplateServiceClient, +) +from .types.autoscaling_policies import ( + AutoscalingPolicy, + BasicAutoscalingAlgorithm, + BasicYarnAutoscalingConfig, + CreateAutoscalingPolicyRequest, + DeleteAutoscalingPolicyRequest, + GetAutoscalingPolicyRequest, + InstanceGroupAutoscalingPolicyConfig, + ListAutoscalingPoliciesRequest, + ListAutoscalingPoliciesResponse, + UpdateAutoscalingPolicyRequest, +) +from .types.batches import ( + Batch, + CreateBatchRequest, + DeleteBatchRequest, + GetBatchRequest, + ListBatchesRequest, + ListBatchesResponse, + PySparkBatch, + SparkBatch, + SparkRBatch, + SparkSqlBatch, +) +from .types.clusters import ( + AcceleratorConfig, + AutoscalingConfig, + AuxiliaryNodeGroup, + AuxiliaryServicesConfig, + Cluster, + ClusterConfig, + ClusterMetrics, + ClusterStatus, + ConfidentialInstanceConfig, + CreateClusterRequest, + DataprocMetricConfig, + DeleteClusterRequest, + DiagnoseClusterRequest, + DiagnoseClusterResults, + DiskConfig, + EncryptionConfig, + EndpointConfig, + GceClusterConfig, + GetClusterRequest, + IdentityConfig, + InstanceFlexibilityPolicy, + InstanceGroupConfig, + InstanceReference, + KerberosConfig, + LifecycleConfig, + ListClustersRequest, + ListClustersResponse, + ManagedGroupConfig, + MetastoreConfig, + NodeGroup, + NodeGroupAffinity, + NodeInitializationAction, + ReservationAffinity, + SecurityConfig, + ShieldedInstanceConfig, + SoftwareConfig, + StartClusterRequest, + StopClusterRequest, + UpdateClusterRequest, + VirtualClusterConfig, +) +from .types.jobs import ( + CancelJobRequest, + DeleteJobRequest, + DriverSchedulingConfig, + GetJobRequest, + HadoopJob, + HiveJob, + Job, + JobMetadata, + JobPlacement, + JobReference, + JobScheduling, + JobStatus, + ListJobsRequest, + ListJobsResponse, + LoggingConfig, + PigJob, + PrestoJob, + PySparkJob, + QueryList, + SparkJob, + SparkRJob, + SparkSqlJob, + SubmitJobRequest, + TrinoJob, + UpdateJobRequest, + YarnApplication, +) +from .types.node_groups import ( + CreateNodeGroupRequest, + GetNodeGroupRequest, + ResizeNodeGroupRequest, +) +from .types.operations import ( + BatchOperationMetadata, + ClusterOperationMetadata, + ClusterOperationStatus, + NodeGroupOperationMetadata, +) +from .types.shared import ( + Component, + EnvironmentConfig, + ExecutionConfig, + FailureAction, + GkeClusterConfig, + GkeNodePoolConfig, + GkeNodePoolTarget, + KubernetesClusterConfig, + KubernetesSoftwareConfig, + PeripheralsConfig, + RuntimeConfig, + RuntimeInfo, + SparkHistoryServerConfig, + UsageMetrics, + UsageSnapshot, +) +from .types.workflow_templates import ( + ClusterOperation, + ClusterSelector, + CreateWorkflowTemplateRequest, + DeleteWorkflowTemplateRequest, + GetWorkflowTemplateRequest, + InstantiateInlineWorkflowTemplateRequest, + InstantiateWorkflowTemplateRequest, + ListWorkflowTemplatesRequest, + ListWorkflowTemplatesResponse, + ManagedCluster, + OrderedJob, + ParameterValidation, + RegexValidation, + TemplateParameter, + UpdateWorkflowTemplateRequest, + ValueValidation, + WorkflowGraph, + WorkflowMetadata, + WorkflowNode, + WorkflowTemplate, + WorkflowTemplatePlacement, +) __all__ = ( "AutoscalingPolicyServiceAsyncClient", diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/__init__.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/__init__.py index 1f4f621c..a7165bce 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/__init__.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import AutoscalingPolicyServiceClient from .async_client import AutoscalingPolicyServiceAsyncClient +from .client import AutoscalingPolicyServiceClient __all__ = ( "AutoscalingPolicyServiceClient", diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py index 4dbd99ca..15be0812 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py @@ -28,28 +28,30 @@ Union, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - -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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers -from google.cloud.dataproc_v1.types import autoscaling_policies from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 -from .transports.base import AutoscalingPolicyServiceTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import AutoscalingPolicyServiceGrpcAsyncIOTransport + +from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers +from google.cloud.dataproc_v1.types import autoscaling_policies + from .client import AutoscalingPolicyServiceClient +from .transports.base import DEFAULT_CLIENT_INFO, AutoscalingPolicyServiceTransport +from .transports.grpc_asyncio import AutoscalingPolicyServiceGrpcAsyncIOTransport class AutoscalingPolicyServiceAsyncClient: diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py index 245bfe61..3ce0249f 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py @@ -29,29 +29,31 @@ cast, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - 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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers -from google.cloud.dataproc_v1.types import autoscaling_policies from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 -from .transports.base import AutoscalingPolicyServiceTransport, DEFAULT_CLIENT_INFO + +from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers +from google.cloud.dataproc_v1.types import autoscaling_policies + +from .transports.base import DEFAULT_CLIENT_INFO, AutoscalingPolicyServiceTransport from .transports.grpc import AutoscalingPolicyServiceGrpcTransport from .transports.grpc_asyncio import AutoscalingPolicyServiceGrpcAsyncIOTransport from .transports.rest import AutoscalingPolicyServiceRestTransport diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py index d640c35c..4678c17b 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/pagers.py @@ -18,10 +18,10 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py index e5a7520c..616399c6 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/__init__.py @@ -19,9 +19,10 @@ from .base import AutoscalingPolicyServiceTransport from .grpc import AutoscalingPolicyServiceGrpcTransport from .grpc_asyncio import AutoscalingPolicyServiceGrpcAsyncIOTransport -from .rest import AutoscalingPolicyServiceRestTransport -from .rest import AutoscalingPolicyServiceRestInterceptor - +from .rest import ( + AutoscalingPolicyServiceRestInterceptor, + AutoscalingPolicyServiceRestTransport, +) # Compile a registry of transports. _transport_registry = ( diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py index d64bd012..0b493c3f 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py @@ -16,22 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.cloud.dataproc_v1 import gapic_version as package_version - -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.dataproc_v1.types import autoscaling_policies from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 +from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore +from google.cloud.dataproc_v1 import gapic_version as package_version +from google.cloud.dataproc_v1.types import autoscaling_policies + DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ ) diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py index f392dbff..f27fb7cb 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py @@ -13,23 +13,22 @@ # 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.dataproc_v1.types import autoscaling_policies from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.protobuf import empty_pb2 # type: ignore -from .base import AutoscalingPolicyServiceTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore + +from google.cloud.dataproc_v1.types import autoscaling_policies + +from .base import DEFAULT_CLIENT_INFO, AutoscalingPolicyServiceTransport class AutoscalingPolicyServiceGrpcTransport(AutoscalingPolicyServiceTransport): diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py index 8a6c8b1c..43835fe1 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py @@ -13,23 +13,22 @@ # 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.dataproc_v1.types import autoscaling_policies from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.protobuf import empty_pb2 # type: ignore -from .base import AutoscalingPolicyServiceTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore +from grpc.experimental import aio # type: ignore + +from google.cloud.dataproc_v1.types import autoscaling_policies + +from .base import DEFAULT_CLIENT_INFO, AutoscalingPolicyServiceTransport from .grpc import AutoscalingPolicyServiceGrpcTransport diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py index 71877942..c8e73f4b 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py @@ -14,27 +14,24 @@ # limitations under the License. # -from google.auth.transport.requests import AuthorizedSession # type: ignore +import dataclasses import json # type: ignore -import grpc # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.auth import credentials as ga_credentials # type: ignore +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import gapic_v1, path_template, rest_helpers, rest_streaming from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.api_core import rest_helpers -from google.api_core import rest_streaming -from google.api_core import path_template -from google.api_core import gapic_v1 - -from google.protobuf import json_format +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 +from google.protobuf import json_format +import grpc # type: ignore from requests import __version__ as requests_version -import dataclasses -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -42,14 +39,12 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.types import autoscaling_policies from google.protobuf import empty_pb2 # type: ignore -from .base import ( - AutoscalingPolicyServiceTransport, - DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO, -) +from google.cloud.dataproc_v1.types import autoscaling_policies +from .base import AutoscalingPolicyServiceTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, diff --git a/google/cloud/dataproc_v1/services/batch_controller/__init__.py b/google/cloud/dataproc_v1/services/batch_controller/__init__.py index 6f9abe10..4eb32a03 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/__init__.py +++ b/google/cloud/dataproc_v1/services/batch_controller/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import BatchControllerClient from .async_client import BatchControllerAsyncClient +from .client import BatchControllerClient __all__ = ( "BatchControllerClient", diff --git a/google/cloud/dataproc_v1/services/batch_controller/async_client.py b/google/cloud/dataproc_v1/services/batch_controller/async_client.py index ffb22834..ce2567d7 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/batch_controller/async_client.py @@ -28,15 +28,15 @@ Union, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - -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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -44,17 +44,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.batch_controller import pagers -from google.cloud.dataproc_v1.types import batches -from google.cloud.dataproc_v1.types import operations -from google.cloud.dataproc_v1.types import shared from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import BatchControllerTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import BatchControllerGrpcAsyncIOTransport + +from google.cloud.dataproc_v1.services.batch_controller import pagers +from google.cloud.dataproc_v1.types import batches, operations, shared + from .client import BatchControllerClient +from .transports.base import DEFAULT_CLIENT_INFO, BatchControllerTransport +from .transports.grpc_asyncio import BatchControllerGrpcAsyncIOTransport class BatchControllerAsyncClient: diff --git a/google/cloud/dataproc_v1/services/batch_controller/client.py b/google/cloud/dataproc_v1/services/batch_controller/client.py index 3604585b..c27f7bc2 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/client.py +++ b/google/cloud/dataproc_v1/services/batch_controller/client.py @@ -29,18 +29,18 @@ cast, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - 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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -48,15 +48,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.batch_controller import pagers -from google.cloud.dataproc_v1.types import batches -from google.cloud.dataproc_v1.types import operations -from google.cloud.dataproc_v1.types import shared from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.protobuf import timestamp_pb2 # type: ignore -from .transports.base import BatchControllerTransport, DEFAULT_CLIENT_INFO + +from google.cloud.dataproc_v1.services.batch_controller import pagers +from google.cloud.dataproc_v1.types import batches, operations, shared + +from .transports.base import DEFAULT_CLIENT_INFO, BatchControllerTransport from .transports.grpc import BatchControllerGrpcTransport from .transports.grpc_asyncio import BatchControllerGrpcAsyncIOTransport from .transports.rest import BatchControllerRestTransport diff --git a/google/cloud/dataproc_v1/services/batch_controller/pagers.py b/google/cloud/dataproc_v1/services/batch_controller/pagers.py index 30edda2c..f563fc9e 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/pagers.py +++ b/google/cloud/dataproc_v1/services/batch_controller/pagers.py @@ -18,10 +18,10 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) from google.cloud.dataproc_v1.types import batches diff --git a/google/cloud/dataproc_v1/services/batch_controller/transports/__init__.py b/google/cloud/dataproc_v1/services/batch_controller/transports/__init__.py index 09b746b5..b9598f2c 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/transports/__init__.py +++ b/google/cloud/dataproc_v1/services/batch_controller/transports/__init__.py @@ -19,9 +19,7 @@ from .base import BatchControllerTransport from .grpc import BatchControllerGrpcTransport from .grpc_asyncio import BatchControllerGrpcAsyncIOTransport -from .rest import BatchControllerRestTransport -from .rest import BatchControllerRestInterceptor - +from .rest import BatchControllerRestInterceptor, BatchControllerRestTransport # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[BatchControllerTransport]] diff --git a/google/cloud/dataproc_v1/services/batch_controller/transports/base.py b/google/cloud/dataproc_v1/services/batch_controller/transports/base.py index 8ca3a6b4..3140199c 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/transports/base.py +++ b/google/cloud/dataproc_v1/services/batch_controller/transports/base.py @@ -16,24 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.cloud.dataproc_v1 import gapic_version as package_version - -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.oauth2 import service_account # type: ignore - -from google.cloud.dataproc_v1.types import batches from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore +from google.cloud.dataproc_v1 import gapic_version as package_version +from google.cloud.dataproc_v1.types import batches + DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ ) diff --git a/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py b/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py index fd41dee0..3cc3ed17 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/batch_controller/transports/grpc.py @@ -13,25 +13,22 @@ # 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 - -import grpc # type: ignore - -from google.cloud.dataproc_v1.types import batches from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import BatchControllerTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore + +from google.cloud.dataproc_v1.types import batches + +from .base import DEFAULT_CLIENT_INFO, BatchControllerTransport class BatchControllerGrpcTransport(BatchControllerTransport): diff --git a/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py index ce8386ab..3fed41d8 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/batch_controller/transports/grpc_asyncio.py @@ -13,25 +13,22 @@ # 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 - -import grpc # type: ignore -from grpc.experimental import aio # type: ignore - -from google.cloud.dataproc_v1.types import batches from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import BatchControllerTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore +from grpc.experimental import aio # type: ignore + +from google.cloud.dataproc_v1.types import batches + +from .base import DEFAULT_CLIENT_INFO, BatchControllerTransport from .grpc import BatchControllerGrpcTransport diff --git a/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py b/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py index 5f933bb0..eb23bf0d 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py @@ -14,28 +14,30 @@ # limitations under the License. # -from google.auth.transport.requests import AuthorizedSession # type: ignore +import dataclasses import json # type: ignore -import grpc # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.auth import credentials as ga_credentials # type: ignore +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import ( + gapic_v1, + operations_v1, + path_template, + rest_helpers, + rest_streaming, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.api_core import rest_helpers -from google.api_core import rest_streaming -from google.api_core import path_template -from google.api_core import gapic_v1 - -from google.protobuf import json_format -from google.api_core import operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 +from google.protobuf import json_format +import grpc # type: ignore from requests import __version__ as requests_version -import dataclasses -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -43,15 +45,13 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.types import batches from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import ( - BatchControllerTransport, - DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO, -) +from google.cloud.dataproc_v1.types import batches +from .base import BatchControllerTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, diff --git a/google/cloud/dataproc_v1/services/cluster_controller/__init__.py b/google/cloud/dataproc_v1/services/cluster_controller/__init__.py index 5fe549df..2b6ba887 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/__init__.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import ClusterControllerClient from .async_client import ClusterControllerAsyncClient +from .client import ClusterControllerClient __all__ = ( "ClusterControllerClient", diff --git a/google/cloud/dataproc_v1/services/cluster_controller/async_client.py b/google/cloud/dataproc_v1/services/cluster_controller/async_client.py index 560fc6b1..0bafc060 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/async_client.py @@ -28,15 +28,15 @@ Union, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - -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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -44,17 +44,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.cluster_controller import pagers -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import operations from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore -from .transports.base import ClusterControllerTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import ClusterControllerGrpcAsyncIOTransport + +from google.cloud.dataproc_v1.services.cluster_controller import pagers +from google.cloud.dataproc_v1.types import clusters, operations + from .client import ClusterControllerClient +from .transports.base import DEFAULT_CLIENT_INFO, ClusterControllerTransport +from .transports.grpc_asyncio import ClusterControllerGrpcAsyncIOTransport class ClusterControllerAsyncClient: diff --git a/google/cloud/dataproc_v1/services/cluster_controller/client.py b/google/cloud/dataproc_v1/services/cluster_controller/client.py index 3268c2e8..13703389 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/client.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/client.py @@ -29,18 +29,18 @@ cast, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - 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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -48,15 +48,16 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.cluster_controller import pagers -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import operations from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore -from .transports.base import ClusterControllerTransport, DEFAULT_CLIENT_INFO + +from google.cloud.dataproc_v1.services.cluster_controller import pagers +from google.cloud.dataproc_v1.types import clusters, operations + +from .transports.base import DEFAULT_CLIENT_INFO, ClusterControllerTransport from .transports.grpc import ClusterControllerGrpcTransport from .transports.grpc_asyncio import ClusterControllerGrpcAsyncIOTransport from .transports.rest import ClusterControllerRestTransport diff --git a/google/cloud/dataproc_v1/services/cluster_controller/pagers.py b/google/cloud/dataproc_v1/services/cluster_controller/pagers.py index 1156bc63..018029c7 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/pagers.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/pagers.py @@ -18,10 +18,10 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) from google.cloud.dataproc_v1.types import clusters diff --git a/google/cloud/dataproc_v1/services/cluster_controller/transports/__init__.py b/google/cloud/dataproc_v1/services/cluster_controller/transports/__init__.py index e1c0a0c2..33bd31ad 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/transports/__init__.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/transports/__init__.py @@ -19,9 +19,7 @@ from .base import ClusterControllerTransport from .grpc import ClusterControllerGrpcTransport from .grpc_asyncio import ClusterControllerGrpcAsyncIOTransport -from .rest import ClusterControllerRestTransport -from .rest import ClusterControllerRestInterceptor - +from .rest import ClusterControllerRestInterceptor, ClusterControllerRestTransport # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ClusterControllerTransport]] diff --git a/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py b/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py index 811feeaf..a3edb089 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/transports/base.py @@ -16,22 +16,19 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.cloud.dataproc_v1 import gapic_version as package_version - -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.oauth2 import service_account # type: ignore - -from google.cloud.dataproc_v1.types import clusters from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account # type: ignore + +from google.cloud.dataproc_v1 import gapic_version as package_version +from google.cloud.dataproc_v1.types import clusters DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py b/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py index f1f59e3e..3337f8fb 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc.py @@ -13,24 +13,21 @@ # 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 - -import grpc # type: ignore - -from google.cloud.dataproc_v1.types import clusters from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore -from .base import ClusterControllerTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore + +from google.cloud.dataproc_v1.types import clusters + +from .base import DEFAULT_CLIENT_INFO, ClusterControllerTransport class ClusterControllerGrpcTransport(ClusterControllerTransport): diff --git a/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py index a06dd64a..b2fda9a2 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/transports/grpc_asyncio.py @@ -13,24 +13,21 @@ # 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.iam.v1 import iam_policy_pb2 # type: ignore +from google.iam.v1 import policy_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore import grpc # type: ignore from grpc.experimental import aio # type: ignore from google.cloud.dataproc_v1.types import clusters -from google.iam.v1 import iam_policy_pb2 # type: ignore -from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from .base import ClusterControllerTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, ClusterControllerTransport from .grpc import ClusterControllerGrpcTransport diff --git a/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py b/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py index 4ad65c82..1201cb6a 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py @@ -14,28 +14,30 @@ # limitations under the License. # -from google.auth.transport.requests import AuthorizedSession # type: ignore +import dataclasses import json # type: ignore -import grpc # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.auth import credentials as ga_credentials # type: ignore +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import ( + gapic_v1, + operations_v1, + path_template, + rest_helpers, + rest_streaming, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.api_core import rest_helpers -from google.api_core import rest_streaming -from google.api_core import path_template -from google.api_core import gapic_v1 - -from google.protobuf import json_format -from google.api_core import operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 +from google.protobuf import json_format +import grpc # type: ignore from requests import __version__ as requests_version -import dataclasses -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -43,14 +45,12 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.types import clusters from google.longrunning import operations_pb2 # type: ignore -from .base import ( - ClusterControllerTransport, - DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO, -) +from google.cloud.dataproc_v1.types import clusters +from .base import ClusterControllerTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, diff --git a/google/cloud/dataproc_v1/services/job_controller/__init__.py b/google/cloud/dataproc_v1/services/job_controller/__init__.py index 94baa60b..a7fd34f4 100644 --- a/google/cloud/dataproc_v1/services/job_controller/__init__.py +++ b/google/cloud/dataproc_v1/services/job_controller/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import JobControllerClient from .async_client import JobControllerAsyncClient +from .client import JobControllerClient __all__ = ( "JobControllerClient", diff --git a/google/cloud/dataproc_v1/services/job_controller/async_client.py b/google/cloud/dataproc_v1/services/job_controller/async_client.py index 528e89df..70e1d910 100644 --- a/google/cloud/dataproc_v1/services/job_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/job_controller/async_client.py @@ -28,15 +28,15 @@ Union, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - -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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -44,14 +44,16 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.job_controller import pagers -from google.cloud.dataproc_v1.types import jobs from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 -from .transports.base import JobControllerTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import JobControllerGrpcAsyncIOTransport + +from google.cloud.dataproc_v1.services.job_controller import pagers +from google.cloud.dataproc_v1.types import jobs + from .client import JobControllerClient +from .transports.base import DEFAULT_CLIENT_INFO, JobControllerTransport +from .transports.grpc_asyncio import JobControllerGrpcAsyncIOTransport class JobControllerAsyncClient: diff --git a/google/cloud/dataproc_v1/services/job_controller/client.py b/google/cloud/dataproc_v1/services/job_controller/client.py index ca8a88fe..35858c1b 100644 --- a/google/cloud/dataproc_v1/services/job_controller/client.py +++ b/google/cloud/dataproc_v1/services/job_controller/client.py @@ -29,18 +29,18 @@ cast, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - 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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -48,12 +48,14 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.job_controller import pagers -from google.cloud.dataproc_v1.types import jobs from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 -from .transports.base import JobControllerTransport, DEFAULT_CLIENT_INFO + +from google.cloud.dataproc_v1.services.job_controller import pagers +from google.cloud.dataproc_v1.types import jobs + +from .transports.base import DEFAULT_CLIENT_INFO, JobControllerTransport from .transports.grpc import JobControllerGrpcTransport from .transports.grpc_asyncio import JobControllerGrpcAsyncIOTransport from .transports.rest import JobControllerRestTransport diff --git a/google/cloud/dataproc_v1/services/job_controller/pagers.py b/google/cloud/dataproc_v1/services/job_controller/pagers.py index ec2caeac..64d92d93 100644 --- a/google/cloud/dataproc_v1/services/job_controller/pagers.py +++ b/google/cloud/dataproc_v1/services/job_controller/pagers.py @@ -18,10 +18,10 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) from google.cloud.dataproc_v1.types import jobs diff --git a/google/cloud/dataproc_v1/services/job_controller/transports/__init__.py b/google/cloud/dataproc_v1/services/job_controller/transports/__init__.py index d8481a0c..1f4f9601 100644 --- a/google/cloud/dataproc_v1/services/job_controller/transports/__init__.py +++ b/google/cloud/dataproc_v1/services/job_controller/transports/__init__.py @@ -19,9 +19,7 @@ from .base import JobControllerTransport from .grpc import JobControllerGrpcTransport from .grpc_asyncio import JobControllerGrpcAsyncIOTransport -from .rest import JobControllerRestTransport -from .rest import JobControllerRestInterceptor - +from .rest import JobControllerRestInterceptor, JobControllerRestTransport # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[JobControllerTransport]] diff --git a/google/cloud/dataproc_v1/services/job_controller/transports/base.py b/google/cloud/dataproc_v1/services/job_controller/transports/base.py index ace719e3..e3835800 100644 --- a/google/cloud/dataproc_v1/services/job_controller/transports/base.py +++ b/google/cloud/dataproc_v1/services/job_controller/transports/base.py @@ -16,24 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.cloud.dataproc_v1 import gapic_version as package_version - -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.oauth2 import service_account # type: ignore - -from google.cloud.dataproc_v1.types import jobs from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore +from google.cloud.dataproc_v1 import gapic_version as package_version +from google.cloud.dataproc_v1.types import jobs + DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ ) diff --git a/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py b/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py index 8e4d862f..06e94842 100644 --- a/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/job_controller/transports/grpc.py @@ -13,25 +13,22 @@ # 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 - -import grpc # type: ignore - -from google.cloud.dataproc_v1.types import jobs from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import JobControllerTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore + +from google.cloud.dataproc_v1.types import jobs + +from .base import DEFAULT_CLIENT_INFO, JobControllerTransport class JobControllerGrpcTransport(JobControllerTransport): diff --git a/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py index 0606e297..d9d9c66e 100644 --- a/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/job_controller/transports/grpc_asyncio.py @@ -13,25 +13,22 @@ # 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 - -import grpc # type: ignore -from grpc.experimental import aio # type: ignore - -from google.cloud.dataproc_v1.types import jobs from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import JobControllerTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore +from grpc.experimental import aio # type: ignore + +from google.cloud.dataproc_v1.types import jobs + +from .base import DEFAULT_CLIENT_INFO, JobControllerTransport from .grpc import JobControllerGrpcTransport diff --git a/google/cloud/dataproc_v1/services/job_controller/transports/rest.py b/google/cloud/dataproc_v1/services/job_controller/transports/rest.py index f651ec7c..54708b29 100644 --- a/google/cloud/dataproc_v1/services/job_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/job_controller/transports/rest.py @@ -14,28 +14,30 @@ # limitations under the License. # -from google.auth.transport.requests import AuthorizedSession # type: ignore +import dataclasses import json # type: ignore -import grpc # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.auth import credentials as ga_credentials # type: ignore +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import ( + gapic_v1, + operations_v1, + path_template, + rest_helpers, + rest_streaming, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.api_core import rest_helpers -from google.api_core import rest_streaming -from google.api_core import path_template -from google.api_core import gapic_v1 - -from google.protobuf import json_format -from google.api_core import operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 +from google.protobuf import json_format +import grpc # type: ignore from requests import __version__ as requests_version -import dataclasses -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -43,15 +45,13 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.types import jobs from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import ( - JobControllerTransport, - DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO, -) +from google.cloud.dataproc_v1.types import jobs +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO +from .base import JobControllerTransport DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, diff --git a/google/cloud/dataproc_v1/services/node_group_controller/__init__.py b/google/cloud/dataproc_v1/services/node_group_controller/__init__.py index 1f8fadb9..2e2d69d0 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/__init__.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import NodeGroupControllerClient from .async_client import NodeGroupControllerAsyncClient +from .client import NodeGroupControllerClient __all__ = ( "NodeGroupControllerClient", diff --git a/google/cloud/dataproc_v1/services/node_group_controller/async_client.py b/google/cloud/dataproc_v1/services/node_group_controller/async_client.py index 5f39347b..32a28328 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/async_client.py @@ -28,15 +28,15 @@ Union, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - -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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -44,15 +44,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import node_groups -from google.cloud.dataproc_v1.types import operations from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 -from .transports.base import NodeGroupControllerTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import NodeGroupControllerGrpcAsyncIOTransport + +from google.cloud.dataproc_v1.types import clusters, node_groups, operations + from .client import NodeGroupControllerClient +from .transports.base import DEFAULT_CLIENT_INFO, NodeGroupControllerTransport +from .transports.grpc_asyncio import NodeGroupControllerGrpcAsyncIOTransport class NodeGroupControllerAsyncClient: diff --git a/google/cloud/dataproc_v1/services/node_group_controller/client.py b/google/cloud/dataproc_v1/services/node_group_controller/client.py index 3bd85883..b36ae065 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/client.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/client.py @@ -29,18 +29,18 @@ cast, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - 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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -48,13 +48,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import node_groups -from google.cloud.dataproc_v1.types import operations from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 -from .transports.base import NodeGroupControllerTransport, DEFAULT_CLIENT_INFO + +from google.cloud.dataproc_v1.types import clusters, node_groups, operations + +from .transports.base import DEFAULT_CLIENT_INFO, NodeGroupControllerTransport from .transports.grpc import NodeGroupControllerGrpcTransport from .transports.grpc_asyncio import NodeGroupControllerGrpcAsyncIOTransport from .transports.rest import NodeGroupControllerRestTransport diff --git a/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py b/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py index 1f2f473f..bc064308 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/transports/__init__.py @@ -19,9 +19,7 @@ from .base import NodeGroupControllerTransport from .grpc import NodeGroupControllerGrpcTransport from .grpc_asyncio import NodeGroupControllerGrpcAsyncIOTransport -from .rest import NodeGroupControllerRestTransport -from .rest import NodeGroupControllerRestInterceptor - +from .rest import NodeGroupControllerRestInterceptor, NodeGroupControllerRestTransport # Compile a registry of transports. _transport_registry = ( diff --git a/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py b/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py index 420e5c3a..6d9f85ca 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/transports/base.py @@ -16,23 +16,19 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.cloud.dataproc_v1 import gapic_version as package_version - -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.oauth2 import service_account # type: ignore - -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import node_groups from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account # type: ignore + +from google.cloud.dataproc_v1 import gapic_version as package_version +from google.cloud.dataproc_v1.types import clusters, node_groups DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ diff --git a/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py b/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py index aab10357..7b989599 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc.py @@ -13,25 +13,21 @@ # 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 - -import grpc # type: ignore - -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import node_groups from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore -from .base import NodeGroupControllerTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore + +from google.cloud.dataproc_v1.types import clusters, node_groups + +from .base import DEFAULT_CLIENT_INFO, NodeGroupControllerTransport class NodeGroupControllerGrpcTransport(NodeGroupControllerTransport): diff --git a/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py index f5218097..42a037cc 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/transports/grpc_asyncio.py @@ -13,25 +13,21 @@ # 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 - -import grpc # type: ignore -from grpc.experimental import aio # type: ignore - -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import node_groups from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore -from .base import NodeGroupControllerTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore +from grpc.experimental import aio # type: ignore + +from google.cloud.dataproc_v1.types import clusters, node_groups + +from .base import DEFAULT_CLIENT_INFO, NodeGroupControllerTransport from .grpc import NodeGroupControllerGrpcTransport diff --git a/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py b/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py index 87090bf9..ab3df31a 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py @@ -14,28 +14,30 @@ # limitations under the License. # -from google.auth.transport.requests import AuthorizedSession # type: ignore +import dataclasses import json # type: ignore -import grpc # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.auth import credentials as ga_credentials # type: ignore +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import ( + gapic_v1, + operations_v1, + path_template, + rest_helpers, + rest_streaming, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.api_core import rest_helpers -from google.api_core import rest_streaming -from google.api_core import path_template -from google.api_core import gapic_v1 - -from google.protobuf import json_format -from google.api_core import operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 +from google.protobuf import json_format +import grpc # type: ignore from requests import __version__ as requests_version -import dataclasses -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -43,15 +45,12 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import node_groups from google.longrunning import operations_pb2 # type: ignore -from .base import ( - NodeGroupControllerTransport, - DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO, -) +from google.cloud.dataproc_v1.types import clusters, node_groups +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO +from .base import NodeGroupControllerTransport DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/__init__.py b/google/cloud/dataproc_v1/services/workflow_template_service/__init__.py index d01b8099..0e9ed496 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/__init__.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import WorkflowTemplateServiceClient from .async_client import WorkflowTemplateServiceAsyncClient +from .client import WorkflowTemplateServiceClient __all__ = ( "WorkflowTemplateServiceClient", diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py b/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py index 79ebf33e..e9c286fe 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py @@ -28,15 +28,15 @@ Union, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - -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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -44,17 +44,19 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.workflow_template_service import pagers -from google.cloud.dataproc_v1.types import workflow_templates from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 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 WorkflowTemplateServiceTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import WorkflowTemplateServiceGrpcAsyncIOTransport + +from google.cloud.dataproc_v1.services.workflow_template_service import pagers +from google.cloud.dataproc_v1.types import workflow_templates + from .client import WorkflowTemplateServiceClient +from .transports.base import DEFAULT_CLIENT_INFO, WorkflowTemplateServiceTransport +from .transports.grpc_asyncio import WorkflowTemplateServiceGrpcAsyncIOTransport class WorkflowTemplateServiceAsyncClient: diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/client.py b/google/cloud/dataproc_v1/services/workflow_template_service/client.py index 46bdca55..6737c83a 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/client.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/client.py @@ -29,18 +29,18 @@ cast, ) -from google.cloud.dataproc_v1 import gapic_version as package_version - 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 +from google.cloud.dataproc_v1 import gapic_version as package_version + try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] except AttributeError: # pragma: NO COVER @@ -48,15 +48,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.dataproc_v1.services.workflow_template_service import pagers -from google.cloud.dataproc_v1.types import workflow_templates from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 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 WorkflowTemplateServiceTransport, DEFAULT_CLIENT_INFO + +from google.cloud.dataproc_v1.services.workflow_template_service import pagers +from google.cloud.dataproc_v1.types import workflow_templates + +from .transports.base import DEFAULT_CLIENT_INFO, WorkflowTemplateServiceTransport from .transports.grpc import WorkflowTemplateServiceGrpcTransport from .transports.grpc_asyncio import WorkflowTemplateServiceGrpcAsyncIOTransport from .transports.rest import WorkflowTemplateServiceRestTransport diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py b/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py index b39cfd4c..f8a9e8a1 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/pagers.py @@ -18,10 +18,10 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) from google.cloud.dataproc_v1.types import workflow_templates diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py index bcc2cd62..7bfc57b2 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/__init__.py @@ -19,9 +19,10 @@ from .base import WorkflowTemplateServiceTransport from .grpc import WorkflowTemplateServiceGrpcTransport from .grpc_asyncio import WorkflowTemplateServiceGrpcAsyncIOTransport -from .rest import WorkflowTemplateServiceRestTransport -from .rest import WorkflowTemplateServiceRestInterceptor - +from .rest import ( + WorkflowTemplateServiceRestInterceptor, + WorkflowTemplateServiceRestTransport, +) # Compile a registry of transports. _transport_registry = ( diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py index a0668453..4c767ced 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/base.py @@ -16,24 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.cloud.dataproc_v1 import gapic_version as package_version - -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.oauth2 import service_account # type: ignore - -from google.cloud.dataproc_v1.types import workflow_templates from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore +from google.cloud.dataproc_v1 import gapic_version as package_version +from google.cloud.dataproc_v1.types import workflow_templates + DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ ) diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py index 9566fab2..a4eb4fed 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py @@ -13,25 +13,22 @@ # 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 - -import grpc # type: ignore - -from google.cloud.dataproc_v1.types import workflow_templates from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import WorkflowTemplateServiceTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore + +from google.cloud.dataproc_v1.types import workflow_templates + +from .base import DEFAULT_CLIENT_INFO, WorkflowTemplateServiceTransport class WorkflowTemplateServiceGrpcTransport(WorkflowTemplateServiceTransport): diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py index d0860af0..96e00253 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py @@ -13,25 +13,22 @@ # 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 - -import grpc # type: ignore -from grpc.experimental import aio # type: ignore - -from google.cloud.dataproc_v1.types import workflow_templates from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import WorkflowTemplateServiceTransport, DEFAULT_CLIENT_INFO +import grpc # type: ignore +from grpc.experimental import aio # type: ignore + +from google.cloud.dataproc_v1.types import workflow_templates + +from .base import DEFAULT_CLIENT_INFO, WorkflowTemplateServiceTransport from .grpc import WorkflowTemplateServiceGrpcTransport diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py index 97add583..bcbdde2f 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py @@ -14,28 +14,30 @@ # limitations under the License. # -from google.auth.transport.requests import AuthorizedSession # type: ignore +import dataclasses import json # type: ignore -import grpc # type: ignore -from google.auth.transport.grpc import SslCredentials # type: ignore -from google.auth import credentials as ga_credentials # type: ignore +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.api_core import ( + gapic_v1, + operations_v1, + path_template, + rest_helpers, + rest_streaming, +) from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.api_core import rest_helpers -from google.api_core import rest_streaming -from google.api_core import path_template -from google.api_core import gapic_v1 - -from google.protobuf import json_format -from google.api_core import operations_v1 +from google.auth import credentials as ga_credentials # type: ignore +from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 +from google.protobuf import json_format +import grpc # type: ignore from requests import __version__ as requests_version -import dataclasses -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -43,15 +45,13 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore -from google.cloud.dataproc_v1.types import workflow_templates from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore -from .base import ( - WorkflowTemplateServiceTransport, - DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO, -) +from google.cloud.dataproc_v1.types import workflow_templates +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO +from .base import WorkflowTemplateServiceTransport DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=BASE_DEFAULT_CLIENT_INFO.gapic_version, diff --git a/google/cloud/dataproc_v1/types/__init__.py b/google/cloud/dataproc_v1/types/__init__.py index f6343361..3f427bd9 100644 --- a/google/cloud/dataproc_v1/types/__init__.py +++ b/google/cloud/dataproc_v1/types/__init__.py @@ -119,8 +119,10 @@ NodeGroupOperationMetadata, ) from .shared import ( + Component, EnvironmentConfig, ExecutionConfig, + FailureAction, GkeClusterConfig, GkeNodePoolConfig, GkeNodePoolTarget, @@ -132,8 +134,6 @@ SparkHistoryServerConfig, UsageMetrics, UsageSnapshot, - Component, - FailureAction, ) from .workflow_templates import ( ClusterOperation, diff --git a/google/cloud/dataproc_v1/types/autoscaling_policies.py b/google/cloud/dataproc_v1/types/autoscaling_policies.py index dc4e30a8..c93bca80 100644 --- a/google/cloud/dataproc_v1/types/autoscaling_policies.py +++ b/google/cloud/dataproc_v1/types/autoscaling_policies.py @@ -17,10 +17,8 @@ from typing import MutableMapping, MutableSequence -import proto # type: ignore - from google.protobuf import duration_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/google/cloud/dataproc_v1/types/batches.py b/google/cloud/dataproc_v1/types/batches.py index 649185b6..e32a069b 100644 --- a/google/cloud/dataproc_v1/types/batches.py +++ b/google/cloud/dataproc_v1/types/batches.py @@ -17,11 +17,10 @@ from typing import MutableMapping, MutableSequence +from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import shared -from google.protobuf import timestamp_pb2 # type: ignore - __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/google/cloud/dataproc_v1/types/clusters.py b/google/cloud/dataproc_v1/types/clusters.py index 64a06a9d..0d5090f9 100644 --- a/google/cloud/dataproc_v1/types/clusters.py +++ b/google/cloud/dataproc_v1/types/clusters.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence -import proto # type: ignore - -from google.cloud.dataproc_v1.types import shared from google.protobuf import duration_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import proto # type: ignore +from google.cloud.dataproc_v1.types import shared __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/google/cloud/dataproc_v1/types/jobs.py b/google/cloud/dataproc_v1/types/jobs.py index 723d95a1..ff5e2384 100644 --- a/google/cloud/dataproc_v1/types/jobs.py +++ b/google/cloud/dataproc_v1/types/jobs.py @@ -17,11 +17,9 @@ from typing import MutableMapping, MutableSequence -import proto # type: ignore - from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/google/cloud/dataproc_v1/types/node_groups.py b/google/cloud/dataproc_v1/types/node_groups.py index f46addd3..65e974b1 100644 --- a/google/cloud/dataproc_v1/types/node_groups.py +++ b/google/cloud/dataproc_v1/types/node_groups.py @@ -17,11 +17,10 @@ from typing import MutableMapping, MutableSequence +from google.protobuf import duration_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import clusters -from google.protobuf import duration_pb2 # type: ignore - __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/google/cloud/dataproc_v1/types/operations.py b/google/cloud/dataproc_v1/types/operations.py index 69bfc7f5..2a68bb2d 100644 --- a/google/cloud/dataproc_v1/types/operations.py +++ b/google/cloud/dataproc_v1/types/operations.py @@ -17,10 +17,8 @@ from typing import MutableMapping, MutableSequence -import proto # type: ignore - from google.protobuf import timestamp_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/google/cloud/dataproc_v1/types/shared.py b/google/cloud/dataproc_v1/types/shared.py index 5c66ae51..b9ecdf13 100644 --- a/google/cloud/dataproc_v1/types/shared.py +++ b/google/cloud/dataproc_v1/types/shared.py @@ -17,11 +17,9 @@ from typing import MutableMapping, MutableSequence -import proto # type: ignore - from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/google/cloud/dataproc_v1/types/workflow_templates.py b/google/cloud/dataproc_v1/types/workflow_templates.py index 95341cb7..c99b7061 100644 --- a/google/cloud/dataproc_v1/types/workflow_templates.py +++ b/google/cloud/dataproc_v1/types/workflow_templates.py @@ -17,13 +17,12 @@ from typing import MutableMapping, MutableSequence +from google.protobuf import duration_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.dataproc_v1.types import clusters from google.cloud.dataproc_v1.types import jobs as gcd_jobs -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - __protobuf__ = proto.module( package="google.cloud.dataproc.v1", diff --git a/noxfile.py b/noxfile.py index 293cc7d3..40007331 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 @@ -287,7 +288,7 @@ def docs(session): shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( "sphinx-build", - # "-W", # warnings as errors + "-W", # warnings as errors "-T", # show full traceback on exception "-N", # no colors "-b", diff --git a/owlbot.py b/owlbot.py index 29f936a1..ce738f01 100644 --- a/owlbot.py +++ b/owlbot.py @@ -35,8 +35,7 @@ if clean_up_generated_samples: shutil.rmtree("samples/generated_samples", ignore_errors=True) clean_up_generated_samples = False - - s.move(library, excludes=["**/gapic_version.py"]) + s.move([library], excludes=["**/gapic_version.py"]) s.remove_staging_dirs() # ---------------------------------------------------------------------------- @@ -52,10 +51,6 @@ python.py_samples(skip_readmes=True) -# Temporarily disable warnings due to -# https://github.com/googleapis/gapic-generator-python/issues/525 -s.replace("noxfile.py", '[\"\']-W[\"\']', '# "-W"') - # run format session for all directories which have a noxfile for noxfile in Path(".").glob("**/noxfile.py"): - s.shell.run(["nox", "-s", "blacken"], cwd=noxfile.parent, hide_output=False) + s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False) diff --git a/tests/system/gapic/v1/test_system_cluster_controller_v1.py b/tests/system/gapic/v1/test_system_cluster_controller_v1.py index 7aa87662..540d82f0 100644 --- a/tests/system/gapic/v1/test_system_cluster_controller_v1.py +++ b/tests/system/gapic/v1/test_system_cluster_controller_v1.py @@ -15,6 +15,7 @@ # limitations under the License. import os + import pytest from google.cloud import dataproc_v1 diff --git a/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py b/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py index 95dda205..b36e11ca 100644 --- a/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py +++ b/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py @@ -22,44 +22,38 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio from collections.abc import Iterable -from google.protobuf import json_format import json import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers -from requests import Response -from requests import Request, PreparedRequest -from requests.sessions import Session -from google.protobuf import json_format +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.dataproc_v1.services.autoscaling_policy_service import ( - AutoscalingPolicyServiceAsyncClient, -) -from google.cloud.dataproc_v1.services.autoscaling_policy_service import ( - AutoscalingPolicyServiceClient, -) -from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers -from google.cloud.dataproc_v1.services.autoscaling_policy_service import transports -from google.cloud.dataproc_v1.types import autoscaling_policies from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore -import google.auth +from google.protobuf import json_format +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest +from requests import PreparedRequest, Request, Response +from requests.sessions import Session + +from google.cloud.dataproc_v1.services.autoscaling_policy_service import ( + AutoscalingPolicyServiceAsyncClient, + AutoscalingPolicyServiceClient, + pagers, + transports, +) +from google.cloud.dataproc_v1.types import autoscaling_policies def client_cert_source_callback(): diff --git a/tests/unit/gapic/dataproc_v1/test_batch_controller.py b/tests/unit/gapic/dataproc_v1/test_batch_controller.py index 0bcbc94e..ca6fd06e 100644 --- a/tests/unit/gapic/dataproc_v1/test_batch_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_batch_controller.py @@ -22,49 +22,48 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio from collections.abc import Iterable -from google.protobuf import json_format import json import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers -from requests import Response -from requests import Request, PreparedRequest -from requests.sessions import Session -from google.protobuf import json_format +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.dataproc_v1.services.batch_controller import ( - BatchControllerAsyncClient, -) -from google.cloud.dataproc_v1.services.batch_controller import BatchControllerClient -from google.cloud.dataproc_v1.services.batch_controller import pagers -from google.cloud.dataproc_v1.services.batch_controller import transports -from google.cloud.dataproc_v1.types import batches -from google.cloud.dataproc_v1.types import operations -from google.cloud.dataproc_v1.types import shared from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore +from google.protobuf import json_format 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 requests import PreparedRequest, Request, Response +from requests.sessions import Session + +from google.cloud.dataproc_v1.services.batch_controller import ( + BatchControllerAsyncClient, + BatchControllerClient, + pagers, + transports, +) +from google.cloud.dataproc_v1.types import batches, operations, shared def client_cert_source_callback(): diff --git a/tests/unit/gapic/dataproc_v1/test_cluster_controller.py b/tests/unit/gapic/dataproc_v1/test_cluster_controller.py index 60d240a0..1cacd331 100644 --- a/tests/unit/gapic/dataproc_v1/test_cluster_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_cluster_controller.py @@ -22,41 +22,25 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio from collections.abc import Iterable -from google.protobuf import json_format import json import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers -from requests import Response -from requests import Request, PreparedRequest -from requests.sessions import Session -from google.protobuf import json_format +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.dataproc_v1.services.cluster_controller import ( - ClusterControllerAsyncClient, -) -from google.cloud.dataproc_v1.services.cluster_controller import ClusterControllerClient -from google.cloud.dataproc_v1.services.cluster_controller import pagers -from google.cloud.dataproc_v1.services.cluster_controller import transports -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import operations -from google.cloud.dataproc_v1.types import shared from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore @@ -65,8 +49,23 @@ 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 json_format 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 requests import PreparedRequest, Request, Response +from requests.sessions import Session + +from google.cloud.dataproc_v1.services.cluster_controller import ( + ClusterControllerAsyncClient, + ClusterControllerClient, + pagers, + transports, +) +from google.cloud.dataproc_v1.types import clusters, operations, shared def client_cert_source_callback(): diff --git a/tests/unit/gapic/dataproc_v1/test_job_controller.py b/tests/unit/gapic/dataproc_v1/test_job_controller.py index 4f420912..b45e853e 100644 --- a/tests/unit/gapic/dataproc_v1/test_job_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_job_controller.py @@ -22,45 +22,48 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio from collections.abc import Iterable -from google.protobuf import json_format import json import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers -from requests import Response -from requests import Request, PreparedRequest -from requests.sessions import Session -from google.protobuf import json_format +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.dataproc_v1.services.job_controller import JobControllerAsyncClient -from google.cloud.dataproc_v1.services.job_controller import JobControllerClient -from google.cloud.dataproc_v1.services.job_controller import pagers -from google.cloud.dataproc_v1.services.job_controller import transports -from google.cloud.dataproc_v1.types import jobs from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.oauth2 import service_account from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import json_format 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 requests import PreparedRequest, Request, Response +from requests.sessions import Session + +from google.cloud.dataproc_v1.services.job_controller import ( + JobControllerAsyncClient, + JobControllerClient, + pagers, + transports, +) +from google.cloud.dataproc_v1.types import jobs def client_cert_source_callback(): diff --git a/tests/unit/gapic/dataproc_v1/test_node_group_controller.py b/tests/unit/gapic/dataproc_v1/test_node_group_controller.py index d179bfa2..adc35a15 100644 --- a/tests/unit/gapic/dataproc_v1/test_node_group_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_node_group_controller.py @@ -22,49 +22,46 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio from collections.abc import Iterable -from google.protobuf import json_format import json import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers -from requests import Response -from requests import Request, PreparedRequest -from requests.sessions import Session -from google.protobuf import json_format +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.dataproc_v1.services.node_group_controller import ( - NodeGroupControllerAsyncClient, -) -from google.cloud.dataproc_v1.services.node_group_controller import ( - NodeGroupControllerClient, -) -from google.cloud.dataproc_v1.services.node_group_controller import transports -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import node_groups -from google.cloud.dataproc_v1.types import operations from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore from google.longrunning import operations_pb2 from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore -import google.auth +from google.protobuf import json_format +import grpc +from grpc.experimental import aio +from proto.marshal.rules import wrappers +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest +from requests import PreparedRequest, Request, Response +from requests.sessions import Session + +from google.cloud.dataproc_v1.services.node_group_controller import ( + NodeGroupControllerAsyncClient, + NodeGroupControllerClient, + transports, +) +from google.cloud.dataproc_v1.types import clusters, node_groups, operations def client_cert_source_callback(): diff --git a/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py b/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py index 879fbd76..22b69710 100644 --- a/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py +++ b/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py @@ -22,44 +22,25 @@ except ImportError: # pragma: NO COVER import mock -import grpc -from grpc.experimental import aio from collections.abc import Iterable -from google.protobuf import json_format import json import math -import pytest -from proto.marshal.rules.dates import DurationRule, TimestampRule -from proto.marshal.rules import wrappers -from requests import Response -from requests import Request, PreparedRequest -from requests.sessions import Session -from google.protobuf import json_format +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.dataproc_v1.services.workflow_template_service import ( - WorkflowTemplateServiceAsyncClient, -) -from google.cloud.dataproc_v1.services.workflow_template_service import ( - WorkflowTemplateServiceClient, -) -from google.cloud.dataproc_v1.services.workflow_template_service import pagers -from google.cloud.dataproc_v1.services.workflow_template_service import transports -from google.cloud.dataproc_v1.types import clusters -from google.cloud.dataproc_v1.types import jobs -from google.cloud.dataproc_v1.types import shared -from google.cloud.dataproc_v1.types import workflow_templates from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore @@ -67,8 +48,23 @@ 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 json_format 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 requests import PreparedRequest, Request, Response +from requests.sessions import Session + +from google.cloud.dataproc_v1.services.workflow_template_service import ( + WorkflowTemplateServiceAsyncClient, + WorkflowTemplateServiceClient, + pagers, + transports, +) +from google.cloud.dataproc_v1.types import clusters, jobs, shared, workflow_templates def client_cert_source_callback(): From c3c65bcb86bac3984a4d1eb21201a6ba1c64cea1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:22:20 -0700 Subject: [PATCH 2/3] docs: Minor formatting (#558) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: Minor formatting chore: Update gapic-generator-python to v1.11.5 build: Update rules_python to 0.24.0 PiperOrigin-RevId: 563436317 Source-Link: https://github.com/googleapis/googleapis/commit/42fd37b18d706f6f51f52f209973b3b2c28f509a Source-Link: https://github.com/googleapis/googleapis-gen/commit/280264ca02fb9316b4237a96d0af1a2343a81a56 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjgwMjY0Y2EwMmZiOTMxNmI0MjM3YTk2ZDBhZjFhMjM0M2E4MWE1NiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../services/autoscaling_policy_service/async_client.py | 2 +- .../services/autoscaling_policy_service/client.py | 2 +- .../autoscaling_policy_service/transports/base.py | 2 +- .../autoscaling_policy_service/transports/grpc.py | 2 +- .../autoscaling_policy_service/transports/grpc_asyncio.py | 2 +- .../autoscaling_policy_service/transports/rest.py | 2 +- .../dataproc_v1/services/batch_controller/async_client.py | 3 ++- .../cloud/dataproc_v1/services/batch_controller/client.py | 3 ++- .../services/batch_controller/transports/rest.py | 1 - .../services/cluster_controller/async_client.py | 2 +- .../dataproc_v1/services/cluster_controller/client.py | 2 +- .../services/cluster_controller/transports/rest.py | 1 - .../dataproc_v1/services/job_controller/async_client.py | 3 ++- .../cloud/dataproc_v1/services/job_controller/client.py | 3 ++- .../services/job_controller/transports/rest.py | 1 - .../services/node_group_controller/async_client.py | 2 +- .../dataproc_v1/services/node_group_controller/client.py | 2 +- .../services/node_group_controller/transports/rest.py | 1 - .../services/workflow_template_service/async_client.py | 3 ++- .../services/workflow_template_service/client.py | 3 ++- .../services/workflow_template_service/transports/grpc.py | 1 + .../workflow_template_service/transports/grpc_asyncio.py | 1 + .../services/workflow_template_service/transports/rest.py | 1 - google/cloud/dataproc_v1/types/autoscaling_policies.py | 1 + google/cloud/dataproc_v1/types/clusters.py | 8 ++++---- google/cloud/dataproc_v1/types/jobs.py | 2 ++ google/cloud/dataproc_v1/types/workflow_templates.py | 5 +++++ .../snippet_metadata_google.cloud.dataproc.v1.json | 2 +- .../gapic/dataproc_v1/test_autoscaling_policy_service.py | 2 +- tests/unit/gapic/dataproc_v1/test_batch_controller.py | 2 +- tests/unit/gapic/dataproc_v1/test_cluster_controller.py | 2 +- tests/unit/gapic/dataproc_v1/test_job_controller.py | 2 +- .../unit/gapic/dataproc_v1/test_node_group_controller.py | 2 +- .../gapic/dataproc_v1/test_workflow_template_service.py | 2 +- 34 files changed, 43 insertions(+), 32 deletions(-) diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py index 15be0812..5f6fe9cd 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/async_client.py @@ -44,7 +44,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py index 3ce0249f..e68af0f0 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py @@ -48,7 +48,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.autoscaling_policy_service import pagers from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py index 0b493c3f..913744b0 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/base.py @@ -24,7 +24,7 @@ from google.auth import credentials as ga_credentials # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py index f27fb7cb..2388dcce 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc.py @@ -22,7 +22,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore import grpc # type: ignore diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py index 43835fe1..bca9d5b8 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/grpc_asyncio.py @@ -21,7 +21,7 @@ from google.auth.transport.grpc import SslCredentials # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py index c8e73f4b..6578c10c 100644 --- a/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py +++ b/google/cloud/dataproc_v1/services/autoscaling_policy_service/transports/rest.py @@ -28,7 +28,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.protobuf import json_format import grpc # type: ignore from requests import __version__ as requests_version @@ -39,6 +38,7 @@ OptionalRetry = Union[retries.Retry, object] # type: ignore +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.cloud.dataproc_v1.types import autoscaling_policies diff --git a/google/cloud/dataproc_v1/services/batch_controller/async_client.py b/google/cloud/dataproc_v1/services/batch_controller/async_client.py index ce2567d7..54409569 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/batch_controller/async_client.py @@ -46,7 +46,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import pagers @@ -528,6 +528,7 @@ async def sample_list_batches(): Returns: google.cloud.dataproc_v1.services.batch_controller.pagers.ListBatchesAsyncPager: A list of batch workloads. + Iterating over this object will yield results and resolve additional pages automatically. diff --git a/google/cloud/dataproc_v1/services/batch_controller/client.py b/google/cloud/dataproc_v1/services/batch_controller/client.py index c27f7bc2..249cb827 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/client.py +++ b/google/cloud/dataproc_v1/services/batch_controller/client.py @@ -50,7 +50,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.cloud.dataproc_v1.services.batch_controller import pagers @@ -777,6 +777,7 @@ def sample_list_batches(): Returns: google.cloud.dataproc_v1.services.batch_controller.pagers.ListBatchesPager: A list of batch workloads. + Iterating over this object will yield results and resolve additional pages automatically. diff --git a/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py b/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py index eb23bf0d..5b227baf 100644 --- a/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/batch_controller/transports/rest.py @@ -34,7 +34,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.protobuf import json_format import grpc # type: ignore from requests import __version__ as requests_version diff --git a/google/cloud/dataproc_v1/services/cluster_controller/async_client.py b/google/cloud/dataproc_v1/services/cluster_controller/async_client.py index 0bafc060..67febfbc 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/async_client.py @@ -46,7 +46,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore diff --git a/google/cloud/dataproc_v1/services/cluster_controller/client.py b/google/cloud/dataproc_v1/services/cluster_controller/client.py index 13703389..65d32cc3 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/client.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/client.py @@ -50,7 +50,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore diff --git a/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py b/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py index 1201cb6a..76907687 100644 --- a/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/cluster_controller/transports/rest.py @@ -34,7 +34,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.protobuf import json_format import grpc # type: ignore from requests import __version__ as requests_version diff --git a/google/cloud/dataproc_v1/services/job_controller/async_client.py b/google/cloud/dataproc_v1/services/job_controller/async_client.py index 70e1d910..f0ac2b1e 100644 --- a/google/cloud/dataproc_v1/services/job_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/job_controller/async_client.py @@ -46,7 +46,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import pagers from google.cloud.dataproc_v1.types import jobs @@ -740,6 +740,7 @@ async def sample_list_jobs(): Returns: google.cloud.dataproc_v1.services.job_controller.pagers.ListJobsAsyncPager: A list of jobs in a project. + Iterating over this object will yield results and resolve additional pages automatically. diff --git a/google/cloud/dataproc_v1/services/job_controller/client.py b/google/cloud/dataproc_v1/services/job_controller/client.py index 35858c1b..325c6d4e 100644 --- a/google/cloud/dataproc_v1/services/job_controller/client.py +++ b/google/cloud/dataproc_v1/services/job_controller/client.py @@ -50,7 +50,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.services.job_controller import pagers from google.cloud.dataproc_v1.types import jobs @@ -918,6 +918,7 @@ def sample_list_jobs(): Returns: google.cloud.dataproc_v1.services.job_controller.pagers.ListJobsPager: A list of jobs in a project. + Iterating over this object will yield results and resolve additional pages automatically. diff --git a/google/cloud/dataproc_v1/services/job_controller/transports/rest.py b/google/cloud/dataproc_v1/services/job_controller/transports/rest.py index 54708b29..115c56f9 100644 --- a/google/cloud/dataproc_v1/services/job_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/job_controller/transports/rest.py @@ -34,7 +34,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.protobuf import json_format import grpc # type: ignore from requests import __version__ as requests_version diff --git a/google/cloud/dataproc_v1/services/node_group_controller/async_client.py b/google/cloud/dataproc_v1/services/node_group_controller/async_client.py index 32a28328..c2b55949 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/async_client.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/async_client.py @@ -46,7 +46,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups, operations diff --git a/google/cloud/dataproc_v1/services/node_group_controller/client.py b/google/cloud/dataproc_v1/services/node_group_controller/client.py index b36ae065..df0e7d9b 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/client.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/client.py @@ -50,7 +50,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.cloud.dataproc_v1.types import clusters, node_groups, operations diff --git a/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py b/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py index ab3df31a..62dc0839 100644 --- a/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py +++ b/google/cloud/dataproc_v1/services/node_group_controller/transports/rest.py @@ -34,7 +34,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.protobuf import json_format import grpc # type: ignore from requests import __version__ as requests_version diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py b/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py index e9c286fe..47ff01da 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/async_client.py @@ -46,7 +46,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import duration_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore @@ -392,6 +392,7 @@ async def get_workflow_template( metadata: Sequence[Tuple[str, str]] = (), ) -> workflow_templates.WorkflowTemplate: r"""Retrieves the latest workflow template. + Can retrieve previously instantiated template by specifying optional version parameter. diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/client.py b/google/cloud/dataproc_v1/services/workflow_template_service/client.py index 6737c83a..ef4f66df 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/client.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/client.py @@ -50,7 +50,7 @@ from google.api_core import operation_async # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.protobuf import duration_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore @@ -643,6 +643,7 @@ def get_workflow_template( metadata: Sequence[Tuple[str, str]] = (), ) -> workflow_templates.WorkflowTemplate: r"""Retrieves the latest workflow template. + Can retrieve previously instantiated template by specifying optional version parameter. diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py index a4eb4fed..fc20d845 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc.py @@ -287,6 +287,7 @@ def get_workflow_template( r"""Return a callable for the get workflow template method over gRPC. Retrieves the latest workflow template. + Can retrieve previously instantiated template by specifying optional version parameter. diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py index 96e00253..b9d762fa 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/grpc_asyncio.py @@ -292,6 +292,7 @@ def get_workflow_template( r"""Return a callable for the get workflow template method over gRPC. Retrieves the latest workflow template. + Can retrieve previously instantiated template by specifying optional version parameter. diff --git a/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py b/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py index bcbdde2f..7fbfc0c7 100644 --- a/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py +++ b/google/cloud/dataproc_v1/services/workflow_template_service/transports/rest.py @@ -34,7 +34,6 @@ from google.auth.transport.requests import AuthorizedSession # type: ignore from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 from google.protobuf import json_format import grpc # type: ignore from requests import __version__ as requests_version diff --git a/google/cloud/dataproc_v1/types/autoscaling_policies.py b/google/cloud/dataproc_v1/types/autoscaling_policies.py index c93bca80..7704fb76 100644 --- a/google/cloud/dataproc_v1/types/autoscaling_policies.py +++ b/google/cloud/dataproc_v1/types/autoscaling_policies.py @@ -353,6 +353,7 @@ class UpdateAutoscalingPolicyRequest(proto.Message): class DeleteAutoscalingPolicyRequest(proto.Message): r"""A request to delete an autoscaling policy. + Autoscaling policies in use by one or more clusters will not be deleted. diff --git a/google/cloud/dataproc_v1/types/clusters.py b/google/cloud/dataproc_v1/types/clusters.py index 0d5090f9..8bd5d44d 100644 --- a/google/cloud/dataproc_v1/types/clusters.py +++ b/google/cloud/dataproc_v1/types/clusters.py @@ -873,6 +873,7 @@ class Preemptibility(proto.Enum): instance group. NON_PREEMPTIBLE (1): Instances are non-preemptible. + This option is allowed for all instance groups and is the only valid value for Master and Worker instance groups. @@ -1401,6 +1402,7 @@ class Substate(proto.Enum): The agent-reported status is out of date (may occur if Dataproc loses communication with Agent). + Applies to RUNNING state. """ UNSPECIFIED = 0 @@ -1459,10 +1461,8 @@ class KerberosConfig(proto.Message): Attributes: enable_kerberos (bool): Optional. Flag to indicate whether to - Kerberize the cluster (default: - - false). Set this field to true to enable - Kerberos on a cluster. + Kerberize the cluster (default: false). Set this + field to true to enable Kerberos on a cluster. root_principal_password_uri (str): Optional. The Cloud Storage URI of a KMS encrypted file containing the root principal diff --git a/google/cloud/dataproc_v1/types/jobs.py b/google/cloud/dataproc_v1/types/jobs.py index ff5e2384..14cd14c0 100644 --- a/google/cloud/dataproc_v1/types/jobs.py +++ b/google/cloud/dataproc_v1/types/jobs.py @@ -959,6 +959,7 @@ class Substate(proto.Enum): The job substate is unknown. SUBMITTED (1): The Job is submitted to the agent. + Applies to RUNNING state. QUEUED (2): The Job has been received and is awaiting @@ -973,6 +974,7 @@ class Substate(proto.Enum): between the agent and Dataproc. If the agent does not send a timely update, the job will fail. + Applies to RUNNING state. """ UNSPECIFIED = 0 diff --git a/google/cloud/dataproc_v1/types/workflow_templates.py b/google/cloud/dataproc_v1/types/workflow_templates.py index c99b7061..b2ba90bc 100644 --- a/google/cloud/dataproc_v1/types/workflow_templates.py +++ b/google/cloud/dataproc_v1/types/workflow_templates.py @@ -224,6 +224,7 @@ class ManagedCluster(proto.Message): Required. The cluster name prefix. A unique cluster name will be formed by appending a random suffix. + The name must contain only lower-case letters (a-z), numbers (0-9), and hyphens (-). Must begin with a letter. Cannot begin or end with @@ -271,6 +272,7 @@ class ClusterSelector(proto.Message): Optional. The zone where workflow process executes. This parameter does not affect the selection of the cluster. + If unspecified, the zone of the first cluster matching the selector is used. cluster_labels (MutableMapping[str, str]): @@ -899,6 +901,7 @@ class GetWorkflowTemplateRequest(proto.Message): Optional. The version of workflow template to retrieve. Only previously instantiated versions can be retrieved. + If unspecified, retrieves the current version. """ @@ -935,6 +938,7 @@ class InstantiateWorkflowTemplateRequest(proto.Message): instantiate. If specified, the workflow will be instantiated only if the current version of the workflow template has the supplied version. + This option cannot be used to instantiate a previous version of workflow template. request_id (str): @@ -1110,6 +1114,7 @@ def raw_page(self): class DeleteWorkflowTemplateRequest(proto.Message): r"""A request to delete a workflow template. + Currently started workflows will remain running. Attributes: diff --git a/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json index 5269dcf4..f1a48076 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dataproc", - "version": "5.5.0" + "version": "0.1.0" }, "snippets": [ { diff --git a/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py b/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py index b36e11ca..91517312 100644 --- a/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py +++ b/tests/unit/gapic/dataproc_v1/test_autoscaling_policy_service.py @@ -35,7 +35,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import json_format diff --git a/tests/unit/gapic/dataproc_v1/test_batch_controller.py b/tests/unit/gapic/dataproc_v1/test_batch_controller.py index ca6fd06e..3cbcbf5c 100644 --- a/tests/unit/gapic/dataproc_v1/test_batch_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_batch_controller.py @@ -44,7 +44,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import json_format diff --git a/tests/unit/gapic/dataproc_v1/test_cluster_controller.py b/tests/unit/gapic/dataproc_v1/test_cluster_controller.py index 1cacd331..9fb80dd4 100644 --- a/tests/unit/gapic/dataproc_v1/test_cluster_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_cluster_controller.py @@ -44,7 +44,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore diff --git a/tests/unit/gapic/dataproc_v1/test_job_controller.py b/tests/unit/gapic/dataproc_v1/test_job_controller.py index b45e853e..6720d7db 100644 --- a/tests/unit/gapic/dataproc_v1/test_job_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_job_controller.py @@ -44,7 +44,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import json_format diff --git a/tests/unit/gapic/dataproc_v1/test_node_group_controller.py b/tests/unit/gapic/dataproc_v1/test_node_group_controller.py index adc35a15..de23658b 100644 --- a/tests/unit/gapic/dataproc_v1/test_node_group_controller.py +++ b/tests/unit/gapic/dataproc_v1/test_node_group_controller.py @@ -44,7 +44,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import json_format diff --git a/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py b/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py index 22b69710..ccf45729 100644 --- a/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py +++ b/tests/unit/gapic/dataproc_v1/test_workflow_template_service.py @@ -44,7 +44,7 @@ from google.iam.v1 import iam_policy_pb2 # type: ignore from google.iam.v1 import options_pb2 # type: ignore from google.iam.v1 import policy_pb2 # type: ignore -from google.longrunning import operations_pb2 +from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore From cbae95825665314081aaab38166600e33e6275d8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:47:13 -0400 Subject: [PATCH 3/3] chore(main): release 5.5.1 (#559) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ google/cloud/dataproc/gapic_version.py | 2 +- google/cloud/dataproc_v1/gapic_version.py | 2 +- .../snippet_metadata_google.cloud.dataproc.v1.json | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 9bf38528..59668eb2 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "5.5.0" + ".": "5.5.1" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fbf68c2..a5bb9df2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-dataproc/#history +## [5.5.1](https://github.com/googleapis/python-dataproc/compare/v5.5.0...v5.5.1) (2023-09-13) + + +### Documentation + +* Minor formatting ([c3c65bc](https://github.com/googleapis/python-dataproc/commit/c3c65bcb86bac3984a4d1eb21201a6ba1c64cea1)) + ## [5.5.0](https://github.com/googleapis/python-dataproc/compare/v5.4.3...v5.5.0) (2023-08-23) diff --git a/google/cloud/dataproc/gapic_version.py b/google/cloud/dataproc/gapic_version.py index c48684a1..aea75090 100644 --- a/google/cloud/dataproc/gapic_version.py +++ b/google/cloud/dataproc/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "5.5.0" # {x-release-please-version} +__version__ = "5.5.1" # {x-release-please-version} diff --git a/google/cloud/dataproc_v1/gapic_version.py b/google/cloud/dataproc_v1/gapic_version.py index c48684a1..aea75090 100644 --- a/google/cloud/dataproc_v1/gapic_version.py +++ b/google/cloud/dataproc_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "5.5.0" # {x-release-please-version} +__version__ = "5.5.1" # {x-release-please-version} diff --git a/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json index f1a48076..701c4641 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.dataproc.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dataproc", - "version": "0.1.0" + "version": "5.5.1" }, "snippets": [ {