Update from master

AzureSDKAutomation · Aug 17, 2020 · 7cbaf9c · 7cbaf9c
1 parent ccfa4c3
commit 7cbaf9c
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 159 deletions.
diff --git a/...ppconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/_configuration.py b/...ppconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/_configuration.py
@@ -47,7 +47,7 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2019-11-01-preview"
+        self.api_version = "2020-06-01"
         self.credential_scopes = ['https://management.azure.com/.default']
         self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
         kwargs.setdefault('sdk_moniker', 'mgmt-appconfiguration/{}'.format(VERSION))

diff --git a/sdk/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/_metadata.json b/sdk/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/_metadata.json
@@ -1,6 +1,6 @@
 {
-    "chosen_version": "2019-11-01-preview",
-    "total_api_version_list": ["2019-11-01-preview"],
+    "chosen_version": "2020-06-01",
+    "total_api_version_list": ["2020-06-01"],
     "client": {
         "name": "AppConfigurationManagementClient",
         "filename": "_app_configuration_management_client",

diff --git a/sdk/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/_version.py b/sdk/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.0.0b1"
+VERSION = "0.1.0"
diff --git a/...ation/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/aio/_configuration_async.py b/...ation/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration/aio/_configuration_async.py
@@ -44,7 +44,7 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2019-11-01-preview"
+        self.api_version = "2020-06-01"
         self.credential_scopes = ['https://management.azure.com/.default']
         self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
         kwargs.setdefault('sdk_moniker', 'mgmt-appconfiguration/{}'.format(VERSION))

diff --git a/...zure/mgmt/appconfiguration/aio/operations_async/_configuration_stores_operations_async.py b/...zure/mgmt/appconfiguration/aio/operations_async/_configuration_stores_operations_async.py
@@ -63,9 +63,13 @@ def list(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfigurationStoreListResult"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
 
         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.list.metadata['url']  # type: ignore
@@ -79,15 +83,11 @@ def prepare_request(next_link=None):
                 if skip_token is not None:
                     query_parameters['$skipToken'] = self._serialize.query("skip_token", skip_token, 'str')
 
+                request = self._client.get(url, query_parameters, header_parameters)
             else:
                 url = next_link
                 query_parameters = {}  # type: Dict[str, Any]
-            # Construct headers
-            header_parameters = {}  # type: Dict[str, Any]
-            header_parameters['Accept'] = 'application/json'
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters, header_parameters)
+                request = self._client.get(url, query_parameters, header_parameters)
             return request
 
         async def extract_data(pipeline_response):
@@ -139,9 +139,13 @@ def list_by_resource_group(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfigurationStoreListResult"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
 
         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.list_by_resource_group.metadata['url']  # type: ignore
@@ -156,15 +160,11 @@ def prepare_request(next_link=None):
                 if skip_token is not None:
                     query_parameters['$skipToken'] = self._serialize.query("skip_token", skip_token, 'str')
 
+                request = self._client.get(url, query_parameters, header_parameters)
             else:
                 url = next_link
                 query_parameters = {}  # type: Dict[str, Any]
-            # Construct headers
-            header_parameters = {}  # type: Dict[str, Any]
-            header_parameters['Accept'] = 'application/json'
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters, header_parameters)
+                request = self._client.get(url, query_parameters, header_parameters)
             return request
 
         async def extract_data(pipeline_response):
@@ -213,7 +213,7 @@ async def get(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfigurationStore"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
 
         # Construct URL
         url = self.get.metadata['url']  # type: ignore
@@ -232,7 +232,6 @@ async def get(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         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
@@ -260,7 +259,7 @@ async def _create_initial(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfigurationStore"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -281,7 +280,6 @@ async def _create_initial(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(config_store_creation_parameters, 'ConfigurationStore')
         body_content_kwargs['content'] = body_content
@@ -295,7 +293,6 @@ async def _create_initial(
             error = self._deserialize(models.Error, response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = None
         if response.status_code == 200:
             deserialized = self._deserialize('ConfigurationStore', pipeline_response)
 
@@ -314,7 +311,7 @@ async def begin_create(
         config_store_name: str,
         config_store_creation_parameters: "models.ConfigurationStore",
         **kwargs
-    ) -> "models.ConfigurationStore":
+    ) -> AsyncLROPoller["models.ConfigurationStore"]:
         """Creates a configuration store with the specified parameters.
 
         :param resource_group_name: The name of the resource group to which the container registry
@@ -330,8 +327,8 @@ async def begin_create(
          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: ConfigurationStore, or the result of cls(response)
-        :rtype: ~app_configuration_management_client.models.ConfigurationStore
+        :return: An instance of AsyncLROPoller that returns either ConfigurationStore or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[~app_configuration_management_client.models.ConfigurationStore]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, AsyncPollingMethod]
@@ -383,7 +380,7 @@ async def _delete_initial(
         cls = kwargs.pop('cls', None)  # type: ClsType[None]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
 
         # Construct URL
         url = self._delete_initial.metadata['url']  # type: ignore
@@ -401,7 +398,6 @@ async def _delete_initial(
         # Construct headers
         header_parameters = {}  # type: Dict[str, Any]
 
-        # Construct and send request
         request = self._client.delete(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -421,7 +417,7 @@ async def begin_delete(
         resource_group_name: str,
         config_store_name: str,
         **kwargs
-    ) -> None:
+    ) -> AsyncLROPoller[None]:
         """Deletes a configuration store.
 
         :param resource_group_name: The name of the resource group to which the container registry
@@ -435,8 +431,8 @@ async def begin_delete(
          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: None, or the result of cls(response)
-        :rtype: None
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, AsyncPollingMethod]
@@ -485,7 +481,7 @@ async def _update_initial(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ConfigurationStore"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -506,7 +502,6 @@ async def _update_initial(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(config_store_update_parameters, 'ConfigurationStoreUpdateParameters')
         body_content_kwargs['content'] = body_content
@@ -520,7 +515,6 @@ async def _update_initial(
             error = self._deserialize(models.Error, response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = None
         if response.status_code == 200:
             deserialized = self._deserialize('ConfigurationStore', pipeline_response)
 
@@ -539,7 +533,7 @@ async def begin_update(
         config_store_name: str,
         config_store_update_parameters: "models.ConfigurationStoreUpdateParameters",
         **kwargs
-    ) -> "models.ConfigurationStore":
+    ) -> AsyncLROPoller["models.ConfigurationStore"]:
         """Updates a configuration store with the specified parameters.
 
         :param resource_group_name: The name of the resource group to which the container registry
@@ -555,8 +549,8 @@ async def begin_update(
          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: ConfigurationStore, or the result of cls(response)
-        :rtype: ~app_configuration_management_client.models.ConfigurationStore
+        :return: An instance of AsyncLROPoller that returns either ConfigurationStore or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[~app_configuration_management_client.models.ConfigurationStore]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, AsyncPollingMethod]
@@ -626,9 +620,13 @@ def list_keys(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ApiKeyListResult"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
 
         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.list_keys.metadata['url']  # type: ignore
@@ -644,15 +642,11 @@ def prepare_request(next_link=None):
                 if skip_token is not None:
                     query_parameters['$skipToken'] = self._serialize.query("skip_token", skip_token, 'str')
 
+                request = self._client.post(url, query_parameters, header_parameters)
             else:
                 url = next_link
                 query_parameters = {}  # type: Dict[str, Any]
-            # Construct headers
-            header_parameters = {}  # type: Dict[str, Any]
-            header_parameters['Accept'] = 'application/json'
-
-            # Construct and send request
-            request = self._client.post(url, query_parameters, header_parameters)
+                request = self._client.get(url, query_parameters, header_parameters)
             return request
 
         async def extract_data(pipeline_response):
@@ -704,7 +698,7 @@ async def regenerate_key(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.ApiKey"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -725,7 +719,6 @@ async def regenerate_key(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(regenerate_key_parameters, 'RegenerateKeyParameters')
         body_content_kwargs['content'] = body_content
@@ -771,7 +764,7 @@ async def list_key_value(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.KeyValue"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -792,7 +785,6 @@ async def list_key_value(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(list_key_value_parameters, 'ListKeyValueParameters')
         body_content_kwargs['content'] = body_content

diff --git a/...mt-appconfiguration/azure/mgmt/appconfiguration/aio/operations_async/_operations_async.py b/...mt-appconfiguration/azure/mgmt/appconfiguration/aio/operations_async/_operations_async.py
@@ -59,7 +59,7 @@ async def check_name_availability(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.NameAvailabilityStatus"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
         content_type = kwargs.pop("content_type", "application/json")
 
         # Construct URL
@@ -78,7 +78,6 @@ async def check_name_availability(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(check_name_availability_parameters, 'CheckNameAvailabilityParameters')
         body_content_kwargs['content'] = body_content
@@ -120,9 +119,13 @@ def list(
         cls = kwargs.pop('cls', None)  # type: ClsType["models.OperationDefinitionListResult"]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
-        api_version = "2019-11-01-preview"
+        api_version = "2020-06-01"
 
         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.list.metadata['url']  # type: ignore
@@ -132,15 +135,11 @@ def prepare_request(next_link=None):
                 if skip_token is not None:
                     query_parameters['$skipToken'] = self._serialize.query("skip_token", skip_token, 'str')
 
+                request = self._client.get(url, query_parameters, header_parameters)
             else:
                 url = next_link
                 query_parameters = {}  # type: Dict[str, Any]
-            # Construct headers
-            header_parameters = {}  # type: Dict[str, Any]
-            header_parameters['Accept'] = 'application/json'
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters, header_parameters)
+                request = self._client.get(url, query_parameters, header_parameters)
             return request
 
         async def extract_data(pipeline_response):