[AutoRelease] t2-rdbms-2023-12-06-86582(can only be merged by SDK owner) (#33413)

azure-sdk · ChenxiJiang333 · web-flow · commit a3c58224430a · 2023-12-18T10:58:45.000+08:00
* code and test

* update version

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

---------

Co-authored-by: azure-sdk &lt;PythonSdkPipelines&gt;
Co-authored-by: ChenxiJiang333 &lt;v-chenjiang@microsoft.com&gt;
Co-authored-by: ChenxiJiang333 &lt;119990644+ChenxiJiang333@users.noreply.github.com&gt;
diff --git a/sdk/rdbms/azure-mgmt-rdbms/CHANGELOG.md b/sdk/rdbms/azure-mgmt-rdbms/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 10.2.0b13 (2023-12-18)
+
+### Other Changes
+
+  - Fix for ServerThreatProtectionSettingsOperations.begin_create_or_update
+
 ## 10.2.0b12 (2023-11-20)
 
 ### Features Added
diff --git a/sdk/rdbms/azure-mgmt-rdbms/_meta.json b/sdk/rdbms/azure-mgmt-rdbms/_meta.json
@@ -1,5 +1,5 @@
 {
-  "commit": "11bbc2b1df2e915a2227a6a1a48a27b9e67c3311",
+  "commit": "d402f685809d6d08be9c0b45065cadd7d78ab870",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.9.7",
   "use": [
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/_version.py
@@ -5,4 +5,4 @@
 # license information.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0b12"
+VERSION = "10.2.0b13"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0b12"
+VERSION = "10.2.0b13"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0b12"
+VERSION = "10.2.0b13"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql_flexibleservers/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/mysql_flexibleservers/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0b12"
+VERSION = "10.2.0b13"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0b12"
+VERSION = "10.2.0b13"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "10.2.0b12"
+VERSION = "10.2.0b13"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/aio/operations/_server_threat_protection_settings_operations.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/aio/operations/_server_threat_protection_settings_operations.py
@@ -235,7 +235,7 @@ async def _create_or_update_initial(
         threat_protection_name: Union[str, _models.ThreatProtectionName],
         parameters: Union[_models.ServerThreatProtectionSettingsModel, IO],
         **kwargs: Any
-    ) -> _models.ServerThreatProtectionSettingsModel:
+    ) -> Optional[_models.ServerThreatProtectionSettingsModel]:
         error_map = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
@@ -249,7 +249,7 @@ async def _create_or_update_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.ServerThreatProtectionSettingsModel] = kwargs.pop("cls", None)
+        cls: ClsType[Optional[_models.ServerThreatProtectionSettingsModel]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -282,21 +282,26 @@ async def _create_or_update_initial(
 
         response = pipeline_response.http_response
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = None
+        response_headers = {}
         if response.status_code == 200:
             deserialized = self._deserialize("ServerThreatProtectionSettingsModel", pipeline_response)
 
         if response.status_code == 201:
             deserialized = self._deserialize("ServerThreatProtectionSettingsModel", pipeline_response)
 
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
         if cls:
-            return cls(pipeline_response, deserialized, {})  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)
 
-        return deserialized  # type: ignore
+        return deserialized
 
     _create_or_update_initial.metadata = {
         "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/advancedThreatProtectionSettings/{threatProtectionName}"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/operations/_server_threat_protection_settings_operations.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/operations/_server_threat_protection_settings_operations.py
@@ -350,7 +350,7 @@ def _create_or_update_initial(
         threat_protection_name: Union[str, _models.ThreatProtectionName],
         parameters: Union[_models.ServerThreatProtectionSettingsModel, IO],
         **kwargs: Any
-    ) -> _models.ServerThreatProtectionSettingsModel:
+    ) -> Optional[_models.ServerThreatProtectionSettingsModel]:
         error_map = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
@@ -364,7 +364,7 @@ def _create_or_update_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.ServerThreatProtectionSettingsModel] = kwargs.pop("cls", None)
+        cls: ClsType[Optional[_models.ServerThreatProtectionSettingsModel]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -397,21 +397,26 @@ def _create_or_update_initial(
 
         response = pipeline_response.http_response
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = None
+        response_headers = {}
         if response.status_code == 200:
             deserialized = self._deserialize("ServerThreatProtectionSettingsModel", pipeline_response)
 
         if response.status_code == 201:
             deserialized = self._deserialize("ServerThreatProtectionSettingsModel", pipeline_response)
 
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
         if cls:
-            return cls(pipeline_response, deserialized, {})  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)
 
-        return deserialized  # type: ignore
+        return deserialized
 
     _create_or_update_initial.metadata = {
         "url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforPostgreSQL/flexibleServers/{serverName}/advancedThreatProtectionSettings/{threatProtectionName}"
diff --git a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_threat_protection_settings_create_or_update.py b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_threat_protection_settings_create_or_update.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+from azure.mgmt.rdbms.postgresql_flexibleservers import PostgreSQLManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-rdbms
+# USAGE
+    python server_threat_protection_settings_create_or_update.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = PostgreSQLManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="00000000-1111-2222-3333-444444444444",
+    )
+
+    response = client.server_threat_protection_settings.begin_create_or_update(
+        resource_group_name="threatprotection-4799",
+        server_name="threatprotection-6440",
+        threat_protection_name="Default",
+        parameters={"properties": {"state": "Enabled"}},
+    ).result()
+    print(response)
+
+
+# x-ms-original-file: specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-06-01-preview/examples/ServerThreatProtectionSettingsCreateOrUpdate.json
+if __name__ == "__main__":
+    main()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "commit": "11bbc2b1df2e915a2227a6a1a48a27b9e67c3311",`
	`2`	`+ "commit": "d402f685809d6d08be9c0b45065cadd7d78ab870",`
`3`	`3`	`"repository_url": "https://github.com/Azure/azure-rest-api-specs",`
`4`	`4`	`"autorest": "3.9.7",`
`5`	`5`	`"use": [`