From e5933930adf757ad4bdecdbc5dcfed7b171d2a9d Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 18 Oct 2019 12:39:53 -0700 Subject: [PATCH 1/8] Update documentation link in CODEOWNERS (#8015) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b5c7781047fc..1de334424f10 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,5 @@ # Instructions for CODEOWNERS file format and automatic build failure notifications: -# https://github.com/Azure/azure-sdk/blob/master/docs/engineering-system/codeowners.md +# https://github.com/Azure/azure-sdk/blob/master/docs/policies/opensource.md#codeowners ########### # SDK From 8eb690237615a845dd9caebb2e94eeae4d73ddf7 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Fri, 18 Oct 2019 14:48:41 -0700 Subject: [PATCH 2/8] remove half of the extraneous ci.yml triggers on core --- sdk/kusto/ci.yml | 2 -- sdk/labservices/ci.yml | 2 -- sdk/loganalytics/ci.yml | 2 -- sdk/logic/ci.yml | 2 -- sdk/machinelearning/ci.yml | 2 -- sdk/managedservices/ci.yml | 2 -- sdk/managementgroups/ci.yml | 2 -- sdk/managementpartner/ci.yml | 2 -- sdk/maps/ci.yml | 2 -- sdk/marketplaceordering/ci.yml | 2 -- sdk/media/ci.yml | 2 -- sdk/mixedreality/ci.yml | 2 -- sdk/monitor/ci.yml | 2 -- sdk/netapp/ci.yml | 2 -- sdk/network/ci.yml | 2 -- sdk/notificationhubs/ci.yml | 2 -- sdk/peering/ci.yml | 2 -- sdk/policyinsights/ci.yml | 2 -- sdk/powerbiembedded/ci.yml | 2 -- sdk/rdbms/ci.yml | 2 -- sdk/recoveryservices/ci.yml | 2 -- sdk/redis/ci.yml | 2 -- sdk/relay/ci.yml | 2 -- sdk/reservations/ci.yml | 2 -- sdk/resources/ci.yml | 2 -- sdk/scheduler/ci.yml | 2 -- sdk/search/ci.yml | 2 -- sdk/security/ci.yml | 2 -- sdk/serialconsole/ci.yml | 2 -- sdk/servermanager/ci.yml | 2 -- sdk/servicebus/ci.yml | 2 -- sdk/servicefabric/ci.yml | 2 -- sdk/signalr/ci.yml | 2 -- sdk/sql/ci.yml | 2 -- sdk/subscription/ci.yml | 2 -- sdk/template/ci.yml | 2 -- sdk/trafficmanager/ci.yml | 2 -- 37 files changed, 74 deletions(-) diff --git a/sdk/kusto/ci.yml b/sdk/kusto/ci.yml index 3dcbb77110c6..cd9c5dca2d7b 100644 --- a/sdk/kusto/ci.yml +++ b/sdk/kusto/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/kusto/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/kusto/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/labservices/ci.yml b/sdk/labservices/ci.yml index 581fcfd6de06..7223aa53d96d 100644 --- a/sdk/labservices/ci.yml +++ b/sdk/labservices/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/labservices/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/labservices/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/loganalytics/ci.yml b/sdk/loganalytics/ci.yml index 59609c39038d..759a44141392 100644 --- a/sdk/loganalytics/ci.yml +++ b/sdk/loganalytics/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/loganalytics/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/loganalytics/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/logic/ci.yml b/sdk/logic/ci.yml index d592e9046a26..543359864a5d 100644 --- a/sdk/logic/ci.yml +++ b/sdk/logic/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/logic/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/logic/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/machinelearning/ci.yml b/sdk/machinelearning/ci.yml index 77bf98c5e88f..997d779ebd3f 100644 --- a/sdk/machinelearning/ci.yml +++ b/sdk/machinelearning/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/machinelearning/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/machinelearning/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/managedservices/ci.yml b/sdk/managedservices/ci.yml index d164a3e2be2a..29fe23349b5b 100644 --- a/sdk/managedservices/ci.yml +++ b/sdk/managedservices/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/managedservices/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/managedservices/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/managementgroups/ci.yml b/sdk/managementgroups/ci.yml index dbf280d0f70d..f277cc2f8768 100644 --- a/sdk/managementgroups/ci.yml +++ b/sdk/managementgroups/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/managementgroups/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/managementgroups/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/managementpartner/ci.yml b/sdk/managementpartner/ci.yml index c9bf09e3b6ef..a5e386e5e229 100644 --- a/sdk/managementpartner/ci.yml +++ b/sdk/managementpartner/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/managementpartner/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/managementpartner/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/maps/ci.yml b/sdk/maps/ci.yml index 9e25db234580..adc309f89e97 100644 --- a/sdk/maps/ci.yml +++ b/sdk/maps/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/maps/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/maps/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/marketplaceordering/ci.yml b/sdk/marketplaceordering/ci.yml index 235684db3c6d..cecf833f41b3 100644 --- a/sdk/marketplaceordering/ci.yml +++ b/sdk/marketplaceordering/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/marketplaceordering/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/marketplaceordering/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/media/ci.yml b/sdk/media/ci.yml index 0148780d99a4..8d9095e0877a 100644 --- a/sdk/media/ci.yml +++ b/sdk/media/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/media/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/media/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/mixedreality/ci.yml b/sdk/mixedreality/ci.yml index 112628da39ee..b0b7c4515230 100644 --- a/sdk/mixedreality/ci.yml +++ b/sdk/mixedreality/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/mixedreality/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/mixedreality/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/monitor/ci.yml b/sdk/monitor/ci.yml index bb66f128a783..641a40159596 100644 --- a/sdk/monitor/ci.yml +++ b/sdk/monitor/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/monitor/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/monitor/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/netapp/ci.yml b/sdk/netapp/ci.yml index 538b474d9be9..b21c2a4f8a19 100644 --- a/sdk/netapp/ci.yml +++ b/sdk/netapp/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/netapp/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/netapp/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/network/ci.yml b/sdk/network/ci.yml index 2ab0a8144e8c..80ec3fff1ef5 100644 --- a/sdk/network/ci.yml +++ b/sdk/network/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/network/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/network/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/notificationhubs/ci.yml b/sdk/notificationhubs/ci.yml index 4aff9f1e66cb..453dc3d8e2b6 100644 --- a/sdk/notificationhubs/ci.yml +++ b/sdk/notificationhubs/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/notificationhubs/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/notificationhubs/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/peering/ci.yml b/sdk/peering/ci.yml index 8cd7891380bb..fb76cdccf8d2 100644 --- a/sdk/peering/ci.yml +++ b/sdk/peering/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/peering/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/peering/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/policyinsights/ci.yml b/sdk/policyinsights/ci.yml index 89685ddb745b..a89faaba16bf 100644 --- a/sdk/policyinsights/ci.yml +++ b/sdk/policyinsights/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/policyinsights/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/policyinsights/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/powerbiembedded/ci.yml b/sdk/powerbiembedded/ci.yml index 6f2bcc62cf05..0da10912e00f 100644 --- a/sdk/powerbiembedded/ci.yml +++ b/sdk/powerbiembedded/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/powerbiembedded/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/powerbiembedded/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/rdbms/ci.yml b/sdk/rdbms/ci.yml index 852bad71f7b3..e338ee060a04 100644 --- a/sdk/rdbms/ci.yml +++ b/sdk/rdbms/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/rdbms/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/rdbms/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/recoveryservices/ci.yml b/sdk/recoveryservices/ci.yml index 8fa60df60474..92f8e58cd218 100644 --- a/sdk/recoveryservices/ci.yml +++ b/sdk/recoveryservices/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/recoveryservices/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/recoveryservices/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/redis/ci.yml b/sdk/redis/ci.yml index a95f7b015d4f..430f09b91727 100644 --- a/sdk/redis/ci.yml +++ b/sdk/redis/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/redis/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/redis/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/relay/ci.yml b/sdk/relay/ci.yml index a1d7a6e166ca..e3d14cc15b03 100644 --- a/sdk/relay/ci.yml +++ b/sdk/relay/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/relay/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/relay/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/reservations/ci.yml b/sdk/reservations/ci.yml index b0c04f0aaa37..755f8aae3b93 100644 --- a/sdk/reservations/ci.yml +++ b/sdk/reservations/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/reservations/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/reservations/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/resources/ci.yml b/sdk/resources/ci.yml index 32b78c0db962..834c8eae44be 100644 --- a/sdk/resources/ci.yml +++ b/sdk/resources/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/resources/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/resources/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/scheduler/ci.yml b/sdk/scheduler/ci.yml index af3e8b3c5b56..6121754ee63c 100644 --- a/sdk/scheduler/ci.yml +++ b/sdk/scheduler/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/scheduler/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/scheduler/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/search/ci.yml b/sdk/search/ci.yml index 13d43cb3a14b..a232a5f248de 100644 --- a/sdk/search/ci.yml +++ b/sdk/search/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/search/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/search/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/security/ci.yml b/sdk/security/ci.yml index 2189b9fc7f59..586a83528680 100644 --- a/sdk/security/ci.yml +++ b/sdk/security/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/security/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/security/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/serialconsole/ci.yml b/sdk/serialconsole/ci.yml index dcc90364044c..0cd33c61f5c2 100644 --- a/sdk/serialconsole/ci.yml +++ b/sdk/serialconsole/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/serialconsole/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/serialconsole/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/servermanager/ci.yml b/sdk/servermanager/ci.yml index a16f829b6a7e..1f690ce22148 100644 --- a/sdk/servermanager/ci.yml +++ b/sdk/servermanager/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/servermanager/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/servermanager/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/servicebus/ci.yml b/sdk/servicebus/ci.yml index 88a0c2174b6b..b3ed3daab9c7 100644 --- a/sdk/servicebus/ci.yml +++ b/sdk/servicebus/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/servicebus/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/servicebus/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/servicefabric/ci.yml b/sdk/servicefabric/ci.yml index 908e2fe8b10c..c4cfa1599412 100644 --- a/sdk/servicefabric/ci.yml +++ b/sdk/servicefabric/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/servicefabric/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/servicefabric/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/signalr/ci.yml b/sdk/signalr/ci.yml index 6631e7a5df8e..99d2c6284ceb 100644 --- a/sdk/signalr/ci.yml +++ b/sdk/signalr/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/signalr/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/signalr/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/sql/ci.yml b/sdk/sql/ci.yml index cf92024a61ab..b409bbc12599 100644 --- a/sdk/sql/ci.yml +++ b/sdk/sql/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/sql/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/sql/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/subscription/ci.yml b/sdk/subscription/ci.yml index b14683de6fea..2af8977cdea6 100644 --- a/sdk/subscription/ci.yml +++ b/sdk/subscription/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/subscription/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/subscription/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml index df1b973f1777..45547e0d10b5 100644 --- a/sdk/template/ci.yml +++ b/sdk/template/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/template/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/template/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml diff --git a/sdk/trafficmanager/ci.yml b/sdk/trafficmanager/ci.yml index 7d13dec87aef..5d75622f1eb3 100644 --- a/sdk/trafficmanager/ci.yml +++ b/sdk/trafficmanager/ci.yml @@ -22,7 +22,6 @@ trigger: paths: include: - sdk/trafficmanager/ - - sdk/core/ pr: branches: @@ -35,7 +34,6 @@ pr: paths: include: - sdk/trafficmanager/ - - sdk/core/ stages: - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml From 65edd30136f291898b890e5fa40346e4bb716bd4 Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Fri, 18 Oct 2019 16:29:20 -0700 Subject: [PATCH 3/8] logging policy with tests and bugfixes + conside impl (#8048) --- sdk/core/azure-core/HISTORY.md | 1 + .../azure/core/pipeline/policies/__init__.py | 4 +- .../core/pipeline/policies/_universal.py | 101 ++++++++++ .../tests/test_universal_pipeline.py | 180 +++++++++++++++++- 4 files changed, 284 insertions(+), 2 deletions(-) diff --git a/sdk/core/azure-core/HISTORY.md b/sdk/core/azure-core/HISTORY.md index 93f247b1f1c6..5af465b79aff 100644 --- a/sdk/core/azure-core/HISTORY.md +++ b/sdk/core/azure-core/HISTORY.md @@ -10,6 +10,7 @@ - Tracing: DistributedTracingPolicy now accepts kwargs network_span_namer to change network span name #7773 - Tracing: Implementation of AbstractSpan can now use the mixin HttpSpanMixin to get HTTP span update automatically #7773 - Tracing: AbstractSpan contract "change_context" introduced #7773 +- Introduce new policy HttpLoggingPolicy #7988 ### Bug fixes diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/__init__.py b/sdk/core/azure-core/azure/core/pipeline/policies/__init__.py index 9e321cee1138..4b724ee41493 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/__init__.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/__init__.py @@ -35,7 +35,8 @@ UserAgentPolicy, NetworkTraceLoggingPolicy, ContentDecodePolicy, - ProxyPolicy + ProxyPolicy, + HttpLoggingPolicy, ) __all__ = [ @@ -52,6 +53,7 @@ 'CustomHookPolicy', 'DistributedTracingPolicy', 'RequestHistory', + 'HttpLoggingPolicy', ] #pylint: disable=unused-import diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py index 3df461c0feac..3320f6f094ab 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py @@ -36,6 +36,7 @@ import re from typing import (Mapping, IO, TypeVar, TYPE_CHECKING, Type, cast, List, Callable, Iterator, # pylint: disable=unused-import Any, Union, Dict, Optional, AnyStr) +from six.moves import urllib from azure.core import __version__ as azcore_version from azure.core.exceptions import ( @@ -267,6 +268,106 @@ def on_response(self, request, response): _LOGGER.debug("Failed to log response: %s", repr(err)) +class HttpLoggingPolicy(SansIOHTTPPolicy): + """The Pipeline policy that handles logging of HTTP requests and responses. + """ + + DEFAULT_HEADERS_WHITELIST = set([ + "x-ms-client-request-id", + "x-ms-return-client-request-id", + "traceparent", + "Accept", + "Cache-Control", + "Connection", + "Content-Length", + "Content-Type", + "Date", + "ETag", + "Expires", + "If-Match", + "If-Modified-Since", + "If-None-Match", + "If-Unmodified-Since", + "Last-Modified", + "Pragma", + "Request-Id", + "Retry-After", + "Server", + "Transfer-Encoding", + "User-Agent" + ]) + REDACTED_PLACEHOLDER = "REDACTED" + + def __init__(self, logger=None, **kwargs): # pylint: disable=unused-argument + self.logger = logger or logging.getLogger( + "azure.core.pipeline.policies.http_logging_policy" + ) + self.allowed_query_params = set() + self.allowed_header_namers = set(HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST) + + def _redact_query_param(self, key, value): + lower_case_allowed_query_params = [ + param.lower() for param in self.allowed_query_params + ] + return value if key.lower() in lower_case_allowed_query_params else HttpLoggingPolicy.REDACTED_PLACEHOLDER + + def _redact_header(self, key, value): + lower_case_allowed_header_namers = [ + header.lower() for header in self.allowed_header_namers + ] + return value if key.lower() in lower_case_allowed_header_namers else HttpLoggingPolicy.REDACTED_PLACEHOLDER + + def on_request(self, request): + # type: (PipelineRequest) -> None + """Logs HTTP method, url and headers. + :param request: The PipelineRequest object. + :type request: ~azure.core.pipeline.PipelineRequest + """ + http_request = request.http_request + options = request.context.options + # Get logger in my context first (request has been retried) + # then read from kwargs (pop if that's the case) + # then use my instance logger + logger = request.context.setdefault("logger", options.pop("logger", self.logger)) + + if not logger.isEnabledFor(logging.INFO): + return + + try: + parsed_url = list(urllib.parse.urlparse(http_request.url)) + parsed_qp = urllib.parse.parse_qsl(parsed_url[4], keep_blank_values=True) + filtered_qp = [(key, self._redact_query_param(key, value)) for key, value in parsed_qp] + # 4 is query + parsed_url[4] = "&".join(["=".join(part) for part in filtered_qp]) + redacted_url = urllib.parse.urlunparse(parsed_url) + + logger.info("Request URL: %r", redacted_url) + logger.info("Request method: %r", http_request.method) + logger.info("Request headers:") + for header, value in http_request.headers.items(): + value = self._redact_header(header, value) + logger.info(" %r: %r", header, value) + except Exception as err: # pylint: disable=broad-except + logger.warning("Failed to log request: %s", repr(err)) + + def on_response(self, request, response): + # type: (PipelineRequest, PipelineResponse) -> None + http_response = response.http_response + logger = response.context.get("logger") + + if not logger.isEnabledFor(logging.INFO): + return + + try: + logger.info("Response status: %r", http_response.status_code) + logger.info("Response headers:") + for res_header, value in http_response.headers.items(): + value = self._redact_header(res_header, value) + logger.info(" %r: %r", res_header, value) + except Exception as err: # pylint: disable=broad-except + logger.warning("Failed to log response: %s", repr(err)) + + class ContentDecodePolicy(SansIOHTTPPolicy): """Policy for decoding unstreamed response content. """ diff --git a/sdk/core/azure-core/tests/test_universal_pipeline.py b/sdk/core/azure-core/tests/test_universal_pipeline.py index 8ca5d3857131..e0a9079709fc 100644 --- a/sdk/core/azure-core/tests/test_universal_pipeline.py +++ b/sdk/core/azure-core/tests/test_universal_pipeline.py @@ -24,6 +24,7 @@ # THE SOFTWARE. # #-------------------------------------------------------------------------- +import logging try: from unittest import mock except ImportError: @@ -49,7 +50,8 @@ from azure.core.pipeline.policies import ( NetworkTraceLoggingPolicy, ContentDecodePolicy, - UserAgentPolicy + UserAgentPolicy, + HttpLoggingPolicy, ) def test_user_agent(): @@ -192,3 +194,179 @@ def body(self): raw_deserializer.on_response(None, response) result = response.context["deserialized_data"] assert result["success"] is True + + +def test_http_logger(): + + class MockHandler(logging.Handler): + def __init__(self): + super(MockHandler, self).__init__() + self.messages = [] + def reset(self): + self.messages = [] + def emit(self, record): + self.messages.append(record) + mock_handler = MockHandler() + + logger = logging.getLogger("testlogger") + logger.addHandler(mock_handler) + logger.setLevel(logging.DEBUG) + + policy = HttpLoggingPolicy(logger=logger) + + universal_request = HttpRequest('GET', 'http://127.0.0.1/') + http_response = HttpResponse(universal_request, None) + http_response.status_code = 202 + request = PipelineRequest(universal_request, PipelineContext(None)) + + # Basics + + policy.on_request(request) + response = PipelineResponse(request, http_response, request.context) + policy.on_response(request, response) + + assert all(m.levelname == 'INFO' for m in mock_handler.messages) + assert len(mock_handler.messages) == 5 + assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'" + assert mock_handler.messages[1].message == "Request method: 'GET'" + assert mock_handler.messages[2].message == 'Request headers:' + assert mock_handler.messages[3].message == 'Response status: 202' + assert mock_handler.messages[4].message == 'Response headers:' + + mock_handler.reset() + + # Let's make this request a failure, retried twice + + policy.on_request(request) + response = PipelineResponse(request, http_response, request.context) + policy.on_response(request, response) + + policy.on_request(request) + response = PipelineResponse(request, http_response, request.context) + policy.on_response(request, response) + + assert all(m.levelname == 'INFO' for m in mock_handler.messages) + assert len(mock_handler.messages) == 10 + assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'" + assert mock_handler.messages[1].message == "Request method: 'GET'" + assert mock_handler.messages[2].message == 'Request headers:' + assert mock_handler.messages[3].message == 'Response status: 202' + assert mock_handler.messages[4].message == 'Response headers:' + assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'" + assert mock_handler.messages[1].message == "Request method: 'GET'" + assert mock_handler.messages[2].message == 'Request headers:' + assert mock_handler.messages[3].message == 'Response status: 202' + assert mock_handler.messages[4].message == 'Response headers:' + + mock_handler.reset() + + # Headers and query parameters + + policy.allowed_query_params = ['country'] + + universal_request.headers = { + "Accept": "Caramel", + "Hate": "Chocolat", + } + http_response.headers = { + "Content-Type": "Caramel", + "HateToo": "Chocolat", + } + universal_request.url = "http://127.0.0.1/?country=france&city=aix" + + policy.on_request(request) + response = PipelineResponse(request, http_response, request.context) + policy.on_response(request, response) + + assert all(m.levelname == 'INFO' for m in mock_handler.messages) + assert len(mock_handler.messages) == 9 + assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/?country=france&city=REDACTED'" + assert mock_handler.messages[1].message == "Request method: 'GET'" + assert mock_handler.messages[2].message == "Request headers:" + # Dict not ordered in Python, exact logging order doesn't matter + assert set([ + mock_handler.messages[3].message, + mock_handler.messages[4].message + ]) == set([ + " 'Accept': 'Caramel'", + " 'Hate': 'REDACTED'" + ]) + assert mock_handler.messages[5].message == "Response status: 202" + assert mock_handler.messages[6].message == "Response headers:" + # Dict not ordered in Python, exact logging order doesn't matter + assert set([ + mock_handler.messages[7].message, + mock_handler.messages[8].message + ]) == set([ + " 'Content-Type': 'Caramel'", + " 'HateToo': 'REDACTED'" + ]) + + mock_handler.reset() + +def test_http_logger_operation_level(): + + class MockHandler(logging.Handler): + def __init__(self): + super(MockHandler, self).__init__() + self.messages = [] + def reset(self): + self.messages = [] + def emit(self, record): + self.messages.append(record) + mock_handler = MockHandler() + + logger = logging.getLogger("testlogger") + logger.addHandler(mock_handler) + logger.setLevel(logging.DEBUG) + + policy = HttpLoggingPolicy() + kwargs={'logger': logger} + + universal_request = HttpRequest('GET', 'http://127.0.0.1/') + http_response = HttpResponse(universal_request, None) + http_response.status_code = 202 + request = PipelineRequest(universal_request, PipelineContext(None, **kwargs)) + + # Basics + + policy.on_request(request) + response = PipelineResponse(request, http_response, request.context) + policy.on_response(request, response) + + assert all(m.levelname == 'INFO' for m in mock_handler.messages) + assert len(mock_handler.messages) == 5 + assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'" + assert mock_handler.messages[1].message == "Request method: 'GET'" + assert mock_handler.messages[2].message == 'Request headers:' + assert mock_handler.messages[3].message == 'Response status: 202' + assert mock_handler.messages[4].message == 'Response headers:' + + mock_handler.reset() + + # Let's make this request a failure, retried twice + + request = PipelineRequest(universal_request, PipelineContext(None, **kwargs)) + + policy.on_request(request) + response = PipelineResponse(request, http_response, request.context) + policy.on_response(request, response) + + policy.on_request(request) + response = PipelineResponse(request, http_response, request.context) + policy.on_response(request, response) + + assert all(m.levelname == 'INFO' for m in mock_handler.messages) + assert len(mock_handler.messages) == 10 + assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'" + assert mock_handler.messages[1].message == "Request method: 'GET'" + assert mock_handler.messages[2].message == 'Request headers:' + assert mock_handler.messages[3].message == 'Response status: 202' + assert mock_handler.messages[4].message == 'Response headers:' + assert mock_handler.messages[0].message == "Request URL: 'http://127.0.0.1/'" + assert mock_handler.messages[1].message == "Request method: 'GET'" + assert mock_handler.messages[2].message == 'Request headers:' + assert mock_handler.messages[3].message == 'Response status: 202' + assert mock_handler.messages[4].message == 'Response headers:' + + mock_handler.reset() From 657d9c8e6cbb8bd543d2996112ee9f00dd45cf87 Mon Sep 17 00:00:00 2001 From: iscai-msft <43154838+iscai-msft@users.noreply.github.com> Date: Fri, 18 Oct 2019 16:55:12 -0700 Subject: [PATCH 4/8] Key Vault: regenerated keyvault for paging logging (#8022) * regenerated keyvault for paging logging * fixed kwargs to pop max_page_size --- .../_generated/v2016_10_01/_configuration.py | 17 +++--- .../v2016_10_01/aio/_configuration_async.py | 16 +++--- .../_key_vault_client_operations_async.py | 48 ++++++++-------- .../_key_vault_client_operations.py | 48 ++++++++-------- .../_shared/_generated/v7_0/_configuration.py | 17 +++--- .../v7_0/aio/_configuration_async.py | 16 +++--- .../_key_vault_client_operations_async.py | 56 +++++++++---------- .../_key_vault_client_operations.py | 56 +++++++++---------- .../azure/keyvault/keys/_client.py | 6 +- .../_generated/v2016_10_01/_configuration.py | 17 +++--- .../v2016_10_01/aio/_configuration_async.py | 16 +++--- .../_key_vault_client_operations_async.py | 48 ++++++++-------- .../_key_vault_client_operations.py | 48 ++++++++-------- .../_shared/_generated/v7_0/_configuration.py | 17 +++--- .../v7_0/aio/_configuration_async.py | 16 +++--- .../_key_vault_client_operations_async.py | 56 +++++++++---------- .../_key_vault_client_operations.py | 56 +++++++++---------- .../azure/keyvault/secrets/_client.py | 6 +- .../_generated/v2016_10_01/_configuration.py | 17 +++--- .../v2016_10_01/aio/_configuration_async.py | 16 +++--- .../_key_vault_client_operations_async.py | 48 ++++++++-------- .../_key_vault_client_operations.py | 48 ++++++++-------- .../_shared/_generated/v7_0/_configuration.py | 17 +++--- .../v7_0/aio/_configuration_async.py | 16 +++--- .../_key_vault_client_operations_async.py | 56 +++++++++---------- .../_key_vault_client_operations.py | 56 +++++++++---------- 26 files changed, 414 insertions(+), 420 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/_configuration.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/_configuration.py index 28cf75e3d2b4..68d6f5b6bd2c 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/_configuration.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/_configuration.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from .version import VERSION @@ -38,11 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.RetryPolicy(**kwargs) - self.custom_hook_policy = policies.CustomHookPolicy(**kwargs) - self.redirect_policy = policies.RedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/_configuration_async.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/_configuration_async.py index a61d9eeff444..fb961bb4bd2d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/_configuration_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/_configuration_async.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from ..version import VERSION @@ -38,10 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.AsyncRetryPolicy(**kwargs) - self.redirect_policy = policies.AsyncRedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py index b5cc965119ed..2e34320ea0fe 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py @@ -394,6 +394,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -431,10 +432,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -469,6 +469,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -505,10 +506,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1152,6 +1152,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1188,10 +1189,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1659,6 +1659,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1695,10 +1696,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1732,6 +1732,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1769,10 +1770,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1804,6 +1804,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1840,10 +1841,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2196,10 +2197,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2457,6 +2457,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2493,10 +2494,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3532,6 +3532,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3568,10 +3569,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3770,6 +3770,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3806,10 +3807,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4162,6 +4162,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4199,10 +4200,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py index 0ae7fd5fb025..a84f1ad1ee7d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py @@ -394,6 +394,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -431,10 +432,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -469,6 +469,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -505,10 +506,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1152,6 +1152,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1188,10 +1189,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1659,6 +1659,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1695,10 +1696,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1732,6 +1732,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1769,10 +1770,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1804,6 +1804,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1840,10 +1841,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2196,10 +2197,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2457,6 +2457,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2493,10 +2494,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3532,6 +3532,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3568,10 +3569,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3770,6 +3770,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3806,10 +3807,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4162,6 +4162,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4199,10 +4200,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/_configuration.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/_configuration.py index 28cf75e3d2b4..68d6f5b6bd2c 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/_configuration.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/_configuration.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from .version import VERSION @@ -38,11 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.RetryPolicy(**kwargs) - self.custom_hook_policy = policies.CustomHookPolicy(**kwargs) - self.redirect_policy = policies.RedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/_configuration_async.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/_configuration_async.py index a61d9eeff444..fb961bb4bd2d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/_configuration_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/_configuration_async.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from ..version import VERSION @@ -38,10 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.AsyncRetryPolicy(**kwargs) - self.redirect_policy = policies.AsyncRedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py index 08e45c2b44a7..1675be60f93a 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py @@ -393,6 +393,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -430,10 +431,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -468,6 +468,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -504,10 +505,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1151,6 +1151,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1187,10 +1188,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1656,6 +1656,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1692,10 +1693,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1729,6 +1729,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1766,10 +1767,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1801,6 +1801,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1837,10 +1838,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2198,10 +2199,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2459,6 +2459,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2495,10 +2496,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3654,6 +3654,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3692,10 +3693,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3894,6 +3894,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3930,10 +3931,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3965,6 +3965,7 @@ def get_deleted_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4001,10 +4002,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4641,6 +4641,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4678,10 +4679,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4716,6 +4716,7 @@ def get_deleted_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4753,10 +4754,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/operations/_key_vault_client_operations.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/operations/_key_vault_client_operations.py index b9ed6e10ea21..da216d1db657 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/operations/_key_vault_client_operations.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_generated/v7_0/operations/_key_vault_client_operations.py @@ -393,6 +393,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -430,10 +431,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -468,6 +468,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -504,10 +505,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1151,6 +1151,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1187,10 +1188,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1656,6 +1656,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1692,10 +1693,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1729,6 +1729,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1766,10 +1767,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1801,6 +1801,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1837,10 +1838,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2198,10 +2199,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2459,6 +2459,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2495,10 +2496,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3654,6 +3654,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3692,10 +3693,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3894,6 +3894,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3930,10 +3931,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3965,6 +3965,7 @@ def get_deleted_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4001,10 +4002,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4641,6 +4641,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4678,10 +4679,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4716,6 +4716,7 @@ def get_deleted_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4753,10 +4754,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_client.py index df9e0344271f..2eab11fa5e8f 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_client.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_client.py @@ -252,7 +252,7 @@ def list_deleted_keys(self, **kwargs): :caption: List all the deleted keys :dedent: 8 """ - max_page_size = kwargs.get("max_page_size", None) + max_page_size = kwargs.pop("max_page_size", None) return self._client.get_deleted_keys( self._vault_endpoint, maxresults=max_page_size, @@ -276,7 +276,7 @@ def list_properties_of_keys(self, **kwargs): :caption: List all keys :dedent: 8 """ - max_page_size = kwargs.get("max_page_size", None) + max_page_size = kwargs.pop("max_page_size", None) return self._client.get_keys( self._vault_endpoint, maxresults=max_page_size, @@ -301,7 +301,7 @@ def list_key_versions(self, name, **kwargs): :caption: List all versions of a key :dedent: 8 """ - max_page_size = kwargs.get("max_page_size", None) + max_page_size = kwargs.pop("max_page_size", None) return self._client.get_key_versions( self._vault_endpoint, name, diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/_configuration.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/_configuration.py index 28cf75e3d2b4..68d6f5b6bd2c 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/_configuration.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/_configuration.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from .version import VERSION @@ -38,11 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.RetryPolicy(**kwargs) - self.custom_hook_policy = policies.CustomHookPolicy(**kwargs) - self.redirect_policy = policies.RedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/_configuration_async.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/_configuration_async.py index a61d9eeff444..fb961bb4bd2d 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/_configuration_async.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/_configuration_async.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from ..version import VERSION @@ -38,10 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.AsyncRetryPolicy(**kwargs) - self.redirect_policy = policies.AsyncRedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py index b5cc965119ed..2e34320ea0fe 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py @@ -394,6 +394,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -431,10 +432,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -469,6 +469,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -505,10 +506,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1152,6 +1152,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1188,10 +1189,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1659,6 +1659,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1695,10 +1696,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1732,6 +1732,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1769,10 +1770,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1804,6 +1804,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1840,10 +1841,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2196,10 +2197,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2457,6 +2457,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2493,10 +2494,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3532,6 +3532,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3568,10 +3569,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3770,6 +3770,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3806,10 +3807,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4162,6 +4162,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4199,10 +4200,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py index 0ae7fd5fb025..a84f1ad1ee7d 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py @@ -394,6 +394,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -431,10 +432,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -469,6 +469,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -505,10 +506,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1152,6 +1152,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1188,10 +1189,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1659,6 +1659,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1695,10 +1696,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1732,6 +1732,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1769,10 +1770,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1804,6 +1804,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1840,10 +1841,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2196,10 +2197,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2457,6 +2457,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2493,10 +2494,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3532,6 +3532,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3568,10 +3569,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3770,6 +3770,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3806,10 +3807,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4162,6 +4162,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4199,10 +4200,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/_configuration.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/_configuration.py index 28cf75e3d2b4..68d6f5b6bd2c 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/_configuration.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/_configuration.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from .version import VERSION @@ -38,11 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.RetryPolicy(**kwargs) - self.custom_hook_policy = policies.CustomHookPolicy(**kwargs) - self.redirect_policy = policies.RedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/_configuration_async.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/_configuration_async.py index a61d9eeff444..fb961bb4bd2d 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/_configuration_async.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/_configuration_async.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from ..version import VERSION @@ -38,10 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.AsyncRetryPolicy(**kwargs) - self.redirect_policy = policies.AsyncRedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py index 08e45c2b44a7..1675be60f93a 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py @@ -393,6 +393,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -430,10 +431,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -468,6 +468,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -504,10 +505,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1151,6 +1151,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1187,10 +1188,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1656,6 +1656,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1692,10 +1693,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1729,6 +1729,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1766,10 +1767,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1801,6 +1801,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1837,10 +1838,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2198,10 +2199,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2459,6 +2459,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2495,10 +2496,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3654,6 +3654,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3692,10 +3693,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3894,6 +3894,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3930,10 +3931,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3965,6 +3965,7 @@ def get_deleted_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4001,10 +4002,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4641,6 +4641,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4678,10 +4679,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4716,6 +4716,7 @@ def get_deleted_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4753,10 +4754,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/operations/_key_vault_client_operations.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/operations/_key_vault_client_operations.py index b9ed6e10ea21..da216d1db657 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/operations/_key_vault_client_operations.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v7_0/operations/_key_vault_client_operations.py @@ -393,6 +393,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -430,10 +431,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -468,6 +468,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -504,10 +505,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1151,6 +1151,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1187,10 +1188,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1656,6 +1656,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1692,10 +1693,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1729,6 +1729,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1766,10 +1767,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1801,6 +1801,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1837,10 +1838,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2198,10 +2199,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2459,6 +2459,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2495,10 +2496,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3654,6 +3654,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3692,10 +3693,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3894,6 +3894,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3930,10 +3931,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3965,6 +3965,7 @@ def get_deleted_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4001,10 +4002,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4641,6 +4641,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4678,10 +4679,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4716,6 +4716,7 @@ def get_deleted_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4753,10 +4754,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_client.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_client.py index eaa53f3490fc..2168e0ecaab2 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_client.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_client.py @@ -180,7 +180,7 @@ def list_properties_of_secrets(self, **kwargs): :dedent: 8 """ - max_page_size = kwargs.get("max_page_size", None) + max_page_size = kwargs.pop("max_page_size", None) return self._client.get_secrets( self._vault_endpoint, maxresults=max_page_size, @@ -207,7 +207,7 @@ def list_secret_versions(self, name, **kwargs): :dedent: 8 """ - max_page_size = kwargs.get("max_page_size", None) + max_page_size = kwargs.pop("max_page_size", None) return self._client.get_secret_versions( self._vault_endpoint, name, @@ -329,7 +329,7 @@ def list_deleted_secrets(self, **kwargs): :dedent: 8 """ - max_page_size = kwargs.get("max_page_size", None) + max_page_size = kwargs.pop("max_page_size", None) return self._client.get_deleted_secrets( self._vault_endpoint, maxresults=max_page_size, diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/_configuration.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/_configuration.py index 28cf75e3d2b4..68d6f5b6bd2c 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/_configuration.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/_configuration.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from .version import VERSION @@ -38,11 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.RetryPolicy(**kwargs) - self.custom_hook_policy = policies.CustomHookPolicy(**kwargs) - self.redirect_policy = policies.RedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/_configuration_async.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/_configuration_async.py index a61d9eeff444..fb961bb4bd2d 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/_configuration_async.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/_configuration_async.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from ..version import VERSION @@ -38,10 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.AsyncRetryPolicy(**kwargs) - self.redirect_policy = policies.AsyncRedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py index b5cc965119ed..2e34320ea0fe 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py @@ -394,6 +394,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -431,10 +432,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -469,6 +469,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -505,10 +506,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1152,6 +1152,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1188,10 +1189,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1659,6 +1659,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1695,10 +1696,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1732,6 +1732,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1769,10 +1770,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1804,6 +1804,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1840,10 +1841,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2196,10 +2197,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2457,6 +2457,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2493,10 +2494,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3532,6 +3532,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3568,10 +3569,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3770,6 +3770,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3806,10 +3807,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4162,6 +4162,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4199,10 +4200,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py index 0ae7fd5fb025..a84f1ad1ee7d 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py @@ -394,6 +394,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -431,10 +432,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -469,6 +469,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -505,10 +506,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1152,6 +1152,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1188,10 +1189,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1659,6 +1659,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1695,10 +1696,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1732,6 +1732,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1769,10 +1770,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1804,6 +1804,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1840,10 +1841,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2196,10 +2197,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2457,6 +2457,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2493,10 +2494,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3532,6 +3532,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3568,10 +3569,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3770,6 +3770,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3806,10 +3807,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4162,6 +4162,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4199,10 +4200,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/_configuration.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/_configuration.py index 28cf75e3d2b4..68d6f5b6bd2c 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/_configuration.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/_configuration.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from .version import VERSION @@ -38,11 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.RetryPolicy(**kwargs) - self.custom_hook_policy = policies.CustomHookPolicy(**kwargs) - self.redirect_policy = policies.RedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/_configuration_async.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/_configuration_async.py index a61d9eeff444..fb961bb4bd2d 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/_configuration_async.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/_configuration_async.py @@ -8,7 +8,7 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- -from azure.core.configuration import Configuration, ConnectionConfiguration +from azure.core.configuration import Configuration from azure.core.pipeline import policies from ..version import VERSION @@ -38,10 +38,10 @@ def __init__(self, credentials, **kwargs): self.credentials = credentials def _configure(self, **kwargs): - self.connection = ConnectionConfiguration(**kwargs) - self.user_agent_policy = policies.UserAgentPolicy(**kwargs) - self.headers_policy = policies.HeadersPolicy(**kwargs) - self.proxy_policy = policies.ProxyPolicy(**kwargs) - self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs) - self.retry_policy = policies.AsyncRetryPolicy(**kwargs) - self.redirect_policy = policies.AsyncRedirectPolicy(**kwargs) + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py index 08e45c2b44a7..1675be60f93a 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/aio/operations_async/_key_vault_client_operations_async.py @@ -393,6 +393,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -430,10 +431,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -468,6 +468,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -504,10 +505,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1151,6 +1151,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1187,10 +1188,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1656,6 +1656,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1692,10 +1693,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1729,6 +1729,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1766,10 +1767,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1801,6 +1801,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1837,10 +1838,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2198,10 +2199,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2459,6 +2459,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2495,10 +2496,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3654,6 +3654,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3692,10 +3693,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3894,6 +3894,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3930,10 +3931,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3965,6 +3965,7 @@ def get_deleted_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4001,10 +4002,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4641,6 +4641,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4678,10 +4679,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4716,6 +4716,7 @@ def get_deleted_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4753,10 +4754,9 @@ async def extract_data_async(response): async def get_next_async(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request) + pipeline_response = await self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/operations/_key_vault_client_operations.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/operations/_key_vault_client_operations.py index b9ed6e10ea21..da216d1db657 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/operations/_key_vault_client_operations.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/_generated/v7_0/operations/_key_vault_client_operations.py @@ -393,6 +393,7 @@ def get_key_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -430,10 +431,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -468,6 +468,7 @@ def get_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -504,10 +505,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1151,6 +1151,7 @@ def get_deleted_keys( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1187,10 +1188,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1656,6 +1656,7 @@ def get_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1692,10 +1693,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1729,6 +1729,7 @@ def get_secret_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1766,10 +1767,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -1801,6 +1801,7 @@ def get_deleted_secrets( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -1837,10 +1838,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2160,6 +2160,7 @@ def get_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2198,10 +2199,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2459,6 +2459,7 @@ def get_certificate_issuers( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2495,10 +2496,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -2946,6 +2946,7 @@ def get_certificate_versions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -2983,10 +2984,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3654,6 +3654,7 @@ def get_deleted_certificates( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3692,10 +3693,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3894,6 +3894,7 @@ def get_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -3930,10 +3931,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -3965,6 +3965,7 @@ def get_deleted_storage_accounts( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4001,10 +4002,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4641,6 +4641,7 @@ def get_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4678,10 +4679,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) @@ -4716,6 +4716,7 @@ def get_deleted_sas_definitions( :raises: :class:`KeyVaultErrorException` """ + error_map = kwargs.pop('error_map', None) def prepare_request(next_link=None): query_parameters = {} if not next_link: @@ -4753,10 +4754,9 @@ def extract_data(response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request) + pipeline_response = self._client._pipeline.run(request, **kwargs) response = pipeline_response.http_response - error_map = kwargs.pop('error_map', None) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) raise models.KeyVaultErrorException(response, self._deserialize) From d993127f7b03746c41c912bc36b1d75d89efb91b Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Fri, 18 Oct 2019 16:58:43 -0700 Subject: [PATCH 5/8] rename examples to samples (#8040) --- sdk/core/azure-core/MANIFEST.in | 2 +- sdk/core/azure-core/azure/core/_match_conditions.py | 1 + sdk/core/azure-core/azure/core/_pipeline_client.py | 2 +- sdk/core/azure-core/azure/core/_pipeline_client_async.py | 2 +- sdk/core/azure-core/azure/core/configuration.py | 4 ++-- sdk/core/azure-core/azure/core/pipeline/_base.py | 2 +- sdk/core/azure-core/azure/core/pipeline/_base_async.py | 2 +- sdk/core/azure-core/azure/core/pipeline/policies/_base.py | 2 +- .../azure-core/azure/core/pipeline/policies/_redirect.py | 2 +- .../azure/core/pipeline/policies/_redirect_async.py | 2 +- .../azure-core/azure/core/pipeline/policies/_retry.py | 2 +- .../azure/core/pipeline/policies/_retry_async.py | 2 +- .../azure-core/azure/core/pipeline/policies/_universal.py | 8 ++++---- .../azure-core/azure/core/pipeline/transport/_aiohttp.py | 2 +- .../azure/core/pipeline/transport/_requests_asyncio.py | 2 +- .../azure/core/pipeline/transport/_requests_basic.py | 2 +- .../azure/core/pipeline/transport/_requests_trio.py | 2 +- sdk/core/azure-core/{examples => samples}/conftest.py | 0 .../{examples => samples}/test_example_async.py | 0 .../{examples => samples}/test_example_config.py | 0 .../{examples => samples}/test_example_sansio.py | 0 .../azure-core/{examples => samples}/test_example_sync.py | 0 22 files changed, 21 insertions(+), 20 deletions(-) rename sdk/core/azure-core/{examples => samples}/conftest.py (100%) rename sdk/core/azure-core/{examples => samples}/test_example_async.py (100%) rename sdk/core/azure-core/{examples => samples}/test_example_config.py (100%) rename sdk/core/azure-core/{examples => samples}/test_example_sansio.py (100%) rename sdk/core/azure-core/{examples => samples}/test_example_sync.py (100%) diff --git a/sdk/core/azure-core/MANIFEST.in b/sdk/core/azure-core/MANIFEST.in index 1ca2a11167f7..0dbb8925e19d 100644 --- a/sdk/core/azure-core/MANIFEST.in +++ b/sdk/core/azure-core/MANIFEST.in @@ -1,5 +1,5 @@ recursive-include tests *.py *.yaml include *.md include azure/__init__.py -recursive-include examples *.py +recursive-include samples *.py diff --git a/sdk/core/azure-core/azure/core/_match_conditions.py b/sdk/core/azure-core/azure/core/_match_conditions.py index e8204d3d0392..22fbc5f8653c 100644 --- a/sdk/core/azure-core/azure/core/_match_conditions.py +++ b/sdk/core/azure-core/azure/core/_match_conditions.py @@ -27,6 +27,7 @@ from enum import Enum class MatchConditions(Enum): + """An enum to describe match conditions. """ Unconditionally = 1 IfNotModified = 2 IfModified = 3 diff --git a/sdk/core/azure-core/azure/core/_pipeline_client.py b/sdk/core/azure-core/azure/core/_pipeline_client.py index ee5341f143e1..d337ad5792ee 100644 --- a/sdk/core/azure-core/azure/core/_pipeline_client.py +++ b/sdk/core/azure-core/azure/core/_pipeline_client.py @@ -68,7 +68,7 @@ class PipelineClient(PipelineClientBase): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sync.py + .. literalinclude:: ../samples/test_example_sync.py :start-after: [START build_pipeline_client] :end-before: [END build_pipeline_client] :language: python 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 f4b90cff6bd5..62f64e088063 100644 --- a/sdk/core/azure-core/azure/core/_pipeline_client_async.py +++ b/sdk/core/azure-core/azure/core/_pipeline_client_async.py @@ -67,7 +67,7 @@ class AsyncPipelineClient(PipelineClientBase): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_async.py + .. literalinclude:: ../samples/test_example_async.py :start-after: [START build_async_pipeline_client] :end-before: [END build_async_pipeline_client] :language: python diff --git a/sdk/core/azure-core/azure/core/configuration.py b/sdk/core/azure-core/azure/core/configuration.py index c0bfc0860adf..0a0e7bf0d66b 100644 --- a/sdk/core/azure-core/azure/core/configuration.py +++ b/sdk/core/azure-core/azure/core/configuration.py @@ -48,7 +48,7 @@ class Configuration(object): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_config.py + .. literalinclude:: ../samples/test_example_config.py :start-after: [START configuration] :end-before: [END configuration] :language: python @@ -99,7 +99,7 @@ class ConnectionConfiguration(object): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_config.py + .. literalinclude:: ../samples/test_example_config.py :start-after: [START connection_configuration] :end-before: [END connection_configuration] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/_base.py b/sdk/core/azure-core/azure/core/pipeline/_base.py index e147679e192e..854dbf24c199 100644 --- a/sdk/core/azure-core/azure/core/pipeline/_base.py +++ b/sdk/core/azure-core/azure/core/pipeline/_base.py @@ -125,7 +125,7 @@ class Pipeline(AbstractContextManager, Generic[HTTPRequestType, HTTPResponseType .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sync.py + .. literalinclude:: ../samples/test_example_sync.py :start-after: [START build_pipeline] :end-before: [END build_pipeline] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/_base_async.py b/sdk/core/azure-core/azure/core/pipeline/_base_async.py index 45871aaaed68..64b6e7608083 100644 --- a/sdk/core/azure-core/azure/core/pipeline/_base_async.py +++ b/sdk/core/azure-core/azure/core/pipeline/_base_async.py @@ -139,7 +139,7 @@ class AsyncPipeline( .. admonition:: Example: - .. literalinclude:: ../examples/test_example_async.py + .. literalinclude:: ../samples/test_example_async.py :start-after: [START build_async_pipeline] :end-before: [END build_async_pipeline] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_base.py b/sdk/core/azure-core/azure/core/pipeline/policies/_base.py index 360439456174..ee5537f5403b 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_base.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_base.py @@ -125,7 +125,7 @@ def on_exception(self, request): # pylint: disable=unused-argument .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sansio.py + .. literalinclude:: ../samples/test_example_sansio.py :start-after: [START on_exception] :end-before: [END on_exception] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_redirect.py b/sdk/core/azure-core/azure/core/pipeline/policies/_redirect.py index 6485f638f420..862b60183cd2 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_redirect.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_redirect.py @@ -52,7 +52,7 @@ class RedirectPolicy(HTTPPolicy): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sync.py + .. literalinclude:: ../samples/test_example_sync.py :start-after: [START redirect_policy] :end-before: [END redirect_policy] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_redirect_async.py b/sdk/core/azure-core/azure/core/pipeline/policies/_redirect_async.py index 5ed6d2b981c9..23751f237714 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_redirect_async.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_redirect_async.py @@ -40,7 +40,7 @@ class AsyncRedirectPolicy(RedirectPolicy, AsyncHTTPPolicy): # type: ignore .. admonition:: Example: - .. literalinclude:: ../examples/test_example_async.py + .. literalinclude:: ../samples/test_example_async.py :start-after: [START async_redirect_policy] :end-before: [END async_redirect_policy] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py b/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py index 1fd35d6213c3..7e073f61f1ae 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_retry.py @@ -74,7 +74,7 @@ class RetryPolicy(HTTPPolicy): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sync.py + .. literalinclude:: ../samples/test_example_sync.py :start-after: [START retry_policy] :end-before: [END retry_policy] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_retry_async.py b/sdk/core/azure-core/azure/core/pipeline/policies/_retry_async.py index 2eb2dcfb0cba..e5d3a7d708c0 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_retry_async.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_retry_async.py @@ -67,7 +67,7 @@ class AsyncRetryPolicy(RetryPolicy, AsyncHTTPPolicy): # type: ignore .. admonition:: Example: - .. literalinclude:: ../examples/test_example_async.py + .. literalinclude:: ../samples/test_example_async.py :start-after: [START async_retry_policy] :end-before: [END async_retry_policy] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py index 3320f6f094ab..19cc6c936bbe 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py @@ -67,7 +67,7 @@ class HeadersPolicy(SansIOHTTPPolicy): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sansio.py + .. literalinclude:: ../samples/test_example_sansio.py :start-after: [START headers_policy] :end-before: [END headers_policy] :language: python @@ -115,7 +115,7 @@ class UserAgentPolicy(SansIOHTTPPolicy): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sansio.py + .. literalinclude:: ../samples/test_example_sansio.py :start-after: [START user_agent_policy] :end-before: [END user_agent_policy] :language: python @@ -186,7 +186,7 @@ class NetworkTraceLoggingPolicy(SansIOHTTPPolicy): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sansio.py + .. literalinclude:: ../samples/test_example_sansio.py :start-after: [START network_trace_logging_policy] :end-before: [END network_trace_logging_policy] :language: python @@ -511,7 +511,7 @@ class ProxyPolicy(SansIOHTTPPolicy): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sansio.py + .. literalinclude:: ../samples/test_example_sansio.py :start-after: [START proxy_policy] :end-before: [END proxy_policy] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/transport/_aiohttp.py b/sdk/core/azure-core/azure/core/pipeline/transport/_aiohttp.py index 1fa048f07e6e..d1cd8e4eed90 100644 --- a/sdk/core/azure-core/azure/core/pipeline/transport/_aiohttp.py +++ b/sdk/core/azure-core/azure/core/pipeline/transport/_aiohttp.py @@ -62,7 +62,7 @@ class AioHttpTransport(AsyncHttpTransport): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_async.py + .. literalinclude:: ../samples/test_example_async.py :start-after: [START aiohttp] :end-before: [END aiohttp] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/transport/_requests_asyncio.py b/sdk/core/azure-core/azure/core/pipeline/transport/_requests_asyncio.py index dbd5e3e85d19..ed0ca39fe73e 100644 --- a/sdk/core/azure-core/azure/core/pipeline/transport/_requests_asyncio.py +++ b/sdk/core/azure-core/azure/core/pipeline/transport/_requests_asyncio.py @@ -66,7 +66,7 @@ class AsyncioRequestsTransport(RequestsTransport, AsyncHttpTransport): # type: .. admonition:: Example: - .. literalinclude:: ../examples/test_example_async.py + .. literalinclude:: ../samples/test_example_async.py :start-after: [START asyncio] :end-before: [END asyncio] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/transport/_requests_basic.py b/sdk/core/azure-core/azure/core/pipeline/transport/_requests_basic.py index 79591cea06b9..2b8252c763b0 100644 --- a/sdk/core/azure-core/azure/core/pipeline/transport/_requests_basic.py +++ b/sdk/core/azure-core/azure/core/pipeline/transport/_requests_basic.py @@ -159,7 +159,7 @@ class RequestsTransport(HttpTransport): .. admonition:: Example: - .. literalinclude:: ../examples/test_example_sync.py + .. literalinclude:: ../samples/test_example_sync.py :start-after: [START requests] :end-before: [END requests] :language: python diff --git a/sdk/core/azure-core/azure/core/pipeline/transport/_requests_trio.py b/sdk/core/azure-core/azure/core/pipeline/transport/_requests_trio.py index f4e6dfdd6369..b3462f8325db 100644 --- a/sdk/core/azure-core/azure/core/pipeline/transport/_requests_trio.py +++ b/sdk/core/azure-core/azure/core/pipeline/transport/_requests_trio.py @@ -137,7 +137,7 @@ class TrioRequestsTransport(RequestsTransport, AsyncHttpTransport): # type: ign .. admonition:: Example: - .. literalinclude:: ../examples/test_example_async.py + .. literalinclude:: ../samples/test_example_async.py :start-after: [START trio] :end-before: [END trio] :language: python diff --git a/sdk/core/azure-core/examples/conftest.py b/sdk/core/azure-core/samples/conftest.py similarity index 100% rename from sdk/core/azure-core/examples/conftest.py rename to sdk/core/azure-core/samples/conftest.py diff --git a/sdk/core/azure-core/examples/test_example_async.py b/sdk/core/azure-core/samples/test_example_async.py similarity index 100% rename from sdk/core/azure-core/examples/test_example_async.py rename to sdk/core/azure-core/samples/test_example_async.py diff --git a/sdk/core/azure-core/examples/test_example_config.py b/sdk/core/azure-core/samples/test_example_config.py similarity index 100% rename from sdk/core/azure-core/examples/test_example_config.py rename to sdk/core/azure-core/samples/test_example_config.py diff --git a/sdk/core/azure-core/examples/test_example_sansio.py b/sdk/core/azure-core/samples/test_example_sansio.py similarity index 100% rename from sdk/core/azure-core/examples/test_example_sansio.py rename to sdk/core/azure-core/samples/test_example_sansio.py diff --git a/sdk/core/azure-core/examples/test_example_sync.py b/sdk/core/azure-core/samples/test_example_sync.py similarity index 100% rename from sdk/core/azure-core/examples/test_example_sync.py rename to sdk/core/azure-core/samples/test_example_sync.py From f519190c9760863b995305b1b5be682074d5b653 Mon Sep 17 00:00:00 2001 From: iscai-msft <43154838+iscai-msft@users.noreply.github.com> Date: Fri, 18 Oct 2019 16:59:08 -0700 Subject: [PATCH 6/8] Key Vault: making crypto models congruent with .net's (#8006) * shaped python's crypto classes to be congruent with .net's * implemented Charles' comments and added changelog --- sdk/keyvault/azure-keyvault-keys/HISTORY.md | 11 ++++- .../azure/keyvault/keys/crypto/__init__.py | 6 +-- .../azure/keyvault/keys/crypto/_client.py | 24 +++++------ .../azure/keyvault/keys/crypto/_models.py | 42 +++++++++++++------ .../keyvault/keys/crypto/aio/__init__.py | 4 +- .../azure/keyvault/keys/crypto/aio/_client.py | 24 +++++------ .../tests/test_crypto_client.py | 18 ++++---- .../tests/test_crypto_client_async.py | 18 ++++---- .../tests/test_examples_crypto.py | 6 +-- .../tests/test_examples_crypto_async.py | 4 +- 10 files changed, 94 insertions(+), 63 deletions(-) diff --git a/sdk/keyvault/azure-keyvault-keys/HISTORY.md b/sdk/keyvault/azure-keyvault-keys/HISTORY.md index babd04c86dd6..b3aecb3d6941 100644 --- a/sdk/keyvault/azure-keyvault-keys/HISTORY.md +++ b/sdk/keyvault/azure-keyvault-keys/HISTORY.md @@ -11,13 +11,20 @@ detail the new keyword arguments): - `update_key_properties` now has two positional parameters, `name` and (optional) `version` - `import_key` now has positional parameters `name` and `key` -- `CryptographyClient` operations return class instances instead of tuples. The -new classes have the same attributes as the tuples. +- `CryptographyClient` operations return class instances instead of tuples and renamed the following +properties + - Renamed the `decrypted_bytes` property of `DecryptResult` to `plaintext` + - Renamed the `unwrapped_bytes` property of `UnwrapResult` to `key` + - Renamed the `result` property of `VerifyResult` to `is_valid` +- Renamed the `UnwrapKeyResult` and `WrapKeyResult` classes to `UnwrapResult` and `WrapResult` - Renamed `list_keys` to `list_properties_of_keys` - Renamed `Key` to `KeyVaultKey` - `KeyVaultKey` properties `created`, `expires`, and `updated` renamed to `created_on`, `expires_on`, and `updated_on` +### New features: +- Now all `CryptographyClient` returns include `key_id` and `algorithm` properties + ## 4.0.0b4 (2019-10-08) - Enums `JsonWebKeyCurveName`, `JsonWebKeyOperation`, and `JsonWebKeyType` have diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/__init__.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/__init__.py index 5c1bcd4d7bbe..f93920a09a68 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/__init__.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/__init__.py @@ -2,7 +2,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -from ._models import DecryptResult, EncryptResult, SignResult, UnwrapKeyResult, VerifyResult, WrapKeyResult +from ._models import DecryptResult, EncryptResult, SignResult, WrapResult, VerifyResult, UnwrapResult from ._client import CryptographyClient from ._enums import EncryptionAlgorithm, KeyWrapAlgorithm, SignatureAlgorithm @@ -15,7 +15,7 @@ "KeyWrapAlgorithm", "SignatureAlgorithm", "SignResult", - "UnwrapKeyResult", + "WrapResult", "VerifyResult", - "WrapKeyResult", + "UnwrapResult", ] diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py index 77d0d0f09c2e..efc431c063e9 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py @@ -6,7 +6,7 @@ from azure.core.exceptions import AzureError, HttpResponseError from azure.core.tracing.decorator import distributed_trace -from . import DecryptResult, EncryptResult, SignResult, VerifyResult, UnwrapKeyResult, WrapKeyResult +from . import DecryptResult, EncryptResult, SignResult, VerifyResult, WrapResult, UnwrapResult from ._internal import EllipticCurveKey, RsaKey from .._models import KeyVaultKey from .._shared import KeyVaultClientBase, parse_vault_id @@ -208,7 +208,7 @@ def decrypt(self, algorithm, ciphertext, **kwargs): from azure.keyvault.keys.crypto import EncryptionAlgorithm result = client.decrypt(EncryptionAlgorithm.rsa_oaep, ciphertext) - print(result.decrypted_bytes) + print(result.plaintext) """ result = self._client.decrypt( @@ -219,18 +219,18 @@ def decrypt(self, algorithm, ciphertext, **kwargs): value=ciphertext, **kwargs ) - return DecryptResult(decrypted_bytes=result.result) + return DecryptResult(key_id=self.key_id, algorithm=algorithm, plaintext=result.result) @distributed_trace def wrap_key(self, algorithm, key, **kwargs): - # type: (KeyWrapAlgorithm, bytes, **Any) -> WrapKeyResult + # type: (KeyWrapAlgorithm, bytes, **Any) -> WrapResult """ Wrap a key with the client's key. Requires the keys/wrapKey permission. :param algorithm: wrapping algorithm to use :type algorithm: :class:`~azure.keyvault.keys.crypto.enums.KeyWrapAlgorithm` :param bytes key: key to wrap - :rtype: :class:`~azure.keyvault.keys.crypto.WrapKeyResult` + :rtype: :class:`~azure.keyvault.keys.crypto.WrapResult` Example: @@ -261,18 +261,18 @@ def wrap_key(self, algorithm, key, **kwargs): **kwargs ).result - return WrapKeyResult(key_id=self.key_id, algorithm=algorithm, encrypted_key=result) + return WrapResult(key_id=self.key_id, algorithm=algorithm, encrypted_key=result) @distributed_trace def unwrap_key(self, algorithm, encrypted_key, **kwargs): - # type: (KeyWrapAlgorithm, bytes, **Any) -> UnwrapKeyResult + # type: (KeyWrapAlgorithm, bytes, **Any) -> UnwrapResult """ Unwrap a key previously wrapped with the client's key. Requires the keys/unwrapKey permission. :param algorithm: wrapping algorithm to use :type algorithm: :class:`~azure.keyvault.keys.crypto.enums.KeyWrapAlgorithm` :param bytes encrypted_key: the wrapped key - :rtype: :class:`~azure.keyvault.keys.crypto.UnwrapKeyResult` + :rtype: :class:`~azure.keyvault.keys.crypto.UnwrapResult` Example: @@ -281,7 +281,7 @@ def unwrap_key(self, algorithm, encrypted_key, **kwargs): from azure.keyvault.keys.crypto import KeyWrapAlgorithm result = client.unwrap_key(KeyWrapAlgorithm.rsa_oaep, wrapped_bytes) - unwrapped_bytes = result.unwrapped_bytes + key = result.key """ @@ -293,7 +293,7 @@ def unwrap_key(self, algorithm, encrypted_key, **kwargs): value=encrypted_key, **kwargs ) - return UnwrapKeyResult(unwrapped_bytes=result.result) + return UnwrapResult(key_id=self.key_id, algorithm=algorithm, key=result.result) @distributed_trace def sign(self, algorithm, digest, **kwargs): @@ -354,7 +354,7 @@ def verify(self, algorithm, digest, signature, **kwargs): from azure.keyvault.keys.crypto import SignatureAlgorithm verified = client.verify(SignatureAlgorithm.rs256, digest, signature) - assert verified.result is True + assert verified.is_valid """ local_key = self._get_local_key(**kwargs) @@ -372,4 +372,4 @@ def verify(self, algorithm, digest, signature, **kwargs): signature=signature, **kwargs ).value - return VerifyResult(result=result) + return VerifyResult(key_id=self.key_id, algorithm=algorithm, is_valid=result) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_models.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_models.py index 2af899fca726..4602bbe53abc 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_models.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_models.py @@ -11,12 +11,17 @@ class DecryptResult: """The result of a decrypt operation. - :param bytes decrypted_bytes: The decrypted bytes + :param str key_id: The encryption key's Key Vault identifier + :param algorithm: The encryption algorithm used + :type algorithm: ~azure.keyvault.keys.crypto.EncryptionAlgorithm + :param bytes plaintext: The decrypted bytes """ - def __init__(self, decrypted_bytes): - # type: (bytes) -> None - self.decrypted_bytes = decrypted_bytes + def __init__(self, key_id, algorithm, plaintext): + # type: (str, str, EncryptionAlgorithm, bytes) -> None + self.key_id = key_id + self.algorithm = algorithm + self.plaintext = plaintext class EncryptResult: @@ -54,24 +59,35 @@ def __init__(self, key_id, algorithm, signature): class VerifyResult: """The result of a verify operation. - :param bool result: Whether the signature is valid + :param str key_id: The signing key's Key Vault identifier + :param bool is_valid: Whether the signature is valid + :param algorithm: The signature algorithm used + :type algorithm: ~azure.keyvault.keys.crypto.SignatureAlgorithm """ - def __init__(self, result): - self.result = result - + def __init__(self, key_id, is_valid, algorithm): + # type: (str, bool, SignatureAlgorithm) -> None + self.key_id = key_id + self.is_valid = is_valid + self.algorithm = algorithm -class UnwrapKeyResult: +class UnwrapResult: """The result of an unwrap key operation. - :param bytes unwrapped_bytes: The unwrapped key's bytes + :param str key_id: Key encryption key's Key Vault identifier + :param algorithm: The key wrap algorithm used + :type algorithm: ~azure.keyvault.keys.crypto.KeyWrapAlgorithm + :param bytes key: The unwrapped key """ - def __init__(self, unwrapped_bytes): - self.unwrapped_bytes = unwrapped_bytes + def __init__(self, key_id, algorithm, key): + # type: (str, KeyWrapAlgorithm, bytes) -> None + self.key_id = key_id + self.algorithm = algorithm + self.key = key -class WrapKeyResult: +class WrapResult: """The result of a wrap key operation. :param str key_id: The wrapping key's Key Vault identifier diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/__init__.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/__init__.py index 50f1b476bea5..2e77052808e3 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/__init__.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/__init__.py @@ -4,7 +4,7 @@ # ------------------------------------ from ._client import CryptographyClient from .. import EncryptionAlgorithm, KeyWrapAlgorithm, SignatureAlgorithm -from .. import EncryptResult, SignResult, WrapKeyResult +from .. import EncryptResult, SignResult, WrapResult __all__ = [ "CryptographyClient", @@ -13,5 +13,5 @@ "KeyWrapAlgorithm", "SignatureAlgorithm", "SignResult", - "WrapKeyResult", + "WrapResult", ] diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/_client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/_client.py index f07f692bbdb8..2bb41390facc 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/_client.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/_client.py @@ -6,7 +6,7 @@ from azure.core.tracing.decorator_async import distributed_trace_async from azure.keyvault.keys._shared import AsyncKeyVaultClientBase, parse_vault_id -from .. import DecryptResult, EncryptResult, SignResult, VerifyResult, UnwrapKeyResult, WrapKeyResult +from .. import DecryptResult, EncryptResult, SignResult, VerifyResult, WrapResult, UnwrapResult from .._internal import EllipticCurveKey, RsaKey from ..._models import KeyVaultKey @@ -195,7 +195,7 @@ async def decrypt(self, algorithm: "EncryptionAlgorithm", ciphertext: bytes, **k from azure.keyvault.keys.crypto import EncryptionAlgorithm result = await client.decrypt(EncryptionAlgorithm.rsa_oaep, ciphertext) - print(result.decrypted_bytes) + print(result.plaintext) """ result = await self._client.decrypt( @@ -206,17 +206,17 @@ async def decrypt(self, algorithm: "EncryptionAlgorithm", ciphertext: bytes, **k value=ciphertext, **kwargs ) - return DecryptResult(decrypted_bytes=result.result) + return DecryptResult(key_id=self.key_id, algorithm=algorithm, plaintext=result.result) @distributed_trace_async - async def wrap_key(self, algorithm: "KeyWrapAlgorithm", key: bytes, **kwargs: "Any") -> WrapKeyResult: + async def wrap_key(self, algorithm: "KeyWrapAlgorithm", key: bytes, **kwargs: "Any") -> WrapResult: """ Wrap a key with the client's key. Requires the keys/wrapKey permission. :param algorithm: wrapping algorithm to use :type algorithm: :class:`~azure.keyvault.keys.crypto.enums.KeyWrapAlgorithm` :param bytes key: key to wrap - :rtype: :class:`~azure.keyvault.keys.crypto.WrapKeyResult` + :rtype: :class:`~azure.keyvault.keys.crypto.WrapResult` Example: @@ -246,17 +246,17 @@ async def wrap_key(self, algorithm: "KeyWrapAlgorithm", key: bytes, **kwargs: "A value=key, **kwargs ).result - return WrapKeyResult(key_id=self.key_id, algorithm=algorithm, encrypted_key=result) + return WrapResult(key_id=self.key_id, algorithm=algorithm, encrypted_key=result) @distributed_trace_async - async def unwrap_key(self, algorithm: "KeyWrapAlgorithm", encrypted_key: bytes, **kwargs: "Any") -> UnwrapKeyResult: + async def unwrap_key(self, algorithm: "KeyWrapAlgorithm", encrypted_key: bytes, **kwargs: "Any") -> UnwrapResult: """ Unwrap a key previously wrapped with the client's key. Requires the keys/unwrapKey permission. :param algorithm: wrapping algorithm to use :type algorithm: :class:`~azure.keyvault.keys.crypto.enums.KeyWrapAlgorithm` :param bytes encrypted_key: the wrapped key - :rtype: :class:`~azure.keyvault.keys.crypto.UnwrapKeyResult` + :rtype: :class:`~azure.keyvault.keys.crypto.UnwrapResult` Example: @@ -265,7 +265,7 @@ async def unwrap_key(self, algorithm: "KeyWrapAlgorithm", encrypted_key: bytes, from azure.keyvault.keys.crypto import KeyWrapAlgorithm result = await client.unwrap_key(KeyWrapAlgorithm.rsa_oaep, wrapped_bytes) - unwrapped_bytes = result.unwrapped_bytes + key = result.key """ @@ -277,7 +277,7 @@ async def unwrap_key(self, algorithm: "KeyWrapAlgorithm", encrypted_key: bytes, value=encrypted_key, **kwargs ) - return UnwrapKeyResult(unwrapped_bytes=result.result) + return UnwrapResult(key_id=self.key_id, algorithm=algorithm, key=result.result) @distributed_trace_async async def sign(self, algorithm: "SignatureAlgorithm", digest: bytes, **kwargs: "**Any") -> SignResult: @@ -338,7 +338,7 @@ async def verify( from azure.keyvault.keys.crypto import SignatureAlgorithm verified = await client.verify(SignatureAlgorithm.rs256, digest, signature) - assert verified.result is True + assert verified.is_valid """ @@ -357,4 +357,4 @@ async def verify( signature=signature, **kwargs ).value - return VerifyResult(result=result) + return VerifyResult(key_id=self.key_id, algorithm=algorithm, is_valid=result) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client.py b/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client.py index df2ca7ed7a2e..692e93f4c9ec 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client.py @@ -86,7 +86,9 @@ def test_encrypt_and_decrypt(self, vault_client, **kwargs): self.assertEqual(result.key_id, imported_key.id) result = crypto_client.decrypt(result.algorithm, result.ciphertext) - self.assertEqual(self.plaintext, result.decrypted_bytes) + self.assertEqual(result.key_id, imported_key.id) + self.assertEqual(EncryptionAlgorithm.rsa_oaep, result.algorithm) + self.assertEqual(self.plaintext, result.plaintext) @ResourceGroupPreparer(name_prefix=name_prefix) @VaultClientPreparer(permissions=NO_GET) @@ -106,7 +108,9 @@ def test_sign_and_verify(self, vault_client, **kwargs): self.assertEqual(result.key_id, imported_key.id) verified = crypto_client.verify(result.algorithm, digest, result.signature) - self.assertTrue(verified.result) + self.assertEqual(result.key_id, imported_key.id) + self.assertEqual(result.algorithm, SignatureAlgorithm.rs256) + self.assertTrue(verified.is_valid) @ResourceGroupPreparer(name_prefix=name_prefix) @VaultClientPreparer(permissions=NO_GET) @@ -124,7 +128,7 @@ def test_wrap_and_unwrap(self, vault_client, **kwargs): self.assertEqual(result.key_id, created_key.id) result = crypto_client.unwrap_key(result.algorithm, result.encrypted_key) - self.assertEqual(key_bytes, result.unwrapped_bytes) + self.assertEqual(key_bytes, result.key) @ResourceGroupPreparer(name_prefix=name_prefix) @VaultClientPreparer() @@ -140,7 +144,7 @@ def test_encrypt_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = crypto_client.decrypt(result.algorithm, result.ciphertext) - self.assertEqual(result.decrypted_bytes, self.plaintext) + self.assertEqual(result.plaintext, self.plaintext) @ResourceGroupPreparer(name_prefix=name_prefix) @VaultClientPreparer() @@ -156,7 +160,7 @@ def test_wrap_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = crypto_client.unwrap_key(result.algorithm, result.encrypted_key) - self.assertEqual(result.unwrapped_bytes, self.plaintext) + self.assertEqual(result.key, self.plaintext) @ResourceGroupPreparer(name_prefix=name_prefix) @VaultClientPreparer() @@ -182,7 +186,7 @@ def test_rsa_verify_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = crypto_client.verify(result.algorithm, digest, result.signature) - self.assertTrue(result.result) + self.assertTrue(result.is_valid) @ResourceGroupPreparer(name_prefix=name_prefix) @VaultClientPreparer() @@ -208,4 +212,4 @@ def test_ec_verify_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = crypto_client.verify(result.algorithm, digest, result.signature) - self.assertTrue(result.result) + self.assertTrue(result.is_valid) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py index 48421ec6980b..9fb097854aca 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_crypto_client_async.py @@ -87,7 +87,9 @@ async def test_encrypt_and_decrypt(self, vault_client, **kwargs): self.assertEqual(result.key_id, imported_key.id) result = await crypto_client.decrypt(result.algorithm, result.ciphertext) - self.assertEqual(self.plaintext, result.decrypted_bytes) + self.assertEqual(result.key_id, imported_key.id) + self.assertEqual(EncryptionAlgorithm.rsa_oaep, result.algorithm) + self.assertEqual(self.plaintext, result.plaintext) @ResourceGroupPreparer(name_prefix=name_prefix) @AsyncVaultClientPreparer(permissions=NO_GET) @@ -108,7 +110,9 @@ async def test_sign_and_verify(self, vault_client, **kwargs): self.assertEqual(result.key_id, imported_key.id) verified = await crypto_client.verify(result.algorithm, digest, result.signature) - self.assertTrue(verified.result) + self.assertEqual(result.key_id, imported_key.id) + self.assertEqual(result.algorithm, SignatureAlgorithm.rs256) + self.assertTrue(verified.is_valid) @ResourceGroupPreparer(name_prefix=name_prefix) @AsyncVaultClientPreparer(permissions=NO_GET) @@ -127,7 +131,7 @@ async def test_wrap_and_unwrap(self, vault_client, **kwargs): self.assertEqual(result.key_id, created_key.id) result = await crypto_client.unwrap_key(result.algorithm, result.encrypted_key) - self.assertEqual(key_bytes, result.unwrapped_bytes) + self.assertEqual(key_bytes, result.key) @ResourceGroupPreparer(name_prefix=name_prefix) @AsyncVaultClientPreparer() @@ -144,7 +148,7 @@ async def test_encrypt_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = await crypto_client.decrypt(result.algorithm, result.ciphertext) - self.assertEqual(result.decrypted_bytes, self.plaintext) + self.assertEqual(result.plaintext, self.plaintext) @ResourceGroupPreparer(name_prefix=name_prefix) @AsyncVaultClientPreparer() @@ -161,7 +165,7 @@ async def test_wrap_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = await crypto_client.unwrap_key(result.algorithm, result.encrypted_key) - self.assertEqual(result.unwrapped_bytes, self.plaintext) + self.assertEqual(result.key, self.plaintext) @ResourceGroupPreparer(name_prefix=name_prefix) @AsyncVaultClientPreparer() @@ -188,7 +192,7 @@ async def test_rsa_verify_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = await crypto_client.verify(result.algorithm, digest, result.signature) - self.assertTrue(result.result) + self.assertTrue(result.is_valid) @ResourceGroupPreparer(name_prefix=name_prefix) @AsyncVaultClientPreparer() @@ -215,4 +219,4 @@ async def test_ec_verify_local(self, vault_client, **kwargs): self.assertEqual(result.key_id, key.id) result = await crypto_client.verify(result.algorithm, digest, result.signature) - self.assertTrue(result.result) + self.assertTrue(result.is_valid) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto.py b/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto.py index 63b0fee07660..e00f8bc7632b 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto.py @@ -41,7 +41,7 @@ def test_encrypt_decrypt(self, vault_client, **kwargs): from azure.keyvault.keys.crypto import EncryptionAlgorithm result = client.decrypt(EncryptionAlgorithm.rsa_oaep, ciphertext) - print(result.decrypted_bytes) + print(result.plaintext) # [END decrypt] @@ -73,7 +73,7 @@ def test_wrap_unwrap(self, vault_client, **kwargs): from azure.keyvault.keys.crypto import KeyWrapAlgorithm result = client.unwrap_key(KeyWrapAlgorithm.rsa_oaep, encrypted_key) - unwrapped_bytes = result.unwrapped_bytes + key = result.key # [END unwrap] @@ -107,6 +107,6 @@ def test_sign_verify(self, vault_client, **kwargs): from azure.keyvault.keys.crypto import SignatureAlgorithm verified = client.verify(SignatureAlgorithm.rs256, digest, signature) - assert verified.result is True + assert verified.is_valid # [END verify] diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py index dd66920b3f44..3bb1383c0402 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_examples_crypto_async.py @@ -42,7 +42,7 @@ async def test_encrypt_decrypt_async(self, vault_client, **kwargs): from azure.keyvault.keys.crypto import EncryptionAlgorithm result = await client.decrypt(EncryptionAlgorithm.rsa_oaep, ciphertext) - print(result.decrypted_bytes) + print(result.plaintext) # [END decrypt] @@ -107,6 +107,6 @@ async def test_sign_verify_async(self, vault_client, **kwargs): from azure.keyvault.keys.crypto import SignatureAlgorithm verified = await client.verify(SignatureAlgorithm.rs256, digest, signature) - assert verified.result is True + assert verified.is_valid # [END verify] From f9261ecd81fe603a2d309f55919ea2b4f5fa1d7f Mon Sep 17 00:00:00 2001 From: Scott Beddall <45376673+scbedd@users.noreply.github.com> Date: Fri, 18 Oct 2019 18:34:15 -0700 Subject: [PATCH 7/8] properly handling condition for job run (#8050) --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 9416ee0d58a6..ea9636b4c2f3 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -21,7 +21,7 @@ jobs: BeforePublishSteps: ${{ parameters.BeforePublishSteps }} - job: 'Analyze' - condition: ne(variables['Skip.Analyze'], 'true') + condition: and(succeededOrFailed(), ne(variables['Skip.Analyze'], 'true')) variables: - template: ../variables/globals.yml @@ -35,7 +35,7 @@ jobs: - template: ../steps/analyze.yml - job: 'Test' - condition: ne(variables['Skip.Test'], 'true') + condition: and(succeededOrFailed(), ne(variables['Skip.Test'], 'true')) timeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }} variables: - template: ../variables/globals.yml From 8c3f20c62aae8cee0dd5115f87dba39fc2898d40 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 18 Oct 2019 19:39:59 -0700 Subject: [PATCH 8/8] Fix typo allowed_header_namers in HttpLoggingPolicy (#8059) --- .../azure-core/azure/core/pipeline/policies/_universal.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py index 19cc6c936bbe..6b78710b437d 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py @@ -303,7 +303,7 @@ def __init__(self, logger=None, **kwargs): # pylint: disable=unused-argument "azure.core.pipeline.policies.http_logging_policy" ) self.allowed_query_params = set() - self.allowed_header_namers = set(HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST) + self.allowed_header_names = set(HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST) def _redact_query_param(self, key, value): lower_case_allowed_query_params = [ @@ -312,10 +312,10 @@ def _redact_query_param(self, key, value): return value if key.lower() in lower_case_allowed_query_params else HttpLoggingPolicy.REDACTED_PLACEHOLDER def _redact_header(self, key, value): - lower_case_allowed_header_namers = [ - header.lower() for header in self.allowed_header_namers + lower_case_allowed_header_names = [ + header.lower() for header in self.allowed_header_names ] - return value if key.lower() in lower_case_allowed_header_namers else HttpLoggingPolicy.REDACTED_PLACEHOLDER + return value if key.lower() in lower_case_allowed_header_names else HttpLoggingPolicy.REDACTED_PLACEHOLDER def on_request(self, request): # type: (PipelineRequest) -> None