From bb56cd1ace01253e1f991c7ca54761715283cf39 Mon Sep 17 00:00:00 2001 From: annatisch Date: Tue, 27 Aug 2019 20:05:05 -0700 Subject: [PATCH 1/4] [Core] Config not required for pipeline client --- sdk/core/azure-core/azure/core/pipeline_client.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/core/azure-core/azure/core/pipeline_client.py b/sdk/core/azure-core/azure/core/pipeline_client.py index cb02f30ef72b..566a327b41ce 100644 --- a/sdk/core/azure-core/azure/core/pipeline_client.py +++ b/sdk/core/azure-core/azure/core/pipeline_client.py @@ -59,7 +59,7 @@ class PipelineClient(PipelineClientBase): Builds a Pipeline client. :param str base_url: URL for the request. - :param config: Service configuration. This is a required parameter. + :param config: Service configuration. This is a required unless pipeline or policies are given separately. :type config: ~azure.core.Configuration :param kwargs: keyword arguments :return: A pipeline object. @@ -80,10 +80,8 @@ class PipelineClient(PipelineClientBase): :caption: Builds the pipeline client. """ - def __init__(self, base_url, config, **kwargs): + def __init__(self, base_url, config=None, **kwargs): super(PipelineClient, self).__init__(base_url) - if config is None: - raise ValueError("Config is a required parameter") self._config = config self._base_url = base_url if kwargs.get("pipeline"): @@ -106,6 +104,8 @@ def _build_pipeline(self, config, **kwargs): # pylint: disable=no-self-use policies = kwargs.get('policies') if policies is None: # [] is a valid policy list + if config is None: + raise ValueError("No config or policies supplied.") policies = [ config.headers_policy, config.user_agent_policy, From 68cec05cfdee4d5f552f699849b0d6e8e27b41a2 Mon Sep 17 00:00:00 2001 From: annatisch Date: Wed, 28 Aug 2019 15:09:13 +1200 Subject: [PATCH 2/4] Updated async pipeline client --- sdk/core/azure-core/azure/core/pipeline_client_async.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/core/azure-core/azure/core/pipeline_client_async.py b/sdk/core/azure-core/azure/core/pipeline_client_async.py index 1ebd6c637f5d..e62bd5e20e8e 100644 --- a/sdk/core/azure-core/azure/core/pipeline_client_async.py +++ b/sdk/core/azure-core/azure/core/pipeline_client_async.py @@ -58,7 +58,7 @@ class AsyncPipelineClient(PipelineClientBase): Builds an AsyncPipeline client. :param str base_url: URL for the request. - :param config: Service configuration. This is a required parameter. + :param config: Service configuration. This is a required unless pipeline or policies are given separately. :type config: ~azure.core.Configuration :param kwargs: keyword arguments. :return: An async pipeline object. @@ -79,10 +79,8 @@ class AsyncPipelineClient(PipelineClientBase): :caption: Builds the async pipeline client. """ - def __init__(self, base_url, config, **kwargs): + def __init__(self, base_url, config=None, **kwargs): super(AsyncPipelineClient, self).__init__(base_url) - if config is None: - raise ValueError("Config is a required parameter") self._config = config self._base_url = base_url if kwargs.get("pipeline"): @@ -105,6 +103,8 @@ def _build_pipeline(self, config, **kwargs): # pylint: disable=no-self-use policies = kwargs.get('policies') if policies is None: # [] is a valid policy list + if config is None: + raise ValueError("No config or policies supplied.") policies = [ config.headers_policy, config.user_agent_policy, From 7425b4c53097de955852ba3af802142ad22ea9b7 Mon Sep 17 00:00:00 2001 From: annatisch Date: Tue, 27 Aug 2019 20:15:49 -0700 Subject: [PATCH 3/4] Reordered default async pipeline --- sdk/core/azure-core/azure/core/pipeline_client_async.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/azure-core/azure/core/pipeline_client_async.py b/sdk/core/azure-core/azure/core/pipeline_client_async.py index e62bd5e20e8e..79692a4b03e3 100644 --- a/sdk/core/azure-core/azure/core/pipeline_client_async.py +++ b/sdk/core/azure-core/azure/core/pipeline_client_async.py @@ -113,8 +113,8 @@ def _build_pipeline(self, config, **kwargs): # pylint: disable=no-self-use config.redirect_policy, config.retry_policy, config.custom_hook_policy, - config.logging_policy, DistributedTracingPolicy(), + config.logging_policy, ] if not transport: From 3153a73df7d6a884a57101f987638686cf4ed61d Mon Sep 17 00:00:00 2001 From: annatisch Date: Tue, 27 Aug 2019 20:16:55 -0700 Subject: [PATCH 4/4] Reordered default pipeline --- sdk/core/azure-core/azure/core/pipeline_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/azure-core/azure/core/pipeline_client.py b/sdk/core/azure-core/azure/core/pipeline_client.py index 566a327b41ce..32d1be10120c 100644 --- a/sdk/core/azure-core/azure/core/pipeline_client.py +++ b/sdk/core/azure-core/azure/core/pipeline_client.py @@ -114,8 +114,8 @@ def _build_pipeline(self, config, **kwargs): # pylint: disable=no-self-use config.redirect_policy, config.retry_policy, config.custom_hook_policy, - config.logging_policy, DistributedTracingPolicy(), + config.logging_policy, ] if not transport: