[AutoRelease] t2-nginx-2025-02-04-84884(can only be merged by SDK owner) (Azure#39547)

* code and test

* update testcases

---------

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

Author: azure-sdk

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

@@ -1,5 +1,45 @@
 # Release History
 
+## 3.1.0b2 (2025-02-23)
+
+### Features Added
+
+  - Client `NginxManagementClient` added operation group `api_keys`
+  - Model `AnalysisResultData` added property `diagnostics`
+  - Model `NginxDeploymentProperties` added property `nginx_app_protect`
+  - Model `NginxDeploymentProperties` added property `dataplane_api_endpoint`
+  - Model `NginxDeploymentUpdateProperties` added property `network_profile`
+  - Model `NginxDeploymentUpdateProperties` added property `nginx_app_protect`
+  - Added enum `ActivationState`
+  - Added model `DiagnosticItem`
+  - Added model `ErrorResponse`
+  - Added enum `Level`
+  - Added model `NginxConfigurationProtectedFileRequest`
+  - Added model `NginxConfigurationProtectedFileResponse`
+  - Added model `NginxConfigurationRequest`
+  - Added model `NginxConfigurationRequestProperties`
+  - Added model `NginxConfigurationResponse`
+  - Added model `NginxConfigurationResponseProperties`
+  - Added model `NginxDeploymentApiKeyListResponse`
+  - Added model `NginxDeploymentApiKeyRequest`
+  - Added model `NginxDeploymentApiKeyRequestProperties`
+  - Added model `NginxDeploymentApiKeyResponse`
+  - Added model `NginxDeploymentApiKeyResponseProperties`
+  - Added model `NginxDeploymentPropertiesNginxAppProtect`
+  - Added model `NginxDeploymentUpdatePropertiesNginxAppProtect`
+  - Added model `WebApplicationFirewallComponentVersions`
+  - Added model `WebApplicationFirewallPackage`
+  - Added model `WebApplicationFirewallSettings`
+  - Added model `WebApplicationFirewallStatus`
+  - Added operation group `ApiKeysOperations`
+
+### Breaking Changes
+
+  - Model `NginxDeploymentProperties` deleted or renamed its instance variable `managed_resource_group`
+  - Deleted or renamed model `NginxConfiguration`
+  - Deleted or renamed model `NginxConfigurationProperties`
+  - Deleted or renamed model `ResourceProviderDefaultErrorResponse`
+
 ## 3.1.0b1 (2024-03-18)
 
 ### Features Added

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

@@ -1,11 +1,11 @@
 {
-  "commit": "cf5ad1932d00c7d15497705ad6b71171d3d68b1e",
+  "commit": "198ffdb2b788b49be283a388ad9735b0cfad1be1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.7",
+  "autorest": "3.10.2",
   "use": [
-    "@autorest/python@6.7.1",
-    "@autorest/modelerfour@4.26.2"
+    "@autorest/python@6.27.4",
+    "@autorest/modelerfour@4.27.0"
   ],
-  "autorest_command": "autorest specification/nginx/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-01-01-preview --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
+  "autorest_command": "autorest specification/nginx/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
   "readme": "specification/nginx/resource-manager/readme.md"
 }

sdk/nginx/azure-mgmt-nginx/assets.json

@@ -5,22 +5,28 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._nginx_management_client import NginxManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._nginx_management_client import NginxManagementClient  # type: ignore
 from ._version import VERSION
 
 __version__ = VERSION
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "NginxManagementClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()

sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/__init__.py

@@ -8,35 +8,32 @@
 
 from typing import Any, TYPE_CHECKING
 
-from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
 from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
 
 from ._version import VERSION
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class NginxManagementClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
+class NginxManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for NginxManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
     :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 "2024-01-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2024-11-01-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(NginxManagementClientConfiguration, self).__init__(**kwargs)
-        api_version: str = kwargs.pop("api_version", "2024-01-01-preview")
+        api_version: str = kwargs.pop("api_version", "2024-11-01-preview")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
@@ -48,6 +45,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
         self.api_version = api_version
         self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
         kwargs.setdefault("sdk_moniker", "mgmt-nginx/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)
 
     def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +54,9 @@ def _configure(self, **kwargs: Any) -> None:
         self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
         self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
         self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
         self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.authentication_policy = kwargs.get("authentication_policy")
         if self.credential and not self.authentication_policy:
             self.authentication_policy = ARMChallengeAuthenticationPolicy(

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

@@ -8,23 +8,33 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
+from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
 from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
 
 from . import models as _models
 from ._configuration import NginxManagementClientConfiguration
 from ._serialization import Deserializer, Serializer
-from .operations import CertificatesOperations, ConfigurationsOperations, DeploymentsOperations, Operations
+from .operations import (
+    ApiKeysOperations,
+    CertificatesOperations,
+    ConfigurationsOperations,
+    DeploymentsOperations,
+    Operations,
+)
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class NginxManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class NginxManagementClient:
     """NginxManagementClient.
 
+    :ivar api_keys: ApiKeysOperations operations
+    :vartype api_keys: azure.mgmt.nginx.operations.ApiKeysOperations
     :ivar certificates: CertificatesOperations operations
     :vartype certificates: azure.mgmt.nginx.operations.CertificatesOperations
     :ivar configurations: ConfigurationsOperations operations
@@ -35,11 +45,11 @@ class NginxManagementClient:  # pylint: disable=client-accepts-api-version-keywo
     :vartype operations: azure.mgmt.nginx.operations.Operations
     :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 "2024-01-01-preview". Note that overriding
+    :keyword api_version: Api Version. Default value is "2024-11-01-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
@@ -56,18 +66,37 @@ def __init__(
         self._config = NginxManagementClientConfiguration(
             credential=credential, subscription_id=subscription_id, **kwargs
         )
-        self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        _policies = kwargs.pop("policies", None)
+        if _policies is None:
+            _policies = [
+                policies.RequestIdPolicy(**kwargs),
+                self._config.headers_policy,
+                self._config.user_agent_policy,
+                self._config.proxy_policy,
+                policies.ContentDecodePolicy(**kwargs),
+                ARMAutoResourceProviderRegistrationPolicy(),
+                self._config.redirect_policy,
+                self._config.retry_policy,
+                self._config.authentication_policy,
+                self._config.custom_hook_policy,
+                self._config.logging_policy,
+                policies.DistributedTracingPolicy(**kwargs),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+                self._config.http_logging_policy,
+            ]
+        self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **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.api_keys = ApiKeysOperations(self._client, self._config, self._serialize, self._deserialize)
         self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize)
         self.configurations = ConfigurationsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.deployments = DeploymentsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
 
-    def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
+    def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest
@@ -87,12 +116,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
 
         request_copy = deepcopy(request)
         request_copy.url = self._client.format_url(request_copy.url)
-        return self._client.send_request(request_copy, **kwargs)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "NginxManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 

sdk/nginx/azure-mgmt-nginx/azure/mgmt/nginx/_nginx_management_client.py

@@ -25,6 +25,7 @@
 #
 # --------------------------------------------------------------------------
 
+
 # This file is used for handwritten extensions to the generated code. Example:
 # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
 def patch_sdk():