[AutoRelease] t2-appcontainers-2024-08-02-27805(can only be merged by SDK owner) (#36723)

* code and test

* update-testcase

* Update testcases

* Update CHANGELOG.md

---------

Co-authored-by: azure-sdk <PythonSdkPipelines>
Co-authored-by: ChenxiJiang333 <[email protected]>
Co-authored-by: ChenxiJiang333 <[email protected]>

Author: azure-sdk

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

@@ -1,5 +1,42 @@
 # Release History
 
+## 3.1.0 (2024-08-06)
+
+### Features Added
+
+  - The 'azure.mgmt.appcontainers.ContainerAppsAPIClient' client method 'get_custom_domain_verification_id' was added in the current version
+  - The 'azure.mgmt.appcontainers.ContainerAppsAPIClient' client had operation group 'usages' added in the current version
+  - The 'azure.mgmt.appcontainers.ContainerAppsAPIClient' client had operation group 'managed_environment_usages' added in the current version
+  - The 'azure.mgmt.appcontainers.aio.ContainerAppsAPIClient' client method 'get_custom_domain_verification_id' was added in the current version
+  - The 'azure.mgmt.appcontainers.aio.ContainerAppsAPIClient' client had operation group 'usages' added in the current version
+  - The 'azure.mgmt.appcontainers.aio.ContainerAppsAPIClient' client had operation group 'managed_environment_usages' added in the current version
+  - The 'azure.mgmt.appcontainers.aio.operations.ContainerAppsAPIClientOperationsMixin' method 'get_custom_domain_verification_id' was added in the current version
+  - The 'azure.mgmt.appcontainers.aio.operations.JobsOperations' method 'get_detector' was added in the current version
+  - The 'azure.mgmt.appcontainers.aio.operations.JobsOperations' method 'list_detectors' was added in the current version
+  - The 'azure.mgmt.appcontainers.aio.operations.JobsOperations' method 'proxy_get' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.aio.operations.ManagedEnvironmentUsagesOperations' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.aio.operations.UsagesOperations' was added in the current version
+  - The 'azure.mgmt.appcontainers.operations.ContainerAppsAPIClientOperationsMixin' method 'get_custom_domain_verification_id' was added in the current version
+  - The 'azure.mgmt.appcontainers.operations.JobsOperations' method 'get_detector' was added in the current version
+  - The 'azure.mgmt.appcontainers.operations.JobsOperations' method 'list_detectors' was added in the current version
+  - The 'azure.mgmt.appcontainers.operations.JobsOperations' method 'proxy_get' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.operations.ManagedEnvironmentUsagesOperations' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.operations.UsagesOperations' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.AuthConfig' had property 'encryption_settings' added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.AvailableWorkloadProfileProperties' had property 'gpus' added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.Ingress' had property 'additional_port_mappings' added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.Login' had property 'token_store' added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.ManagedEnvironment' had property 'peer_traffic_configuration' added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.BlobStorageTokenStore' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.EncryptionSettings' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.IngressPortMapping' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.ListUsagesResult' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.ManagedEnvironmentPropertiesPeerTrafficConfiguration' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.ManagedEnvironmentPropertiesPeerTrafficConfigurationEncryption' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.TokenStore' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.Usage' was added in the current version
+  - The model or publicly exposed class 'azure.mgmt.appcontainers.models.UsageName' was added in the current version
+
 ## 3.1.0b1 (2024-03-18)
 
 ### Features Added

sdk/appcontainers/azure-mgmt-appcontainers/_meta.json

@@ -1,11 +1,11 @@
 {
-  "commit": "e5404d3e55f885d2cb8fdbff3fd1a03bcfc6bb4c",
+  "commit": "c4b33165c43ba9253bb5b36a8c907dbef570bb6f",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.7",
+  "autorest": "3.10.2",
   "use": [
-    "@autorest/python@6.13.7",
+    "@autorest/python@6.17.0",
     "@autorest/[email protected]"
   ],
-  "autorest_command": "autorest specification/app/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.13.7 --use=@autorest/[email protected] --version=3.9.7 --version-tolerant=False",
+  "autorest_command": "autorest specification/app/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 --tag=package-2024-03 --use=@autorest/python@6.17.0 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
   "readme": "specification/app/resource-manager/readme.md"
 }

sdk/appcontainers/azure-mgmt-appcontainers/assets.json

@@ -0,0 +1,6 @@
+{
+    "AssetsRepo": "Azure/azure-sdk-assets",
+    "AssetsRepoPrefixPath": "python",
+    "TagPrefix": "python/appcontainers/azure-mgmt-appcontainers",
+    "Tag": "python/appcontainers/azure-mgmt-appcontainers_61b453d1ec"
+}

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

@@ -26,15 +26,15 @@ class ContainerAppsAPIClientConfiguration:  # pylint: disable=too-many-instance-
 
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
+    :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-11-02-preview". Note that overriding
-     this default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2024-03-01". 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:
-        api_version: str = kwargs.pop("api_version", "2023-11-02-preview")
+        api_version: str = kwargs.pop("api_version", "2024-03-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")

sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_container_apps_api_client.py

@@ -8,6 +8,7 @@
 
 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
@@ -18,13 +19,8 @@
 from ._configuration import ContainerAppsAPIClientConfiguration
 from ._serialization import Deserializer, Serializer
 from .operations import (
-    AppResiliencyOperations,
     AvailableWorkloadProfilesOperations,
     BillingMetersOperations,
-    BuildAuthTokenOperations,
-    BuildersOperations,
-    BuildsByBuilderResourceOperations,
-    BuildsOperations,
     CertificatesOperations,
     ConnectedEnvironmentsCertificatesOperations,
     ConnectedEnvironmentsDaprComponentsOperations,
@@ -37,11 +33,7 @@
     ContainerAppsRevisionReplicasOperations,
     ContainerAppsRevisionsOperations,
     ContainerAppsSourceControlsOperations,
-    DaprComponentResiliencyPoliciesOperations,
     DaprComponentsOperations,
-    DaprSubscriptionsOperations,
-    DotNetComponentsOperations,
-    JavaComponentsOperations,
     JobsExecutionsOperations,
     JobsOperations,
     ManagedCertificatesOperations,
@@ -65,8 +57,6 @@ class ContainerAppsAPIClient(
 ):  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
     """ContainerAppsAPIClient.
 
-    :ivar app_resiliency: AppResiliencyOperations operations
-    :vartype app_resiliency: azure.mgmt.appcontainers.operations.AppResiliencyOperations
     :ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations
     :vartype container_apps_auth_configs:
      azure.mgmt.appcontainers.operations.ContainerAppsAuthConfigsOperations
@@ -75,15 +65,6 @@ class ContainerAppsAPIClient(
      azure.mgmt.appcontainers.operations.AvailableWorkloadProfilesOperations
     :ivar billing_meters: BillingMetersOperations operations
     :vartype billing_meters: azure.mgmt.appcontainers.operations.BillingMetersOperations
-    :ivar builders: BuildersOperations operations
-    :vartype builders: azure.mgmt.appcontainers.operations.BuildersOperations
-    :ivar builds_by_builder_resource: BuildsByBuilderResourceOperations operations
-    :vartype builds_by_builder_resource:
-     azure.mgmt.appcontainers.operations.BuildsByBuilderResourceOperations
-    :ivar builds: BuildsOperations operations
-    :vartype builds: azure.mgmt.appcontainers.operations.BuildsOperations
-    :ivar build_auth_token: BuildAuthTokenOperations operations
-    :vartype build_auth_token: azure.mgmt.appcontainers.operations.BuildAuthTokenOperations
     :ivar connected_environments: ConnectedEnvironmentsOperations operations
     :vartype connected_environments:
      azure.mgmt.appcontainers.operations.ConnectedEnvironmentsOperations
@@ -131,13 +112,8 @@ class ContainerAppsAPIClient(
      azure.mgmt.appcontainers.operations.ManagedCertificatesOperations
     :ivar namespaces: NamespacesOperations operations
     :vartype namespaces: azure.mgmt.appcontainers.operations.NamespacesOperations
-    :ivar dapr_component_resiliency_policies: DaprComponentResiliencyPoliciesOperations operations
-    :vartype dapr_component_resiliency_policies:
-     azure.mgmt.appcontainers.operations.DaprComponentResiliencyPoliciesOperations
     :ivar dapr_components: DaprComponentsOperations operations
     :vartype dapr_components: azure.mgmt.appcontainers.operations.DaprComponentsOperations
-    :ivar dapr_subscriptions: DaprSubscriptionsOperations operations
-    :vartype dapr_subscriptions: azure.mgmt.appcontainers.operations.DaprSubscriptionsOperations
     :ivar managed_environments_storages: ManagedEnvironmentsStoragesOperations operations
     :vartype managed_environments_storages:
      azure.mgmt.appcontainers.operations.ManagedEnvironmentsStoragesOperations
@@ -149,18 +125,14 @@ class ContainerAppsAPIClient(
     :ivar managed_environment_usages: ManagedEnvironmentUsagesOperations operations
     :vartype managed_environment_usages:
      azure.mgmt.appcontainers.operations.ManagedEnvironmentUsagesOperations
-    :ivar java_components: JavaComponentsOperations operations
-    :vartype java_components: azure.mgmt.appcontainers.operations.JavaComponentsOperations
-    :ivar dot_net_components: DotNetComponentsOperations operations
-    :vartype dot_net_components: azure.mgmt.appcontainers.operations.DotNetComponentsOperations
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
+    :param subscription_id: The ID of the target subscription. 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-11-02-preview". Note that overriding
-     this default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2024-03-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.
@@ -200,20 +172,13 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
         self._serialize.client_side_validation = False
-        self.app_resiliency = AppResiliencyOperations(self._client, self._config, self._serialize, self._deserialize)
         self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.available_workload_profiles = AvailableWorkloadProfilesOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.billing_meters = BillingMetersOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.builders = BuildersOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.builds_by_builder_resource = BuildsByBuilderResourceOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.builds = BuildsOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.build_auth_token = BuildAuthTokenOperations(self._client, self._config, self._serialize, self._deserialize)
         self.connected_environments = ConnectedEnvironmentsOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
@@ -253,13 +218,7 @@ def __init__(
             self._client, self._config, self._serialize, self._deserialize
         )
         self.namespaces = NamespacesOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.dapr_component_resiliency_policies = DaprComponentResiliencyPoliciesOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
         self.dapr_components = DaprComponentsOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.dapr_subscriptions = DaprSubscriptionsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
         self.managed_environments_storages = ManagedEnvironmentsStoragesOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
@@ -270,10 +229,6 @@ def __init__(
         self.managed_environment_usages = ManagedEnvironmentUsagesOperations(
             self._client, self._config, self._serialize, self._deserialize
         )
-        self.java_components = JavaComponentsOperations(self._client, self._config, self._serialize, self._deserialize)
-        self.dot_net_components = DotNetComponentsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
 
     def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
@@ -300,7 +255,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "ContainerAppsAPIClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 

sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_patch.py

@@ -25,6 +25,7 @@
 #
 # --------------------------------------------------------------------------
 
+
 # This file is used for handwritten extensions to the generated code. Example:
 # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
 def patch_sdk():

sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_serialization.py

@@ -144,6 +144,8 @@ def _json_attemp(data):
                 # context otherwise.
                 _LOGGER.critical("Wasn't XML not JSON, failing")
                 raise DeserializationError("XML is invalid") from err
+        elif content_type.startswith("text/"):
+            return data_as_str
         raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
 
     @classmethod
@@ -1441,7 +1443,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_vendor.py

@@ -8,8 +8,6 @@
 from abc import ABC
 from typing import TYPE_CHECKING
 
-from azure.core.pipeline.transport import HttpRequest
-
 from ._configuration import ContainerAppsAPIClientConfiguration
 
 if TYPE_CHECKING:
@@ -19,14 +17,6 @@
     from ._serialization import Deserializer, Serializer
 
 
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
-
-
 class ContainerAppsAPIClientMixinABC(ABC):
     """DO NOT use this class. It is for internal typing use only."""
 

sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "3.1.0b1"
+VERSION = "3.1.0"

sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_configuration.py

@@ -26,15 +26,15 @@ class ContainerAppsAPIClientConfiguration:  # pylint: disable=too-many-instance-
 
     :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials_async.AsyncTokenCredential
-    :param subscription_id: The ID of the target subscription. The value must be an UUID. Required.
+    :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :keyword api_version: Api Version. Default value is "2023-11-02-preview". Note that overriding
-     this default value may result in unsupported behavior.
+    :keyword api_version: Api Version. Default value is "2024-03-01". 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:
-        api_version: str = kwargs.pop("api_version", "2023-11-02-preview")
+        api_version: str = kwargs.pop("api_version", "2024-03-01")
 
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")