Skip to content

Commit c5f8d57

Browse files
author
SDKAuto
committed
CodeGen from PR 30392 in Azure/azure-rest-api-specs
Merge 1051a001400f4cdac5b0bb811b3f5d4d7422ab02 into e79d9ef3e065f2dcb6bd1db51e29c62a99dff5cb
1 parent 034f53f commit c5f8d57

File tree

94 files changed

+9027
-1626
lines changed

Some content is hidden

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

94 files changed

+9027
-1626
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": "7291328cf25ade50679ca53d1a11ccb0f4a2e56c",
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/confluent/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/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
9+
"autorest_command": "autorest specification/confluent/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/confluent/resource-manager/readme.md"
1111
}

sdk/confluent/azure-mgmt-confluent/azure/mgmt/confluent/_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 ConfluentManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
21+
class ConfluentManagementClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
2322
"""Configuration for ConfluentManagementClient.
2423
2524
Note that all parameters used to create this instance are saved as instance
@@ -29,14 +28,13 @@ class ConfluentManagementClientConfiguration(Configuration): # pylint: disable=
2928
:type credential: ~azure.core.credentials.TokenCredential
3029
:param subscription_id: Microsoft Azure subscription id. Required.
3130
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2024-02-13". Note that overriding this
31+
:keyword api_version: Api Version. Default value is "2024-07-01". Note that overriding this
3332
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(ConfluentManagementClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2024-02-13")
37+
api_version: str = kwargs.pop("api_version", "2024-07-01")
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-confluent/{}".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/confluent/azure-mgmt-confluent/azure/mgmt/confluent/_confluent_management_client.py

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,25 @@
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 ConfluentManagementClientConfiguration
1720
from ._serialization import Deserializer, Serializer
1821
from .operations import (
1922
AccessOperations,
23+
ClusterOperations,
24+
ConnectorOperations,
25+
EnvironmentOperations,
2026
MarketplaceAgreementsOperations,
2127
OrganizationOperations,
2228
OrganizationOperationsOperations,
29+
TopicsOperations,
2330
ValidationsOperations,
2431
)
2532

@@ -28,7 +35,7 @@
2835
from azure.core.credentials import TokenCredential
2936

3037

31-
class ConfluentManagementClient: # pylint: disable=client-accepts-api-version-keyword
38+
class ConfluentManagementClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
3239
"""ConfluentManagementClient.
3340
3441
:ivar marketplace_agreements: MarketplaceAgreementsOperations operations
@@ -43,13 +50,21 @@ class ConfluentManagementClient: # pylint: disable=client-accepts-api-version-k
4350
:vartype validations: azure.mgmt.confluent.operations.ValidationsOperations
4451
:ivar access: AccessOperations operations
4552
:vartype access: azure.mgmt.confluent.operations.AccessOperations
53+
:ivar environment: EnvironmentOperations operations
54+
:vartype environment: azure.mgmt.confluent.operations.EnvironmentOperations
55+
:ivar cluster: ClusterOperations operations
56+
:vartype cluster: azure.mgmt.confluent.operations.ClusterOperations
57+
:ivar connector: ConnectorOperations operations
58+
:vartype connector: azure.mgmt.confluent.operations.ConnectorOperations
59+
:ivar topics: TopicsOperations operations
60+
:vartype topics: azure.mgmt.confluent.operations.TopicsOperations
4661
:param credential: Credential needed for the client to connect to Azure. Required.
4762
:type credential: ~azure.core.credentials.TokenCredential
4863
:param subscription_id: Microsoft Azure subscription id. Required.
4964
:type subscription_id: str
5065
:param base_url: Service URL. Default value is "https://management.azure.com".
5166
:type base_url: str
52-
:keyword api_version: Api Version. Default value is "2024-02-13". Note that overriding this
67+
:keyword api_version: Api Version. Default value is "2024-07-01". Note that overriding this
5368
default value may result in unsupported behavior.
5469
:paramtype api_version: str
5570
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -66,7 +81,25 @@ def __init__(
6681
self._config = ConfluentManagementClientConfiguration(
6782
credential=credential, subscription_id=subscription_id, **kwargs
6883
)
69-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
84+
_policies = kwargs.pop("policies", None)
85+
if _policies is None:
86+
_policies = [
87+
policies.RequestIdPolicy(**kwargs),
88+
self._config.headers_policy,
89+
self._config.user_agent_policy,
90+
self._config.proxy_policy,
91+
policies.ContentDecodePolicy(**kwargs),
92+
ARMAutoResourceProviderRegistrationPolicy(),
93+
self._config.redirect_policy,
94+
self._config.retry_policy,
95+
self._config.authentication_policy,
96+
self._config.custom_hook_policy,
97+
self._config.logging_policy,
98+
policies.DistributedTracingPolicy(**kwargs),
99+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
100+
self._config.http_logging_policy,
101+
]
102+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
70103

71104
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
72105
self._serialize = Serializer(client_models)
@@ -81,8 +114,12 @@ def __init__(
81114
self.organization = OrganizationOperations(self._client, self._config, self._serialize, self._deserialize)
82115
self.validations = ValidationsOperations(self._client, self._config, self._serialize, self._deserialize)
83116
self.access = AccessOperations(self._client, self._config, self._serialize, self._deserialize)
117+
self.environment = EnvironmentOperations(self._client, self._config, self._serialize, self._deserialize)
118+
self.cluster = ClusterOperations(self._client, self._config, self._serialize, self._deserialize)
119+
self.connector = ConnectorOperations(self._client, self._config, self._serialize, self._deserialize)
120+
self.topics = TopicsOperations(self._client, self._config, self._serialize, self._deserialize)
84121

85-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
122+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
86123
"""Runs the network request through the client's chained policies.
87124
88125
>>> from azure.core.rest import HttpRequest
@@ -102,12 +139,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
102139

103140
request_copy = deepcopy(request)
104141
request_copy.url = self._client.format_url(request_copy.url)
105-
return self._client.send_request(request_copy, **kwargs)
142+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
106143

107144
def close(self) -> None:
108145
self._client.close()
109146

110-
def __enter__(self) -> "ConfluentManagementClient":
147+
def __enter__(self) -> Self:
111148
self._client.__enter__()
112149
return self
113150

0 commit comments

Comments
 (0)