Skip to content

Commit 964eb12

Browse files
author
SDKAuto
committed
CodeGen from PR 34242 in Azure/azure-rest-api-specs
Merge 8fbc11097a7044c1adc129e989a96f3988cf536d into 11059b2f00c7572b276dc9862c0b41db8702cc78
1 parent ebf29c4 commit 964eb12

Some content is hidden

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

42 files changed

+5039
-5430
lines changed

sdk/fabric/azure-mgmt-fabric/CHANGELOG.md

Lines changed: 373 additions & 0 deletions
Large diffs are not rendered by default.

sdk/fabric/azure-mgmt-fabric/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 Fabric 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: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
2-
"commit": "9ce76c4f113368361dac4de5d0a71eb058602756",
2+
"commit": "c908490d3d2b6fdd1a5dfa108a0f47183e4c06e0",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"typespec_src": "specification/fabric/Microsoft.Fabric.Management",
5-
"@azure-tools/typespec-python": "0.36.0"
5+
"@azure-tools/typespec-python": "0.36.0",
6+
"autorest": "3.10.2",
7+
"use": [
8+
"@autorest/[email protected]",
9+
"@autorest/[email protected]"
10+
],
11+
"autorest_command": "autorest specification/fabric/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/[email protected] --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
12+
"readme": "specification/fabric/resource-manager/readme.md"
613
}

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,30 @@
22
# --------------------------------------------------------------------------
33
# Copyright (c) Microsoft Corporation. All rights reserved.
44
# Licensed under the MIT License. See License.txt in the project root for license information.
5-
# Code generated by Microsoft (R) Python Code Generator.
5+
# 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 ._client import FabricMgmtClient
10+
from typing import TYPE_CHECKING
11+
12+
if TYPE_CHECKING:
13+
from ._patch import * # pylint: disable=unused-wildcard-import
14+
15+
from ._microsoft_fabric_management_service import MicrosoftFabricManagementService # 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__ = [
22-
"FabricMgmtClient",
28+
"MicrosoftFabricManagementService",
2329
]
2430
__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore
2531

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# --------------------------------------------------------------------------
33
# Copyright (c) Microsoft Corporation. All rights reserved.
44
# Licensed under the MIT License. See License.txt in the project root for license information.
5-
# Code generated by Microsoft (R) Python Code Generator.
5+
# Code generated by Microsoft (R) AutoRest Code Generator.
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

@@ -17,30 +17,22 @@
1717
from azure.core.credentials import TokenCredential
1818

1919

20-
class FabricMgmtClientConfiguration: # pylint: disable=too-many-instance-attributes
21-
"""Configuration for FabricMgmtClient.
20+
class MicrosoftFabricManagementServiceConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
21+
"""Configuration for MicrosoftFabricManagementService.
2222
2323
Note that all parameters used to create this instance are saved as instance
2424
attributes.
2525
26-
:param credential: Credential used to authenticate requests to the service. Required.
26+
:param credential: Credential needed for the client to connect to Azure. Required.
2727
:type credential: ~azure.core.credentials.TokenCredential
2828
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
2929
:type subscription_id: str
30-
:param base_url: Service host. Default value is "https://management.azure.com".
31-
:type base_url: str
32-
:keyword api_version: The API version to use for this operation. Default value is "2023-11-01".
33-
Note that overriding this default value may result in unsupported behavior.
30+
:keyword api_version: Api Version. Default value is "2023-11-01". Note that overriding this
31+
default value may result in unsupported behavior.
3432
:paramtype api_version: str
3533
"""
3634

37-
def __init__(
38-
self,
39-
credential: "TokenCredential",
40-
subscription_id: str,
41-
base_url: str = "https://management.azure.com",
42-
**kwargs: Any
43-
) -> None:
35+
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
4436
api_version: str = kwargs.pop("api_version", "2023-11-01")
4537

4638
if credential is None:
@@ -50,7 +42,6 @@ def __init__(
5042

5143
self.credential = credential
5244
self.subscription_id = subscription_id
53-
self.base_url = base_url
5445
self.api_version = api_version
5546
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
5647
kwargs.setdefault("sdk_moniker", "mgmt-fabric/{}".format(VERSION))

sdk/fabric/azure-mgmt-fabric/azure/mgmt/fabric/_client.py renamed to sdk/fabric/azure-mgmt-fabric/azure/mgmt/fabric/_microsoft_fabric_management_service.py

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,62 @@
22
# --------------------------------------------------------------------------
33
# Copyright (c) Microsoft Corporation. All rights reserved.
44
# Licensed under the MIT License. See License.txt in the project root for license information.
5-
# Code generated by Microsoft (R) Python Code Generator.
5+
# Code generated by Microsoft (R) AutoRest Code Generator.
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

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

1313
from azure.core.pipeline import policies
1414
from azure.core.rest import HttpRequest, HttpResponse
15+
from azure.core.settings import settings
1516
from azure.mgmt.core import ARMPipelineClient
1617
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
18+
from azure.mgmt.core.tools import get_arm_endpoints
1719

18-
from ._configuration import FabricMgmtClientConfiguration
19-
from ._serialization import Deserializer, Serializer
20+
from . import models as _models
21+
from ._configuration import MicrosoftFabricManagementServiceConfiguration
22+
from ._utils.serialization import Deserializer, Serializer
2023
from .operations import FabricCapacitiesOperations, Operations
2124

2225
if TYPE_CHECKING:
2326
from azure.core.credentials import TokenCredential
2427

2528

26-
class FabricMgmtClient:
27-
"""FabricMgmtClient.
29+
class MicrosoftFabricManagementService:
30+
"""Microsoft.Fabric Resource Provider management API.
2831
29-
:ivar fabric_capacities: FabricCapacitiesOperations operations
30-
:vartype fabric_capacities: azure.mgmt.fabric.operations.FabricCapacitiesOperations
3132
:ivar operations: Operations operations
3233
:vartype operations: azure.mgmt.fabric.operations.Operations
33-
:param credential: Credential used to authenticate requests to the service. Required.
34+
:ivar fabric_capacities: FabricCapacitiesOperations operations
35+
:vartype fabric_capacities: azure.mgmt.fabric.operations.FabricCapacitiesOperations
36+
:param credential: Credential needed for the client to connect to Azure. Required.
3437
:type credential: ~azure.core.credentials.TokenCredential
3538
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
3639
:type subscription_id: str
37-
:param base_url: Service host. Default value is "https://management.azure.com".
40+
:param base_url: Service URL. Default value is None.
3841
:type base_url: str
39-
:keyword api_version: The API version to use for this operation. Default value is "2023-11-01".
40-
Note that overriding this default value may result in unsupported behavior.
42+
:keyword api_version: Api Version. Default value is "2023-11-01". Note that overriding this
43+
default value may result in unsupported behavior.
4144
:paramtype api_version: str
4245
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
4346
Retry-After header is present.
4447
"""
4548

4649
def __init__(
47-
self,
48-
credential: "TokenCredential",
49-
subscription_id: str,
50-
base_url: str = "https://management.azure.com",
51-
**kwargs: Any
50+
self, credential: "TokenCredential", subscription_id: str, base_url: Optional[str] = None, **kwargs: Any
5251
) -> None:
53-
_endpoint = "{endpoint}"
54-
self._config = FabricMgmtClientConfiguration(
55-
credential=credential, subscription_id=subscription_id, base_url=base_url, **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 = MicrosoftFabricManagementServiceConfiguration(
58+
credential=credential, subscription_id=subscription_id, credential_scopes=credential_scopes, **kwargs
5659
)
60+
5761
_policies = kwargs.pop("policies", None)
5862
if _policies is None:
5963
_policies = [
@@ -72,23 +76,24 @@ def __init__(
7276
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
7377
self._config.http_logging_policy,
7478
]
75-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=_endpoint, policies=_policies, **kwargs)
79+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs)
7680

77-
self._serialize = Serializer()
78-
self._deserialize = Deserializer()
81+
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
82+
self._serialize = Serializer(client_models)
83+
self._deserialize = Deserializer(client_models)
7984
self._serialize.client_side_validation = False
85+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
8086
self.fabric_capacities = FabricCapacitiesOperations(
8187
self._client, self._config, self._serialize, self._deserialize
8288
)
83-
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
8489

85-
def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
90+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
8691
"""Runs the network request through the client's chained policies.
8792
8893
>>> from azure.core.rest import HttpRequest
8994
>>> request = HttpRequest("GET", "https://www.example.org/")
9095
<HttpRequest [GET], url: 'https://www.example.org/'>
91-
>>> response = client.send_request(request)
96+
>>> response = client._send_request(request)
9297
<HttpResponse: 200 OK>
9398
9499
For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
@@ -101,11 +106,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
101106
"""
102107

103108
request_copy = deepcopy(request)
104-
path_format_arguments = {
105-
"endpoint": self._serialize.url("self._config.base_url", self._config.base_url, "str", skip_quote=True),
106-
}
107-
108-
request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
109+
request_copy.url = self._client.format_url(request_copy.url)
109110
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
110111

111112
def close(self) -> None:

0 commit comments

Comments
 (0)