From 66587f023a5e9172ebd8e9ffa163ac24f76c6fe7 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 24 Jul 2020 14:25:31 -0400 Subject: [PATCH 1/3] fix double typing for config init in async --- autorest/multiapi/templates/multiapi_config.py.jinja2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autorest/multiapi/templates/multiapi_config.py.jinja2 b/autorest/multiapi/templates/multiapi_config.py.jinja2 index 997cf6f6916..c437fb076ba 100644 --- a/autorest/multiapi/templates/multiapi_config.py.jinja2 +++ b/autorest/multiapi/templates/multiapi_config.py.jinja2 @@ -53,7 +53,9 @@ class {{ client_name }}Configuration(Configuration): """ {{ method_signature()|indent }} + {% if not async_mode %} # type: (...) -> None + {% endif %} {% for serialized_name, gp_dict in global_parameters_method.items() %} {% if gp_dict["required"] %} if {{ serialized_name }} is None: From 0877252583e5eda06af4b533e65039a0ea05369a Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 24 Jul 2020 14:25:37 -0400 Subject: [PATCH 2/3] regenerate --- .../Multiapi/multiapi/aio/_configuration_async.py | 1 - .../multiapicredentialdefaultpolicy/aio/_configuration_async.py | 1 - .../multiapicustombaseurl/aio/_configuration_async.py | 1 - .../multiapidataplane/aio/_configuration_async.py | 1 - .../multiapiwithsubmodule/submodule/aio/_configuration_async.py | 1 - 5 files changed, 5 deletions(-) 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 efa0fa85bd3..7d3a06926c9 100644 --- a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_configuration_async.py @@ -32,7 +32,6 @@ def __init__( 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) 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 a71723403cf..fd448263f31 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_configuration_async.py @@ -32,7 +32,6 @@ def __init__( 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) diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py index 5bd32a0ba62..14328f8e995 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_configuration_async.py @@ -34,7 +34,6 @@ def __init__( endpoint, # type: str **kwargs # type: Any ) -> None: - # type: (...) -> None if credential is None: raise ValueError("Parameter 'credential' must not be None.") if endpoint is None: diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py index db7abab6469..bd3515cecc8 100644 --- a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py +++ b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_configuration_async.py @@ -31,7 +31,6 @@ def __init__( 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) 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 b7b3ea81225..b71ff33bc55 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 @@ -32,7 +32,6 @@ def __init__( 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) From a7f64b508863989ee7a68132d66b5046a747fe12 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Fri, 24 Jul 2020 14:27:24 -0400 Subject: [PATCH 3/3] update changelog --- ChangeLog.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 941f444beef..6dfb11606dc 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,13 @@ # Change Log +### 2020-xx-xx - 5.1.0-preview.6 +Autorest Core version: 3.0.6287 +Modelerfour version: 4.15.378 + +**Bug Fixes** + +- Fix duplicate type signatures in multiapi async config file #727 + ### 2020-06-23 - 5.1.0-preview.5 Autorest Core version: 3.0.6287 Modelerfour version: 4.15.378