Skip to content

Commit 95f8164

Browse files
author
SDKAuto
committed
CodeGen from PR 32988 in Azure/azure-rest-api-specs
Merge b6aa924a4a1ddca5b663b76cf80681a1d74d84af into 7d27c9d8f5ae6a97280e93e412fa76d9c6ddcb68
1 parent a957672 commit 95f8164

Some content is hidden

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

46 files changed

+2851
-2140
lines changed
Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,61 @@
11
# Microsoft Azure SDK for Python
22

33
This is the Microsoft Azure Portal Management Client Library.
4-
This package has been tested with Python 3.7+.
4+
This package has been tested with Python 3.8+.
55
For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all).
66

77
## _Disclaimer_
88

99
_Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For more information and questions, please refer to https://github.com/Azure/azure-sdk-for-python/issues/20691_
1010

11-
# Usage
11+
## Getting started
1212

13+
### Prerequisites
1314

14-
To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt)
15-
16-
For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/)
17-
Code samples for this package can be found at [Portal Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
18-
Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
15+
- Python 3.8+ is required to use this package.
16+
- [Azure subscription](https://azure.microsoft.com/free/)
1917

18+
### Install the package
2019

21-
# Provide Feedback
20+
```bash
21+
pip install azure-mgmt-portal
22+
pip install azure-identity
23+
```
2224

23-
If you encounter any bugs or have suggestions, please file an issue in the
24-
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
25-
section of the project.
25+
### Authentication
26+
27+
By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables.
28+
29+
- `AZURE_CLIENT_ID` for Azure client ID.
30+
- `AZURE_TENANT_ID` for Azure tenant ID.
31+
- `AZURE_CLIENT_SECRET` for Azure client secret.
32+
33+
In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`.
34+
35+
With above configuration, client can be authenticated by following code:
36+
37+
```python
38+
from azure.identity import DefaultAzureCredential
39+
from azure.mgmt.portal import Portal
40+
import os
2641

42+
sub_id = os.getenv("AZURE_SUBSCRIPTION_ID")
43+
client = Portal(credential=DefaultAzureCredential(), subscription_id=sub_id)
44+
```
2745

46+
## Examples
2847

48+
Code samples for this package can be found at:
49+
- [Search Portal Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
50+
- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
51+
52+
53+
## Troubleshooting
54+
55+
## Next steps
56+
57+
## Provide Feedback
58+
59+
If you encounter any bugs or have suggestions, please file an issue in the
60+
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
61+
section of the project.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "4522e1d3fb6dcb81bc63e3414d11dd7eaf08264b",
2+
"commit": "ec531d595d202515f77ae5c48d8950870094a0e7",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.2",
4+
"autorest": "3.10.2",
55
"use": [
6-
"@autorest/python@6.2.1",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.27.4",
7+
"@autorest/modelerfour@4.27.0"
88
],
9-
"autorest_command": "autorest specification/portal/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.2.1 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/portal/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.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/portal/resource-manager/readme.md"
1111
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,28 @@
55
# Code generated by Microsoft (R) AutoRest Code Generator.
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
8+
# pylint: disable=wrong-import-position
89

9-
from ._portal import Portal
10+
from typing import TYPE_CHECKING
11+
12+
if TYPE_CHECKING:
13+
from ._patch import * # pylint: disable=unused-wildcard-import
14+
15+
from ._portal import Portal # type: ignore
1016
from ._version import VERSION
1117

1218
__version__ = VERSION
1319

1420
try:
1521
from ._patch import __all__ as _patch_all
16-
from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import
22+
from ._patch import *
1723
except ImportError:
1824
_patch_all = []
1925
from ._patch import patch_sdk as _patch_sdk
2026

2127
__all__ = [
2228
"Portal",
2329
]
24-
__all__.extend([p for p in _patch_all if p not in __all__])
30+
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
2531

2632
_patch_sdk()

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

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

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

12-
from azure.core.configuration import Configuration
1311
from azure.core.pipeline import policies
1412
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1513

1614
from ._version import VERSION
1715

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2316
if TYPE_CHECKING:
24-
# pylint: disable=unused-import,ungrouped-imports
2517
from azure.core.credentials import TokenCredential
2618

2719

28-
class PortalConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
20+
class PortalConfiguration: # pylint: disable=too-many-instance-attributes
2921
"""Configuration for Portal.
3022
3123
Note that all parameters used to create this instance are saved as instance
3224
attributes.
3325
3426
:param credential: Credential needed for the client to connect to Azure. Required.
3527
:type credential: ~azure.core.credentials.TokenCredential
36-
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g.
37-
00000000-0000-0000-0000-000000000000). Required.
28+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
3829
:type subscription_id: str
39-
:keyword api_version: Api Version. Default value is "2020-09-01-preview". Note that overriding
30+
:keyword api_version: Api Version. Default value is "2025-04-01-preview". Note that overriding
4031
this default value may result in unsupported behavior.
4132
:paramtype api_version: str
4233
"""
4334

4435
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
45-
super(PortalConfiguration, self).__init__(**kwargs)
46-
api_version = kwargs.pop("api_version", "2020-09-01-preview") # type: Literal["2020-09-01-preview"]
36+
api_version: str = kwargs.pop("api_version", "2025-04-01-preview")
4737

4838
if credential is None:
4939
raise ValueError("Parameter 'credential' must not be None.")
@@ -55,20 +45,18 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
5545
self.api_version = api_version
5646
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
5747
kwargs.setdefault("sdk_moniker", "mgmt-portal/{}".format(VERSION))
48+
self.polling_interval = kwargs.get("polling_interval", 30)
5849
self._configure(**kwargs)
5950

60-
def _configure(
61-
self, **kwargs # type: Any
62-
):
63-
# type: (...) -> None
51+
def _configure(self, **kwargs: Any) -> None:
6452
self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
6553
self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
6654
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
6755
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
6856
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
69-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
7057
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
7158
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
59+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
7260
self.authentication_policy = kwargs.get("authentication_policy")
7361
if self.credential and not self.authentication_policy:
7462
self.authentication_policy = ARMChallengeAuthenticationPolicy(

sdk/portal/azure-mgmt-portal/azure/mgmt/portal/_portal.py

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
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

15-
from . import models
18+
from . import models as _models
1619
from ._configuration import PortalConfiguration
1720
from ._serialization import Deserializer, Serializer
1821
from .operations import (
@@ -23,31 +26,29 @@
2326
)
2427

2528
if TYPE_CHECKING:
26-
# pylint: disable=unused-import,ungrouped-imports
2729
from azure.core.credentials import TokenCredential
2830

2931

30-
class Portal: # pylint: disable=client-accepts-api-version-keyword
32+
class Portal:
3133
"""Allows creation and deletion of Azure Shared Dashboards.
3234
3335
:ivar operations: Operations operations
3436
:vartype operations: azure.mgmt.portal.operations.Operations
3537
:ivar dashboards: DashboardsOperations operations
3638
:vartype dashboards: azure.mgmt.portal.operations.DashboardsOperations
37-
:ivar tenant_configurations: TenantConfigurationsOperations operations
38-
:vartype tenant_configurations: azure.mgmt.portal.operations.TenantConfigurationsOperations
3939
:ivar list_tenant_configuration_violations: ListTenantConfigurationViolationsOperations
4040
operations
4141
:vartype list_tenant_configuration_violations:
4242
azure.mgmt.portal.operations.ListTenantConfigurationViolationsOperations
43+
:ivar tenant_configurations: TenantConfigurationsOperations operations
44+
:vartype tenant_configurations: azure.mgmt.portal.operations.TenantConfigurationsOperations
4345
:param credential: Credential needed for the client to connect to Azure. Required.
4446
:type credential: ~azure.core.credentials.TokenCredential
45-
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g.
46-
00000000-0000-0000-0000-000000000000). Required.
47+
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
4748
:type subscription_id: str
4849
:param base_url: Service URL. Default value is "https://management.azure.com".
4950
:type base_url: str
50-
:keyword api_version: Api Version. Default value is "2020-09-01-preview". Note that overriding
51+
:keyword api_version: Api Version. Default value is "2025-04-01-preview". Note that overriding
5152
this default value may result in unsupported behavior.
5253
:paramtype api_version: str
5354
"""
@@ -60,22 +61,40 @@ def __init__(
6061
**kwargs: Any
6162
) -> None:
6263
self._config = PortalConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
63-
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
64-
65-
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
64+
_policies = kwargs.pop("policies", None)
65+
if _policies is None:
66+
_policies = [
67+
policies.RequestIdPolicy(**kwargs),
68+
self._config.headers_policy,
69+
self._config.user_agent_policy,
70+
self._config.proxy_policy,
71+
policies.ContentDecodePolicy(**kwargs),
72+
ARMAutoResourceProviderRegistrationPolicy(),
73+
self._config.redirect_policy,
74+
self._config.retry_policy,
75+
self._config.authentication_policy,
76+
self._config.custom_hook_policy,
77+
self._config.logging_policy,
78+
policies.DistributedTracingPolicy(**kwargs),
79+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
80+
self._config.http_logging_policy,
81+
]
82+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
83+
84+
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
6685
self._serialize = Serializer(client_models)
6786
self._deserialize = Deserializer(client_models)
6887
self._serialize.client_side_validation = False
6988
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
7089
self.dashboards = DashboardsOperations(self._client, self._config, self._serialize, self._deserialize)
71-
self.tenant_configurations = TenantConfigurationsOperations(
90+
self.list_tenant_configuration_violations = ListTenantConfigurationViolationsOperations(
7291
self._client, self._config, self._serialize, self._deserialize
7392
)
74-
self.list_tenant_configuration_violations = ListTenantConfigurationViolationsOperations(
93+
self.tenant_configurations = TenantConfigurationsOperations(
7594
self._client, self._config, self._serialize, self._deserialize
7695
)
7796

78-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
97+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
7998
"""Runs the network request through the client's chained policies.
8099
81100
>>> from azure.core.rest import HttpRequest
@@ -95,17 +114,14 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
95114

96115
request_copy = deepcopy(request)
97116
request_copy.url = self._client.format_url(request_copy.url)
98-
return self._client.send_request(request_copy, **kwargs)
117+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
99118

100-
def close(self):
101-
# type: () -> None
119+
def close(self) -> None:
102120
self._client.close()
103121

104-
def __enter__(self):
105-
# type: () -> Portal
122+
def __enter__(self) -> Self:
106123
self._client.__enter__()
107124
return self
108125

109-
def __exit__(self, *exc_details):
110-
# type: (Any) -> None
126+
def __exit__(self, *exc_details: Any) -> None:
111127
self._client.__exit__(*exc_details)

0 commit comments

Comments
 (0)