[AutoRelease] t2-cosmosdb-2024-06-17-27764(can only be merged by SDK owner) (#36102)

* code and test

* Update CHANGELOG.md

* Update _version.py

---------

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

Author: azure-sdk

sdk/cosmos/azure-mgmt-cosmosdb/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Release History
 
+## 9.5.1 (2024-06-19)
+
+### Features Added
+
+  - Model ServiceResourceCreateUpdateParameters has a new parameter properties
+
+### Breaking Changes
+
+  - Model ServiceResourceCreateUpdateParameters no longer has parameter instance_count
+  - Model ServiceResourceCreateUpdateParameters no longer has parameter instance_size
+  - Model ServiceResourceCreateUpdateParameters no longer has parameter service_type
+
+### Bugs Fixed
+
+  - Disable parameter flatten for Model ServiceResourceCreateUpdateParameters to avoid deserializatin
+
 ## 9.5.0 (2024-05-20)
 
 ### Features Added

sdk/cosmos/azure-mgmt-cosmosdb/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "d8fea3be3e325648fa72fbd251191de9af5d049a",
+  "commit": "f1546dc981fa5d164d7ecd13588520457462c22c",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.10.2",
   "use": [
-    "@autorest/[email protected].16",
+    "@autorest/[email protected].19",
     "@autorest/[email protected]"
   ],
-  "autorest_command": "autorest specification/cosmos-db/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/[email protected].16 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/cosmos-db/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 --tag=package-2024-05 --use=@autorest/[email protected].19 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
   "readme": "specification/cosmos-db/resource-manager/readme.md"
 }

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_serialization.py

@@ -1441,7 +1441,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_version.py

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

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/__init__.py

@@ -68,7 +68,7 @@
 from ._models_py3 import DataCenterResourceProperties
 from ._models_py3 import DataTransferRegionalServiceResource
 from ._models_py3 import DataTransferServiceResource
-from ._models_py3 import DataTransferServiceResourceCreateUpdateParameters
+from ._models_py3 import DataTransferServiceResourceCreateUpdateProperties
 from ._models_py3 import DataTransferServiceResourceProperties
 from ._models_py3 import DatabaseAccountConnectionString
 from ._models_py3 import DatabaseAccountCreateUpdateParameters
@@ -88,7 +88,7 @@
 from ._models_py3 import FailoverPolicy
 from ._models_py3 import GraphAPIComputeRegionalServiceResource
 from ._models_py3 import GraphAPIComputeServiceResource
-from ._models_py3 import GraphAPIComputeServiceResourceCreateUpdateParameters
+from ._models_py3 import GraphAPIComputeServiceResourceCreateUpdateProperties
 from ._models_py3 import GraphAPIComputeServiceResourceProperties
 from ._models_py3 import GremlinDatabaseCreateUpdateParameters
 from ._models_py3 import GremlinDatabaseGetPropertiesOptions
@@ -121,7 +121,7 @@
 from ._models_py3 import ManagedServiceIdentityUserAssignedIdentity
 from ._models_py3 import MaterializedViewsBuilderRegionalServiceResource
 from ._models_py3 import MaterializedViewsBuilderServiceResource
-from ._models_py3 import MaterializedViewsBuilderServiceResourceCreateUpdateParameters
+from ._models_py3 import MaterializedViewsBuilderServiceResourceCreateUpdateProperties
 from ._models_py3 import MaterializedViewsBuilderServiceResourceProperties
 from ._models_py3 import Metric
 from ._models_py3 import MetricAvailability
@@ -240,7 +240,7 @@
 from ._models_py3 import SqlDatabaseResource
 from ._models_py3 import SqlDedicatedGatewayRegionalServiceResource
 from ._models_py3 import SqlDedicatedGatewayServiceResource
-from ._models_py3 import SqlDedicatedGatewayServiceResourceCreateUpdateParameters
+from ._models_py3 import SqlDedicatedGatewayServiceResourceCreateUpdateProperties
 from ._models_py3 import SqlDedicatedGatewayServiceResourceProperties
 from ._models_py3 import SqlRoleAssignmentCreateUpdateParameters
 from ._models_py3 import SqlRoleAssignmentGetResults
@@ -395,7 +395,7 @@
     "DataCenterResourceProperties",
     "DataTransferRegionalServiceResource",
     "DataTransferServiceResource",
-    "DataTransferServiceResourceCreateUpdateParameters",
+    "DataTransferServiceResourceCreateUpdateProperties",
     "DataTransferServiceResourceProperties",
     "DatabaseAccountConnectionString",
     "DatabaseAccountCreateUpdateParameters",
@@ -415,7 +415,7 @@
     "FailoverPolicy",
     "GraphAPIComputeRegionalServiceResource",
     "GraphAPIComputeServiceResource",
-    "GraphAPIComputeServiceResourceCreateUpdateParameters",
+    "GraphAPIComputeServiceResourceCreateUpdateProperties",
     "GraphAPIComputeServiceResourceProperties",
     "GremlinDatabaseCreateUpdateParameters",
     "GremlinDatabaseGetPropertiesOptions",
@@ -448,7 +448,7 @@
     "ManagedServiceIdentityUserAssignedIdentity",
     "MaterializedViewsBuilderRegionalServiceResource",
     "MaterializedViewsBuilderServiceResource",
-    "MaterializedViewsBuilderServiceResourceCreateUpdateParameters",
+    "MaterializedViewsBuilderServiceResourceCreateUpdateProperties",
     "MaterializedViewsBuilderServiceResourceProperties",
     "Metric",
     "MetricAvailability",
@@ -567,7 +567,7 @@
     "SqlDatabaseResource",
     "SqlDedicatedGatewayRegionalServiceResource",
     "SqlDedicatedGatewayServiceResource",
-    "SqlDedicatedGatewayServiceResourceCreateUpdateParameters",
+    "SqlDedicatedGatewayServiceResourceCreateUpdateProperties",
     "SqlDedicatedGatewayServiceResourceProperties",
     "SqlRoleAssignmentCreateUpdateParameters",
     "SqlRoleAssignmentGetResults",

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/_models_py3.py

@@ -4392,10 +4392,10 @@ class ServiceResourceCreateUpdateProperties(_serialization.Model):
     """Properties in ServiceResourceCreateUpdateParameters.
 
     You probably want to use the sub-classes and not this class directly. Known sub-classes are:
-    DataTransferServiceResourceCreateUpdateParameters,
-    GraphAPIComputeServiceResourceCreateUpdateParameters,
-    MaterializedViewsBuilderServiceResourceCreateUpdateParameters,
-    SqlDedicatedGatewayServiceResourceCreateUpdateParameters
+    DataTransferServiceResourceCreateUpdateProperties,
+    GraphAPIComputeServiceResourceCreateUpdateProperties,
+    MaterializedViewsBuilderServiceResourceCreateUpdateProperties,
+    SqlDedicatedGatewayServiceResourceCreateUpdateProperties
 
     All required parameters must be populated in order to send to server.
 
@@ -4422,10 +4422,10 @@ class ServiceResourceCreateUpdateProperties(_serialization.Model):
 
     _subtype_map = {
         "service_type": {
-            "DataTransfer": "DataTransferServiceResourceCreateUpdateParameters",
-            "GraphAPICompute": "GraphAPIComputeServiceResourceCreateUpdateParameters",
-            "MaterializedViewsBuilder": "MaterializedViewsBuilderServiceResourceCreateUpdateParameters",
-            "SqlDedicatedGateway": "SqlDedicatedGatewayServiceResourceCreateUpdateParameters",
+            "DataTransfer": "DataTransferServiceResourceCreateUpdateProperties",
+            "GraphAPICompute": "GraphAPIComputeServiceResourceCreateUpdateProperties",
+            "MaterializedViewsBuilder": "MaterializedViewsBuilderServiceResourceCreateUpdateProperties",
+            "SqlDedicatedGateway": "SqlDedicatedGatewayServiceResourceCreateUpdateProperties",
         }
     }
 
@@ -4449,10 +4449,10 @@ def __init__(
         self.service_type: Optional[str] = None
 
 
-class DataTransferServiceResourceCreateUpdateParameters(
+class DataTransferServiceResourceCreateUpdateProperties(
     ServiceResourceCreateUpdateProperties
 ):  # pylint: disable=name-too-long
-    """Parameters for Create or Update request for DataTransferServiceResource.
+    """Properties for Create or Update request for DataTransferServiceResource.
 
     All required parameters must be populated in order to send to server.
 
@@ -4827,10 +4827,10 @@ def __init__(
         self.properties = properties
 
 
-class GraphAPIComputeServiceResourceCreateUpdateParameters(
+class GraphAPIComputeServiceResourceCreateUpdateProperties(
     ServiceResourceCreateUpdateProperties
 ):  # pylint: disable=name-too-long
-    """Parameters for Create or Update request for GraphAPIComputeServiceResource.
+    """Properties for Create or Update request for GraphAPIComputeServiceResource.
 
     All required parameters must be populated in order to send to server.
 
@@ -6328,10 +6328,10 @@ def __init__(
         self.properties = properties
 
 
-class MaterializedViewsBuilderServiceResourceCreateUpdateParameters(
+class MaterializedViewsBuilderServiceResourceCreateUpdateProperties(
     ServiceResourceCreateUpdateProperties
 ):  # pylint: disable=name-too-long
-    """Parameters for Create or Update request for MaterializedViewsBuilderServiceResource.
+    """Properties for Create or Update request for MaterializedViewsBuilderServiceResource.
 
     All required parameters must be populated in order to send to server.
 
@@ -10644,44 +10644,23 @@ def __init__(self, *, properties: Optional["_models.ServiceResourceProperties"]
 class ServiceResourceCreateUpdateParameters(_serialization.Model):
     """Parameters for Create or Update request for ServiceResource.
 
-    :ivar instance_size: Instance type for the service. Known values are: "Cosmos.D4s",
-     "Cosmos.D8s", and "Cosmos.D16s".
-    :vartype instance_size: str or ~azure.mgmt.cosmosdb.models.ServiceSize
-    :ivar instance_count: Instance count for the service.
-    :vartype instance_count: int
-    :ivar service_type: ServiceType for the service. Known values are: "SqlDedicatedGateway",
-     "DataTransfer", "GraphAPICompute", and "MaterializedViewsBuilder".
-    :vartype service_type: str or ~azure.mgmt.cosmosdb.models.ServiceType
+    :ivar properties: Properties in ServiceResourceCreateUpdateParameters.
+    :vartype properties: ~azure.mgmt.cosmosdb.models.ServiceResourceCreateUpdateProperties
     """
 
-    _validation = {
-        "instance_count": {"minimum": 0},
-    }
-
     _attribute_map = {
-        "instance_size": {"key": "properties.instanceSize", "type": "str"},
-        "instance_count": {"key": "properties.instanceCount", "type": "int"},
-        "service_type": {"key": "properties.serviceType", "type": "str"},
+        "properties": {"key": "properties", "type": "ServiceResourceCreateUpdateProperties"},
     }
 
     def __init__(
-        self,
-        *,
-        instance_size: Optional[Union[str, "_models.ServiceSize"]] = None,
-        instance_count: Optional[int] = None,
-        **kwargs: Any
+        self, *, properties: Optional["_models.ServiceResourceCreateUpdateProperties"] = None, **kwargs: Any
     ) -> None:
         """
-        :keyword instance_size: Instance type for the service. Known values are: "Cosmos.D4s",
-         "Cosmos.D8s", and "Cosmos.D16s".
-        :paramtype instance_size: str or ~azure.mgmt.cosmosdb.models.ServiceSize
-        :keyword instance_count: Instance count for the service.
-        :paramtype instance_count: int
+        :keyword properties: Properties in ServiceResourceCreateUpdateParameters.
+        :paramtype properties: ~azure.mgmt.cosmosdb.models.ServiceResourceCreateUpdateProperties
         """
         super().__init__(**kwargs)
-        self.instance_size = instance_size
-        self.instance_count = instance_count
-        self.service_type: Optional[str] = None
+        self.properties = properties
 
 
 class ServiceResourceListResult(_serialization.Model):
@@ -11386,10 +11365,10 @@ def __init__(
         self.properties = properties
 
 
-class SqlDedicatedGatewayServiceResourceCreateUpdateParameters(
+class SqlDedicatedGatewayServiceResourceCreateUpdateProperties(
     ServiceResourceCreateUpdateProperties
 ):  # pylint: disable=name-too-long
-    """Parameters for Create or Update request for SqlDedicatedGatewayServiceResource.
+    """Properties for Create or Update request for SqlDedicatedGatewayServiceResource.
 
     All required parameters must be populated in order to send to server.