Skip to content

Commit a1304fe

Browse files
author
SDKAuto
committed
CodeGen from PR 17068 in Azure/azure-rest-api-specs
Merge c2b9d5b4e39e0f48db0b8315245d8e7013f10c64 into 306493f
1 parent 03abd5c commit a1304fe

Some content is hidden

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

41 files changed

+5514
-3871
lines changed

‎sdk/automanage/azure-mgmt-automanage/_meta.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"autorest": "3.7.2",
3+
"use": [
4+
"@autorest/python@5.12.0",
5+
"@autorest/modelerfour@4.19.3"
6+
],
7+
"commit": "26681018d6a81704fcd939692b951d75b26da44c",
8+
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9+
"autorest_command": "autorest specification/automanage/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
10+
"readme": "specification/automanage/resource-manager/readme.md"
11+
}

‎sdk/automanage/azure-mgmt-automanage/azure/mgmt/automanage/__init__.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['AutomanageClient']
1414

15-
try:
16-
from ._patch import patch_sdk
17-
patch_sdk()
18-
except ImportError:
19-
pass
15+
# `._patch.py` is used for handwritten extensions to the generated code
16+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
17+
from ._patch import patch_sdk
18+
patch_sdk()

‎sdk/automanage/azure-mgmt-automanage/azure/mgmt/automanage/_automanage_client.py‎

Lines changed: 66 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,69 +6,99 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from copy import deepcopy
10+
from typing import Any, Optional, TYPE_CHECKING
1011

12+
from azure.core.rest import HttpRequest, HttpResponse
1113
from azure.mgmt.core import ARMPipelineClient
1214
from msrest import Deserializer, Serializer
1315

16+
from . import models
17+
from ._configuration import AutomanageClientConfiguration
18+
from .operations import BestPracticesOperations, BestPracticesVersionsOperations, ConfigurationProfileAssignmentsOperations, ConfigurationProfilesOperations, ConfigurationProfilesVersionsOperations, Operations, ReportsOperations, ServicePrincipalsOperations
19+
1420
if TYPE_CHECKING:
1521
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
1822
from azure.core.credentials import TokenCredential
1923

20-
from ._configuration import AutomanageClientConfiguration
21-
from .operations import AccountsOperations
22-
from .operations import ConfigurationProfileAssignmentsOperations
23-
from .operations import ConfigurationProfilePreferencesOperations
24-
from .operations import Operations
25-
from . import models
26-
27-
28-
class AutomanageClient(object):
24+
class AutomanageClient:
2925
"""Automanage Client.
3026
31-
:ivar accounts: AccountsOperations operations
32-
:vartype accounts: automanage_client.operations.AccountsOperations
27+
:ivar best_practices: BestPracticesOperations operations
28+
:vartype best_practices: automanage_client.operations.BestPracticesOperations
29+
:ivar best_practices_versions: BestPracticesVersionsOperations operations
30+
:vartype best_practices_versions: automanage_client.operations.BestPracticesVersionsOperations
31+
:ivar configuration_profiles: ConfigurationProfilesOperations operations
32+
:vartype configuration_profiles: automanage_client.operations.ConfigurationProfilesOperations
33+
:ivar configuration_profiles_versions: ConfigurationProfilesVersionsOperations operations
34+
:vartype configuration_profiles_versions:
35+
automanage_client.operations.ConfigurationProfilesVersionsOperations
3336
:ivar configuration_profile_assignments: ConfigurationProfileAssignmentsOperations operations
34-
:vartype configuration_profile_assignments: automanage_client.operations.ConfigurationProfileAssignmentsOperations
35-
:ivar configuration_profile_preferences: ConfigurationProfilePreferencesOperations operations
36-
:vartype configuration_profile_preferences: automanage_client.operations.ConfigurationProfilePreferencesOperations
37+
:vartype configuration_profile_assignments:
38+
automanage_client.operations.ConfigurationProfileAssignmentsOperations
3739
:ivar operations: Operations operations
3840
:vartype operations: automanage_client.operations.Operations
41+
:ivar reports: ReportsOperations operations
42+
:vartype reports: automanage_client.operations.ReportsOperations
43+
:ivar service_principals: ServicePrincipalsOperations operations
44+
:vartype service_principals: automanage_client.operations.ServicePrincipalsOperations
3945
:param credential: Credential needed for the client to connect to Azure.
4046
:type credential: ~azure.core.credentials.TokenCredential
4147
:param subscription_id: The ID of the target subscription.
4248
:type subscription_id: str
43-
:param str base_url: Service URL
44-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
49+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
50+
:type base_url: str
4551
"""
4652

4753
def __init__(
4854
self,
49-
credential, # type: "TokenCredential"
50-
subscription_id, # type: str
51-
base_url=None, # type: Optional[str]
52-
**kwargs # type: Any
53-
):
54-
# type: (...) -> None
55-
if not base_url:
56-
base_url = 'https://management.azure.com'
57-
self._config = AutomanageClientConfiguration(credential, subscription_id, **kwargs)
55+
credential: "TokenCredential",
56+
subscription_id: str,
57+
base_url: str = "https://management.azure.com",
58+
**kwargs: Any
59+
) -> None:
60+
self._config = AutomanageClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5861
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
5962

6063
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6164
self._serialize = Serializer(client_models)
6265
self._deserialize = Deserializer(client_models)
66+
self._serialize.client_side_validation = False
67+
self.best_practices = BestPracticesOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.best_practices_versions = BestPracticesVersionsOperations(self._client, self._config, self._serialize, self._deserialize)
69+
self.configuration_profiles = ConfigurationProfilesOperations(self._client, self._config, self._serialize, self._deserialize)
70+
self.configuration_profiles_versions = ConfigurationProfilesVersionsOperations(self._client, self._config, self._serialize, self._deserialize)
71+
self.configuration_profile_assignments = ConfigurationProfileAssignmentsOperations(self._client, self._config, self._serialize, self._deserialize)
72+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
73+
self.reports = ReportsOperations(self._client, self._config, self._serialize, self._deserialize)
74+
self.service_principals = ServicePrincipalsOperations(self._client, self._config, self._serialize, self._deserialize)
75+
76+
77+
def _send_request(
78+
self,
79+
request, # type: HttpRequest
80+
**kwargs: Any
81+
) -> HttpResponse:
82+
"""Runs the network request through the client's chained policies.
83+
84+
>>> from azure.core.rest import HttpRequest
85+
>>> request = HttpRequest("GET", "https://www.example.org/")
86+
<HttpRequest [GET], url: 'https://www.example.org/'>
87+
>>> response = client._send_request(request)
88+
<HttpResponse: 200 OK>
89+
90+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
91+
92+
:param request: The network request you want to make. Required.
93+
:type request: ~azure.core.rest.HttpRequest
94+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
95+
:return: The response of your network call. Does not do error handling on your response.
96+
:rtype: ~azure.core.rest.HttpResponse
97+
"""
6398

64-
self.accounts = AccountsOperations(
65-
self._client, self._config, self._serialize, self._deserialize)
66-
self.configuration_profile_assignments = ConfigurationProfileAssignmentsOperations(
67-
self._client, self._config, self._serialize, self._deserialize)
68-
self.configuration_profile_preferences = ConfigurationProfilePreferencesOperations(
69-
self._client, self._config, self._serialize, self._deserialize)
70-
self.operations = Operations(
71-
self._client, self._config, self._serialize, self._deserialize)
99+
request_copy = deepcopy(request)
100+
request_copy.url = self._client.format_url(request_copy.url)
101+
return self._client.send_request(request_copy, **kwargs)
72102

73103
def close(self):
74104
# type: () -> None

‎sdk/automanage/azure-mgmt-automanage/azure/mgmt/automanage/_configuration.py‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from typing import Any, TYPE_CHECKING
1010

1111
from azure.core.configuration import Configuration
1212
from azure.core.pipeline import policies
13+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1314

1415
from ._version import VERSION
1516

1617
if TYPE_CHECKING:
1718
# pylint: disable=unused-import,ungrouped-imports
18-
from typing import Any
19-
2019
from azure.core.credentials import TokenCredential
2120

2221

@@ -34,22 +33,20 @@ class AutomanageClientConfiguration(Configuration):
3433

3534
def __init__(
3635
self,
37-
credential, # type: "TokenCredential"
38-
subscription_id, # type: str
39-
**kwargs # type: Any
40-
):
41-
# type: (...) -> None
36+
credential: "TokenCredential",
37+
subscription_id: str,
38+
**kwargs: Any
39+
) -> None:
40+
super(AutomanageClientConfiguration, self).__init__(**kwargs)
4241
if credential is None:
4342
raise ValueError("Parameter 'credential' must not be None.")
4443
if subscription_id is None:
4544
raise ValueError("Parameter 'subscription_id' must not be None.")
46-
super(AutomanageClientConfiguration, self).__init__(**kwargs)
4745

4846
self.credential = credential
4947
self.subscription_id = subscription_id
50-
self.api_version = "2020-06-30-preview"
51-
self.credential_scopes = ['https://management.azure.com/.default']
52-
self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
48+
self.api_version = "2021-04-30-preview"
49+
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5350
kwargs.setdefault('sdk_moniker', 'mgmt-automanage/{}'.format(VERSION))
5451
self._configure(**kwargs)
5552

@@ -62,9 +59,10 @@ def _configure(
6259
self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
6360
self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)
6461
self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs)
62+
self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs)
6563
self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs)
6664
self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
6765
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6866
self.authentication_policy = kwargs.get('authentication_policy')
6967
if self.credential and not self.authentication_policy:
70-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
68+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/automanage/azure-mgmt-automanage/azure/mgmt/automanage/_metadata.json‎

Lines changed: 72 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,109 @@
11
{
2-
"chosen_version": "2020-06-30-preview",
3-
"total_api_version_list": ["2020-06-30-preview"],
2+
"chosen_version": "2021-04-30-preview",
3+
"total_api_version_list": ["2021-04-30-preview"],
44
"client": {
55
"name": "AutomanageClient",
66
"filename": "_automanage_client",
7-
"description": "Automanage Client."
7+
"description": "Automanage Client.",
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
10+
"azure_arm": true,
11+
"has_lro_operations": false,
12+
"client_side_validation": false,
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"AutomanageClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14+
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"AutomanageClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
815
},
916
"global_parameters": {
10-
"sync_method": {
17+
"sync": {
1118
"credential": {
12-
"method_signature": "credential, # type: \"TokenCredential\"",
19+
"signature": "credential, # type: \"TokenCredential\"",
1320
"description": "Credential needed for the client to connect to Azure.",
1421
"docstring_type": "~azure.core.credentials.TokenCredential",
1522
"required": true
1623
},
1724
"subscription_id": {
18-
"method_signature": "subscription_id, # type: str",
25+
"signature": "subscription_id, # type: str",
1926
"description": "The ID of the target subscription.",
2027
"docstring_type": "str",
2128
"required": true
2229
}
2330
},
24-
"async_method": {
31+
"async": {
2532
"credential": {
26-
"method_signature": "credential, # type: \"AsyncTokenCredential\"",
33+
"signature": "credential: \"AsyncTokenCredential\",",
2734
"description": "Credential needed for the client to connect to Azure.",
2835
"docstring_type": "~azure.core.credentials_async.AsyncTokenCredential",
2936
"required": true
3037
},
3138
"subscription_id": {
32-
"method_signature": "subscription_id, # type: str",
39+
"signature": "subscription_id: str,",
3340
"description": "The ID of the target subscription.",
3441
"docstring_type": "str",
3542
"required": true
3643
}
3744
},
3845
"constant": {
3946
},
40-
"call": "credential, subscription_id"
47+
"call": "credential, subscription_id",
48+
"service_client_specific": {
49+
"sync": {
50+
"api_version": {
51+
"signature": "api_version=None, # type: Optional[str]",
52+
"description": "API version to use if no profile is provided, or if missing in profile.",
53+
"docstring_type": "str",
54+
"required": false
55+
},
56+
"base_url": {
57+
"signature": "base_url=\"https://management.azure.com\", # type: str",
58+
"description": "Service URL",
59+
"docstring_type": "str",
60+
"required": false
61+
},
62+
"profile": {
63+
"signature": "profile=KnownProfiles.default, # type: KnownProfiles",
64+
"description": "A profile definition, from KnownProfiles to dict.",
65+
"docstring_type": "azure.profiles.KnownProfiles",
66+
"required": false
67+
}
68+
},
69+
"async": {
70+
"api_version": {
71+
"signature": "api_version: Optional[str] = None,",
72+
"description": "API version to use if no profile is provided, or if missing in profile.",
73+
"docstring_type": "str",
74+
"required": false
75+
},
76+
"base_url": {
77+
"signature": "base_url: str = \"https://management.azure.com\",",
78+
"description": "Service URL",
79+
"docstring_type": "str",
80+
"required": false
81+
},
82+
"profile": {
83+
"signature": "profile: KnownProfiles = KnownProfiles.default,",
84+
"description": "A profile definition, from KnownProfiles to dict.",
85+
"docstring_type": "azure.profiles.KnownProfiles",
86+
"required": false
87+
}
88+
}
89+
}
4190
},
4291
"config": {
4392
"credential": true,
44-
"credential_scopes": ["https://management.azure.com/.default"]
93+
"credential_scopes": ["https://management.azure.com/.default"],
94+
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
95+
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
96+
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
97+
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
4598
},
4699
"operation_groups": {
47-
"accounts": "AccountsOperations",
100+
"best_practices": "BestPracticesOperations",
101+
"best_practices_versions": "BestPracticesVersionsOperations",
102+
"configuration_profiles": "ConfigurationProfilesOperations",
103+
"configuration_profiles_versions": "ConfigurationProfilesVersionsOperations",
48104
"configuration_profile_assignments": "ConfigurationProfileAssignmentsOperations",
49-
"configuration_profile_preferences": "ConfigurationProfilePreferencesOperations",
50-
"operations": "Operations"
51-
},
52-
"operation_mixins": {
53-
},
54-
"sync_imports": "None",
55-
"async_imports": "None"
105+
"operations": "Operations",
106+
"reports": "ReportsOperations",
107+
"service_principals": "ServicePrincipalsOperations"
108+
}
56109
}

0 commit comments

Comments
 (0)