Skip to content

Commit bcea1a4

Browse files
author
SDKAuto
committed
CodeGen from PR 18202 in Azure/azure-rest-api-specs
Merge 8c15a5acd231e0cf846e58a99673cf46e95c4cf1 into 96da969aa75e2beb27c3dbc2d69a76900856cc52
1 parent 573d68e commit bcea1a4

30 files changed

+2862
-3144
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.2",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.1",
5-
"@autorest/modelerfour@4.19.2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/modelerfour@4.19.3"
66
],
7-
"commit": "fa3ba1acdd45ddad8950133befc5b0a6f1ee5163",
7+
"commit": "63b914ba1221b0019410788d5a7a8194a1c685ef",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/databricks/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.1 --use=@autorest/modelerfour@4.19.2 --version=3.4.2",
9+
"autorest_command": "autorest specification/databricks/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",
1010
"readme": "specification/databricks/resource-manager/readme.md"
1111
}

sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/__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__ = ['AzureDatabricksManagementClient']
1414

15-
try:
16-
from ._patch import patch_sdk # type: ignore
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/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_azure_databricks_management_client.py

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,94 +6,97 @@
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 AzureDatabricksManagementClientConfiguration
18+
from .operations import Operations, OutboundNetworkDependenciesEndpointsOperations, PrivateEndpointConnectionsOperations, PrivateLinkResourcesOperations, VNetPeeringOperations, WorkspacesOperations
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
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import AzureDatabricksManagementClientConfiguration
22-
from .operations import WorkspacesOperations
23-
from .operations import Operations
24-
from .operations import PrivateLinkResourcesOperations
25-
from .operations import PrivateEndpointConnectionsOperations
26-
from .operations import VNetPeeringOperations
27-
from . import models
28-
2923

30-
class AzureDatabricksManagementClient(object):
24+
class AzureDatabricksManagementClient:
3125
"""The Microsoft Azure management APIs allow end users to operate on Azure Databricks Workspace resources.
3226
3327
:ivar workspaces: WorkspacesOperations operations
34-
:vartype workspaces: azure_databricks_management_client.operations.WorkspacesOperations
28+
:vartype workspaces: azure.mgmt.databricks.operations.WorkspacesOperations
3529
:ivar operations: Operations operations
36-
:vartype operations: azure_databricks_management_client.operations.Operations
30+
:vartype operations: azure.mgmt.databricks.operations.Operations
3731
:ivar private_link_resources: PrivateLinkResourcesOperations operations
38-
:vartype private_link_resources: azure_databricks_management_client.operations.PrivateLinkResourcesOperations
32+
:vartype private_link_resources:
33+
azure.mgmt.databricks.operations.PrivateLinkResourcesOperations
3934
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
40-
:vartype private_endpoint_connections: azure_databricks_management_client.operations.PrivateEndpointConnectionsOperations
35+
:vartype private_endpoint_connections:
36+
azure.mgmt.databricks.operations.PrivateEndpointConnectionsOperations
37+
:ivar outbound_network_dependencies_endpoints: OutboundNetworkDependenciesEndpointsOperations
38+
operations
39+
:vartype outbound_network_dependencies_endpoints:
40+
azure.mgmt.databricks.operations.OutboundNetworkDependenciesEndpointsOperations
4141
:ivar vnet_peering: VNetPeeringOperations operations
42-
:vartype vnet_peering: azure_databricks_management_client.operations.VNetPeeringOperations
42+
:vartype vnet_peering: azure.mgmt.databricks.operations.VNetPeeringOperations
4343
:param credential: Credential needed for the client to connect to Azure.
4444
:type credential: ~azure.core.credentials.TokenCredential
4545
:param subscription_id: The ID of the target subscription.
4646
:type subscription_id: str
47-
:param str base_url: Service URL
48-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
47+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
48+
:type base_url: str
49+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
50+
Retry-After header is present.
4951
"""
5052

5153
def __init__(
5254
self,
53-
credential, # type: "TokenCredential"
54-
subscription_id, # type: str
55-
base_url=None, # type: Optional[str]
56-
**kwargs # type: Any
57-
):
58-
# type: (...) -> None
59-
if not base_url:
60-
base_url = 'https://management.azure.com'
61-
self._config = AzureDatabricksManagementClientConfiguration(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 = AzureDatabricksManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
6261
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6362

6463
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6564
self._serialize = Serializer(client_models)
66-
self._serialize.client_side_validation = False
6765
self._deserialize = Deserializer(client_models)
66+
self._serialize.client_side_validation = False
67+
self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
69+
self.private_link_resources = PrivateLinkResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
70+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
71+
self.outbound_network_dependencies_endpoints = OutboundNetworkDependenciesEndpointsOperations(self._client, self._config, self._serialize, self._deserialize)
72+
self.vnet_peering = VNetPeeringOperations(self._client, self._config, self._serialize, self._deserialize)
6873

69-
self.workspaces = WorkspacesOperations(
70-
self._client, self._config, self._serialize, self._deserialize)
71-
self.operations = Operations(
72-
self._client, self._config, self._serialize, self._deserialize)
73-
self.private_link_resources = PrivateLinkResourcesOperations(
74-
self._client, self._config, self._serialize, self._deserialize)
75-
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
76-
self._client, self._config, self._serialize, self._deserialize)
77-
self.vnet_peering = VNetPeeringOperations(
78-
self._client, self._config, self._serialize, self._deserialize)
79-
80-
def _send_request(self, http_request, **kwargs):
81-
# type: (HttpRequest, Any) -> HttpResponse
74+
75+
def _send_request(
76+
self,
77+
request, # type: HttpRequest
78+
**kwargs: Any
79+
) -> HttpResponse:
8280
"""Runs the network request through the client's chained policies.
8381
84-
:param http_request: The network request you want to make. Required.
85-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
86-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
82+
>>> from azure.core.rest import HttpRequest
83+
>>> request = HttpRequest("GET", "https://www.example.org/")
84+
<HttpRequest [GET], url: 'https://www.example.org/'>
85+
>>> response = client._send_request(request)
86+
<HttpResponse: 200 OK>
87+
88+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
89+
90+
:param request: The network request you want to make. Required.
91+
:type request: ~azure.core.rest.HttpRequest
92+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
8793
:return: The response of your network call. Does not do error handling on your response.
88-
:rtype: ~azure.core.pipeline.transport.HttpResponse
94+
:rtype: ~azure.core.rest.HttpResponse
8995
"""
90-
path_format_arguments = {
91-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
92-
}
93-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
94-
stream = kwargs.pop("stream", True)
95-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
96-
return pipeline_response.http_response
96+
97+
request_copy = deepcopy(request)
98+
request_copy.url = self._client.format_url(request_copy.url)
99+
return self._client.send_request(request_copy, **kwargs)
97100

98101
def close(self):
99102
# type: () -> None

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +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 ARMHttpLoggingPolicy
13+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1414

1515
from ._version import VERSION
1616

1717
if TYPE_CHECKING:
1818
# pylint: disable=unused-import,ungrouped-imports
19-
from typing import Any
20-
2119
from azure.core.credentials import TokenCredential
2220

2321

@@ -35,19 +33,19 @@ class AzureDatabricksManagementClientConfiguration(Configuration):
3533

3634
def __init__(
3735
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
36+
credential: "TokenCredential",
37+
subscription_id: str,
38+
**kwargs: Any
39+
) -> None:
40+
super(AzureDatabricksManagementClientConfiguration, self).__init__(**kwargs)
4341
if credential is None:
4442
raise ValueError("Parameter 'credential' must not be None.")
4543
if subscription_id is None:
4644
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(AzureDatabricksManagementClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
48+
self.api_version = "2021-04-01-preview"
5149
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5250
kwargs.setdefault('sdk_moniker', 'mgmt-databricks/{}'.format(VERSION))
5351
self._configure(**kwargs)
@@ -67,4 +65,4 @@ def _configure(
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/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_metadata.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"chosen_version": "",
3-
"total_api_version_list": ["2018-04-01", "2021-04-01-preview"],
2+
"chosen_version": "2021-04-01-preview",
3+
"total_api_version_list": ["2021-04-01-preview"],
44
"client": {
55
"name": "AzureDatabricksManagementClient",
66
"filename": "_azure_databricks_management_client",
77
"description": "The Microsoft Azure management APIs allow end users to operate on Azure Databricks Workspace resources.",
8-
"base_url": "\u0027https://management.azure.com\u0027",
9-
"custom_base_url": null,
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
1010
"azure_arm": true,
1111
"has_lro_operations": true,
1212
"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\": [\"AzureDatabricksManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}}}",
14-
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"AzureDatabricksManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}}}"
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\": [\"AzureDatabricksManagementClientConfiguration\"]}}, \"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\": [\"AzureDatabricksManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {
@@ -54,7 +54,7 @@
5454
"required": false
5555
},
5656
"base_url": {
57-
"signature": "base_url=None, # type: Optional[str]",
57+
"signature": "base_url=\"https://management.azure.com\", # type: str",
5858
"description": "Service URL",
5959
"docstring_type": "str",
6060
"required": false
@@ -74,7 +74,7 @@
7474
"required": false
7575
},
7676
"base_url": {
77-
"signature": "base_url: Optional[str] = None,",
77+
"signature": "base_url: str = \"https://management.azure.com\",",
7878
"description": "Service URL",
7979
"docstring_type": "str",
8080
"required": false
@@ -91,17 +91,17 @@
9191
"config": {
9292
"credential": true,
9393
"credential_scopes": ["https://management.azure.com/.default"],
94-
"credential_default_policy_type": "BearerTokenCredentialPolicy",
95-
"credential_default_policy_type_has_async_version": true,
96-
"credential_key_header_name": null,
97-
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
98-
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
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\"]}}}"
9998
},
10099
"operation_groups": {
101100
"workspaces": "WorkspacesOperations",
102101
"operations": "Operations",
103102
"private_link_resources": "PrivateLinkResourcesOperations",
104103
"private_endpoint_connections": "PrivateEndpointConnectionsOperations",
104+
"outbound_network_dependencies_endpoints": "OutboundNetworkDependenciesEndpointsOperations",
105105
"vnet_peering": "VNetPeeringOperations"
106106
}
107107
}

0 commit comments

Comments
 (0)