CodeGen from PR 26189 in Azure/azure-rest-api-specs

Merge 6a4abd3b5d6084e4a1aa8e0e29be1b2461b365f2 into 622891e1923a4fd9501263d1c14da7f040c1b1f2

sdk/devcenter/azure-mgmt-devcenter/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "4f6418dca8c15697489bbe6f855558bb79ca5bf5",
+  "commit": "18223a59a3c2e586450bff34fa76a4e37145b61d",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.4.8",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "autorest_command": "autorest specification/devcenter/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.8 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/devcenter/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
   "readme": "specification/devcenter/resource-manager/readme.md"
 }

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/_configuration.py

@@ -29,14 +29,14 @@ class DevCenterMgmtClientConfiguration(Configuration):  # pylint: disable=too-ma
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
+     this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(DevCenterMgmtClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2023-04-01")
+        api_version: str = kwargs.pop("api_version", "2023-08-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/_dev_center_mgmt_client.py

@@ -17,10 +17,13 @@
 from ._serialization import Deserializer, Serializer
 from .operations import (
     AttachedNetworksOperations,
+    CatalogDevBoxDefinitionsOperations,
     CatalogsOperations,
     CheckNameAvailabilityOperations,
+    CustomizationTasksOperations,
     DevBoxDefinitionsOperations,
     DevCentersOperations,
+    EnvironmentDefinitionsOperations,
     EnvironmentTypesOperations,
     GalleriesOperations,
     ImageVersionsOperations,
@@ -78,6 +81,14 @@ class DevCenterMgmtClient:  # pylint: disable=client-accepts-api-version-keyword
     :ivar check_name_availability: CheckNameAvailabilityOperations operations
     :vartype check_name_availability:
      azure.mgmt.devcenter.operations.CheckNameAvailabilityOperations
+    :ivar catalog_dev_box_definitions: CatalogDevBoxDefinitionsOperations operations
+    :vartype catalog_dev_box_definitions:
+     azure.mgmt.devcenter.operations.CatalogDevBoxDefinitionsOperations
+    :ivar customization_tasks: CustomizationTasksOperations operations
+    :vartype customization_tasks: azure.mgmt.devcenter.operations.CustomizationTasksOperations
+    :ivar environment_definitions: EnvironmentDefinitionsOperations operations
+    :vartype environment_definitions:
+     azure.mgmt.devcenter.operations.EnvironmentDefinitionsOperations
     :ivar skus: SkusOperations operations
     :vartype skus: azure.mgmt.devcenter.operations.SkusOperations
     :ivar pools: PoolsOperations operations
@@ -92,8 +103,8 @@ class DevCenterMgmtClient:  # pylint: disable=client-accepts-api-version-keyword
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
+     this default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
      Retry-After header is present.
@@ -144,6 +155,15 @@ def __init__(
         self.check_name_availability = CheckNameAvailabilityOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.catalog_dev_box_definitions = CatalogDevBoxDefinitionsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.customization_tasks = CustomizationTasksOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.environment_definitions = EnvironmentDefinitionsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
         self.skus = SkusOperations(self._client, self._config, self._serialize, self._deserialize)
         self.pools = PoolsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.schedules = SchedulesOperations(self._client, self._config, self._serialize, self._deserialize)

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/_serialization.py

@@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                                 _serialized.update(_new_attr)  # type: ignore
                             _new_attr = _new_attr[k]  # type: ignore
                             _serialized = _serialized[k]
-                except ValueError:
-                    continue
+                except ValueError as err:
+                    if isinstance(err, SerializationError):
+                        raise
 
         except (AttributeError, KeyError, TypeError) as err:
             msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):
 
         :param data: The data to be serialized.
         :param str data_type: The type to be serialized from.
+        :keyword bool skip_quote: Whether to skip quote the serialized result.
+        Defaults to False.
         :rtype: str
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
@@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
             # Treat the list aside, since we don't want to encode the div separator
             if data_type.startswith("["):
                 internal_data_type = data_type[1:-1]
-                data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
-                if not kwargs.get("skip_quote", False):
-                    data = [quote(str(d), safe="") for d in data]
-                return str(self.serialize_iter(data, internal_data_type, **kwargs))
+                do_quote = not kwargs.get("skip_quote", False)
+                return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
 
             # Not a list, regular serialization
             output = self.serialize_data(data, data_type, **kwargs)
@@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
          not be None or empty.
         :param str div: If set, this str will be used to combine the elements
          in the iterable into a combined string. Default is 'None'.
+        :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
+        Defaults to False.
         :rtype: list, str
         """
         if isinstance(data, str):
@@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
         for d in data:
             try:
                 serialized.append(self.serialize_data(d, iter_type, **kwargs))
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized.append(None)
 
+        if kwargs.get("do_quote", False):
+            serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
+
         if div:
             serialized = ["" if s is None else str(s) for s in serialized]
             serialized = div.join(serialized)
@@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
         for key, value in attr.items():
             try:
                 serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized[self.serialize_unicode(key)] = None
 
         if "xml" in serialization_ctxt:

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/_vendor.py

@@ -5,8 +5,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import List, cast
-
 from azure.core.pipeline.transport import HttpRequest
 
 
@@ -16,15 +14,3 @@ def _convert_request(request, files=None):
     if files:
         request.set_formdata_body(files)
     return request
-
-
-def _format_url_section(template, **kwargs):
-    components = template.split("/")
-    while components:
-        try:
-            return template.format(**kwargs)
-        except KeyError as key:
-            # Need the cast, as for some reasons "split" is typed as list[str | Any]
-            formatted_components = cast(List[str], template.split("/"))
-            components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
-            template = "/".join(components)

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.0.0"
+VERSION = "1.0.0b1"

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/aio/_configuration.py

@@ -29,14 +29,14 @@ class DevCenterMgmtClientConfiguration(Configuration):  # pylint: disable=too-ma
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
     :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
+     this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
     def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
         super(DevCenterMgmtClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2023-04-01")
+        api_version: str = kwargs.pop("api_version", "2023-08-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/aio/_dev_center_mgmt_client.py

@@ -17,10 +17,13 @@
 from ._configuration import DevCenterMgmtClientConfiguration
 from .operations import (
     AttachedNetworksOperations,
+    CatalogDevBoxDefinitionsOperations,
     CatalogsOperations,
     CheckNameAvailabilityOperations,
+    CustomizationTasksOperations,
     DevBoxDefinitionsOperations,
     DevCentersOperations,
+    EnvironmentDefinitionsOperations,
     EnvironmentTypesOperations,
     GalleriesOperations,
     ImageVersionsOperations,
@@ -78,6 +81,14 @@ class DevCenterMgmtClient:  # pylint: disable=client-accepts-api-version-keyword
     :ivar check_name_availability: CheckNameAvailabilityOperations operations
     :vartype check_name_availability:
      azure.mgmt.devcenter.aio.operations.CheckNameAvailabilityOperations
+    :ivar catalog_dev_box_definitions: CatalogDevBoxDefinitionsOperations operations
+    :vartype catalog_dev_box_definitions:
+     azure.mgmt.devcenter.aio.operations.CatalogDevBoxDefinitionsOperations
+    :ivar customization_tasks: CustomizationTasksOperations operations
+    :vartype customization_tasks: azure.mgmt.devcenter.aio.operations.CustomizationTasksOperations
+    :ivar environment_definitions: EnvironmentDefinitionsOperations operations
+    :vartype environment_definitions:
+     azure.mgmt.devcenter.aio.operations.EnvironmentDefinitionsOperations
     :ivar skus: SkusOperations operations
     :vartype skus: azure.mgmt.devcenter.aio.operations.SkusOperations
     :ivar pools: PoolsOperations operations
@@ -92,8 +103,8 @@ class DevCenterMgmtClient:  # pylint: disable=client-accepts-api-version-keyword
     :type subscription_id: str
     :param base_url: Service URL. Default value is "https://management.azure.com".
     :type base_url: str
-    :keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
-     default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2023-08-01-preview". Note that overriding
+     this default value may result in unsupported behavior.
     :paramtype api_version: str
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
      Retry-After header is present.
@@ -144,6 +155,15 @@ def __init__(
         self.check_name_availability = CheckNameAvailabilityOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.catalog_dev_box_definitions = CatalogDevBoxDefinitionsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.customization_tasks = CustomizationTasksOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.environment_definitions = EnvironmentDefinitionsOperations(
+            self._client, self._config, self._serialize, self._deserialize
+        )
         self.skus = SkusOperations(self._client, self._config, self._serialize, self._deserialize)
         self.pools = PoolsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.schedules = SchedulesOperations(self._client, self._config, self._serialize, self._deserialize)

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/aio/operations/__init__.py

@@ -21,6 +21,9 @@
 from ._operation_statuses_operations import OperationStatusesOperations
 from ._usages_operations import UsagesOperations
 from ._check_name_availability_operations import CheckNameAvailabilityOperations
+from ._catalog_dev_box_definitions_operations import CatalogDevBoxDefinitionsOperations
+from ._customization_tasks_operations import CustomizationTasksOperations
+from ._environment_definitions_operations import EnvironmentDefinitionsOperations
 from ._skus_operations import SkusOperations
 from ._pools_operations import PoolsOperations
 from ._schedules_operations import SchedulesOperations
@@ -46,6 +49,9 @@
     "OperationStatusesOperations",
     "UsagesOperations",
     "CheckNameAvailabilityOperations",
+    "CatalogDevBoxDefinitionsOperations",
+    "CustomizationTasksOperations",
+    "EnvironmentDefinitionsOperations",
     "SkusOperations",
     "PoolsOperations",
     "SchedulesOperations",

sdk/devcenter/azure-mgmt-devcenter/azure/mgmt/devcenter/aio/operations/_attached_networks_operations.py

@@ -6,6 +6,7 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+from io import IOBase
 from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
@@ -416,7 +417,7 @@ async def _create_or_update_initial(
         content_type = content_type or "application/json"
         _json = None
         _content = None
-        if isinstance(body, (IO, bytes)):
+        if isinstance(body, (IOBase, bytes)):
             _content = body
         else:
             _json = self._serialize.body(body, "AttachedNetworkConnection")