Skip to content

Commit 2351e00

Browse files
author
SDKAuto
committed
CodeGen from PR 31409 in Azure/azure-rest-api-specs
Merge 1d3d6cd4b0493ebae7da7e89422f1d28767d2542 into 05f0a4d4c909c3da52cae35d889e02fb47946554
1 parent 5a54fe8 commit 2351e00

File tree

59 files changed

+3718
-1413
lines changed

Some content is hidden

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

59 files changed

+3718
-1413
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "cf5ad1932d00c7d15497705ad6b71171d3d68b1e",
2+
"commit": "a859f6abe7737c4d94e253b8793070171320709b",
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.19.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.19.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: 12 additions & 8 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,35 +18,40 @@
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
2625
attributes.
2726
2827
:param credential: Credential needed for the client to connect to Azure. Required.
2928
:type credential: ~azure.core.credentials.TokenCredential
30-
:param subscription_id: The ID of the target subscription. Required.
29+
:param api_key_name: The resource name of the API key. Required.
30+
:type api_key_name: str
31+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
3132
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
33+
:keyword api_version: Api Version. Default value is "2024-11-01-preview". Note that overriding
3334
this default value may result in unsupported behavior.
3435
:paramtype api_version: str
3536
"""
3637

37-
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")
38+
def __init__(self, credential: "TokenCredential", api_key_name: str, subscription_id: str, **kwargs: Any) -> None:
39+
api_version: str = kwargs.pop("api_version", "2024-11-01-preview")
4040

4141
if credential is None:
4242
raise ValueError("Parameter 'credential' must not be None.")
43+
if api_key_name is None:
44+
raise ValueError("Parameter 'api_key_name' must not be None.")
4345
if subscription_id is None:
4446
raise ValueError("Parameter 'subscription_id' must not be None.")
4547

4648
self.credential = credential
49+
self.api_key_name = api_key_name
4750
self.subscription_id = subscription_id
4851
self.api_version = api_version
4952
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
5053
kwargs.setdefault("sdk_moniker", "mgmt-nginx/{}".format(VERSION))
54+
self.polling_interval = kwargs.get("polling_interval", 30)
5155
self._configure(**kwargs)
5256

5357
def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +60,9 @@ def _configure(self, **kwargs: Any) -> None:
5660
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
5761
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
5862
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
59-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6063
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
6164
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
65+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6266
self.authentication_policy = kwargs.get("authentication_policy")
6367
if self.credential and not self.authentication_policy:
6468
self.authentication_policy = ARMChallengeAuthenticationPolicy(

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

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,23 @@
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
1720
from ._serialization import Deserializer, Serializer
18-
from .operations import CertificatesOperations, ConfigurationsOperations, DeploymentsOperations, Operations
21+
from .operations import (
22+
ApiKeysOperations,
23+
CertificatesOperations,
24+
ConfigurationsOperations,
25+
DeploymentsOperations,
26+
Operations,
27+
)
1928

2029
if TYPE_CHECKING:
2130
# pylint: disable=unused-import,ungrouped-imports
@@ -25,6 +34,8 @@
2534
class NginxManagementClient: # pylint: disable=client-accepts-api-version-keyword
2635
"""NginxManagementClient.
2736
37+
:ivar api_keys: ApiKeysOperations operations
38+
:vartype api_keys: azure.mgmt.nginx.operations.ApiKeysOperations
2839
:ivar certificates: CertificatesOperations operations
2940
:vartype certificates: azure.mgmt.nginx.operations.CertificatesOperations
3041
:ivar configurations: ConfigurationsOperations operations
@@ -35,11 +46,13 @@ class NginxManagementClient: # pylint: disable=client-accepts-api-version-keywo
3546
:vartype operations: azure.mgmt.nginx.operations.Operations
3647
:param credential: Credential needed for the client to connect to Azure. Required.
3748
:type credential: ~azure.core.credentials.TokenCredential
38-
:param subscription_id: The ID of the target subscription. Required.
49+
:param api_key_name: The resource name of the API key. Required.
50+
:type api_key_name: str
51+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
3952
:type subscription_id: str
4053
:param base_url: Service URL. Default value is "https://management.azure.com".
4154
:type base_url: str
42-
:keyword api_version: Api Version. Default value is "2024-01-01-preview". Note that overriding
55+
:keyword api_version: Api Version. Default value is "2024-11-01-preview". Note that overriding
4356
this default value may result in unsupported behavior.
4457
:paramtype api_version: str
4558
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -49,25 +62,45 @@ class NginxManagementClient: # pylint: disable=client-accepts-api-version-keywo
4962
def __init__(
5063
self,
5164
credential: "TokenCredential",
65+
api_key_name: str,
5266
subscription_id: str,
5367
base_url: str = "https://management.azure.com",
5468
**kwargs: Any
5569
) -> None:
5670
self._config = NginxManagementClientConfiguration(
57-
credential=credential, subscription_id=subscription_id, **kwargs
71+
credential=credential, api_key_name=api_key_name, subscription_id=subscription_id, **kwargs
5872
)
59-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
73+
_policies = kwargs.pop("policies", None)
74+
if _policies is None:
75+
_policies = [
76+
policies.RequestIdPolicy(**kwargs),
77+
self._config.headers_policy,
78+
self._config.user_agent_policy,
79+
self._config.proxy_policy,
80+
policies.ContentDecodePolicy(**kwargs),
81+
ARMAutoResourceProviderRegistrationPolicy(),
82+
self._config.redirect_policy,
83+
self._config.retry_policy,
84+
self._config.authentication_policy,
85+
self._config.custom_hook_policy,
86+
self._config.logging_policy,
87+
policies.DistributedTracingPolicy(**kwargs),
88+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
89+
self._config.http_logging_policy,
90+
]
91+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
6092

6193
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
6294
self._serialize = Serializer(client_models)
6395
self._deserialize = Deserializer(client_models)
6496
self._serialize.client_side_validation = False
97+
self.api_keys = ApiKeysOperations(self._client, self._config, self._serialize, self._deserialize)
6598
self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize)
6699
self.configurations = ConfigurationsOperations(self._client, self._config, self._serialize, self._deserialize)
67100
self.deployments = DeploymentsOperations(self._client, self._config, self._serialize, self._deserialize)
68101
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
69102

70-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
103+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
71104
"""Runs the network request through the client's chained policies.
72105
73106
>>> from azure.core.rest import HttpRequest
@@ -87,12 +120,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
87120

88121
request_copy = deepcopy(request)
89122
request_copy.url = self._client.format_url(request_copy.url)
90-
return self._client.send_request(request_copy, **kwargs)
123+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
91124

92125
def close(self) -> None:
93126
self._client.close()
94127

95-
def __enter__(self) -> "NginxManagementClient":
128+
def __enter__(self) -> Self:
96129
self._client.__enter__()
97130
return self
98131

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)