Skip to content

Commit

Permalink
[AutoRelease] t2-confluent-2022-11-02-18721(Do not merge) (Azure#27246)
Browse files Browse the repository at this point in the history 
* code and test

* Update CHANGELOG.md

* Update _version.py

Co-authored-by: PythonSdkPipelines <PythonSdkPipelines>
Co-authored-by: zhenbiao wei <424401670@qq.com>
  • Loading branch information
@azure-sdk @Wzb123456789
azure-sdk and Wzb123456789 authored Nov 3, 2022
1 parent ed691f3 commit 010f570
Show file tree
Hide file tree
Showing 45 changed files with 5,457 additions and 2,190 deletions.
19 changes: 19 additions & 0 deletions sdk/confluent/azure-mgmt-confluent/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# Release History

## 2.0.0b2 (2022-11-02)

### Features Added

- Added operation group ValidationsOperations
- Model ConfluentAgreementResource has a new parameter system_data
- Model OrganizationResource has a new parameter system_data

### Breaking Changes

- Parameter email_address of model UserDetail is now required
- Parameter id of model OfferDetail is now required
- Parameter offer_detail of model OrganizationResource is now required
- Parameter plan_id of model OfferDetail is now required
- Parameter plan_name of model OfferDetail is now required
- Parameter publisher_id of model OfferDetail is now required
- Parameter term_unit of model OfferDetail is now required
- Parameter user_detail of model OrganizationResource is now required

## 2.0.0b1 (2021-05-24)

**Features**
Expand Down
4 changes: 3 additions & 1 deletion sdk/confluent/azure-mgmt-confluent/MANIFEST.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
include _meta.json
recursive-include tests *.py *.yaml
recursive-include tests *.py *.json
recursive-include samples *.py *.md
include *.md
include azure/__init__.py
include azure/mgmt/__init__.py
include LICENSE
include azure/mgmt/confluent/py.typed
4 changes: 1 addition & 3 deletions sdk/confluent/azure-mgmt-confluent/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Microsoft Azure SDK for Python

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

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


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 [Confluent Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com.
Expand Down
12 changes: 6 additions & 6 deletions sdk/confluent/azure-mgmt-confluent/_meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"autorest": "3.4.2",
"commit": "0c21115ccacbbad11c4aa13a711e4990ebf07752",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"use": [
"@autorest/python@5.8.0",
"@autorest/modelerfour@4.19.1"
"@autorest/python@6.2.1",
"@autorest/modelerfour@4.24.3"
],
"commit": "58af5ba424f6a4e270a22327933c78143e89bf07",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest_command": "autorest specification/confluent/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.0 --use=@autorest/modelerfour@4.19.1 --version=3.4.2",
"autorest_command": "autorest specification/confluent/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.1 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
"readme": "specification/confluent/resource-manager/readme.md"
}
15 changes: 11 additions & 4 deletions sdk/confluent/azure-mgmt-confluent/azure/mgmt/confluent/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@
from ._version import VERSION

__version__ = VERSION
__all__ = ['ConfluentManagementClient']

try:
from ._patch import patch_sdk # type: ignore
patch_sdk()
from ._patch import __all__ as _patch_all
from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import
except ImportError:
pass
_patch_all = []
from ._patch import patch_sdk as _patch_sdk

__all__ = [
"ConfluentManagementClient",
]
__all__.extend([p for p in _patch_all if p not in __all__])

_patch_sdk()
64 changes: 34 additions & 30 deletions sdk/confluent/azure-mgmt-confluent/azure/mgmt/confluent/_configuration.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,66 +6,70 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import TYPE_CHECKING
import sys
from typing import Any, TYPE_CHECKING

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

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 typing import Any

from azure.core.credentials import TokenCredential


class ConfluentManagementClientConfiguration(Configuration):
class ConfluentManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
"""Configuration for ConfluentManagementClient.
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.
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: Microsoft Azure subscription id.
:param subscription_id: Microsoft Azure subscription id. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2021-12-01". Note that overriding this
default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(
self,
credential, # type: "TokenCredential"
subscription_id, # type: str
**kwargs # type: Any
):
# type: (...) -> None
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
super(ConfluentManagementClientConfiguration, self).__init__(**kwargs)
api_version = kwargs.pop("api_version", "2021-12-01") # type: Literal["2021-12-01"]

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
super(ConfluentManagementClientConfiguration, self).__init__(**kwargs)

self.credential = credential
self.subscription_id = subscription_id
self.api_version = "2021-03-01-preview"
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'mgmt-confluent/{}'.format(VERSION))
self.api_version = api_version
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
kwargs.setdefault("sdk_moniker", "mgmt-confluent/{}".format(VERSION))
self._configure(**kwargs)

def _configure(
self,
**kwargs # type: Any
self, **kwargs # type: Any
):
# type: (...) -> None
self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
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.authentication_policy = kwargs.get('authentication_policy')
self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
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.authentication_policy = kwargs.get("authentication_policy")
if self.credential and not self.authentication_policy:
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
self.authentication_policy = ARMChallengeAuthenticationPolicy(
self.credential, *self.credential_scopes, **kwargs
)
110 changes: 60 additions & 50 deletions sdk/confluent/azure-mgmt-confluent/azure/mgmt/confluent/_confluent_management_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,89 +6,99 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

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

from azure.core.rest import HttpRequest, HttpResponse
from azure.mgmt.core import ARMPipelineClient
from msrest import Deserializer, Serializer

from . import models
from ._configuration import ConfluentManagementClientConfiguration
from ._serialization import Deserializer, Serializer
from .operations import (
MarketplaceAgreementsOperations,
OrganizationOperations,
OrganizationOperationsOperations,
ValidationsOperations,
)

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from typing import Any, Optional

from azure.core.credentials import TokenCredential
from azure.core.pipeline.transport import HttpRequest, HttpResponse

from ._configuration import ConfluentManagementClientConfiguration
from .operations import MarketplaceAgreementsOperations
from .operations import OrganizationOperationsOperations
from .operations import OrganizationOperations
from .operations import ValidationsOperations
from . import models


class ConfluentManagementClient(object):
class ConfluentManagementClient: # pylint: disable=client-accepts-api-version-keyword
"""ConfluentManagementClient.
:ivar marketplace_agreements: MarketplaceAgreementsOperations operations
:vartype marketplace_agreements: azure.mgmt.confluent.operations.MarketplaceAgreementsOperations
:vartype marketplace_agreements:
azure.mgmt.confluent.operations.MarketplaceAgreementsOperations
:ivar organization_operations: OrganizationOperationsOperations operations
:vartype organization_operations: azure.mgmt.confluent.operations.OrganizationOperationsOperations
:vartype organization_operations:
azure.mgmt.confluent.operations.OrganizationOperationsOperations
:ivar organization: OrganizationOperations operations
:vartype organization: azure.mgmt.confluent.operations.OrganizationOperations
:ivar validations: ValidationsOperations operations
:vartype validations: azure.mgmt.confluent.operations.ValidationsOperations
:param credential: Credential needed for the client to connect to Azure.
:param credential: Credential needed for the client to connect to Azure. Required.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: Microsoft Azure subscription id.
:param subscription_id: Microsoft Azure subscription id. Required.
:type subscription_id: str
:param str base_url: Service URL
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
:keyword api_version: Api Version. Default value is "2021-12-01". 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.
"""

def __init__(
self,
credential, # type: "TokenCredential"
subscription_id, # type: str
base_url=None, # type: Optional[str]
**kwargs # type: Any
):
# type: (...) -> None
if not base_url:
base_url = 'https://management.azure.com'
self._config = ConfluentManagementClientConfiguration(credential, subscription_id, **kwargs)
credential: "TokenCredential",
subscription_id: str,
base_url: str = "https://management.azure.com",
**kwargs: Any
) -> None:
self._config = ConfluentManagementClientConfiguration(
credential=credential, subscription_id=subscription_id, **kwargs
)
self._client = 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)
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)

self._serialize.client_side_validation = False
self.marketplace_agreements = MarketplaceAgreementsOperations(
self._client, self._config, self._serialize, self._deserialize)
self._client, self._config, self._serialize, self._deserialize
)
self.organization_operations = OrganizationOperationsOperations(
self._client, self._config, self._serialize, self._deserialize)
self.organization = OrganizationOperations(
self._client, self._config, self._serialize, self._deserialize)
self.validations = ValidationsOperations(
self._client, self._config, self._serialize, self._deserialize)

def _send_request(self, http_request, **kwargs):
# type: (HttpRequest, Any) -> HttpResponse
self._client, self._config, self._serialize, self._deserialize
)
self.organization = OrganizationOperations(self._client, self._config, self._serialize, self._deserialize)
self.validations = ValidationsOperations(self._client, self._config, self._serialize, self._deserialize)

def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
"""Runs the network request through the client's chained policies.
:param http_request: The network request you want to make. Required.
:type http_request: ~azure.core.pipeline.transport.HttpRequest
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
>>> from azure.core.rest import HttpRequest
>>> request = HttpRequest("GET", "https://www.example.org/")
<HttpRequest [GET], url: 'https://www.example.org/'>
>>> response = client._send_request(request)
<HttpResponse: 200 OK>
For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
:param request: The network request you want to make. Required.
:type request: ~azure.core.rest.HttpRequest
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
:return: The response of your network call. Does not do error handling on your response.
:rtype: ~azure.core.pipeline.transport.HttpResponse
:rtype: ~azure.core.rest.HttpResponse
"""
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
}
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
stream = kwargs.pop("stream", True)
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
return pipeline_response.http_response

request_copy = deepcopy(request)
request_copy.url = self._client.format_url(request_copy.url)
return self._client.send_request(request_copy, **kwargs)

def close(self):
# type: () -> None
Expand Down
Loading

0 comments on commit 010f570

Please sign in to comment.