[AutoPR track2_azure-mgmt-hybridcontainerservice] changes for vault tier

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

@@ -1,11 +1,11 @@
 {
-  "commit": "aa85f59e259c4b12197b57b221067c40fa2fe3f1",
+  "commit": "a231973a4fd49f699621dd74cb1b47d9d6fdcd13",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.4.0",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "autorest_command": "autorest specification/hybridaks/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.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/hybridaks/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/hybridaks/resource-manager/readme.md"
 }

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

@@ -6,7 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
 from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
 
 from ._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
@@ -33,16 +27,16 @@ class HybridContainerServiceMgmtClientConfiguration(Configuration):  # pylint: d
 
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The ID of the target subscription. Required.
+    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2022-09-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2023-11-15-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(HybridContainerServiceMgmtClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2022-09-01-preview"] = kwargs.pop("api_version", "2022-09-01-preview")
+        api_version: str = kwargs.pop("api_version", "2023-11-15-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/hybridcontainerservice/azure-mgmt-hybridcontainerservice/azure/mgmt/hybridcontainerservice/_hybrid_container_service_mgmt_client.py

@@ -17,11 +17,12 @@
 from ._serialization import Deserializer, Serializer
 from .operations import (
     AgentPoolOperations,
-    HybridContainerServiceOperations,
+    HybridContainerServiceMgmtClientOperationsMixin,
     HybridIdentityMetadataOperations,
+    KubernetesVersionsOperations,
     Operations,
-    ProvisionedClustersOperations,
-    StorageSpacesOperations,
+    ProvisionedClusterInstancesOperations,
+    VMSkusOperations,
     VirtualNetworksOperations,
 )
 
@@ -30,34 +31,36 @@
     from azure.core.credentials import TokenCredential
 
 
-class HybridContainerServiceMgmtClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class HybridContainerServiceMgmtClient(
+    HybridContainerServiceMgmtClientOperationsMixin
+):  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
     """The Microsoft.HybridContainerService Rest API spec.
 
-    :ivar provisioned_clusters: ProvisionedClustersOperations operations
-    :vartype provisioned_clusters:
-     azure.mgmt.hybridcontainerservice.operations.ProvisionedClustersOperations
+    :ivar provisioned_cluster_instances: ProvisionedClusterInstancesOperations operations
+    :vartype provisioned_cluster_instances:
+     azure.mgmt.hybridcontainerservice.operations.ProvisionedClusterInstancesOperations
     :ivar hybrid_identity_metadata: HybridIdentityMetadataOperations operations
     :vartype hybrid_identity_metadata:
      azure.mgmt.hybridcontainerservice.operations.HybridIdentityMetadataOperations
     :ivar agent_pool: AgentPoolOperations operations
     :vartype agent_pool: azure.mgmt.hybridcontainerservice.operations.AgentPoolOperations
-    :ivar hybrid_container_service: HybridContainerServiceOperations operations
-    :vartype hybrid_container_service:
-     azure.mgmt.hybridcontainerservice.operations.HybridContainerServiceOperations
+    :ivar kubernetes_versions: KubernetesVersionsOperations operations
+    :vartype kubernetes_versions:
+     azure.mgmt.hybridcontainerservice.operations.KubernetesVersionsOperations
+    :ivar vm_skus: VMSkusOperations operations
+    :vartype vm_skus: azure.mgmt.hybridcontainerservice.operations.VMSkusOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.hybridcontainerservice.operations.Operations
-    :ivar storage_spaces: StorageSpacesOperations operations
-    :vartype storage_spaces: azure.mgmt.hybridcontainerservice.operations.StorageSpacesOperations
     :ivar virtual_networks: VirtualNetworksOperations operations
     :vartype virtual_networks:
      azure.mgmt.hybridcontainerservice.operations.VirtualNetworksOperations
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The ID of the target subscription. Required.
+    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :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 "2022-09-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2023-11-15-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
@@ -74,24 +77,24 @@ def __init__(
         self._config = HybridContainerServiceMgmtClientConfiguration(
             credential=credential, subscription_id=subscription_id, **kwargs
         )
-        self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._client: ARMPipelineClient = ARMPipelineClient(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._serialize.client_side_validation = False
-        self.provisioned_clusters = ProvisionedClustersOperations(
+        self.provisioned_cluster_instances = ProvisionedClusterInstancesOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.hybrid_identity_metadata = HybridIdentityMetadataOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.agent_pool = AgentPoolOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.hybrid_container_service = HybridContainerServiceOperations(
+        self.kubernetes_versions = KubernetesVersionsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
+        self.vm_skus = VMSkusOperations(self._client, self._config, self._serialize, self._deserialize)
         self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
-        self.storage_spaces = StorageSpacesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.virtual_networks = VirtualNetworksOperations(
             self._client, self._config, self._serialize, self._deserialize
         )

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

@@ -629,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                         if xml_desc.get("attr", False):
                             if xml_ns:
                                 ET.register_namespace(xml_prefix, xml_ns)
-                                xml_name = "{}{}".format(xml_ns, xml_name)
+                                xml_name = "{{{}}}{}".format(xml_ns, xml_name)
                             serialized.set(xml_name, new_attr)  # type: ignore
                             continue
                         if xml_desc.get("text", False):
@@ -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:
@@ -1271,7 +1281,7 @@ def _extract_name_from_internal_type(internal_type):
     xml_name = internal_type_xml_map.get("name", internal_type.__name__)
     xml_ns = internal_type_xml_map.get("ns", None)
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
     return xml_name
 
 
@@ -1295,7 +1305,7 @@ def xml_key_extractor(attr, attr_desc, data):
     # Integrate namespace if necessary
     xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
 
     # If it's an attribute, that's simple
     if xml_desc.get("attr", False):

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

@@ -5,10 +5,19 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import List, cast
+from abc import ABC
+from typing import TYPE_CHECKING
 
 from azure.core.pipeline.transport import HttpRequest
 
+from ._configuration import HybridContainerServiceMgmtClientConfiguration
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import,ungrouped-imports
+    from azure.core import PipelineClient
+
+    from ._serialization import Deserializer, Serializer
+
 
 def _convert_request(request, files=None):
     data = request.content if not files else None
@@ -18,13 +27,10 @@ def _convert_request(request, files=None):
     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)
+class HybridContainerServiceMgmtClientMixinABC(ABC):
+    """DO NOT use this class. It is for internal typing use only."""
+
+    _client: "PipelineClient"
+    _config: HybridContainerServiceMgmtClientConfiguration
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

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

@@ -6,7 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-import sys
 from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
 
 from .._version import VERSION
 
-if sys.version_info >= (3, 8):
-    from typing import Literal  # pylint: disable=no-name-in-module, ungrouped-imports
-else:
-    from typing_extensions import Literal  # type: ignore  # pylint: disable=ungrouped-imports
-
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
@@ -33,16 +27,16 @@ class HybridContainerServiceMgmtClientConfiguration(Configuration):  # pylint: d
 
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
-    :param subscription_id: The ID of the target subscription. Required.
+    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2022-09-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2023-11-15-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(HybridContainerServiceMgmtClientConfiguration, self).__init__(**kwargs)
-        api_version: Literal["2022-09-01-preview"] = kwargs.pop("api_version", "2022-09-01-preview")
+        api_version: str = kwargs.pop("api_version", "2023-11-15-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")