Skip to content

Commit 26d9a93

Browse files
author
SDKAuto
committed
CodeGen from PR 29773 in Azure/azure-rest-api-specs
Merge 2d98f96c30b7bfa8e98b49634d5d265645e56baf into 90fcec87cf1892a1aae071e7c50317398f45e92c
1 parent 2bf9936 commit 26d9a93

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1607
-1136
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ client = NginxManagementClient(credential=DefaultAzureCredential(), subscription
4848
Code samples for this package can be found at:
4949
- [Search Nginx Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
5050
- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
51-
- [Other Nginx Management doc](https://github.com/nginxinc/nginxaas-for-azure-snippets/tree/main/sdk/python)
51+
- [Other Nginx Management doc](https://github.com/nginxinc/nginxaas-for-azure-snippets/tree/main/snippets/sdk/python)
5252

5353

5454
## Troubleshooting
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "cf5ad1932d00c7d15497705ad6b71171d3d68b1e",
2+
"commit": "7d7195c0fd37c4e011addca6ad3e789fbe8e7454",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.7",
4+
"autorest": "3.10.2",
55
"use": [
6-
"@autorest/python@6.7.1",
7-
"@autorest/modelerfour@4.26.2"
6+
"@autorest/python@6.17.0",
7+
"@autorest/modelerfour@4.27.0"
88
],
9-
"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",
9+
"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/s/azure-sdk-for-python/sdk --use=@autorest/python@6.17.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/nginx/resource-manager/readme.md"
1111
}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from typing import Any, TYPE_CHECKING
1010

11-
from azure.core.configuration import Configuration
1211
from azure.core.pipeline import policies
1312
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1413

@@ -19,7 +18,7 @@
1918
from azure.core.credentials import TokenCredential
2019

2120

22-
class NginxManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
21+
class NginxManagementClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
2322
"""Configuration for NginxManagementClient.
2423
2524
Note that all parameters used to create this instance are saved as instance
@@ -29,14 +28,13 @@ class NginxManagementClientConfiguration(Configuration): # pylint: disable=too-
2928
:type credential: ~azure.core.credentials.TokenCredential
3029
:param subscription_id: The ID of the target subscription. Required.
3130
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
31+
:keyword api_version: Api Version. Default value is "2024-06-01-preview". Note that overriding
3332
this default value may result in unsupported behavior.
3433
:paramtype api_version: str
3534
"""
3635

3736
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
38-
super(NginxManagementClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2024-01-01-preview")
37+
api_version: str = kwargs.pop("api_version", "2024-06-01-preview")
4038

4139
if credential is None:
4240
raise ValueError("Parameter 'credential' must not be None.")
@@ -48,6 +46,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
4846
self.api_version = api_version
4947
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
5048
kwargs.setdefault("sdk_moniker", "mgmt-nginx/{}".format(VERSION))
49+
self.polling_interval = kwargs.get("polling_interval", 30)
5150
self._configure(**kwargs)
5251

5352
def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None:
5655
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
5756
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
5857
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
59-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6058
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
6159
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
60+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6261
self.authentication_policy = kwargs.get("authentication_policy")
6362
if self.credential and not self.authentication_policy:
6463
self.authentication_policy = ARMChallengeAuthenticationPolicy(

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

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88

99
from copy import deepcopy
1010
from typing import Any, TYPE_CHECKING
11+
from typing_extensions import Self
1112

13+
from azure.core.pipeline import policies
1214
from azure.core.rest import HttpRequest, HttpResponse
1315
from azure.mgmt.core import ARMPipelineClient
16+
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
1417

1518
from . import models as _models
1619
from ._configuration import NginxManagementClientConfiguration
@@ -39,7 +42,7 @@ class NginxManagementClient: # pylint: disable=client-accepts-api-version-keywo
3942
:type subscription_id: str
4043
:param base_url: Service URL. Default value is "https://management.azure.com".
4144
:type base_url: str
42-
:keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
45+
:keyword api_version: Api Version. Default value is "2024-06-01-preview". Note that overriding
4346
this default value may result in unsupported behavior.
4447
:paramtype api_version: str
4548
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -56,7 +59,25 @@ def __init__(
5659
self._config = NginxManagementClientConfiguration(
5760
credential=credential, subscription_id=subscription_id, **kwargs
5861
)
59-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
62+
_policies = kwargs.pop("policies", None)
63+
if _policies is None:
64+
_policies = [
65+
policies.RequestIdPolicy(**kwargs),
66+
self._config.headers_policy,
67+
self._config.user_agent_policy,
68+
self._config.proxy_policy,
69+
policies.ContentDecodePolicy(**kwargs),
70+
ARMAutoResourceProviderRegistrationPolicy(),
71+
self._config.redirect_policy,
72+
self._config.retry_policy,
73+
self._config.authentication_policy,
74+
self._config.custom_hook_policy,
75+
self._config.logging_policy,
76+
policies.DistributedTracingPolicy(**kwargs),
77+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
78+
self._config.http_logging_policy,
79+
]
80+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
6081

6182
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
6283
self._serialize = Serializer(client_models)
@@ -67,7 +88,7 @@ def __init__(
6788
self.deployments = DeploymentsOperations(self._client, self._config, self._serialize, self._deserialize)
6889
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
6990

70-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
91+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
7192
"""Runs the network request through the client's chained policies.
7293
7394
>>> from azure.core.rest import HttpRequest
@@ -87,12 +108,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
87108

88109
request_copy = deepcopy(request)
89110
request_copy.url = self._client.format_url(request_copy.url)
90-
return self._client.send_request(request_copy, **kwargs)
111+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
91112

92113
def close(self) -> None:
93114
self._client.close()
94115

95-
def __enter__(self) -> "NginxManagementClient":
116+
def __enter__(self) -> Self:
96117
self._client.__enter__()
97118
return self
98119

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#
2626
# --------------------------------------------------------------------------
2727

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

0 commit comments

Comments
 (0)