From c9126057cde7fc28094785cceab9cf43e42ca8e0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 19:48:29 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.51.2 (#151) - [ ] Regenerate this pull request now. fix: add 'dict' annotation type to 'request' Committer: @busunkim96 PiperOrigin-RevId: 398509016 Source-Link: https://github.com/googleapis/googleapis/commit/b224dfa52642a733ea64849d4e06d15c274bc08f Source-Link: https://github.com/googleapis/googleapis-gen/commit/63a1db7a38d74b9639592f521ed1daaf7299ad9a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjNhMWRiN2EzOGQ3NGI5NjM5NTkyZjUyMWVkMWRhYWY3Mjk5YWQ5YSJ9 --- .../services/cluster_manager/client.py | 130 ++++++++--------- .../cluster_manager/transports/base.py | 2 +- .../cluster_manager/transports/grpc.py | 6 +- .../transports/grpc_asyncio.py | 6 +- .../services/cluster_manager/client.py | 134 +++++++++--------- .../cluster_manager/transports/base.py | 2 +- .../cluster_manager/transports/grpc.py | 6 +- .../transports/grpc_asyncio.py | 6 +- scripts/fixup_container_v1_keywords.py | 66 ++++----- scripts/fixup_container_v1beta1_keywords.py | 68 ++++----- 10 files changed, 213 insertions(+), 213 deletions(-) diff --git a/google/cloud/container_v1/services/cluster_manager/client.py b/google/cloud/container_v1/services/cluster_manager/client.py index c3221cca..e981168c 100644 --- a/google/cloud/container_v1/services/cluster_manager/client.py +++ b/google/cloud/container_v1/services/cluster_manager/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources import warnings @@ -337,7 +337,7 @@ def __init__( def list_clusters( self, - request: cluster_service.ListClustersRequest = None, + request: Union[cluster_service.ListClustersRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -350,7 +350,7 @@ def list_clusters( specified zone or all zones. Args: - request (google.cloud.container_v1.types.ListClustersRequest): + request (Union[google.cloud.container_v1.types.ListClustersRequest, dict]): The request object. ListClustersRequest lists clusters. project_id (str): Deprecated. The Google Developers Console `project ID or @@ -436,7 +436,7 @@ def list_clusters( def get_cluster( self, - request: cluster_service.GetClusterRequest = None, + request: Union[cluster_service.GetClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -449,7 +449,7 @@ def get_cluster( r"""Gets the details of a specific cluster. Args: - request (google.cloud.container_v1.types.GetClusterRequest): + request (Union[google.cloud.container_v1.types.GetClusterRequest, dict]): The request object. GetClusterRequest gets the settings of a cluster. project_id (str): @@ -543,7 +543,7 @@ def get_cluster( def create_cluster( self, - request: cluster_service.CreateClusterRequest = None, + request: Union[cluster_service.CreateClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -568,7 +568,7 @@ def create_cluster( indicating which CIDR range the cluster is using. Args: - request (google.cloud.container_v1.types.CreateClusterRequest): + request (Union[google.cloud.container_v1.types.CreateClusterRequest, dict]): The request object. CreateClusterRequest creates a cluster. project_id (str): @@ -664,7 +664,7 @@ def create_cluster( def update_cluster( self, - request: cluster_service.UpdateClusterRequest = None, + request: Union[cluster_service.UpdateClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -678,7 +678,7 @@ def update_cluster( r"""Updates the settings of a specific cluster. Args: - request (google.cloud.container_v1.types.UpdateClusterRequest): + request (Union[google.cloud.container_v1.types.UpdateClusterRequest, dict]): The request object. UpdateClusterRequest updates the settings of a cluster. project_id (str): @@ -785,7 +785,7 @@ def update_cluster( def update_node_pool( self, - request: cluster_service.UpdateNodePoolRequest = None, + request: Union[cluster_service.UpdateNodePoolRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -795,7 +795,7 @@ def update_node_pool( specified node pool. Args: - request (google.cloud.container_v1.types.UpdateNodePoolRequest): + request (Union[google.cloud.container_v1.types.UpdateNodePoolRequest, dict]): The request object. UpdateNodePoolRequests update a node pool's image and/or version. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -838,7 +838,7 @@ def update_node_pool( def set_node_pool_autoscaling( self, - request: cluster_service.SetNodePoolAutoscalingRequest = None, + request: Union[cluster_service.SetNodePoolAutoscalingRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -848,7 +848,7 @@ def set_node_pool_autoscaling( pool. Args: - request (google.cloud.container_v1.types.SetNodePoolAutoscalingRequest): + request (Union[google.cloud.container_v1.types.SetNodePoolAutoscalingRequest, dict]): The request object. SetNodePoolAutoscalingRequest sets the autoscaler settings of a node pool. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -893,7 +893,7 @@ def set_node_pool_autoscaling( def set_logging_service( self, - request: cluster_service.SetLoggingServiceRequest = None, + request: Union[cluster_service.SetLoggingServiceRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -907,7 +907,7 @@ def set_logging_service( r"""Sets the logging service for a specific cluster. Args: - request (google.cloud.container_v1.types.SetLoggingServiceRequest): + request (Union[google.cloud.container_v1.types.SetLoggingServiceRequest, dict]): The request object. SetLoggingServiceRequest sets the logging service of a cluster. project_id (str): @@ -1028,7 +1028,7 @@ def set_logging_service( def set_monitoring_service( self, - request: cluster_service.SetMonitoringServiceRequest = None, + request: Union[cluster_service.SetMonitoringServiceRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1042,7 +1042,7 @@ def set_monitoring_service( r"""Sets the monitoring service for a specific cluster. Args: - request (google.cloud.container_v1.types.SetMonitoringServiceRequest): + request (Union[google.cloud.container_v1.types.SetMonitoringServiceRequest, dict]): The request object. SetMonitoringServiceRequest sets the monitoring service of a cluster. project_id (str): @@ -1165,7 +1165,7 @@ def set_monitoring_service( def set_addons_config( self, - request: cluster_service.SetAddonsConfigRequest = None, + request: Union[cluster_service.SetAddonsConfigRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1179,7 +1179,7 @@ def set_addons_config( r"""Sets the addons for a specific cluster. Args: - request (google.cloud.container_v1.types.SetAddonsConfigRequest): + request (Union[google.cloud.container_v1.types.SetAddonsConfigRequest, dict]): The request object. SetAddonsConfigRequest sets the addons associated with the cluster. project_id (str): @@ -1287,7 +1287,7 @@ def set_addons_config( def set_locations( self, - request: cluster_service.SetLocationsRequest = None, + request: Union[cluster_service.SetLocationsRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1303,7 +1303,7 @@ def set_locations( instead. Args: - request (google.cloud.container_v1.types.SetLocationsRequest): + request (Union[google.cloud.container_v1.types.SetLocationsRequest, dict]): The request object. SetLocationsRequest sets the locations of the cluster. project_id (str): @@ -1421,7 +1421,7 @@ def set_locations( def update_master( self, - request: cluster_service.UpdateMasterRequest = None, + request: Union[cluster_service.UpdateMasterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1435,7 +1435,7 @@ def update_master( r"""Updates the master for a specific cluster. Args: - request (google.cloud.container_v1.types.UpdateMasterRequest): + request (Union[google.cloud.container_v1.types.UpdateMasterRequest, dict]): The request object. UpdateMasterRequest updates the master of the cluster. project_id (str): @@ -1554,7 +1554,7 @@ def update_master( def set_master_auth( self, - request: cluster_service.SetMasterAuthRequest = None, + request: Union[cluster_service.SetMasterAuthRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1566,7 +1566,7 @@ def set_master_auth( password. Args: - request (google.cloud.container_v1.types.SetMasterAuthRequest): + request (Union[google.cloud.container_v1.types.SetMasterAuthRequest, dict]): The request object. SetMasterAuthRequest updates the admin password of a cluster. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1609,7 +1609,7 @@ def set_master_auth( def delete_cluster( self, - request: cluster_service.DeleteClusterRequest = None, + request: Union[cluster_service.DeleteClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1631,7 +1631,7 @@ def delete_cluster( initially created. Args: - request (google.cloud.container_v1.types.DeleteClusterRequest): + request (Union[google.cloud.container_v1.types.DeleteClusterRequest, dict]): The request object. DeleteClusterRequest deletes a cluster. project_id (str): @@ -1729,7 +1729,7 @@ def delete_cluster( def list_operations( self, - request: cluster_service.ListOperationsRequest = None, + request: Union[cluster_service.ListOperationsRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1741,7 +1741,7 @@ def list_operations( or all zones. Args: - request (google.cloud.container_v1.types.ListOperationsRequest): + request (Union[google.cloud.container_v1.types.ListOperationsRequest, dict]): The request object. ListOperationsRequest lists operations. project_id (str): @@ -1817,7 +1817,7 @@ def list_operations( def get_operation( self, - request: cluster_service.GetOperationRequest = None, + request: Union[cluster_service.GetOperationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1830,7 +1830,7 @@ def get_operation( r"""Gets the specified operation. Args: - request (google.cloud.container_v1.types.GetOperationRequest): + request (Union[google.cloud.container_v1.types.GetOperationRequest, dict]): The request object. GetOperationRequest gets a single operation. project_id (str): @@ -1927,7 +1927,7 @@ def get_operation( def cancel_operation( self, - request: cluster_service.CancelOperationRequest = None, + request: Union[cluster_service.CancelOperationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1940,7 +1940,7 @@ def cancel_operation( r"""Cancels the specified operation. Args: - request (google.cloud.container_v1.types.CancelOperationRequest): + request (Union[google.cloud.container_v1.types.CancelOperationRequest, dict]): The request object. CancelOperationRequest cancels a single operation. project_id (str): @@ -2028,7 +2028,7 @@ def cancel_operation( def get_server_config( self, - request: cluster_service.GetServerConfigRequest = None, + request: Union[cluster_service.GetServerConfigRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2041,7 +2041,7 @@ def get_server_config( Kubernetes Engine service. Args: - request (google.cloud.container_v1.types.GetServerConfigRequest): + request (Union[google.cloud.container_v1.types.GetServerConfigRequest, dict]): The request object. Gets the current Kubernetes Engine service configuration. project_id (str): @@ -2125,7 +2125,7 @@ def get_server_config( def get_json_web_keys( self, - request: cluster_service.GetJSONWebKeysRequest = None, + request: Union[cluster_service.GetJSONWebKeysRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -2137,7 +2137,7 @@ def get_json_web_keys( available for all clusters. Args: - request (google.cloud.container_v1.types.GetJSONWebKeysRequest): + request (Union[google.cloud.container_v1.types.GetJSONWebKeysRequest, dict]): The request object. GetJSONWebKeysRequest gets the public component of the keys used by the cluster to sign token requests. This will be the jwks_uri for the @@ -2182,7 +2182,7 @@ def get_json_web_keys( def list_node_pools( self, - request: cluster_service.ListNodePoolsRequest = None, + request: Union[cluster_service.ListNodePoolsRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2195,7 +2195,7 @@ def list_node_pools( r"""Lists the node pools for a cluster. Args: - request (google.cloud.container_v1.types.ListNodePoolsRequest): + request (Union[google.cloud.container_v1.types.ListNodePoolsRequest, dict]): The request object. ListNodePoolsRequest lists the node pool(s) for a cluster. project_id (str): @@ -2290,7 +2290,7 @@ def list_node_pools( def get_node_pool( self, - request: cluster_service.GetNodePoolRequest = None, + request: Union[cluster_service.GetNodePoolRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2304,7 +2304,7 @@ def get_node_pool( r"""Retrieves the requested node pool. Args: - request (google.cloud.container_v1.types.GetNodePoolRequest): + request (Union[google.cloud.container_v1.types.GetNodePoolRequest, dict]): The request object. GetNodePoolRequest retrieves a node pool for a cluster. project_id (str): @@ -2417,7 +2417,7 @@ def get_node_pool( def create_node_pool( self, - request: cluster_service.CreateNodePoolRequest = None, + request: Union[cluster_service.CreateNodePoolRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2431,7 +2431,7 @@ def create_node_pool( r"""Creates a node pool for a cluster. Args: - request (google.cloud.container_v1.types.CreateNodePoolRequest): + request (Union[google.cloud.container_v1.types.CreateNodePoolRequest, dict]): The request object. CreateNodePoolRequest creates a node pool for a cluster. project_id (str): @@ -2535,7 +2535,7 @@ def create_node_pool( def delete_node_pool( self, - request: cluster_service.DeleteNodePoolRequest = None, + request: Union[cluster_service.DeleteNodePoolRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2549,7 +2549,7 @@ def delete_node_pool( r"""Deletes a node pool from a cluster. Args: - request (google.cloud.container_v1.types.DeleteNodePoolRequest): + request (Union[google.cloud.container_v1.types.DeleteNodePoolRequest, dict]): The request object. DeleteNodePoolRequest deletes a node pool for a cluster. project_id (str): @@ -2657,7 +2657,7 @@ def delete_node_pool( def rollback_node_pool_upgrade( self, - request: cluster_service.RollbackNodePoolUpgradeRequest = None, + request: Union[cluster_service.RollbackNodePoolUpgradeRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2673,7 +2673,7 @@ def rollback_node_pool_upgrade( successfully completed. Args: - request (google.cloud.container_v1.types.RollbackNodePoolUpgradeRequest): + request (Union[google.cloud.container_v1.types.RollbackNodePoolUpgradeRequest, dict]): The request object. RollbackNodePoolUpgradeRequest rollbacks the previously Aborted or Failed NodePool upgrade. This will be an no-op if the last upgrade @@ -2787,7 +2787,7 @@ def rollback_node_pool_upgrade( def set_node_pool_management( self, - request: cluster_service.SetNodePoolManagementRequest = None, + request: Union[cluster_service.SetNodePoolManagementRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -2796,7 +2796,7 @@ def set_node_pool_management( r"""Sets the NodeManagement options for a node pool. Args: - request (google.cloud.container_v1.types.SetNodePoolManagementRequest): + request (Union[google.cloud.container_v1.types.SetNodePoolManagementRequest, dict]): The request object. SetNodePoolManagementRequest sets the node management properties of a node pool. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -2839,7 +2839,7 @@ def set_node_pool_management( def set_labels( self, - request: cluster_service.SetLabelsRequest = None, + request: Union[cluster_service.SetLabelsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -2848,7 +2848,7 @@ def set_labels( r"""Sets labels on a cluster. Args: - request (google.cloud.container_v1.types.SetLabelsRequest): + request (Union[google.cloud.container_v1.types.SetLabelsRequest, dict]): The request object. SetLabelsRequest sets the Google Cloud Platform labels on a Google Container Engine cluster, which will in turn set them for Google Compute @@ -2893,7 +2893,7 @@ def set_labels( def set_legacy_abac( self, - request: cluster_service.SetLegacyAbacRequest = None, + request: Union[cluster_service.SetLegacyAbacRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2908,7 +2908,7 @@ def set_legacy_abac( on a cluster. Args: - request (google.cloud.container_v1.types.SetLegacyAbacRequest): + request (Union[google.cloud.container_v1.types.SetLegacyAbacRequest, dict]): The request object. SetLegacyAbacRequest enables or disables the ABAC authorization mechanism for a cluster. project_id (str): @@ -3015,7 +3015,7 @@ def set_legacy_abac( def start_ip_rotation( self, - request: cluster_service.StartIPRotationRequest = None, + request: Union[cluster_service.StartIPRotationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3028,7 +3028,7 @@ def start_ip_rotation( r"""Starts master IP rotation. Args: - request (google.cloud.container_v1.types.StartIPRotationRequest): + request (Union[google.cloud.container_v1.types.StartIPRotationRequest, dict]): The request object. StartIPRotationRequest creates a new IP for the cluster and then performs a node upgrade on each node pool to point to the new IP. @@ -3126,7 +3126,7 @@ def start_ip_rotation( def complete_ip_rotation( self, - request: cluster_service.CompleteIPRotationRequest = None, + request: Union[cluster_service.CompleteIPRotationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3139,7 +3139,7 @@ def complete_ip_rotation( r"""Completes master IP rotation. Args: - request (google.cloud.container_v1.types.CompleteIPRotationRequest): + request (Union[google.cloud.container_v1.types.CompleteIPRotationRequest, dict]): The request object. CompleteIPRotationRequest moves the cluster master back into single-IP mode. project_id (str): @@ -3236,7 +3236,7 @@ def complete_ip_rotation( def set_node_pool_size( self, - request: cluster_service.SetNodePoolSizeRequest = None, + request: Union[cluster_service.SetNodePoolSizeRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -3245,7 +3245,7 @@ def set_node_pool_size( r"""Sets the size for a specific node pool. Args: - request (google.cloud.container_v1.types.SetNodePoolSizeRequest): + request (Union[google.cloud.container_v1.types.SetNodePoolSizeRequest, dict]): The request object. SetNodePoolSizeRequest sets the size a node pool. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -3288,7 +3288,7 @@ def set_node_pool_size( def set_network_policy( self, - request: cluster_service.SetNetworkPolicyRequest = None, + request: Union[cluster_service.SetNetworkPolicyRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3302,7 +3302,7 @@ def set_network_policy( r"""Enables or disables Network Policy for a cluster. Args: - request (google.cloud.container_v1.types.SetNetworkPolicyRequest): + request (Union[google.cloud.container_v1.types.SetNetworkPolicyRequest, dict]): The request object. SetNetworkPolicyRequest enables/disables network policy for a cluster. project_id (str): @@ -3408,7 +3408,7 @@ def set_network_policy( def set_maintenance_policy( self, - request: cluster_service.SetMaintenancePolicyRequest = None, + request: Union[cluster_service.SetMaintenancePolicyRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3422,7 +3422,7 @@ def set_maintenance_policy( r"""Sets the maintenance policy for a cluster. Args: - request (google.cloud.container_v1.types.SetMaintenancePolicyRequest): + request (Union[google.cloud.container_v1.types.SetMaintenancePolicyRequest, dict]): The request object. SetMaintenancePolicyRequest sets the maintenance policy for a cluster. project_id (str): @@ -3527,7 +3527,7 @@ def set_maintenance_policy( def list_usable_subnetworks( self, - request: cluster_service.ListUsableSubnetworksRequest = None, + request: Union[cluster_service.ListUsableSubnetworksRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -3537,7 +3537,7 @@ def list_usable_subnetworks( clusters in a project. Args: - request (google.cloud.container_v1.types.ListUsableSubnetworksRequest): + request (Union[google.cloud.container_v1.types.ListUsableSubnetworksRequest, dict]): The request object. ListUsableSubnetworksRequest requests the list of usable subnetworks available to a user for creating clusters. diff --git a/google/cloud/container_v1/services/cluster_manager/transports/base.py b/google/cloud/container_v1/services/cluster_manager/transports/base.py index 2cd76906..c47ec349 100644 --- a/google/cloud/container_v1/services/cluster_manager/transports/base.py +++ b/google/cloud/container_v1/services/cluster_manager/transports/base.py @@ -116,7 +116,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/container_v1/services/cluster_manager/transports/grpc.py b/google/cloud/container_v1/services/cluster_manager/transports/grpc.py index d1188dec..713489ea 100644 --- a/google/cloud/container_v1/services/cluster_manager/transports/grpc.py +++ b/google/cloud/container_v1/services/cluster_manager/transports/grpc.py @@ -81,16 +81,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py b/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py index 837092b7..37e50a7d 100644 --- a/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py +++ b/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py @@ -128,16 +128,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/container_v1beta1/services/cluster_manager/client.py b/google/cloud/container_v1beta1/services/cluster_manager/client.py index af11ef1e..3aa3c18c 100644 --- a/google/cloud/container_v1beta1/services/cluster_manager/client.py +++ b/google/cloud/container_v1beta1/services/cluster_manager/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources import warnings @@ -349,7 +349,7 @@ def __init__( def list_clusters( self, - request: cluster_service.ListClustersRequest = None, + request: Union[cluster_service.ListClustersRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -361,7 +361,7 @@ def list_clusters( specified zone or all zones. Args: - request (google.cloud.container_v1beta1.types.ListClustersRequest): + request (Union[google.cloud.container_v1beta1.types.ListClustersRequest, dict]): The request object. ListClustersRequest lists clusters. project_id (str): Required. Deprecated. The Google Developers Console @@ -437,7 +437,7 @@ def list_clusters( def get_cluster( self, - request: cluster_service.GetClusterRequest = None, + request: Union[cluster_service.GetClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -449,7 +449,7 @@ def get_cluster( r"""Gets the details for a specific cluster. Args: - request (google.cloud.container_v1beta1.types.GetClusterRequest): + request (Union[google.cloud.container_v1beta1.types.GetClusterRequest, dict]): The request object. GetClusterRequest gets the settings of a cluster. project_id (str): @@ -534,7 +534,7 @@ def get_cluster( def create_cluster( self, - request: cluster_service.CreateClusterRequest = None, + request: Union[cluster_service.CreateClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -558,7 +558,7 @@ def create_cluster( indicating which CIDR range the cluster is using. Args: - request (google.cloud.container_v1beta1.types.CreateClusterRequest): + request (Union[google.cloud.container_v1beta1.types.CreateClusterRequest, dict]): The request object. CreateClusterRequest creates a cluster. project_id (str): @@ -645,7 +645,7 @@ def create_cluster( def update_cluster( self, - request: cluster_service.UpdateClusterRequest = None, + request: Union[cluster_service.UpdateClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -658,7 +658,7 @@ def update_cluster( r"""Updates the settings for a specific cluster. Args: - request (google.cloud.container_v1beta1.types.UpdateClusterRequest): + request (Union[google.cloud.container_v1beta1.types.UpdateClusterRequest, dict]): The request object. UpdateClusterRequest updates the settings of a cluster. project_id (str): @@ -756,7 +756,7 @@ def update_cluster( def update_node_pool( self, - request: cluster_service.UpdateNodePoolRequest = None, + request: Union[cluster_service.UpdateNodePoolRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -766,7 +766,7 @@ def update_node_pool( node pool. Args: - request (google.cloud.container_v1beta1.types.UpdateNodePoolRequest): + request (Union[google.cloud.container_v1beta1.types.UpdateNodePoolRequest, dict]): The request object. SetNodePoolVersionRequest updates the version of a node pool. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -809,7 +809,7 @@ def update_node_pool( def set_node_pool_autoscaling( self, - request: cluster_service.SetNodePoolAutoscalingRequest = None, + request: Union[cluster_service.SetNodePoolAutoscalingRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -819,7 +819,7 @@ def set_node_pool_autoscaling( pool. Args: - request (google.cloud.container_v1beta1.types.SetNodePoolAutoscalingRequest): + request (Union[google.cloud.container_v1beta1.types.SetNodePoolAutoscalingRequest, dict]): The request object. SetNodePoolAutoscalingRequest sets the autoscaler settings of a node pool. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -864,7 +864,7 @@ def set_node_pool_autoscaling( def set_logging_service( self, - request: cluster_service.SetLoggingServiceRequest = None, + request: Union[cluster_service.SetLoggingServiceRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -877,7 +877,7 @@ def set_logging_service( r"""Sets the logging service for a specific cluster. Args: - request (google.cloud.container_v1beta1.types.SetLoggingServiceRequest): + request (Union[google.cloud.container_v1beta1.types.SetLoggingServiceRequest, dict]): The request object. SetLoggingServiceRequest sets the logging service of a cluster. project_id (str): @@ -987,7 +987,7 @@ def set_logging_service( def set_monitoring_service( self, - request: cluster_service.SetMonitoringServiceRequest = None, + request: Union[cluster_service.SetMonitoringServiceRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1000,7 +1000,7 @@ def set_monitoring_service( r"""Sets the monitoring service for a specific cluster. Args: - request (google.cloud.container_v1beta1.types.SetMonitoringServiceRequest): + request (Union[google.cloud.container_v1beta1.types.SetMonitoringServiceRequest, dict]): The request object. SetMonitoringServiceRequest sets the monitoring service of a cluster. project_id (str): @@ -1112,7 +1112,7 @@ def set_monitoring_service( def set_addons_config( self, - request: cluster_service.SetAddonsConfigRequest = None, + request: Union[cluster_service.SetAddonsConfigRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1125,7 +1125,7 @@ def set_addons_config( r"""Sets the addons for a specific cluster. Args: - request (google.cloud.container_v1beta1.types.SetAddonsConfigRequest): + request (Union[google.cloud.container_v1beta1.types.SetAddonsConfigRequest, dict]): The request object. SetAddonsRequest sets the addons associated with the cluster. project_id (str): @@ -1224,7 +1224,7 @@ def set_addons_config( def set_locations( self, - request: cluster_service.SetLocationsRequest = None, + request: Union[cluster_service.SetLocationsRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1239,7 +1239,7 @@ def set_locations( instead. Args: - request (google.cloud.container_v1beta1.types.SetLocationsRequest): + request (Union[google.cloud.container_v1beta1.types.SetLocationsRequest, dict]): The request object. SetLocationsRequest sets the locations of the cluster. project_id (str): @@ -1348,7 +1348,7 @@ def set_locations( def update_master( self, - request: cluster_service.UpdateMasterRequest = None, + request: Union[cluster_service.UpdateMasterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1361,7 +1361,7 @@ def update_master( r"""Updates the master for a specific cluster. Args: - request (google.cloud.container_v1beta1.types.UpdateMasterRequest): + request (Union[google.cloud.container_v1beta1.types.UpdateMasterRequest, dict]): The request object. UpdateMasterRequest updates the master of the cluster. project_id (str): @@ -1471,7 +1471,7 @@ def update_master( def set_master_auth( self, - request: cluster_service.SetMasterAuthRequest = None, + request: Union[cluster_service.SetMasterAuthRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1483,7 +1483,7 @@ def set_master_auth( password. Args: - request (google.cloud.container_v1beta1.types.SetMasterAuthRequest): + request (Union[google.cloud.container_v1beta1.types.SetMasterAuthRequest, dict]): The request object. SetMasterAuthRequest updates the admin password of a cluster. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1526,7 +1526,7 @@ def set_master_auth( def delete_cluster( self, - request: cluster_service.DeleteClusterRequest = None, + request: Union[cluster_service.DeleteClusterRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1547,7 +1547,7 @@ def delete_cluster( initially created. Args: - request (google.cloud.container_v1beta1.types.DeleteClusterRequest): + request (Union[google.cloud.container_v1beta1.types.DeleteClusterRequest, dict]): The request object. DeleteClusterRequest deletes a cluster. project_id (str): @@ -1636,7 +1636,7 @@ def delete_cluster( def list_operations( self, - request: cluster_service.ListOperationsRequest = None, + request: Union[cluster_service.ListOperationsRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1648,7 +1648,7 @@ def list_operations( zone or all zones. Args: - request (google.cloud.container_v1beta1.types.ListOperationsRequest): + request (Union[google.cloud.container_v1beta1.types.ListOperationsRequest, dict]): The request object. ListOperationsRequest lists operations. project_id (str): @@ -1725,7 +1725,7 @@ def list_operations( def get_operation( self, - request: cluster_service.GetOperationRequest = None, + request: Union[cluster_service.GetOperationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1737,7 +1737,7 @@ def get_operation( r"""Gets the specified operation. Args: - request (google.cloud.container_v1beta1.types.GetOperationRequest): + request (Union[google.cloud.container_v1beta1.types.GetOperationRequest, dict]): The request object. GetOperationRequest gets a single operation. project_id (str): @@ -1825,7 +1825,7 @@ def get_operation( def cancel_operation( self, - request: cluster_service.CancelOperationRequest = None, + request: Union[cluster_service.CancelOperationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1837,7 +1837,7 @@ def cancel_operation( r"""Cancels the specified operation. Args: - request (google.cloud.container_v1beta1.types.CancelOperationRequest): + request (Union[google.cloud.container_v1beta1.types.CancelOperationRequest, dict]): The request object. CancelOperationRequest cancels a single operation. project_id (str): @@ -1916,7 +1916,7 @@ def cancel_operation( def get_server_config( self, - request: cluster_service.GetServerConfigRequest = None, + request: Union[cluster_service.GetServerConfigRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -1928,7 +1928,7 @@ def get_server_config( Kubernetes Engine service. Args: - request (google.cloud.container_v1beta1.types.GetServerConfigRequest): + request (Union[google.cloud.container_v1beta1.types.GetServerConfigRequest, dict]): The request object. Gets the current Kubernetes Engine service configuration. project_id (str): @@ -2004,7 +2004,7 @@ def get_server_config( def list_node_pools( self, - request: cluster_service.ListNodePoolsRequest = None, + request: Union[cluster_service.ListNodePoolsRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2016,7 +2016,7 @@ def list_node_pools( r"""Lists the node pools for a cluster. Args: - request (google.cloud.container_v1beta1.types.ListNodePoolsRequest): + request (Union[google.cloud.container_v1beta1.types.ListNodePoolsRequest, dict]): The request object. ListNodePoolsRequest lists the node pool(s) for a cluster. project_id (str): @@ -2102,7 +2102,7 @@ def list_node_pools( def get_json_web_keys( self, - request: cluster_service.GetJSONWebKeysRequest = None, + request: Union[cluster_service.GetJSONWebKeysRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -2114,7 +2114,7 @@ def get_json_web_keys( available for all clusters. Args: - request (google.cloud.container_v1beta1.types.GetJSONWebKeysRequest): + request (Union[google.cloud.container_v1beta1.types.GetJSONWebKeysRequest, dict]): The request object. GetJSONWebKeysRequest gets the public component of the keys used by the cluster to sign token requests. This will be the jwks_uri for the @@ -2159,7 +2159,7 @@ def get_json_web_keys( def get_node_pool( self, - request: cluster_service.GetNodePoolRequest = None, + request: Union[cluster_service.GetNodePoolRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2172,7 +2172,7 @@ def get_node_pool( r"""Retrieves the requested node pool. Args: - request (google.cloud.container_v1beta1.types.GetNodePoolRequest): + request (Union[google.cloud.container_v1beta1.types.GetNodePoolRequest, dict]): The request object. GetNodePoolRequest retrieves a node pool for a cluster. project_id (str): @@ -2310,7 +2310,7 @@ def get_node_pool( def create_node_pool( self, - request: cluster_service.CreateNodePoolRequest = None, + request: Union[cluster_service.CreateNodePoolRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2323,7 +2323,7 @@ def create_node_pool( r"""Creates a node pool for a cluster. Args: - request (google.cloud.container_v1beta1.types.CreateNodePoolRequest): + request (Union[google.cloud.container_v1beta1.types.CreateNodePoolRequest, dict]): The request object. CreateNodePoolRequest creates a node pool for a cluster. project_id (str): @@ -2418,7 +2418,7 @@ def create_node_pool( def delete_node_pool( self, - request: cluster_service.DeleteNodePoolRequest = None, + request: Union[cluster_service.DeleteNodePoolRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2431,7 +2431,7 @@ def delete_node_pool( r"""Deletes a node pool from a cluster. Args: - request (google.cloud.container_v1beta1.types.DeleteNodePoolRequest): + request (Union[google.cloud.container_v1beta1.types.DeleteNodePoolRequest, dict]): The request object. DeleteNodePoolRequest deletes a node pool for a cluster. project_id (str): @@ -2530,7 +2530,7 @@ def delete_node_pool( def rollback_node_pool_upgrade( self, - request: cluster_service.RollbackNodePoolUpgradeRequest = None, + request: Union[cluster_service.RollbackNodePoolUpgradeRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2545,7 +2545,7 @@ def rollback_node_pool_upgrade( successfully completed. Args: - request (google.cloud.container_v1beta1.types.RollbackNodePoolUpgradeRequest): + request (Union[google.cloud.container_v1beta1.types.RollbackNodePoolUpgradeRequest, dict]): The request object. RollbackNodePoolUpgradeRequest rollbacks the previously Aborted or Failed NodePool upgrade. This will be an no-op if the last upgrade @@ -2649,7 +2649,7 @@ def rollback_node_pool_upgrade( def set_node_pool_management( self, - request: cluster_service.SetNodePoolManagementRequest = None, + request: Union[cluster_service.SetNodePoolManagementRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2663,7 +2663,7 @@ def set_node_pool_management( r"""Sets the NodeManagement options for a node pool. Args: - request (google.cloud.container_v1beta1.types.SetNodePoolManagementRequest): + request (Union[google.cloud.container_v1beta1.types.SetNodePoolManagementRequest, dict]): The request object. SetNodePoolManagementRequest sets the node management properties of a node pool. project_id (str): @@ -2774,7 +2774,7 @@ def set_node_pool_management( def set_labels( self, - request: cluster_service.SetLabelsRequest = None, + request: Union[cluster_service.SetLabelsRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2790,7 +2790,7 @@ def set_labels( r"""Sets labels on a cluster. Args: - request (google.cloud.container_v1beta1.types.SetLabelsRequest): + request (Union[google.cloud.container_v1beta1.types.SetLabelsRequest, dict]): The request object. SetLabelsRequest sets the Google Cloud Platform labels on a Google Container Engine cluster, which will in turn set them for Google Compute @@ -2906,7 +2906,7 @@ def set_labels( def set_legacy_abac( self, - request: cluster_service.SetLegacyAbacRequest = None, + request: Union[cluster_service.SetLegacyAbacRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -2920,7 +2920,7 @@ def set_legacy_abac( on a cluster. Args: - request (google.cloud.container_v1beta1.types.SetLegacyAbacRequest): + request (Union[google.cloud.container_v1beta1.types.SetLegacyAbacRequest, dict]): The request object. SetLegacyAbacRequest enables or disables the ABAC authorization mechanism for a cluster. project_id (str): @@ -3018,7 +3018,7 @@ def set_legacy_abac( def start_ip_rotation( self, - request: cluster_service.StartIPRotationRequest = None, + request: Union[cluster_service.StartIPRotationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3030,7 +3030,7 @@ def start_ip_rotation( r"""Starts master IP rotation. Args: - request (google.cloud.container_v1beta1.types.StartIPRotationRequest): + request (Union[google.cloud.container_v1beta1.types.StartIPRotationRequest, dict]): The request object. StartIPRotationRequest creates a new IP for the cluster and then performs a node upgrade on each node pool to point to the new IP. @@ -3119,7 +3119,7 @@ def start_ip_rotation( def complete_ip_rotation( self, - request: cluster_service.CompleteIPRotationRequest = None, + request: Union[cluster_service.CompleteIPRotationRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3131,7 +3131,7 @@ def complete_ip_rotation( r"""Completes master IP rotation. Args: - request (google.cloud.container_v1beta1.types.CompleteIPRotationRequest): + request (Union[google.cloud.container_v1beta1.types.CompleteIPRotationRequest, dict]): The request object. CompleteIPRotationRequest moves the cluster master back into single-IP mode. project_id (str): @@ -3219,7 +3219,7 @@ def complete_ip_rotation( def set_node_pool_size( self, - request: cluster_service.SetNodePoolSizeRequest = None, + request: Union[cluster_service.SetNodePoolSizeRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -3231,7 +3231,7 @@ def set_node_pool_size( [NodePool.locations][google.container.v1beta1.NodePool.locations]. Args: - request (google.cloud.container_v1beta1.types.SetNodePoolSizeRequest): + request (Union[google.cloud.container_v1beta1.types.SetNodePoolSizeRequest, dict]): The request object. SetNodePoolSizeRequest sets the size of a node pool. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -3274,7 +3274,7 @@ def set_node_pool_size( def set_network_policy( self, - request: cluster_service.SetNetworkPolicyRequest = None, + request: Union[cluster_service.SetNetworkPolicyRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3287,7 +3287,7 @@ def set_network_policy( r"""Enables or disables Network Policy for a cluster. Args: - request (google.cloud.container_v1beta1.types.SetNetworkPolicyRequest): + request (Union[google.cloud.container_v1beta1.types.SetNetworkPolicyRequest, dict]): The request object. SetNetworkPolicyRequest enables/disables network policy for a cluster. project_id (str): @@ -3384,7 +3384,7 @@ def set_network_policy( def set_maintenance_policy( self, - request: cluster_service.SetMaintenancePolicyRequest = None, + request: Union[cluster_service.SetMaintenancePolicyRequest, dict] = None, *, project_id: str = None, zone: str = None, @@ -3397,7 +3397,7 @@ def set_maintenance_policy( r"""Sets the maintenance policy for a cluster. Args: - request (google.cloud.container_v1beta1.types.SetMaintenancePolicyRequest): + request (Union[google.cloud.container_v1beta1.types.SetMaintenancePolicyRequest, dict]): The request object. SetMaintenancePolicyRequest sets the maintenance policy for a cluster. project_id (str): @@ -3490,7 +3490,7 @@ def set_maintenance_policy( def list_usable_subnetworks( self, - request: cluster_service.ListUsableSubnetworksRequest = None, + request: Union[cluster_service.ListUsableSubnetworksRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -3501,7 +3501,7 @@ def list_usable_subnetworks( clusters in a project. Args: - request (google.cloud.container_v1beta1.types.ListUsableSubnetworksRequest): + request (Union[google.cloud.container_v1beta1.types.ListUsableSubnetworksRequest, dict]): The request object. ListUsableSubnetworksRequest requests the list of usable subnetworks. available to a user for creating clusters. @@ -3574,7 +3574,7 @@ def list_usable_subnetworks( def list_locations( self, - request: cluster_service.ListLocationsRequest = None, + request: Union[cluster_service.ListLocationsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -3585,7 +3585,7 @@ def list_locations( Engine. Args: - request (google.cloud.container_v1beta1.types.ListLocationsRequest): + request (Union[google.cloud.container_v1beta1.types.ListLocationsRequest, dict]): The request object. ListLocationsRequest is used to request the locations that offer GKE. parent (str): diff --git a/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py b/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py index 91af1335..1f43ef2e 100644 --- a/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py +++ b/google/cloud/container_v1beta1/services/cluster_manager/transports/base.py @@ -116,7 +116,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py b/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py index 28a573c2..174a3c30 100644 --- a/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py +++ b/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py @@ -81,16 +81,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py b/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py index 7ddee6d8..da248d6d 100644 --- a/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py +++ b/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py @@ -128,16 +128,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/scripts/fixup_container_v1_keywords.py b/scripts/fixup_container_v1_keywords.py index 308cef05..834f4a32 100644 --- a/scripts/fixup_container_v1_keywords.py +++ b/scripts/fixup_container_v1_keywords.py @@ -39,38 +39,38 @@ def partition( class containerCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'cancel_operation': ('project_id', 'zone', 'operation_id', 'name', ), - 'complete_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', ), - 'create_cluster': ('cluster', 'project_id', 'zone', 'parent', ), - 'create_node_pool': ('node_pool', 'project_id', 'zone', 'cluster_id', 'parent', ), - 'delete_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), - 'delete_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'get_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), - 'get_json_web_keys': ('parent', ), - 'get_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'get_operation': ('project_id', 'zone', 'operation_id', 'name', ), - 'get_server_config': ('project_id', 'zone', 'name', ), - 'list_clusters': ('project_id', 'zone', 'parent', ), - 'list_node_pools': ('project_id', 'zone', 'cluster_id', 'parent', ), - 'list_operations': ('project_id', 'zone', 'parent', ), - 'list_usable_subnetworks': ('parent', 'filter', 'page_size', 'page_token', ), - 'rollback_node_pool_upgrade': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'set_addons_config': ('addons_config', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_labels': ('resource_labels', 'label_fingerprint', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_legacy_abac': ('enabled', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_locations': ('locations', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_logging_service': ('logging_service', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_maintenance_policy': ('project_id', 'zone', 'cluster_id', 'maintenance_policy', 'name', ), - 'set_master_auth': ('action', 'update', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_monitoring_service': ('monitoring_service', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_network_policy': ('network_policy', 'project_id', 'zone', 'cluster_id', 'name', ), - 'set_node_pool_autoscaling': ('autoscaling', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'set_node_pool_management': ('management', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'set_node_pool_size': ('node_count', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'start_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', 'rotate_credentials', ), - 'update_cluster': ('update', 'project_id', 'zone', 'cluster_id', 'name', ), - 'update_master': ('master_version', 'project_id', 'zone', 'cluster_id', 'name', ), - 'update_node_pool': ('node_version', 'image_type', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', 'locations', 'workload_metadata_config', 'upgrade_settings', ), + 'cancel_operation': ('project_id', 'zone', 'operation_id', 'name', ), + 'complete_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', ), + 'create_cluster': ('cluster', 'project_id', 'zone', 'parent', ), + 'create_node_pool': ('node_pool', 'project_id', 'zone', 'cluster_id', 'parent', ), + 'delete_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), + 'delete_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'get_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), + 'get_json_web_keys': ('parent', ), + 'get_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'get_operation': ('project_id', 'zone', 'operation_id', 'name', ), + 'get_server_config': ('project_id', 'zone', 'name', ), + 'list_clusters': ('project_id', 'zone', 'parent', ), + 'list_node_pools': ('project_id', 'zone', 'cluster_id', 'parent', ), + 'list_operations': ('project_id', 'zone', 'parent', ), + 'list_usable_subnetworks': ('parent', 'filter', 'page_size', 'page_token', ), + 'rollback_node_pool_upgrade': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'set_addons_config': ('addons_config', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_labels': ('resource_labels', 'label_fingerprint', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_legacy_abac': ('enabled', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_locations': ('locations', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_logging_service': ('logging_service', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_maintenance_policy': ('project_id', 'zone', 'cluster_id', 'maintenance_policy', 'name', ), + 'set_master_auth': ('action', 'update', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_monitoring_service': ('monitoring_service', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_network_policy': ('network_policy', 'project_id', 'zone', 'cluster_id', 'name', ), + 'set_node_pool_autoscaling': ('autoscaling', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'set_node_pool_management': ('management', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'set_node_pool_size': ('node_count', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'start_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', 'rotate_credentials', ), + 'update_cluster': ('update', 'project_id', 'zone', 'cluster_id', 'name', ), + 'update_master': ('master_version', 'project_id', 'zone', 'cluster_id', 'name', ), + 'update_node_pool': ('node_version', 'image_type', 'project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', 'locations', 'workload_metadata_config', 'upgrade_settings', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -89,7 +89,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) diff --git a/scripts/fixup_container_v1beta1_keywords.py b/scripts/fixup_container_v1beta1_keywords.py index 9ba1d854..65942b8b 100644 --- a/scripts/fixup_container_v1beta1_keywords.py +++ b/scripts/fixup_container_v1beta1_keywords.py @@ -39,39 +39,39 @@ def partition( class containerCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'cancel_operation': ('project_id', 'zone', 'operation_id', 'name', ), - 'complete_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', ), - 'create_cluster': ('project_id', 'zone', 'cluster', 'parent', ), - 'create_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool', 'parent', ), - 'delete_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), - 'delete_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'get_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), - 'get_json_web_keys': ('parent', ), - 'get_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'get_operation': ('project_id', 'zone', 'operation_id', 'name', ), - 'get_server_config': ('project_id', 'zone', 'name', ), - 'list_clusters': ('project_id', 'zone', 'parent', ), - 'list_locations': ('parent', ), - 'list_node_pools': ('project_id', 'zone', 'cluster_id', 'parent', ), - 'list_operations': ('project_id', 'zone', 'parent', ), - 'list_usable_subnetworks': ('parent', 'filter', 'page_size', 'page_token', ), - 'rollback_node_pool_upgrade': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), - 'set_addons_config': ('project_id', 'zone', 'cluster_id', 'addons_config', 'name', ), - 'set_labels': ('project_id', 'zone', 'cluster_id', 'resource_labels', 'label_fingerprint', 'name', ), - 'set_legacy_abac': ('project_id', 'zone', 'cluster_id', 'enabled', 'name', ), - 'set_locations': ('project_id', 'zone', 'cluster_id', 'locations', 'name', ), - 'set_logging_service': ('project_id', 'zone', 'cluster_id', 'logging_service', 'name', ), - 'set_maintenance_policy': ('project_id', 'zone', 'cluster_id', 'maintenance_policy', 'name', ), - 'set_master_auth': ('project_id', 'zone', 'cluster_id', 'action', 'update', 'name', ), - 'set_monitoring_service': ('project_id', 'zone', 'cluster_id', 'monitoring_service', 'name', ), - 'set_network_policy': ('project_id', 'zone', 'cluster_id', 'network_policy', 'name', ), - 'set_node_pool_autoscaling': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'autoscaling', 'name', ), - 'set_node_pool_management': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'management', 'name', ), - 'set_node_pool_size': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'node_count', 'name', ), - 'start_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', 'rotate_credentials', ), - 'update_cluster': ('project_id', 'zone', 'cluster_id', 'update', 'name', ), - 'update_master': ('project_id', 'zone', 'cluster_id', 'master_version', 'name', ), - 'update_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'node_version', 'image_type', 'locations', 'workload_metadata_config', 'name', 'upgrade_settings', 'tags', 'taints', 'labels', 'linux_node_config', 'kubelet_config', 'gvnic', ), + 'cancel_operation': ('project_id', 'zone', 'operation_id', 'name', ), + 'complete_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', ), + 'create_cluster': ('project_id', 'zone', 'cluster', 'parent', ), + 'create_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool', 'parent', ), + 'delete_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), + 'delete_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'get_cluster': ('project_id', 'zone', 'cluster_id', 'name', ), + 'get_json_web_keys': ('parent', ), + 'get_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'get_operation': ('project_id', 'zone', 'operation_id', 'name', ), + 'get_server_config': ('project_id', 'zone', 'name', ), + 'list_clusters': ('project_id', 'zone', 'parent', ), + 'list_locations': ('parent', ), + 'list_node_pools': ('project_id', 'zone', 'cluster_id', 'parent', ), + 'list_operations': ('project_id', 'zone', 'parent', ), + 'list_usable_subnetworks': ('parent', 'filter', 'page_size', 'page_token', ), + 'rollback_node_pool_upgrade': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'name', ), + 'set_addons_config': ('project_id', 'zone', 'cluster_id', 'addons_config', 'name', ), + 'set_labels': ('project_id', 'zone', 'cluster_id', 'resource_labels', 'label_fingerprint', 'name', ), + 'set_legacy_abac': ('project_id', 'zone', 'cluster_id', 'enabled', 'name', ), + 'set_locations': ('project_id', 'zone', 'cluster_id', 'locations', 'name', ), + 'set_logging_service': ('project_id', 'zone', 'cluster_id', 'logging_service', 'name', ), + 'set_maintenance_policy': ('project_id', 'zone', 'cluster_id', 'maintenance_policy', 'name', ), + 'set_master_auth': ('project_id', 'zone', 'cluster_id', 'action', 'update', 'name', ), + 'set_monitoring_service': ('project_id', 'zone', 'cluster_id', 'monitoring_service', 'name', ), + 'set_network_policy': ('project_id', 'zone', 'cluster_id', 'network_policy', 'name', ), + 'set_node_pool_autoscaling': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'autoscaling', 'name', ), + 'set_node_pool_management': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'management', 'name', ), + 'set_node_pool_size': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'node_count', 'name', ), + 'start_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', 'rotate_credentials', ), + 'update_cluster': ('project_id', 'zone', 'cluster_id', 'update', 'name', ), + 'update_master': ('project_id', 'zone', 'cluster_id', 'master_version', 'name', ), + 'update_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'node_version', 'image_type', 'locations', 'workload_metadata_config', 'name', 'upgrade_settings', 'tags', 'taints', 'labels', 'linux_node_config', 'kubelet_config', 'gvnic', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -90,7 +90,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs )