Skip to content

Commit

Permalink
[AutoRelease] t2-elastic-2024-09-17-03241(can only be merged by SDK o…
Browse files Browse the repository at this point in the history
…wner) (#37420)

* code and test

* update-testcase

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

---------

Co-authored-by: azure-sdk <PythonSdkPipelines>
Co-authored-by: ChenxiJiang333 <v-chenjiang@microsoft.com>
Co-authored-by: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
  • Loading branch information
4 people authored Oct 24, 2024
1 parent 323609b commit 032b394
Show file tree
Hide file tree
Showing 166 changed files with 9,890 additions and 2,129 deletions.
53 changes: 53 additions & 0 deletions sdk/elastic/azure-mgmt-elastic/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,58 @@
# Release History

## 1.1.0b4 (2024-10-23)

### Features Added

- Model `MicrosoftElastic` added property `monitored_subscriptions`
- Model `MicrosoftElastic` added property `billing_info`
- Model `MicrosoftElastic` added property `connected_partner_resources`
- Model `MicrosoftElastic` added property `open_ai`
- Model `DeploymentInfoResponse` added property `elasticsearch_end_point`
- Model `MarketplaceSaaSInfo` added property `marketplace_status`
- Model `MarketplaceSaaSInfo` added property `billed_azure_subscription_id`
- Model `MarketplaceSaaSInfo` added property `subscribed`
- Model `MarketplaceSaaSInfoMarketplaceSubscription` added property `publisher_id`
- Model `MarketplaceSaaSInfoMarketplaceSubscription` added property `offer_id`
- Model `MonitorProperties` added property `plan_details`
- Model `MonitorProperties` added property `subscription_state`
- Model `MonitorProperties` added property `saa_s_azure_subscription_status`
- Model `MonitorProperties` added property `source_campaign_name`
- Model `MonitorProperties` added property `source_campaign_id`
- Added model `BillingInfoResponse`
- Added model `ConnectedPartnerResourceProperties`
- Added model `ConnectedPartnerResourcesListFormat`
- Added model `ConnectedPartnerResourcesListResponse`
- Added model `ElasticOrganizationToAzureSubscriptionMappingResponse`
- Added model `ElasticOrganizationToAzureSubscriptionMappingResponseProperties`
- Added model `ErrorAdditionalInfo`
- Added model `ErrorDetail`
- Added model `ErrorResponse`
- Added model `MonitoredSubscription`
- Added model `MonitoredSubscriptionProperties`
- Added model `MonitoredSubscriptionPropertiesList`
- Added model `OpenAIIntegrationProperties`
- Added model `OpenAIIntegrationRPModel`
- Added model `OpenAIIntegrationRPModelListResponse`
- Added model `OpenAIIntegrationStatusResponse`
- Added model `OpenAIIntegrationStatusResponseProperties`
- Added enum `Operation`
- Added model `PartnerBillingEntity`
- Added model `PlanDetails`
- Added model `ResubscribeProperties`
- Added enum `Status`
- Added model `SubscriptionList`
- Operation group `OrganizationsOperations` added method `begin_resubscribe`
- Operation group `OrganizationsOperations` added method `get_elastic_to_azure_subscription_mapping`
- Added operation group `BillingInfoOperations`
- Added operation group `ConnectedPartnerResourcesOperations`
- Added operation group `MonitoredSubscriptionsOperations`
- Added operation group `OpenAIOperations`

### Breaking Changes

- Renamed method `update` to `begin_update` in Operation group `MonitorsOperations`

## 1.1.0b3 (2023-05-22)

### Features Added
Expand Down
7 changes: 2 additions & 5 deletions sdk/elastic/azure-mgmt-elastic/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Microsoft Azure SDK for Python

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

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

### Prerequisites

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

### Install the package
Expand Down Expand Up @@ -59,6 +59,3 @@ Code samples for this package can be found at:
If you encounter any bugs or have suggestions, please file an issue in the
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
section of the project.


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-elastic%2FREADME.png)
10 changes: 5 additions & 5 deletions sdk/elastic/azure-mgmt-elastic/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commit": "1f449b5a17448f05ce1cd914f8ed75a0b568d130",
"commit": "6c709e5a3325eaa862649acee2252ce1c8166042",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"autorest": "3.10.2",
"use": [
"@autorest/python@6.4.8",
"@autorest/modelerfour@4.24.3"
"@autorest/python@6.19.0",
"@autorest/modelerfour@4.27.0"
],
"autorest_command": "autorest specification/elastic/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.4.8 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
"autorest_command": "autorest specification/elastic/resource-manager/readme.md --generate-sample=True --generate-test=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.19.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
"readme": "specification/elastic/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

from typing import Any, TYPE_CHECKING

from azure.core.configuration import Configuration
from azure.core.pipeline import policies
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy

Expand All @@ -19,25 +18,23 @@
from azure.core.credentials import TokenCredential


class MicrosoftElasticConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
class MicrosoftElasticConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
"""Configuration for MicrosoftElastic.
Note that all parameters used to create this instance are saved as instance
attributes.
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g.
00000000-0000-0000-0000-000000000000). Required.
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2023-02-01-preview". Note that overriding
:keyword api_version: Api Version. Default value is "2024-06-15-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(MicrosoftElasticConfiguration, self).__init__(**kwargs)
api_version: str = kwargs.pop("api_version", "2023-02-01-preview")
api_version: str = kwargs.pop("api_version", "2024-06-15-preview")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand All @@ -49,6 +46,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
self.api_version = api_version
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
kwargs.setdefault("sdk_moniker", "mgmt-elastic/{}".format(VERSION))
self.polling_interval = kwargs.get("polling_interval", 30)
self._configure(**kwargs)

def _configure(self, **kwargs: Any) -> None:
Expand All @@ -57,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None:
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
self.authentication_policy = kwargs.get("authentication_policy")
if self.credential and not self.authentication_policy:
self.authentication_policy = ARMChallengeAuthenticationPolicy(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,21 @@

from copy import deepcopy
from typing import Any, TYPE_CHECKING
from typing_extensions import Self

from azure.core.pipeline import policies
from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy

from . import models as _models
from ._configuration import MicrosoftElasticConfiguration
from ._serialization import Deserializer, Serializer
from .operations import (
AllTrafficFiltersOperations,
AssociateTrafficFilterOperations,
BillingInfoOperations,
ConnectedPartnerResourcesOperations,
CreateAndAssociateIPFilterOperations,
CreateAndAssociatePLFilterOperations,
DeploymentInfoOperations,
Expand All @@ -28,7 +33,9 @@
ListAssociatedTrafficFiltersOperations,
MonitorOperations,
MonitoredResourcesOperations,
MonitoredSubscriptionsOperations,
MonitorsOperations,
OpenAIOperations,
Operations,
OrganizationsOperations,
TagRulesOperations,
Expand All @@ -53,12 +60,22 @@ class MicrosoftElastic: # pylint: disable=client-accepts-api-version-keyword,to
:vartype monitors: azure.mgmt.elastic.operations.MonitorsOperations
:ivar elastic_versions: ElasticVersionsOperations operations
:vartype elastic_versions: azure.mgmt.elastic.operations.ElasticVersionsOperations
:ivar monitored_subscriptions: MonitoredSubscriptionsOperations operations
:vartype monitored_subscriptions:
azure.mgmt.elastic.operations.MonitoredSubscriptionsOperations
:ivar monitored_resources: MonitoredResourcesOperations operations
:vartype monitored_resources: azure.mgmt.elastic.operations.MonitoredResourcesOperations
:ivar deployment_info: DeploymentInfoOperations operations
:vartype deployment_info: azure.mgmt.elastic.operations.DeploymentInfoOperations
:ivar external_user: ExternalUserOperations operations
:vartype external_user: azure.mgmt.elastic.operations.ExternalUserOperations
:ivar billing_info: BillingInfoOperations operations
:vartype billing_info: azure.mgmt.elastic.operations.BillingInfoOperations
:ivar connected_partner_resources: ConnectedPartnerResourcesOperations operations
:vartype connected_partner_resources:
azure.mgmt.elastic.operations.ConnectedPartnerResourcesOperations
:ivar open_ai: OpenAIOperations operations
:vartype open_ai: azure.mgmt.elastic.operations.OpenAIOperations
:ivar tag_rules: TagRulesOperations operations
:vartype tag_rules: azure.mgmt.elastic.operations.TagRulesOperations
:ivar vm_host: VMHostOperations operations
Expand Down Expand Up @@ -96,12 +113,11 @@ class MicrosoftElastic: # pylint: disable=client-accepts-api-version-keyword,to
:vartype organizations: azure.mgmt.elastic.operations.OrganizationsOperations
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g.
00000000-0000-0000-0000-000000000000). Required.
:param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
: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 "2023-02-01-preview". Note that overriding
:keyword api_version: Api Version. Default value is "2024-06-15-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
Expand All @@ -116,7 +132,25 @@ def __init__(
**kwargs: Any
) -> None:
self._config = MicrosoftElasticConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
_policies = kwargs.pop("policies", None)
if _policies is None:
_policies = [
policies.RequestIdPolicy(**kwargs),
self._config.headers_policy,
self._config.user_agent_policy,
self._config.proxy_policy,
policies.ContentDecodePolicy(**kwargs),
ARMAutoResourceProviderRegistrationPolicy(),
self._config.redirect_policy,
self._config.retry_policy,
self._config.authentication_policy,
self._config.custom_hook_policy,
self._config.logging_policy,
policies.DistributedTracingPolicy(**kwargs),
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
self._config.http_logging_policy,
]
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)

client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
self._serialize = Serializer(client_models)
Expand All @@ -127,11 +161,19 @@ def __init__(
self.elastic_versions = ElasticVersionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.monitored_subscriptions = MonitoredSubscriptionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.monitored_resources = MonitoredResourcesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.deployment_info = DeploymentInfoOperations(self._client, self._config, self._serialize, self._deserialize)
self.external_user = ExternalUserOperations(self._client, self._config, self._serialize, self._deserialize)
self.billing_info = BillingInfoOperations(self._client, self._config, self._serialize, self._deserialize)
self.connected_partner_resources = ConnectedPartnerResourcesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.open_ai = OpenAIOperations(self._client, self._config, self._serialize, self._deserialize)
self.tag_rules = TagRulesOperations(self._client, self._config, self._serialize, self._deserialize)
self.vm_host = VMHostOperations(self._client, self._config, self._serialize, self._deserialize)
self.vm_ingestion = VMIngestionOperations(self._client, self._config, self._serialize, self._deserialize)
Expand Down Expand Up @@ -164,7 +206,7 @@ def __init__(
self.traffic_filters = TrafficFiltersOperations(self._client, self._config, self._serialize, self._deserialize)
self.organizations = OrganizationsOperations(self._client, self._config, self._serialize, self._deserialize)

def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
"""Runs the network request through the client's chained policies.
>>> from azure.core.rest import HttpRequest
Expand All @@ -184,12 +226,12 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:

request_copy = deepcopy(request)
request_copy.url = self._client.format_url(request_copy.url)
return self._client.send_request(request_copy, **kwargs)
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore

def close(self) -> None:
self._client.close()

def __enter__(self) -> "MicrosoftElastic":
def __enter__(self) -> Self:
self._client.__enter__()
return self

Expand Down
Loading

0 comments on commit 032b394

Please sign in to comment.