Skip to content

Commit a8c0f18

Browse files
author
SDKAuto
committed
CodeGen from PR 33888 in Azure/azure-rest-api-specs
Merge 1d15f598c347222509674dc332360b8c54e028ba into 8ab23bfef36dbedfe554f215d0771a4ef7d56d11
1 parent 8b9851a commit a8c0f18

File tree

87 files changed

+3381
-1234
lines changed

Some content is hidden

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

87 files changed

+3381
-1234
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Microsoft Azure SDK for Python
22

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

77
## _Disclaimer_
@@ -12,7 +12,7 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For
1212

1313
### Prerequisites
1414

15-
- Python 3.8+ is required to use this package.
15+
- Python 3.9+ is required to use this package.
1616
- [Azure subscription](https://azure.microsoft.com/free/)
1717

1818
### Install the package
@@ -24,7 +24,7 @@ pip install azure-identity
2424

2525
### Authentication
2626

27-
By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables.
27+
By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configuration of the following environment variables.
2828

2929
- `AZURE_CLIENT_ID` for Azure client ID.
3030
- `AZURE_TENANT_ID` for Azure tenant ID.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "09c37754dac91874ff689ed1e60effb4268c8669",
2+
"commit": "451d3a928d2b680e6ee9ae79311cb85e153d3bfc",
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.13.7",
6+
"@autorest/python@6.33.0",
77
"@autorest/[email protected]"
88
],
9-
"autorest_command": "autorest specification/sphere/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.13.7 --use=@autorest/[email protected] --version=3.9.7 --version-tolerant=False",
9+
"autorest_command": "autorest specification/sphere/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.33.0 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/sphere/resource-manager/readme.md"
1111
}

sdk/sphere/azure-mgmt-sphere/azure/mgmt/sphere/__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 ._azure_sphere_mgmt_client import AzureSphereMgmtClient
10+
from typing import TYPE_CHECKING
11+
12+
if TYPE_CHECKING:
13+
from ._patch import * # pylint: disable=unused-wildcard-import
14+
15+
from ._azure_sphere_mgmt_client import AzureSphereMgmtClient # 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 * # 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
"AzureSphereMgmtClient",
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/sphere/azure-mgmt-sphere/azure/mgmt/sphere/_azure_sphere_mgmt_client.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
# --------------------------------------------------------------------------
88

99
from copy import deepcopy
10-
from typing import Any, TYPE_CHECKING
10+
from typing import Any, Optional, TYPE_CHECKING, cast
11+
from typing_extensions import Self
1112

1213
from azure.core.pipeline import policies
1314
from azure.core.rest import HttpRequest, HttpResponse
15+
from azure.core.settings import settings
1416
from azure.mgmt.core import ARMPipelineClient
1517
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
18+
from azure.mgmt.core.tools import get_arm_endpoints
1619

1720
from . import models as _models
1821
from ._configuration import AzureSphereMgmtClientConfiguration
@@ -29,11 +32,10 @@
2932
)
3033

3134
if TYPE_CHECKING:
32-
# pylint: disable=unused-import,ungrouped-imports
3335
from azure.core.credentials import TokenCredential
3436

3537

36-
class AzureSphereMgmtClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
38+
class AzureSphereMgmtClient: # pylint: disable=too-many-instance-attributes
3739
"""Azure Sphere resource management API.
3840
3941
:ivar operations: Operations operations
@@ -56,7 +58,7 @@ class AzureSphereMgmtClient: # pylint: disable=client-accepts-api-version-keywo
5658
:type credential: ~azure.core.credentials.TokenCredential
5759
:param subscription_id: The ID of the target subscription. Required.
5860
:type subscription_id: str
59-
:param base_url: Service URL. Default value is "https://management.azure.com".
61+
:param base_url: Service URL. Default value is None.
6062
:type base_url: str
6163
:keyword api_version: Api Version. Default value is "2024-04-01". Note that overriding this
6264
default value may result in unsupported behavior.
@@ -66,15 +68,17 @@ class AzureSphereMgmtClient: # pylint: disable=client-accepts-api-version-keywo
6668
"""
6769

6870
def __init__(
69-
self,
70-
credential: "TokenCredential",
71-
subscription_id: str,
72-
base_url: str = "https://management.azure.com",
73-
**kwargs: Any
71+
self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any
7472
) -> None:
73+
_cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore
74+
_endpoints = get_arm_endpoints(_cloud)
75+
if not base_url:
76+
base_url = _endpoints["resource_manager"]
77+
credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])
7578
self._config = AzureSphereMgmtClientConfiguration(
76-
credential=credential, subscription_id=subscription_id, **kwargs
79+
credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **kwargs
7780
)
81+
7882
_policies = kwargs.pop("policies", None)
7983
if _policies is None:
8084
_policies = [
@@ -93,7 +97,7 @@ def __init__(
9397
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
9498
self._config.http_logging_policy,
9599
]
96-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
100+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs)
97101

98102
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
99103
self._serialize = Serializer(client_models)
@@ -133,7 +137,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
133137
def close(self) -> None:
134138
self._client.close()
135139

136-
def __enter__(self) -> "AzureSphereMgmtClient":
140+
def __enter__(self) -> Self:
137141
self._client.__enter__()
138142
return self
139143

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
from ._version import VERSION
1515

1616
if TYPE_CHECKING:
17-
# pylint: disable=unused-import,ungrouped-imports
1817
from azure.core.credentials import TokenCredential
1918

2019

21-
class AzureSphereMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
20+
class AzureSphereMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes
2221
"""Configuration for AzureSphereMgmtClient.
2322
2423
Note that all parameters used to create this instance are saved as instance

0 commit comments

Comments
 (0)