From 892d560d522649f886276dc3f34f0b471d7afdb4 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 28 Jun 2023 18:33:10 -0700 Subject: [PATCH] [AutoRelease] t2-databricks-2023-06-14-29768(can only be merged by SDK owner) (#30768) * code and test * update * Update CHANGELOG.md --------- Co-authored-by: PythonSdkPipelines Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> Co-authored-by: Yuchao Yan --- .../azure-mgmt-databricks/CHANGELOG.md | 29 ++ .../azure-mgmt-databricks/README.md | 50 ++- .../azure-mgmt-databricks/_meta.json | 6 +- .../_azure_databricks_management_client.py | 11 +- .../azure/mgmt/databricks/_configuration.py | 12 - .../azure/mgmt/databricks/_serialization.py | 93 +++-- .../azure/mgmt/databricks/_vendor.py | 5 +- .../azure/mgmt/databricks/_version.py | 2 +- .../_azure_databricks_management_client.py | 11 +- .../mgmt/databricks/aio/_configuration.py | 12 - .../_access_connectors_operations.py | 97 ++--- .../databricks/aio/operations/_operations.py | 26 +- ...twork_dependencies_endpoints_operations.py | 12 +- ...private_endpoint_connections_operations.py | 60 +-- .../_private_link_resources_operations.py | 33 +- .../operations/_vnet_peering_operations.py | 60 +-- .../aio/operations/_workspaces_operations.py | 98 ++--- .../azure/mgmt/databricks/models/__init__.py | 10 +- ...zure_databricks_management_client_enums.py | 18 +- .../mgmt/databricks/models/_models_py3.py | 361 +++++++++++------- .../_access_connectors_operations.py | 121 ++---- .../mgmt/databricks/operations/_operations.py | 30 +- ...twork_dependencies_endpoints_operations.py | 16 +- ...private_endpoint_connections_operations.py | 76 ++-- .../_private_link_resources_operations.py | 41 +- .../operations/_vnet_peering_operations.py | 76 ++-- .../operations/_workspaces_operations.py | 122 ++---- .../access_connector_create_or_update.py | 2 +- ...tor_create_or_update_with_user_assigned.py | 42 ++ .../access_connector_delete.py | 5 +- .../generated_samples/access_connector_get.py | 2 +- .../access_connector_patch_update.py | 2 +- ...ccess_connectors_list_by_resource_group.py | 2 +- ...cess_connectors_list_by_subscription_id.py | 2 +- .../generated_samples/disable_encryption.py | 2 +- .../generated_samples/enable_encryption.py | 2 +- .../list_private_endpoint_connections.py | 2 +- .../list_private_link_resources.py | 2 +- .../generated_samples/operations_list.py | 2 +- ...und_network_dependencies_endpoints_list.py | 2 +- .../generated_samples/prepare_encryption.py | 2 +- .../private_endpoint_connections_delete.py | 5 +- .../private_endpoint_connections_get.py | 2 +- .../private_endpoint_connections_update.py | 2 +- .../private_link_resources_get.py | 2 +- .../generated_samples/workspace_create.py | 2 +- .../workspace_create_with_parameters.py | 2 +- .../generated_samples/workspace_delete.py | 5 +- .../generated_samples/workspace_get.py | 2 +- .../workspace_get_parameters.py | 2 +- ...orkspace_managed_disk_encryption_create.py | 2 +- .../workspace_managed_disk_encryption_get.py | 2 +- ...orkspace_managed_disk_encryption_update.py | 2 +- .../generated_samples/workspace_update.py | 2 +- .../workspace_virtual_net_peering_get.py | 2 +- .../workspace_virtual_net_peering_list.py | 2 +- ...irtual_network_peering_create_or_update.py | 53 +++ ...orkspace_virtual_network_peering_delete.py | 5 +- .../workspaces_list_by_resource_group.py | 2 +- .../workspaces_list_by_subscription.py | 2 +- .../azure-mgmt-databricks/sdk_packaging.toml | 2 +- sdk/databricks/azure-mgmt-databricks/setup.py | 80 ++-- .../tests/test_cli_mgmt_databricks.py | 93 +---- 63 files changed, 818 insertions(+), 1014 deletions(-) create mode 100644 sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update_with_user_assigned.py create mode 100644 sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_create_or_update.py diff --git a/sdk/databricks/azure-mgmt-databricks/CHANGELOG.md b/sdk/databricks/azure-mgmt-databricks/CHANGELOG.md index d4f40ba47af0..9ae1b6852074 100644 --- a/sdk/databricks/azure-mgmt-databricks/CHANGELOG.md +++ b/sdk/databricks/azure-mgmt-databricks/CHANGELOG.md @@ -1,5 +1,34 @@ # Release History +## 2.0.0 (2023-06-29) + +### Features Added + + - Added operation group AccessConnectorsOperations + - Added operation group OutboundNetworkDependenciesEndpointsOperations + - Added operation group PrivateEndpointConnectionsOperations + - Added operation group PrivateLinkResourcesOperations + - Model OperationDisplay has a new parameter description + - Model Workspace has a new parameter disk_encryption_set_id + - Model Workspace has a new parameter encryption + - Model Workspace has a new parameter managed_disk_identity + - Model Workspace has a new parameter private_endpoint_connections + - Model Workspace has a new parameter public_network_access + - Model Workspace has a new parameter required_nsg_rules + - Model Workspace has a new parameter system_data + - Model WorkspaceCustomParameters has a new parameter load_balancer_backend_pool_name + - Model WorkspaceCustomParameters has a new parameter load_balancer_id + - Model WorkspaceCustomParameters has a new parameter nat_gateway_name + - Model WorkspaceCustomParameters has a new parameter public_ip_name + - Model WorkspaceCustomParameters has a new parameter resource_tags + - Model WorkspaceCustomParameters has a new parameter storage_account_name + - Model WorkspaceCustomParameters has a new parameter storage_account_sku_name + - Model WorkspaceCustomParameters has a new parameter vnet_address_prefix + +### Breaking Changes + + - Client name is changed from `DatabricksClient` to `AzureDatabricksManagementClient` + ## 1.1.0b2 (2022-11-18) ### Features Added diff --git a/sdk/databricks/azure-mgmt-databricks/README.md b/sdk/databricks/azure-mgmt-databricks/README.md index c870da4b707d..a060c6b6901e 100644 --- a/sdk/databricks/azure-mgmt-databricks/README.md +++ b/sdk/databricks/azure-mgmt-databricks/README.md @@ -8,17 +8,53 @@ For a more complete view of Azure libraries, see the [azure sdk python release]( _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_ -# Usage +## Getting started +### Prerequisites -To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt) - -For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/) -Code samples for this package can be found at [Data Bricks Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com. -Additional code samples for different Azure services are available at [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples) +- Python 3.7+ is required to use this package. +- [Azure subscription](https://azure.microsoft.com/free/) +### Install the package -# Provide Feedback +```bash +pip install azure-mgmt-databricks +pip install azure-identity +``` + +### Authentication + +By default, [Azure Active Directory](https://aka.ms/awps/aad) token authentication depends on correct configure of following environment variables. + +- `AZURE_CLIENT_ID` for Azure client ID. +- `AZURE_TENANT_ID` for Azure tenant ID. +- `AZURE_CLIENT_SECRET` for Azure client secret. + +In addition, Azure subscription ID can be configured via environment variable `AZURE_SUBSCRIPTION_ID`. + +With above configuration, client can be authenticated by following code: + +```python +from azure.identity import DefaultAzureCredential +from azure.mgmt.databricks import AzureDatabricksManagementClient +import os + +sub_id = os.getenv("AZURE_SUBSCRIPTION_ID") +client = AzureDatabricksManagementClient(credential=DefaultAzureCredential(), subscription_id=sub_id) +``` + +## Examples + +Code samples for this package can be found at: +- [Search Data Bricks Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com +- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples) + + +## Troubleshooting + +## Next steps + +## Provide Feedback If you encounter any bugs or have suggestions, please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-python/issues) diff --git a/sdk/databricks/azure-mgmt-databricks/_meta.json b/sdk/databricks/azure-mgmt-databricks/_meta.json index 0646bb60ab17..f2a9d3dd0662 100644 --- a/sdk/databricks/azure-mgmt-databricks/_meta.json +++ b/sdk/databricks/azure-mgmt-databricks/_meta.json @@ -1,11 +1,11 @@ { - "commit": "171bef6183260f0ae968086596495813fcd29c4e", + "commit": "f36175f4c54eeec5b6d409406e131dadb540546a", "repository_url": "https://github.com/Azure/azure-rest-api-specs", "autorest": "3.9.2", "use": [ - "@autorest/python@6.2.7", + "@autorest/python@6.6.0", "@autorest/modelerfour@4.24.3" ], - "autorest_command": "autorest specification/databricks/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.7 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", + "autorest_command": "autorest specification/databricks/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.6.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", "readme": "specification/databricks/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_azure_databricks_management_client.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_azure_databricks_management_client.py index f5485cf5783f..cc6649e1a282 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_azure_databricks_management_client.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_azure_databricks_management_client.py @@ -31,8 +31,8 @@ class AzureDatabricksManagementClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes - """The Microsoft Azure management APIs allow end users to operate on Azure Databricks Workspace - resources. + """The Microsoft Azure management APIs allow end users to operate on Azure Databricks Workspace / + Access Connector resources. :ivar workspaces: WorkspacesOperations operations :vartype workspaces: azure.mgmt.databricks.operations.WorkspacesOperations @@ -58,9 +58,6 @@ class AzureDatabricksManagementClient: # pylint: disable=client-accepts-api-ver :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2022-04-01-preview". Note that overriding - this default value may result in unsupported behavior. - :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. """ @@ -75,7 +72,7 @@ def __init__( self._config = AzureDatabricksManagementClientConfiguration( credential=credential, subscription_id=subscription_id, **kwargs ) - self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) @@ -126,5 +123,5 @@ def __enter__(self) -> "AzureDatabricksManagementClient": self._client.__enter__() return self - def __exit__(self, *exc_details) -> None: + def __exit__(self, *exc_details: Any) -> None: self._client.__exit__(*exc_details) diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_configuration.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_configuration.py index ffa9b4da635e..3b9c2e63367e 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_configuration.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_configuration.py @@ -6,7 +6,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, TYPE_CHECKING from azure.core.configuration import Configuration @@ -15,11 +14,6 @@ from ._version import VERSION -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential @@ -35,15 +29,10 @@ class AzureDatabricksManagementClientConfiguration(Configuration): # pylint: di :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2022-04-01-preview". Note that overriding - this default value may result in unsupported behavior. - :paramtype api_version: str """ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(AzureDatabricksManagementClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-04-01-preview"] = kwargs.pop("api_version", "2022-04-01-preview") - if credential is None: raise ValueError("Parameter 'credential' must not be None.") if subscription_id is None: @@ -51,7 +40,6 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs self.credential = credential self.subscription_id = subscription_id - self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-databricks/{}".format(VERSION)) self._configure(**kwargs) diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_serialization.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_serialization.py index 2c170e28dbca..842ae727fbbc 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_serialization.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_serialization.py @@ -38,7 +38,22 @@ import re import sys import codecs -from typing import Optional, Union, AnyStr, IO, Mapping +from typing import ( + Dict, + Any, + cast, + Optional, + Union, + AnyStr, + IO, + Mapping, + Callable, + TypeVar, + MutableMapping, + Type, + List, + Mapping, +) try: from urllib import quote # type: ignore @@ -48,12 +63,14 @@ import isodate # type: ignore -from typing import Dict, Any, cast - from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback +from azure.core.serialization import NULL as AzureCoreNull _BOM = codecs.BOM_UTF8.decode(encoding="utf-8") +ModelType = TypeVar("ModelType", bound="Model") +JSON = MutableMapping[str, Any] + class RawDeserializer: @@ -277,8 +294,8 @@ class Model(object): _attribute_map: Dict[str, Dict[str, Any]] = {} _validation: Dict[str, Dict[str, Any]] = {} - def __init__(self, **kwargs): - self.additional_properties = {} + def __init__(self, **kwargs: Any) -> None: + self.additional_properties: Dict[str, Any] = {} for k in kwargs: if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -287,25 +304,25 @@ def __init__(self, **kwargs): else: setattr(self, k, kwargs[k]) - def __eq__(self, other): + def __eq__(self, other: Any) -> bool: """Compare objects by comparing all attributes.""" if isinstance(other, self.__class__): return self.__dict__ == other.__dict__ return False - def __ne__(self, other): + def __ne__(self, other: Any) -> bool: """Compare objects by comparing all attributes.""" return not self.__eq__(other) - def __str__(self): + def __str__(self) -> str: return str(self.__dict__) @classmethod - def enable_additional_properties_sending(cls): + def enable_additional_properties_sending(cls) -> None: cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} @classmethod - def is_xml_model(cls): + def is_xml_model(cls) -> bool: try: cls._xml_map # type: ignore except AttributeError: @@ -322,7 +339,7 @@ def _create_xml_node(cls): return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) - def serialize(self, keep_readonly=False, **kwargs): + def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: """Return the JSON that would be sent to azure from this model. This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. @@ -336,8 +353,13 @@ def serialize(self, keep_readonly=False, **kwargs): serializer = Serializer(self._infer_class_models()) return serializer._serialize(self, keep_readonly=keep_readonly, **kwargs) - def as_dict(self, keep_readonly=True, key_transformer=attribute_transformer, **kwargs): - """Return a dict that can be JSONify using json.dump. + def as_dict( + self, + keep_readonly: bool = True, + key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + **kwargs: Any + ) -> JSON: + """Return a dict that can be serialized using json.dump. Advanced usage might optionally use a callback as parameter: @@ -384,7 +406,7 @@ def _infer_class_models(cls): return client_models @classmethod - def deserialize(cls, data, content_type=None): + def deserialize(cls: Type[ModelType], data: Any, content_type: Optional[str] = None) -> ModelType: """Parse a str using the RestAPI syntax and return a model. :param str data: A str using RestAPI structure. JSON by default. @@ -396,7 +418,12 @@ def deserialize(cls, data, content_type=None): return deserializer(cls.__name__, data, content_type=content_type) @classmethod - def from_dict(cls, data, key_extractors=None, content_type=None): + def from_dict( + cls: Type[ModelType], + data: Any, + key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + content_type: Optional[str] = None, + ) -> ModelType: """Parse a dict using given key extractor return a model. By default consider key @@ -409,8 +436,8 @@ def from_dict(cls, data, key_extractors=None, content_type=None): :raises: DeserializationError if something went wrong """ deserializer = Deserializer(cls._infer_class_models()) - deserializer.key_extractors = ( - [ + deserializer.key_extractors = ( # type: ignore + [ # type: ignore attribute_key_case_insensitive_extractor, rest_key_case_insensitive_extractor, last_rest_key_case_insensitive_extractor, @@ -518,7 +545,7 @@ class Serializer(object): "multiple": lambda x, y: x % y != 0, } - def __init__(self, classes=None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.serialize_type = { "iso-8601": Serializer.serialize_iso, "rfc-1123": Serializer.serialize_rfc, @@ -534,7 +561,7 @@ def __init__(self, classes=None): "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -602,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): if xml_desc.get("attr", False): if xml_ns: ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) serialized.set(xml_name, new_attr) # type: ignore continue if xml_desc.get("text", False): @@ -626,8 +653,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs): serialized.append(local_node) # type: ignore else: # JSON for k in reversed(keys): # type: ignore - unflattened = {k: new_attr} - new_attr = unflattened + new_attr = {k: new_attr} _new_attr = new_attr _serialized = serialized @@ -656,8 +682,8 @@ def body(self, data, data_type, **kwargs): """ # Just in case this is a dict - internal_data_type = data_type.strip("[]{}") - internal_data_type = self.dependencies.get(internal_data_type, None) + internal_data_type_str = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type_str, None) try: is_xml_model_serialization = kwargs["is_xml"] except KeyError: @@ -777,6 +803,8 @@ def serialize_data(self, data, data_type, **kwargs): raise ValueError("No value for given attribute") try: + if data is AzureCoreNull: + return None if data_type in self.basic_types.values(): return self.serialize_basic(data, data_type, **kwargs) @@ -1161,7 +1189,8 @@ def rest_key_extractor(attr, attr_desc, data): working_data = data while "." in key: - dict_keys = _FLATTEN.split(key) + # Need the cast, as for some reasons "split" is typed as list[str | Any] + dict_keys = cast(List[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1242,7 +1271,7 @@ def _extract_name_from_internal_type(internal_type): xml_name = internal_type_xml_map.get("name", internal_type.__name__) xml_ns = internal_type_xml_map.get("ns", None) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) return xml_name @@ -1266,7 +1295,7 @@ def xml_key_extractor(attr, attr_desc, data): # Integrate namespace if necessary xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) if xml_ns: - xml_name = "{}{}".format(xml_ns, xml_name) + xml_name = "{{{}}}{}".format(xml_ns, xml_name) # If it's an attribute, that's simple if xml_desc.get("attr", False): @@ -1332,7 +1361,7 @@ class Deserializer(object): valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - def __init__(self, classes=None): + def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]] = None): self.deserialize_type = { "iso-8601": Deserializer.deserialize_iso, "rfc-1123": Deserializer.deserialize_rfc, @@ -1352,7 +1381,7 @@ def __init__(self, classes=None): "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies = dict(classes) if classes else {} + self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much @@ -1471,7 +1500,7 @@ def _classify_target(self, target, data): Once classification has been determined, initialize object. :param str target: The target object type to deserialize to. - :param str/dict data: The response data to deseralize. + :param str/dict data: The response data to deserialize. """ if target is None: return None, None @@ -1486,7 +1515,7 @@ def _classify_target(self, target, data): target = target._classify(data, self.dependencies) except AttributeError: pass # Target is not a Model, no classify - return target, target.__class__.__name__ + return target, target.__class__.__name__ # type: ignore def failsafe_deserialize(self, target_obj, data, content_type=None): """Ignores any errors encountered in deserialization, @@ -1496,7 +1525,7 @@ def failsafe_deserialize(self, target_obj, data, content_type=None): a deserialization error. :param str target_obj: The target object type to deserialize to. - :param str/dict data: The response data to deseralize. + :param str/dict data: The response data to deserialize. :param str content_type: Swagger "produces" if available. """ try: diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_vendor.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_vendor.py index 9aad73fc743e..bd0df84f5319 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_vendor.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_vendor.py @@ -5,6 +5,8 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from typing import List, cast + from azure.core.pipeline.transport import HttpRequest @@ -22,6 +24,7 @@ def _format_url_section(template, **kwargs): try: return template.format(**kwargs) except KeyError as key: - formatted_components = template.split("/") + # Need the cast, as for some reasons "split" is typed as list[str | Any] + formatted_components = cast(List[str], template.split("/")) components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] template = "/".join(components) diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_version.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_version.py index f1fb63697cf5..48944bf3938a 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_version.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.1.0b2" +VERSION = "2.0.0" diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_azure_databricks_management_client.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_azure_databricks_management_client.py index e0b9c2b6413a..f2fb0d7e332c 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_azure_databricks_management_client.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_azure_databricks_management_client.py @@ -31,8 +31,8 @@ class AzureDatabricksManagementClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes - """The Microsoft Azure management APIs allow end users to operate on Azure Databricks Workspace - resources. + """The Microsoft Azure management APIs allow end users to operate on Azure Databricks Workspace / + Access Connector resources. :ivar workspaces: WorkspacesOperations operations :vartype workspaces: azure.mgmt.databricks.aio.operations.WorkspacesOperations @@ -58,9 +58,6 @@ class AzureDatabricksManagementClient: # pylint: disable=client-accepts-api-ver :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str - :keyword api_version: Api Version. Default value is "2022-04-01-preview". Note that overriding - this default value may result in unsupported behavior. - :paramtype api_version: str :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present. """ @@ -75,7 +72,7 @@ def __init__( self._config = AzureDatabricksManagementClientConfiguration( credential=credential, subscription_id=subscription_id, **kwargs ) - self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) + self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) @@ -126,5 +123,5 @@ async def __aenter__(self) -> "AzureDatabricksManagementClient": await self._client.__aenter__() return self - async def __aexit__(self, *exc_details) -> None: + async def __aexit__(self, *exc_details: Any) -> None: await self._client.__aexit__(*exc_details) diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_configuration.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_configuration.py index 80c40b3e465d..ba1486eedc60 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_configuration.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/_configuration.py @@ -6,7 +6,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, TYPE_CHECKING from azure.core.configuration import Configuration @@ -15,11 +14,6 @@ from .._version import VERSION -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential @@ -35,15 +29,10 @@ class AzureDatabricksManagementClientConfiguration(Configuration): # pylint: di :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2022-04-01-preview". Note that overriding - this default value may result in unsupported behavior. - :paramtype api_version: str """ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(AzureDatabricksManagementClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-04-01-preview"] = kwargs.pop("api_version", "2022-04-01-preview") - if credential is None: raise ValueError("Parameter 'credential' must not be None.") if subscription_id is None: @@ -51,7 +40,6 @@ def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **k self.credential = credential self.subscription_id = subscription_id - self.api_version = api_version self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) kwargs.setdefault("sdk_moniker", "mgmt-databricks/{}".format(VERSION)) self._configure(**kwargs) diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_access_connectors_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_access_connectors_operations.py index 5817befb7142..c27bbf1b9c6d 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_access_connectors_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_access_connectors_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( @@ -40,10 +39,6 @@ build_update_request, ) -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -92,9 +87,7 @@ async def get(self, resource_group_name: str, connector_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) request = build_get_request( @@ -109,8 +102,9 @@ async def get(self, resource_group_name: str, connector_name: str, **kwargs: Any request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -145,9 +139,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -162,8 +154,9 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -204,9 +197,7 @@ async def begin_delete(self, resource_group_name: str, connector_name: str, **kw _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -264,16 +255,14 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "AccessConnector") @@ -293,8 +282,9 @@ async def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -409,7 +399,7 @@ async def begin_create_or_update( :param connector_name: The name of the azure databricks accessConnector. Required. :type connector_name: str :param parameters: Parameters supplied to the create or update an azure databricks - accessConnector. Is either a model type or a IO type. Required. + accessConnector. Is either a AccessConnector type or a IO type. Required. :type parameters: ~azure.mgmt.databricks.models.AccessConnector or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -430,9 +420,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -495,16 +483,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[Optional[_models.AccessConnector]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "AccessConnectorUpdate") @@ -524,8 +510,9 @@ async def _update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -635,8 +622,8 @@ async def begin_update( :type resource_group_name: str :param connector_name: The name of the azure databricks accessConnector. Required. :type connector_name: str - :param parameters: The update to the azure databricks accessConnector. Is either a model type - or a IO type. Required. + :param parameters: The update to the azure databricks accessConnector. Is either a + AccessConnectorUpdate type or a IO type. Required. :type parameters: ~azure.mgmt.databricks.models.AccessConnectorUpdate or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -657,9 +644,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -721,9 +706,7 @@ def list_by_resource_group( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[_models.AccessConnectorListResult] = kwargs.pop("cls", None) error_map = { @@ -749,18 +732,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -776,8 +748,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -806,9 +779,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.AccessCo _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[_models.AccessConnectorListResult] = kwargs.pop("cls", None) error_map = { @@ -833,18 +804,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -860,8 +820,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_operations.py index c625981a031b..de022539b725 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_operations.py @@ -6,9 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar -import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( @@ -30,10 +28,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -69,9 +63,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { @@ -95,18 +87,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -122,8 +103,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_outbound_network_dependencies_endpoints_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_outbound_network_dependencies_endpoints_operations.py index 52a2514648e3..9ad1ef8fb372 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_outbound_network_dependencies_endpoints_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_outbound_network_dependencies_endpoints_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, List, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from ..._vendor import _convert_request from ...operations._outbound_network_dependencies_endpoints_operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -87,9 +82,7 @@ async def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[List[_models.OutboundEnvironmentEndpoint]] = kwargs.pop("cls", None) request = build_list_request( @@ -104,8 +97,9 @@ async def list( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_endpoint_connections_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_endpoint_connections_operations.py index 006bce65c7d7..1a1dc18d5f27 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_endpoint_connections_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_endpoint_connections_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( @@ -38,10 +37,6 @@ build_list_request, ) -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -88,9 +83,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.PrivateEndpointConnectionsList] = kwargs.pop("cls", None) error_map = { @@ -117,18 +110,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -144,8 +126,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -193,9 +176,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -211,8 +192,9 @@ async def get( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -252,16 +234,14 @@ async def _create_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -282,8 +262,9 @@ async def _create_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -415,7 +396,7 @@ async def begin_create( :param private_endpoint_connection_name: The name of the private endpoint connection. Required. :type private_endpoint_connection_name: str :param private_endpoint_connection: The private endpoint connection with updated properties. Is - either a model type or a IO type. Required. + either a PrivateEndpointConnection type or a IO type. Required. :type private_endpoint_connection: ~azure.mgmt.databricks.models.PrivateEndpointConnection or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -438,9 +419,7 @@ async def begin_create( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -500,9 +479,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -518,8 +495,9 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -566,9 +544,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_link_resources_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_link_resources_operations.py index deba832e4752..292b13ae31ac 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_link_resources_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_private_link_resources_operations.py @@ -6,9 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar -import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( @@ -31,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._private_link_resources_operations import build_get_request, build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -80,9 +74,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.PrivateLinkResourcesList] = kwargs.pop("cls", None) error_map = { @@ -109,18 +101,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -136,8 +117,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -185,9 +167,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( @@ -203,8 +183,9 @@ async def get( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_vnet_peering_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_vnet_peering_operations.py index 54afffddb762..02a4ff40a45c 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_vnet_peering_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_vnet_peering_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( @@ -38,10 +37,6 @@ build_list_by_workspace_request, ) -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -94,9 +89,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[Optional[_models.VirtualNetworkPeering]] = kwargs.pop("cls", None) request = build_get_request( @@ -112,8 +105,9 @@ async def get( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -150,9 +144,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -168,8 +160,9 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -214,9 +207,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -276,16 +267,14 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.VirtualNetworkPeering] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(virtual_network_peering_parameters, (IO, bytes)): + if isinstance(virtual_network_peering_parameters, (IOBase, bytes)): _content = virtual_network_peering_parameters else: _json = self._serialize.body(virtual_network_peering_parameters, "VirtualNetworkPeering") @@ -306,8 +295,9 @@ async def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -431,7 +421,7 @@ async def begin_create_or_update( :param peering_name: The name of the workspace vNet peering. Required. :type peering_name: str :param virtual_network_peering_parameters: Parameters supplied to the create workspace vNet - Peering. Is either a model type or a IO type. Required. + Peering. Is either a VirtualNetworkPeering type or a IO type. Required. :type virtual_network_peering_parameters: ~azure.mgmt.databricks.models.VirtualNetworkPeering or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -453,9 +443,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.VirtualNetworkPeering] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -522,9 +510,7 @@ def list_by_workspace( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.VirtualNetworkPeeringList] = kwargs.pop("cls", None) error_map = { @@ -551,18 +537,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -578,8 +553,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_workspaces_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_workspaces_operations.py index 753a9f3a8864..b2a46117a8d3 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_workspaces_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/aio/operations/_workspaces_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ( @@ -40,10 +39,6 @@ build_update_request, ) -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -92,9 +87,7 @@ async def get(self, resource_group_name: str, workspace_name: str, **kwargs: Any _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) request = build_get_request( @@ -109,8 +102,9 @@ async def get(self, resource_group_name: str, workspace_name: str, **kwargs: Any request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -145,9 +139,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -162,8 +154,9 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -204,9 +197,7 @@ async def begin_delete(self, resource_group_name: str, workspace_name: str, **kw _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -260,16 +251,14 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "Workspace") @@ -289,8 +278,9 @@ async def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -398,8 +388,8 @@ async def begin_create_or_update( :type resource_group_name: str :param workspace_name: The name of the workspace. Required. :type workspace_name: str - :param parameters: Parameters supplied to the create or update a workspace. Is either a model - type or a IO type. Required. + :param parameters: Parameters supplied to the create or update a workspace. Is either a + Workspace type or a IO type. Required. :type parameters: ~azure.mgmt.databricks.models.Workspace or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -420,9 +410,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -485,16 +473,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[Optional[_models.Workspace]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "WorkspaceUpdate") @@ -514,8 +500,9 @@ async def _update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -625,7 +612,8 @@ async def begin_update( :type resource_group_name: str :param workspace_name: The name of the workspace. Required. :type workspace_name: str - :param parameters: The update to the workspace. Is either a model type or a IO type. Required. + :param parameters: The update to the workspace. Is either a WorkspaceUpdate type or a IO type. + Required. :type parameters: ~azure.mgmt.databricks.models.WorkspaceUpdate or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -646,9 +634,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -708,9 +694,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.WorkspaceListResult] = kwargs.pop("cls", None) error_map = { @@ -736,18 +720,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -763,8 +736,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -793,9 +767,7 @@ def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.Workspac _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.WorkspaceListResult] = kwargs.pop("cls", None) error_map = { @@ -820,18 +792,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -847,8 +808,9 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/__init__.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/__init__.py index a167f64ff43e..ac37825003f8 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/__init__.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/__init__.py @@ -23,10 +23,10 @@ from ._models_py3 import ErrorResponse from ._models_py3 import GroupIdInformation from ._models_py3 import GroupIdInformationProperties -from ._models_py3 import IdentityData from ._models_py3 import ManagedDiskEncryption from ._models_py3 import ManagedDiskEncryptionKeyVaultProperties from ._models_py3 import ManagedIdentityConfiguration +from ._models_py3 import ManagedServiceIdentity from ._models_py3 import Operation from ._models_py3 import OperationDisplay from ._models_py3 import OperationListResult @@ -41,6 +41,7 @@ from ._models_py3 import Sku from ._models_py3 import SystemData from ._models_py3 import TrackedResource +from ._models_py3 import UserAssignedIdentity from ._models_py3 import VirtualNetworkPeering from ._models_py3 import VirtualNetworkPeeringList from ._models_py3 import VirtualNetworkPeeringPropertiesFormatDatabricksVirtualNetwork @@ -59,8 +60,8 @@ from ._azure_databricks_management_client_enums import CreatedByType from ._azure_databricks_management_client_enums import CustomParameterType from ._azure_databricks_management_client_enums import EncryptionKeySource -from ._azure_databricks_management_client_enums import IdentityType from ._azure_databricks_management_client_enums import KeySource +from ._azure_databricks_management_client_enums import ManagedServiceIdentityType from ._azure_databricks_management_client_enums import PeeringProvisioningState from ._azure_databricks_management_client_enums import PeeringState from ._azure_databricks_management_client_enums import PrivateEndpointConnectionProvisioningState @@ -90,10 +91,10 @@ "ErrorResponse", "GroupIdInformation", "GroupIdInformationProperties", - "IdentityData", "ManagedDiskEncryption", "ManagedDiskEncryptionKeyVaultProperties", "ManagedIdentityConfiguration", + "ManagedServiceIdentity", "Operation", "OperationDisplay", "OperationListResult", @@ -108,6 +109,7 @@ "Sku", "SystemData", "TrackedResource", + "UserAssignedIdentity", "VirtualNetworkPeering", "VirtualNetworkPeeringList", "VirtualNetworkPeeringPropertiesFormatDatabricksVirtualNetwork", @@ -125,8 +127,8 @@ "CreatedByType", "CustomParameterType", "EncryptionKeySource", - "IdentityType", "KeySource", + "ManagedServiceIdentityType", "PeeringProvisioningState", "PeeringState", "PrivateEndpointConnectionProvisioningState", diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_azure_databricks_management_client_enums.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_azure_databricks_management_client_enums.py index 9f03ff71b49a..d2c537b8f206 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_azure_databricks_management_client_enums.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_azure_databricks_management_client_enums.py @@ -33,13 +33,6 @@ class EncryptionKeySource(str, Enum, metaclass=CaseInsensitiveEnumMeta): MICROSOFT_KEYVAULT = "Microsoft.Keyvault" -class IdentityType(str, Enum, metaclass=CaseInsensitiveEnumMeta): - """The identity type.""" - - NONE = "None" - SYSTEM_ASSIGNED = "SystemAssigned" - - class KeySource(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The encryption keySource (provider). Possible values (case-insensitive): Default, Microsoft.Keyvault. @@ -49,6 +42,17 @@ class KeySource(str, Enum, metaclass=CaseInsensitiveEnumMeta): MICROSOFT_KEYVAULT = "Microsoft.Keyvault" +class ManagedServiceIdentityType(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Type of managed service identity (where both SystemAssigned and UserAssigned types are + allowed). + """ + + NONE = "None" + SYSTEM_ASSIGNED = "SystemAssigned" + USER_ASSIGNED = "UserAssigned" + SYSTEM_ASSIGNED_USER_ASSIGNED = "SystemAssigned,UserAssigned" + + class PeeringProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The current provisioning state.""" diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_models_py3.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_models_py3.py index 79901cc3e9b5..9e28712ebc0b 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_models_py3.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_models_py3.py @@ -51,7 +51,7 @@ class Resource(_serialization.Model): "type": {"key": "type", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.id = None @@ -95,7 +95,7 @@ class TrackedResource(Resource): "location": {"key": "location", "type": "str"}, } - def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kwargs): + def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kwargs: Any) -> None: """ :keyword tags: Resource tags. :paramtype tags: dict[str, str] @@ -126,8 +126,10 @@ class AccessConnector(TrackedResource): :vartype tags: dict[str, str] :ivar location: The geo-location where the resource lives. Required. :vartype location: str - :ivar identity: Identity for the resource. - :vartype identity: ~azure.mgmt.databricks.models.IdentityData + :ivar identity: Managed service identity (system assigned and/or user assigned identities). + :vartype identity: ~azure.mgmt.databricks.models.ManagedServiceIdentity + :ivar system_data: The system metadata relating to this resource. + :vartype system_data: ~azure.mgmt.databricks.models.SystemData :ivar properties: Azure Databricks accessConnector properties. :vartype properties: ~azure.mgmt.databricks.models.AccessConnectorProperties """ @@ -137,6 +139,7 @@ class AccessConnector(TrackedResource): "name": {"readonly": True}, "type": {"readonly": True}, "location": {"required": True}, + "system_data": {"readonly": True}, } _attribute_map = { @@ -145,7 +148,8 @@ class AccessConnector(TrackedResource): "type": {"key": "type", "type": "str"}, "tags": {"key": "tags", "type": "{str}"}, "location": {"key": "location", "type": "str"}, - "identity": {"key": "identity", "type": "IdentityData"}, + "identity": {"key": "identity", "type": "ManagedServiceIdentity"}, + "system_data": {"key": "systemData", "type": "SystemData"}, "properties": {"key": "properties", "type": "AccessConnectorProperties"}, } @@ -154,22 +158,23 @@ def __init__( *, location: str, tags: Optional[Dict[str, str]] = None, - identity: Optional["_models.IdentityData"] = None, + identity: Optional["_models.ManagedServiceIdentity"] = None, properties: Optional["_models.AccessConnectorProperties"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword tags: Resource tags. :paramtype tags: dict[str, str] :keyword location: The geo-location where the resource lives. Required. :paramtype location: str - :keyword identity: Identity for the resource. - :paramtype identity: ~azure.mgmt.databricks.models.IdentityData + :keyword identity: Managed service identity (system assigned and/or user assigned identities). + :paramtype identity: ~azure.mgmt.databricks.models.ManagedServiceIdentity :keyword properties: Azure Databricks accessConnector properties. :paramtype properties: ~azure.mgmt.databricks.models.AccessConnectorProperties """ super().__init__(tags=tags, location=location, **kwargs) self.identity = identity + self.system_data = None self.properties = properties @@ -188,8 +193,8 @@ class AccessConnectorListResult(_serialization.Model): } def __init__( - self, *, value: Optional[List["_models.AccessConnector"]] = None, next_link: Optional[str] = None, **kwargs - ): + self, *, value: Optional[List["_models.AccessConnector"]] = None, next_link: Optional[str] = None, **kwargs: Any + ) -> None: """ :keyword value: The array of azure databricks accessConnector. :paramtype value: list[~azure.mgmt.databricks.models.AccessConnector] @@ -220,7 +225,7 @@ class AccessConnectorProperties(_serialization.Model): "provisioning_state": {"key": "provisioningState", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.provisioning_state = None @@ -231,23 +236,27 @@ class AccessConnectorUpdate(_serialization.Model): :ivar tags: Resource tags. :vartype tags: dict[str, str] - :ivar identity: The identity of the resource. - :vartype identity: ~azure.mgmt.databricks.models.IdentityData + :ivar identity: Managed service identity (system assigned and/or user assigned identities). + :vartype identity: ~azure.mgmt.databricks.models.ManagedServiceIdentity """ _attribute_map = { "tags": {"key": "tags", "type": "{str}"}, - "identity": {"key": "identity", "type": "IdentityData"}, + "identity": {"key": "identity", "type": "ManagedServiceIdentity"}, } def __init__( - self, *, tags: Optional[Dict[str, str]] = None, identity: Optional["_models.IdentityData"] = None, **kwargs - ): + self, + *, + tags: Optional[Dict[str, str]] = None, + identity: Optional["_models.ManagedServiceIdentity"] = None, + **kwargs: Any + ) -> None: """ :keyword tags: Resource tags. :paramtype tags: dict[str, str] - :keyword identity: The identity of the resource. - :paramtype identity: ~azure.mgmt.databricks.models.IdentityData + :keyword identity: Managed service identity (system assigned and/or user assigned identities). + :paramtype identity: ~azure.mgmt.databricks.models.ManagedServiceIdentity """ super().__init__(**kwargs) self.tags = tags @@ -255,7 +264,8 @@ def __init__( class AddressSpace(_serialization.Model): - """AddressSpace contains an array of IP address ranges that can be used by subnets of the virtual network. + """AddressSpace contains an array of IP address ranges that can be used by subnets of the virtual + network. :ivar address_prefixes: A list of address blocks reserved for this virtual network in CIDR notation. @@ -266,7 +276,7 @@ class AddressSpace(_serialization.Model): "address_prefixes": {"key": "addressPrefixes", "type": "[str]"}, } - def __init__(self, *, address_prefixes: Optional[List[str]] = None, **kwargs): + def __init__(self, *, address_prefixes: Optional[List[str]] = None, **kwargs: Any) -> None: """ :keyword address_prefixes: A list of address blocks reserved for this virtual network in CIDR notation. @@ -302,7 +312,7 @@ class CreatedBy(_serialization.Model): "application_id": {"key": "applicationId", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.oid = None @@ -338,8 +348,8 @@ def __init__( key_name: Optional[str] = None, key_version: Optional[str] = None, key_vault_uri: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword key_source: The encryption keySource (provider). Possible values (case-insensitive): Default, Microsoft.Keyvault. Known values are: "Default" and "Microsoft.Keyvault". @@ -377,8 +387,8 @@ def __init__( *, managed_services: Optional["_models.EncryptionV2"] = None, managed_disk: Optional["_models.ManagedDiskEncryption"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword managed_services: Encryption properties for the databricks managed services. :paramtype managed_services: ~azure.mgmt.databricks.models.EncryptionV2 @@ -416,8 +426,8 @@ def __init__( *, key_source: Union[str, "_models.EncryptionKeySource"], key_vault_properties: Optional["_models.EncryptionV2KeyVaultProperties"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword key_source: The encryption keySource (provider). Possible values (case-insensitive): Microsoft.Keyvault. Required. "Microsoft.Keyvault" @@ -455,7 +465,7 @@ class EncryptionV2KeyVaultProperties(_serialization.Model): "key_version": {"key": "keyVersion", "type": "str"}, } - def __init__(self, *, key_vault_uri: str, key_name: str, key_version: str, **kwargs): + def __init__(self, *, key_vault_uri: str, key_name: str, key_version: str, **kwargs: Any) -> None: """ :keyword key_vault_uri: The Uri of KeyVault. Required. :paramtype key_vault_uri: str @@ -489,8 +499,8 @@ def __init__( *, domain_name: Optional[str] = None, endpoint_details: Optional[List["_models.EndpointDetail"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword domain_name: The domain name of the dependency. :paramtype domain_name: str @@ -531,8 +541,8 @@ def __init__( port: Optional[int] = None, latency: Optional[float] = None, is_accessible: Optional[bool] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword ip_address: An IP Address that Domain Name currently resolves to. :paramtype ip_address: str @@ -576,7 +586,7 @@ class ErrorDetail(_serialization.Model): "target": {"key": "target", "type": "str"}, } - def __init__(self, *, code: str, message: str, target: Optional[str] = None, **kwargs): + def __init__(self, *, code: str, message: str, target: Optional[str] = None, **kwargs: Any) -> None: """ :keyword code: The error's code. Required. :paramtype code: str @@ -625,8 +635,8 @@ def __init__( message: str, details: Optional[List["_models.ErrorDetail"]] = None, innererror: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword code: A machine readable error code. Required. :paramtype code: str @@ -661,7 +671,7 @@ class ErrorResponse(_serialization.Model): "error": {"key": "error", "type": "ErrorInfo"}, } - def __init__(self, *, error: "_models.ErrorInfo", **kwargs): + def __init__(self, *, error: "_models.ErrorInfo", **kwargs: Any) -> None: """ :keyword error: The error details. Required. :paramtype error: ~azure.mgmt.databricks.models.ErrorInfo @@ -703,7 +713,7 @@ class GroupIdInformation(Resource): "properties": {"key": "properties", "type": "GroupIdInformationProperties"}, } - def __init__(self, *, properties: "_models.GroupIdInformationProperties", **kwargs): + def __init__(self, *, properties: "_models.GroupIdInformationProperties", **kwargs: Any) -> None: """ :keyword properties: The group id properties. Required. :paramtype properties: ~azure.mgmt.databricks.models.GroupIdInformationProperties @@ -735,8 +745,8 @@ def __init__( group_id: Optional[str] = None, required_members: Optional[List[str]] = None, required_zone_names: Optional[List[str]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword group_id: The group id. :paramtype group_id: str @@ -751,44 +761,6 @@ def __init__( self.required_zone_names = required_zone_names -class IdentityData(_serialization.Model): - """Identity for the resource. - - Variables are only populated by the server, and will be ignored when sending a request. - - All required parameters must be populated in order to send to Azure. - - :ivar principal_id: The principal ID of resource identity. - :vartype principal_id: str - :ivar tenant_id: The tenant ID of resource. - :vartype tenant_id: str - :ivar type: The identity type. Required. Known values are: "None" and "SystemAssigned". - :vartype type: str or ~azure.mgmt.databricks.models.IdentityType - """ - - _validation = { - "principal_id": {"readonly": True}, - "tenant_id": {"readonly": True}, - "type": {"required": True}, - } - - _attribute_map = { - "principal_id": {"key": "principalId", "type": "str"}, - "tenant_id": {"key": "tenantId", "type": "str"}, - "type": {"key": "type", "type": "str"}, - } - - def __init__(self, *, type: Union[str, "_models.IdentityType"], **kwargs): - """ - :keyword type: The identity type. Required. Known values are: "None" and "SystemAssigned". - :paramtype type: str or ~azure.mgmt.databricks.models.IdentityType - """ - super().__init__(**kwargs) - self.principal_id = None - self.tenant_id = None - self.type = type - - class ManagedDiskEncryption(_serialization.Model): """The object that contains details of encryption used on the workspace. @@ -822,8 +794,8 @@ def __init__( key_source: Union[str, "_models.EncryptionKeySource"], key_vault_properties: "_models.ManagedDiskEncryptionKeyVaultProperties", rotation_to_latest_key_version_enabled: Optional[bool] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword key_source: The encryption keySource (provider). Possible values (case-insensitive): Microsoft.Keyvault. Required. "Microsoft.Keyvault" @@ -866,7 +838,7 @@ class ManagedDiskEncryptionKeyVaultProperties(_serialization.Model): "key_version": {"key": "keyVersion", "type": "str"}, } - def __init__(self, *, key_vault_uri: str, key_name: str, key_version: str, **kwargs): + def __init__(self, *, key_vault_uri: str, key_name: str, key_version: str, **kwargs: Any) -> None: """ :keyword key_vault_uri: The URI of KeyVault. Required. :paramtype key_vault_uri: str @@ -907,7 +879,7 @@ class ManagedIdentityConfiguration(_serialization.Model): "type": {"key": "type", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.principal_id = None @@ -915,6 +887,70 @@ def __init__(self, **kwargs): self.type = None +class ManagedServiceIdentity(_serialization.Model): + """Managed service identity (system assigned and/or user assigned identities). + + Variables are only populated by the server, and will be ignored when sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar principal_id: The service principal ID of the system assigned identity. This property + will only be provided for a system assigned identity. + :vartype principal_id: str + :ivar tenant_id: The tenant ID of the system assigned identity. This property will only be + provided for a system assigned identity. + :vartype tenant_id: str + :ivar type: Type of managed service identity (where both SystemAssigned and UserAssigned types + are allowed). Required. Known values are: "None", "SystemAssigned", "UserAssigned", and + "SystemAssigned,UserAssigned". + :vartype type: str or ~azure.mgmt.databricks.models.ManagedServiceIdentityType + :ivar user_assigned_identities: The set of user assigned identities associated with the + resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. + The dictionary values can be empty objects ({}) in requests. + :vartype user_assigned_identities: dict[str, + ~azure.mgmt.databricks.models.UserAssignedIdentity] + """ + + _validation = { + "principal_id": {"readonly": True}, + "tenant_id": {"readonly": True}, + "type": {"required": True}, + } + + _attribute_map = { + "principal_id": {"key": "principalId", "type": "str"}, + "tenant_id": {"key": "tenantId", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "user_assigned_identities": {"key": "userAssignedIdentities", "type": "{UserAssignedIdentity}"}, + } + + def __init__( + self, + *, + type: Union[str, "_models.ManagedServiceIdentityType"], + user_assigned_identities: Optional[Dict[str, "_models.UserAssignedIdentity"]] = None, + **kwargs: Any + ) -> None: + """ + :keyword type: Type of managed service identity (where both SystemAssigned and UserAssigned + types are allowed). Required. Known values are: "None", "SystemAssigned", "UserAssigned", and + "SystemAssigned,UserAssigned". + :paramtype type: str or ~azure.mgmt.databricks.models.ManagedServiceIdentityType + :keyword user_assigned_identities: The set of user assigned identities associated with the + resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}. + The dictionary values can be empty objects ({}) in requests. + :paramtype user_assigned_identities: dict[str, + ~azure.mgmt.databricks.models.UserAssignedIdentity] + """ + super().__init__(**kwargs) + self.principal_id = None + self.tenant_id = None + self.type = type + self.user_assigned_identities = user_assigned_identities + + class Operation(_serialization.Model): """REST API operation. @@ -929,7 +965,9 @@ class Operation(_serialization.Model): "display": {"key": "display", "type": "OperationDisplay"}, } - def __init__(self, *, name: Optional[str] = None, display: Optional["_models.OperationDisplay"] = None, **kwargs): + def __init__( + self, *, name: Optional[str] = None, display: Optional["_models.OperationDisplay"] = None, **kwargs: Any + ) -> None: """ :keyword name: Operation name: {provider}/{resource}/{operation}. :paramtype name: str @@ -944,18 +982,21 @@ def __init__(self, *, name: Optional[str] = None, display: Optional["_models.Ope class OperationDisplay(_serialization.Model): """The object that represents the operation. - :ivar provider: Service provider: Microsoft.ResourceProvider. + :ivar provider: Service provider: ex Microsoft.Databricks. :vartype provider: str :ivar resource: Resource on which the operation is performed. :vartype resource: str :ivar operation: Operation type: Read, write, delete, etc. :vartype operation: str + :ivar description: Description for the resource operation. + :vartype description: str """ _attribute_map = { "provider": {"key": "provider", "type": "str"}, "resource": {"key": "resource", "type": "str"}, "operation": {"key": "operation", "type": "str"}, + "description": {"key": "description", "type": "str"}, } def __init__( @@ -964,24 +1005,29 @@ def __init__( provider: Optional[str] = None, resource: Optional[str] = None, operation: Optional[str] = None, - **kwargs - ): + description: Optional[str] = None, + **kwargs: Any + ) -> None: """ - :keyword provider: Service provider: Microsoft.ResourceProvider. + :keyword provider: Service provider: ex Microsoft.Databricks. :paramtype provider: str :keyword resource: Resource on which the operation is performed. :paramtype resource: str :keyword operation: Operation type: Read, write, delete, etc. :paramtype operation: str + :keyword description: Description for the resource operation. + :paramtype description: str """ super().__init__(**kwargs) self.provider = provider self.resource = resource self.operation = operation + self.description = description class OperationListResult(_serialization.Model): - """Result of the request to list Resource Provider operations. It contains a list of operations and a URL link to get the next set of results. + """Result of the request to list Resource Provider operations. It contains a list of operations + and a URL link to get the next set of results. :ivar value: List of Resource Provider operations supported by the Resource Provider resource provider. @@ -995,7 +1041,9 @@ class OperationListResult(_serialization.Model): "next_link": {"key": "nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.Operation"]] = None, next_link: Optional[str] = None, **kwargs): + def __init__( + self, *, value: Optional[List["_models.Operation"]] = None, next_link: Optional[str] = None, **kwargs: Any + ) -> None: """ :keyword value: List of Resource Provider operations supported by the Resource Provider resource provider. @@ -1028,8 +1076,8 @@ def __init__( *, category: Optional[str] = None, endpoints: Optional[List["_models.EndpointDependency"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword category: The category of endpoints accessed by the Workspace, e.g. azure-storage, azure-mysql, etc. @@ -1059,7 +1107,7 @@ class PrivateEndpoint(_serialization.Model): "id": {"key": "id", "type": "str"}, } - def __init__(self, **kwargs): + def __init__(self, **kwargs: Any) -> None: """ """ super().__init__(**kwargs) self.id = None @@ -1096,7 +1144,7 @@ class PrivateEndpointConnection(_serialization.Model): "properties": {"key": "properties", "type": "PrivateEndpointConnectionProperties"}, } - def __init__(self, *, properties: "_models.PrivateEndpointConnectionProperties", **kwargs): + def __init__(self, *, properties: "_models.PrivateEndpointConnectionProperties", **kwargs: Any) -> None: """ :keyword properties: The private endpoint connection properties. Required. :paramtype properties: ~azure.mgmt.databricks.models.PrivateEndpointConnectionProperties @@ -1117,6 +1165,8 @@ class PrivateEndpointConnectionProperties(_serialization.Model): :ivar private_endpoint: Private endpoint. :vartype private_endpoint: ~azure.mgmt.databricks.models.PrivateEndpoint + :ivar group_ids: GroupIds from the private link service resource. + :vartype group_ids: list[str] :ivar private_link_service_connection_state: Private endpoint connection state. Required. :vartype private_link_service_connection_state: ~azure.mgmt.databricks.models.PrivateLinkServiceConnectionState @@ -1133,6 +1183,7 @@ class PrivateEndpointConnectionProperties(_serialization.Model): _attribute_map = { "private_endpoint": {"key": "privateEndpoint", "type": "PrivateEndpoint"}, + "group_ids": {"key": "groupIds", "type": "[str]"}, "private_link_service_connection_state": { "key": "privateLinkServiceConnectionState", "type": "PrivateLinkServiceConnectionState", @@ -1145,17 +1196,21 @@ def __init__( *, private_link_service_connection_state: "_models.PrivateLinkServiceConnectionState", private_endpoint: Optional["_models.PrivateEndpoint"] = None, - **kwargs - ): + group_ids: Optional[List[str]] = None, + **kwargs: Any + ) -> None: """ :keyword private_endpoint: Private endpoint. :paramtype private_endpoint: ~azure.mgmt.databricks.models.PrivateEndpoint + :keyword group_ids: GroupIds from the private link service resource. + :paramtype group_ids: list[str] :keyword private_link_service_connection_state: Private endpoint connection state. Required. :paramtype private_link_service_connection_state: ~azure.mgmt.databricks.models.PrivateLinkServiceConnectionState """ super().__init__(**kwargs) self.private_endpoint = private_endpoint + self.group_ids = group_ids self.private_link_service_connection_state = private_link_service_connection_state self.provisioning_state = None @@ -1179,8 +1234,8 @@ def __init__( *, value: Optional[List["_models.PrivateEndpointConnection"]] = None, next_link: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword value: The list of returned private endpoint connection. :paramtype value: list[~azure.mgmt.databricks.models.PrivateEndpointConnection] @@ -1207,8 +1262,12 @@ class PrivateLinkResourcesList(_serialization.Model): } def __init__( - self, *, value: Optional[List["_models.GroupIdInformation"]] = None, next_link: Optional[str] = None, **kwargs - ): + self, + *, + value: Optional[List["_models.GroupIdInformation"]] = None, + next_link: Optional[str] = None, + **kwargs: Any + ) -> None: """ :keyword value: The list of available private link resources for a workspace. :paramtype value: list[~azure.mgmt.databricks.models.GroupIdInformation] @@ -1230,8 +1289,8 @@ class PrivateLinkServiceConnectionState(_serialization.Model): :vartype status: str or ~azure.mgmt.databricks.models.PrivateLinkServiceConnectionStatus :ivar description: The description for the current state of a private endpoint connection. :vartype description: str - :ivar action_required: Actions required for a private endpoint connection. - :vartype action_required: str + :ivar actions_required: Actions required for a private endpoint connection. + :vartype actions_required: str """ _validation = { @@ -1241,7 +1300,7 @@ class PrivateLinkServiceConnectionState(_serialization.Model): _attribute_map = { "status": {"key": "status", "type": "str"}, "description": {"key": "description", "type": "str"}, - "action_required": {"key": "actionRequired", "type": "str"}, + "actions_required": {"key": "actionsRequired", "type": "str"}, } def __init__( @@ -1249,22 +1308,22 @@ def __init__( *, status: Union[str, "_models.PrivateLinkServiceConnectionStatus"], description: Optional[str] = None, - action_required: Optional[str] = None, - **kwargs - ): + actions_required: Optional[str] = None, + **kwargs: Any + ) -> None: """ :keyword status: The status of a private endpoint connection. Required. Known values are: "Pending", "Approved", "Rejected", and "Disconnected". :paramtype status: str or ~azure.mgmt.databricks.models.PrivateLinkServiceConnectionStatus :keyword description: The description for the current state of a private endpoint connection. :paramtype description: str - :keyword action_required: Actions required for a private endpoint connection. - :paramtype action_required: str + :keyword actions_required: Actions required for a private endpoint connection. + :paramtype actions_required: str """ super().__init__(**kwargs) self.status = status self.description = description - self.action_required = action_required + self.actions_required = actions_required class Sku(_serialization.Model): @@ -1287,7 +1346,7 @@ class Sku(_serialization.Model): "tier": {"key": "tier", "type": "str"}, } - def __init__(self, *, name: str, tier: Optional[str] = None, **kwargs): + def __init__(self, *, name: str, tier: Optional[str] = None, **kwargs: Any) -> None: """ :keyword name: The SKU name. Required. :paramtype name: str @@ -1336,8 +1395,8 @@ def __init__( last_modified_by: Optional[str] = None, last_modified_by_type: Optional[Union[str, "_models.CreatedByType"]] = None, last_modified_at: Optional[datetime.datetime] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword created_by: The identity that created the resource. :paramtype created_by: str @@ -1363,6 +1422,34 @@ def __init__( self.last_modified_at = last_modified_at +class UserAssignedIdentity(_serialization.Model): + """User assigned identity properties. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar principal_id: The principal ID of the assigned identity. + :vartype principal_id: str + :ivar client_id: The client ID of the assigned identity. + :vartype client_id: str + """ + + _validation = { + "principal_id": {"readonly": True}, + "client_id": {"readonly": True}, + } + + _attribute_map = { + "principal_id": {"key": "principalId", "type": "str"}, + "client_id": {"key": "clientId", "type": "str"}, + } + + def __init__(self, **kwargs: Any) -> None: + """ """ + super().__init__(**kwargs) + self.principal_id = None + self.client_id = None + + class VirtualNetworkPeering(_serialization.Model): # pylint: disable=too-many-instance-attributes """Peerings in a VirtualNetwork resource. @@ -1457,8 +1544,8 @@ def __init__( ] = None, databricks_address_space: Optional["_models.AddressSpace"] = None, remote_address_space: Optional["_models.AddressSpace"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword allow_virtual_network_access: Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space. @@ -1527,8 +1614,8 @@ def __init__( *, value: Optional[List["_models.VirtualNetworkPeering"]] = None, next_link: Optional[str] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword value: List of virtual network peerings on workspace. :paramtype value: list[~azure.mgmt.databricks.models.VirtualNetworkPeering] @@ -1542,7 +1629,8 @@ def __init__( class VirtualNetworkPeeringPropertiesFormatDatabricksVirtualNetwork(_serialization.Model): - """The remote virtual network should be in the same region. See here to learn more (https://docs.microsoft.com/en-us/azure/databricks/administration-guide/cloud-configurations/azure/vnet-peering). + """The remote virtual network should be in the same region. See here to learn more + (https://docs.microsoft.com/en-us/azure/databricks/administration-guide/cloud-configurations/azure/vnet-peering). :ivar id: The Id of the databricks virtual network. :vartype id: str @@ -1552,7 +1640,7 @@ class VirtualNetworkPeeringPropertiesFormatDatabricksVirtualNetwork(_serializati "id": {"key": "id", "type": "str"}, } - def __init__(self, *, id: Optional[str] = None, **kwargs): # pylint: disable=redefined-builtin + def __init__(self, *, id: Optional[str] = None, **kwargs: Any) -> None: # pylint: disable=redefined-builtin """ :keyword id: The Id of the databricks virtual network. :paramtype id: str @@ -1562,7 +1650,8 @@ def __init__(self, *, id: Optional[str] = None, **kwargs): # pylint: disable=re class VirtualNetworkPeeringPropertiesFormatRemoteVirtualNetwork(_serialization.Model): - """The remote virtual network should be in the same region. See here to learn more (https://docs.microsoft.com/en-us/azure/databricks/administration-guide/cloud-configurations/azure/vnet-peering). + """The remote virtual network should be in the same region. See here to learn more + (https://docs.microsoft.com/en-us/azure/databricks/administration-guide/cloud-configurations/azure/vnet-peering). :ivar id: The Id of the remote virtual network. :vartype id: str @@ -1572,7 +1661,7 @@ class VirtualNetworkPeeringPropertiesFormatRemoteVirtualNetwork(_serialization.M "id": {"key": "id", "type": "str"}, } - def __init__(self, *, id: Optional[str] = None, **kwargs): # pylint: disable=redefined-builtin + def __init__(self, *, id: Optional[str] = None, **kwargs: Any) -> None: # pylint: disable=redefined-builtin """ :keyword id: The Id of the remote virtual network. :paramtype id: str @@ -1663,6 +1752,7 @@ class Workspace(TrackedResource): # pylint: disable=too-many-instance-attribute "created_date_time": {"readonly": True}, "workspace_id": {"readonly": True}, "workspace_url": {"readonly": True}, + "disk_encryption_set_id": {"readonly": True}, "private_endpoint_connections": {"readonly": True}, } @@ -1713,12 +1803,11 @@ def __init__( # pylint: disable=too-many-locals updated_by: Optional["_models.CreatedBy"] = None, storage_account_identity: Optional["_models.ManagedIdentityConfiguration"] = None, managed_disk_identity: Optional["_models.ManagedIdentityConfiguration"] = None, - disk_encryption_set_id: Optional[str] = None, encryption: Optional["_models.WorkspacePropertiesEncryption"] = None, public_network_access: Optional[Union[str, "_models.PublicNetworkAccess"]] = None, required_nsg_rules: Optional[Union[str, "_models.RequiredNsgRules"]] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword tags: Resource tags. :paramtype tags: dict[str, str] @@ -1745,8 +1834,6 @@ def __init__( # pylint: disable=too-many-locals :keyword managed_disk_identity: The details of Managed Identity of Disk Encryption Set used for Managed Disk Encryption. :paramtype managed_disk_identity: ~azure.mgmt.databricks.models.ManagedIdentityConfiguration - :keyword disk_encryption_set_id: The resource Id of the managed disk encryption set. - :paramtype disk_encryption_set_id: str :keyword encryption: Encryption properties for databricks workspace. :paramtype encryption: ~azure.mgmt.databricks.models.WorkspacePropertiesEncryption :keyword public_network_access: The network access type for accessing workspace. Set value to @@ -1773,7 +1860,7 @@ def __init__( # pylint: disable=too-many-locals self.workspace_url = None self.storage_account_identity = storage_account_identity self.managed_disk_identity = managed_disk_identity - self.disk_encryption_set_id = disk_encryption_set_id + self.disk_encryption_set_id = None self.encryption = encryption self.private_endpoint_connections = None self.public_network_access = public_network_access @@ -1804,7 +1891,7 @@ class WorkspaceCustomBooleanParameter(_serialization.Model): "value": {"key": "value", "type": "bool"}, } - def __init__(self, *, value: bool, **kwargs): + def __init__(self, *, value: bool, **kwargs: Any) -> None: """ :keyword value: The value which should be used for this field. Required. :paramtype value: bool @@ -1838,7 +1925,7 @@ class WorkspaceCustomObjectParameter(_serialization.Model): "value": {"key": "value", "type": "object"}, } - def __init__(self, *, value: JSON, **kwargs): + def __init__(self, *, value: JSON, **kwargs: Any) -> None: """ :keyword value: The value which should be used for this field. Required. :paramtype value: JSON @@ -1951,8 +2038,8 @@ def __init__( storage_account_name: Optional["_models.WorkspaceCustomStringParameter"] = None, storage_account_sku_name: Optional["_models.WorkspaceCustomStringParameter"] = None, vnet_address_prefix: Optional["_models.WorkspaceCustomStringParameter"] = None, - **kwargs - ): + **kwargs: Any + ) -> None: """ :keyword aml_workspace_id: The ID of a Azure Machine Learning workspace to link with Databricks workspace. @@ -2045,7 +2132,7 @@ class WorkspaceCustomStringParameter(_serialization.Model): "value": {"key": "value", "type": "str"}, } - def __init__(self, *, value: str, **kwargs): + def __init__(self, *, value: str, **kwargs: Any) -> None: """ :keyword value: The value which should be used for this field. Required. :paramtype value: str @@ -2076,7 +2163,7 @@ class WorkspaceEncryptionParameter(_serialization.Model): "value": {"key": "value", "type": "Encryption"}, } - def __init__(self, *, value: Optional["_models.Encryption"] = None, **kwargs): + def __init__(self, *, value: Optional["_models.Encryption"] = None, **kwargs: Any) -> None: """ :keyword value: The value which should be used for this field. :paramtype value: ~azure.mgmt.databricks.models.Encryption @@ -2100,7 +2187,9 @@ class WorkspaceListResult(_serialization.Model): "next_link": {"key": "nextLink", "type": "str"}, } - def __init__(self, *, value: Optional[List["_models.Workspace"]] = None, next_link: Optional[str] = None, **kwargs): + def __init__( + self, *, value: Optional[List["_models.Workspace"]] = None, next_link: Optional[str] = None, **kwargs: Any + ) -> None: """ :keyword value: The array of workspaces. :paramtype value: list[~azure.mgmt.databricks.models.Workspace] @@ -2129,7 +2218,7 @@ class WorkspacePropertiesEncryption(_serialization.Model): "entities": {"key": "entities", "type": "EncryptionEntitiesDefinition"}, } - def __init__(self, *, entities: "_models.EncryptionEntitiesDefinition", **kwargs): + def __init__(self, *, entities: "_models.EncryptionEntitiesDefinition", **kwargs: Any) -> None: """ :keyword entities: Encryption entities definition for the workspace. Required. :paramtype entities: ~azure.mgmt.databricks.models.EncryptionEntitiesDefinition @@ -2162,7 +2251,7 @@ class WorkspaceProviderAuthorization(_serialization.Model): "role_definition_id": {"key": "roleDefinitionId", "type": "str"}, } - def __init__(self, *, principal_id: str, role_definition_id: str, **kwargs): + def __init__(self, *, principal_id: str, role_definition_id: str, **kwargs: Any) -> None: """ :keyword principal_id: The provider's principal identifier. This is the identity that the provider will use to call ARM to manage the workspace resources. Required. @@ -2188,7 +2277,7 @@ class WorkspaceUpdate(_serialization.Model): "tags": {"key": "tags", "type": "{str}"}, } - def __init__(self, *, tags: Optional[Dict[str, str]] = None, **kwargs): + def __init__(self, *, tags: Optional[Dict[str, str]] = None, **kwargs: Any) -> None: """ :keyword tags: Resource tags. :paramtype tags: dict[str, str] diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_access_connectors_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_access_connectors_operations.py index 15300c39c535..c654e272a4e8 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_access_connectors_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_access_connectors_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.exceptions import ( ClientAuthenticationError, @@ -32,10 +31,6 @@ from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -49,9 +44,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -84,9 +77,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -119,9 +110,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -157,9 +146,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -193,9 +180,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -225,9 +210,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -291,9 +274,7 @@ def get(self, resource_group_name: str, connector_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) request = build_get_request( @@ -308,8 +289,9 @@ def get(self, resource_group_name: str, connector_name: str, **kwargs: Any) -> _ request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -344,9 +326,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -361,8 +341,9 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -403,9 +384,7 @@ def begin_delete(self, resource_group_name: str, connector_name: str, **kwargs: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -463,16 +442,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "AccessConnector") @@ -492,8 +469,9 @@ def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -608,7 +586,7 @@ def begin_create_or_update( :param connector_name: The name of the azure databricks accessConnector. Required. :type connector_name: str :param parameters: Parameters supplied to the create or update an azure databricks - accessConnector. Is either a model type or a IO type. Required. + accessConnector. Is either a AccessConnector type or a IO type. Required. :type parameters: ~azure.mgmt.databricks.models.AccessConnector or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -629,9 +607,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -694,16 +670,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[Optional[_models.AccessConnector]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "AccessConnectorUpdate") @@ -723,8 +697,9 @@ def _update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -834,8 +809,8 @@ def begin_update( :type resource_group_name: str :param connector_name: The name of the azure databricks accessConnector. Required. :type connector_name: str - :param parameters: The update to the azure databricks accessConnector. Is either a model type - or a IO type. Required. + :param parameters: The update to the azure databricks accessConnector. Is either a + AccessConnectorUpdate type or a IO type. Required. :type parameters: ~azure.mgmt.databricks.models.AccessConnectorUpdate or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -856,9 +831,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.AccessConnector] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -918,9 +891,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[_models.AccessConnectorListResult] = kwargs.pop("cls", None) error_map = { @@ -946,18 +917,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -973,8 +933,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -1003,9 +964,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.AccessConnect _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-05-01")) cls: ClsType[_models.AccessConnectorListResult] = kwargs.pop("cls", None) error_map = { @@ -1030,18 +989,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -1057,8 +1005,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_operations.py index 834dc40285f9..f7ffaffe1228 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_operations.py @@ -6,9 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar -import urllib.parse from azure.core.exceptions import ( ClientAuthenticationError, @@ -30,10 +28,6 @@ from .._serialization import Serializer from .._vendor import _convert_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,9 +39,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -93,9 +85,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { @@ -119,18 +109,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -146,8 +125,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_outbound_network_dependencies_endpoints_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_outbound_network_dependencies_endpoints_operations.py index ac4d7072014e..d5a292eb45b2 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_outbound_network_dependencies_endpoints_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_outbound_network_dependencies_endpoints_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, List, Optional, TypeVar from azure.core.exceptions import ( @@ -28,10 +27,6 @@ from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,9 +40,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -125,9 +118,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[List[_models.OutboundEnvironmentEndpoint]] = kwargs.pop("cls", None) request = build_list_request( @@ -142,8 +133,9 @@ def list( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_endpoint_connections_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_endpoint_connections_operations.py index 111dbdbacb95..ffe13a16a692 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_endpoint_connections_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_endpoint_connections_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.exceptions import ( ClientAuthenticationError, @@ -32,10 +31,6 @@ from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -49,9 +44,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -88,9 +81,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -130,9 +121,7 @@ def build_create_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -175,9 +164,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -248,9 +235,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.PrivateEndpointConnectionsList] = kwargs.pop("cls", None) error_map = { @@ -277,18 +262,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -304,8 +278,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -353,9 +328,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) request = build_get_request( @@ -371,8 +344,9 @@ def get( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -412,16 +386,14 @@ def _create_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(private_endpoint_connection, (IO, bytes)): + if isinstance(private_endpoint_connection, (IOBase, bytes)): _content = private_endpoint_connection else: _json = self._serialize.body(private_endpoint_connection, "PrivateEndpointConnection") @@ -442,8 +414,9 @@ def _create_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -573,7 +546,7 @@ def begin_create( :param private_endpoint_connection_name: The name of the private endpoint connection. Required. :type private_endpoint_connection_name: str :param private_endpoint_connection: The private endpoint connection with updated properties. Is - either a model type or a IO type. Required. + either a PrivateEndpointConnection type or a IO type. Required. :type private_endpoint_connection: ~azure.mgmt.databricks.models.PrivateEndpointConnection or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -595,9 +568,7 @@ def begin_create( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -657,9 +628,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -675,8 +644,9 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -723,9 +693,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_link_resources_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_link_resources_operations.py index 94f68554d157..ef2b862e3862 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_link_resources_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_private_link_resources_operations.py @@ -6,9 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar -import urllib.parse from azure.core.exceptions import ( ClientAuthenticationError, @@ -30,10 +28,6 @@ from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -47,9 +41,7 @@ def build_list_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -82,9 +74,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -152,9 +142,7 @@ def list( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.PrivateLinkResourcesList] = kwargs.pop("cls", None) error_map = { @@ -181,18 +169,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -208,8 +185,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -257,9 +235,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.GroupIdInformation] = kwargs.pop("cls", None) request = build_get_request( @@ -275,8 +251,9 @@ def get( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_vnet_peering_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_vnet_peering_operations.py index 2d2ce4ddb521..4d8af85087e4 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_vnet_peering_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_vnet_peering_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.exceptions import ( ClientAuthenticationError, @@ -32,10 +31,6 @@ from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -49,9 +44,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -85,9 +78,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -121,9 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -160,9 +149,7 @@ def build_list_by_workspace_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -237,9 +224,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[Optional[_models.VirtualNetworkPeering]] = kwargs.pop("cls", None) request = build_get_request( @@ -255,8 +240,9 @@ def get( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -293,9 +279,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -311,8 +295,9 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -357,9 +342,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -419,16 +402,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.VirtualNetworkPeering] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(virtual_network_peering_parameters, (IO, bytes)): + if isinstance(virtual_network_peering_parameters, (IOBase, bytes)): _content = virtual_network_peering_parameters else: _json = self._serialize.body(virtual_network_peering_parameters, "VirtualNetworkPeering") @@ -449,8 +430,9 @@ def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -574,7 +556,7 @@ def begin_create_or_update( :param peering_name: The name of the workspace vNet peering. Required. :type peering_name: str :param virtual_network_peering_parameters: Parameters supplied to the create workspace vNet - Peering. Is either a model type or a IO type. Required. + Peering. Is either a VirtualNetworkPeering type or a IO type. Required. :type virtual_network_peering_parameters: ~azure.mgmt.databricks.models.VirtualNetworkPeering or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. @@ -596,9 +578,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.VirtualNetworkPeering] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -664,9 +644,7 @@ def list_by_workspace( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.VirtualNetworkPeeringList] = kwargs.pop("cls", None) error_map = { @@ -693,18 +671,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -720,8 +687,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_workspaces_operations.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_workspaces_operations.py index 3b328548cb50..f45b6816d261 100644 --- a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_workspaces_operations.py +++ b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/operations/_workspaces_operations.py @@ -6,9 +6,8 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload -import urllib.parse from azure.core.exceptions import ( ClientAuthenticationError, @@ -32,10 +31,6 @@ from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -49,9 +44,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -84,9 +77,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -119,9 +110,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -157,9 +146,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -193,9 +180,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -225,9 +210,7 @@ def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> H _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", "2022-04-01-preview") - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -291,9 +274,7 @@ def get(self, resource_group_name: str, workspace_name: str, **kwargs: Any) -> _ _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) request = build_get_request( @@ -308,8 +289,9 @@ def get(self, resource_group_name: str, workspace_name: str, **kwargs: Any) -> _ request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -344,9 +326,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -361,8 +341,9 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -403,9 +384,7 @@ def begin_delete(self, resource_group_name: str, workspace_name: str, **kwargs: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -459,16 +438,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "Workspace") @@ -488,8 +465,9 @@ def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -595,8 +573,8 @@ def begin_create_or_update( :type resource_group_name: str :param workspace_name: The name of the workspace. Required. :type workspace_name: str - :param parameters: Parameters supplied to the create or update a workspace. Is either a model - type or a IO type. Required. + :param parameters: Parameters supplied to the create or update a workspace. Is either a + Workspace type or a IO type. Required. :type parameters: ~azure.mgmt.databricks.models.Workspace or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -616,9 +594,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -681,16 +657,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[Optional[_models.Workspace]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "WorkspaceUpdate") @@ -710,8 +684,9 @@ def _update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -819,7 +794,8 @@ def begin_update( :type resource_group_name: str :param workspace_name: The name of the workspace. Required. :type workspace_name: str - :param parameters: The update to the workspace. Is either a model type or a IO type. Required. + :param parameters: The update to the workspace. Is either a WorkspaceUpdate type or a IO type. + Required. :type parameters: ~azure.mgmt.databricks.models.WorkspaceUpdate or IO :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. Default value is None. @@ -839,9 +815,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Workspace] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -901,9 +875,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.WorkspaceListResult] = kwargs.pop("cls", None) error_map = { @@ -929,18 +901,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -956,8 +917,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response @@ -986,9 +948,7 @@ def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.Workspace"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-04-01-preview"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-02-01")) cls: ClsType[_models.WorkspaceListResult] = kwargs.pop("cls", None) error_map = { @@ -1013,18 +973,7 @@ def prepare_request(next_link=None): request.url = self._client.format_url(request.url) else: - # make call to next link with the client's api-version - _parsed_next_link = urllib.parse.urlparse(next_link) - _next_request_params = case_insensitive_dict( - { - key: [urllib.parse.quote(v) for v in value] - for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items() - } - ) - _next_request_params["api-version"] = self._config.api_version - request = HttpRequest( - "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params - ) + request = HttpRequest("GET", next_link) request = _convert_request(request) request.url = self._client.format_url(request.url) request.method = "GET" @@ -1040,8 +989,9 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) + _stream = False pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - request, stream=False, **kwargs + request, stream=_stream, **kwargs ) response = pipeline_response.http_response diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update.py index 331a5bcb46d9..ad41beb497b1 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/AccessConnectorCreateOrUpdate.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-05-01/examples/AccessConnectorCreateOrUpdate.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update_with_user_assigned.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update_with_user_assigned.py new file mode 100644 index 000000000000..aeaeac41a4dc --- /dev/null +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_create_or_update_with_user_assigned.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential +from azure.mgmt.databricks import AzureDatabricksManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-databricks +# USAGE + python access_connector_create_or_update_with_user_assigned.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureDatabricksManagementClient( + credential=DefaultAzureCredential(), + subscription_id="subid", + ) + + response = client.access_connectors.begin_create_or_update( + resource_group_name="rg", + connector_name="myAccessConnector", + parameters={"location": "westus"}, + ).result() + print(response) + + +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-05-01/examples/AccessConnectorCreateOrUpdateWithUserAssigned.json +if __name__ == "__main__": + main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_delete.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_delete.py index 9fcedfad32b5..382be65bf940 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_delete.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_delete.py @@ -29,13 +29,12 @@ def main(): subscription_id="subid", ) - response = client.access_connectors.begin_delete( + client.access_connectors.begin_delete( resource_group_name="rg", connector_name="myAccessConnector", ).result() - print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/AccessConnectorDelete.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-05-01/examples/AccessConnectorDelete.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_get.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_get.py index 7debc57e1302..9915650cb0fc 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_get.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_get.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/AccessConnectorGet.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-05-01/examples/AccessConnectorGet.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_patch_update.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_patch_update.py index c032d6ac38a8..90446cfa1dbf 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_patch_update.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connector_patch_update.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/AccessConnectorPatchUpdate.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-05-01/examples/AccessConnectorPatchUpdate.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_resource_group.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_resource_group.py index 597456f44593..03fcc99d8436 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_resource_group.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_resource_group.py @@ -36,6 +36,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/AccessConnectorsListByResourceGroup.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-05-01/examples/AccessConnectorsListByResourceGroup.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_subscription_id.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_subscription_id.py index 302bfbdfa275..e2c0b2130693 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_subscription_id.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/access_connectors_list_by_subscription_id.py @@ -34,6 +34,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/AccessConnectorsListBySubscriptionId.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-05-01/examples/AccessConnectorsListBySubscriptionId.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/disable_encryption.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/disable_encryption.py index 603b375aa49d..5b2885f2c212 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/disable_encryption.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/disable_encryption.py @@ -43,6 +43,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/DisableEncryption.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/DisableEncryption.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/enable_encryption.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/enable_encryption.py index b99c52d57818..5dcefd4874dd 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/enable_encryption.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/enable_encryption.py @@ -53,6 +53,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/EnableEncryption.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/EnableEncryption.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_endpoint_connections.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_endpoint_connections.py index 0369d8d393b3..72771d1f6e64 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_endpoint_connections.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_endpoint_connections.py @@ -37,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/ListPrivateEndpointConnections.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/ListPrivateEndpointConnections.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_link_resources.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_link_resources.py index b445103aea3c..f6c949cdd93a 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_link_resources.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/list_private_link_resources.py @@ -37,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/ListPrivateLinkResources.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/ListPrivateLinkResources.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/operations_list.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/operations_list.py index 4474c35aa9d2..8f4805d40a05 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/operations_list.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/operations_list.py @@ -34,6 +34,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/OperationsList.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/OperationsList.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/outbound_network_dependencies_endpoints_list.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/outbound_network_dependencies_endpoints_list.py index a43967b3bc7f..9e31d4e14af5 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/outbound_network_dependencies_endpoints_list.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/outbound_network_dependencies_endpoints_list.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/OutboundNetworkDependenciesEndpointsList.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/OutboundNetworkDependenciesEndpointsList.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/prepare_encryption.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/prepare_encryption.py index 01fe590f5f81..4c3469c30827 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/prepare_encryption.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/prepare_encryption.py @@ -43,6 +43,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrepareEncryption.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/PrepareEncryption.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_delete.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_delete.py index 98ee236f5e91..04977a28759f 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_delete.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_delete.py @@ -29,14 +29,13 @@ def main(): subscription_id="11111111-1111-1111-1111-111111111111", ) - response = client.private_endpoint_connections.begin_delete( + client.private_endpoint_connections.begin_delete( resource_group_name="myResourceGroup", workspace_name="myWorkspace", private_endpoint_connection_name="myWorkspace.23456789-1111-1111-1111-111111111111", ).result() - print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsDelete.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/PrivateEndpointConnectionsDelete.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_get.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_get.py index 25aa2f723d27..a575472ea6a9 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_get.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_get.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsGet.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/PrivateEndpointConnectionsGet.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_update.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_update.py index 4f9370453f44..b6bd920b70dc 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_update.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_endpoint_connections_update.py @@ -45,6 +45,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsUpdate.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/PrivateEndpointConnectionsUpdate.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_link_resources_get.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_link_resources_get.py index 5ed35d5dd392..05e95ba4db48 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/private_link_resources_get.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/private_link_resources_get.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateLinkResourcesGet.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/PrivateLinkResourcesGet.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create.py index 4a89d29062d0..281c09558388 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create.py @@ -40,6 +40,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceCreate.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceCreate.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create_with_parameters.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create_with_parameters.py index 647910056e83..536e3d920eb5 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create_with_parameters.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_create_with_parameters.py @@ -49,6 +49,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceCreateWithParameters.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceCreateWithParameters.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_delete.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_delete.py index 49bced920e18..bf7af1a64123 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_delete.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_delete.py @@ -29,13 +29,12 @@ def main(): subscription_id="subid", ) - response = client.workspaces.begin_delete( + client.workspaces.begin_delete( resource_group_name="rg", workspace_name="myWorkspace", ).result() - print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceDelete.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceDelete.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get.py index c8516544230a..eeff767db884 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceGet.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceGet.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get_parameters.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get_parameters.py index 9ec515579dbf..f5635ad9eb64 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get_parameters.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_get_parameters.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceGetParameters.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceGetParameters.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_create.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_create.py index fca93417ca5a..36786e299bb7 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_create.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_create.py @@ -55,6 +55,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceManagedDiskEncryptionCreate.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceManagedDiskEncryptionCreate.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_get.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_get.py index 9a7a93eed63b..cdea6e0feb72 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_get.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_get.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceManagedDiskEncryptionGet.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceManagedDiskEncryptionGet.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_update.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_update.py index d93ae78e43eb..0477f5f6bb62 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_update.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_managed_disk_encryption_update.py @@ -56,6 +56,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceManagedDiskEncryptionUpdate.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceManagedDiskEncryptionUpdate.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_update.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_update.py index 608bee2db1ba..936fa87f41a5 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_update.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_update.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceUpdate.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceUpdate.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_get.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_get.py index cf02ceb018a5..ffe862a7571e 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_get.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_get.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceVirtualNetPeeringGet.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceVirtualNetPeeringGet.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_list.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_list.py index 863a9a858895..b9b693f23db6 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_list.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_net_peering_list.py @@ -37,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceVirtualNetPeeringList.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceVirtualNetPeeringList.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_create_or_update.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_create_or_update.py new file mode 100644 index 000000000000..fb6e44baca00 --- /dev/null +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_create_or_update.py @@ -0,0 +1,53 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is regenerated. +# -------------------------------------------------------------------------- + +from azure.identity import DefaultAzureCredential +from azure.mgmt.databricks import AzureDatabricksManagementClient + +""" +# PREREQUISITES + pip install azure-identity + pip install azure-mgmt-databricks +# USAGE + python workspace_virtual_network_peering_create_or_update.py + + Before run the sample, please set the values of the client ID, tenant ID and client secret + of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, + AZURE_CLIENT_SECRET. For more info about how to get the value, please see: + https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal +""" + + +def main(): + client = AzureDatabricksManagementClient( + credential=DefaultAzureCredential(), + subscription_id="subid", + ) + + response = client.vnet_peering.begin_create_or_update( + resource_group_name="rg", + workspace_name="myWorkspace", + peering_name="vNetPeeringTest", + virtual_network_peering_parameters={ + "properties": { + "allowForwardedTraffic": False, + "allowGatewayTransit": False, + "allowVirtualNetworkAccess": True, + "remoteVirtualNetwork": { + "id": "/subscriptions/0140911e-1040-48da-8bc9-b99fb3dd88a6/resourceGroups/subramantest/providers/Microsoft.Network/virtualNetworks/subramanvnet" + }, + "useRemoteGateways": False, + } + }, + ).result() + print(response) + + +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceVirtualNetworkPeeringCreateOrUpdate.json +if __name__ == "__main__": + main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_delete.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_delete.py index 719e513b1cb0..299ae6938391 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_delete.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspace_virtual_network_peering_delete.py @@ -29,14 +29,13 @@ def main(): subscription_id="subid", ) - response = client.vnet_peering.begin_delete( + client.vnet_peering.begin_delete( resource_group_name="rg", workspace_name="myWorkspace", peering_name="vNetPeering", ).result() - print(response) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceVirtualNetworkPeeringDelete.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspaceVirtualNetworkPeeringDelete.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_resource_group.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_resource_group.py index 7ce93c5dde91..148a2b69d43c 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_resource_group.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_resource_group.py @@ -36,6 +36,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspacesListByResourceGroup.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspacesListByResourceGroup.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_subscription.py b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_subscription.py index 9871fc0de2f2..ba81b1058a95 100644 --- a/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_subscription.py +++ b/sdk/databricks/azure-mgmt-databricks/generated_samples/workspaces_list_by_subscription.py @@ -34,6 +34,6 @@ def main(): print(item) -# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspacesListBySubscription.json +# x-ms-original-file: specification/databricks/resource-manager/Microsoft.Databricks/stable/2023-02-01/examples/WorkspacesListBySubscription.json if __name__ == "__main__": main() diff --git a/sdk/databricks/azure-mgmt-databricks/sdk_packaging.toml b/sdk/databricks/azure-mgmt-databricks/sdk_packaging.toml index 950538bf7cf8..d0a9e6621d47 100644 --- a/sdk/databricks/azure-mgmt-databricks/sdk_packaging.toml +++ b/sdk/databricks/azure-mgmt-databricks/sdk_packaging.toml @@ -3,6 +3,6 @@ package_name = "azure-mgmt-databricks" package_nspkg = "azure-mgmt-nspkg" package_pprint_name = "Data Bricks Management" package_doc_id = "" -is_stable = false +is_stable = true is_arm = true title = "AzureDatabricksManagementClient" diff --git a/sdk/databricks/azure-mgmt-databricks/setup.py b/sdk/databricks/azure-mgmt-databricks/setup.py index 8bef6ca4d25b..7b2212e87e3f 100644 --- a/sdk/databricks/azure-mgmt-databricks/setup.py +++ b/sdk/databricks/azure-mgmt-databricks/setup.py @@ -1,10 +1,10 @@ #!/usr/bin/env python -#------------------------------------------------------------------------- +# ------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for # license information. -#-------------------------------------------------------------------------- +# -------------------------------------------------------------------------- import re import os.path @@ -16,64 +16,68 @@ PACKAGE_PPRINT_NAME = "Data Bricks Management" # a-b-c => a/b/c -package_folder_path = PACKAGE_NAME.replace('-', '/') +package_folder_path = PACKAGE_NAME.replace("-", "/") # a-b-c => a.b.c -namespace_name = PACKAGE_NAME.replace('-', '.') +namespace_name = PACKAGE_NAME.replace("-", ".") # Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, 'version.py') - if os.path.exists(os.path.join(package_folder_path, 'version.py')) - else os.path.join(package_folder_path, '_version.py'), 'r') as fd: - version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', - fd.read(), re.MULTILINE).group(1) +with open( + os.path.join(package_folder_path, "version.py") + if os.path.exists(os.path.join(package_folder_path, "version.py")) + else os.path.join(package_folder_path, "_version.py"), + "r", +) as fd: + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1) if not version: - raise RuntimeError('Cannot find version information') + raise RuntimeError("Cannot find version information") -with open('README.md', encoding='utf-8') as f: +with open("README.md", encoding="utf-8") as f: readme = f.read() -with open('CHANGELOG.md', encoding='utf-8') as f: +with open("CHANGELOG.md", encoding="utf-8") as f: changelog = f.read() setup( name=PACKAGE_NAME, version=version, - description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), - long_description=readme + '\n\n' + changelog, - long_description_content_type='text/markdown', - license='MIT License', - author='Microsoft Corporation', - author_email='azpysdkhelp@microsoft.com', - url='https://github.com/Azure/azure-sdk-for-python', + description="Microsoft Azure {} Client Library for Python".format(PACKAGE_PPRINT_NAME), + long_description=readme + "\n\n" + changelog, + long_description_content_type="text/markdown", + license="MIT License", + author="Microsoft Corporation", + author_email="azpysdkhelp@microsoft.com", + url="https://github.com/Azure/azure-sdk-for-python", keywords="azure, azure sdk", # update with search keywords relevant to the azure service / product classifiers=[ - 'Development Status :: 4 - Beta', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'License :: OSI Approved :: MIT License', + "Development Status :: 5 - Production/Stable", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "License :: OSI Approved :: MIT License", ], zip_safe=False, - packages=find_packages(exclude=[ - 'tests', - # Exclude packages that will be covered by PEP420 or nspkg - 'azure', - 'azure.mgmt', - ]), + packages=find_packages( + exclude=[ + "tests", + # Exclude packages that will be covered by PEP420 or nspkg + "azure", + "azure.mgmt", + ] + ), include_package_data=True, package_data={ - 'pytyped': ['py.typed'], + "pytyped": ["py.typed"], }, install_requires=[ - "msrest>=0.7.1", + "isodate<1.0.0,>=0.6.1", "azure-common~=1.1", "azure-mgmt-core>=1.3.2,<2.0.0", "typing-extensions>=4.3.0; python_version<'3.8.0'", ], - python_requires=">=3.7" + python_requires=">=3.7", ) diff --git a/sdk/databricks/azure-mgmt-databricks/tests/test_cli_mgmt_databricks.py b/sdk/databricks/azure-mgmt-databricks/tests/test_cli_mgmt_databricks.py index efa63057eb31..63c881aef0d7 100644 --- a/sdk/databricks/azure-mgmt-databricks/tests/test_cli_mgmt_databricks.py +++ b/sdk/databricks/azure-mgmt-databricks/tests/test_cli_mgmt_databricks.py @@ -5,89 +5,20 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. #-------------------------------------------------------------------------- - - -# TEST SCENARIO COVERAGE -# ---------------------- -# Methods Total : 7 -# Methods Covered : 7 -# Examples Total : 9 -# Examples Tested : 9 -# Coverage % : 100 -# ---------------------- - -import unittest - -import azure.mgmt.databricks -from devtools_testutils import AzureMgmtTestCase, ResourceGroupPreparer +import pytest +from azure.mgmt.databricks import AzureDatabricksManagementClient +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy AZURE_LOCATION = 'eastus' -class MgmtDatabricksClientTest(AzureMgmtTestCase): - - def setUp(self): - super(MgmtDatabricksClientTest, self).setUp() - self.mgmt_client = self.create_mgmt_client( - azure.mgmt.databricks.DatabricksClient - ) - - @ unittest.skip("unavailable in track2") - @ResourceGroupPreparer(location=AZURE_LOCATION) - def test_databricks(self, resource_group): - - SUBSCRIPTION_ID = self.settings.SUBSCRIPTION_ID - WORKSPACE_NAME = "workspace1" - RESOURCE_GROUP = "test_mgmt_databricks_test_resource_groups457f10501" - - # Create or update workspace[put] - BODY = { - "managed_resource_group_id": "/subscriptions/" + SUBSCRIPTION_ID + "/resourceGroups/" + RESOURCE_GROUP + "", - "location": "westus" - } - result = self.mgmt_client.workspaces.create_or_update(BODY, resource_group.name, WORKSPACE_NAME) - result = result.result() - - WORKSPACE_NAME_2 = WORKSPACE_NAME + "2" - # Create or update workspace with custom parameters[put] - BODY = { - "managed_resource_group_id": "/subscriptions/" + SUBSCRIPTION_ID + "/resourceGroups/" + RESOURCE_GROUP + "", - "location": "westus" - } - result = self.mgmt_client.workspaces.create_or_update(BODY, resource_group.name, WORKSPACE_NAME) - result = result.result() - - # Get a workspace with custom parameters[get] - result = self.mgmt_client.workspaces.get(resource_group.name, WORKSPACE_NAME) - - # Get a workspace[get] - result = self.mgmt_client.workspaces.get(resource_group.name, WORKSPACE_NAME) - - # Lists workspaces[get] - result = self.mgmt_client.workspaces.list_by_resource_group(resource_group.name) - - # Lists workspaces[get] - result = self.mgmt_client.workspaces.list_by_resource_group(resource_group.name) - - # Operations[get] - result = self.mgmt_client.operations.list() - - # Update a workspace's tags.[patch] - # BODY = { - # "tags": { - # "mytag1": "myvalue1" - # } - # } - TAGS = { - "mytag1": "myvalue1" - } - result = self.mgmt_client.workspaces.update(resource_group.name, WORKSPACE_NAME, TAGS) - result = result.result() - - # Delete a workspace[delete] - result = self.mgmt_client.workspaces.delete(resource_group.name, WORKSPACE_NAME) - result = result.result() +@pytest.mark.skip(reason="fix later") +class TestAzureMgmtDatabricks(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.mgmt_client = self.create_mgmt_client(AzureDatabricksManagementClient) + + @RandomNameResourceGroupPreparer(location=AZURE_LOCATION) + @recorded_by_proxy + def test_list_by_sub(self, resource_group): + self.mgmt_client.workspaces.list_by_subscription() -#------------------------------------------------------------------------------ -if __name__ == '__main__': - unittest.main()