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

Merge d7237f1a2eb1c013d9ebf202343d4bc4ac112ca0 into abad0096677005817d2c19df2364663e5583c8fc
azure-sdk · Jul 1, 2024 · b2b8848 · b2b8848
1 parent 7224718
commit b2b8848
Show file tree

Hide file tree

Showing 6 changed files with 171 additions and 24 deletions.
diff --git a/sdk/datafactory/azure-mgmt-datafactory/_meta.json b/sdk/datafactory/azure-mgmt-datafactory/_meta.json
@@ -1,11 +1,11 @@
 {
-  "commit": "92a02c9755fa3b2359df8dfc031babcddf6d91ba",
+  "commit": "09eed73e312271bf5d9ca32881997d0c192502ca",
   "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/datafactory/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/datafactory/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/[email protected].19 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
   "readme": "specification/datafactory/resource-manager/readme.md"
 }
diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_serialization.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_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

diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "8.0.0"
+VERSION = "1.0.0"
diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
@@ -153,6 +153,7 @@
 from ._models_py3 import ConcurObjectDataset
 from ._models_py3 import ConcurSource
 from ._models_py3 import ConnectionStateProperties
+from ._models_py3 import ContinuationSettingsReference
 from ._models_py3 import ControlActivity
 from ._models_py3 import CopyActivity
 from ._models_py3 import CopyActivityLogSettings
@@ -1071,6 +1072,7 @@
     "ConcurObjectDataset",
     "ConcurSource",
     "ConnectionStateProperties",
+    "ContinuationSettingsReference",
     "ControlActivity",
     "CopyActivity",
     "CopyActivityLogSettings",

diff --git a/...e-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py b/...e-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py
@@ -964,6 +964,7 @@ class SqlServerAuthenticationType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
 
     SQL = "SQL"
     WINDOWS = "Windows"
+    USER_ASSIGNED_MANAGED_IDENTITY = "UserAssignedManagedIdentity"
 
 
 class SqlWriteBehaviorEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta):