[AutoRelease] t2-recoveryservices-2023-08-15-30449(can only be merged by SDK owner) (Azure#31652)

* code and test

* Update CHANGELOG.md

---------

Co-authored-by: azure-sdk <PythonSdkPipelines>
Co-authored-by: ChenxiJiang333 <[email protected]>

Author: azure-sdk

sdk/recoveryservices/azure-mgmt-recoveryservices/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History
 
+## 2.5.0 (2023-09-05)
+
+### Features Added
+
+  - Model SecuritySettings has a new parameter multi_user_authorization
+  - Model SecuritySettings has a new parameter soft_delete_settings
+  - Model VaultProperties has a new parameter secure_score
+
 ## 2.4.0 (2023-05-20)
 
 ### Features Added

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

@@ -1,11 +1,11 @@
 {
-  "commit": "18b397a02e5c7b856f61b6d7fb66a69c9c56c8ce",
+  "commit": "277c98958d4dd87af68a6192009644704239778e",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.4.12",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "autorest_command": "autorest specification/recoveryservices/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.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/recoveryservices/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.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
   "readme": "specification/recoveryservices/resource-manager/readme.md"
 }

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

@@ -29,14 +29,14 @@ class RecoveryServicesClientConfiguration(Configuration):  # pylint: disable=too
     :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-02-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-04-01". 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(RecoveryServicesClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2023-02-01")
+        api_version: str = kwargs.pop("api_version", "2023-04-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_recovery_services_client.py

@@ -65,7 +65,7 @@ class RecoveryServicesClient(
     :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-02-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-04-01". 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

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_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/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/_vendor.py

@@ -6,7 +6,7 @@
 # --------------------------------------------------------------------------
 
 from abc import ABC
-from typing import List, TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from azure.core.pipeline.transport import HttpRequest
 
@@ -27,18 +27,6 @@ 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 RecoveryServicesClientMixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 

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

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

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

@@ -29,14 +29,14 @@ class RecoveryServicesClientConfiguration(Configuration):  # pylint: disable=too
     :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-02-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-04-01". 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(RecoveryServicesClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2023-02-01")
+        api_version: str = kwargs.pop("api_version", "2023-04-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/aio/_recovery_services_client.py

@@ -68,7 +68,7 @@ class RecoveryServicesClient(
     :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-02-01". Note that overriding this
+    :keyword api_version: Api Version. Default value is "2023-04-01". 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

sdk/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices/models/__init__.py

@@ -54,6 +54,7 @@
 from ._models_py3 import RestoreSettings
 from ._models_py3 import SecuritySettings
 from ._models_py3 import Sku
+from ._models_py3 import SoftDeleteSettings
 from ._models_py3 import SystemData
 from ._models_py3 import TrackedResource
 from ._models_py3 import UpgradeDetails
@@ -77,12 +78,15 @@
 from ._recovery_services_client_enums import CrossSubscriptionRestoreState
 from ._recovery_services_client_enums import ImmutabilityState
 from ._recovery_services_client_enums import InfrastructureEncryptionState
+from ._recovery_services_client_enums import MultiUserAuthorization
 from ._recovery_services_client_enums import PrivateEndpointConnectionStatus
 from ._recovery_services_client_enums import ProvisioningState
 from ._recovery_services_client_enums import PublicNetworkAccess
 from ._recovery_services_client_enums import ResourceIdentityType
 from ._recovery_services_client_enums import ResourceMoveState
+from ._recovery_services_client_enums import SecureScoreLevel
 from ._recovery_services_client_enums import SkuName
+from ._recovery_services_client_enums import SoftDeleteState
 from ._recovery_services_client_enums import StandardTierStorageRedundancy
 from ._recovery_services_client_enums import TriggerType
 from ._recovery_services_client_enums import UsagesUnit
@@ -142,6 +146,7 @@
     "RestoreSettings",
     "SecuritySettings",
     "Sku",
+    "SoftDeleteSettings",
     "SystemData",
     "TrackedResource",
     "UpgradeDetails",
@@ -164,12 +169,15 @@
     "CrossSubscriptionRestoreState",
     "ImmutabilityState",
     "InfrastructureEncryptionState",
+    "MultiUserAuthorization",
     "PrivateEndpointConnectionStatus",
     "ProvisioningState",
     "PublicNetworkAccess",
     "ResourceIdentityType",
     "ResourceMoveState",
+    "SecureScoreLevel",
     "SkuName",
+    "SoftDeleteState",
     "StandardTierStorageRedundancy",
     "TriggerType",
     "UsagesUnit",