Skip to content

Commit a510d66

Browse files
author
SDKAuto
committed
CodeGen from PR 34242 in Azure/azure-rest-api-specs
Merge 0858faa965d694793386c33b5ded46b3f657b1df into 31869e6038974dbd20dd5028feaec2c402835cad
1 parent ebf29c4 commit a510d66

37 files changed

+1698
-1003
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Release History
22

3+
## 1.0.0 (2025-04-27)
4+
5+
### Features Added
6+
7+
- Model `LiftrBaseOfferDetails` added property `renewal_mode`
8+
- Model `LiftrBaseOfferDetails` added property `end_date`
9+
- Model `OrganizationResourceUpdateProperties` added property `marketplace`
10+
- Added model `LiftrBaseMarketplaceDetailsUpdate`
11+
- Added model `LiftrBaseOfferDetailsUpdate`
12+
- Added enum `RenewalMode`
13+
- Method `OrganizationsOperations.begin_create_or_update` has a new overload `def begin_create_or_update(self: None, resource_group_name: str, organization_name: str, resource: IO[bytes], content_type: str)`
14+
- Method `OrganizationsOperations.begin_update` has a new overload `def begin_update(self: None, resource_group_name: str, organization_name: str, properties: IO[bytes], content_type: str)`
15+
16+
### Breaking Changes
17+
18+
- Deleted or renamed model `Versions`
19+
320
## 1.0.0b1 (2024-02-22)
421

522
* Initial Release

sdk/astro/azure-mgmt-astro/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 Astro 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "8bf9ff0986adb3b37755d8b0a0dfab93906d2eab",
2+
"commit": "8b1d8291b0bdd7759b788d13065c29ef328a4dd4",
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.34.1",
7+
"@autorest/modelerfour@4.27.0"
88
],
9-
"autorest_command": "autorest specification/liftrastronomer/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/liftrastronomer/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.34.1 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/liftrastronomer/resource-manager/readme.md"
1111
}

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

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,26 @@
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

13+
from azure.core.pipeline import policies
1214
from azure.core.rest import HttpRequest, HttpResponse
15+
from azure.core.settings import settings
1316
from azure.mgmt.core import ARMPipelineClient
17+
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
18+
from azure.mgmt.core.tools import get_arm_endpoints
1419

1520
from . import models as _models
1621
from ._configuration import AstroMgmtClientConfiguration
17-
from ._serialization import Deserializer, Serializer
22+
from ._utils.serialization import Deserializer, Serializer
1823
from .operations import Operations, OrganizationsOperations
1924

2025
if TYPE_CHECKING:
21-
# pylint: disable=unused-import,ungrouped-imports
2226
from azure.core.credentials import TokenCredential
2327

2428

25-
class AstroMgmtClient: # pylint: disable=client-accepts-api-version-keyword
29+
class AstroMgmtClient:
2630
"""AstroMgmtClient.
2731
2832
:ivar operations: Operations operations
@@ -33,24 +37,46 @@ class AstroMgmtClient: # pylint: disable=client-accepts-api-version-keyword
3337
:type credential: ~azure.core.credentials.TokenCredential
3438
:param subscription_id: The ID of the target subscription. Required.
3539
:type subscription_id: str
36-
:param base_url: Service URL. Default value is "https://management.azure.com".
40+
:param base_url: Service URL. Default value is None.
3741
:type base_url: str
38-
:keyword api_version: Api Version. Default value is "2023-08-01". Note that overriding this
42+
:keyword api_version: Api Version. Default value is "2024-08-27". Note that overriding this
3943
default value may result in unsupported behavior.
4044
:paramtype api_version: str
4145
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
4246
Retry-After header is present.
4347
"""
4448

4549
def __init__(
46-
self,
47-
credential: "TokenCredential",
48-
subscription_id: str,
49-
base_url: str = "https://management.azure.com",
50-
**kwargs: Any
50+
self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any
5151
) -> None:
52-
self._config = AstroMgmtClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
53-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
52+
_cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud # type: ignore
53+
_endpoints = get_arm_endpoints(_cloud)
54+
if not base_url:
55+
base_url = _endpoints["resource_manager"]
56+
credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])
57+
self._config = AstroMgmtClientConfiguration(
58+
credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **kwargs
59+
)
60+
61+
_policies = kwargs.pop("policies", None)
62+
if _policies is None:
63+
_policies = [
64+
policies.RequestIdPolicy(**kwargs),
65+
self._config.headers_policy,
66+
self._config.user_agent_policy,
67+
self._config.proxy_policy,
68+
policies.ContentDecodePolicy(**kwargs),
69+
ARMAutoResourceProviderRegistrationPolicy(),
70+
self._config.redirect_policy,
71+
self._config.retry_policy,
72+
self._config.authentication_policy,
73+
self._config.custom_hook_policy,
74+
self._config.logging_policy,
75+
policies.DistributedTracingPolicy(**kwargs),
76+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
77+
self._config.http_logging_policy,
78+
]
79+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs)
5480

5581
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
5682
self._serialize = Serializer(client_models)
@@ -59,7 +85,7 @@ def __init__(
5985
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
6086
self.organizations = OrganizationsOperations(self._client, self._config, self._serialize, self._deserialize)
6187

62-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
88+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
6389
"""Runs the network request through the client's chained policies.
6490
6591
>>> from azure.core.rest import HttpRequest
@@ -79,12 +105,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
79105

80106
request_copy = deepcopy(request)
81107
request_copy.url = self._client.format_url(request_copy.url)
82-
return self._client.send_request(request_copy, **kwargs)
108+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
83109

84110
def close(self) -> None:
85111
self._client.close()
86112

87-
def __enter__(self) -> "AstroMgmtClient":
113+
def __enter__(self) -> Self:
88114
self._client.__enter__()
89115
return self
90116

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@
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

1514
from ._version import VERSION
1615

1716
if TYPE_CHECKING:
18-
# pylint: disable=unused-import,ungrouped-imports
1917
from azure.core.credentials import TokenCredential
2018

2119

22-
class AstroMgmtClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
20+
class AstroMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes
2321
"""Configuration for AstroMgmtClient.
2422
2523
Note that all parameters used to create this instance are saved as instance
@@ -29,14 +27,13 @@ class AstroMgmtClientConfiguration(Configuration): # pylint: disable=too-many-i
2927
:type credential: ~azure.core.credentials.TokenCredential
3028
:param subscription_id: The ID of the target subscription. Required.
3129
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2023-08-01". Note that overriding this
30+
:keyword api_version: Api Version. Default value is "2024-08-27". Note that overriding this
3331
default value may result in unsupported behavior.
3432
:paramtype api_version: str
3533
"""
3634

3735
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
38-
super(AstroMgmtClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2023-08-01")
36+
api_version: str = kwargs.pop("api_version", "2024-08-27")
4037

4138
if credential is None:
4239
raise ValueError("Parameter 'credential' must not be None.")
@@ -48,6 +45,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
4845
self.api_version = api_version
4946
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
5047
kwargs.setdefault("sdk_moniker", "mgmt-astro/{}".format(VERSION))
48+
self.polling_interval = kwargs.get("polling_interval", 30)
5149
self._configure(**kwargs)
5250

5351
def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +54,9 @@ def _configure(self, **kwargs: Any) -> None:
5654
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
5755
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
5856
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
59-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6057
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
6158
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
59+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6260
self.authentication_policy = kwargs.get("authentication_policy")
6361
if self.credential and not self.authentication_policy:
6462
self.authentication_policy = ARMChallengeAuthenticationPolicy(

sdk/astro/azure-mgmt-astro/azure/mgmt/astro/_vendor.py renamed to sdk/astro/azure-mgmt-astro/azure/mgmt/astro/_utils/__init__.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,3 @@
44
# Code generated by Microsoft (R) AutoRest Code Generator.
55
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
66
# --------------------------------------------------------------------------
7-
8-
from azure.core.pipeline.transport import HttpRequest
9-
10-
11-
def _convert_request(request, files=None):
12-
data = request.content if not files else None
13-
request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
14-
if files:
15-
request.set_formdata_body(files)
16-
return request

0 commit comments

Comments
 (0)