From 21621f28bfb399444a117e7989452593896087e3 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 10 Jun 2020 17:04:11 -0400 Subject: [PATCH 01/10] add credential default policy for non-multiapi --- autorest/codegen/__init__.py | 17 +- autorest/codegen/templates/config.py.jinja2 | 5 +- tasks.py | 18 ++ .../bodyduration/_configuration.py | 1 + .../bodyduration/aio/_configuration_async.py | 1 + .../azureparametergrouping/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../AzureReport/azurereport/_configuration.py | 1 + .../azurereport/aio/_configuration_async.py | 1 + .../azurespecialproperties/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../custombaseurl/_configuration.py | 1 + .../custombaseurl/aio/_configuration_async.py | 1 + .../custombaseurlpaging/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../Head/head/_configuration.py | 1 + .../Head/head/aio/_configuration_async.py | 1 + .../headexceptions/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../__init__.py | 19 +++ .../_auto_rest_head_test_service.py | 65 +++++++ .../_configuration.py | 62 +++++++ .../_version.py | 9 + .../aio/__init__.py | 10 ++ .../aio/_auto_rest_head_test_service_async.py | 61 +++++++ .../aio/_configuration_async.py | 58 +++++++ .../aio/operations_async/__init__.py | 13 ++ .../_http_success_operations_async.py | 153 +++++++++++++++++ .../operations/__init__.py | 13 ++ .../operations/_http_success_operations.py | 160 ++++++++++++++++++ .../headwithazurekeycredentialpolicy/py.typed | 1 + .../HeadWithAzureKeyCredentialPolicy/setup.py | 37 ++++ .../AcceptanceTests/Lro/lro/_configuration.py | 1 + .../Lro/lro/aio/_configuration_async.py | 1 + .../Paging/paging/_configuration.py | 1 + .../Paging/paging/aio/_configuration_async.py | 1 + .../storage/_configuration.py | 1 + .../storage/aio/_configuration_async.py | 1 + .../_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../additionalproperties/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../BodyArray/bodyarray/_configuration.py | 1 + .../bodyarray/aio/_configuration_async.py | 1 + .../vanilla/body/array/_configuration.py | 1 + .../body/array/aio/_configuration_async.py | 1 + .../BodyBoolean/bodyboolean/_configuration.py | 1 + .../bodyboolean/aio/_configuration_async.py | 1 + .../BodyByte/bodybyte/_configuration.py | 1 + .../bodybyte/aio/_configuration_async.py | 1 + .../BodyComplex/bodycomplex/_configuration.py | 1 + .../bodycomplex/aio/_configuration_async.py | 1 + .../BodyDate/bodydate/_configuration.py | 1 + .../bodydate/aio/_configuration_async.py | 1 + .../bodydatetime/_configuration.py | 1 + .../bodydatetime/aio/_configuration_async.py | 1 + .../bodydatetimerfc1123/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../bodydictionary/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../bodyduration/_configuration.py | 1 + .../bodyduration/aio/_configuration_async.py | 1 + .../BodyFile/bodyfile/_configuration.py | 1 + .../bodyfile/aio/_configuration_async.py | 1 + .../BodyInteger/bodyinteger/_configuration.py | 1 + .../bodyinteger/aio/_configuration_async.py | 1 + .../BodyNumber/bodynumber/_configuration.py | 1 + .../bodynumber/aio/_configuration_async.py | 1 + .../BodyString/bodystring/_configuration.py | 1 + .../bodystring/aio/_configuration_async.py | 1 + .../BodyTime/bodytime/_configuration.py | 1 + .../bodytime/aio/_configuration_async.py | 1 + .../custombaseurl/_configuration.py | 1 + .../custombaseurl/aio/_configuration_async.py | 1 + .../_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../extensibleenumsswagger/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../Header/header/_configuration.py | 1 + .../Header/header/aio/_configuration_async.py | 1 + .../Http/httpinfrastructure/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../MediaTypes/mediatypes/_configuration.py | 1 + .../mediatypes/aio/_configuration_async.py | 1 + .../modelflattening/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../multipleinheritance/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../nonstringenums/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../ObjectType/objecttype/_configuration.py | 1 + .../objecttype/aio/_configuration_async.py | 1 + .../parameterflattening/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../Report/report/_configuration.py | 1 + .../Report/report/aio/_configuration_async.py | 1 + .../requiredoptional/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../AcceptanceTests/Url/url/_configuration.py | 1 + .../Url/url/aio/_configuration_async.py | 1 + .../_configuration.py | 1 + .../aio/_configuration_async.py | 1 + .../Validation/validation/_configuration.py | 1 + .../validation/aio/_configuration_async.py | 1 + .../Xml/xmlservice/_configuration.py | 1 + .../xmlservice/aio/_configuration_async.py | 1 + .../xmserrorresponse/_configuration.py | 1 + .../aio/_configuration_async.py | 1 + 108 files changed, 788 insertions(+), 5 deletions(-) create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/__init__.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_version.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service_async.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/__init__.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/_http_success_operations_async.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/__init__.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/py.typed create mode 100644 test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py diff --git a/autorest/codegen/__init__.py b/autorest/codegen/__init__.py index aa4c2a54a7a..cb6099d1f24 100644 --- a/autorest/codegen/__init__.py +++ b/autorest/codegen/__init__.py @@ -18,8 +18,6 @@ _LOGGER = logging.getLogger(__name__) - - class CodeGenerator(Plugin): @staticmethod def remove_cloud_errors(yaml_data: Dict[str, Any]) -> None: @@ -138,8 +136,17 @@ def _build_code_model_options(self) -> Dict[str, Any]: "For example: --credential-scopes=https://cognitiveservices.azure.com/.default" ) + credential_default_policy_type = self._autorestapi.get_value("credential-default-policy-type") or "BearerTokenCredentialPolicy" + + if credential_scopes and credential_default_policy_type != "BearerTokenCredentialPolicy": + _LOGGER.warning( + "You have --credential-default-policy-type not set as BearerTokenCredentialPolicy and a value for " + "--credential-scopes. Since credential scopes are tied to the BearerTokenCredentialPolicy, " + "we will ignore your credential scopes." + ) + credential_scopes = [] - if not credential_scopes: + elif not credential_scopes and credential_default_policy_type == "BearerTokenCredentialPolicy": if azure_arm: credential_scopes = ["https://management.azure.com/.default"] elif credential: @@ -176,7 +183,9 @@ def _build_code_model_options(self) -> Dict[str, Any]: "package_version": self._autorestapi.get_value("package-version"), "client_side_validation": self._autorestapi.get_boolean_value("client-side-validation", False), "tracing": self._autorestapi.get_boolean_value("trace", False), - "multiapi": self._autorestapi.get_boolean_value("multiapi", False) + "multiapi": self._autorestapi.get_boolean_value("multiapi", False), + "credential_default_policy_type": credential_default_policy_type, + "credential_default_policy_type_has_async_version": credential_default_policy_type == "BearerTokenCredentialPolicy" } if options["basic_setup_py"] and not options["package_version"]: diff --git a/autorest/codegen/templates/config.py.jinja2 b/autorest/codegen/templates/config.py.jinja2 index fc96d5648be..216f117eb2b 100644 --- a/autorest/codegen/templates/config.py.jinja2 +++ b/autorest/codegen/templates/config.py.jinja2 @@ -72,6 +72,7 @@ class {{ code_model.class_name }}Configuration(Configuration): # type: (...) -> None {% endif %} self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) @@ -86,5 +87,7 @@ class {{ code_model.class_name }}Configuration(Configuration): raise ValueError("You must provide either credential_scopes or authentication_policy as kwargs") {% endif %} if self.credential and not self.authentication_policy: - self.authentication_policy = policies.{{ async_prefix }}BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs) + {% set credential_default_policy_type = ("Async" if (async_mode and code_model.options['credential_default_policy_type_has_async_version']) else "") + code_model.options['credential_default_policy_type'] %} + {% set bearer_token_specific_params = "*self.credential_scopes, " %} + self.authentication_policy = policies.{{ credential_default_policy_type }}(self.credential, {{ bearer_token_specific_params if "BearerTokenCredentialPolicy" in credential_default_policy_type }}**kwargs) {% endif %} diff --git a/tasks.py b/tasks.py index c4ba5761267..eb242d6478e 100644 --- a/tasks.py +++ b/tasks.py @@ -146,6 +146,8 @@ def regen_expected(c, opts, debug): args.append(f"--override-info.title={opts['override-info.title']}") if opts.get('override-info.description'): args.append(f"--override-info.description={opts['override-info.description']}") + if opts.get('credential-default-policy-type'): + args.append(f"--credential-default-policy-type={opts['credential-default-policy-type']}") cmd_line = '{} {}'.format(_AUTOREST_CMD_LINE, " ".join(args)) print(Fore.YELLOW + f'Queuing up: {cmd_line}') @@ -244,6 +246,21 @@ def regenerate_namespace_folders_test(c, debug=False): } regen_expected(c, opts, debug) +@task +def regenerate_credential_default_policy(c, debug=False): + default_mapping = {'AcceptanceTests/HeadWithAzureKeyCredentialPolicy': 'head.json'} + opts = { + 'output_base_dir': 'test/azure', + 'input_base_dir': swagger_dir, + 'mappings': default_mapping, + 'output_dir': 'Expected', + 'azure_arm': True, + 'flattening_threshold': '1', + 'ns_prefix': True, + 'credential-default-policy-type': 'AzureKeyCredentialPolicy' + } + regen_expected(c, opts, debug) + @task def regenerate(c, swagger_name=None, debug=False): # regenerate expected code for tests @@ -253,6 +270,7 @@ def regenerate(c, swagger_name=None, debug=False): if not swagger_name: regenerate_namespace_folders_test(c, debug) regenerate_multiapi(c, debug) + regenerate_credential_default_policy(c, debug) @task diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py index 689193ae273..fb9601360f8 100644 --- a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py index a13ab8e4b83..1b03cf72178 100644 --- a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py index d207f8b8c27..26b4028c60e 100644 --- a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py index bf5ddf64f70..1395efe74f9 100644 --- a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py index cd73b916d0e..782a3f183f6 100644 --- a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py index 714cf2b4801..d90aef88501 100644 --- a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py index cbcfd91f3f3..07beddb42fc 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py @@ -59,6 +59,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py index 1d1ca81a0df..726e4d94b66 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py @@ -55,6 +55,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py index 93a21fe7d6d..c24bc56ed62 100644 --- a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py @@ -48,6 +48,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py index fb73b3eb921..5e22d7ca806 100644 --- a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py @@ -42,6 +42,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py index e1f79ae79d9..49070bfc6bf 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py @@ -58,6 +58,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py index 9fae7a70545..8550798d059 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py @@ -54,6 +54,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py b/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py index 3c0d6f29f6a..b73f61b1b25 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py index cfa5659c9cc..b14aed6c310 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py index 397fcee099d..658d3bc3ef8 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py index cf07971723f..c660e2a0e39 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/__init__.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/__init__.py new file mode 100644 index 00000000000..78354a67f97 --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/__init__.py @@ -0,0 +1,19 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._auto_rest_head_test_service import AutoRestHeadTestService +from ._version import VERSION + +__version__ = VERSION +__all__ = ['AutoRestHeadTestService'] + +try: + from ._patch import patch_sdk # type: ignore + patch_sdk() +except ImportError: + pass diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py new file mode 100644 index 00000000000..8f47e8fa1cc --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py @@ -0,0 +1,65 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.mgmt.core import ARMPipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Dict, Optional + + from azure.core.credentials import TokenCredential + +from ._configuration import AutoRestHeadTestServiceConfiguration +from .operations import HttpSuccessOperations + + +class AutoRestHeadTestService(object): + """Test Infrastructure for AutoRest. + + :ivar http_success: HttpSuccessOperations operations + :vartype http_success: headwithazurekeycredentialpolicy.operations.HttpSuccessOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential, # type: "TokenCredential" + base_url=None, # type: Optional[str] + **kwargs # type: Any + ): + # type: (...) -> None + if not base_url: + base_url = 'http://localhost:3000' + self._config = AutoRestHeadTestServiceConfiguration(credential, **kwargs) + self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {} # type: Dict[str, Any] + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.http_success = HttpSuccessOperations( + self._client, self._config, self._serialize, self._deserialize) + + def close(self): + # type: () -> None + self._client.close() + + def __enter__(self): + # type: () -> AutoRestHeadTestService + self._client.__enter__() + return self + + def __exit__(self, *exc_details): + # type: (Any) -> None + self._client.__exit__(*exc_details) diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py new file mode 100644 index 00000000000..a136ae4fe41 --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +from ._version import VERSION + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any + + from azure.core.credentials import TokenCredential + + +class AutoRestHeadTestServiceConfiguration(Configuration): + """Configuration for AutoRestHeadTestService. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(AutoRestHeadTestServiceConfiguration, self).__init__(**kwargs) + + self.credential = credential + kwargs.setdefault('sdk_moniker', 'autorestheadtestservice/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs # type: Any + ): + # type: (...) -> None + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_version.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_version.py new file mode 100644 index 00000000000..eae7c95b6fb --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_version.py @@ -0,0 +1,9 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +VERSION = "0.1.0" diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py new file mode 100644 index 00000000000..0738ddead5b --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/__init__.py @@ -0,0 +1,10 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._auto_rest_head_test_service_async import AutoRestHeadTestService +__all__ = ['AutoRestHeadTestService'] diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service_async.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service_async.py new file mode 100644 index 00000000000..14e0b34b2b4 --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service_async.py @@ -0,0 +1,61 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, Optional, TYPE_CHECKING + +from azure.mgmt.core import AsyncARMPipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Dict + + from azure.core.credentials_async import AsyncTokenCredential + +from ._configuration_async import AutoRestHeadTestServiceConfiguration +from .operations_async import HttpSuccessOperations + + +class AutoRestHeadTestService(object): + """Test Infrastructure for AutoRest. + + :ivar http_success: HttpSuccessOperations operations + :vartype http_success: headwithazurekeycredentialpolicy.aio.operations_async.HttpSuccessOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + base_url: Optional[str] = None, + **kwargs: Any + ) -> None: + if not base_url: + base_url = 'http://localhost:3000' + self._config = AutoRestHeadTestServiceConfiguration(credential, **kwargs) + self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {} # type: Dict[str, Any] + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.http_success = HttpSuccessOperations( + self._client, self._config, self._serialize, self._deserialize) + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> "AutoRestHeadTestService": + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details) -> None: + await self._client.__aexit__(*exc_details) diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py new file mode 100644 index 00000000000..e31dd8e174e --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +from .._version import VERSION + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + + +class AutoRestHeadTestServiceConfiguration(Configuration): + """Configuration for AutoRestHeadTestService. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(AutoRestHeadTestServiceConfiguration, self).__init__(**kwargs) + + self.credential = credential + kwargs.setdefault('sdk_moniker', 'autorestheadtestservice/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs: Any + ) -> None: + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/__init__.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/__init__.py new file mode 100644 index 00000000000..d4a3ccc1963 --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/__init__.py @@ -0,0 +1,13 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._http_success_operations_async import HttpSuccessOperations + +__all__ = [ + 'HttpSuccessOperations', +] diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/_http_success_operations_async.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/_http_success_operations_async.py new file mode 100644 index 00000000000..51ccbc3446d --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations_async/_http_success_operations_async.py @@ -0,0 +1,153 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, Optional, TypeVar +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async +from azure.mgmt.core.exceptions import ARMErrorFormat + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class HttpSuccessOperations: + """HttpSuccessOperations async operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + def __init__(self, client, config, serializer, deserializer) -> None: + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + @distributed_trace_async + async def head200( + self, + **kwargs + ) -> bool: + """Return 200 status code if successful. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: bool, or the result of cls(response) + :rtype: bool + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + # Construct URL + url = self.head200.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.head(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200, 404]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) + + return 200 <= response.status_code <= 299 + head200.metadata = {'url': '/http/success/200'} # type: ignore + + @distributed_trace_async + async def head204( + self, + **kwargs + ) -> bool: + """Return 204 status code if successful. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: bool, or the result of cls(response) + :rtype: bool + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + # Construct URL + url = self.head204.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.head(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [204, 404]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) + + return 200 <= response.status_code <= 299 + head204.metadata = {'url': '/http/success/204'} # type: ignore + + @distributed_trace_async + async def head404( + self, + **kwargs + ) -> bool: + """Return 404 status code if successful. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: bool, or the result of cls(response) + :rtype: bool + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + # Construct URL + url = self.head404.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.head(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [204, 404]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) + + return 200 <= response.status_code <= 299 + head404.metadata = {'url': '/http/success/404'} # type: ignore diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/__init__.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/__init__.py new file mode 100644 index 00000000000..ab55c6fdc9f --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/__init__.py @@ -0,0 +1,13 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._http_success_operations import HttpSuccessOperations + +__all__ = [ + 'HttpSuccessOperations', +] diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py new file mode 100644 index 00000000000..8299982b647 --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py @@ -0,0 +1,160 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse +from azure.core.tracing.decorator import distributed_trace +from azure.mgmt.core.exceptions import ARMErrorFormat + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Optional, TypeVar + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class HttpSuccessOperations(object): + """HttpSuccessOperations operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + def __init__(self, client, config, serializer, deserializer): + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + @distributed_trace + def head200( + self, + **kwargs # type: Any + ): + # type: (...) -> bool + """Return 200 status code if successful. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: bool, or the result of cls(response) + :rtype: bool + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + # Construct URL + url = self.head200.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.head(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200, 404]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) + + return 200 <= response.status_code <= 299 + head200.metadata = {'url': '/http/success/200'} # type: ignore + + @distributed_trace + def head204( + self, + **kwargs # type: Any + ): + # type: (...) -> bool + """Return 204 status code if successful. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: bool, or the result of cls(response) + :rtype: bool + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + # Construct URL + url = self.head204.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.head(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [204, 404]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) + + return 200 <= response.status_code <= 299 + head204.metadata = {'url': '/http/success/204'} # type: ignore + + @distributed_trace + def head404( + self, + **kwargs # type: Any + ): + # type: (...) -> bool + """Return 404 status code if successful. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: bool, or the result of cls(response) + :rtype: bool + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + # Construct URL + url = self.head404.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.head(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [204, 404]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) + + if cls: + return cls(pipeline_response, None, {}) + + return 200 <= response.status_code <= 299 + head404.metadata = {'url': '/http/success/404'} # type: ignore diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/py.typed b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py new file mode 100644 index 00000000000..09ee006da32 --- /dev/null +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +# coding: utf-8 + +from setuptools import setup, find_packages + +NAME = "autorestheadtestservice" +VERSION = "0.1.0" + +# To install the library, run the following +# +# python setup.py install +# +# prerequisite: setuptools +# http://pypi.python.org/pypi/setuptools + +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] + +setup( + name=NAME, + version=VERSION, + description="AutoRestHeadTestService", + author_email="", + url="", + keywords=["Swagger", "AutoRestHeadTestService"], + install_requires=REQUIRES, + packages=find_packages(), + include_package_data=True, + long_description="""\ + Test Infrastructure for AutoRest. + """ +) diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py b/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py index 6840b88073a..9193d8826d9 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py index 8b7bfdfd26f..ffa00d6b27d 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py b/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py index 4315d8d6185..4d638fa44e0 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py index 3a7e5e90b2d..ff58ff1775e 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py index 738a21a7074..69c7c95d88a 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py @@ -59,6 +59,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py index 581a2c009b6..6eb2a01d0e6 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py @@ -55,6 +55,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py index 8be57d15707..df275f718a2 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py @@ -59,6 +59,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py index 8ee69980dd9..719f2a74800 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py @@ -55,6 +55,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py index 2b240202e71..483830c438d 100644 --- a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py index ac52e0d62cb..62a0f949b60 100644 --- a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py index 01a896cbd3b..431d8771c2c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py index 4bd0fc41701..589fe8f27e8 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py index 01a896cbd3b..431d8771c2c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py index 4bd0fc41701..589fe8f27e8 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py index 4bb8e668049..e1f4eb9777b 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py index e9e4a5219cb..4b647145b25 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py index a4662294d84..4b971db94fc 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py index dfff3a00d3e..d37ce0f56e8 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py index 21346fd217f..ae58b529a1a 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py @@ -43,6 +43,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py index 231ec33f368..aa34bbf83a9 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py @@ -37,6 +37,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py index 7d758190ee5..53f812a790b 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py index bee1ffda434..4fc13f5db0c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py index 52a4251d283..ff0b6a9b32c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py index ce5ba77b756..c51574101c7 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py index 369880be895..edb0d0c6571 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py index c9bddd41723..15b6d22c4d4 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py index ab036a4bbc3..a5134f6ed42 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py index 8a05dce1a92..813431fc273 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py index 689193ae273..fb9601360f8 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py index a13ab8e4b83..1b03cf72178 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py index 47d8a63e9f9..f40daf07835 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py index fb32f1d142c..d28407b4644 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py index 86a1d3ebfd2..5bd9858ec57 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py index 262a8481776..541275db6ad 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py index bdc06407352..812932def62 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py index 0c1b5075113..da1fa2b5551 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py index 742501a30aa..a0385bf3f99 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py index 0a7ca379167..7694d9ad988 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py index 191c729cb7f..07866d4ee3f 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py index c07ccec3eff..2a48fcda7e4 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py index 93a21fe7d6d..c24bc56ed62 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py @@ -48,6 +48,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py index fb73b3eb921..5e22d7ca806 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py @@ -42,6 +42,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py index 039cc891e1d..5a683c0abb1 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py @@ -54,6 +54,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py index ea7d33e7ae7..dc7e653896c 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py index eafd0bdce0a..5db6ba68940 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py index 02a5ce9bf01..6263a30cc30 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py index 488c3c88c31..bd654407978 100644 --- a/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py index 74415a3e1c4..2c36f56df79 100644 --- a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py index 1c9f29ffc65..bb9b3c9f41e 100644 --- a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py index d8e5bac4c56..20bab4ae7b5 100644 --- a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py index ca7c486f157..e416d46b5ea 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py index 74cc0fc0c11..80223f12056 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py index 09e3ca852e3..a0b4a7f9829 100644 --- a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py index 33bff93b181..7f16cbd34fd 100644 --- a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py index 9934d7190b2..0f2ca96609a 100644 --- a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py index 1a1c36c9fa6..cb54b346a8e 100644 --- a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py index d8ed85228fd..d6bc74ec056 100644 --- a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py index 0ba4f475c90..1b2a956469d 100644 --- a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py index a827f990e1c..daf3c597290 100644 --- a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py index e3ee9067801..306ed7f5145 100644 --- a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py index 0d56c724cc3..47068005a00 100644 --- a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py index 8149db7c0a6..99d22d4faf4 100644 --- a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py index bc3e8ee6680..040069e15b7 100644 --- a/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py index a35a326f91b..9a9d5ca77b9 100644 --- a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py index f30356489b9..420371b7106 100644 --- a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py @@ -58,6 +58,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py index df4e6f96240..116412c23d5 100644 --- a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py @@ -52,6 +52,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py index 6874ba22447..2d10168d774 100644 --- a/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py index 4012c2786b4..9bae3a7582e 100644 --- a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py @@ -46,6 +46,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py index e2135fd9aa6..bcf007fde11 100644 --- a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py index 1fef98f0691..ffa9f97aef9 100644 --- a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py index 058eb79f711..590c3ae99fc 100644 --- a/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py @@ -49,6 +49,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py index 965217de176..ce4071ef89e 100644 --- a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py @@ -43,6 +43,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py index acdf8f87230..6052fde9962 100644 --- a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py index e4828a5ed86..8e6cec550a5 100644 --- a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py index 1e3ccb4e9bd..09c83e1db1a 100644 --- a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py @@ -41,6 +41,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py index 72970bc6a42..4ea17864859 100644 --- a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py @@ -35,6 +35,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) From 2c273ba8e9f4c101a3c4ac029ad51132600b4748 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 10 Jun 2020 17:54:27 -0400 Subject: [PATCH 02/10] add credential default policy for multiapi --- .../codegen/templates/metadata.json.jinja2 | 4 +- .../templates/multiapi_config.py.jinja2 | 5 +- ...test_multiapi_credential_default_policy.py | 43 +++++ ...test_multiapi_credential_default_policy.py | 41 ++++ .../Multiapi/multiapi/_configuration.py | 1 + .../multiapi/aio/_configuration_async.py | 1 + .../Multiapi/multiapi/v1/_configuration.py | 1 + .../Multiapi/multiapi/v1/_metadata.json | 4 +- .../multiapi/v1/aio/_configuration_async.py | 1 + .../Multiapi/multiapi/v2/_configuration.py | 1 + .../Multiapi/multiapi/v2/_metadata.json | 4 +- .../multiapi/v2/aio/_configuration_async.py | 1 + .../Multiapi/multiapi/v3/_configuration.py | 1 + .../Multiapi/multiapi/v3/_metadata.json | 4 +- .../multiapi/v3/aio/_configuration_async.py | 1 + .../__init__.py | 16 ++ .../_configuration.py | 58 ++++++ .../_multiapi_service_client.py | 141 ++++++++++++++ .../_operations_mixin.py | 112 +++++++++++ .../_version.py | 8 + .../aio/__init__.py | 10 + .../aio/_configuration_async.py | 57 ++++++ .../aio/_multiapi_service_client_async.py | 141 ++++++++++++++ .../aio/_operations_mixin_async.py | 108 +++++++++++ .../multiapicredentialdefaultpolicy/models.py | 9 + .../multiapicredentialdefaultpolicy/py.typed | 1 + .../v1/__init__.py | 16 ++ .../v1/_configuration.py | 62 ++++++ .../v1/_metadata.json | 79 ++++++++ .../v1/_multiapi_service_client.py | 65 +++++++ .../v1/aio/__init__.py | 10 + .../v1/aio/_configuration_async.py | 58 ++++++ .../v1/aio/_multiapi_service_client_async.py | 59 ++++++ .../v1/aio/operations_async/__init__.py | 15 ++ ...ultiapi_service_client_operations_async.py | 175 +++++++++++++++++ .../_operation_group_one_operations_async.py | 80 ++++++++ .../v1/models/__init__.py | 19 ++ .../v1/models/_models.py | 52 +++++ .../v1/models/_models_py3.py | 59 ++++++ .../v1/operations/__init__.py | 15 ++ .../_multiapi_service_client_operations.py | 182 ++++++++++++++++++ .../_operation_group_one_operations.py | 85 ++++++++ .../v1/py.typed | 1 + .../v2/__init__.py | 16 ++ .../v2/_configuration.py | 62 ++++++ .../v2/_metadata.json | 56 ++++++ .../v2/_multiapi_service_client.py | 70 +++++++ .../v2/aio/__init__.py | 10 + .../v2/aio/_configuration_async.py | 58 ++++++ .../v2/aio/_multiapi_service_client_async.py | 64 ++++++ .../v2/aio/operations_async/__init__.py | 17 ++ ...ultiapi_service_client_operations_async.py | 73 +++++++ .../_operation_group_one_operations_async.py | 136 +++++++++++++ .../_operation_group_two_operations_async.py | 84 ++++++++ .../v2/models/__init__.py | 19 ++ .../v2/models/_models.py | 62 ++++++ .../v2/models/_models_py3.py | 70 +++++++ .../v2/operations/__init__.py | 17 ++ .../_multiapi_service_client_operations.py | 78 ++++++++ .../_operation_group_one_operations.py | 142 ++++++++++++++ .../_operation_group_two_operations.py | 89 +++++++++ .../v2/py.typed | 1 + .../v3/__init__.py | 16 ++ .../v3/_configuration.py | 62 ++++++ .../v3/_metadata.json | 56 ++++++ .../v3/_multiapi_service_client.py | 70 +++++++ .../v3/aio/__init__.py | 10 + .../v3/aio/_configuration_async.py | 58 ++++++ .../v3/aio/_multiapi_service_client_async.py | 64 ++++++ .../v3/aio/operations_async/__init__.py | 17 ++ ...ultiapi_service_client_operations_async.py | 78 ++++++++ .../_operation_group_one_operations_async.py | 96 +++++++++ .../_operation_group_two_operations_async.py | 142 ++++++++++++++ .../v3/models/__init__.py | 30 +++ .../v3/models/_models.py | 98 ++++++++++ .../v3/models/_models_py3.py | 110 +++++++++++ .../models/_multiapi_service_client_enums.py | 18 ++ .../v3/operations/__init__.py | 17 ++ .../_multiapi_service_client_operations.py | 83 ++++++++ .../_operation_group_one_operations.py | 101 ++++++++++ .../_operation_group_two_operations.py | 148 ++++++++++++++ .../v3/py.typed | 1 + .../MultiapiCredentialDefaultPolicy/setup.py | 42 ++++ .../multiapinoasync/_configuration.py | 1 + .../multiapinoasync/v1/_configuration.py | 1 + .../multiapinoasync/v1/_metadata.json | 4 +- .../multiapinoasync/v2/_configuration.py | 1 + .../multiapinoasync/v2/_metadata.json | 4 +- .../multiapinoasync/v3/_configuration.py | 1 + .../multiapinoasync/v3/_metadata.json | 4 +- .../submodule/_configuration.py | 1 + .../submodule/aio/_configuration_async.py | 1 + .../submodule/v1/_configuration.py | 1 + .../submodule/v1/_metadata.json | 4 +- .../submodule/v1/aio/_configuration_async.py | 1 + .../submodule/v2/_configuration.py | 1 + .../submodule/v2/_metadata.json | 4 +- .../submodule/v2/aio/_configuration_async.py | 1 + .../submodule/v3/_configuration.py | 1 + .../submodule/v3/_metadata.json | 4 +- .../submodule/v3/aio/_configuration_async.py | 1 + test/multiapi/requirements.txt | 3 +- .../multiapicredentialdefaultpolicy/README.md | 50 +++++ 103 files changed, 4324 insertions(+), 12 deletions(-) create mode 100644 test/multiapi/AcceptanceTests/asynctests/test_multiapi_credential_default_policy.py create mode 100644 test/multiapi/AcceptanceTests/test_multiapi_credential_default_policy.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_version.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/models.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/py.typed create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_multiapi_service_client.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_multiapi_service_client_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_operation_group_one_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/py.typed create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_multiapi_service_client.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_multiapi_service_client_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_one_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_two_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models_py3.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/py.typed create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_multiapi_service_client.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_multiapi_service_client_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_one_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_two_operations_async.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/__init__.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/py.typed create mode 100644 test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/setup.py create mode 100644 test/multiapi/specification/multiapicredentialdefaultpolicy/README.md diff --git a/autorest/codegen/templates/metadata.json.jinja2 b/autorest/codegen/templates/metadata.json.jinja2 index b1b9fc49e99..b37209af2a6 100644 --- a/autorest/codegen/templates/metadata.json.jinja2 +++ b/autorest/codegen/templates/metadata.json.jinja2 @@ -39,7 +39,9 @@ }, "config": { "credential": {{ code_model.options['credential'] | tojson }}, - "credential_scopes": {{ code_model.options['credential_scopes'] | tojson }} + "credential_scopes": {{ code_model.options['credential_scopes'] | tojson }}, + "credential_default_policy_type": {{ code_model.options['credential_default_policy_type'] | tojson }}, + "credential_default_policy_type_has_async_version": {{ code_model.options['credential_default_policy_type_has_async_version'] | tojson }} }, "operation_groups": { {% for operation_group in code_model.operation_groups %} diff --git a/autorest/multiapi/templates/multiapi_config.py.jinja2 b/autorest/multiapi/templates/multiapi_config.py.jinja2 index 016dce4953e..2fd48e3b8e4 100644 --- a/autorest/multiapi/templates/multiapi_config.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_config.py.jinja2 @@ -82,6 +82,7 @@ class {{ client_name }}Configuration(Configuration): # type: (...) -> None {% endif %} self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) @@ -96,5 +97,7 @@ class {{ client_name }}Configuration(Configuration): raise ValueError("You must provide either credential_scopes or authentication_policy as kwargs") {% endif %} if self.credential and not self.authentication_policy: - self.authentication_policy = policies.{{ async_prefix }}BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs) + {% set credential_default_policy_type = ("Async" if (async_mode and config['credential_default_policy_type_has_async_version']) else "") + config['credential_default_policy_type'] %} + {% set bearer_token_specific_params = "*self.credential_scopes, " %} + self.authentication_policy = policies.{{ credential_default_policy_type }}(self.credential, {{ bearer_token_specific_params if "BearerTokenCredentialPolicy" in credential_default_policy_type }}**kwargs) {% endif %} diff --git a/test/multiapi/AcceptanceTests/asynctests/test_multiapi_credential_default_policy.py b/test/multiapi/AcceptanceTests/asynctests/test_multiapi_credential_default_policy.py new file mode 100644 index 00000000000..2857de8f3c3 --- /dev/null +++ b/test/multiapi/AcceptanceTests/asynctests/test_multiapi_credential_default_policy.py @@ -0,0 +1,43 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- +import pytest +from async_generator import yield_, async_generator +from azure.core.pipeline.policies import AzureKeyCredentialPolicy + +@pytest.fixture +@async_generator +async def default_client(credential, authentication_policy): + from multiapicredentialdefaultpolicy.aio import MultiapiServiceClient + async with MultiapiServiceClient( + base_url="http://localhost:3000", + credential="12345", + name="azure_key_credential_policy" + ) as default_client: + await yield_(default_client) + +def test_multiapi_credential_default_policy_type(default_client): + # making sure that the authentication policy is AzureKeyCredentialPolicy + assert isinstance(default_client._config.authentication_policy, AzureKeyCredentialPolicy) \ No newline at end of file diff --git a/test/multiapi/AcceptanceTests/test_multiapi_credential_default_policy.py b/test/multiapi/AcceptanceTests/test_multiapi_credential_default_policy.py new file mode 100644 index 00000000000..0812e088263 --- /dev/null +++ b/test/multiapi/AcceptanceTests/test_multiapi_credential_default_policy.py @@ -0,0 +1,41 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- +import pytest +from azure.core.pipeline.policies import AzureKeyCredentialPolicy + +@pytest.fixture +def default_client(authentication_policy): + from multiapicredentialdefaultpolicy import MultiapiServiceClient + with MultiapiServiceClient( + base_url="http://localhost:3000", + credential="12345", + name="azure_key_credential_policy" + ) as default_client: + yield default_client + +def test_multiapi_credential_default_policy_type(default_client): + # making sure that the authentication policy is AzureKeyCredentialPolicy + assert isinstance(default_client._config.authentication_policy, AzureKeyCredentialPolicy) \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py index 1ac26fb2367..e0cefedcbc4 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py @@ -48,6 +48,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py index 7f0abc85ce2..525a74c1e72 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py @@ -47,6 +47,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py index 4a22f3ea0ad..a222332d4fa 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json index a991638b2af..adcfb2ca2b6 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations" diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py index 52f4b99fba3..60672b352b5 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py index 540f8415c9c..7e2cec5a23e 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json index 42a381b4f87..78688bf9c04 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations", diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py index 3ec64429d3d..a0347274a16 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py index b1d384c5d0f..8a25de4bdc9 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json index 0830d4070b9..c1d220aea76 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations", diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py index bdfcf65671e..bcbc96f6778 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/__init__.py new file mode 100644 index 00000000000..8c8f1f92954 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/__init__.py @@ -0,0 +1,16 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] + +try: + from ._patch import patch_sdk # type: ignore + patch_sdk() +except ImportError: + pass diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py new file mode 100644 index 00000000000..7ca956deef3 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- +from typing import Any + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +from ._version import VERSION + + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs # type: Any + ): + # type: (...) -> None + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py new file mode 100644 index 00000000000..90842b4af3f --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_multiapi_service_client.py @@ -0,0 +1,141 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from azure.mgmt.core import ARMPipelineClient +from msrest import Serializer, Deserializer + +from azure.profiles import KnownProfiles, ProfileDefinition +from azure.profiles.multiapiclient import MultiApiClientMixin +from ._configuration import MultiapiServiceClientConfiguration +from ._operations_mixin import MultiapiServiceClientOperationsMixin +class _SDKClient(object): + def __init__(self, *args, **kwargs): + """This is a fake class to support current implemetation of MultiApiClientMixin." + Will be removed in final version of multiapi azure-core based client + """ + pass + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin, MultiApiClientMixin, _SDKClient): + """Service client for multiapi client testing. + + This ready contains multiple API versions, to help you deal with all of the Azure clouds + (Azure Stack, Azure Government, Azure China, etc.). + By default, it uses the latest API version available on public Azure. + For production, you should stick to a particular api-version and/or profile. + The profile sets a mapping between an operation group and its API version. + The api-version parameter sets the default API version if the operation + group is not described in the profile. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + :param str api_version: API version to use if no profile is provided, or if + missing in profile. + :param str base_url: Service URL + :param profile: A profile definition, from KnownProfiles to dict. + :type profile: azure.profiles.KnownProfiles + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + DEFAULT_API_VERSION = '3.0.0' + _PROFILE_TAG = "multiapicredentialdefaultpolicy.MultiapiServiceClient" + LATEST_PROFILE = ProfileDefinition({ + _PROFILE_TAG: { + None: DEFAULT_API_VERSION, + 'begin_test_lro': '1.0.0', + 'test_one': '2.0.0', + }}, + _PROFILE_TAG + " latest" + ) + + def __init__( + self, + credential, # type: "TokenCredential" + api_version=None, + base_url=None, + profile=KnownProfiles.default, + **kwargs # type: Any + ): + if not base_url: + base_url = 'https://management.azure.com' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + super(MultiapiServiceClient, self).__init__( + credential, + self._config, + api_version=api_version, + profile=profile + ) + + @classmethod + def _models_dict(cls, api_version): + return {k: v for k, v in cls.models(api_version).__dict__.items() if isinstance(v, type)} + + @classmethod + def models(cls, api_version=DEFAULT_API_VERSION): + """Module depends on the API version: + + * 1.0.0: :mod:`v1.models` + * 2.0.0: :mod:`v2.models` + * 3.0.0: :mod:`v3.models` + """ + if api_version == '1.0.0': + from .v1 import models + return models + elif api_version == '2.0.0': + from .v2 import models + return models + elif api_version == '3.0.0': + from .v3 import models + return models + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + + @property + def operation_group_one(self): + """Instance depends on the API version: + + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` + """ + api_version = self._get_api_version('operation_group_one') + if api_version == '1.0.0': + from .v1.operations import OperationGroupOneOperations as OperationClass + elif api_version == '2.0.0': + from .v2.operations import OperationGroupOneOperations as OperationClass + elif api_version == '3.0.0': + from .v3.operations import OperationGroupOneOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + + @property + def operation_group_two(self): + """Instance depends on the API version: + + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` + """ + api_version = self._get_api_version('operation_group_two') + if api_version == '2.0.0': + from .v2.operations import OperationGroupTwoOperations as OperationClass + elif api_version == '3.0.0': + from .v3.operations import OperationGroupTwoOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + + def close(self): + self._client.close() + def __enter__(self): + self._client.__enter__() + return self + def __exit__(self, *exc_details): + self._client.__exit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py new file mode 100644 index 00000000000..28db425f2fb --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py @@ -0,0 +1,112 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- +from msrest import Serializer, Deserializer +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.paging import ItemPaged +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse +from azure.core.polling import LROPoller, NoPolling, PollingMethod +from azure.core.polling.base_polling import LROBasePolling + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union + + +class MultiapiServiceClientOperationsMixin(object): + + def begin_test_lro( + self, + product=None, # type: Optional["models.Product"] + **kwargs # type: Any + ): + """Put in whatever shape of Product you want, will return a Product with id equal to 100. + + :param product: Product to put. + :type product: ~multiapicredentialdefaultpolicy.v1.models.Product + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + :return: An instance of LROPoller that returns either Product or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[~multiapicredentialdefaultpolicy.v1.models.Product] + :raises ~azure.core.exceptions.HttpResponseError: + """ + api_version = self._get_api_version('begin_test_lro') + if api_version == '1.0.0': + from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + mixin_instance = OperationClass() + mixin_instance._client = self._client + mixin_instance._config = self._config + mixin_instance._serialize = Serializer(self._models_dict(api_version)) + mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) + return mixin_instance.begin_test_lro(product, **kwargs) + + def test_one( + self, + id, # type: int + message=None, # type: Optional[str] + **kwargs # type: Any + ): + """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. + + :param id: An int parameter. + :type id: int + :param message: An optional string parameter. + :type message: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelTwo, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = self._get_api_version('test_one') + if api_version == '1.0.0': + from .v1.operations import MultiapiServiceClientOperationsMixin as OperationClass + elif api_version == '2.0.0': + from .v2.operations import MultiapiServiceClientOperationsMixin as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + mixin_instance = OperationClass() + mixin_instance._client = self._client + mixin_instance._config = self._config + mixin_instance._serialize = Serializer(self._models_dict(api_version)) + mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) + return mixin_instance.test_one(id, message, **kwargs) + + def test_paging( + self, + **kwargs # type: Any + ): + """Returns ModelThree with optionalProperty 'paged'. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: An iterator like instance of either PagingResult or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult] + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = self._get_api_version('test_paging') + if api_version == '3.0.0': + from .v3.operations import MultiapiServiceClientOperationsMixin as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + mixin_instance = OperationClass() + mixin_instance._client = self._client + mixin_instance._config = self._config + mixin_instance._serialize = Serializer(self._models_dict(api_version)) + mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) + return mixin_instance.test_paging(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_version.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_version.py new file mode 100644 index 00000000000..a30a458f8b5 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_version.py @@ -0,0 +1,8 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +VERSION = "0.1.0" \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py new file mode 100644 index 00000000000..ec341e1dd7e --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/__init__.py @@ -0,0 +1,10 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_async import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py new file mode 100644 index 00000000000..b20ae701700 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py @@ -0,0 +1,57 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- +from typing import Any + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +from .._version import VERSION + + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + """ + + def __init__( + self, + credential, # type: "AsyncTokenCredential" + **kwargs # type: Any + ) -> None: + # type: (...) -> None + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs: Any + ) -> None: + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py new file mode 100644 index 00000000000..b6db4fd613d --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_multiapi_service_client_async.py @@ -0,0 +1,141 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from azure.mgmt.core import AsyncARMPipelineClient +from msrest import Serializer, Deserializer + +from azure.profiles import KnownProfiles, ProfileDefinition +from azure.profiles.multiapiclient import MultiApiClientMixin +from ._configuration_async import MultiapiServiceClientConfiguration +from ._operations_mixin_async import MultiapiServiceClientOperationsMixin +class _SDKClient(object): + def __init__(self, *args, **kwargs): + """This is a fake class to support current implemetation of MultiApiClientMixin." + Will be removed in final version of multiapi azure-core based client + """ + pass + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin, MultiApiClientMixin, _SDKClient): + """Service client for multiapi client testing. + + This ready contains multiple API versions, to help you deal with all of the Azure clouds + (Azure Stack, Azure Government, Azure China, etc.). + By default, it uses the latest API version available on public Azure. + For production, you should stick to a particular api-version and/or profile. + The profile sets a mapping between an operation group and its API version. + The api-version parameter sets the default API version if the operation + group is not described in the profile. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + :param str api_version: API version to use if no profile is provided, or if + missing in profile. + :param str base_url: Service URL + :param profile: A profile definition, from KnownProfiles to dict. + :type profile: azure.profiles.KnownProfiles + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + DEFAULT_API_VERSION = '3.0.0' + _PROFILE_TAG = "multiapicredentialdefaultpolicy.MultiapiServiceClient" + LATEST_PROFILE = ProfileDefinition({ + _PROFILE_TAG: { + None: DEFAULT_API_VERSION, + 'begin_test_lro': '1.0.0', + 'test_one': '2.0.0', + }}, + _PROFILE_TAG + " latest" + ) + + def __init__( + self, + credential, # type: "AsyncTokenCredential" + api_version=None, + base_url=None, + profile=KnownProfiles.default, + **kwargs # type: Any + ) -> None: + if not base_url: + base_url = 'https://management.azure.com' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + super(MultiapiServiceClient, self).__init__( + credential, + self._config, + api_version=api_version, + profile=profile + ) + + @classmethod + def _models_dict(cls, api_version): + return {k: v for k, v in cls.models(api_version).__dict__.items() if isinstance(v, type)} + + @classmethod + def models(cls, api_version=DEFAULT_API_VERSION): + """Module depends on the API version: + + * 1.0.0: :mod:`v1.models` + * 2.0.0: :mod:`v2.models` + * 3.0.0: :mod:`v3.models` + """ + if api_version == '1.0.0': + from ..v1 import models + return models + elif api_version == '2.0.0': + from ..v2 import models + return models + elif api_version == '3.0.0': + from ..v3 import models + return models + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + + @property + def operation_group_one(self): + """Instance depends on the API version: + + * 1.0.0: :class:`OperationGroupOneOperations` + * 2.0.0: :class:`OperationGroupOneOperations` + * 3.0.0: :class:`OperationGroupOneOperations` + """ + api_version = self._get_api_version('operation_group_one') + if api_version == '1.0.0': + from ..v1.aio.operations_async import OperationGroupOneOperations as OperationClass + elif api_version == '2.0.0': + from ..v2.aio.operations_async import OperationGroupOneOperations as OperationClass + elif api_version == '3.0.0': + from ..v3.aio.operations_async import OperationGroupOneOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + + @property + def operation_group_two(self): + """Instance depends on the API version: + + * 2.0.0: :class:`OperationGroupTwoOperations` + * 3.0.0: :class:`OperationGroupTwoOperations` + """ + api_version = self._get_api_version('operation_group_two') + if api_version == '2.0.0': + from ..v2.aio.operations_async import OperationGroupTwoOperations as OperationClass + elif api_version == '3.0.0': + from ..v3.aio.operations_async import OperationGroupTwoOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + + async def close(self): + await self._client.close() + async def __aenter__(self): + await self._client.__aenter__() + return self + async def __aexit__(self, *exc_details): + await self._client.__aexit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py new file mode 100644 index 00000000000..9a940077b7e --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin_async.py @@ -0,0 +1,108 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- +from msrest import Serializer, Deserializer +from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union +import warnings + +from azure.core.async_paging import AsyncItemPaged, AsyncList +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest +from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod +from azure.core.polling.async_base_polling import AsyncLROBasePolling + + +class MultiapiServiceClientOperationsMixin(object): + + async def begin_test_lro( + self, + product: Optional["models.Product"] = None, + **kwargs + ) -> AsyncLROPoller["models.Product"]: + """Put in whatever shape of Product you want, will return a Product with id equal to 100. + + :param product: Product to put. + :type product: ~multiapicredentialdefaultpolicy.v1.models.Product + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either Product or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~multiapicredentialdefaultpolicy.v1.models.Product] + :raises ~azure.core.exceptions.HttpResponseError: + """ + api_version = self._get_api_version('begin_test_lro') + if api_version == '1.0.0': + from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + mixin_instance = OperationClass() + mixin_instance._client = self._client + mixin_instance._config = self._config + mixin_instance._serialize = Serializer(self._models_dict(api_version)) + mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) + return await mixin_instance.begin_test_lro(product, **kwargs) + + async def test_one( + self, + id: int, + message: Optional[str] = None, + **kwargs + ) -> "models.ModelTwo": + """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. + + :param id: An int parameter. + :type id: int + :param message: An optional string parameter. + :type message: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelTwo, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = self._get_api_version('test_one') + if api_version == '1.0.0': + from ..v1.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + elif api_version == '2.0.0': + from ..v2.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + mixin_instance = OperationClass() + mixin_instance._client = self._client + mixin_instance._config = self._config + mixin_instance._serialize = Serializer(self._models_dict(api_version)) + mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) + return await mixin_instance.test_one(id, message, **kwargs) + + def test_paging( + self, + **kwargs + ) -> AsyncItemPaged["models.PagingResult"]: + """Returns ModelThree with optionalProperty 'paged'. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: An iterator like instance of either PagingResult or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult] + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = self._get_api_version('test_paging') + if api_version == '3.0.0': + from ..v3.aio.operations_async import MultiapiServiceClientOperationsMixin as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + mixin_instance = OperationClass() + mixin_instance._client = self._client + mixin_instance._config = self._config + mixin_instance._serialize = Serializer(self._models_dict(api_version)) + mixin_instance._deserialize = Deserializer(self._models_dict(api_version)) + return mixin_instance.test_paging(**kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/models.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/models.py new file mode 100644 index 00000000000..954f1ee54ab --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/models.py @@ -0,0 +1,9 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- +from .v1.models import * +from .v2.models import * +from .v3.models import * diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/py.typed b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/__init__.py new file mode 100644 index 00000000000..8c8f1f92954 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/__init__.py @@ -0,0 +1,16 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] + +try: + from ._patch import patch_sdk # type: ignore + patch_sdk() +except ImportError: + pass diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py new file mode 100644 index 00000000000..e3998041eb4 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any + + from azure.core.credentials import TokenCredential + +VERSION = "unknown" + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + self.api_version = "1.0.0" + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs # type: Any + ): + # type: (...) -> None + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json new file mode 100644 index 00000000000..7ec5283b5ad --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json @@ -0,0 +1,79 @@ +{ + "chosen_version": "1.0.0", + "total_api_version_list": ["1.0.0"], + "client": { + "name": "MultiapiServiceClient", + "filename": "_multiapi_service_client", + "description": "Service client for multiapi client testing." + }, + "global_parameters": { + "sync_method": { + "credential": { + "method_signature": "credential, # type: \"TokenCredential\"", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials.TokenCredential", + "required": true + } + }, + "async_method": { + "credential": { + "method_signature": "credential, # type: \"AsyncTokenCredential\"", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials_async.AsyncTokenCredential", + "required": true + } + }, + "constant": { + }, + "call": "credential" + }, + "config": { + "credential": true, + "credential_scopes": null, + "credential_default_policy_type": "AzureKeyCredentialPolicy", + "credential_default_policy_type_has_async_version": false + }, + "operation_groups": { + "operation_group_one": "OperationGroupOneOperations" + }, + "operation_mixins": { + "test_one" : { + "sync": { + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n", + "doc": "\"\"\"TestOne should be in an FirstVersionOperationsMixin.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: None, or the result of cls(response)\n:rtype: None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "async": { + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs\n) -\u003e None:\n", + "coroutine": true, + "doc": "\"\"\"TestOne should be in an FirstVersionOperationsMixin.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: None, or the result of cls(response)\n:rtype: None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "call": "id, message" + }, + "_test_lro_initial" : { + "sync": { + "signature": "def _test_lro_initial(\n self,\n product=None, # type: Optional[\"models.Product\"]\n **kwargs # type: Any\n):\n", + "doc": "\"\"\"\n\n:param product: Product to put.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "async": { + "signature": "async def _test_lro_initial(\n self,\n product: Optional[\"models.Product\"] = None,\n **kwargs\n) -\u003e Optional[\"models.Product\"]:\n", + "coroutine": true, + "doc": "\"\"\"\n\n:param product: Product to put.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: Product, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v1.models.Product or None\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "call": "product" + }, + "begin_test_lro" : { + "sync": { + "signature": "def begin_test_lro(\n self,\n product=None, # type: Optional[\"models.Product\"]\n **kwargs # type: Any\n):\n", + "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: True for ARMPolling, False for no polling, or a\n polling object for personal polling strategy\n:paramtype polling: bool or ~azure.core.polling.PollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.\n:return: An instance of LROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.LROPoller[~multiapicredentialdefaultpolicy.v1.models.Product]\n:raises ~azure.core.exceptions.HttpResponseError:\n\"\"\"" + }, + "async": { + "signature": "async def begin_test_lro(\n self,\n product: Optional[\"models.Product\"] = None,\n **kwargs\n) -\u003e AsyncLROPoller[\"models.Product\"]:\n", + "coroutine": true, + "doc": "\"\"\"Put in whatever shape of Product you want, will return a Product with id equal to 100.\n\n:param product: Product to put.\n:type product: ~multiapicredentialdefaultpolicy.v1.models.Product\n:keyword callable cls: A custom type or function that will be passed the direct response\n:keyword str continuation_token: A continuation token to restart a poller from a saved state.\n:keyword polling: True for ARMPolling, False for no polling, or a\n polling object for personal polling strategy\n:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod\n:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.\n:return: An instance of AsyncLROPoller that returns either Product or the result of cls(response)\n:rtype: ~azure.core.polling.AsyncLROPoller[~multiapicredentialdefaultpolicy.v1.models.Product]\n:raises ~azure.core.exceptions.HttpResponseError:\n\"\"\"" + }, + "call": "product" + } + }, + "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"], \"azure.core.polling\": [\"LROPoller\", \"NoPolling\", \"PollingMethod\"], \"azure.core.polling.base_polling\": [\"LROBasePolling\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Callable\", \"Dict\", \"Generic\", \"Optional\", \"TypeVar\", \"Union\"]}}}", + "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"], \"azure.core.polling\": [\"AsyncLROPoller\", \"AsyncNoPolling\", \"AsyncPollingMethod\"], \"azure.core.polling.async_base_polling\": [\"AsyncLROBasePolling\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Callable\", \"Dict\", \"Generic\", \"Optional\", \"TypeVar\", \"Union\"]}}}" +} \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_multiapi_service_client.py new file mode 100644 index 00000000000..19a60b72634 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_multiapi_service_client.py @@ -0,0 +1,65 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.core import PipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any + + from azure.core.credentials import TokenCredential + +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from . import models + + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): + """Service client for multiapi client testing. + + :ivar operation_group_one: OperationGroupOneOperations operations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v1.operations.OperationGroupOneOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + base_url = 'None' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.operation_group_one = OperationGroupOneOperations( + self._client, self._config, self._serialize, self._deserialize) + + def close(self): + # type: () -> None + self._client.close() + + def __enter__(self): + # type: () -> MultiapiServiceClient + self._client.__enter__() + return self + + def __exit__(self, *exc_details): + # type: (Any) -> None + self._client.__exit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py new file mode 100644 index 00000000000..ec341e1dd7e --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/__init__.py @@ -0,0 +1,10 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_async import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py new file mode 100644 index 00000000000..bffa607fad7 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + +VERSION = "unknown" + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + self.api_version = "1.0.0" + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs: Any + ) -> None: + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client_async.py new file mode 100644 index 00000000000..e338931a000 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_multiapi_service_client_async.py @@ -0,0 +1,59 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, TYPE_CHECKING + +from azure.core import AsyncPipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + +from ._configuration_async import MultiapiServiceClientConfiguration +from .operations_async import MultiapiServiceClientOperationsMixin +from .operations_async import OperationGroupOneOperations +from .. import models + + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): + """Service client for multiapi client testing. + + :ivar operation_group_one: OperationGroupOneOperations operations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v1.aio.operations_async.OperationGroupOneOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: + base_url = 'None' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.operation_group_one = OperationGroupOneOperations( + self._client, self._config, self._serialize, self._deserialize) + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> "MultiapiServiceClient": + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details) -> None: + await self._client.__aexit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/__init__.py new file mode 100644 index 00000000000..ec2cdbef519 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/__init__.py @@ -0,0 +1,15 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations_async import OperationGroupOneOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_multiapi_service_client_operations_async.py new file mode 100644 index 00000000000..6d4f48a0695 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_multiapi_service_client_operations_async.py @@ -0,0 +1,175 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, Optional, TypeVar, Union +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest +from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod +from azure.core.polling.async_base_polling import AsyncLROBasePolling + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class MultiapiServiceClientOperationsMixin: + + async def test_one( + self, + id: int, + message: Optional[str] = None, + **kwargs + ) -> None: + """TestOne should be in an FirstVersionOperationsMixin. + + :param id: An int parameter. + :type id: int + :param message: An optional string parameter. + :type message: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "1.0.0" + + # Construct URL + url = self.test_one.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['id'] = self._serialize.query("id", id, 'int') + if message is not None: + query_parameters['message'] = self._serialize.query("message", message, 'str') + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_one.metadata = {'url': '/multiapi/testOneEndpoint'} # type: ignore + + async def _test_lro_initial( + self, + product: Optional["models.Product"] = None, + **kwargs + ) -> Optional["models.Product"]: + cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.Product"]] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self._test_lro_initial.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + header_parameters['Accept'] = 'application/json' + + body_content_kwargs = {} # type: Dict[str, Any] + if product is not None: + body_content = self._serialize.body(product, 'Product') + else: + body_content = None + body_content_kwargs['content'] = body_content + request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200, 204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = None + if response.status_code == 200: + deserialized = self._deserialize('Product', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + _test_lro_initial.metadata = {'url': '/multiapi/lro'} # type: ignore + + async def begin_test_lro( + self, + product: Optional["models.Product"] = None, + **kwargs + ) -> AsyncLROPoller["models.Product"]: + """Put in whatever shape of Product you want, will return a Product with id equal to 100. + + :param product: Product to put. + :type product: ~multiapicredentialdefaultpolicy.v1.models.Product + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either Product or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~multiapicredentialdefaultpolicy.v1.models.Product] + :raises ~azure.core.exceptions.HttpResponseError: + """ + polling = kwargs.pop('polling', False) # type: Union[bool, AsyncPollingMethod] + cls = kwargs.pop('cls', None) # type: ClsType["models.Product"] + lro_delay = kwargs.pop( + 'polling_interval', + self._config.polling_interval + ) + cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + if cont_token is None: + raw_result = await self._test_lro_initial( + product=product, + cls=lambda x,y,z: x, + **kwargs + ) + + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + + def get_long_running_output(pipeline_response): + deserialized = self._deserialize('Product', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + return deserialized + + if polling is True: polling_method = AsyncLROBasePolling(lro_delay, **kwargs) + elif polling is False: polling_method = AsyncNoPolling() + else: polling_method = polling + if cont_token: + return AsyncLROPoller.from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output + ) + else: + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + begin_test_lro.metadata = {'url': '/multiapi/lro'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_operation_group_one_operations_async.py new file mode 100644 index 00000000000..bce4f3ec08c --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations_async/_operation_group_one_operations_async.py @@ -0,0 +1,80 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, Optional, TypeVar +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupOneOperations: + """OperationGroupOneOperations async operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v1.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer) -> None: + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + async def test_two( + self, + **kwargs + ) -> None: + """TestTwo should be in OperationGroupOneOperations. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "1.0.0" + + # Construct URL + url = self.test_two.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.get(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_two.metadata = {'url': '/multiapi/one/testTwoEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/__init__.py new file mode 100644 index 00000000000..cfec3d6aba5 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/__init__.py @@ -0,0 +1,19 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +try: + from ._models_py3 import Error + from ._models_py3 import Product +except (SyntaxError, ImportError): + from ._models import Error # type: ignore + from ._models import Product # type: ignore + +__all__ = [ + 'Error', + 'Product', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models.py new file mode 100644 index 00000000000..e61e5c0be95 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.core.exceptions import HttpResponseError +import msrest.serialization + + +class Error(msrest.serialization.Model): + """Error. + + :param status: + :type status: int + :param message: + :type message: str + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(Error, self).__init__(**kwargs) + self.status = kwargs.get('status', None) + self.message = kwargs.get('message', None) + + +class Product(msrest.serialization.Model): + """Product. + + :param id: + :type id: int + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'int'}, + } + + def __init__( + self, + **kwargs + ): + super(Product, self).__init__(**kwargs) + self.id = kwargs.get('id', None) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py new file mode 100644 index 00000000000..8de2526c72c --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py @@ -0,0 +1,59 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Optional + +from azure.core.exceptions import HttpResponseError +import msrest.serialization + + +class Error(msrest.serialization.Model): + """Error. + + :param status: + :type status: int + :param message: + :type message: str + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + *, + status: Optional[int] = None, + message: Optional[str] = None, + **kwargs + ): + super(Error, self).__init__(**kwargs) + self.status = status + self.message = message + + +class Product(msrest.serialization.Model): + """Product. + + :param id: + :type id: int + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'int'}, + } + + def __init__( + self, + *, + id: Optional[int] = None, + **kwargs + ): + super(Product, self).__init__(**kwargs) + self.id = id diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/__init__.py new file mode 100644 index 00000000000..1d9facfa368 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/__init__.py @@ -0,0 +1,15 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py new file mode 100644 index 00000000000..ee6b72ef7b3 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py @@ -0,0 +1,182 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse +from azure.core.polling import LROPoller, NoPolling, PollingMethod +from azure.core.polling.base_polling import LROBasePolling + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Optional, TypeVar, Union + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class MultiapiServiceClientOperationsMixin(object): + + def test_one( + self, + id, # type: int + message=None, # type: Optional[str] + **kwargs # type: Any + ): + # type: (...) -> None + """TestOne should be in an FirstVersionOperationsMixin. + + :param id: An int parameter. + :type id: int + :param message: An optional string parameter. + :type message: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "1.0.0" + + # Construct URL + url = self.test_one.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['id'] = self._serialize.query("id", id, 'int') + if message is not None: + query_parameters['message'] = self._serialize.query("message", message, 'str') + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_one.metadata = {'url': '/multiapi/testOneEndpoint'} # type: ignore + + def _test_lro_initial( + self, + product=None, # type: Optional["models.Product"] + **kwargs # type: Any + ): + # type: (...) -> Optional["models.Product"] + cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.Product"]] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self._test_lro_initial.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + header_parameters['Accept'] = 'application/json' + + body_content_kwargs = {} # type: Dict[str, Any] + if product is not None: + body_content = self._serialize.body(product, 'Product') + else: + body_content = None + body_content_kwargs['content'] = body_content + request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200, 204]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = None + if response.status_code == 200: + deserialized = self._deserialize('Product', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + _test_lro_initial.metadata = {'url': '/multiapi/lro'} # type: ignore + + def begin_test_lro( + self, + product=None, # type: Optional["models.Product"] + **kwargs # type: Any + ): + # type: (...) -> LROPoller["models.Product"] + """Put in whatever shape of Product you want, will return a Product with id equal to 100. + + :param product: Product to put. + :type product: ~multiapicredentialdefaultpolicy.v1.models.Product + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + :return: An instance of LROPoller that returns either Product or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[~multiapicredentialdefaultpolicy.v1.models.Product] + :raises ~azure.core.exceptions.HttpResponseError: + """ + polling = kwargs.pop('polling', False) # type: Union[bool, PollingMethod] + cls = kwargs.pop('cls', None) # type: ClsType["models.Product"] + lro_delay = kwargs.pop( + 'polling_interval', + self._config.polling_interval + ) + cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + if cont_token is None: + raw_result = self._test_lro_initial( + product=product, + cls=lambda x,y,z: x, + **kwargs + ) + + kwargs.pop('error_map', None) + kwargs.pop('content_type', None) + + def get_long_running_output(pipeline_response): + deserialized = self._deserialize('Product', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + return deserialized + + if polling is True: polling_method = LROBasePolling(lro_delay, **kwargs) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + if cont_token: + return LROPoller.from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output + ) + else: + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + begin_test_lro.metadata = {'url': '/multiapi/lro'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py new file mode 100644 index 00000000000..8f5c9ce72e0 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py @@ -0,0 +1,85 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Optional, TypeVar + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupOneOperations(object): + """OperationGroupOneOperations operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v1.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + def test_two( + self, + **kwargs # type: Any + ): + # type: (...) -> None + """TestTwo should be in OperationGroupOneOperations. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "1.0.0" + + # Construct URL + url = self.test_two.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.get(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_two.metadata = {'url': '/multiapi/one/testTwoEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/py.typed b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/__init__.py new file mode 100644 index 00000000000..8c8f1f92954 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/__init__.py @@ -0,0 +1,16 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] + +try: + from ._patch import patch_sdk # type: ignore + patch_sdk() +except ImportError: + pass diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py new file mode 100644 index 00000000000..aa1129f3fca --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any + + from azure.core.credentials import TokenCredential + +VERSION = "unknown" + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + self.api_version = "2.0.0" + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs # type: Any + ): + # type: (...) -> None + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json new file mode 100644 index 00000000000..bb83f93dcbf --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json @@ -0,0 +1,56 @@ +{ + "chosen_version": "2.0.0", + "total_api_version_list": ["2.0.0"], + "client": { + "name": "MultiapiServiceClient", + "filename": "_multiapi_service_client", + "description": "Service client for multiapi client testing." + }, + "global_parameters": { + "sync_method": { + "credential": { + "method_signature": "credential, # type: \"TokenCredential\"", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials.TokenCredential", + "required": true + } + }, + "async_method": { + "credential": { + "method_signature": "credential, # type: \"AsyncTokenCredential\"", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials_async.AsyncTokenCredential", + "required": true + } + }, + "constant": { + }, + "call": "credential" + }, + "config": { + "credential": true, + "credential_scopes": null, + "credential_default_policy_type": "AzureKeyCredentialPolicy", + "credential_default_policy_type_has_async_version": false + }, + "operation_groups": { + "operation_group_one": "OperationGroupOneOperations", + "operation_group_two": "OperationGroupTwoOperations" + }, + "operation_mixins": { + "test_one" : { + "sync": { + "signature": "def test_one(\n self,\n id, # type: int\n message=None, # type: Optional[str]\n **kwargs # type: Any\n):\n", + "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "async": { + "signature": "async def test_one(\n self,\n id: int,\n message: Optional[str] = None,\n **kwargs\n) -\u003e \"models.ModelTwo\":\n", + "coroutine": true, + "doc": "\"\"\"TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo.\n\n:param id: An int parameter.\n:type id: int\n:param message: An optional string parameter.\n:type message: str\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: ModelTwo, or the result of cls(response)\n:rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "call": "id, message" + } + }, + "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Callable\", \"Dict\", \"Generic\", \"Optional\", \"TypeVar\"]}}}", + "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Callable\", \"Dict\", \"Generic\", \"Optional\", \"TypeVar\"]}}}" +} \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_multiapi_service_client.py new file mode 100644 index 00000000000..91c9ec90913 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_multiapi_service_client.py @@ -0,0 +1,70 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.core import PipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any + + from azure.core.credentials import TokenCredential + +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations +from . import models + + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): + """Service client for multiapi client testing. + + :ivar operation_group_one: OperationGroupOneOperations operations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v2.operations.OperationGroupOneOperations + :ivar operation_group_two: OperationGroupTwoOperations operations + :vartype operation_group_two: multiapicredentialdefaultpolicy.v2.operations.OperationGroupTwoOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + base_url = 'None' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.operation_group_one = OperationGroupOneOperations( + self._client, self._config, self._serialize, self._deserialize) + self.operation_group_two = OperationGroupTwoOperations( + self._client, self._config, self._serialize, self._deserialize) + + def close(self): + # type: () -> None + self._client.close() + + def __enter__(self): + # type: () -> MultiapiServiceClient + self._client.__enter__() + return self + + def __exit__(self, *exc_details): + # type: (Any) -> None + self._client.__exit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py new file mode 100644 index 00000000000..ec341e1dd7e --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/__init__.py @@ -0,0 +1,10 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_async import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py new file mode 100644 index 00000000000..0d249e22dd2 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + +VERSION = "unknown" + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + self.api_version = "2.0.0" + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs: Any + ) -> None: + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client_async.py new file mode 100644 index 00000000000..8f91ddc2de0 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_multiapi_service_client_async.py @@ -0,0 +1,64 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, TYPE_CHECKING + +from azure.core import AsyncPipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + +from ._configuration_async import MultiapiServiceClientConfiguration +from .operations_async import MultiapiServiceClientOperationsMixin +from .operations_async import OperationGroupOneOperations +from .operations_async import OperationGroupTwoOperations +from .. import models + + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): + """Service client for multiapi client testing. + + :ivar operation_group_one: OperationGroupOneOperations operations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v2.aio.operations_async.OperationGroupOneOperations + :ivar operation_group_two: OperationGroupTwoOperations operations + :vartype operation_group_two: multiapicredentialdefaultpolicy.v2.aio.operations_async.OperationGroupTwoOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: + base_url = 'None' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.operation_group_one = OperationGroupOneOperations( + self._client, self._config, self._serialize, self._deserialize) + self.operation_group_two = OperationGroupTwoOperations( + self._client, self._config, self._serialize, self._deserialize) + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> "MultiapiServiceClient": + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details) -> None: + await self._client.__aexit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/__init__.py new file mode 100644 index 00000000000..a627ee1aa5c --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations_async import OperationGroupOneOperations +from ._operation_group_two_operations_async import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_multiapi_service_client_operations_async.py new file mode 100644 index 00000000000..5b2817b1ca1 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_multiapi_service_client_operations_async.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, Optional, TypeVar +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class MultiapiServiceClientOperationsMixin: + + async def test_one( + self, + id: int, + message: Optional[str] = None, + **kwargs + ) -> "models.ModelTwo": + """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. + + :param id: An int parameter. + :type id: int + :param message: An optional string parameter. + :type message: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelTwo, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.ModelTwo"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + + # Construct URL + url = self.test_one.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['id'] = self._serialize.query("id", id, 'int') + if message is not None: + query_parameters['message'] = self._serialize.query("message", message, 'str') + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Accept'] = 'application/json' + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = self._deserialize('ModelTwo', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + test_one.metadata = {'url': '/multiapi/testOneEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_one_operations_async.py new file mode 100644 index 00000000000..d1d418cbe64 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_one_operations_async.py @@ -0,0 +1,136 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, Optional, TypeVar +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupOneOperations: + """OperationGroupOneOperations async operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v2.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer) -> None: + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + async def test_two( + self, + parameter_one: Optional["models.ModelTwo"] = None, + **kwargs + ) -> "models.ModelTwo": + """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. + + :param parameter_one: A ModelTwo parameter. + :type parameter_one: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelTwo, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.ModelTwo"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self.test_two.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + header_parameters['Accept'] = 'application/json' + + body_content_kwargs = {} # type: Dict[str, Any] + if parameter_one is not None: + body_content = self._serialize.body(parameter_one, 'ModelTwo') + else: + body_content = None + body_content_kwargs['content'] = body_content + request = self._client.get(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = self._deserialize('ModelTwo', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + test_two.metadata = {'url': '/multiapi/one/testTwoEndpoint'} # type: ignore + + async def test_three( + self, + **kwargs + ) -> None: + """TestThree should be in OperationGroupOneOperations. Takes in ModelTwo. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + + # Construct URL + url = self.test_three.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_three.metadata = {'url': '/multiapi/one/testThreeEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_two_operations_async.py new file mode 100644 index 00000000000..ea702d7b960 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations_async/_operation_group_two_operations_async.py @@ -0,0 +1,84 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, Optional, TypeVar +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupTwoOperations: + """OperationGroupTwoOperations async operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v2.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer) -> None: + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + async def test_four( + self, + parameter_one: bool, + **kwargs + ) -> None: + """TestFour should be in OperationGroupTwoOperations. + + :param parameter_one: A boolean parameter. + :type parameter_one: bool + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + + # Construct URL + url = self.test_four.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['parameterOne'] = self._serialize.query("parameter_one", parameter_one, 'bool') + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.post(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_four.metadata = {'url': '/multiapi/two/testFourEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/__init__.py new file mode 100644 index 00000000000..27909a95db1 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/__init__.py @@ -0,0 +1,19 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +try: + from ._models_py3 import Error + from ._models_py3 import ModelTwo +except (SyntaxError, ImportError): + from ._models import Error # type: ignore + from ._models import ModelTwo # type: ignore + +__all__ = [ + 'Error', + 'ModelTwo', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models.py new file mode 100644 index 00000000000..98abe2ea2ea --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.core.exceptions import HttpResponseError +import msrest.serialization + + +class Error(msrest.serialization.Model): + """Error. + + :param status: + :type status: int + :param message: + :type message: str + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(Error, self).__init__(**kwargs) + self.status = kwargs.get('status', None) + self.message = kwargs.get('message', None) + + +class ModelTwo(msrest.serialization.Model): + """Only exists in api version 2.0.0. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. + :type id: int + :param message: + :type message: str + """ + + _validation = { + 'id': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ModelTwo, self).__init__(**kwargs) + self.id = kwargs['id'] + self.message = kwargs.get('message', None) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models_py3.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models_py3.py new file mode 100644 index 00000000000..706ae4654aa --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/models/_models_py3.py @@ -0,0 +1,70 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Optional + +from azure.core.exceptions import HttpResponseError +import msrest.serialization + + +class Error(msrest.serialization.Model): + """Error. + + :param status: + :type status: int + :param message: + :type message: str + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + *, + status: Optional[int] = None, + message: Optional[str] = None, + **kwargs + ): + super(Error, self).__init__(**kwargs) + self.status = status + self.message = message + + +class ModelTwo(msrest.serialization.Model): + """Only exists in api version 2.0.0. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. + :type id: int + :param message: + :type message: str + """ + + _validation = { + 'id': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + *, + id: int, + message: Optional[str] = None, + **kwargs + ): + super(ModelTwo, self).__init__(**kwargs) + self.id = id + self.message = message diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/__init__.py new file mode 100644 index 00000000000..356f78798f2 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py new file mode 100644 index 00000000000..6d280f711be --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py @@ -0,0 +1,78 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Optional, TypeVar + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class MultiapiServiceClientOperationsMixin(object): + + def test_one( + self, + id, # type: int + message=None, # type: Optional[str] + **kwargs # type: Any + ): + # type: (...) -> "models.ModelTwo" + """TestOne should be in an SecondVersionOperationsMixin. Returns ModelTwo. + + :param id: An int parameter. + :type id: int + :param message: An optional string parameter. + :type message: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelTwo, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.ModelTwo"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + + # Construct URL + url = self.test_one.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['id'] = self._serialize.query("id", id, 'int') + if message is not None: + query_parameters['message'] = self._serialize.query("message", message, 'str') + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Accept'] = 'application/json' + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = self._deserialize('ModelTwo', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + test_one.metadata = {'url': '/multiapi/testOneEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py new file mode 100644 index 00000000000..01f396c1390 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py @@ -0,0 +1,142 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Optional, TypeVar + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupOneOperations(object): + """OperationGroupOneOperations operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v2.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + def test_two( + self, + parameter_one=None, # type: Optional["models.ModelTwo"] + **kwargs # type: Any + ): + # type: (...) -> "models.ModelTwo" + """TestTwo should be in OperationGroupOneOperations. Takes in ModelTwo and ouputs ModelTwo. + + :param parameter_one: A ModelTwo parameter. + :type parameter_one: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelTwo, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v2.models.ModelTwo + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.ModelTwo"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self.test_two.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + header_parameters['Accept'] = 'application/json' + + body_content_kwargs = {} # type: Dict[str, Any] + if parameter_one is not None: + body_content = self._serialize.body(parameter_one, 'ModelTwo') + else: + body_content = None + body_content_kwargs['content'] = body_content + request = self._client.get(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = self._deserialize('ModelTwo', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + test_two.metadata = {'url': '/multiapi/one/testTwoEndpoint'} # type: ignore + + def test_three( + self, + **kwargs # type: Any + ): + # type: (...) -> None + """TestThree should be in OperationGroupOneOperations. Takes in ModelTwo. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + + # Construct URL + url = self.test_three.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_three.metadata = {'url': '/multiapi/one/testThreeEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py new file mode 100644 index 00000000000..a925d87be8d --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py @@ -0,0 +1,89 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Optional, TypeVar + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupTwoOperations(object): + """OperationGroupTwoOperations operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v2.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + def test_four( + self, + parameter_one, # type: bool + **kwargs # type: Any + ): + # type: (...) -> None + """TestFour should be in OperationGroupTwoOperations. + + :param parameter_one: A boolean parameter. + :type parameter_one: bool + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "2.0.0" + + # Construct URL + url = self.test_four.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['parameterOne'] = self._serialize.query("parameter_one", parameter_one, 'bool') + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.post(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_four.metadata = {'url': '/multiapi/two/testFourEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/py.typed b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/__init__.py new file mode 100644 index 00000000000..8c8f1f92954 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/__init__.py @@ -0,0 +1,16 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] + +try: + from ._patch import patch_sdk # type: ignore + patch_sdk() +except ImportError: + pass diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py new file mode 100644 index 00000000000..2954380b2db --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any + + from azure.core.credentials import TokenCredential + +VERSION = "unknown" + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + self.api_version = "3.0.0" + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs # type: Any + ): + # type: (...) -> None + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json new file mode 100644 index 00000000000..7ecd0c15b03 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json @@ -0,0 +1,56 @@ +{ + "chosen_version": "3.0.0", + "total_api_version_list": ["3.0.0"], + "client": { + "name": "MultiapiServiceClient", + "filename": "_multiapi_service_client", + "description": "Service client for multiapi client testing." + }, + "global_parameters": { + "sync_method": { + "credential": { + "method_signature": "credential, # type: \"TokenCredential\"", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials.TokenCredential", + "required": true + } + }, + "async_method": { + "credential": { + "method_signature": "credential, # type: \"AsyncTokenCredential\"", + "description": "Credential needed for the client to connect to Azure.", + "docstring_type": "~azure.core.credentials_async.AsyncTokenCredential", + "required": true + } + }, + "constant": { + }, + "call": "credential" + }, + "config": { + "credential": true, + "credential_scopes": null, + "credential_default_policy_type": "AzureKeyCredentialPolicy", + "credential_default_policy_type_has_async_version": false + }, + "operation_groups": { + "operation_group_one": "OperationGroupOneOperations", + "operation_group_two": "OperationGroupTwoOperations" + }, + "operation_mixins": { + "test_paging" : { + "sync": { + "signature": "def test_paging(\n self,\n **kwargs # type: Any\n):\n", + "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.paging.ItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "async": { + "signature": "def test_paging(\n self,\n **kwargs\n) -\u003e AsyncItemPaged[\"models.PagingResult\"]:\n", + "coroutine": false, + "doc": "\"\"\"Returns ModelThree with optionalProperty \u0027paged\u0027.\n\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: An iterator like instance of either PagingResult or the result of cls(response)\n:rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult]\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\"" + }, + "call": "" + } + }, + "sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"], \"azure.core.paging\": [\"ItemPaged\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Callable\", \"Dict\", \"Generic\", \"Iterable\", \"Optional\", \"TypeVar\"]}}}", + "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"], \"azure.core.async_paging\": [\"AsyncItemPaged\", \"AsyncList\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"AsyncIterable\", \"Callable\", \"Dict\", \"Generic\", \"Optional\", \"TypeVar\"]}}}" +} \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_multiapi_service_client.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_multiapi_service_client.py new file mode 100644 index 00000000000..1f5ae23a142 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_multiapi_service_client.py @@ -0,0 +1,70 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import TYPE_CHECKING + +from azure.core import PipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any + + from azure.core.credentials import TokenCredential + +from ._configuration import MultiapiServiceClientConfiguration +from .operations import MultiapiServiceClientOperationsMixin +from .operations import OperationGroupOneOperations +from .operations import OperationGroupTwoOperations +from . import models + + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): + """Service client for multiapi client testing. + + :ivar operation_group_one: OperationGroupOneOperations operations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v3.operations.OperationGroupOneOperations + :ivar operation_group_two: OperationGroupTwoOperations operations + :vartype operation_group_two: multiapicredentialdefaultpolicy.v3.operations.OperationGroupTwoOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials.TokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential, # type: "TokenCredential" + **kwargs # type: Any + ): + # type: (...) -> None + base_url = 'None' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.operation_group_one = OperationGroupOneOperations( + self._client, self._config, self._serialize, self._deserialize) + self.operation_group_two = OperationGroupTwoOperations( + self._client, self._config, self._serialize, self._deserialize) + + def close(self): + # type: () -> None + self._client.close() + + def __enter__(self): + # type: () -> MultiapiServiceClient + self._client.__enter__() + return self + + def __exit__(self, *exc_details): + # type: (Any) -> None + self._client.__exit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py new file mode 100644 index 00000000000..ec341e1dd7e --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/__init__.py @@ -0,0 +1,10 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_async import MultiapiServiceClient +__all__ = ['MultiapiServiceClient'] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py new file mode 100644 index 00000000000..9608416a682 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, TYPE_CHECKING + +from azure.core.configuration import Configuration +from azure.core.pipeline import policies + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + +VERSION = "unknown" + +class MultiapiServiceClientConfiguration(Configuration): + """Configuration for MultiapiServiceClient. + + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: + if credential is None: + raise ValueError("Parameter 'credential' must not be None.") + super(MultiapiServiceClientConfiguration, self).__init__(**kwargs) + + self.credential = credential + self.api_version = "3.0.0" + kwargs.setdefault('sdk_moniker', 'multiapicredentialdefaultpolicy/{}'.format(VERSION)) + self._configure(**kwargs) + + def _configure( + self, + **kwargs: Any + ) -> None: + self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') + 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) + self.authentication_policy = kwargs.get('authentication_policy') + if self.credential and not self.authentication_policy: + self.authentication_policy = policies.AzureKeyCredentialPolicy(self.credential, **kwargs) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client_async.py new file mode 100644 index 00000000000..9b1585e0a49 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_multiapi_service_client_async.py @@ -0,0 +1,64 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import Any, TYPE_CHECKING + +from azure.core import AsyncPipelineClient +from msrest import Deserializer, Serializer + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from azure.core.credentials_async import AsyncTokenCredential + +from ._configuration_async import MultiapiServiceClientConfiguration +from .operations_async import MultiapiServiceClientOperationsMixin +from .operations_async import OperationGroupOneOperations +from .operations_async import OperationGroupTwoOperations +from .. import models + + +class MultiapiServiceClient(MultiapiServiceClientOperationsMixin): + """Service client for multiapi client testing. + + :ivar operation_group_one: OperationGroupOneOperations operations + :vartype operation_group_one: multiapicredentialdefaultpolicy.v3.aio.operations_async.OperationGroupOneOperations + :ivar operation_group_two: OperationGroupTwoOperations operations + :vartype operation_group_two: multiapicredentialdefaultpolicy.v3.aio.operations_async.OperationGroupTwoOperations + :param credential: Credential needed for the client to connect to Azure. + :type credential: ~azure.core.credentials_async.AsyncTokenCredential + :param str base_url: Service URL + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. + """ + + def __init__( + self, + credential: "AsyncTokenCredential", + **kwargs: Any + ) -> None: + base_url = 'None' + self._config = MultiapiServiceClientConfiguration(credential, **kwargs) + self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs) + + client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.operation_group_one = OperationGroupOneOperations( + self._client, self._config, self._serialize, self._deserialize) + self.operation_group_two = OperationGroupTwoOperations( + self._client, self._config, self._serialize, self._deserialize) + + async def close(self) -> None: + await self._client.close() + + async def __aenter__(self) -> "MultiapiServiceClient": + await self._client.__aenter__() + return self + + async def __aexit__(self, *exc_details) -> None: + await self._client.__aexit__(*exc_details) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/__init__.py new file mode 100644 index 00000000000..a627ee1aa5c --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations_async import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations_async import OperationGroupOneOperations +from ._operation_group_two_operations_async import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_multiapi_service_client_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_multiapi_service_client_operations_async.py new file mode 100644 index 00000000000..e3c96ba7735 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_multiapi_service_client_operations_async.py @@ -0,0 +1,78 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar +import warnings + +from azure.core.async_paging import AsyncItemPaged, AsyncList +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class MultiapiServiceClientOperationsMixin: + + def test_paging( + self, + **kwargs + ) -> AsyncIterable["models.PagingResult"]: + """Returns ModelThree with optionalProperty 'paged'. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: An iterator like instance of either PagingResult or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult] + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.PagingResult"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + def prepare_request(next_link=None): + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Accept'] = 'application/json' + + if not next_link: + # Construct URL + url = self.test_paging.metadata['url'] # type: ignore + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + request = self._client.get(url, query_parameters, header_parameters) + else: + url = next_link + query_parameters = {} # type: Dict[str, Any] + request = self._client.get(url, query_parameters, header_parameters) + return request + + async def extract_data(pipeline_response): + deserialized = self._deserialize('PagingResult', pipeline_response) + list_of_elem = deserialized.values + if cls: + list_of_elem = cls(list_of_elem) + return deserialized.next_link or None, AsyncList(list_of_elem) + + async def get_next(next_link=None): + request = prepare_request(next_link) + + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + return pipeline_response + + return AsyncItemPaged( + get_next, extract_data + ) + test_paging.metadata = {'url': '/multiapi/paging'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_one_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_one_operations_async.py new file mode 100644 index 00000000000..79fd7c4f14a --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_one_operations_async.py @@ -0,0 +1,96 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, Optional, TypeVar +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupOneOperations: + """OperationGroupOneOperations async operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v3.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer) -> None: + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + async def test_two( + self, + parameter_one: Optional["models.ModelThree"] = None, + **kwargs + ) -> "models.ModelThree": + """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. + + :param parameter_one: A ModelThree parameter. + :type parameter_one: ~multiapicredentialdefaultpolicy.v3.models.ModelThree + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelThree, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v3.models.ModelThree + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.ModelThree"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "3.0.0" + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self.test_two.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + header_parameters['Accept'] = 'application/json' + + body_content_kwargs = {} # type: Dict[str, Any] + if parameter_one is not None: + body_content = self._serialize.body(parameter_one, 'ModelThree') + else: + body_content = None + body_content_kwargs['content'] = body_content + request = self._client.get(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = self._deserialize('ModelThree', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + test_two.metadata = {'url': '/multiapi/one/testTwoEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_two_operations_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_two_operations_async.py new file mode 100644 index 00000000000..5f0a92e7003 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations_async/_operation_group_two_operations_async.py @@ -0,0 +1,142 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import Any, Callable, Dict, Generic, IO, Optional, TypeVar, Union +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest + +from ... import models + +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupTwoOperations: + """OperationGroupTwoOperations async operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v3.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer) -> None: + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + async def test_four( + self, + input: Optional[Union[IO, "models.SourcePath"]] = None, + **kwargs + ) -> None: + """TestFour should be in OperationGroupTwoOperations. + + :param input: Input parameter. + :type input: IO or ~multiapicredentialdefaultpolicy.v3.models.SourcePath + :keyword str content_type: Media type of the body sent to the API. Default value is "application/json". + Allowed values are: "application/pdf", "image/jpeg", "image/png", "image/tiff", "application/json". + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "3.0.0" + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self.test_four.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + + body_content_kwargs = {} # type: Dict[str, Any] + if header_parameters['Content-Type'].split(";")[0] in ['application/pdf', 'image/jpeg', 'image/png', 'image/tiff']: + body_content_kwargs['stream_content'] = input + elif header_parameters['Content-Type'].split(";")[0] in ['application/json']: + if input is not None: + body_content = self._serialize.body(input, 'SourcePath') + else: + body_content = None + body_content_kwargs['content'] = body_content + else: + raise ValueError( + "The content_type '{}' is not one of the allowed values: " + "['application/pdf', 'image/jpeg', 'image/png', 'image/tiff', 'application/json']".format(header_parameters['Content-Type']) + ) + request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_four.metadata = {'url': '/multiapi/two/testFourEndpoint'} # type: ignore + + async def test_five( + self, + **kwargs + ) -> None: + """TestFive should be in OperationGroupTwoOperations. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "3.0.0" + + # Construct URL + url = self.test_five.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_five.metadata = {'url': '/multiapi/two/testFiveEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/__init__.py new file mode 100644 index 00000000000..1c2b0959b7f --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/__init__.py @@ -0,0 +1,30 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +try: + from ._models_py3 import Error + from ._models_py3 import ModelThree + from ._models_py3 import PagingResult + from ._models_py3 import SourcePath +except (SyntaxError, ImportError): + from ._models import Error # type: ignore + from ._models import ModelThree # type: ignore + from ._models import PagingResult # type: ignore + from ._models import SourcePath # type: ignore + +from ._multiapi_service_client_enums import ( + ContentType, +) + +__all__ = [ + 'Error', + 'ModelThree', + 'PagingResult', + 'SourcePath', + 'ContentType', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models.py new file mode 100644 index 00000000000..1dc8113523c --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models.py @@ -0,0 +1,98 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.core.exceptions import HttpResponseError +import msrest.serialization + + +class Error(msrest.serialization.Model): + """Error. + + :param status: + :type status: int + :param message: + :type message: str + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(Error, self).__init__(**kwargs) + self.status = kwargs.get('status', None) + self.message = kwargs.get('message', None) + + +class ModelThree(msrest.serialization.Model): + """Only exists in api version 3.0.0. + + :param optional_property: + :type optional_property: str + """ + + _attribute_map = { + 'optional_property': {'key': 'optionalProperty', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(ModelThree, self).__init__(**kwargs) + self.optional_property = kwargs.get('optional_property', None) + + +class PagingResult(msrest.serialization.Model): + """PagingResult. + + :param values: + :type values: list[~multiapicredentialdefaultpolicy.v3.models.ModelThree] + :param next_link: + :type next_link: str + """ + + _attribute_map = { + 'values': {'key': 'values', 'type': '[ModelThree]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(PagingResult, self).__init__(**kwargs) + self.values = kwargs.get('values', None) + self.next_link = kwargs.get('next_link', None) + + +class SourcePath(msrest.serialization.Model): + """Uri or local path to source data. + + :param source: File source path. + :type source: str + """ + + _validation = { + 'source': {'max_length': 2048, 'min_length': 0}, + } + + _attribute_map = { + 'source': {'key': 'source', 'type': 'str'}, + } + + def __init__( + self, + **kwargs + ): + super(SourcePath, self).__init__(**kwargs) + self.source = kwargs.get('source', None) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py new file mode 100644 index 00000000000..2f5c4870d38 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py @@ -0,0 +1,110 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from typing import List, Optional + +from azure.core.exceptions import HttpResponseError +import msrest.serialization + + +class Error(msrest.serialization.Model): + """Error. + + :param status: + :type status: int + :param message: + :type message: str + """ + + _attribute_map = { + 'status': {'key': 'status', 'type': 'int'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + *, + status: Optional[int] = None, + message: Optional[str] = None, + **kwargs + ): + super(Error, self).__init__(**kwargs) + self.status = status + self.message = message + + +class ModelThree(msrest.serialization.Model): + """Only exists in api version 3.0.0. + + :param optional_property: + :type optional_property: str + """ + + _attribute_map = { + 'optional_property': {'key': 'optionalProperty', 'type': 'str'}, + } + + def __init__( + self, + *, + optional_property: Optional[str] = None, + **kwargs + ): + super(ModelThree, self).__init__(**kwargs) + self.optional_property = optional_property + + +class PagingResult(msrest.serialization.Model): + """PagingResult. + + :param values: + :type values: list[~multiapicredentialdefaultpolicy.v3.models.ModelThree] + :param next_link: + :type next_link: str + """ + + _attribute_map = { + 'values': {'key': 'values', 'type': '[ModelThree]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__( + self, + *, + values: Optional[List["ModelThree"]] = None, + next_link: Optional[str] = None, + **kwargs + ): + super(PagingResult, self).__init__(**kwargs) + self.values = values + self.next_link = next_link + + +class SourcePath(msrest.serialization.Model): + """Uri or local path to source data. + + :param source: File source path. + :type source: str + """ + + _validation = { + 'source': {'max_length': 2048, 'min_length': 0}, + } + + _attribute_map = { + 'source': {'key': 'source', 'type': 'str'}, + } + + def __init__( + self, + *, + source: Optional[str] = None, + **kwargs + ): + super(SourcePath, self).__init__(**kwargs) + self.source = source diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py new file mode 100644 index 00000000000..bf4c202fc64 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_multiapi_service_client_enums.py @@ -0,0 +1,18 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from enum import Enum + +class ContentType(str, Enum): + """Content type for upload + """ + + application_pdf = "application/pdf" #: Content Type 'application/pdf'. + image_jpeg = "image/jpeg" #: Content Type 'image/jpeg'. + image_png = "image/png" #: Content Type 'image/png'. + image_tiff = "image/tiff" #: Content Type 'image/tiff'. diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/__init__.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/__init__.py new file mode 100644 index 00000000000..356f78798f2 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/__init__.py @@ -0,0 +1,17 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from ._multiapi_service_client_operations import MultiapiServiceClientOperationsMixin +from ._operation_group_one_operations import OperationGroupOneOperations +from ._operation_group_two_operations import OperationGroupTwoOperations + +__all__ = [ + 'MultiapiServiceClientOperationsMixin', + 'OperationGroupOneOperations', + 'OperationGroupTwoOperations', +] diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py new file mode 100644 index 00000000000..bb354214e3d --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py @@ -0,0 +1,83 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.paging import ItemPaged +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class MultiapiServiceClientOperationsMixin(object): + + def test_paging( + self, + **kwargs # type: Any + ): + # type: (...) -> Iterable["models.PagingResult"] + """Returns ModelThree with optionalProperty 'paged'. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: An iterator like instance of either PagingResult or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~multiapicredentialdefaultpolicy.v3.models.PagingResult] + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.PagingResult"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + + def prepare_request(next_link=None): + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Accept'] = 'application/json' + + if not next_link: + # Construct URL + url = self.test_paging.metadata['url'] # type: ignore + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + + request = self._client.get(url, query_parameters, header_parameters) + else: + url = next_link + query_parameters = {} # type: Dict[str, Any] + request = self._client.get(url, query_parameters, header_parameters) + return request + + def extract_data(pipeline_response): + deserialized = self._deserialize('PagingResult', pipeline_response) + list_of_elem = deserialized.values + if cls: + list_of_elem = cls(list_of_elem) + return deserialized.next_link or None, iter(list_of_elem) + + def get_next(next_link=None): + request = prepare_request(next_link) + + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + raise HttpResponseError(response=response) + + return pipeline_response + + return ItemPaged( + get_next, extract_data + ) + test_paging.metadata = {'url': '/multiapi/paging'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py new file mode 100644 index 00000000000..5ac8c897fa8 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py @@ -0,0 +1,101 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, Optional, TypeVar + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupOneOperations(object): + """OperationGroupOneOperations operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v3.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + def test_two( + self, + parameter_one=None, # type: Optional["models.ModelThree"] + **kwargs # type: Any + ): + # type: (...) -> "models.ModelThree" + """TestTwo should be in OperationGroupOneOperations. Takes in ModelThree and ouputs ModelThree. + + :param parameter_one: A ModelThree parameter. + :type parameter_one: ~multiapicredentialdefaultpolicy.v3.models.ModelThree + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ModelThree, or the result of cls(response) + :rtype: ~multiapicredentialdefaultpolicy.v3.models.ModelThree + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["models.ModelThree"] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "3.0.0" + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self.test_two.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + header_parameters['Accept'] = 'application/json' + + body_content_kwargs = {} # type: Dict[str, Any] + if parameter_one is not None: + body_content = self._serialize.body(parameter_one, 'ModelThree') + else: + body_content = None + body_content_kwargs['content'] = body_content + request = self._client.get(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + deserialized = self._deserialize('ModelThree', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + test_two.metadata = {'url': '/multiapi/one/testTwoEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py new file mode 100644 index 00000000000..b387301fdf6 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py @@ -0,0 +1,148 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- +from typing import TYPE_CHECKING +import warnings + +from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpRequest, HttpResponse + +from .. import models + +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from typing import Any, Callable, Dict, Generic, IO, Optional, TypeVar, Union + + T = TypeVar('T') + ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +class OperationGroupTwoOperations(object): + """OperationGroupTwoOperations operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~multiapicredentialdefaultpolicy.v3.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + def test_four( + self, + input=None, # type: Optional[Union[IO, "models.SourcePath"]] + **kwargs # type: Any + ): + # type: (...) -> None + """TestFour should be in OperationGroupTwoOperations. + + :param input: Input parameter. + :type input: IO or ~multiapicredentialdefaultpolicy.v3.models.SourcePath + :keyword str content_type: Media type of the body sent to the API. Default value is "application/json". + Allowed values are: "application/pdf", "image/jpeg", "image/png", "image/tiff", "application/json". + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "3.0.0" + content_type = kwargs.pop("content_type", "application/json") + + # Construct URL + url = self.test_four.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str') + + body_content_kwargs = {} # type: Dict[str, Any] + if header_parameters['Content-Type'].split(";")[0] in ['application/pdf', 'image/jpeg', 'image/png', 'image/tiff']: + body_content_kwargs['stream_content'] = input + elif header_parameters['Content-Type'].split(";")[0] in ['application/json']: + if input is not None: + body_content = self._serialize.body(input, 'SourcePath') + else: + body_content = None + body_content_kwargs['content'] = body_content + else: + raise ValueError( + "The content_type '{}' is not one of the allowed values: " + "['application/pdf', 'image/jpeg', 'image/png', 'image/tiff', 'application/json']".format(header_parameters['Content-Type']) + ) + request = self._client.post(url, query_parameters, header_parameters, **body_content_kwargs) + + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_four.metadata = {'url': '/multiapi/two/testFourEndpoint'} # type: ignore + + def test_five( + self, + **kwargs # type: Any + ): + # type: (...) -> None + """TestFive should be in OperationGroupTwoOperations. + + :keyword callable cls: A custom type or function that will be passed the direct response + :return: None, or the result of cls(response) + :rtype: None + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType[None] + error_map = {404: ResourceNotFoundError, 409: ResourceExistsError} + error_map.update(kwargs.pop('error_map', {})) + api_version = "3.0.0" + + # Construct URL + url = self.test_five.metadata['url'] # type: ignore + + # Construct parameters + query_parameters = {} # type: Dict[str, Any] + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} # type: Dict[str, Any] + + request = self._client.put(url, query_parameters, header_parameters) + pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize(models.Error, response) + raise HttpResponseError(response=response, model=error) + + if cls: + return cls(pipeline_response, None, {}) + + test_five.metadata = {'url': '/multiapi/two/testFiveEndpoint'} # type: ignore diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/py.typed b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/py.typed new file mode 100644 index 00000000000..e5aff4f83af --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/py.typed @@ -0,0 +1 @@ +# Marker file for PEP 561. \ No newline at end of file diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/setup.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/setup.py new file mode 100644 index 00000000000..2d4cdb23283 --- /dev/null +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/setup.py @@ -0,0 +1,42 @@ +# coding=utf-8 +#------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +#-------------------------------------------------------------------------- +# coding: utf-8 + +from setuptools import setup, find_packages + +NAME = "multiapicredentialdefaultpolicy" +VERSION = "0.1.0" + +# To install the library, run the following +# +# python setup.py install +# +# prerequisite: setuptools +# http://pypi.python.org/pypi/setuptools + +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] + +setup( + name=NAME, + version=VERSION, + description="multiapi with a non BearerTokenCredentialPolicy auth policy", + author_email="", + url="", + keywords=["Swagger", "multiapicredentialdefaultpolicy"], + install_requires=REQUIRES, + packages=find_packages(), + include_package_data=True, + long_description="""\ + This ready contains multiple API versions, to help you deal with all of the Azure clouds + (Azure Stack, Azure Government, Azure China, etc.). + By default, it uses the latest API version available on public Azure. + For production, you should stick to a particular api-version and/or profile. + The profile sets a mapping between an operation group and its API version. + The api-version parameter sets the default API version if the operation + group is not described in the profile. + """ +) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py index 381eda9fa0d..d1b42e9aaba 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py @@ -48,6 +48,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py index 3fcc2229a43..36224e24e01 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json index 43e744ca7c8..b2162b9ea04 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py index 002a740cb80..5ad731a9f83 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json index 68fdc8047bb..257c251a767 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations", diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py index e10c7a26639..0a93db45514 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json index b7a2f7a2696..bbc72153d7b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations", diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py index c94f5375a16..652af8925bc 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py @@ -48,6 +48,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py index 2e592445944..fcaba77d5e4 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py @@ -47,6 +47,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py index e14f18f66fb..9c70ef22a09 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json index 7bb419dbe03..326632aa45c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations" diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py index 814d8253850..c0efb6795e5 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py index 6fc0ba8fa75..6b967457f20 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json index 51725a67786..507b3ccc827 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations", diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py index 8a5090f28e9..f751558dcbf 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py index c3461db416c..2d2e444406b 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py @@ -52,6 +52,7 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json index c6c3df67a43..c5d90dc7cd1 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_metadata.json @@ -29,7 +29,9 @@ }, "config": { "credential": true, - "credential_scopes": [] + "credential_scopes": [], + "credential_default_policy_type": "BearerTokenCredentialPolicy", + "credential_default_policy_type_has_async_version": true }, "operation_groups": { "operation_group_one": "OperationGroupOneOperations", diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py index 263f21bedb8..b061890c5a9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py @@ -48,6 +48,7 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) + kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/requirements.txt b/test/multiapi/requirements.txt index 6bd0d2baece..6ff4005f153 100644 --- a/test/multiapi/requirements.txt +++ b/test/multiapi/requirements.txt @@ -8,4 +8,5 @@ azure-common aiohttp>=3.0; python_full_version >= '3.5.2' -e ./Expected/AcceptanceTests/Multiapi -e ./Expected/AcceptanceTests/MultiapiWithSubmodule --e ./Expected/AcceptanceTests/MultiapiNoAsync \ No newline at end of file +-e ./Expected/AcceptanceTests/MultiapiNoAsync +-e ./Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy \ No newline at end of file diff --git a/test/multiapi/specification/multiapicredentialdefaultpolicy/README.md b/test/multiapi/specification/multiapicredentialdefaultpolicy/README.md new file mode 100644 index 00000000000..210db8abade --- /dev/null +++ b/test/multiapi/specification/multiapicredentialdefaultpolicy/README.md @@ -0,0 +1,50 @@ +# Testing multiapi + +### Tag: v1 + +These settings apply only when `--tag=v1` is specified on the command line. + +``` yaml $(tag) == 'v1' +input-file: ../../../../node_modules/@microsoft.azure/autorest.testserver/swagger/multiapi-v1.json +namespace: multiapicredentialdefaultpolicy.v1 +output-folder: $(python-sdks-folder)/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1 +``` + +``` yaml $(tag) == 'v2' +input-file: ../../../../node_modules/@microsoft.azure/autorest.testserver/swagger/multiapi-v2.json +namespace: multiapicredentialdefaultpolicy.v2 +output-folder: $(python-sdks-folder)/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2 +``` + +``` yaml $(tag) == 'v3' +input-file: ../../../../node_modules/@microsoft.azure/autorest.testserver/swagger/multiapi-v3.json +namespace: multiapicredentialdefaultpolicy.v3 +output-folder: $(python-sdks-folder)/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3 +``` + +### Settings +``` yaml +package-name: multiapicredentialdefaultpolicy +no-namespace-folders: true +license-header: MICROSOFT_MIT_NO_VERSION +azure: true +add-credentials: true +credential-default-policy-type: AzureKeyCredentialPolicy +``` + +``` yaml $(multiapi) +clear-output-folder: true +batch: + - tag: v1 + - tag: v2 + - tag: v3 + - multiapiscript: true +``` + +### Multi-api script + +``` yaml $(multiapiscript) +output-folder: $(python-sdks-folder)/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/ +clear-output-folder: false +perform-load: false +``` From 65a9516859cb67b74019da7cc7d0ebef4587a85d Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 10 Jun 2020 17:59:27 -0400 Subject: [PATCH 03/10] fix pylint --- autorest/codegen/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/autorest/codegen/__init__.py b/autorest/codegen/__init__.py index cb6099d1f24..ecb6e6abd60 100644 --- a/autorest/codegen/__init__.py +++ b/autorest/codegen/__init__.py @@ -136,7 +136,9 @@ def _build_code_model_options(self) -> Dict[str, Any]: "For example: --credential-scopes=https://cognitiveservices.azure.com/.default" ) - credential_default_policy_type = self._autorestapi.get_value("credential-default-policy-type") or "BearerTokenCredentialPolicy" + credential_default_policy_type = ( + self._autorestapi.get_value("credential-default-policy-type") or "BearerTokenCredentialPolicy" + ) if credential_scopes and credential_default_policy_type != "BearerTokenCredentialPolicy": _LOGGER.warning( @@ -185,7 +187,9 @@ def _build_code_model_options(self) -> Dict[str, Any]: "tracing": self._autorestapi.get_boolean_value("trace", False), "multiapi": self._autorestapi.get_boolean_value("multiapi", False), "credential_default_policy_type": credential_default_policy_type, - "credential_default_policy_type_has_async_version": credential_default_policy_type == "BearerTokenCredentialPolicy" + "credential_default_policy_type_has_async_version": ( + credential_default_policy_type == "BearerTokenCredentialPolicy" + ) } if options["basic_setup_py"] and not options["package_version"]: From 0997b6918b13ecc059169d92952e66c59e524942 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 11 Jun 2020 10:49:44 -0400 Subject: [PATCH 04/10] remove popping of sdk_moniker from config --- autorest/codegen/templates/config.py.jinja2 | 1 - autorest/multiapi/templates/multiapi_config.py.jinja2 | 1 - .../AzureBodyDuration/bodyduration/_configuration.py | 1 - .../AzureBodyDuration/bodyduration/aio/_configuration_async.py | 1 - .../azureparametergrouping/_configuration.py | 1 - .../azureparametergrouping/aio/_configuration_async.py | 1 - .../AcceptanceTests/AzureReport/azurereport/_configuration.py | 1 - .../AzureReport/azurereport/aio/_configuration_async.py | 1 - .../AzureSpecials/azurespecialproperties/_configuration.py | 1 - .../azurespecialproperties/aio/_configuration_async.py | 1 - .../CustomBaseUri/custombaseurl/_configuration.py | 1 - .../CustomBaseUri/custombaseurl/aio/_configuration_async.py | 1 - .../CustomUrlPaging/custombaseurlpaging/_configuration.py | 1 - .../custombaseurlpaging/aio/_configuration_async.py | 1 - test/azure/Expected/AcceptanceTests/Head/head/_configuration.py | 1 - .../AcceptanceTests/Head/head/aio/_configuration_async.py | 1 - .../HeadExceptions/headexceptions/_configuration.py | 1 - .../HeadExceptions/headexceptions/aio/_configuration_async.py | 1 - .../headwithazurekeycredentialpolicy/_configuration.py | 1 - .../headwithazurekeycredentialpolicy/aio/_configuration_async.py | 1 - test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py | 1 - .../Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/Paging/paging/_configuration.py | 1 - .../AcceptanceTests/Paging/paging/aio/_configuration_async.py | 1 - .../StorageManagementClient/storage/_configuration.py | 1 - .../StorageManagementClient/storage/aio/_configuration_async.py | 1 - .../subscriptionidapiversion/_configuration.py | 1 - .../subscriptionidapiversion/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py | 1 - .../Multiapi/multiapi/aio/_configuration_async.py | 1 - .../AcceptanceTests/Multiapi/multiapi/v1/_configuration.py | 1 - .../Multiapi/multiapi/v1/aio/_configuration_async.py | 1 - .../AcceptanceTests/Multiapi/multiapi/v2/_configuration.py | 1 - .../Multiapi/multiapi/v2/aio/_configuration_async.py | 1 - .../AcceptanceTests/Multiapi/multiapi/v3/_configuration.py | 1 - .../Multiapi/multiapi/v3/aio/_configuration_async.py | 1 - .../MultiapiNoAsync/multiapinoasync/_configuration.py | 1 - .../MultiapiNoAsync/multiapinoasync/v1/_configuration.py | 1 - .../MultiapiNoAsync/multiapinoasync/v2/_configuration.py | 1 - .../MultiapiNoAsync/multiapinoasync/v3/_configuration.py | 1 - .../multiapiwithsubmodule/submodule/_configuration.py | 1 - .../multiapiwithsubmodule/submodule/aio/_configuration_async.py | 1 - .../multiapiwithsubmodule/submodule/v1/_configuration.py | 1 - .../submodule/v1/aio/_configuration_async.py | 1 - .../multiapiwithsubmodule/submodule/v2/_configuration.py | 1 - .../submodule/v2/aio/_configuration_async.py | 1 - .../multiapiwithsubmodule/submodule/v3/_configuration.py | 1 - .../submodule/v3/aio/_configuration_async.py | 1 - .../AdditionalProperties/additionalproperties/_configuration.py | 1 - .../additionalproperties/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyArray/bodyarray/_configuration.py | 1 - .../BodyArray/bodyarray/aio/_configuration_async.py | 1 - .../vanilla/body/array/_configuration.py | 1 - .../vanilla/body/array/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py | 1 - .../BodyBoolean/bodyboolean/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py | 1 - .../BodyByte/bodybyte/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyComplex/bodycomplex/_configuration.py | 1 - .../BodyComplex/bodycomplex/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py | 1 - .../BodyDate/bodydate/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py | 1 - .../BodyDateTime/bodydatetime/aio/_configuration_async.py | 1 - .../BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py | 1 - .../bodydatetimerfc1123/aio/_configuration_async.py | 1 - .../BodyDictionary/bodydictionary/_configuration.py | 1 - .../BodyDictionary/bodydictionary/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyDuration/bodyduration/_configuration.py | 1 - .../BodyDuration/bodyduration/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py | 1 - .../BodyFile/bodyfile/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyInteger/bodyinteger/_configuration.py | 1 - .../BodyInteger/bodyinteger/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyNumber/bodynumber/_configuration.py | 1 - .../BodyNumber/bodynumber/aio/_configuration_async.py | 1 - .../AcceptanceTests/BodyString/bodystring/_configuration.py | 1 - .../BodyString/bodystring/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py | 1 - .../BodyTime/bodytime/aio/_configuration_async.py | 1 - .../CustomBaseUri/custombaseurl/_configuration.py | 1 - .../CustomBaseUri/custombaseurl/aio/_configuration_async.py | 1 - .../custombaseurlmoreoptions/_configuration.py | 1 - .../custombaseurlmoreoptions/aio/_configuration_async.py | 1 - .../ExtensibleEnums/extensibleenumsswagger/_configuration.py | 1 - .../extensibleenumsswagger/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/Header/header/_configuration.py | 1 - .../AcceptanceTests/Header/header/aio/_configuration_async.py | 1 - .../AcceptanceTests/Http/httpinfrastructure/_configuration.py | 1 - .../Http/httpinfrastructure/aio/_configuration_async.py | 1 - .../AcceptanceTests/MediaTypes/mediatypes/_configuration.py | 1 - .../MediaTypes/mediatypes/aio/_configuration_async.py | 1 - .../ModelFlattening/modelflattening/_configuration.py | 1 - .../ModelFlattening/modelflattening/aio/_configuration_async.py | 1 - .../MultipleInheritance/multipleinheritance/_configuration.py | 1 - .../multipleinheritance/aio/_configuration_async.py | 1 - .../NonStringEnums/nonstringenums/_configuration.py | 1 - .../NonStringEnums/nonstringenums/aio/_configuration_async.py | 1 - .../AcceptanceTests/ObjectType/objecttype/_configuration.py | 1 - .../ObjectType/objecttype/aio/_configuration_async.py | 1 - .../ParameterFlattening/parameterflattening/_configuration.py | 1 - .../parameterflattening/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/Report/report/_configuration.py | 1 - .../AcceptanceTests/Report/report/aio/_configuration_async.py | 1 - .../RequiredOptional/requiredoptional/_configuration.py | 1 - .../requiredoptional/aio/_configuration_async.py | 1 - test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py | 1 - .../Expected/AcceptanceTests/Url/url/aio/_configuration_async.py | 1 - .../urlmulticollectionformat/_configuration.py | 1 - .../urlmulticollectionformat/aio/_configuration_async.py | 1 - .../AcceptanceTests/Validation/validation/_configuration.py | 1 - .../Validation/validation/aio/_configuration_async.py | 1 - .../Expected/AcceptanceTests/Xml/xmlservice/_configuration.py | 1 - .../AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py | 1 - .../XmsErrorResponse/xmserrorresponse/_configuration.py | 1 - .../xmserrorresponse/aio/_configuration_async.py | 1 - 116 files changed, 116 deletions(-) diff --git a/autorest/codegen/templates/config.py.jinja2 b/autorest/codegen/templates/config.py.jinja2 index 216f117eb2b..f91c07d7c89 100644 --- a/autorest/codegen/templates/config.py.jinja2 +++ b/autorest/codegen/templates/config.py.jinja2 @@ -72,7 +72,6 @@ class {{ code_model.class_name }}Configuration(Configuration): # type: (...) -> None {% endif %} self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/autorest/multiapi/templates/multiapi_config.py.jinja2 b/autorest/multiapi/templates/multiapi_config.py.jinja2 index 2fd48e3b8e4..429a84a3776 100644 --- a/autorest/multiapi/templates/multiapi_config.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_config.py.jinja2 @@ -82,7 +82,6 @@ class {{ client_name }}Configuration(Configuration): # type: (...) -> None {% endif %} self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py index fb9601360f8..689193ae273 100644 --- a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py index 1b03cf72178..a13ab8e4b83 100644 --- a/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py index 26b4028c60e..d207f8b8c27 100644 --- a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py index 1395efe74f9..bf5ddf64f70 100644 --- a/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py index 782a3f183f6..cd73b916d0e 100644 --- a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py index d90aef88501..714cf2b4801 100644 --- a/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureReport/azurereport/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py index 07beddb42fc..cbcfd91f3f3 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/_configuration.py @@ -59,7 +59,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py index 726e4d94b66..1d1ca81a0df 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/_configuration_async.py @@ -55,7 +55,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py index c24bc56ed62..93a21fe7d6d 100644 --- a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py @@ -48,7 +48,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py index 5e22d7ca806..fb73b3eb921 100644 --- a/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py @@ -42,7 +42,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py index 49070bfc6bf..e1f79ae79d9 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_configuration.py @@ -58,7 +58,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py index 8550798d059..9fae7a70545 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/_configuration_async.py @@ -54,7 +54,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py b/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py index b73f61b1b25..3c0d6f29f6a 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py index b14aed6c310..cfa5659c9cc 100644 --- a/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Head/head/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py index 658d3bc3ef8..397fcee099d 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py index c660e2a0e39..cf07971723f 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py index a136ae4fe41..b3d6415edd8 100644 --- a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_configuration.py @@ -50,7 +50,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py index e31dd8e174e..aa710287e31 100644 --- a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_configuration_async.py @@ -46,7 +46,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py b/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py index 9193d8826d9..6840b88073a 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py index ffa00d6b27d..8b7bfdfd26f 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Lro/lro/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py b/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py index 4d638fa44e0..4315d8d6185 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py index ff58ff1775e..3a7e5e90b2d 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/Paging/paging/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py index 69c7c95d88a..738a21a7074 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/_configuration.py @@ -59,7 +59,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py index 6eb2a01d0e6..581a2c009b6 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/storage/aio/_configuration_async.py @@ -55,7 +55,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py index df275f718a2..8be57d15707 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_configuration.py @@ -59,7 +59,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py index 719f2a74800..8ee69980dd9 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/_configuration_async.py @@ -55,7 +55,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py index e0cefedcbc4..1ac26fb2367 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_configuration.py @@ -48,7 +48,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py index 525a74c1e72..7f0abc85ce2 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py @@ -47,7 +47,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py index a222332d4fa..4a22f3ea0ad 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py index 60672b352b5..52f4b99fba3 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py index 7e2cec5a23e..540f8415c9c 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py index a0347274a16..3ec64429d3d 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py index 8a25de4bdc9..b1d384c5d0f 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py index bcbc96f6778..bdfcf65671e 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py index d1b42e9aaba..381eda9fa0d 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_configuration.py @@ -48,7 +48,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py index 36224e24e01..3fcc2229a43 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py index 5ad731a9f83..002a740cb80 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py index 0a93db45514..e10c7a26639 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py index 652af8925bc..c94f5375a16 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_configuration.py @@ -48,7 +48,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py index fcaba77d5e4..2e592445944 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/aio/_configuration_async.py @@ -47,7 +47,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py index 9c70ef22a09..e14f18f66fb 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py index c0efb6795e5..814d8253850 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py index 6b967457f20..6fc0ba8fa75 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py index f751558dcbf..8a5090f28e9 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py index 2d2e444406b..c3461db416c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py index b061890c5a9..263f21bedb8 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py index 483830c438d..2b240202e71 100644 --- a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py index 62a0f949b60..ac52e0d62cb 100644 --- a/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py index 431d8771c2c..01a896cbd3b 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py index 589fe8f27e8..4bd0fc41701 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArray/bodyarray/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py index 431d8771c2c..01a896cbd3b 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py index 589fe8f27e8..4bd0fc41701 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py index e1f4eb9777b..4bb8e668049 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py index 4b647145b25..e9e4a5219cb 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py index 4b971db94fc..a4662294d84 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py index d37ce0f56e8..dfff3a00d3e 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyByte/bodybyte/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py index ae58b529a1a..21346fd217f 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/_configuration.py @@ -43,7 +43,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py index aa34bbf83a9..231ec33f368 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/_configuration_async.py @@ -37,7 +37,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py index 53f812a790b..7d758190ee5 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py index 4fc13f5db0c..bee1ffda434 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDate/bodydate/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py index ff0b6a9b32c..52a4251d283 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py index c51574101c7..ce5ba77b756 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py index edb0d0c6571..369880be895 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py index 15b6d22c4d4..c9bddd41723 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py index a5134f6ed42..ab036a4bbc3 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py index 813431fc273..8a05dce1a92 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py index fb9601360f8..689193ae273 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py index 1b03cf72178..a13ab8e4b83 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py index f40daf07835..47d8a63e9f9 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py index d28407b4644..fb32f1d142c 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyFile/bodyfile/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py index 5bd9858ec57..86a1d3ebfd2 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py index 541275db6ad..262a8481776 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py index 812932def62..bdc06407352 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py index da1fa2b5551..0c1b5075113 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py index a0385bf3f99..742501a30aa 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py index 7694d9ad988..0a7ca379167 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyString/bodystring/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py index 07866d4ee3f..191c729cb7f 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py index 2a48fcda7e4..c07ccec3eff 100644 --- a/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/BodyTime/bodytime/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py index c24bc56ed62..93a21fe7d6d 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/_configuration.py @@ -48,7 +48,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py index 5e22d7ca806..fb73b3eb921 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/_configuration_async.py @@ -42,7 +42,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py index 5a683c0abb1..039cc891e1d 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_configuration.py @@ -54,7 +54,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py index dc7e653896c..ea7d33e7ae7 100644 --- a/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/_configuration_async.py @@ -48,7 +48,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py index 5db6ba68940..eafd0bdce0a 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py index 6263a30cc30..02a5ce9bf01 100644 --- a/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py index bd654407978..488c3c88c31 100644 --- a/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Header/header/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py index 2c36f56df79..74415a3e1c4 100644 --- a/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Header/header/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py index bb9b3c9f41e..1c9f29ffc65 100644 --- a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py index 20bab4ae7b5..d8e5bac4c56 100644 --- a/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Http/httpinfrastructure/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py index e416d46b5ea..ca7c486f157 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py index 80223f12056..74cc0fc0c11 100644 --- a/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py index a0b4a7f9829..09e3ca852e3 100644 --- a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py index 7f16cbd34fd..33bff93b181 100644 --- a/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py index 0f2ca96609a..9934d7190b2 100644 --- a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py index cb54b346a8e..1a1c36c9fa6 100644 --- a/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py index d6bc74ec056..d8ed85228fd 100644 --- a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py index 1b2a956469d..0ba4f475c90 100644 --- a/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py index daf3c597290..a827f990e1c 100644 --- a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py index 306ed7f5145..e3ee9067801 100644 --- a/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ObjectType/objecttype/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py index 47068005a00..0d56c724cc3 100644 --- a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py index 99d22d4faf4..8149db7c0a6 100644 --- a/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py index 040069e15b7..bc3e8ee6680 100644 --- a/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Report/report/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py index 9a9d5ca77b9..a35a326f91b 100644 --- a/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Report/report/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py index 420371b7106..f30356489b9 100644 --- a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/_configuration.py @@ -58,7 +58,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py index 116412c23d5..df4e6f96240 100644 --- a/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/_configuration_async.py @@ -52,7 +52,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py index 2d10168d774..6874ba22447 100644 --- a/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Url/url/_configuration.py @@ -52,7 +52,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py index 9bae3a7582e..4012c2786b4 100644 --- a/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Url/url/aio/_configuration_async.py @@ -46,7 +46,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py index bcf007fde11..e2135fd9aa6 100644 --- a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py index ffa9f97aef9..1fef98f0691 100644 --- a/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py index 590c3ae99fc..058eb79f711 100644 --- a/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Validation/validation/_configuration.py @@ -49,7 +49,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py index ce4071ef89e..965217de176 100644 --- a/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Validation/validation/aio/_configuration_async.py @@ -43,7 +43,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py index 6052fde9962..acdf8f87230 100644 --- a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py index 8e6cec550a5..e4828a5ed86 100644 --- a/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/Xml/xmlservice/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py index 09c83e1db1a..1e3ccb4e9bd 100644 --- a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py +++ b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_configuration.py @@ -41,7 +41,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py index 4ea17864859..72970bc6a42 100644 --- a/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py +++ b/test/vanilla/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/_configuration_async.py @@ -35,7 +35,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) From a2a1ca38e0fcb1eba718e5495e5e13768f7a8a80 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 11 Jun 2020 11:10:21 -0400 Subject: [PATCH 05/10] only accept BearerTokenCredentialPolicy and AzureKeyCredentialPolicy --- autorest/codegen/__init__.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/autorest/codegen/__init__.py b/autorest/codegen/__init__.py index ecb6e6abd60..ecb6bcda153 100644 --- a/autorest/codegen/__init__.py +++ b/autorest/codegen/__init__.py @@ -17,6 +17,13 @@ from .serializers import JinjaSerializer +def _get_credential_default_policy_type_has_async_version(credential_default_policy_type: str) -> bool: + mapping = { + "BearerTokenCredentialPolicy": True, + "AzureKeyCredentialPolicy": False + } + return mapping[credential_default_policy_type] + _LOGGER = logging.getLogger(__name__) class CodeGenerator(Plugin): @staticmethod @@ -136,10 +143,22 @@ def _build_code_model_options(self) -> Dict[str, Any]: "For example: --credential-scopes=https://cognitiveservices.azure.com/.default" ) - credential_default_policy_type = ( + passed_in_credential_default_policy_type = ( self._autorestapi.get_value("credential-default-policy-type") or "BearerTokenCredentialPolicy" ) + # right now, we only allow BearerTokenCredentialPolicy and AzureKeyCredentialPolicy + allowed_policies = ["BearerTokenCredentialPolicy", "AzureKeyCredentialPolicy"] + credential_default_policy_type = [ + cp for cp in allowed_policies if cp.lower() == passed_in_credential_default_policy_type.lower() + ] + if not credential_default_policy_type: + raise ValueError( + "The credential you pass in with --credential-default-policy-type must be either" + "BearerTokenCredentialPolicy or AzureKeyCredentialPolicy" + ) + credential_default_policy_type = credential_default_policy_type[0] + if credential_scopes and credential_default_policy_type != "BearerTokenCredentialPolicy": _LOGGER.warning( "You have --credential-default-policy-type not set as BearerTokenCredentialPolicy and a value for " @@ -188,7 +207,7 @@ def _build_code_model_options(self) -> Dict[str, Any]: "multiapi": self._autorestapi.get_boolean_value("multiapi", False), "credential_default_policy_type": credential_default_policy_type, "credential_default_policy_type_has_async_version": ( - credential_default_policy_type == "BearerTokenCredentialPolicy" + _get_credential_default_policy_type_has_async_version(credential_default_policy_type) ) } From ce30ee3623739c3593a6d5033aa61ab3bc16af85 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 11 Jun 2020 11:15:48 -0400 Subject: [PATCH 06/10] fixed mypy --- autorest/codegen/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autorest/codegen/__init__.py b/autorest/codegen/__init__.py index ecb6bcda153..782d782ff4e 100644 --- a/autorest/codegen/__init__.py +++ b/autorest/codegen/__init__.py @@ -149,15 +149,15 @@ def _build_code_model_options(self) -> Dict[str, Any]: # right now, we only allow BearerTokenCredentialPolicy and AzureKeyCredentialPolicy allowed_policies = ["BearerTokenCredentialPolicy", "AzureKeyCredentialPolicy"] - credential_default_policy_type = [ - cp for cp in allowed_policies if cp.lower() == passed_in_credential_default_policy_type.lower() - ] - if not credential_default_policy_type: + try: + credential_default_policy_type = [ + cp for cp in allowed_policies if cp.lower() == passed_in_credential_default_policy_type.lower() + ][0] + except IndexError: raise ValueError( - "The credential you pass in with --credential-default-policy-type must be either" + "The credential you pass in with --credential-default-policy-type must be either " "BearerTokenCredentialPolicy or AzureKeyCredentialPolicy" ) - credential_default_policy_type = credential_default_policy_type[0] if credential_scopes and credential_default_policy_type != "BearerTokenCredentialPolicy": _LOGGER.warning( From 0954cf4047f9fcae33cbf65a3e7d1b39cf5b27d2 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 11 Jun 2020 11:17:30 -0400 Subject: [PATCH 07/10] update multiapi azure core dependency to sdk repo --- test/multiapi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/multiapi/requirements.txt b/test/multiapi/requirements.txt index 6ff4005f153..7cdbdcac95c 100644 --- a/test/multiapi/requirements.txt +++ b/test/multiapi/requirements.txt @@ -1,5 +1,5 @@ msrest>=0.6.11 -azure-core>=1.6.0 +git+https://github.com/Azure/azure-sdk-for-python#subdirectory=sdk/core/azure-core&egg=azure-core azure-mgmt-core>=1.1.0 pytest pytest-asyncio==0.10.0;python_full_version>="3.5.2" From 2c1c884e69cc9100934d2739b33a1ab4907e0df7 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 11 Jun 2020 12:25:07 -0400 Subject: [PATCH 08/10] update changelog --- ChangeLog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 45a6830f54c..517f501d6c4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,14 @@ # Change Log +### Unreleased +Modelerfour version: 4.13.351 + +**New Features** + +- We have added a `--credential-default-policy-type` flag. Its default value is `BearerTokenCredentialPolicy`, but it can also accept +`AzureKeyCredentialPolicy`. The value passed in will be the default authentication policy in the client's config, so users using the +generated library will use that auth policy unless they pass in a separate one through kwargs #686 + ### 2020-06-08 - 5.1.0-preview.2 Modelerfour version: 4.13.351 From d8ec002e3d2f23b2bfc52a3ec8c822d53bfd1bb6 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 11 Jun 2020 18:24:27 -0400 Subject: [PATCH 09/10] add multiapi regeneration --- tasks.py | 35 ++++++++++++------- .../_configuration.py | 1 - .../aio/_configuration_async.py | 1 - .../v1/_configuration.py | 1 - .../v1/aio/_configuration_async.py | 1 - .../v2/_configuration.py | 1 - .../v2/aio/_configuration_async.py | 1 - .../v3/_configuration.py | 1 - .../v3/aio/_configuration_async.py | 1 - 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tasks.py b/tasks.py index eb242d6478e..03a2eeceb13 100644 --- a/tasks.py +++ b/tasks.py @@ -320,16 +320,25 @@ def _multiapi_command_line(location): ) @task -def regenerate_multiapi(c, debug=False): - cmds = [] - # create basic multiapi client (package-name=multapi) - cmds.append(_multiapi_command_line("test/multiapi/specification/multiapi/README.md")) - # create multiapi client with submodule (package-name=multiapi#submodule) - cmds.append(_multiapi_command_line("test/multiapi/specification/multiapiwithsubmodule/README.md")) - # create multiapi client with no aio folder (package-name=multiapinoasync) - cmds.append(_multiapi_command_line("test/multiapi/specification/multiapinoasync/README.md")) - with Pool() as pool: - result = pool.map(run_autorest, cmds) - success = all(result) - if not success: - raise SystemExit("Autorest generation fails") +def regenerate_multiapi(c, swagger_name="test", debug=False): + # being hacky: making default swagger_name 'test', since it appears in each spec name + available_specifications = [ + # create basic multiapi client (package-name=multapi) + "test/multiapi/specification/multiapi/README.md", + # create multiapi client with submodule (package-name=multiapi#submodule) + "test/multiapi/specification/multiapiwithsubmodule/README.md", + # create multiapi client with no aio folder (package-name=multiapinoasync) + "test/multiapi/specification/multiapinoasync/README.md", + # create multiapi client with AzureKeyCredentialPolicy + "test/multiapi/specification/multiapicredentialdefaultpolicy/README.md" + ] + + cmds = [_multiapi_command_line(spec) for spec in available_specifications if swagger_name.lower() in spec] + + if len(cmds) == 1: + success = run_autorest(cmds[0], debug=debug) + else: + # Execute actual taks in parallel + with Pool() as pool: + result = pool.map(run_autorest, cmds) + success = all(result) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py index 7ca956deef3..4b617532b9f 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_configuration.py @@ -46,7 +46,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py index b20ae701700..4748e5c0928 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py @@ -45,7 +45,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py index e3998041eb4..6459777b136 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_configuration.py @@ -50,7 +50,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py index bffa607fad7..aeb3230738c 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/_configuration_async.py @@ -46,7 +46,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py index aa1129f3fca..d8732d89843 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_configuration.py @@ -50,7 +50,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py index 0d249e22dd2..7dcabe1b969 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/_configuration_async.py @@ -46,7 +46,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py index 2954380b2db..a81837a0993 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_configuration.py @@ -50,7 +50,6 @@ def _configure( ): # type: (...) -> None self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py index 9608416a682..d2eb90e68b2 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/_configuration_async.py @@ -46,7 +46,6 @@ def _configure( **kwargs: Any ) -> None: self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - kwargs.pop('sdk_moniker') 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) From 2da01a4af78799e7a3f007990b83d4116512c593 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 11 Jun 2020 18:43:38 -0400 Subject: [PATCH 10/10] fix task call --- tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks.py b/tasks.py index 03a2eeceb13..87ff98745bf 100644 --- a/tasks.py +++ b/tasks.py @@ -320,7 +320,7 @@ def _multiapi_command_line(location): ) @task -def regenerate_multiapi(c, swagger_name="test", debug=False): +def regenerate_multiapi(c, debug=False, swagger_name="test"): # being hacky: making default swagger_name 'test', since it appears in each spec name available_specifications = [ # create basic multiapi client (package-name=multapi)