From 9a5c257d94941bb6eb11f26251fc610512efc59d Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Fri, 18 Oct 2019 16:46:23 -0700 Subject: [PATCH 1/9] use HttpLoggingPolicy in azure-identity --- .../azure-identity/azure/identity/_authn_client.py | 2 ++ .../identity/_credentials/managed_identity.py | 2 ++ .../identity/_internal/msal_transport_adapter.py | 2 ++ .../azure/identity/aio/_authn_client.py | 2 ++ .../aio/_internal/msal_transport_adapter.py | 14 ++++++++++++-- 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/sdk/identity/azure-identity/azure/identity/_authn_client.py b/sdk/identity/azure-identity/azure/identity/_authn_client.py index dd82ccd5e7c2..b358da9c95dc 100644 --- a/sdk/identity/azure-identity/azure/identity/_authn_client.py +++ b/sdk/identity/azure-identity/azure/identity/_authn_client.py @@ -14,6 +14,7 @@ from azure.core.pipeline import Pipeline from azure.core.pipeline.policies import ( ContentDecodePolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, ProxyPolicy, RetryPolicy, @@ -190,6 +191,7 @@ def __init__( config.retry_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if not transport: transport = RequestsTransport(**kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py b/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py index b88b4b9fc60f..9ce3d13119f0 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py @@ -11,6 +11,7 @@ ContentDecodePolicy, DistributedTracingPolicy, HeadersPolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, RetryPolicy, ) @@ -70,6 +71,7 @@ def __init__(self, endpoint, client_cls, config=None, client_id=None, **kwargs): config.retry_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] self._client = client_cls(endpoint=endpoint, config=config, policies=policies, **kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py index ba6f9cdb7096..f0e1ce762595 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py @@ -12,6 +12,7 @@ from azure.core.pipeline.policies import ( ContentDecodePolicy, DistributedTracingPolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, ProxyPolicy, RetryPolicy, @@ -88,6 +89,7 @@ def _build_pipeline(self, config=None, policies=None, transport=None, **kwargs): config.retry_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if not transport: transport = RequestsTransport(**kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py b/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py index 1585ade43123..d767fa8508d6 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py @@ -14,6 +14,7 @@ AsyncRetryPolicy, ContentDecodePolicy, DistributedTracingPolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, ProxyPolicy, ) @@ -44,6 +45,7 @@ def __init__( config.retry_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if not transport: transport = AioHttpTransport(**kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py b/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py index a1be9df87c77..8dd6b17035f9 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py @@ -10,7 +10,12 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import AsyncRetryPolicy, DistributedTracingPolicy, NetworkTraceLoggingPolicy +from azure.core.pipeline.policies import ( + AsyncRetryPolicy, + DistributedTracingPolicy, + HttpLoggingPolicy, + NetworkTraceLoggingPolicy, +) from azure.core.pipeline.transport import AioHttpTransport, HttpRequest from azure.identity._internal import MsalTransportResponse @@ -34,7 +39,12 @@ def __init__( ) -> None: config = config or self._create_config(**kwargs) - policies = policies or [config.retry_policy, config.logging_policy, DistributedTracingPolicy()] + policies = policies or [ + config.retry_policy, + config.logging_policy, + DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), + ] self._transport = transport or AioHttpTransport(configuration=config) atexit.register(self._close_transport_session) # prevent aiohttp warnings self._pipeline = AsyncPipeline(transport=self._transport, policies=policies) From f575b90c23924037d6c3d336b2c4d15191605156 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Fri, 18 Oct 2019 16:47:29 -0700 Subject: [PATCH 2/9] use HttpLoggingPolicy in azure-keyvault-* --- .../azure/keyvault/certificates/_shared/async_client_base.py | 3 ++- .../azure/keyvault/certificates/_shared/client_base.py | 3 ++- .../azure/keyvault/keys/_shared/async_client_base.py | 3 ++- .../azure/keyvault/keys/_shared/client_base.py | 3 ++- .../azure/keyvault/secrets/_shared/async_client_base.py | 3 ++- .../azure/keyvault/secrets/_shared/client_base.py | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py index 932aa8587184..0208b6b5a97f 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import AsyncHttpTransport from ._generated import KeyVaultClient @@ -89,6 +89,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.authentication_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py index 835893198b27..a5600128eacb 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING from azure.core.pipeline import Pipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import RequestsTransport from ._generated import KeyVaultClient from .challenge_auth_policy import ChallengeAuthPolicy @@ -89,6 +89,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.authentication_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py index 932aa8587184..0208b6b5a97f 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import AsyncHttpTransport from ._generated import KeyVaultClient @@ -89,6 +89,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.authentication_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py index 904454386038..b346357b91c0 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import Pipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import RequestsTransport from ._generated import KeyVaultClient from .challenge_auth_policy import ChallengeAuthPolicy @@ -90,6 +90,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.authentication_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py index 932aa8587184..0208b6b5a97f 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import AsyncHttpTransport from ._generated import KeyVaultClient @@ -89,6 +89,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.authentication_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py index 904454386038..b346357b91c0 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import Pipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import RequestsTransport from ._generated import KeyVaultClient from .challenge_auth_policy import ChallengeAuthPolicy @@ -90,6 +90,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.authentication_policy, config.logging_policy, DistributedTracingPolicy(), + HttpLoggingPolicy(**kwargs), ] if transport is None: From 938a3e4a901348c939b16673c5e480fd3acb9bb7 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Fri, 18 Oct 2019 16:48:47 -0700 Subject: [PATCH 3/9] ... tracing policy takes kwargs now (identity) --- sdk/identity/azure-identity/azure/identity/_authn_client.py | 2 +- .../azure/identity/_credentials/managed_identity.py | 2 +- .../azure/identity/_internal/msal_transport_adapter.py | 2 +- sdk/identity/azure-identity/azure/identity/aio/_authn_client.py | 2 +- .../azure/identity/aio/_internal/msal_transport_adapter.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/identity/azure-identity/azure/identity/_authn_client.py b/sdk/identity/azure-identity/azure/identity/_authn_client.py index b358da9c95dc..d07b0cdff082 100644 --- a/sdk/identity/azure-identity/azure/identity/_authn_client.py +++ b/sdk/identity/azure-identity/azure/identity/_authn_client.py @@ -190,7 +190,7 @@ def __init__( ContentDecodePolicy(), config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] if not transport: diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py b/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py index 9ce3d13119f0..98166d588849 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py @@ -70,7 +70,7 @@ def __init__(self, endpoint, client_cls, config=None, client_id=None, **kwargs): config.headers_policy, config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] self._client = client_cls(endpoint=endpoint, config=config, policies=policies, **kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py index f0e1ce762595..9b8e587cb9db 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py @@ -88,7 +88,7 @@ def _build_pipeline(self, config=None, policies=None, transport=None, **kwargs): ContentDecodePolicy(), config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] if not transport: diff --git a/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py b/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py index d767fa8508d6..0670dae23296 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py @@ -44,7 +44,7 @@ def __init__( ContentDecodePolicy(), config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] if not transport: diff --git a/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py b/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py index 8dd6b17035f9..442ee6a8fdfe 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py @@ -42,7 +42,7 @@ def __init__( policies = policies or [ config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] self._transport = transport or AioHttpTransport(configuration=config) From e40a3904cac1811330b340ce2a7cc0a8d8744154 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Fri, 18 Oct 2019 16:51:50 -0700 Subject: [PATCH 4/9] ... tracing policy takes kwargs now (keyvault) --- .../azure/keyvault/certificates/_shared/async_client_base.py | 2 +- .../azure/keyvault/certificates/_shared/client_base.py | 2 +- .../azure/keyvault/keys/_shared/async_client_base.py | 2 +- .../azure/keyvault/keys/_shared/client_base.py | 2 +- .../azure/keyvault/secrets/_shared/async_client_base.py | 2 +- .../azure/keyvault/secrets/_shared/client_base.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py index 0208b6b5a97f..fb876b5914ba 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py @@ -88,7 +88,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py index a5600128eacb..2edf12270621 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py @@ -88,7 +88,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py index 0208b6b5a97f..fb876b5914ba 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py @@ -88,7 +88,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py index b346357b91c0..250cd1c5e418 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py @@ -89,7 +89,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py index 0208b6b5a97f..fb876b5914ba 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py @@ -88,7 +88,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py index b346357b91c0..250cd1c5e418 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py @@ -89,7 +89,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), HttpLoggingPolicy(**kwargs), ] From 5fc7031853d341f7ea428f7133b4d6e6bc9b5d36 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Fri, 18 Oct 2019 17:04:19 -0700 Subject: [PATCH 5/9] allow keyvault header in logging --- .../azure/keyvault/certificates/_shared/async_client_base.py | 4 +++- .../azure/keyvault/certificates/_shared/client_base.py | 4 +++- .../azure/keyvault/keys/_shared/async_client_base.py | 4 +++- .../azure/keyvault/keys/_shared/client_base.py | 4 +++- .../azure/keyvault/secrets/_shared/async_client_base.py | 4 +++- .../azure/keyvault/secrets/_shared/client_base.py | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py index fb876b5914ba..0327364ecead 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -89,7 +91,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.authentication_policy, config.logging_policy, DistributedTracingPolicy(**kwargs), - HttpLoggingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py index 2edf12270621..2e805fc028c2 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint, credential, **kwargs): # pylint:disable=no-self-use def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -89,7 +91,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.authentication_policy, config.logging_policy, DistributedTracingPolicy(**kwargs), - HttpLoggingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py index fb876b5914ba..0327364ecead 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -89,7 +91,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.authentication_policy, config.logging_policy, DistributedTracingPolicy(**kwargs), - HttpLoggingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py index 250cd1c5e418..fe5a37a9ac87 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py @@ -81,6 +81,8 @@ def __init__(self, vault_endpoint, credential, **kwargs): # pylint:disable=no-self-use def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -90,7 +92,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.authentication_policy, config.logging_policy, DistributedTracingPolicy(**kwargs), - HttpLoggingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py index fb876b5914ba..0327364ecead 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -89,7 +91,7 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.authentication_policy, config.logging_policy, DistributedTracingPolicy(**kwargs), - HttpLoggingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py index 250cd1c5e418..fe5a37a9ac87 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py @@ -81,6 +81,8 @@ def __init__(self, vault_endpoint, credential, **kwargs): # pylint:disable=no-self-use def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -90,7 +92,7 @@ def _build_pipeline(self, config, transport, **kwargs): config.authentication_policy, config.logging_policy, DistributedTracingPolicy(**kwargs), - HttpLoggingPolicy(**kwargs), + logging_policy, ] if transport is None: From 580e4f3a07042f5d3781ceef5ed513fb2939f7a6 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Mon, 21 Oct 2019 09:20:27 -0700 Subject: [PATCH 6/9] fix typo --- .../azure/keyvault/certificates/_shared/async_client_base.py | 2 +- .../azure/keyvault/certificates/_shared/client_base.py | 2 +- .../azure/keyvault/keys/_shared/async_client_base.py | 2 +- .../azure/keyvault/keys/_shared/client_base.py | 2 +- .../azure/keyvault/secrets/_shared/async_client_base.py | 2 +- .../azure/keyvault/secrets/_shared/client_base.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py index 0327364ecead..eeafdd82c547 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py @@ -81,7 +81,7 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: logging_policy = HttpLoggingPolicy(**kwargs) - logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py index 2e805fc028c2..6769cad95b3b 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py @@ -81,7 +81,7 @@ def __init__(self, vault_endpoint, credential, **kwargs): def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline logging_policy = HttpLoggingPolicy(**kwargs) - logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py index 0327364ecead..eeafdd82c547 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py @@ -81,7 +81,7 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: logging_policy = HttpLoggingPolicy(**kwargs) - logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py index fe5a37a9ac87..00791a935b43 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py @@ -82,7 +82,7 @@ def __init__(self, vault_endpoint, credential, **kwargs): def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline logging_policy = HttpLoggingPolicy(**kwargs) - logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py index 0327364ecead..eeafdd82c547 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py @@ -81,7 +81,7 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: logging_policy = HttpLoggingPolicy(**kwargs) - logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py index fe5a37a9ac87..00791a935b43 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py @@ -82,7 +82,7 @@ def __init__(self, vault_endpoint, credential, **kwargs): def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline logging_policy = HttpLoggingPolicy(**kwargs) - logging_policy.allowed_header_namers.add("x-ms-keyvault-network-info") + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, From d5127394c0653f2e25050b402f3969dfa5c54bd2 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Mon, 21 Oct 2019 11:54:01 -0700 Subject: [PATCH 7/9] update azure-core dependency --- sdk/identity/azure-identity/setup.py | 2 +- sdk/keyvault/azure-keyvault-certificates/setup.py | 2 +- sdk/keyvault/azure-keyvault-keys/setup.py | 2 +- sdk/keyvault/azure-keyvault-secrets/setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/identity/azure-identity/setup.py b/sdk/identity/azure-identity/setup.py index fedcf533e319..3c170e4f3702 100644 --- a/sdk/identity/azure-identity/setup.py +++ b/sdk/identity/azure-identity/setup.py @@ -70,7 +70,7 @@ ] ), install_requires=[ - "azure-core<2.0.0,>=1.0.0b2", + "azure-core<2.0.0,>=1.0.0b5", "cryptography>=2.1.4", "msal~=0.4.1", "msal-extensions~=0.1.1", diff --git a/sdk/keyvault/azure-keyvault-certificates/setup.py b/sdk/keyvault/azure-keyvault-certificates/setup.py index ac43b02937a8..e4da99a1c89d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/setup.py +++ b/sdk/keyvault/azure-keyvault-certificates/setup.py @@ -78,7 +78,7 @@ "azure.keyvault", ] ), - install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"], + install_requires=["azure-core<2.0.0,>=1.0.0b5", "azure-common~=1.1", "msrest>=0.5.0"], extras_require={ ":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.4'": ["enum34>=1.0.4"], diff --git a/sdk/keyvault/azure-keyvault-keys/setup.py b/sdk/keyvault/azure-keyvault-keys/setup.py index f5dfb2a9e6bf..133ad8d628f8 100644 --- a/sdk/keyvault/azure-keyvault-keys/setup.py +++ b/sdk/keyvault/azure-keyvault-keys/setup.py @@ -78,7 +78,7 @@ "azure.keyvault", ] ), - install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "cryptography>=2.1.4", "msrest>=0.5.0"], + install_requires=["azure-core<2.0.0,>=1.0.0b5", "azure-common~=1.1", "cryptography>=2.1.4", "msrest>=0.5.0"], extras_require={ ":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.4'": ["enum34>=1.0.4"], diff --git a/sdk/keyvault/azure-keyvault-secrets/setup.py b/sdk/keyvault/azure-keyvault-secrets/setup.py index ccecb514929d..8852ebe8228c 100644 --- a/sdk/keyvault/azure-keyvault-secrets/setup.py +++ b/sdk/keyvault/azure-keyvault-secrets/setup.py @@ -78,7 +78,7 @@ "azure.keyvault", ] ), - install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"], + install_requires=["azure-core<2.0.0,>=1.0.0b5", "azure-common~=1.1", "msrest>=0.5.0"], extras_require={ ":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.4'": ["enum34>=1.0.4"], From 6d8b9ff28fb09c4b4dfb2c3227ebf307924f2c01 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Mon, 21 Oct 2019 12:02:06 -0700 Subject: [PATCH 8/9] exclude azure.identity from dependency test --- eng/tox/import_all.py | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/tox/import_all.py b/eng/tox/import_all.py index e3e19129650c..9d30d3a84401 100644 --- a/eng/tox/import_all.py +++ b/eng/tox/import_all.py @@ -18,6 +18,7 @@ excluded_packages = [ "azure.core.tracing.opencensus", "azure.eventhub.checkpointstoreblob.aio", + "azure.identity", "azure.keyvault.certificates", # Github issue 7879 "azure.keyvault.keys", # Github issue 7879 "azure.keyvault.secrets", # Github issue 7879 From 314c95f21b1e62adf5ce6cb9260f0b2fc4a9d588 Mon Sep 17 00:00:00 2001 From: Charles Lowell Date: Mon, 21 Oct 2019 12:10:31 -0700 Subject: [PATCH 9/9] remove shared_requirements overrides --- shared_requirements.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/shared_requirements.txt b/shared_requirements.txt index ded20019e56c..f454b03ea708 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -6,7 +6,7 @@ azure-cognitiveservices-language-nspkg azure-cognitiveservices-search-nspkg azure-cognitiveservices-vision-nspkg azure-common~=1.1 -azure-core<2.0.0,>=1.0.0b4 +azure-core<2.0.0,>=1.0.0b5 azure-cosmosdb-table~=1.0 azure-datalake-store~=0.0.18 azure-eventhub<6.0.0,>=5.0.0b3 @@ -114,10 +114,6 @@ opencensus>=0.6.0 opencensus-ext-threading opencensus-ext-azure>=0.3.1 #override azure-cognitiveservices-inkrecognizer azure-core<2.0.0,>=1.0.0b2 -#override azure-identity azure-core<2.0.0,>=1.0.0b2 -#override azure-keyvault-certificates azure-core<2.0.0,>=1.0.0b2 -#override azure-keyvault-keys azure-core<2.0.0,>=1.0.0b2 -#override azure-keyvault-secrets azure-core<2.0.0,>=1.0.0b2 #override azure-eventhub-checkpointstoreblob-aio azure-storage-blob<=12.0.0b4,>=12.0.0b2 #override azure-eventhub-checkpointstoreblob-aio aiohttp<4.0,>=3.0 #override azure-eventhub uamqp<2.0,>=1.2.3