From 0a1ee9408d21e9ca797353535ff7f900dad1eff0 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 28 Apr 2022 03:57:54 +0000 Subject: [PATCH] CodeGen from PR 18842 in Azure/azure-rest-api-specs Merge 9802b3bd5112e21ecdc3a1d75f55244fafca2a8a into 8db7df38fe5fca1fc4d2634f5c89e8acfeb1f4ce --- sdk/app/azure-mgmt-app/_meta.json | 6 +- .../azure/mgmt/app/_configuration.py | 9 +- .../mgmt/app/_container_apps_api_client.py | 61 +- .../azure/mgmt/app/_metadata.json | 19 +- .../azure/mgmt/app/aio/_configuration.py | 9 +- .../app/aio/_container_apps_api_client.py | 58 +- .../azure/mgmt/app/aio/operations/__init__.py | 18 +- .../operations/_certificates_operations.py | 78 +- ..._container_apps_auth_configs_operations.py | 62 +- .../operations/_container_apps_operations.py | 246 ++++-- ...ainer_apps_revision_replicas_operations.py | 33 +- .../_container_apps_revisions_operations.py | 79 +- ...ntainer_apps_source_controls_operations.py | 82 +- .../operations/_dapr_components_operations.py | 128 +++- .../_managed_environments_operations.py | 217 ++++-- ...anaged_environments_storages_operations.py | 60 +- .../aio/operations/_namespaces_operations.py | 112 +++ .../mgmt/app/aio/operations/_operations.py | 23 +- .../azure/mgmt/app/models/__init__.py | 12 +- .../_container_apps_api_client_enums.py | 13 +- .../azure/mgmt/app/models/_models_py3.py | 702 ++++++++++-------- .../azure/mgmt/app/operations/__init__.py | 18 +- .../operations/_certificates_operations.py | 187 +++-- ..._container_apps_auth_configs_operations.py | 149 ++-- .../operations/_container_apps_operations.py | 419 +++++++---- ...ainer_apps_revision_replicas_operations.py | 78 +- .../_container_apps_revisions_operations.py | 190 +++-- ...ntainer_apps_source_controls_operations.py | 169 +++-- .../operations/_dapr_components_operations.py | 253 +++++-- .../_managed_environments_operations.py | 349 +++++---- ...anaged_environments_storages_operations.py | 148 ++-- .../app/operations/_namespaces_operations.py | 160 ++++ .../azure/mgmt/app/operations/_operations.py | 43 +- 33 files changed, 2791 insertions(+), 1399 deletions(-) create mode 100644 sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_namespaces_operations.py create mode 100644 sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_namespaces_operations.py diff --git a/sdk/app/azure-mgmt-app/_meta.json b/sdk/app/azure-mgmt-app/_meta.json index b635d5601ca5..bb2c095c357c 100644 --- a/sdk/app/azure-mgmt-app/_meta.json +++ b/sdk/app/azure-mgmt-app/_meta.json @@ -1,11 +1,11 @@ { "autorest": "3.7.2", "use": [ - "@autorest/python@5.12.0", + "@autorest/python@5.13.0", "@autorest/modelerfour@4.19.3" ], - "commit": "4ac6be1b22f88bfbb6ca3e294e73538bcac90b49", + "commit": "76532a48a1073f9556892e193d4d21bd10be3e37", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/app/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", + "autorest_command": "autorest specification/app/resource-manager/readme.md --multiapi --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", "readme": "specification/app/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/_configuration.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/_configuration.py index 90b7231faf5c..044e3d3a9e61 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/_configuration.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/_configuration.py @@ -19,7 +19,7 @@ from azure.core.credentials import TokenCredential -class ContainerAppsAPIClientConfiguration(Configuration): +class ContainerAppsAPIClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes """Configuration for ContainerAppsAPIClient. Note that all parameters used to create this instance are saved as instance @@ -29,6 +29,9 @@ class ContainerAppsAPIClientConfiguration(Configuration): :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. :type subscription_id: str + :keyword api_version: Api Version. Default value is "2022-03-01". Note that overriding this + default value may result in unsupported behavior. + :paramtype api_version: str """ def __init__( @@ -38,6 +41,8 @@ def __init__( **kwargs: Any ) -> None: super(ContainerAppsAPIClientConfiguration, self).__init__(**kwargs) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + if credential is None: raise ValueError("Parameter 'credential' must not be None.") if subscription_id is None: @@ -45,7 +50,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id - self.api_version = "2022-01-01-preview" + self.api_version = api_version self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'mgmt-app/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/_container_apps_api_client.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/_container_apps_api_client.py index 714c5d778be9..5ca2a2c59656 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/_container_apps_api_client.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/_container_apps_api_client.py @@ -7,55 +7,59 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Optional, TYPE_CHECKING +from typing import Any, TYPE_CHECKING + +from msrest import Deserializer, Serializer from azure.core.rest import HttpRequest, HttpResponse from azure.mgmt.core import ARMPipelineClient -from msrest import Deserializer, Serializer from . import models from ._configuration import ContainerAppsAPIClientConfiguration -from .operations import CertificatesOperations, ContainerAppsAuthConfigsOperations, ContainerAppsOperations, ContainerAppsRevisionReplicasOperations, ContainerAppsRevisionsOperations, ContainerAppsSourceControlsOperations, DaprComponentsOperations, ManagedEnvironmentsOperations, ManagedEnvironmentsStoragesOperations, Operations +from .operations import CertificatesOperations, ContainerAppsAuthConfigsOperations, ContainerAppsOperations, ContainerAppsRevisionReplicasOperations, ContainerAppsRevisionsOperations, ContainerAppsSourceControlsOperations, DaprComponentsOperations, ManagedEnvironmentsOperations, ManagedEnvironmentsStoragesOperations, NamespacesOperations, Operations if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class ContainerAppsAPIClient: +class ContainerAppsAPIClient: # pylint: disable=too-many-instance-attributes """ContainerAppsAPIClient. + :ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations + :vartype container_apps_auth_configs: + azure.mgmt.app.operations.ContainerAppsAuthConfigsOperations :ivar container_apps: ContainerAppsOperations operations - :vartype container_apps: container_apps_api_client.operations.ContainerAppsOperations + :vartype container_apps: azure.mgmt.app.operations.ContainerAppsOperations :ivar container_apps_revisions: ContainerAppsRevisionsOperations operations - :vartype container_apps_revisions: - container_apps_api_client.operations.ContainerAppsRevisionsOperations + :vartype container_apps_revisions: azure.mgmt.app.operations.ContainerAppsRevisionsOperations :ivar container_apps_revision_replicas: ContainerAppsRevisionReplicasOperations operations :vartype container_apps_revision_replicas: - container_apps_api_client.operations.ContainerAppsRevisionReplicasOperations + azure.mgmt.app.operations.ContainerAppsRevisionReplicasOperations + :ivar dapr_components: DaprComponentsOperations operations + :vartype dapr_components: azure.mgmt.app.operations.DaprComponentsOperations + :ivar operations: Operations operations + :vartype operations: azure.mgmt.app.operations.Operations :ivar managed_environments: ManagedEnvironmentsOperations operations - :vartype managed_environments: - container_apps_api_client.operations.ManagedEnvironmentsOperations + :vartype managed_environments: azure.mgmt.app.operations.ManagedEnvironmentsOperations :ivar certificates: CertificatesOperations operations - :vartype certificates: container_apps_api_client.operations.CertificatesOperations - :ivar operations: Operations operations - :vartype operations: container_apps_api_client.operations.Operations - :ivar container_apps_source_controls: ContainerAppsSourceControlsOperations operations - :vartype container_apps_source_controls: - container_apps_api_client.operations.ContainerAppsSourceControlsOperations - :ivar dapr_components: DaprComponentsOperations operations - :vartype dapr_components: container_apps_api_client.operations.DaprComponentsOperations - :ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations - :vartype container_apps_auth_configs: - container_apps_api_client.operations.ContainerAppsAuthConfigsOperations + :vartype certificates: azure.mgmt.app.operations.CertificatesOperations + :ivar namespaces: NamespacesOperations operations + :vartype namespaces: azure.mgmt.app.operations.NamespacesOperations :ivar managed_environments_storages: ManagedEnvironmentsStoragesOperations operations :vartype managed_environments_storages: - container_apps_api_client.operations.ManagedEnvironmentsStoragesOperations + azure.mgmt.app.operations.ManagedEnvironmentsStoragesOperations + :ivar container_apps_source_controls: ContainerAppsSourceControlsOperations operations + :vartype container_apps_source_controls: + azure.mgmt.app.operations.ContainerAppsSourceControlsOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials.TokenCredential :param subscription_id: The ID of the target subscription. :type subscription_id: str - :param base_url: Service URL. Default value is 'https://management.azure.com'. + :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-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. """ @@ -74,21 +78,22 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False + self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations(self._client, self._config, self._serialize, self._deserialize) self.container_apps = ContainerAppsOperations(self._client, self._config, self._serialize, self._deserialize) self.container_apps_revisions = ContainerAppsRevisionsOperations(self._client, self._config, self._serialize, self._deserialize) self.container_apps_revision_replicas = ContainerAppsRevisionReplicasOperations(self._client, self._config, self._serialize, self._deserialize) + self.dapr_components = DaprComponentsOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) self.managed_environments = ManagedEnvironmentsOperations(self._client, self._config, self._serialize, self._deserialize) self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_source_controls = ContainerAppsSourceControlsOperations(self._client, self._config, self._serialize, self._deserialize) - self.dapr_components = DaprComponentsOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations(self._client, self._config, self._serialize, self._deserialize) + self.namespaces = NamespacesOperations(self._client, self._config, self._serialize, self._deserialize) self.managed_environments_storages = ManagedEnvironmentsStoragesOperations(self._client, self._config, self._serialize, self._deserialize) + self.container_apps_source_controls = ContainerAppsSourceControlsOperations(self._client, self._config, self._serialize, self._deserialize) def _send_request( self, - request, # type: HttpRequest + request: HttpRequest, **kwargs: Any ) -> HttpResponse: """Runs the network request through the client's chained policies. diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/_metadata.json b/sdk/app/azure-mgmt-app/azure/mgmt/app/_metadata.json index eeb87a80b677..ef96a7b75251 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/_metadata.json +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/_metadata.json @@ -1,6 +1,6 @@ { - "chosen_version": "2022-01-01-preview", - "total_api_version_list": ["2022-01-01-preview"], + "chosen_version": "2022-03-01", + "total_api_version_list": ["2022-03-01"], "client": { "name": "ContainerAppsAPIClient", "filename": "_container_apps_api_client", @@ -10,8 +10,8 @@ "azure_arm": true, "has_lro_operations": true, "client_side_validation": false, - "sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ContainerAppsAPIClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", - "async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ContainerAppsAPIClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}" + "sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ContainerAppsAPIClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}", + "async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ContainerAppsAPIClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}" }, "global_parameters": { "sync": { @@ -97,15 +97,16 @@ "async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}" }, "operation_groups": { + "container_apps_auth_configs": "ContainerAppsAuthConfigsOperations", "container_apps": "ContainerAppsOperations", "container_apps_revisions": "ContainerAppsRevisionsOperations", "container_apps_revision_replicas": "ContainerAppsRevisionReplicasOperations", + "dapr_components": "DaprComponentsOperations", + "operations": "Operations", "managed_environments": "ManagedEnvironmentsOperations", "certificates": "CertificatesOperations", - "operations": "Operations", - "container_apps_source_controls": "ContainerAppsSourceControlsOperations", - "dapr_components": "DaprComponentsOperations", - "container_apps_auth_configs": "ContainerAppsAuthConfigsOperations", - "managed_environments_storages": "ManagedEnvironmentsStoragesOperations" + "namespaces": "NamespacesOperations", + "managed_environments_storages": "ManagedEnvironmentsStoragesOperations", + "container_apps_source_controls": "ContainerAppsSourceControlsOperations" } } \ No newline at end of file diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_configuration.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_configuration.py index ed19909a70d5..5b9f79f99523 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_configuration.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_configuration.py @@ -19,7 +19,7 @@ from azure.core.credentials_async import AsyncTokenCredential -class ContainerAppsAPIClientConfiguration(Configuration): +class ContainerAppsAPIClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes """Configuration for ContainerAppsAPIClient. Note that all parameters used to create this instance are saved as instance @@ -29,6 +29,9 @@ class ContainerAppsAPIClientConfiguration(Configuration): :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. :type subscription_id: str + :keyword api_version: Api Version. Default value is "2022-03-01". Note that overriding this + default value may result in unsupported behavior. + :paramtype api_version: str """ def __init__( @@ -38,6 +41,8 @@ def __init__( **kwargs: Any ) -> None: super(ContainerAppsAPIClientConfiguration, self).__init__(**kwargs) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + if credential is None: raise ValueError("Parameter 'credential' must not be None.") if subscription_id is None: @@ -45,7 +50,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id - self.api_version = "2022-01-01-preview" + self.api_version = api_version self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'mgmt-app/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_container_apps_api_client.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_container_apps_api_client.py index f49b67610af1..8eff5ef11408 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_container_apps_api_client.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/_container_apps_api_client.py @@ -7,55 +7,60 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Optional, TYPE_CHECKING +from typing import Any, Awaitable, TYPE_CHECKING + +from msrest import Deserializer, Serializer from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.mgmt.core import AsyncARMPipelineClient -from msrest import Deserializer, Serializer from .. import models from ._configuration import ContainerAppsAPIClientConfiguration -from .operations import CertificatesOperations, ContainerAppsAuthConfigsOperations, ContainerAppsOperations, ContainerAppsRevisionReplicasOperations, ContainerAppsRevisionsOperations, ContainerAppsSourceControlsOperations, DaprComponentsOperations, ManagedEnvironmentsOperations, ManagedEnvironmentsStoragesOperations, Operations +from .operations import CertificatesOperations, ContainerAppsAuthConfigsOperations, ContainerAppsOperations, ContainerAppsRevisionReplicasOperations, ContainerAppsRevisionsOperations, ContainerAppsSourceControlsOperations, DaprComponentsOperations, ManagedEnvironmentsOperations, ManagedEnvironmentsStoragesOperations, NamespacesOperations, Operations if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class ContainerAppsAPIClient: +class ContainerAppsAPIClient: # pylint: disable=too-many-instance-attributes """ContainerAppsAPIClient. + :ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations + :vartype container_apps_auth_configs: + azure.mgmt.app.aio.operations.ContainerAppsAuthConfigsOperations :ivar container_apps: ContainerAppsOperations operations - :vartype container_apps: container_apps_api_client.aio.operations.ContainerAppsOperations + :vartype container_apps: azure.mgmt.app.aio.operations.ContainerAppsOperations :ivar container_apps_revisions: ContainerAppsRevisionsOperations operations :vartype container_apps_revisions: - container_apps_api_client.aio.operations.ContainerAppsRevisionsOperations + azure.mgmt.app.aio.operations.ContainerAppsRevisionsOperations :ivar container_apps_revision_replicas: ContainerAppsRevisionReplicasOperations operations :vartype container_apps_revision_replicas: - container_apps_api_client.aio.operations.ContainerAppsRevisionReplicasOperations + azure.mgmt.app.aio.operations.ContainerAppsRevisionReplicasOperations + :ivar dapr_components: DaprComponentsOperations operations + :vartype dapr_components: azure.mgmt.app.aio.operations.DaprComponentsOperations + :ivar operations: Operations operations + :vartype operations: azure.mgmt.app.aio.operations.Operations :ivar managed_environments: ManagedEnvironmentsOperations operations - :vartype managed_environments: - container_apps_api_client.aio.operations.ManagedEnvironmentsOperations + :vartype managed_environments: azure.mgmt.app.aio.operations.ManagedEnvironmentsOperations :ivar certificates: CertificatesOperations operations - :vartype certificates: container_apps_api_client.aio.operations.CertificatesOperations - :ivar operations: Operations operations - :vartype operations: container_apps_api_client.aio.operations.Operations - :ivar container_apps_source_controls: ContainerAppsSourceControlsOperations operations - :vartype container_apps_source_controls: - container_apps_api_client.aio.operations.ContainerAppsSourceControlsOperations - :ivar dapr_components: DaprComponentsOperations operations - :vartype dapr_components: container_apps_api_client.aio.operations.DaprComponentsOperations - :ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations - :vartype container_apps_auth_configs: - container_apps_api_client.aio.operations.ContainerAppsAuthConfigsOperations + :vartype certificates: azure.mgmt.app.aio.operations.CertificatesOperations + :ivar namespaces: NamespacesOperations operations + :vartype namespaces: azure.mgmt.app.aio.operations.NamespacesOperations :ivar managed_environments_storages: ManagedEnvironmentsStoragesOperations operations :vartype managed_environments_storages: - container_apps_api_client.aio.operations.ManagedEnvironmentsStoragesOperations + azure.mgmt.app.aio.operations.ManagedEnvironmentsStoragesOperations + :ivar container_apps_source_controls: ContainerAppsSourceControlsOperations operations + :vartype container_apps_source_controls: + azure.mgmt.app.aio.operations.ContainerAppsSourceControlsOperations :param credential: Credential needed for the client to connect to Azure. :type credential: ~azure.core.credentials_async.AsyncTokenCredential :param subscription_id: The ID of the target subscription. :type subscription_id: str - :param base_url: Service URL. Default value is 'https://management.azure.com'. + :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-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. """ @@ -74,16 +79,17 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False + self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations(self._client, self._config, self._serialize, self._deserialize) self.container_apps = ContainerAppsOperations(self._client, self._config, self._serialize, self._deserialize) self.container_apps_revisions = ContainerAppsRevisionsOperations(self._client, self._config, self._serialize, self._deserialize) self.container_apps_revision_replicas = ContainerAppsRevisionReplicasOperations(self._client, self._config, self._serialize, self._deserialize) + self.dapr_components = DaprComponentsOperations(self._client, self._config, self._serialize, self._deserialize) + self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) self.managed_environments = ManagedEnvironmentsOperations(self._client, self._config, self._serialize, self._deserialize) self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) - self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_source_controls = ContainerAppsSourceControlsOperations(self._client, self._config, self._serialize, self._deserialize) - self.dapr_components = DaprComponentsOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations(self._client, self._config, self._serialize, self._deserialize) + self.namespaces = NamespacesOperations(self._client, self._config, self._serialize, self._deserialize) self.managed_environments_storages = ManagedEnvironmentsStoragesOperations(self._client, self._config, self._serialize, self._deserialize) + self.container_apps_source_controls = ContainerAppsSourceControlsOperations(self._client, self._config, self._serialize, self._deserialize) def _send_request( diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/__init__.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/__init__.py index 021cee48b4be..505be253220b 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/__init__.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/__init__.py @@ -6,26 +6,28 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from ._container_apps_auth_configs_operations import ContainerAppsAuthConfigsOperations from ._container_apps_operations import ContainerAppsOperations from ._container_apps_revisions_operations import ContainerAppsRevisionsOperations from ._container_apps_revision_replicas_operations import ContainerAppsRevisionReplicasOperations +from ._dapr_components_operations import DaprComponentsOperations +from ._operations import Operations from ._managed_environments_operations import ManagedEnvironmentsOperations from ._certificates_operations import CertificatesOperations -from ._operations import Operations -from ._container_apps_source_controls_operations import ContainerAppsSourceControlsOperations -from ._dapr_components_operations import DaprComponentsOperations -from ._container_apps_auth_configs_operations import ContainerAppsAuthConfigsOperations +from ._namespaces_operations import NamespacesOperations from ._managed_environments_storages_operations import ManagedEnvironmentsStoragesOperations +from ._container_apps_source_controls_operations import ContainerAppsSourceControlsOperations __all__ = [ + 'ContainerAppsAuthConfigsOperations', 'ContainerAppsOperations', 'ContainerAppsRevisionsOperations', 'ContainerAppsRevisionReplicasOperations', + 'DaprComponentsOperations', + 'Operations', 'ManagedEnvironmentsOperations', 'CertificatesOperations', - 'Operations', - 'ContainerAppsSourceControlsOperations', - 'DaprComponentsOperations', - 'ContainerAppsAuthConfigsOperations', + 'NamespacesOperations', 'ManagedEnvironmentsStoragesOperations', + 'ContainerAppsSourceControlsOperations', ] diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_certificates_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_certificates_operations.py index b261b386cb07..8d621083a029 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_certificates_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_certificates_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -31,7 +30,7 @@ class CertificatesOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -64,10 +63,11 @@ def list( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either CertificateCollection or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.CertificateCollection] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.CertificateCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.CertificateCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -80,6 +80,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) @@ -91,6 +92,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -108,7 +110,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -122,7 +128,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates'} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates"} # type: ignore @distributed_trace_async async def get( @@ -144,7 +150,7 @@ async def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: Certificate, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Certificate + :rtype: ~azure.mgmt.app.models.Certificate :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] @@ -153,18 +159,25 @@ async def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -179,7 +192,7 @@ async def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore @distributed_trace_async @@ -201,11 +214,11 @@ async def create_or_update( :type managed_environment_name: str :param name: Name of the Certificate. :type name: str - :param certificate_envelope: Certificate to be created or updated. - :type certificate_envelope: ~container_apps_api_client.models.Certificate + :param certificate_envelope: Certificate to be created or updated. Default value is None. + :type certificate_envelope: ~azure.mgmt.app.models.Certificate :keyword callable cls: A custom type or function that will be passed the direct response :return: Certificate, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Certificate + :rtype: ~azure.mgmt.app.models.Certificate :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] @@ -214,6 +227,7 @@ async def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] if certificate_envelope is not None: @@ -226,6 +240,7 @@ async def create_or_update( resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -233,7 +248,11 @@ async def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -248,11 +267,11 @@ async def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore @distributed_trace_async - async def delete( + async def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, managed_environment_name: str, @@ -280,18 +299,25 @@ async def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -302,7 +328,7 @@ async def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore @distributed_trace_async @@ -325,10 +351,10 @@ async def update( :param name: Name of the Certificate. :type name: str :param certificate_envelope: Properties of a certificate that need to be updated. - :type certificate_envelope: ~container_apps_api_client.models.CertificatePatch + :type certificate_envelope: ~azure.mgmt.app.models.CertificatePatch :keyword callable cls: A custom type or function that will be passed the direct response :return: Certificate, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Certificate + :rtype: ~azure.mgmt.app.models.Certificate :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] @@ -337,6 +363,7 @@ async def update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(certificate_envelope, 'CertificatePatch') @@ -346,6 +373,7 @@ async def update( resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.update.metadata['url'], @@ -353,7 +381,11 @@ async def update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -368,5 +400,5 @@ async def update( return deserialized - update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_auth_configs_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_auth_configs_operations.py index e8fdce3d7522..07954b36edde 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_auth_configs_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_auth_configs_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -31,7 +30,7 @@ class ContainerAppsAuthConfigsOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -64,10 +63,11 @@ def list_by_container_app( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AuthConfigCollection or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.AuthConfigCollection] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.AuthConfigCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfigCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -80,6 +80,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=self.list_by_container_app.metadata['url'], ) request = _convert_request(request) @@ -91,6 +92,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -108,7 +110,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -122,7 +128,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list_by_container_app.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs'} # type: ignore + list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs"} # type: ignore @distributed_trace_async async def get( @@ -144,7 +150,7 @@ async def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: AuthConfig, or the result of cls(response) - :rtype: ~container_apps_api_client.models.AuthConfig + :rtype: ~azure.mgmt.app.models.AuthConfig :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] @@ -153,18 +159,25 @@ async def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -179,7 +192,7 @@ async def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}"} # type: ignore @distributed_trace_async @@ -202,10 +215,10 @@ async def create_or_update( :param name: Name of the Container App AuthConfig. :type name: str :param auth_config_envelope: Properties used to create a Container App AuthConfig. - :type auth_config_envelope: ~container_apps_api_client.models.AuthConfig + :type auth_config_envelope: ~azure.mgmt.app.models.AuthConfig :keyword callable cls: A custom type or function that will be passed the direct response :return: AuthConfig, or the result of cls(response) - :rtype: ~container_apps_api_client.models.AuthConfig + :rtype: ~azure.mgmt.app.models.AuthConfig :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] @@ -214,6 +227,7 @@ async def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(auth_config_envelope, 'AuthConfig') @@ -223,6 +237,7 @@ async def create_or_update( resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -230,7 +245,11 @@ async def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -245,11 +264,11 @@ async def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}"} # type: ignore @distributed_trace_async - async def delete( + async def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -277,18 +296,25 @@ async def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -299,5 +325,5 @@ async def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_operations.py index abea0c93db47..82fc6b1a776f 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -22,7 +21,7 @@ from ... import models as _models from ..._vendor import _convert_request -from ...operations._container_apps_operations import build_create_or_update_request_initial, build_delete_request_initial, build_get_request, build_list_by_resource_group_request, build_list_by_subscription_request, build_list_custom_host_name_analysis_request, build_list_secrets_request, build_update_request +from ...operations._container_apps_operations import build_create_or_update_request_initial, build_delete_request_initial, build_get_request, build_list_by_resource_group_request, build_list_by_subscription_request, build_list_custom_host_name_analysis_request, build_list_secrets_request, build_update_request_initial T = TypeVar('T') ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -33,7 +32,7 @@ class ContainerAppsOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -60,10 +59,11 @@ def list_by_subscription( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ContainerAppCollection or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.ContainerAppCollection] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.ContainerAppCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -74,6 +74,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=self.list_by_subscription.metadata['url'], ) request = _convert_request(request) @@ -83,6 +84,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -100,7 +102,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -114,7 +120,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps'} # type: ignore + list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace def list_by_resource_group( @@ -131,10 +137,11 @@ def list_by_resource_group( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ContainerAppCollection or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.ContainerAppCollection] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.ContainerAppCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -146,6 +153,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=self.list_by_resource_group.metadata['url'], ) request = _convert_request(request) @@ -156,6 +164,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -173,7 +182,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -187,7 +200,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps'} # type: ignore + list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace_async async def get( @@ -206,7 +219,7 @@ async def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ContainerApp, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ContainerApp + :rtype: ~azure.mgmt.app.models.ContainerApp :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] @@ -215,17 +228,24 @@ async def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -240,7 +260,7 @@ async def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore async def _create_or_update_initial( @@ -256,6 +276,7 @@ async def _create_or_update_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(container_app_envelope, 'ContainerApp') @@ -264,6 +285,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self._create_or_update_initial.metadata['url'], @@ -271,7 +293,11 @@ async def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 201]: @@ -289,7 +315,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore @distributed_trace_async @@ -309,7 +335,7 @@ async def begin_create_or_update( :param name: Name of the Container App. :type name: str :param container_app_envelope: Properties used to create a container app. - :type container_app_envelope: ~container_apps_api_client.models.ContainerApp + :type container_app_envelope: ~azure.mgmt.app.models.ContainerApp :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -320,11 +346,12 @@ async def begin_create_or_update( Retry-After header is present. :return: An instance of AsyncLROPoller that returns either ContainerApp or the result of cls(response) - :rtype: ~azure.core.polling.AsyncLROPoller[~container_apps_api_client.models.ContainerApp] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.app.models.ContainerApp] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.AsyncPollingMethod] + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] lro_delay = kwargs.pop( 'polling_interval', @@ -336,6 +363,7 @@ async def begin_create_or_update( resource_group_name=resource_group_name, name=name, container_app_envelope=container_app_envelope, + api_version=api_version, content_type=content_type, cls=lambda x,y,z: x, **kwargs @@ -360,12 +388,11 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore - async def _delete_initial( + async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -377,17 +404,24 @@ async def _delete_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self._delete_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: @@ -397,11 +431,11 @@ async def _delete_initial( if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore @distributed_trace_async - async def begin_delete( + async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -427,7 +461,8 @@ async def begin_delete( :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises: ~azure.core.exceptions.HttpResponseError """ - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.AsyncPollingMethod] + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] cls = kwargs.pop('cls', None) # type: ClsType[None] lro_delay = kwargs.pop( 'polling_interval', @@ -438,6 +473,7 @@ async def begin_delete( raw_result = await self._delete_initial( resource_group_name=resource_group_name, name=name, + api_version=api_version, cls=lambda x,y,z: x, **kwargs ) @@ -458,73 +494,127 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore - @distributed_trace_async - async def update( + async def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, - container_app_envelope: "_models.ContainerAppPatch", + container_app_envelope: "_models.ContainerApp", **kwargs: Any - ) -> "_models.ContainerApp": - """Update properties of a Container App. - - Patches a Container App. Currently only patching of tags is supported. - - :param resource_group_name: The name of the resource group. The name is case insensitive. - :type resource_group_name: str - :param name: Name of the Container App. - :type name: str - :param container_app_envelope: Properties of a container app that need to be updated. - :type container_app_envelope: ~container_apps_api_client.models.ContainerAppPatch - :keyword callable cls: A custom type or function that will be passed the direct response - :return: ContainerApp, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ContainerApp - :raises: ~azure.core.exceptions.HttpResponseError - """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] + ) -> None: + cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - _json = self._serialize.body(container_app_envelope, 'ContainerAppPatch') + _json = self._serialize.body(container_app_envelope, 'ContainerApp') - request = build_update_request( + request = build_update_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, - template_url=self.update.metadata['url'], + template_url=self._update_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response - if response.status_code not in [200]: + if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - - deserialized = self._deserialize('ContainerApp', pipeline_response) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, None, {}) - return deserialized + _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore + + + @distributed_trace_async + async def begin_update( # pylint: disable=inconsistent-return-statements + self, + resource_group_name: str, + name: str, + container_app_envelope: "_models.ContainerApp", + **kwargs: Any + ) -> AsyncLROPoller[None]: + """Update properties of a Container App. + + Patches a Container App using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param name: Name of the Container App. + :type name: str + :param container_app_envelope: Properties of a Container App that need to be updated. + :type container_app_envelope: ~azure.mgmt.app.models.ContainerApp + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[None] + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] + cls = kwargs.pop('cls', None) # type: ClsType[None] + lro_delay = kwargs.pop( + 'polling_interval', + self._config.polling_interval + ) + cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + if cont_token is None: + raw_result = await self._update_initial( + resource_group_name=resource_group_name, + name=name, + container_app_envelope=container_app_envelope, + api_version=api_version, + content_type=content_type, + cls=lambda x,y,z: x, + **kwargs + ) + kwargs.pop('error_map', None) - update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + def get_long_running_output(pipeline_response): + if cls: + return cls(pipeline_response, None, {}) + if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + elif polling is False: polling_method = AsyncNoPolling() + else: polling_method = polling + if cont_token: + return AsyncLROPoller.from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output + ) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + + begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore + @distributed_trace_async async def list_custom_host_name_analysis( self, @@ -541,11 +631,11 @@ async def list_custom_host_name_analysis( :type resource_group_name: str :param container_app_name: Name of the Container App. :type container_app_name: str - :param custom_hostname: Custom hostname. + :param custom_hostname: Custom hostname. Default value is None. :type custom_hostname: str :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomHostnameAnalysisResult, or the result of cls(response) - :rtype: ~container_apps_api_client.models.CustomHostnameAnalysisResult + :rtype: ~azure.mgmt.app.models.CustomHostnameAnalysisResult :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.CustomHostnameAnalysisResult"] @@ -554,18 +644,25 @@ async def list_custom_host_name_analysis( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_custom_host_name_analysis_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, custom_hostname=custom_hostname, template_url=self.list_custom_host_name_analysis.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -580,7 +677,7 @@ async def list_custom_host_name_analysis( return deserialized - list_custom_host_name_analysis.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis'} # type: ignore + list_custom_host_name_analysis.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis"} # type: ignore @distributed_trace_async @@ -600,7 +697,7 @@ async def list_secrets( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: SecretsCollection, or the result of cls(response) - :rtype: ~container_apps_api_client.models.SecretsCollection + :rtype: ~azure.mgmt.app.models.SecretsCollection :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.SecretsCollection"] @@ -609,17 +706,24 @@ async def list_secrets( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_secrets_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self.list_secrets.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -634,5 +738,5 @@ async def list_secrets( return deserialized - list_secrets.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets'} # type: ignore + list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revision_replicas_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revision_replicas_operations.py index 7b64ea72d645..1abb21affd68 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revision_replicas_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revision_replicas_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Optional, TypeVar from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse @@ -29,7 +28,7 @@ class ContainerAppsRevisionReplicasOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -67,7 +66,7 @@ async def get_replica( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: Replica, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Replica + :rtype: ~azure.mgmt.app.models.Replica :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Replica"] @@ -76,6 +75,8 @@ async def get_replica( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_replica_request( subscription_id=self._config.subscription_id, @@ -83,12 +84,17 @@ async def get_replica( container_app_name=container_app_name, revision_name=revision_name, name=name, + api_version=api_version, template_url=self.get_replica.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -103,7 +109,7 @@ async def get_replica( return deserialized - get_replica.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{name}'} # type: ignore + get_replica.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{name}"} # type: ignore @distributed_trace_async @@ -126,7 +132,7 @@ async def list_replicas( :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ReplicaCollection, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ReplicaCollection + :rtype: ~azure.mgmt.app.models.ReplicaCollection :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ReplicaCollection"] @@ -135,18 +141,25 @@ async def list_replicas( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_replicas_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + api_version=api_version, template_url=self.list_replicas.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -161,5 +174,5 @@ async def list_replicas( return deserialized - list_replicas.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas'} # type: ignore + list_replicas.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revisions_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revisions_operations.py index 5cd9f2e3fd2d..f31b8c9afbcb 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revisions_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_revisions_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -31,7 +30,7 @@ class ContainerAppsRevisionsOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -51,6 +50,7 @@ def list_revisions( self, resource_group_name: str, container_app_name: str, + filter: Optional[str] = None, **kwargs: Any ) -> AsyncIterable["_models.RevisionCollection"]: """Get the Revisions for a given Container App. @@ -61,12 +61,15 @@ def list_revisions( :type resource_group_name: str :param container_app_name: Name of the Container App for which Revisions are needed. :type container_app_name: str + :param filter: The filter to apply on the operation. Default value is None. + :type filter: str :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either RevisionCollection or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.RevisionCollection] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.RevisionCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.RevisionCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -79,6 +82,8 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, + filter=filter, template_url=self.list_revisions.metadata['url'], ) request = _convert_request(request) @@ -90,6 +95,8 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, + filter=filter, template_url=next_link, ) request = _convert_request(request) @@ -107,7 +114,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -121,7 +132,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list_revisions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions'} # type: ignore + list_revisions.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions"} # type: ignore @distributed_trace_async async def get_revision( @@ -143,7 +154,7 @@ async def get_revision( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: Revision, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Revision + :rtype: ~azure.mgmt.app.models.Revision :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Revision"] @@ -152,18 +163,25 @@ async def get_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.get_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -178,11 +196,11 @@ async def get_revision( return deserialized - get_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}'} # type: ignore + get_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}"} # type: ignore @distributed_trace_async - async def activate_revision( + async def activate_revision( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -210,18 +228,25 @@ async def activate_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_activate_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.activate_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -232,11 +257,11 @@ async def activate_revision( if cls: return cls(pipeline_response, None, {}) - activate_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/activate'} # type: ignore + activate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/activate"} # type: ignore @distributed_trace_async - async def deactivate_revision( + async def deactivate_revision( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -264,18 +289,25 @@ async def deactivate_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_deactivate_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.deactivate_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -286,11 +318,11 @@ async def deactivate_revision( if cls: return cls(pipeline_response, None, {}) - deactivate_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/deactivate'} # type: ignore + deactivate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/deactivate"} # type: ignore @distributed_trace_async - async def restart_revision( + async def restart_revision( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -318,18 +350,25 @@ async def restart_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_restart_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.restart_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -340,5 +379,5 @@ async def restart_revision( if cls: return cls(pipeline_response, None, {}) - restart_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/restart'} # type: ignore + restart_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/restart"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_source_controls_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_source_controls_operations.py index f3b24eef4db3..fc48271d16a7 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_source_controls_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_container_apps_source_controls_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -33,7 +32,7 @@ class ContainerAppsSourceControlsOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -66,10 +65,11 @@ def list_by_container_app( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either SourceControlCollection or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.SourceControlCollection] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.SourceControlCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControlCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -82,6 +82,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=self.list_by_container_app.metadata['url'], ) request = _convert_request(request) @@ -93,6 +94,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -110,7 +112,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -124,7 +130,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list_by_container_app.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols'} # type: ignore + list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols"} # type: ignore @distributed_trace_async async def get( @@ -146,7 +152,7 @@ async def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: SourceControl, or the result of cls(response) - :rtype: ~container_apps_api_client.models.SourceControl + :rtype: ~azure.mgmt.app.models.SourceControl :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] @@ -155,18 +161,25 @@ async def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -181,7 +194,7 @@ async def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore async def _create_or_update_initial( @@ -198,6 +211,7 @@ async def _create_or_update_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(source_control_envelope, 'SourceControl') @@ -207,6 +221,7 @@ async def _create_or_update_initial( resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self._create_or_update_initial.metadata['url'], @@ -214,7 +229,11 @@ async def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202]: @@ -232,7 +251,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore @distributed_trace_async @@ -255,7 +274,7 @@ async def begin_create_or_update( :param name: Name of the Container App SourceControl. :type name: str :param source_control_envelope: Properties used to create a Container App SourceControl. - :type source_control_envelope: ~container_apps_api_client.models.SourceControl + :type source_control_envelope: ~azure.mgmt.app.models.SourceControl :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -266,11 +285,12 @@ async def begin_create_or_update( Retry-After header is present. :return: An instance of AsyncLROPoller that returns either SourceControl or the result of cls(response) - :rtype: ~azure.core.polling.AsyncLROPoller[~container_apps_api_client.models.SourceControl] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.app.models.SourceControl] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.AsyncPollingMethod] + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] lro_delay = kwargs.pop( 'polling_interval', @@ -283,6 +303,7 @@ async def begin_create_or_update( container_app_name=container_app_name, name=name, source_control_envelope=source_control_envelope, + api_version=api_version, content_type=content_type, cls=lambda x,y,z: x, **kwargs @@ -307,12 +328,11 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore - async def _delete_initial( + async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -325,18 +345,25 @@ async def _delete_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self._delete_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: @@ -346,11 +373,11 @@ async def _delete_initial( if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore @distributed_trace_async - async def begin_delete( + async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -379,7 +406,8 @@ async def begin_delete( :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises: ~azure.core.exceptions.HttpResponseError """ - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.AsyncPollingMethod] + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] cls = kwargs.pop('cls', None) # type: ClsType[None] lro_delay = kwargs.pop( 'polling_interval', @@ -391,6 +419,7 @@ async def begin_delete( resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, cls=lambda x,y,z: x, **kwargs ) @@ -411,7 +440,6 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_dapr_components_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_dapr_components_operations.py index fa4d365e7441..8e05e1318690 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_dapr_components_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_dapr_components_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -20,7 +19,7 @@ from ... import models as _models from ..._vendor import _convert_request -from ...operations._dapr_components_operations import build_create_or_update_request, build_delete_request, build_get_request, build_list_request +from ...operations._dapr_components_operations import build_create_or_update_request, build_delete_request, build_get_request, build_list_request, build_list_secrets_request T = TypeVar('T') ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -31,7 +30,7 @@ class DaprComponentsOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -65,9 +64,11 @@ def list( :return: An iterator like instance of either DaprComponentsCollection or the result of cls(response) :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.DaprComponentsCollection] + ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.DaprComponentsCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponentsCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -80,6 +81,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) @@ -91,6 +93,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -108,7 +111,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -122,7 +129,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents'} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents"} # type: ignore @distributed_trace_async async def get( @@ -144,7 +151,7 @@ async def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: DaprComponent, or the result of cls(response) - :rtype: ~container_apps_api_client.models.DaprComponent + :rtype: ~azure.mgmt.app.models.DaprComponent :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] @@ -153,18 +160,25 @@ async def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -179,7 +193,7 @@ async def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}"} # type: ignore @distributed_trace_async @@ -202,10 +216,10 @@ async def create_or_update( :param name: Name of the Dapr Component. :type name: str :param dapr_component_envelope: Configuration details of the Dapr Component. - :type dapr_component_envelope: ~container_apps_api_client.models.DaprComponent + :type dapr_component_envelope: ~azure.mgmt.app.models.DaprComponent :keyword callable cls: A custom type or function that will be passed the direct response :return: DaprComponent, or the result of cls(response) - :rtype: ~container_apps_api_client.models.DaprComponent + :rtype: ~azure.mgmt.app.models.DaprComponent :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] @@ -214,6 +228,7 @@ async def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(dapr_component_envelope, 'DaprComponent') @@ -223,6 +238,7 @@ async def create_or_update( resource_group_name=resource_group_name, environment_name=environment_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -230,7 +246,11 @@ async def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -245,11 +265,11 @@ async def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}"} # type: ignore @distributed_trace_async - async def delete( + async def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, environment_name: str, @@ -277,18 +297,25 @@ async def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -299,5 +326,70 @@ async def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}"} # type: ignore + + + @distributed_trace_async + async def list_secrets( + self, + resource_group_name: str, + environment_name: str, + name: str, + **kwargs: Any + ) -> "_models.DaprSecretsCollection": + """List secrets for a dapr component. + + List secrets for a dapr component. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. + :type environment_name: str + :param name: Name of the Dapr Component. + :type name: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: DaprSecretsCollection, or the result of cls(response) + :rtype: ~azure.mgmt.app.models.DaprSecretsCollection + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprSecretsCollection"] + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } + error_map.update(kwargs.pop('error_map', {})) + + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + + + request = build_list_secrets_request( + subscription_id=self._config.subscription_id, + resource_group_name=resource_group_name, + environment_name=environment_name, + name=name, + api_version=api_version, + template_url=self.list_secrets.metadata['url'], + ) + request = _convert_request(request) + request.url = self._client.format_url(request.url) + + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize('DaprSecretsCollection', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + + list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}/listSecrets"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_operations.py index a7cc217cfe3f..96cf1e3a38a6 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -22,7 +21,7 @@ from ... import models as _models from ..._vendor import _convert_request -from ...operations._managed_environments_operations import build_create_or_update_request_initial, build_delete_request_initial, build_get_request, build_list_by_resource_group_request, build_list_by_subscription_request, build_update_request +from ...operations._managed_environments_operations import build_create_or_update_request_initial, build_delete_request_initial, build_get_request, build_list_by_resource_group_request, build_list_by_subscription_request, build_update_request_initial T = TypeVar('T') ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -33,7 +32,7 @@ class ManagedEnvironmentsOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -61,9 +60,11 @@ def list_by_subscription( :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of cls(response) :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.ManagedEnvironmentsCollection] + ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.ManagedEnvironmentsCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -74,6 +75,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=self.list_by_subscription.metadata['url'], ) request = _convert_request(request) @@ -83,6 +85,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -100,7 +103,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -114,7 +121,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments'} # type: ignore + list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace def list_by_resource_group( @@ -132,9 +139,11 @@ def list_by_resource_group( :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of cls(response) :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.ManagedEnvironmentsCollection] + ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.ManagedEnvironmentsCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -146,6 +155,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=self.list_by_resource_group.metadata['url'], ) request = _convert_request(request) @@ -156,6 +166,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -173,7 +184,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -187,7 +202,7 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments'} # type: ignore + list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace_async async def get( @@ -206,7 +221,7 @@ async def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironment, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironment + :rtype: ~azure.mgmt.app.models.ManagedEnvironment :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] @@ -215,17 +230,24 @@ async def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -240,7 +262,7 @@ async def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore async def _create_or_update_initial( @@ -256,6 +278,7 @@ async def _create_or_update_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') @@ -264,6 +287,7 @@ async def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self._create_or_update_initial.metadata['url'], @@ -271,7 +295,11 @@ async def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 201]: @@ -289,7 +317,7 @@ async def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore @distributed_trace_async @@ -309,7 +337,7 @@ async def begin_create_or_update( :param name: Name of the Environment. :type name: str :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~container_apps_api_client.models.ManagedEnvironment + :type environment_envelope: ~azure.mgmt.app.models.ManagedEnvironment :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -320,12 +348,12 @@ async def begin_create_or_update( Retry-After header is present. :return: An instance of AsyncLROPoller that returns either ManagedEnvironment or the result of cls(response) - :rtype: - ~azure.core.polling.AsyncLROPoller[~container_apps_api_client.models.ManagedEnvironment] + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.app.models.ManagedEnvironment] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.AsyncPollingMethod] + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] lro_delay = kwargs.pop( 'polling_interval', @@ -337,6 +365,7 @@ async def begin_create_or_update( resource_group_name=resource_group_name, name=name, environment_envelope=environment_envelope, + api_version=api_version, content_type=content_type, cls=lambda x,y,z: x, **kwargs @@ -361,12 +390,11 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore - async def _delete_initial( + async def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -378,17 +406,24 @@ async def _delete_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self._delete_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: @@ -398,11 +433,11 @@ async def _delete_initial( if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore @distributed_trace_async - async def begin_delete( + async def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -428,7 +463,8 @@ async def begin_delete( :rtype: ~azure.core.polling.AsyncLROPoller[None] :raises: ~azure.core.exceptions.HttpResponseError """ - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.AsyncPollingMethod] + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] cls = kwargs.pop('cls', None) # type: ClsType[None] lro_delay = kwargs.pop( 'polling_interval', @@ -439,6 +475,7 @@ async def begin_delete( raw_result = await self._delete_initial( resource_group_name=resource_group_name, name=name, + api_version=api_version, cls=lambda x,y,z: x, **kwargs ) @@ -459,69 +496,123 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore - @distributed_trace_async - async def update( + async def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, - environment_envelope: "_models.ManagedEnvironmentPatch", + environment_envelope: "_models.ManagedEnvironment", **kwargs: Any - ) -> "_models.ManagedEnvironment": - """Update Managed Environment's properties. - - Patches a Managed Environment. Only patching of tags is supported currently. - - :param resource_group_name: The name of the resource group. The name is case insensitive. - :type resource_group_name: str - :param name: Name of the Environment. - :type name: str - :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~container_apps_api_client.models.ManagedEnvironmentPatch - :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironment, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironment - :raises: ~azure.core.exceptions.HttpResponseError - """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] + ) -> None: + cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - _json = self._serialize.body(environment_envelope, 'ManagedEnvironmentPatch') + _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') - request = build_update_request( + request = build_update_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, - template_url=self.update.metadata['url'], + template_url=self._update_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response - if response.status_code not in [200]: + if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, None, {}) - return deserialized + _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore + + + @distributed_trace_async + async def begin_update( # pylint: disable=inconsistent-return-statements + self, + resource_group_name: str, + name: str, + environment_envelope: "_models.ManagedEnvironment", + **kwargs: Any + ) -> AsyncLROPoller[None]: + """Update Managed Environment's properties. - update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + Patches a Managed Environment using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param name: Name of the Environment. + :type name: str + :param environment_envelope: Configuration details of the Environment. + :type environment_envelope: ~azure.mgmt.app.models.ManagedEnvironment + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[None] + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] + cls = kwargs.pop('cls', None) # type: ClsType[None] + lro_delay = kwargs.pop( + 'polling_interval', + self._config.polling_interval + ) + cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + if cont_token is None: + raw_result = await self._update_initial( + resource_group_name=resource_group_name, + name=name, + environment_envelope=environment_envelope, + api_version=api_version, + content_type=content_type, + cls=lambda x,y,z: x, + **kwargs + ) + kwargs.pop('error_map', None) + + def get_long_running_output(pipeline_response): + if cls: + return cls(pipeline_response, None, {}) + + + if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) + elif polling is False: polling_method = AsyncNoPolling() + else: polling_method = polling + if cont_token: + return AsyncLROPoller.from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output + ) + return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) + begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_storages_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_storages_operations.py index a9db1bf2ac83..067e6f38bd56 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_storages_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_managed_environments_storages_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Optional, TypeVar from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse @@ -29,7 +28,7 @@ class ManagedEnvironmentsStoragesOperations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -61,7 +60,7 @@ async def list( :type env_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironmentStoragesCollection, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironmentStoragesCollection + :rtype: ~azure.mgmt.app.models.ManagedEnvironmentStoragesCollection :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStoragesCollection"] @@ -70,17 +69,24 @@ async def list( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, env_name=env_name, + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -95,7 +101,7 @@ async def list( return deserialized - list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages'} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages"} # type: ignore @distributed_trace_async @@ -118,7 +124,7 @@ async def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironmentStorage, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironmentStorage + :rtype: ~azure.mgmt.app.models.ManagedEnvironmentStorage :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] @@ -127,18 +133,25 @@ async def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, env_name=env_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -153,7 +166,7 @@ async def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}"} # type: ignore @distributed_trace_async @@ -176,10 +189,10 @@ async def create_or_update( :param name: Name of the storage. :type name: str :param storage_envelope: Configuration details of storage. - :type storage_envelope: ~container_apps_api_client.models.ManagedEnvironmentStorage + :type storage_envelope: ~azure.mgmt.app.models.ManagedEnvironmentStorage :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironmentStorage, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironmentStorage + :rtype: ~azure.mgmt.app.models.ManagedEnvironmentStorage :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] @@ -188,6 +201,7 @@ async def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(storage_envelope, 'ManagedEnvironmentStorage') @@ -197,6 +211,7 @@ async def create_or_update( resource_group_name=resource_group_name, env_name=env_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -204,7 +219,11 @@ async def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -219,11 +238,11 @@ async def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}"} # type: ignore @distributed_trace_async - async def delete( + async def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, env_name: str, @@ -251,18 +270,25 @@ async def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, env_name=env_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -273,5 +299,5 @@ async def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_namespaces_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_namespaces_operations.py new file mode 100644 index 000000000000..8f173e7d6435 --- /dev/null +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_namespaces_operations.py @@ -0,0 +1,112 @@ +# pylint: disable=too-many-lines +# 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 typing import Any, Callable, Dict, Optional, TypeVar + +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import AsyncHttpResponse +from azure.core.rest import HttpRequest +from azure.core.tracing.decorator_async import distributed_trace_async +from azure.mgmt.core.exceptions import ARMErrorFormat + +from ... import models as _models +from ..._vendor import _convert_request +from ...operations._namespaces_operations import build_check_name_availability_request +T = TypeVar('T') +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] + +class NamespacesOperations: + """NamespacesOperations async operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~azure.mgmt.app.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = _models + + def __init__(self, client, config, serializer, deserializer) -> None: + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + @distributed_trace_async + async def check_name_availability( + self, + resource_group_name: str, + managed_environment_name: str, + check_name_availability_request: "_models.CheckNameAvailabilityRequest", + **kwargs: Any + ) -> "_models.CheckNameAvailabilityResponse": + """Checks the resource name availability. + + Checks if resource name is available. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param managed_environment_name: Name of the Managed Environment. + :type managed_environment_name: str + :param check_name_availability_request: The check name availability request. + :type check_name_availability_request: ~azure.mgmt.app.models.CheckNameAvailabilityRequest + :keyword callable cls: A custom type or function that will be passed the direct response + :return: CheckNameAvailabilityResponse, or the result of cls(response) + :rtype: ~azure.mgmt.app.models.CheckNameAvailabilityResponse + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["_models.CheckNameAvailabilityResponse"] + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } + error_map.update(kwargs.pop('error_map', {})) + + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + + _json = self._serialize.body(check_name_availability_request, 'CheckNameAvailabilityRequest') + + request = build_check_name_availability_request( + subscription_id=self._config.subscription_id, + resource_group_name=resource_group_name, + managed_environment_name=managed_environment_name, + api_version=api_version, + content_type=content_type, + json=_json, + template_url=self.check_name_availability.metadata['url'], + ) + request = _convert_request(request) + request.url = self._client.format_url(request.url) + + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize('CheckNameAvailabilityResponse', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + + check_name_availability.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/checkNameAvailability"} # type: ignore + diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_operations.py index 7280e090ac90..d68ca5ac2226 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/aio/operations/_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,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 functools -from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar from azure.core.async_paging import AsyncItemPaged, AsyncList from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error @@ -15,7 +14,6 @@ from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace -from azure.core.tracing.decorator_async import distributed_trace_async from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models @@ -31,7 +29,7 @@ class Operations: instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -55,10 +53,11 @@ def list( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AvailableOperations or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~container_apps_api_client.models.AvailableOperations] + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.app.models.AvailableOperations] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.AvailableOperations"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -68,6 +67,7 @@ def prepare_request(next_link=None): if not next_link: request = build_list_request( + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) @@ -76,6 +76,7 @@ def prepare_request(next_link=None): else: request = build_list_request( + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -93,7 +94,11 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -107,4 +112,4 @@ async def get_next(next_link=None): return AsyncItemPaged( get_next, extract_data ) - list.metadata = {'url': '/providers/Microsoft.App/operations'} # type: ignore + list.metadata = {'url': "/providers/Microsoft.App/operations"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/models/__init__.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/models/__init__.py index 97ddbb90753e..cfdcf8a0559f 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/models/__init__.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/models/__init__.py @@ -28,12 +28,13 @@ from ._models_py3 import CertificateCollection from ._models_py3 import CertificatePatch from ._models_py3 import CertificateProperties +from ._models_py3 import CheckNameAvailabilityRequest +from ._models_py3 import CheckNameAvailabilityResponse from ._models_py3 import ClientRegistration from ._models_py3 import Configuration from ._models_py3 import Container from ._models_py3 import ContainerApp from ._models_py3 import ContainerAppCollection -from ._models_py3 import ContainerAppPatch from ._models_py3 import ContainerAppProbe from ._models_py3 import ContainerAppProbeHttpGet from ._models_py3 import ContainerAppProbeHttpGetHttpHeadersItem @@ -49,6 +50,7 @@ from ._models_py3 import DaprComponent from ._models_py3 import DaprComponentsCollection from ._models_py3 import DaprMetadata +from ._models_py3 import DaprSecretsCollection from ._models_py3 import DefaultAuthorizationPolicy from ._models_py3 import DefaultErrorResponse from ._models_py3 import DefaultErrorResponseError @@ -71,7 +73,6 @@ from ._models_py3 import LoginRoutes from ._models_py3 import LoginScopes from ._models_py3 import ManagedEnvironment -from ._models_py3 import ManagedEnvironmentPatch from ._models_py3 import ManagedEnvironmentStorage from ._models_py3 import ManagedEnvironmentStorageProperties from ._models_py3 import ManagedEnvironmentStoragesCollection @@ -119,6 +120,7 @@ AppProtocol, BindingType, CertificateProvisioningState, + CheckNameAvailabilityReason, ContainerAppProvisioningState, CookieExpirationConvention, CreatedByType, @@ -158,12 +160,13 @@ 'CertificateCollection', 'CertificatePatch', 'CertificateProperties', + 'CheckNameAvailabilityRequest', + 'CheckNameAvailabilityResponse', 'ClientRegistration', 'Configuration', 'Container', 'ContainerApp', 'ContainerAppCollection', - 'ContainerAppPatch', 'ContainerAppProbe', 'ContainerAppProbeHttpGet', 'ContainerAppProbeHttpGetHttpHeadersItem', @@ -179,6 +182,7 @@ 'DaprComponent', 'DaprComponentsCollection', 'DaprMetadata', + 'DaprSecretsCollection', 'DefaultAuthorizationPolicy', 'DefaultErrorResponse', 'DefaultErrorResponseError', @@ -201,7 +205,6 @@ 'LoginRoutes', 'LoginScopes', 'ManagedEnvironment', - 'ManagedEnvironmentPatch', 'ManagedEnvironmentStorage', 'ManagedEnvironmentStorageProperties', 'ManagedEnvironmentStoragesCollection', @@ -246,6 +249,7 @@ 'AppProtocol', 'BindingType', 'CertificateProvisioningState', + 'CheckNameAvailabilityReason', 'ContainerAppProvisioningState', 'CookieExpirationConvention', 'CreatedByType', diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_container_apps_api_client_enums.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_container_apps_api_client_enums.py index dfd7bb186bd7..c4e97aa7418e 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_container_apps_api_client_enums.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_container_apps_api_client_enums.py @@ -24,9 +24,9 @@ class ActiveRevisionsMode(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): .. raw:: html - Multiple: multiple revisions can be active. If no value if provided, this is the - defaultSingle: Only one revision can be active at a time. Revision weights can not - be used in this mode + Multiple: multiple revisions can be active.Single: Only one + revision can be active at a time. Revision weights can not be used in this mode. If no value if + provided, this is the default. """ MULTIPLE = "multiple" @@ -57,6 +57,13 @@ class CertificateProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, DELETE_FAILED = "DeleteFailed" PENDING = "Pending" +class CheckNameAvailabilityReason(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + """The reason why the given name is not available. + """ + + INVALID = "Invalid" + ALREADY_EXISTS = "AlreadyExists" + class ContainerAppProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): """Provisioning state of the Container App. """ diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_models_py3.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_models_py3.py index 56167390e75d..a52f2224c124 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_models_py3.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/models/_models_py3.py @@ -81,9 +81,9 @@ class Apple(msrest.serialization.Model): the set registration; otherwise, :code:`true`. :vartype enabled: bool :ivar registration: The configuration settings of the Apple registration. - :vartype registration: ~container_apps_api_client.models.AppleRegistration + :vartype registration: ~azure.mgmt.app.models.AppleRegistration :ivar login: The configuration settings of the login flow. - :vartype login: ~container_apps_api_client.models.LoginScopes + :vartype login: ~azure.mgmt.app.models.LoginScopes """ _attribute_map = { @@ -105,9 +105,9 @@ def __init__( despite the set registration; otherwise, :code:`true`. :paramtype enabled: bool :keyword registration: The configuration settings of the Apple registration. - :paramtype registration: ~container_apps_api_client.models.AppleRegistration + :paramtype registration: ~azure.mgmt.app.models.AppleRegistration :keyword login: The configuration settings of the login flow. - :paramtype login: ~container_apps_api_client.models.LoginScopes + :paramtype login: ~azure.mgmt.app.models.LoginScopes """ super(Apple, self).__init__(**kwargs) self.enabled = enabled @@ -153,8 +153,7 @@ class AppLogsConfiguration(msrest.serialization.Model): :ivar destination: Logs destination. :vartype destination: str :ivar log_analytics_configuration: Log Analytics configuration. - :vartype log_analytics_configuration: - ~container_apps_api_client.models.LogAnalyticsConfiguration + :vartype log_analytics_configuration: ~azure.mgmt.app.models.LogAnalyticsConfiguration """ _attribute_map = { @@ -173,8 +172,7 @@ def __init__( :keyword destination: Logs destination. :paramtype destination: str :keyword log_analytics_configuration: Log Analytics configuration. - :paramtype log_analytics_configuration: - ~container_apps_api_client.models.LogAnalyticsConfiguration + :paramtype log_analytics_configuration: ~azure.mgmt.app.models.LogAnalyticsConfiguration """ super(AppLogsConfiguration, self).__init__(**kwargs) self.destination = destination @@ -228,7 +226,7 @@ class Resource(msrest.serialization.Model): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData """ _validation = { @@ -273,7 +271,7 @@ class ProxyResource(Resource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData """ _validation = { @@ -314,22 +312,22 @@ class AuthConfig(ProxyResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar platform: The configuration settings of the platform of ContainerApp Service Authentication/Authorization. - :vartype platform: ~container_apps_api_client.models.AuthPlatform + :vartype platform: ~azure.mgmt.app.models.AuthPlatform :ivar global_validation: The configuration settings that determines the validation flow of users using Service Authentication/Authorization. - :vartype global_validation: ~container_apps_api_client.models.GlobalValidation + :vartype global_validation: ~azure.mgmt.app.models.GlobalValidation :ivar identity_providers: The configuration settings of each of the identity providers used to configure ContainerApp Service Authentication/Authorization. - :vartype identity_providers: ~container_apps_api_client.models.IdentityProviders + :vartype identity_providers: ~azure.mgmt.app.models.IdentityProviders :ivar login: The configuration settings of the login flow of users using ContainerApp Service Authentication/Authorization. - :vartype login: ~container_apps_api_client.models.Login + :vartype login: ~azure.mgmt.app.models.Login :ivar http_settings: The configuration settings of the HTTP requests for authentication and authorization requests made against ContainerApp Service Authentication/Authorization. - :vartype http_settings: ~container_apps_api_client.models.HttpSettings + :vartype http_settings: ~azure.mgmt.app.models.HttpSettings """ _validation = { @@ -364,19 +362,19 @@ def __init__( """ :keyword platform: The configuration settings of the platform of ContainerApp Service Authentication/Authorization. - :paramtype platform: ~container_apps_api_client.models.AuthPlatform + :paramtype platform: ~azure.mgmt.app.models.AuthPlatform :keyword global_validation: The configuration settings that determines the validation flow of users using Service Authentication/Authorization. - :paramtype global_validation: ~container_apps_api_client.models.GlobalValidation + :paramtype global_validation: ~azure.mgmt.app.models.GlobalValidation :keyword identity_providers: The configuration settings of each of the identity providers used to configure ContainerApp Service Authentication/Authorization. - :paramtype identity_providers: ~container_apps_api_client.models.IdentityProviders + :paramtype identity_providers: ~azure.mgmt.app.models.IdentityProviders :keyword login: The configuration settings of the login flow of users using ContainerApp Service Authentication/Authorization. - :paramtype login: ~container_apps_api_client.models.Login + :paramtype login: ~azure.mgmt.app.models.Login :keyword http_settings: The configuration settings of the HTTP requests for authentication and authorization requests made against ContainerApp Service Authentication/Authorization. - :paramtype http_settings: ~container_apps_api_client.models.HttpSettings + :paramtype http_settings: ~azure.mgmt.app.models.HttpSettings """ super(AuthConfig, self).__init__(**kwargs) self.platform = platform @@ -394,7 +392,7 @@ class AuthConfigCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.AuthConfig] + :vartype value: list[~azure.mgmt.app.models.AuthConfig] :ivar next_link: Link to next page of resources. :vartype next_link: str """ @@ -417,7 +415,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.AuthConfig] + :paramtype value: list[~azure.mgmt.app.models.AuthConfig] """ super(AuthConfigCollection, self).__init__(**kwargs) self.value = value @@ -468,7 +466,7 @@ class AvailableOperations(msrest.serialization.Model): """Available operations of the service. :ivar value: Collection of available operation details. - :vartype value: list[~container_apps_api_client.models.OperationDetail] + :vartype value: list[~azure.mgmt.app.models.OperationDetail] :ivar next_link: URL client should use to fetch the next page (per server side paging). It's null for now, added for future use. :vartype next_link: str @@ -488,7 +486,7 @@ def __init__( ): """ :keyword value: Collection of available operation details. - :paramtype value: list[~container_apps_api_client.models.OperationDetail] + :paramtype value: list[~azure.mgmt.app.models.OperationDetail] :keyword next_link: URL client should use to fetch the next page (per server side paging). It's null for now, added for future use. :paramtype next_link: str @@ -505,12 +503,12 @@ class AzureActiveDirectory(msrest.serialization.Model): enabled despite the set registration; otherwise, :code:`true`. :vartype enabled: bool :ivar registration: The configuration settings of the Azure Active Directory app registration. - :vartype registration: ~container_apps_api_client.models.AzureActiveDirectoryRegistration + :vartype registration: ~azure.mgmt.app.models.AzureActiveDirectoryRegistration :ivar login: The configuration settings of the Azure Active Directory login flow. - :vartype login: ~container_apps_api_client.models.AzureActiveDirectoryLogin + :vartype login: ~azure.mgmt.app.models.AzureActiveDirectoryLogin :ivar validation: The configuration settings of the Azure Active Directory token validation flow. - :vartype validation: ~container_apps_api_client.models.AzureActiveDirectoryValidation + :vartype validation: ~azure.mgmt.app.models.AzureActiveDirectoryValidation :ivar is_auto_provisioned: Gets a value indicating whether the Azure AD configuration was auto-provisioned using 1st party tooling. This is an internal flag primarily intended to support the Azure Management Portal. Users @@ -543,12 +541,12 @@ def __init__( :paramtype enabled: bool :keyword registration: The configuration settings of the Azure Active Directory app registration. - :paramtype registration: ~container_apps_api_client.models.AzureActiveDirectoryRegistration + :paramtype registration: ~azure.mgmt.app.models.AzureActiveDirectoryRegistration :keyword login: The configuration settings of the Azure Active Directory login flow. - :paramtype login: ~container_apps_api_client.models.AzureActiveDirectoryLogin + :paramtype login: ~azure.mgmt.app.models.AzureActiveDirectoryLogin :keyword validation: The configuration settings of the Azure Active Directory token validation flow. - :paramtype validation: ~container_apps_api_client.models.AzureActiveDirectoryValidation + :paramtype validation: ~azure.mgmt.app.models.AzureActiveDirectoryValidation :keyword is_auto_provisioned: Gets a value indicating whether the Azure AD configuration was auto-provisioned using 1st party tooling. This is an internal flag primarily intended to support the Azure Management Portal. Users @@ -703,14 +701,13 @@ class AzureActiveDirectoryValidation(msrest.serialization.Model): :ivar jwt_claim_checks: The configuration settings of the checks that should be made while validating the JWT Claims. - :vartype jwt_claim_checks: ~container_apps_api_client.models.JwtClaimChecks + :vartype jwt_claim_checks: ~azure.mgmt.app.models.JwtClaimChecks :ivar allowed_audiences: The list of audiences that can make successful authentication/authorization requests. :vartype allowed_audiences: list[str] :ivar default_authorization_policy: The configuration settings of the default authorization policy. - :vartype default_authorization_policy: - ~container_apps_api_client.models.DefaultAuthorizationPolicy + :vartype default_authorization_policy: ~azure.mgmt.app.models.DefaultAuthorizationPolicy """ _attribute_map = { @@ -730,14 +727,13 @@ def __init__( """ :keyword jwt_claim_checks: The configuration settings of the checks that should be made while validating the JWT Claims. - :paramtype jwt_claim_checks: ~container_apps_api_client.models.JwtClaimChecks + :paramtype jwt_claim_checks: ~azure.mgmt.app.models.JwtClaimChecks :keyword allowed_audiences: The list of audiences that can make successful authentication/authorization requests. :paramtype allowed_audiences: list[str] :keyword default_authorization_policy: The configuration settings of the default authorization policy. - :paramtype default_authorization_policy: - ~container_apps_api_client.models.DefaultAuthorizationPolicy + :paramtype default_authorization_policy: ~azure.mgmt.app.models.DefaultAuthorizationPolicy """ super(AzureActiveDirectoryValidation, self).__init__(**kwargs) self.jwt_claim_checks = jwt_claim_checks @@ -799,7 +795,7 @@ class AzureFileProperties(msrest.serialization.Model): :ivar account_key: Storage account key for azure file. :vartype account_key: str :ivar access_mode: Access mode for storage. Possible values include: "ReadOnly", "ReadWrite". - :vartype access_mode: str or ~container_apps_api_client.models.AccessMode + :vartype access_mode: str or ~azure.mgmt.app.models.AccessMode :ivar share_name: Azure file share name. :vartype share_name: str """ @@ -827,7 +823,7 @@ def __init__( :paramtype account_key: str :keyword access_mode: Access mode for storage. Possible values include: "ReadOnly", "ReadWrite". - :paramtype access_mode: str or ~container_apps_api_client.models.AccessMode + :paramtype access_mode: str or ~azure.mgmt.app.models.AccessMode :keyword share_name: Azure file share name. :paramtype share_name: str """ @@ -845,7 +841,7 @@ class AzureStaticWebApps(msrest.serialization.Model): enabled despite the set registration; otherwise, :code:`true`. :vartype enabled: bool :ivar registration: The configuration settings of the Azure Static Web Apps registration. - :vartype registration: ~container_apps_api_client.models.AzureStaticWebAppsRegistration + :vartype registration: ~azure.mgmt.app.models.AzureStaticWebAppsRegistration """ _attribute_map = { @@ -865,7 +861,7 @@ def __init__( be enabled despite the set registration; otherwise, :code:`true`. :paramtype enabled: bool :keyword registration: The configuration settings of the Azure Static Web Apps registration. - :paramtype registration: ~container_apps_api_client.models.AzureStaticWebAppsRegistration + :paramtype registration: ~azure.mgmt.app.models.AzureStaticWebAppsRegistration """ super(AzureStaticWebApps, self).__init__(**kwargs) self.enabled = enabled @@ -914,7 +910,7 @@ class TrackedResource(Resource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar tags: A set of tags. Resource tags. :vartype tags: dict[str, str] :ivar location: Required. The geo-location where the resource lives. @@ -973,13 +969,13 @@ class Certificate(TrackedResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar tags: A set of tags. Resource tags. :vartype tags: dict[str, str] :ivar location: Required. The geo-location where the resource lives. :vartype location: str :ivar properties: Certificate resource specific properties. - :vartype properties: ~container_apps_api_client.models.CertificateProperties + :vartype properties: ~azure.mgmt.app.models.CertificateProperties """ _validation = { @@ -1014,7 +1010,7 @@ def __init__( :keyword location: Required. The geo-location where the resource lives. :paramtype location: str :keyword properties: Certificate resource specific properties. - :paramtype properties: ~container_apps_api_client.models.CertificateProperties + :paramtype properties: ~azure.mgmt.app.models.CertificateProperties """ super(Certificate, self).__init__(tags=tags, location=location, **kwargs) self.properties = properties @@ -1028,7 +1024,7 @@ class CertificateCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.Certificate] + :vartype value: list[~azure.mgmt.app.models.Certificate] :ivar next_link: Link to next page of resources. :vartype next_link: str """ @@ -1051,7 +1047,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.Certificate] + :paramtype value: list[~azure.mgmt.app.models.Certificate] """ super(CertificateCollection, self).__init__(**kwargs) self.value = value @@ -1090,8 +1086,7 @@ class CertificateProperties(msrest.serialization.Model): :ivar provisioning_state: Provisioning state of the certificate. Possible values include: "Succeeded", "Failed", "Canceled", "DeleteFailed", "Pending". - :vartype provisioning_state: str or - ~container_apps_api_client.models.CertificateProvisioningState + :vartype provisioning_state: str or ~azure.mgmt.app.models.CertificateProvisioningState :ivar password: Certificate password. :vartype password: str :ivar subject_name: Subject name of the certificate. @@ -1162,6 +1157,79 @@ def __init__( self.public_key_hash = None +class CheckNameAvailabilityRequest(msrest.serialization.Model): + """The check availability request body. + + :ivar name: The name of the resource for which availability needs to be checked. + :vartype name: str + :ivar type: The resource type. + :vartype type: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + def __init__( + self, + *, + name: Optional[str] = None, + type: Optional[str] = None, + **kwargs + ): + """ + :keyword name: The name of the resource for which availability needs to be checked. + :paramtype name: str + :keyword type: The resource type. + :paramtype type: str + """ + super(CheckNameAvailabilityRequest, self).__init__(**kwargs) + self.name = name + self.type = type + + +class CheckNameAvailabilityResponse(msrest.serialization.Model): + """The check availability result. + + :ivar name_available: Indicates if the resource name is available. + :vartype name_available: bool + :ivar reason: The reason why the given name is not available. Possible values include: + "Invalid", "AlreadyExists". + :vartype reason: str or ~azure.mgmt.app.models.CheckNameAvailabilityReason + :ivar message: Detailed reason why the given name is available. + :vartype message: str + """ + + _attribute_map = { + 'name_available': {'key': 'nameAvailable', 'type': 'bool'}, + 'reason': {'key': 'reason', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__( + self, + *, + name_available: Optional[bool] = None, + reason: Optional[Union[str, "CheckNameAvailabilityReason"]] = None, + message: Optional[str] = None, + **kwargs + ): + """ + :keyword name_available: Indicates if the resource name is available. + :paramtype name_available: bool + :keyword reason: The reason why the given name is not available. Possible values include: + "Invalid", "AlreadyExists". + :paramtype reason: str or ~azure.mgmt.app.models.CheckNameAvailabilityReason + :keyword message: Detailed reason why the given name is available. + :paramtype message: str + """ + super(CheckNameAvailabilityResponse, self).__init__(**kwargs) + self.name_available = name_available + self.reason = reason + self.message = message + + class ClientRegistration(msrest.serialization.Model): """The configuration settings of the app registration for providers that have client ids and client secrets. @@ -1198,24 +1266,24 @@ class Configuration(msrest.serialization.Model): """Non versioned Container App configuration properties that define the mutable settings of a Container app. :ivar secrets: Collection of secrets used by a Container app. - :vartype secrets: list[~container_apps_api_client.models.Secret] + :vartype secrets: list[~azure.mgmt.app.models.Secret] :ivar active_revisions_mode: ActiveRevisionsMode controls how active revisions are handled for the Container app: .. raw:: html - Multiple: multiple revisions can be active. If no value if provided, this is - the defaultSingle: Only one revision can be active at a time. Revision weights can - not be used in this mode. Possible values include: "multiple", "single". - :vartype active_revisions_mode: str or ~container_apps_api_client.models.ActiveRevisionsMode + Multiple: multiple revisions can be active.Single: Only one + revision can be active at a time. Revision weights can not be used in this mode. If no value if + provided, this is the default.. Possible values include: "multiple", "single". + :vartype active_revisions_mode: str or ~azure.mgmt.app.models.ActiveRevisionsMode :ivar ingress: Ingress configurations. - :vartype ingress: ~container_apps_api_client.models.Ingress + :vartype ingress: ~azure.mgmt.app.models.Ingress :ivar registries: Collection of private container registry credentials for containers used by the Container app. - :vartype registries: list[~container_apps_api_client.models.RegistryCredentials] + :vartype registries: list[~azure.mgmt.app.models.RegistryCredentials] :ivar dapr: Dapr configuration for the Container App. - :vartype dapr: ~container_apps_api_client.models.Dapr + :vartype dapr: ~azure.mgmt.app.models.Dapr """ _attribute_map = { @@ -1238,24 +1306,24 @@ def __init__( ): """ :keyword secrets: Collection of secrets used by a Container app. - :paramtype secrets: list[~container_apps_api_client.models.Secret] + :paramtype secrets: list[~azure.mgmt.app.models.Secret] :keyword active_revisions_mode: ActiveRevisionsMode controls how active revisions are handled for the Container app: .. raw:: html - Multiple: multiple revisions can be active. If no value if provided, this is - the defaultSingle: Only one revision can be active at a time. Revision weights can - not be used in this mode. Possible values include: "multiple", "single". - :paramtype active_revisions_mode: str or ~container_apps_api_client.models.ActiveRevisionsMode + Multiple: multiple revisions can be active.Single: Only one + revision can be active at a time. Revision weights can not be used in this mode. If no value if + provided, this is the default.. Possible values include: "multiple", "single". + :paramtype active_revisions_mode: str or ~azure.mgmt.app.models.ActiveRevisionsMode :keyword ingress: Ingress configurations. - :paramtype ingress: ~container_apps_api_client.models.Ingress + :paramtype ingress: ~azure.mgmt.app.models.Ingress :keyword registries: Collection of private container registry credentials for containers used by the Container app. - :paramtype registries: list[~container_apps_api_client.models.RegistryCredentials] + :paramtype registries: list[~azure.mgmt.app.models.RegistryCredentials] :keyword dapr: Dapr configuration for the Container App. - :paramtype dapr: ~container_apps_api_client.models.Dapr + :paramtype dapr: ~azure.mgmt.app.models.Dapr """ super(Configuration, self).__init__(**kwargs) self.secrets = secrets @@ -1277,13 +1345,13 @@ class Container(msrest.serialization.Model): :ivar args: Container start command arguments. :vartype args: list[str] :ivar env: Container environment variables. - :vartype env: list[~container_apps_api_client.models.EnvironmentVar] + :vartype env: list[~azure.mgmt.app.models.EnvironmentVar] :ivar resources: Container resource requirements. - :vartype resources: ~container_apps_api_client.models.ContainerResources + :vartype resources: ~azure.mgmt.app.models.ContainerResources :ivar probes: List of probes for the container. - :vartype probes: list[~container_apps_api_client.models.ContainerAppProbe] + :vartype probes: list[~azure.mgmt.app.models.ContainerAppProbe] :ivar volume_mounts: Container volume mounts. - :vartype volume_mounts: list[~container_apps_api_client.models.VolumeMount] + :vartype volume_mounts: list[~azure.mgmt.app.models.VolumeMount] """ _attribute_map = { @@ -1320,13 +1388,13 @@ def __init__( :keyword args: Container start command arguments. :paramtype args: list[str] :keyword env: Container environment variables. - :paramtype env: list[~container_apps_api_client.models.EnvironmentVar] + :paramtype env: list[~azure.mgmt.app.models.EnvironmentVar] :keyword resources: Container resource requirements. - :paramtype resources: ~container_apps_api_client.models.ContainerResources + :paramtype resources: ~azure.mgmt.app.models.ContainerResources :keyword probes: List of probes for the container. - :paramtype probes: list[~container_apps_api_client.models.ContainerAppProbe] + :paramtype probes: list[~azure.mgmt.app.models.ContainerAppProbe] :keyword volume_mounts: Container volume mounts. - :paramtype volume_mounts: list[~container_apps_api_client.models.VolumeMount] + :paramtype volume_mounts: list[~azure.mgmt.app.models.VolumeMount] """ super(Container, self).__init__(**kwargs) self.image = image @@ -1356,18 +1424,17 @@ class ContainerApp(TrackedResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar tags: A set of tags. Resource tags. :vartype tags: dict[str, str] :ivar location: Required. The geo-location where the resource lives. :vartype location: str :ivar identity: managed identities for the Container App to interact with other Azure services without maintaining any secrets or credentials in code. - :vartype identity: ~container_apps_api_client.models.ManagedServiceIdentity + :vartype identity: ~azure.mgmt.app.models.ManagedServiceIdentity :ivar provisioning_state: Provisioning state of the Container App. Possible values include: "InProgress", "Succeeded", "Failed", "Canceled". - :vartype provisioning_state: str or - ~container_apps_api_client.models.ContainerAppProvisioningState + :vartype provisioning_state: str or ~azure.mgmt.app.models.ContainerAppProvisioningState :ivar managed_environment_id: Resource ID of the Container App's environment. :vartype managed_environment_id: str :ivar latest_revision_name: Name of the latest revision of the Container App. @@ -1378,9 +1445,9 @@ class ContainerApp(TrackedResource): :ivar custom_domain_verification_id: Id used to verify domain name ownership. :vartype custom_domain_verification_id: str :ivar configuration: Non versioned Container App configuration properties. - :vartype configuration: ~container_apps_api_client.models.Configuration + :vartype configuration: ~azure.mgmt.app.models.Configuration :ivar template: Container App versioned application definition. - :vartype template: ~container_apps_api_client.models.Template + :vartype template: ~azure.mgmt.app.models.Template :ivar outbound_ip_addresses: Outbound IP Addresses for container app. :vartype outbound_ip_addresses: list[str] """ @@ -1434,13 +1501,13 @@ def __init__( :paramtype location: str :keyword identity: managed identities for the Container App to interact with other Azure services without maintaining any secrets or credentials in code. - :paramtype identity: ~container_apps_api_client.models.ManagedServiceIdentity + :paramtype identity: ~azure.mgmt.app.models.ManagedServiceIdentity :keyword managed_environment_id: Resource ID of the Container App's environment. :paramtype managed_environment_id: str :keyword configuration: Non versioned Container App configuration properties. - :paramtype configuration: ~container_apps_api_client.models.Configuration + :paramtype configuration: ~azure.mgmt.app.models.Configuration :keyword template: Container App versioned application definition. - :paramtype template: ~container_apps_api_client.models.Template + :paramtype template: ~azure.mgmt.app.models.Template """ super(ContainerApp, self).__init__(tags=tags, location=location, **kwargs) self.identity = identity @@ -1462,7 +1529,7 @@ class ContainerAppCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.ContainerApp] + :vartype value: list[~azure.mgmt.app.models.ContainerApp] :ivar next_link: Link to next page of resources. :vartype next_link: str """ @@ -1485,38 +1552,13 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.ContainerApp] + :paramtype value: list[~azure.mgmt.app.models.ContainerApp] """ super(ContainerAppCollection, self).__init__(**kwargs) self.value = value self.next_link = None -class ContainerAppPatch(msrest.serialization.Model): - """Container App Patch. - - :ivar tags: A set of tags. Application-specific metadata in the form of key-value pairs. - :vartype tags: dict[str, str] - """ - - _attribute_map = { - 'tags': {'key': 'tags', 'type': '{str}'}, - } - - def __init__( - self, - *, - tags: Optional[Dict[str, str]] = None, - **kwargs - ): - """ - :keyword tags: A set of tags. Application-specific metadata in the form of key-value pairs. - :paramtype tags: dict[str, str] - """ - super(ContainerAppPatch, self).__init__(**kwargs) - self.tags = tags - - class ContainerAppProbe(msrest.serialization.Model): """Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. @@ -1524,7 +1566,7 @@ class ContainerAppProbe(msrest.serialization.Model): after having succeeded. Defaults to 3. Minimum value is 1. Maximum value is 10. :vartype failure_threshold: int :ivar http_get: HTTPGet specifies the http request to perform. - :vartype http_get: ~container_apps_api_client.models.ContainerAppProbeHttpGet + :vartype http_get: ~azure.mgmt.app.models.ContainerAppProbeHttpGet :ivar initial_delay_seconds: Number of seconds after the container has started before liveness probes are initiated. Minimum value is 1. Maximum value is 60. :vartype initial_delay_seconds: int @@ -1537,7 +1579,7 @@ class ContainerAppProbe(msrest.serialization.Model): :vartype success_threshold: int :ivar tcp_socket: TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported. - :vartype tcp_socket: ~container_apps_api_client.models.ContainerAppProbeTcpSocket + :vartype tcp_socket: ~azure.mgmt.app.models.ContainerAppProbeTcpSocket :ivar termination_grace_period_seconds: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are forcibly @@ -1552,7 +1594,7 @@ class ContainerAppProbe(msrest.serialization.Model): Minimum value is 1. Maximum value is 240. :vartype timeout_seconds: int :ivar type: The type of probe. Possible values include: "liveness", "readiness", "startup". - :vartype type: str or ~container_apps_api_client.models.Type + :vartype type: str or ~azure.mgmt.app.models.Type """ _attribute_map = { @@ -1586,7 +1628,7 @@ def __init__( after having succeeded. Defaults to 3. Minimum value is 1. Maximum value is 10. :paramtype failure_threshold: int :keyword http_get: HTTPGet specifies the http request to perform. - :paramtype http_get: ~container_apps_api_client.models.ContainerAppProbeHttpGet + :paramtype http_get: ~azure.mgmt.app.models.ContainerAppProbeHttpGet :keyword initial_delay_seconds: Number of seconds after the container has started before liveness probes are initiated. Minimum value is 1. Maximum value is 60. :paramtype initial_delay_seconds: int @@ -1599,7 +1641,7 @@ def __init__( :paramtype success_threshold: int :keyword tcp_socket: TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported. - :paramtype tcp_socket: ~container_apps_api_client.models.ContainerAppProbeTcpSocket + :paramtype tcp_socket: ~azure.mgmt.app.models.ContainerAppProbeTcpSocket :keyword termination_grace_period_seconds: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. The grace period is the duration in seconds after the processes running in the pod are sent a termination signal and the time when the processes are @@ -1614,7 +1656,7 @@ def __init__( second. Minimum value is 1. Maximum value is 240. :paramtype timeout_seconds: int :keyword type: The type of probe. Possible values include: "liveness", "readiness", "startup". - :paramtype type: str or ~container_apps_api_client.models.Type + :paramtype type: str or ~azure.mgmt.app.models.Type """ super(ContainerAppProbe, self).__init__(**kwargs) self.failure_threshold = failure_threshold @@ -1637,8 +1679,7 @@ class ContainerAppProbeHttpGet(msrest.serialization.Model): httpHeaders instead. :vartype host: str :ivar http_headers: Custom headers to set in the request. HTTP allows repeated headers. - :vartype http_headers: - list[~container_apps_api_client.models.ContainerAppProbeHttpGetHttpHeadersItem] + :vartype http_headers: list[~azure.mgmt.app.models.ContainerAppProbeHttpGetHttpHeadersItem] :ivar path: Path to access on the HTTP server. :vartype path: str :ivar port: Required. Name or number of the port to access on the container. Number must be in @@ -1675,8 +1716,7 @@ def __init__( in httpHeaders instead. :paramtype host: str :keyword http_headers: Custom headers to set in the request. HTTP allows repeated headers. - :paramtype http_headers: - list[~container_apps_api_client.models.ContainerAppProbeHttpGetHttpHeadersItem] + :paramtype http_headers: list[~azure.mgmt.app.models.ContainerAppProbeHttpGetHttpHeadersItem] :keyword path: Path to access on the HTTP server. :paramtype path: str :keyword port: Required. Name or number of the port to access on the container. Number must be @@ -1851,7 +1891,7 @@ class CookieExpiration(msrest.serialization.Model): :ivar convention: The convention used when determining the session cookie's expiration. Possible values include: "FixedTime", "IdentityProviderDerived". - :vartype convention: str or ~container_apps_api_client.models.CookieExpirationConvention + :vartype convention: str or ~azure.mgmt.app.models.CookieExpirationConvention :ivar time_to_expiration: The time after the request is made when the session cookie should expire. :vartype time_to_expiration: str @@ -1872,7 +1912,7 @@ def __init__( """ :keyword convention: The convention used when determining the session cookie's expiration. Possible values include: "FixedTime", "IdentityProviderDerived". - :paramtype convention: str or ~container_apps_api_client.models.CookieExpirationConvention + :paramtype convention: str or ~azure.mgmt.app.models.CookieExpirationConvention :keyword time_to_expiration: The time after the request is made when the session cookie should expire. :paramtype time_to_expiration: str @@ -1891,7 +1931,7 @@ class CustomDomain(msrest.serialization.Model): :vartype name: str :ivar binding_type: Custom Domain binding type. Possible values include: "Disabled", "SniEnabled". - :vartype binding_type: str or ~container_apps_api_client.models.BindingType + :vartype binding_type: str or ~azure.mgmt.app.models.BindingType :ivar certificate_id: Required. Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment. :vartype certificate_id: str @@ -1921,7 +1961,7 @@ def __init__( :paramtype name: str :keyword binding_type: Custom Domain binding type. Possible values include: "Disabled", "SniEnabled". - :paramtype binding_type: str or ~container_apps_api_client.models.BindingType + :paramtype binding_type: str or ~azure.mgmt.app.models.BindingType :keyword certificate_id: Required. Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment. :paramtype certificate_id: str @@ -1947,7 +1987,7 @@ class CustomHostnameAnalysisResult(ProxyResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar host_name: Host name that was analyzed. :vartype host_name: str :ivar is_hostname_already_verified: :code:`true` if hostname is already verified; @@ -1956,11 +1996,10 @@ class CustomHostnameAnalysisResult(ProxyResource): :ivar custom_domain_verification_test: DNS verification test result. Possible values include: "Passed", "Failed", "Skipped". :vartype custom_domain_verification_test: str or - ~container_apps_api_client.models.DnsVerificationTestResult + ~azure.mgmt.app.models.DnsVerificationTestResult :ivar custom_domain_verification_failure_info: Raw failure information if DNS verification fails. - :vartype custom_domain_verification_failure_info: - ~container_apps_api_client.models.DefaultErrorResponse + :vartype custom_domain_verification_failure_info: ~azure.mgmt.app.models.DefaultErrorResponse :ivar has_conflict_on_managed_environment: :code:`true` if there is a conflict on the Container App's managed environment; otherwise, :code:`false`. :vartype has_conflict_on_managed_environment: bool @@ -2054,10 +2093,10 @@ class CustomOpenIdConnectProvider(msrest.serialization.Model): :vartype enabled: bool :ivar registration: The configuration settings of the app registration for the custom Open ID Connect provider. - :vartype registration: ~container_apps_api_client.models.OpenIdConnectRegistration + :vartype registration: ~azure.mgmt.app.models.OpenIdConnectRegistration :ivar login: The configuration settings of the login flow of the custom Open ID Connect provider. - :vartype login: ~container_apps_api_client.models.OpenIdConnectLogin + :vartype login: ~azure.mgmt.app.models.OpenIdConnectLogin """ _attribute_map = { @@ -2080,10 +2119,10 @@ def __init__( :paramtype enabled: bool :keyword registration: The configuration settings of the app registration for the custom Open ID Connect provider. - :paramtype registration: ~container_apps_api_client.models.OpenIdConnectRegistration + :paramtype registration: ~azure.mgmt.app.models.OpenIdConnectRegistration :keyword login: The configuration settings of the login flow of the custom Open ID Connect provider. - :paramtype login: ~container_apps_api_client.models.OpenIdConnectLogin + :paramtype login: ~azure.mgmt.app.models.OpenIdConnectLogin """ super(CustomOpenIdConnectProvider, self).__init__(**kwargs) self.enabled = enabled @@ -2100,7 +2139,7 @@ class CustomScaleRule(msrest.serialization.Model): :ivar metadata: Metadata properties to describe custom scale rule. :vartype metadata: dict[str, str] :ivar auth: Authentication secrets for the custom scale rule. - :vartype auth: list[~container_apps_api_client.models.ScaleRuleAuth] + :vartype auth: list[~azure.mgmt.app.models.ScaleRuleAuth] """ _attribute_map = { @@ -2124,7 +2163,7 @@ def __init__( :keyword metadata: Metadata properties to describe custom scale rule. :paramtype metadata: dict[str, str] :keyword auth: Authentication secrets for the custom scale rule. - :paramtype auth: list[~container_apps_api_client.models.ScaleRuleAuth] + :paramtype auth: list[~azure.mgmt.app.models.ScaleRuleAuth] """ super(CustomScaleRule, self).__init__(**kwargs) self.type = type @@ -2141,7 +2180,7 @@ class Dapr(msrest.serialization.Model): :vartype app_id: str :ivar app_protocol: Tells Dapr which protocol your application is using. Valid options are http and grpc. Default is http. Possible values include: "http", "grpc". - :vartype app_protocol: str or ~container_apps_api_client.models.AppProtocol + :vartype app_protocol: str or ~azure.mgmt.app.models.AppProtocol :ivar app_port: Tells Dapr which port your application is listening on. :vartype app_port: int """ @@ -2169,7 +2208,7 @@ def __init__( :paramtype app_id: str :keyword app_protocol: Tells Dapr which protocol your application is using. Valid options are http and grpc. Default is http. Possible values include: "http", "grpc". - :paramtype app_protocol: str or ~container_apps_api_client.models.AppProtocol + :paramtype app_protocol: str or ~azure.mgmt.app.models.AppProtocol :keyword app_port: Tells Dapr which port your application is listening on. :paramtype app_port: int """ @@ -2195,7 +2234,7 @@ class DaprComponent(ProxyResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar component_type: Component type. :vartype component_type: str :ivar version: Component version. @@ -2205,9 +2244,9 @@ class DaprComponent(ProxyResource): :ivar init_timeout: Initialization timeout. :vartype init_timeout: str :ivar secrets: Collection of secrets used by a Dapr component. - :vartype secrets: list[~container_apps_api_client.models.Secret] + :vartype secrets: list[~azure.mgmt.app.models.Secret] :ivar metadata: Component metadata. - :vartype metadata: list[~container_apps_api_client.models.DaprMetadata] + :vartype metadata: list[~azure.mgmt.app.models.DaprMetadata] :ivar scopes: Names of container apps that can use this Dapr component. :vartype scopes: list[str] """ @@ -2255,9 +2294,9 @@ def __init__( :keyword init_timeout: Initialization timeout. :paramtype init_timeout: str :keyword secrets: Collection of secrets used by a Dapr component. - :paramtype secrets: list[~container_apps_api_client.models.Secret] + :paramtype secrets: list[~azure.mgmt.app.models.Secret] :keyword metadata: Component metadata. - :paramtype metadata: list[~container_apps_api_client.models.DaprMetadata] + :paramtype metadata: list[~azure.mgmt.app.models.DaprMetadata] :keyword scopes: Names of container apps that can use this Dapr component. :paramtype scopes: list[str] """ @@ -2279,7 +2318,7 @@ class DaprComponentsCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.DaprComponent] + :vartype value: list[~azure.mgmt.app.models.DaprComponent] :ivar next_link: Link to next page of resources. :vartype next_link: str """ @@ -2302,7 +2341,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.DaprComponent] + :paramtype value: list[~azure.mgmt.app.models.DaprComponent] """ super(DaprComponentsCollection, self).__init__(**kwargs) self.value = value @@ -2350,12 +2389,43 @@ def __init__( self.secret_ref = secret_ref +class DaprSecretsCollection(msrest.serialization.Model): + """Dapr component Secrets Collection ARM resource. + + All required parameters must be populated in order to send to Azure. + + :ivar value: Required. Collection of secrets used by a Dapr component. + :vartype value: list[~azure.mgmt.app.models.Secret] + """ + + _validation = { + 'value': {'required': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[Secret]'}, + } + + def __init__( + self, + *, + value: List["Secret"], + **kwargs + ): + """ + :keyword value: Required. Collection of secrets used by a Dapr component. + :paramtype value: list[~azure.mgmt.app.models.Secret] + """ + super(DaprSecretsCollection, self).__init__(**kwargs) + self.value = value + + class DefaultAuthorizationPolicy(msrest.serialization.Model): """The configuration settings of the Azure Active Directory default authorization policy. :ivar allowed_principals: The configuration settings of the Azure Active Directory allowed principals. - :vartype allowed_principals: ~container_apps_api_client.models.AllowedPrincipals + :vartype allowed_principals: ~azure.mgmt.app.models.AllowedPrincipals :ivar allowed_applications: The configuration settings of the Azure Active Directory allowed applications. :vartype allowed_applications: list[str] @@ -2376,7 +2446,7 @@ def __init__( """ :keyword allowed_principals: The configuration settings of the Azure Active Directory allowed principals. - :paramtype allowed_principals: ~container_apps_api_client.models.AllowedPrincipals + :paramtype allowed_principals: ~azure.mgmt.app.models.AllowedPrincipals :keyword allowed_applications: The configuration settings of the Azure Active Directory allowed applications. :paramtype allowed_applications: list[str] @@ -2392,7 +2462,7 @@ class DefaultErrorResponse(msrest.serialization.Model): Variables are only populated by the server, and will be ignored when sending a request. :ivar error: Error model. - :vartype error: ~container_apps_api_client.models.DefaultErrorResponseError + :vartype error: ~azure.mgmt.app.models.DefaultErrorResponseError """ _validation = { @@ -2425,7 +2495,7 @@ class DefaultErrorResponseError(msrest.serialization.Model): :ivar target: Detailed error description and debugging information. :vartype target: str :ivar details: Details or the error. - :vartype details: list[~container_apps_api_client.models.DefaultErrorResponseErrorDetailsItem] + :vartype details: list[~azure.mgmt.app.models.DefaultErrorResponseErrorDetailsItem] :ivar innererror: More information to debug error. :vartype innererror: str """ @@ -2453,8 +2523,7 @@ def __init__( ): """ :keyword details: Details or the error. - :paramtype details: - list[~container_apps_api_client.models.DefaultErrorResponseErrorDetailsItem] + :paramtype details: list[~azure.mgmt.app.models.DefaultErrorResponseErrorDetailsItem] """ super(DefaultErrorResponseError, self).__init__(**kwargs) self.code = None @@ -2550,11 +2619,11 @@ class Facebook(msrest.serialization.Model): :vartype enabled: bool :ivar registration: The configuration settings of the app registration for the Facebook provider. - :vartype registration: ~container_apps_api_client.models.AppRegistration + :vartype registration: ~azure.mgmt.app.models.AppRegistration :ivar graph_api_version: The version of the Facebook api to be used while logging in. :vartype graph_api_version: str :ivar login: The configuration settings of the login flow. - :vartype login: ~container_apps_api_client.models.LoginScopes + :vartype login: ~azure.mgmt.app.models.LoginScopes """ _attribute_map = { @@ -2579,11 +2648,11 @@ def __init__( :paramtype enabled: bool :keyword registration: The configuration settings of the app registration for the Facebook provider. - :paramtype registration: ~container_apps_api_client.models.AppRegistration + :paramtype registration: ~azure.mgmt.app.models.AppRegistration :keyword graph_api_version: The version of the Facebook api to be used while logging in. :paramtype graph_api_version: str :keyword login: The configuration settings of the login flow. - :paramtype login: ~container_apps_api_client.models.LoginScopes + :paramtype login: ~azure.mgmt.app.models.LoginScopes """ super(Facebook, self).__init__(**kwargs) self.enabled = enabled @@ -2597,7 +2666,7 @@ class ForwardProxy(msrest.serialization.Model): :ivar convention: The convention used to determine the url of the request made. Possible values include: "NoProxy", "Standard", "Custom". - :vartype convention: str or ~container_apps_api_client.models.ForwardProxyConvention + :vartype convention: str or ~azure.mgmt.app.models.ForwardProxyConvention :ivar custom_host_header_name: The name of the header containing the host of the request. :vartype custom_host_header_name: str :ivar custom_proto_header_name: The name of the header containing the scheme of the request. @@ -2621,7 +2690,7 @@ def __init__( """ :keyword convention: The convention used to determine the url of the request made. Possible values include: "NoProxy", "Standard", "Custom". - :paramtype convention: str or ~container_apps_api_client.models.ForwardProxyConvention + :paramtype convention: str or ~azure.mgmt.app.models.ForwardProxyConvention :keyword custom_host_header_name: The name of the header containing the host of the request. :paramtype custom_host_header_name: str :keyword custom_proto_header_name: The name of the header containing the scheme of the request. @@ -2640,9 +2709,9 @@ class GitHub(msrest.serialization.Model): the set registration; otherwise, :code:`true`. :vartype enabled: bool :ivar registration: The configuration settings of the app registration for the GitHub provider. - :vartype registration: ~container_apps_api_client.models.ClientRegistration + :vartype registration: ~azure.mgmt.app.models.ClientRegistration :ivar login: The configuration settings of the login flow. - :vartype login: ~container_apps_api_client.models.LoginScopes + :vartype login: ~azure.mgmt.app.models.LoginScopes """ _attribute_map = { @@ -2665,9 +2734,9 @@ def __init__( :paramtype enabled: bool :keyword registration: The configuration settings of the app registration for the GitHub provider. - :paramtype registration: ~container_apps_api_client.models.ClientRegistration + :paramtype registration: ~azure.mgmt.app.models.ClientRegistration :keyword login: The configuration settings of the login flow. - :paramtype login: ~container_apps_api_client.models.LoginScopes + :paramtype login: ~azure.mgmt.app.models.LoginScopes """ super(GitHub, self).__init__(**kwargs) self.enabled = enabled @@ -2679,25 +2748,28 @@ class GithubActionConfiguration(msrest.serialization.Model): """Configuration properties that define the mutable settings of a Container App SourceControl. :ivar registry_info: Registry configurations. - :vartype registry_info: ~container_apps_api_client.models.RegistryInfo + :vartype registry_info: ~azure.mgmt.app.models.RegistryInfo :ivar azure_credentials: AzureCredentials configurations. - :vartype azure_credentials: ~container_apps_api_client.models.AzureCredentials - :ivar dockerfile_path: Docker file path. - :vartype dockerfile_path: str + :vartype azure_credentials: ~azure.mgmt.app.models.AzureCredentials + :ivar context_path: Context path. + :vartype context_path: str + :ivar image: Image name. + :vartype image: str :ivar publish_type: Code or Image. :vartype publish_type: str :ivar os: Operation system. :vartype os: str :ivar runtime_stack: Runtime stack. :vartype runtime_stack: str - :ivar runtime_version: Runtime Version. + :ivar runtime_version: Runtime version. :vartype runtime_version: str """ _attribute_map = { 'registry_info': {'key': 'registryInfo', 'type': 'RegistryInfo'}, 'azure_credentials': {'key': 'azureCredentials', 'type': 'AzureCredentials'}, - 'dockerfile_path': {'key': 'dockerfilePath', 'type': 'str'}, + 'context_path': {'key': 'contextPath', 'type': 'str'}, + 'image': {'key': 'image', 'type': 'str'}, 'publish_type': {'key': 'publishType', 'type': 'str'}, 'os': {'key': 'os', 'type': 'str'}, 'runtime_stack': {'key': 'runtimeStack', 'type': 'str'}, @@ -2709,7 +2781,8 @@ def __init__( *, registry_info: Optional["RegistryInfo"] = None, azure_credentials: Optional["AzureCredentials"] = None, - dockerfile_path: Optional[str] = None, + context_path: Optional[str] = None, + image: Optional[str] = None, publish_type: Optional[str] = None, os: Optional[str] = None, runtime_stack: Optional[str] = None, @@ -2718,24 +2791,27 @@ def __init__( ): """ :keyword registry_info: Registry configurations. - :paramtype registry_info: ~container_apps_api_client.models.RegistryInfo + :paramtype registry_info: ~azure.mgmt.app.models.RegistryInfo :keyword azure_credentials: AzureCredentials configurations. - :paramtype azure_credentials: ~container_apps_api_client.models.AzureCredentials - :keyword dockerfile_path: Docker file path. - :paramtype dockerfile_path: str + :paramtype azure_credentials: ~azure.mgmt.app.models.AzureCredentials + :keyword context_path: Context path. + :paramtype context_path: str + :keyword image: Image name. + :paramtype image: str :keyword publish_type: Code or Image. :paramtype publish_type: str :keyword os: Operation system. :paramtype os: str :keyword runtime_stack: Runtime stack. :paramtype runtime_stack: str - :keyword runtime_version: Runtime Version. + :keyword runtime_version: Runtime version. :paramtype runtime_version: str """ super(GithubActionConfiguration, self).__init__(**kwargs) self.registry_info = registry_info self.azure_credentials = azure_credentials - self.dockerfile_path = dockerfile_path + self.context_path = context_path + self.image = image self.publish_type = publish_type self.os = os self.runtime_stack = runtime_stack @@ -2749,7 +2825,7 @@ class GlobalValidation(msrest.serialization.Model): to access the app. Possible values include: "RedirectToLoginPage", "AllowAnonymous", "Return401", "Return403". :vartype unauthenticated_client_action: str or - ~container_apps_api_client.models.UnauthenticatedClientActionV2 + ~azure.mgmt.app.models.UnauthenticatedClientActionV2 :ivar redirect_to_provider: The default authentication provider to use when multiple providers are configured. This setting is only needed if multiple providers are configured and the unauthenticated @@ -2780,7 +2856,7 @@ def __init__( attempts to access the app. Possible values include: "RedirectToLoginPage", "AllowAnonymous", "Return401", "Return403". :paramtype unauthenticated_client_action: str or - ~container_apps_api_client.models.UnauthenticatedClientActionV2 + ~azure.mgmt.app.models.UnauthenticatedClientActionV2 :keyword redirect_to_provider: The default authentication provider to use when multiple providers are configured. This setting is only needed if multiple providers are configured and the unauthenticated @@ -2804,12 +2880,12 @@ class Google(msrest.serialization.Model): the set registration; otherwise, :code:`true`. :vartype enabled: bool :ivar registration: The configuration settings of the app registration for the Google provider. - :vartype registration: ~container_apps_api_client.models.ClientRegistration + :vartype registration: ~azure.mgmt.app.models.ClientRegistration :ivar login: The configuration settings of the login flow. - :vartype login: ~container_apps_api_client.models.LoginScopes + :vartype login: ~azure.mgmt.app.models.LoginScopes :ivar validation: The configuration settings of the Azure Active Directory token validation flow. - :vartype validation: ~container_apps_api_client.models.AllowedAudiencesValidation + :vartype validation: ~azure.mgmt.app.models.AllowedAudiencesValidation """ _attribute_map = { @@ -2834,12 +2910,12 @@ def __init__( :paramtype enabled: bool :keyword registration: The configuration settings of the app registration for the Google provider. - :paramtype registration: ~container_apps_api_client.models.ClientRegistration + :paramtype registration: ~azure.mgmt.app.models.ClientRegistration :keyword login: The configuration settings of the login flow. - :paramtype login: ~container_apps_api_client.models.LoginScopes + :paramtype login: ~azure.mgmt.app.models.LoginScopes :keyword validation: The configuration settings of the Azure Active Directory token validation flow. - :paramtype validation: ~container_apps_api_client.models.AllowedAudiencesValidation + :paramtype validation: ~azure.mgmt.app.models.AllowedAudiencesValidation """ super(Google, self).__init__(**kwargs) self.enabled = enabled @@ -2854,7 +2930,7 @@ class HttpScaleRule(msrest.serialization.Model): :ivar metadata: Metadata properties to describe http scale rule. :vartype metadata: dict[str, str] :ivar auth: Authentication secrets for the custom scale rule. - :vartype auth: list[~container_apps_api_client.models.ScaleRuleAuth] + :vartype auth: list[~azure.mgmt.app.models.ScaleRuleAuth] """ _attribute_map = { @@ -2873,7 +2949,7 @@ def __init__( :keyword metadata: Metadata properties to describe http scale rule. :paramtype metadata: dict[str, str] :keyword auth: Authentication secrets for the custom scale rule. - :paramtype auth: list[~container_apps_api_client.models.ScaleRuleAuth] + :paramtype auth: list[~azure.mgmt.app.models.ScaleRuleAuth] """ super(HttpScaleRule, self).__init__(**kwargs) self.metadata = metadata @@ -2887,9 +2963,9 @@ class HttpSettings(msrest.serialization.Model): not having the HTTPS scheme are permissible; otherwise, :code:`true`. :vartype require_https: bool :ivar routes: The configuration settings of the paths HTTP requests. - :vartype routes: ~container_apps_api_client.models.HttpSettingsRoutes + :vartype routes: ~azure.mgmt.app.models.HttpSettingsRoutes :ivar forward_proxy: The configuration settings of a forward proxy used to make the requests. - :vartype forward_proxy: ~container_apps_api_client.models.ForwardProxy + :vartype forward_proxy: ~azure.mgmt.app.models.ForwardProxy """ _attribute_map = { @@ -2911,10 +2987,10 @@ def __init__( responses not having the HTTPS scheme are permissible; otherwise, :code:`true`. :paramtype require_https: bool :keyword routes: The configuration settings of the paths HTTP requests. - :paramtype routes: ~container_apps_api_client.models.HttpSettingsRoutes + :paramtype routes: ~azure.mgmt.app.models.HttpSettingsRoutes :keyword forward_proxy: The configuration settings of a forward proxy used to make the requests. - :paramtype forward_proxy: ~container_apps_api_client.models.ForwardProxy + :paramtype forward_proxy: ~azure.mgmt.app.models.ForwardProxy """ super(HttpSettings, self).__init__(**kwargs) self.require_https = require_https @@ -2952,24 +3028,24 @@ class IdentityProviders(msrest.serialization.Model): :ivar azure_active_directory: The configuration settings of the Azure Active directory provider. - :vartype azure_active_directory: ~container_apps_api_client.models.AzureActiveDirectory + :vartype azure_active_directory: ~azure.mgmt.app.models.AzureActiveDirectory :ivar facebook: The configuration settings of the Facebook provider. - :vartype facebook: ~container_apps_api_client.models.Facebook + :vartype facebook: ~azure.mgmt.app.models.Facebook :ivar git_hub: The configuration settings of the GitHub provider. - :vartype git_hub: ~container_apps_api_client.models.GitHub + :vartype git_hub: ~azure.mgmt.app.models.GitHub :ivar google: The configuration settings of the Google provider. - :vartype google: ~container_apps_api_client.models.Google + :vartype google: ~azure.mgmt.app.models.Google :ivar twitter: The configuration settings of the Twitter provider. - :vartype twitter: ~container_apps_api_client.models.Twitter + :vartype twitter: ~azure.mgmt.app.models.Twitter :ivar apple: The configuration settings of the Apple provider. - :vartype apple: ~container_apps_api_client.models.Apple + :vartype apple: ~azure.mgmt.app.models.Apple :ivar azure_static_web_apps: The configuration settings of the Azure Static Web Apps provider. - :vartype azure_static_web_apps: ~container_apps_api_client.models.AzureStaticWebApps + :vartype azure_static_web_apps: ~azure.mgmt.app.models.AzureStaticWebApps :ivar custom_open_id_connect_providers: The map of the name of the alias of each custom Open ID Connect provider to the configuration settings of the custom Open ID Connect provider. :vartype custom_open_id_connect_providers: dict[str, - ~container_apps_api_client.models.CustomOpenIdConnectProvider] + ~azure.mgmt.app.models.CustomOpenIdConnectProvider] """ _attribute_map = { @@ -2999,25 +3075,25 @@ def __init__( """ :keyword azure_active_directory: The configuration settings of the Azure Active directory provider. - :paramtype azure_active_directory: ~container_apps_api_client.models.AzureActiveDirectory + :paramtype azure_active_directory: ~azure.mgmt.app.models.AzureActiveDirectory :keyword facebook: The configuration settings of the Facebook provider. - :paramtype facebook: ~container_apps_api_client.models.Facebook + :paramtype facebook: ~azure.mgmt.app.models.Facebook :keyword git_hub: The configuration settings of the GitHub provider. - :paramtype git_hub: ~container_apps_api_client.models.GitHub + :paramtype git_hub: ~azure.mgmt.app.models.GitHub :keyword google: The configuration settings of the Google provider. - :paramtype google: ~container_apps_api_client.models.Google + :paramtype google: ~azure.mgmt.app.models.Google :keyword twitter: The configuration settings of the Twitter provider. - :paramtype twitter: ~container_apps_api_client.models.Twitter + :paramtype twitter: ~azure.mgmt.app.models.Twitter :keyword apple: The configuration settings of the Apple provider. - :paramtype apple: ~container_apps_api_client.models.Apple + :paramtype apple: ~azure.mgmt.app.models.Apple :keyword azure_static_web_apps: The configuration settings of the Azure Static Web Apps provider. - :paramtype azure_static_web_apps: ~container_apps_api_client.models.AzureStaticWebApps + :paramtype azure_static_web_apps: ~azure.mgmt.app.models.AzureStaticWebApps :keyword custom_open_id_connect_providers: The map of the name of the alias of each custom Open ID Connect provider to the configuration settings of the custom Open ID Connect provider. :paramtype custom_open_id_connect_providers: dict[str, - ~container_apps_api_client.models.CustomOpenIdConnectProvider] + ~azure.mgmt.app.models.CustomOpenIdConnectProvider] """ super(IdentityProviders, self).__init__(**kwargs) self.azure_active_directory = azure_active_directory @@ -3042,11 +3118,11 @@ class Ingress(msrest.serialization.Model): :ivar target_port: Target Port in containers for traffic from ingress. :vartype target_port: int :ivar transport: Ingress transport protocol. Possible values include: "auto", "http", "http2". - :vartype transport: str or ~container_apps_api_client.models.IngressTransportMethod + :vartype transport: str or ~azure.mgmt.app.models.IngressTransportMethod :ivar traffic: Traffic weights for app's revisions. - :vartype traffic: list[~container_apps_api_client.models.TrafficWeight] + :vartype traffic: list[~azure.mgmt.app.models.TrafficWeight] :ivar custom_domains: custom domain bindings for Container Apps' hostnames. - :vartype custom_domains: list[~container_apps_api_client.models.CustomDomain] + :vartype custom_domains: list[~azure.mgmt.app.models.CustomDomain] :ivar allow_insecure: Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections. :vartype allow_insecure: bool @@ -3084,11 +3160,11 @@ def __init__( :paramtype target_port: int :keyword transport: Ingress transport protocol. Possible values include: "auto", "http", "http2". - :paramtype transport: str or ~container_apps_api_client.models.IngressTransportMethod + :paramtype transport: str or ~azure.mgmt.app.models.IngressTransportMethod :keyword traffic: Traffic weights for app's revisions. - :paramtype traffic: list[~container_apps_api_client.models.TrafficWeight] + :paramtype traffic: list[~azure.mgmt.app.models.TrafficWeight] :keyword custom_domains: custom domain bindings for Container Apps' hostnames. - :paramtype custom_domains: list[~container_apps_api_client.models.CustomDomain] + :paramtype custom_domains: list[~azure.mgmt.app.models.CustomDomain] :keyword allow_insecure: Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections. :paramtype allow_insecure: bool @@ -3171,7 +3247,7 @@ class Login(msrest.serialization.Model): """The configuration settings of the login flow of users using ContainerApp Service Authentication/Authorization. :ivar routes: The routes that specify the endpoints used for login and logout requests. - :vartype routes: ~container_apps_api_client.models.LoginRoutes + :vartype routes: ~azure.mgmt.app.models.LoginRoutes :ivar preserve_url_fragments_for_logins: :code:`true` if the fragments from the request are preserved after the login request is made; otherwise, :code:`false`. :vartype preserve_url_fragments_for_logins: bool @@ -3181,9 +3257,9 @@ class Login(msrest.serialization.Model): Note that URLs within the current domain are always implicitly allowed. :vartype allowed_external_redirect_urls: list[str] :ivar cookie_expiration: The configuration settings of the session cookie's expiration. - :vartype cookie_expiration: ~container_apps_api_client.models.CookieExpiration + :vartype cookie_expiration: ~azure.mgmt.app.models.CookieExpiration :ivar nonce: The configuration settings of the nonce used in the login flow. - :vartype nonce: ~container_apps_api_client.models.Nonce + :vartype nonce: ~azure.mgmt.app.models.Nonce """ _attribute_map = { @@ -3206,7 +3282,7 @@ def __init__( ): """ :keyword routes: The routes that specify the endpoints used for login and logout requests. - :paramtype routes: ~container_apps_api_client.models.LoginRoutes + :paramtype routes: ~azure.mgmt.app.models.LoginRoutes :keyword preserve_url_fragments_for_logins: :code:`true` if the fragments from the request are preserved after the login request is made; otherwise, :code:`false`. :paramtype preserve_url_fragments_for_logins: bool @@ -3216,9 +3292,9 @@ def __init__( Note that URLs within the current domain are always implicitly allowed. :paramtype allowed_external_redirect_urls: list[str] :keyword cookie_expiration: The configuration settings of the session cookie's expiration. - :paramtype cookie_expiration: ~container_apps_api_client.models.CookieExpiration + :paramtype cookie_expiration: ~azure.mgmt.app.models.CookieExpiration :keyword nonce: The configuration settings of the nonce used in the login flow. - :paramtype nonce: ~container_apps_api_client.models.Nonce + :paramtype nonce: ~azure.mgmt.app.models.Nonce """ super(Login, self).__init__(**kwargs) self.routes = routes @@ -3295,7 +3371,7 @@ class ManagedEnvironment(TrackedResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar tags: A set of tags. Resource tags. :vartype tags: dict[str, str] :ivar location: Required. The geo-location where the resource lives. @@ -3304,13 +3380,15 @@ class ManagedEnvironment(TrackedResource): "Succeeded", "Failed", "Canceled", "Waiting", "InitializationInProgress", "InfrastructureSetupInProgress", "InfrastructureSetupComplete", "ScheduledForDelete", "UpgradeRequested", "UpgradeFailed". - :vartype provisioning_state: str or - ~container_apps_api_client.models.EnvironmentProvisioningState + :vartype provisioning_state: str or ~azure.mgmt.app.models.EnvironmentProvisioningState :ivar dapr_ai_instrumentation_key: Azure Monitor instrumentation key used by Dapr to export Service to Service communication telemetry. :vartype dapr_ai_instrumentation_key: str + :ivar dapr_ai_connection_string: Application Insights connection string used by Dapr to export + Service to Service communication telemetry. + :vartype dapr_ai_connection_string: str :ivar vnet_configuration: Vnet configuration for the environment. - :vartype vnet_configuration: ~container_apps_api_client.models.VnetConfiguration + :vartype vnet_configuration: ~azure.mgmt.app.models.VnetConfiguration :ivar deployment_errors: Any errors that occurred during deployment or deployment validation. :vartype deployment_errors: str :ivar default_domain: Default Domain Name for the cluster. @@ -3320,7 +3398,9 @@ class ManagedEnvironment(TrackedResource): :ivar app_logs_configuration: Cluster configuration which enables the log daemon to export app logs to a destination. Currently only "log-analytics" is supported. - :vartype app_logs_configuration: ~container_apps_api_client.models.AppLogsConfiguration + :vartype app_logs_configuration: ~azure.mgmt.app.models.AppLogsConfiguration + :ivar zone_redundant: Whether or not this Managed Environment is zone-redundant. + :vartype zone_redundant: bool """ _validation = { @@ -3344,11 +3424,13 @@ class ManagedEnvironment(TrackedResource): 'location': {'key': 'location', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'dapr_ai_instrumentation_key': {'key': 'properties.daprAIInstrumentationKey', 'type': 'str'}, + 'dapr_ai_connection_string': {'key': 'properties.daprAIConnectionString', 'type': 'str'}, 'vnet_configuration': {'key': 'properties.vnetConfiguration', 'type': 'VnetConfiguration'}, 'deployment_errors': {'key': 'properties.deploymentErrors', 'type': 'str'}, 'default_domain': {'key': 'properties.defaultDomain', 'type': 'str'}, 'static_ip': {'key': 'properties.staticIp', 'type': 'str'}, 'app_logs_configuration': {'key': 'properties.appLogsConfiguration', 'type': 'AppLogsConfiguration'}, + 'zone_redundant': {'key': 'properties.zoneRedundant', 'type': 'bool'}, } def __init__( @@ -3357,8 +3439,10 @@ def __init__( location: str, tags: Optional[Dict[str, str]] = None, dapr_ai_instrumentation_key: Optional[str] = None, + dapr_ai_connection_string: Optional[str] = None, vnet_configuration: Optional["VnetConfiguration"] = None, app_logs_configuration: Optional["AppLogsConfiguration"] = None, + zone_redundant: Optional[bool] = None, **kwargs ): """ @@ -3369,46 +3453,28 @@ def __init__( :keyword dapr_ai_instrumentation_key: Azure Monitor instrumentation key used by Dapr to export Service to Service communication telemetry. :paramtype dapr_ai_instrumentation_key: str + :keyword dapr_ai_connection_string: Application Insights connection string used by Dapr to + export Service to Service communication telemetry. + :paramtype dapr_ai_connection_string: str :keyword vnet_configuration: Vnet configuration for the environment. - :paramtype vnet_configuration: ~container_apps_api_client.models.VnetConfiguration + :paramtype vnet_configuration: ~azure.mgmt.app.models.VnetConfiguration :keyword app_logs_configuration: Cluster configuration which enables the log daemon to export app logs to a destination. Currently only "log-analytics" is supported. - :paramtype app_logs_configuration: ~container_apps_api_client.models.AppLogsConfiguration + :paramtype app_logs_configuration: ~azure.mgmt.app.models.AppLogsConfiguration + :keyword zone_redundant: Whether or not this Managed Environment is zone-redundant. + :paramtype zone_redundant: bool """ super(ManagedEnvironment, self).__init__(tags=tags, location=location, **kwargs) self.provisioning_state = None self.dapr_ai_instrumentation_key = dapr_ai_instrumentation_key + self.dapr_ai_connection_string = dapr_ai_connection_string self.vnet_configuration = vnet_configuration self.deployment_errors = None self.default_domain = None self.static_ip = None self.app_logs_configuration = app_logs_configuration - - -class ManagedEnvironmentPatch(msrest.serialization.Model): - """An environment for hosting container apps. - - :ivar tags: A set of tags. Application-specific metadata in the form of key-value pairs. - :vartype tags: dict[str, str] - """ - - _attribute_map = { - 'tags': {'key': 'tags', 'type': '{str}'}, - } - - def __init__( - self, - *, - tags: Optional[Dict[str, str]] = None, - **kwargs - ): - """ - :keyword tags: A set of tags. Application-specific metadata in the form of key-value pairs. - :paramtype tags: dict[str, str] - """ - super(ManagedEnvironmentPatch, self).__init__(**kwargs) - self.tags = tags + self.zone_redundant = zone_redundant class ManagedEnvironmentsCollection(msrest.serialization.Model): @@ -3419,7 +3485,7 @@ class ManagedEnvironmentsCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.ManagedEnvironment] + :vartype value: list[~azure.mgmt.app.models.ManagedEnvironment] :ivar next_link: Link to next page of resources. :vartype next_link: str """ @@ -3442,7 +3508,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.ManagedEnvironment] + :paramtype value: list[~azure.mgmt.app.models.ManagedEnvironment] """ super(ManagedEnvironmentsCollection, self).__init__(**kwargs) self.value = value @@ -3464,9 +3530,9 @@ class ManagedEnvironmentStorage(ProxyResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar properties: Storage properties. - :vartype properties: ~container_apps_api_client.models.ManagedEnvironmentStorageProperties + :vartype properties: ~azure.mgmt.app.models.ManagedEnvironmentStorageProperties """ _validation = { @@ -3492,7 +3558,7 @@ def __init__( ): """ :keyword properties: Storage properties. - :paramtype properties: ~container_apps_api_client.models.ManagedEnvironmentStorageProperties + :paramtype properties: ~azure.mgmt.app.models.ManagedEnvironmentStorageProperties """ super(ManagedEnvironmentStorage, self).__init__(**kwargs) self.properties = properties @@ -3502,7 +3568,7 @@ class ManagedEnvironmentStorageProperties(msrest.serialization.Model): """Storage properties. :ivar azure_file: Azure file properties. - :vartype azure_file: ~container_apps_api_client.models.AzureFileProperties + :vartype azure_file: ~azure.mgmt.app.models.AzureFileProperties """ _attribute_map = { @@ -3517,7 +3583,7 @@ def __init__( ): """ :keyword azure_file: Azure file properties. - :paramtype azure_file: ~container_apps_api_client.models.AzureFileProperties + :paramtype azure_file: ~azure.mgmt.app.models.AzureFileProperties """ super(ManagedEnvironmentStorageProperties, self).__init__(**kwargs) self.azure_file = azure_file @@ -3529,7 +3595,7 @@ class ManagedEnvironmentStoragesCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of storage resources. - :vartype value: list[~container_apps_api_client.models.ManagedEnvironmentStorage] + :vartype value: list[~azure.mgmt.app.models.ManagedEnvironmentStorage] """ _validation = { @@ -3548,7 +3614,7 @@ def __init__( ): """ :keyword value: Required. Collection of storage resources. - :paramtype value: list[~container_apps_api_client.models.ManagedEnvironmentStorage] + :paramtype value: list[~azure.mgmt.app.models.ManagedEnvironmentStorage] """ super(ManagedEnvironmentStoragesCollection, self).__init__(**kwargs) self.value = value @@ -3570,13 +3636,12 @@ class ManagedServiceIdentity(msrest.serialization.Model): :ivar type: Required. Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). Possible values include: "None", "SystemAssigned", "UserAssigned", "SystemAssigned,UserAssigned". - :vartype type: str or ~container_apps_api_client.models.ManagedServiceIdentityType + :vartype type: str or ~azure.mgmt.app.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, - ~container_apps_api_client.models.UserAssignedIdentity] + :vartype user_assigned_identities: dict[str, ~azure.mgmt.app.models.UserAssignedIdentity] """ _validation = { @@ -3603,13 +3668,12 @@ def __init__( :keyword type: Required. Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). Possible values include: "None", "SystemAssigned", "UserAssigned", "SystemAssigned,UserAssigned". - :paramtype type: str or ~container_apps_api_client.models.ManagedServiceIdentityType + :paramtype type: str or ~azure.mgmt.app.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, - ~container_apps_api_client.models.UserAssignedIdentity] + :paramtype user_assigned_identities: dict[str, ~azure.mgmt.app.models.UserAssignedIdentity] """ super(ManagedServiceIdentity, self).__init__(**kwargs) self.principal_id = None @@ -3784,10 +3848,10 @@ class OpenIdConnectRegistration(msrest.serialization.Model): :ivar client_id: The client id of the custom Open ID Connect provider. :vartype client_id: str :ivar client_credential: The authentication credentials of the custom Open ID Connect provider. - :vartype client_credential: ~container_apps_api_client.models.OpenIdConnectClientCredential + :vartype client_credential: ~azure.mgmt.app.models.OpenIdConnectClientCredential :ivar open_id_connect_configuration: The configuration settings of the endpoints used for the custom Open ID Connect provider. - :vartype open_id_connect_configuration: ~container_apps_api_client.models.OpenIdConnectConfig + :vartype open_id_connect_configuration: ~azure.mgmt.app.models.OpenIdConnectConfig """ _attribute_map = { @@ -3809,10 +3873,10 @@ def __init__( :paramtype client_id: str :keyword client_credential: The authentication credentials of the custom Open ID Connect provider. - :paramtype client_credential: ~container_apps_api_client.models.OpenIdConnectClientCredential + :paramtype client_credential: ~azure.mgmt.app.models.OpenIdConnectClientCredential :keyword open_id_connect_configuration: The configuration settings of the endpoints used for the custom Open ID Connect provider. - :paramtype open_id_connect_configuration: ~container_apps_api_client.models.OpenIdConnectConfig + :paramtype open_id_connect_configuration: ~azure.mgmt.app.models.OpenIdConnectConfig """ super(OpenIdConnectRegistration, self).__init__(**kwargs) self.client_id = client_id @@ -3828,7 +3892,7 @@ class OperationDetail(msrest.serialization.Model): :ivar is_data_action: Indicates whether the operation is a data action. :vartype is_data_action: bool :ivar display: Display of the operation. - :vartype display: ~container_apps_api_client.models.OperationDisplay + :vartype display: ~azure.mgmt.app.models.OperationDisplay :ivar origin: Origin of the operation. :vartype origin: str """ @@ -3855,7 +3919,7 @@ def __init__( :keyword is_data_action: Indicates whether the operation is a data action. :paramtype is_data_action: bool :keyword display: Display of the operation. - :paramtype display: ~container_apps_api_client.models.OperationDisplay + :paramtype display: ~azure.mgmt.app.models.OperationDisplay :keyword origin: Origin of the operation. :paramtype origin: str """ @@ -3920,7 +3984,7 @@ class QueueScaleRule(msrest.serialization.Model): :ivar queue_length: Queue length. :vartype queue_length: int :ivar auth: Authentication secrets for the queue scale rule. - :vartype auth: list[~container_apps_api_client.models.ScaleRuleAuth] + :vartype auth: list[~azure.mgmt.app.models.ScaleRuleAuth] """ _attribute_map = { @@ -3943,7 +4007,7 @@ def __init__( :keyword queue_length: Queue length. :paramtype queue_length: int :keyword auth: Authentication secrets for the queue scale rule. - :paramtype auth: list[~container_apps_api_client.models.ScaleRuleAuth] + :paramtype auth: list[~azure.mgmt.app.models.ScaleRuleAuth] """ super(QueueScaleRule, self).__init__(**kwargs) self.queue_name = queue_name @@ -3960,12 +4024,17 @@ class RegistryCredentials(msrest.serialization.Model): :vartype username: str :ivar password_secret_ref: The name of the Secret that contains the registry login password. :vartype password_secret_ref: str + :ivar identity: A Managed Identity to use to authenticate with Azure Container Registry. For + user-assigned identities, use the full user-assigned identity Resource ID. For system-assigned + identities, use 'system'. + :vartype identity: str """ _attribute_map = { 'server': {'key': 'server', 'type': 'str'}, 'username': {'key': 'username', 'type': 'str'}, 'password_secret_ref': {'key': 'passwordSecretRef', 'type': 'str'}, + 'identity': {'key': 'identity', 'type': 'str'}, } def __init__( @@ -3974,6 +4043,7 @@ def __init__( server: Optional[str] = None, username: Optional[str] = None, password_secret_ref: Optional[str] = None, + identity: Optional[str] = None, **kwargs ): """ @@ -3983,11 +4053,16 @@ def __init__( :paramtype username: str :keyword password_secret_ref: The name of the Secret that contains the registry login password. :paramtype password_secret_ref: str + :keyword identity: A Managed Identity to use to authenticate with Azure Container Registry. For + user-assigned identities, use the full user-assigned identity Resource ID. For system-assigned + identities, use 'system'. + :paramtype identity: str """ super(RegistryCredentials, self).__init__(**kwargs) self.server = server self.username = username self.password_secret_ref = password_secret_ref + self.identity = identity class RegistryInfo(msrest.serialization.Model): @@ -4044,11 +4119,11 @@ class Replica(ProxyResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar created_time: Timestamp describing when the pod was created by controller. :vartype created_time: ~datetime.datetime :ivar containers: The containers collection under a replica. - :vartype containers: list[~container_apps_api_client.models.ReplicaContainer] + :vartype containers: list[~azure.mgmt.app.models.ReplicaContainer] """ _validation = { @@ -4076,7 +4151,7 @@ def __init__( ): """ :keyword containers: The containers collection under a replica. - :paramtype containers: list[~container_apps_api_client.models.ReplicaContainer] + :paramtype containers: list[~azure.mgmt.app.models.ReplicaContainer] """ super(Replica, self).__init__(**kwargs) self.created_time = None @@ -4089,7 +4164,7 @@ class ReplicaCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.Replica] + :vartype value: list[~azure.mgmt.app.models.Replica] """ _validation = { @@ -4108,7 +4183,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.Replica] + :paramtype value: list[~azure.mgmt.app.models.Replica] """ super(ReplicaCollection, self).__init__(**kwargs) self.value = value @@ -4182,7 +4257,7 @@ class Revision(ProxyResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar created_time: Timestamp describing when the revision was created by controller. :vartype created_time: ~datetime.datetime @@ -4191,7 +4266,7 @@ class Revision(ProxyResource): :ivar template: Container App Revision Template with all possible settings and the defaults if user did not provide them. The defaults are populated as they were at the creation time. - :vartype template: ~container_apps_api_client.models.Template + :vartype template: ~azure.mgmt.app.models.Template :ivar active: Boolean describing if the Revision is Active. :vartype active: bool :ivar replicas: Number of pods currently running for this revision. @@ -4202,10 +4277,10 @@ class Revision(ProxyResource): :vartype provisioning_error: str :ivar health_state: Current health State of the revision. Possible values include: "Healthy", "Unhealthy", "None". - :vartype health_state: str or ~container_apps_api_client.models.RevisionHealthState + :vartype health_state: str or ~azure.mgmt.app.models.RevisionHealthState :ivar provisioning_state: Current provisioning State of the revision. Possible values include: "Provisioning", "Provisioned", "Failed", "Deprovisioning", "Deprovisioned". - :vartype provisioning_state: str or ~container_apps_api_client.models.RevisionProvisioningState + :vartype provisioning_state: str or ~azure.mgmt.app.models.RevisionProvisioningState """ _validation = { @@ -4266,7 +4341,7 @@ class RevisionCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.Revision] + :vartype value: list[~azure.mgmt.app.models.Revision] :ivar next_link: Link to next page of resources. :vartype next_link: str """ @@ -4289,7 +4364,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.Revision] + :paramtype value: list[~azure.mgmt.app.models.Revision] """ super(RevisionCollection, self).__init__(**kwargs) self.value = value @@ -4304,7 +4379,7 @@ class Scale(msrest.serialization.Model): :ivar max_replicas: Optional. Maximum number of container replicas. Defaults to 10 if not set. :vartype max_replicas: int :ivar rules: Scaling rules. - :vartype rules: list[~container_apps_api_client.models.ScaleRule] + :vartype rules: list[~azure.mgmt.app.models.ScaleRule] """ _attribute_map = { @@ -4328,7 +4403,7 @@ def __init__( set. :paramtype max_replicas: int :keyword rules: Scaling rules. - :paramtype rules: list[~container_apps_api_client.models.ScaleRule] + :paramtype rules: list[~azure.mgmt.app.models.ScaleRule] """ super(Scale, self).__init__(**kwargs) self.min_replicas = min_replicas @@ -4342,11 +4417,11 @@ class ScaleRule(msrest.serialization.Model): :ivar name: Scale Rule Name. :vartype name: str :ivar azure_queue: Azure Queue based scaling. - :vartype azure_queue: ~container_apps_api_client.models.QueueScaleRule + :vartype azure_queue: ~azure.mgmt.app.models.QueueScaleRule :ivar custom: Custom scale rule. - :vartype custom: ~container_apps_api_client.models.CustomScaleRule + :vartype custom: ~azure.mgmt.app.models.CustomScaleRule :ivar http: HTTP requests based scaling. - :vartype http: ~container_apps_api_client.models.HttpScaleRule + :vartype http: ~azure.mgmt.app.models.HttpScaleRule """ _attribute_map = { @@ -4369,11 +4444,11 @@ def __init__( :keyword name: Scale Rule Name. :paramtype name: str :keyword azure_queue: Azure Queue based scaling. - :paramtype azure_queue: ~container_apps_api_client.models.QueueScaleRule + :paramtype azure_queue: ~azure.mgmt.app.models.QueueScaleRule :keyword custom: Custom scale rule. - :paramtype custom: ~container_apps_api_client.models.CustomScaleRule + :paramtype custom: ~azure.mgmt.app.models.CustomScaleRule :keyword http: HTTP requests based scaling. - :paramtype http: ~container_apps_api_client.models.HttpScaleRule + :paramtype http: ~azure.mgmt.app.models.HttpScaleRule """ super(ScaleRule, self).__init__(**kwargs) self.name = name @@ -4452,7 +4527,7 @@ class SecretsCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.ContainerAppSecret] + :vartype value: list[~azure.mgmt.app.models.ContainerAppSecret] """ _validation = { @@ -4471,7 +4546,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.ContainerAppSecret] + :paramtype value: list[~azure.mgmt.app.models.ContainerAppSecret] """ super(SecretsCollection, self).__init__(**kwargs) self.value = value @@ -4492,10 +4567,10 @@ class SourceControl(ProxyResource): :vartype type: str :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. - :vartype system_data: ~container_apps_api_client.models.SystemData + :vartype system_data: ~azure.mgmt.app.models.SystemData :ivar operation_state: Current provisioning State of the operation. Possible values include: "InProgress", "Succeeded", "Failed", "Canceled". - :vartype operation_state: str or ~container_apps_api_client.models.SourceControlOperationState + :vartype operation_state: str or ~azure.mgmt.app.models.SourceControlOperationState :ivar repo_url: The repo url which will be integrated to ContainerApp. :vartype repo_url: str :ivar branch: The branch which will trigger the auto deployment. @@ -4504,8 +4579,7 @@ class SourceControl(ProxyResource): and the defaults if user did not provide them. The defaults are populated as they were at the creation time. - :vartype github_action_configuration: - ~container_apps_api_client.models.GithubActionConfiguration + :vartype github_action_configuration: ~azure.mgmt.app.models.GithubActionConfiguration """ _validation = { @@ -4544,8 +4618,7 @@ def __init__( settings and the defaults if user did not provide them. The defaults are populated as they were at the creation time. - :paramtype github_action_configuration: - ~container_apps_api_client.models.GithubActionConfiguration + :paramtype github_action_configuration: ~azure.mgmt.app.models.GithubActionConfiguration """ super(SourceControl, self).__init__(**kwargs) self.operation_state = None @@ -4562,7 +4635,7 @@ class SourceControlCollection(msrest.serialization.Model): All required parameters must be populated in order to send to Azure. :ivar value: Required. Collection of resources. - :vartype value: list[~container_apps_api_client.models.SourceControl] + :vartype value: list[~azure.mgmt.app.models.SourceControl] :ivar next_link: Link to next page of resources. :vartype next_link: str """ @@ -4585,7 +4658,7 @@ def __init__( ): """ :keyword value: Required. Collection of resources. - :paramtype value: list[~container_apps_api_client.models.SourceControl] + :paramtype value: list[~azure.mgmt.app.models.SourceControl] """ super(SourceControlCollection, self).__init__(**kwargs) self.value = value @@ -4599,14 +4672,14 @@ class SystemData(msrest.serialization.Model): :vartype created_by: str :ivar created_by_type: The type of identity that created the resource. Possible values include: "User", "Application", "ManagedIdentity", "Key". - :vartype created_by_type: str or ~container_apps_api_client.models.CreatedByType + :vartype created_by_type: str or ~azure.mgmt.app.models.CreatedByType :ivar created_at: The timestamp of resource creation (UTC). :vartype created_at: ~datetime.datetime :ivar last_modified_by: The identity that last modified the resource. :vartype last_modified_by: str :ivar last_modified_by_type: The type of identity that last modified the resource. Possible values include: "User", "Application", "ManagedIdentity", "Key". - :vartype last_modified_by_type: str or ~container_apps_api_client.models.CreatedByType + :vartype last_modified_by_type: str or ~azure.mgmt.app.models.CreatedByType :ivar last_modified_at: The timestamp of resource last modification (UTC). :vartype last_modified_at: ~datetime.datetime """ @@ -4636,14 +4709,14 @@ def __init__( :paramtype created_by: str :keyword created_by_type: The type of identity that created the resource. Possible values include: "User", "Application", "ManagedIdentity", "Key". - :paramtype created_by_type: str or ~container_apps_api_client.models.CreatedByType + :paramtype created_by_type: str or ~azure.mgmt.app.models.CreatedByType :keyword created_at: The timestamp of resource creation (UTC). :paramtype created_at: ~datetime.datetime :keyword last_modified_by: The identity that last modified the resource. :paramtype last_modified_by: str :keyword last_modified_by_type: The type of identity that last modified the resource. Possible values include: "User", "Application", "ManagedIdentity", "Key". - :paramtype last_modified_by_type: str or ~container_apps_api_client.models.CreatedByType + :paramtype last_modified_by_type: str or ~azure.mgmt.app.models.CreatedByType :keyword last_modified_at: The timestamp of resource last modification (UTC). :paramtype last_modified_at: ~datetime.datetime """ @@ -4664,11 +4737,11 @@ class Template(msrest.serialization.Model): :ivar revision_suffix: User friendly suffix that is appended to the revision name. :vartype revision_suffix: str :ivar containers: List of container definitions for the Container App. - :vartype containers: list[~container_apps_api_client.models.Container] + :vartype containers: list[~azure.mgmt.app.models.Container] :ivar scale: Scaling properties for the Container App. - :vartype scale: ~container_apps_api_client.models.Scale + :vartype scale: ~azure.mgmt.app.models.Scale :ivar volumes: List of volume definitions for the Container App. - :vartype volumes: list[~container_apps_api_client.models.Volume] + :vartype volumes: list[~azure.mgmt.app.models.Volume] """ _attribute_map = { @@ -4691,11 +4764,11 @@ def __init__( :keyword revision_suffix: User friendly suffix that is appended to the revision name. :paramtype revision_suffix: str :keyword containers: List of container definitions for the Container App. - :paramtype containers: list[~container_apps_api_client.models.Container] + :paramtype containers: list[~azure.mgmt.app.models.Container] :keyword scale: Scaling properties for the Container App. - :paramtype scale: ~container_apps_api_client.models.Scale + :paramtype scale: ~azure.mgmt.app.models.Scale :keyword volumes: List of volume definitions for the Container App. - :paramtype volumes: list[~container_apps_api_client.models.Volume] + :paramtype volumes: list[~azure.mgmt.app.models.Volume] """ super(Template, self).__init__(**kwargs) self.revision_suffix = revision_suffix @@ -4713,12 +4786,15 @@ class TrafficWeight(msrest.serialization.Model): :vartype weight: int :ivar latest_revision: Indicates that the traffic weight belongs to a latest stable revision. :vartype latest_revision: bool + :ivar label: Associates a traffic label with a revision. + :vartype label: str """ _attribute_map = { 'revision_name': {'key': 'revisionName', 'type': 'str'}, 'weight': {'key': 'weight', 'type': 'int'}, 'latest_revision': {'key': 'latestRevision', 'type': 'bool'}, + 'label': {'key': 'label', 'type': 'str'}, } def __init__( @@ -4727,6 +4803,7 @@ def __init__( revision_name: Optional[str] = None, weight: Optional[int] = None, latest_revision: Optional[bool] = False, + label: Optional[str] = None, **kwargs ): """ @@ -4737,11 +4814,14 @@ def __init__( :keyword latest_revision: Indicates that the traffic weight belongs to a latest stable revision. :paramtype latest_revision: bool + :keyword label: Associates a traffic label with a revision. + :paramtype label: str """ super(TrafficWeight, self).__init__(**kwargs) self.revision_name = revision_name self.weight = weight self.latest_revision = latest_revision + self.label = label class Twitter(msrest.serialization.Model): @@ -4752,7 +4832,7 @@ class Twitter(msrest.serialization.Model): :vartype enabled: bool :ivar registration: The configuration settings of the app registration for the Twitter provider. - :vartype registration: ~container_apps_api_client.models.TwitterRegistration + :vartype registration: ~azure.mgmt.app.models.TwitterRegistration """ _attribute_map = { @@ -4773,7 +4853,7 @@ def __init__( :paramtype enabled: bool :keyword registration: The configuration settings of the app registration for the Twitter provider. - :paramtype registration: ~container_apps_api_client.models.TwitterRegistration + :paramtype registration: ~azure.mgmt.app.models.TwitterRegistration """ super(Twitter, self).__init__(**kwargs) self.enabled = enabled @@ -4937,7 +5017,7 @@ class Volume(msrest.serialization.Model): :vartype name: str :ivar storage_type: Storage type for the volume. If not provided, use EmptyDir. Possible values include: "AzureFile", "EmptyDir". - :vartype storage_type: str or ~container_apps_api_client.models.StorageType + :vartype storage_type: str or ~azure.mgmt.app.models.StorageType :ivar storage_name: Name of storage resource. No need to provide for EmptyDir. :vartype storage_name: str """ @@ -4961,7 +5041,7 @@ def __init__( :paramtype name: str :keyword storage_type: Storage type for the volume. If not provided, use EmptyDir. Possible values include: "AzureFile", "EmptyDir". - :paramtype storage_type: str or ~container_apps_api_client.models.StorageType + :paramtype storage_type: str or ~azure.mgmt.app.models.StorageType :keyword storage_name: Name of storage resource. No need to provide for EmptyDir. :paramtype storage_name: str """ diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/__init__.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/__init__.py index 021cee48b4be..505be253220b 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/__init__.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/__init__.py @@ -6,26 +6,28 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- +from ._container_apps_auth_configs_operations import ContainerAppsAuthConfigsOperations from ._container_apps_operations import ContainerAppsOperations from ._container_apps_revisions_operations import ContainerAppsRevisionsOperations from ._container_apps_revision_replicas_operations import ContainerAppsRevisionReplicasOperations +from ._dapr_components_operations import DaprComponentsOperations +from ._operations import Operations from ._managed_environments_operations import ManagedEnvironmentsOperations from ._certificates_operations import CertificatesOperations -from ._operations import Operations -from ._container_apps_source_controls_operations import ContainerAppsSourceControlsOperations -from ._dapr_components_operations import DaprComponentsOperations -from ._container_apps_auth_configs_operations import ContainerAppsAuthConfigsOperations +from ._namespaces_operations import NamespacesOperations from ._managed_environments_storages_operations import ManagedEnvironmentsStoragesOperations +from ._container_apps_source_controls_operations import ContainerAppsSourceControlsOperations __all__ = [ + 'ContainerAppsAuthConfigsOperations', 'ContainerAppsOperations', 'ContainerAppsRevisionsOperations', 'ContainerAppsRevisionReplicasOperations', + 'DaprComponentsOperations', + 'Operations', 'ManagedEnvironmentsOperations', 'CertificatesOperations', - 'Operations', - 'ContainerAppsSourceControlsOperations', - 'DaprComponentsOperations', - 'ContainerAppsAuthConfigsOperations', + 'NamespacesOperations', 'ManagedEnvironmentsStoragesOperations', + 'ContainerAppsSourceControlsOperations', ] diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_certificates_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_certificates_operations.py index a0d95b39d63c..de3073e6a002 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_certificates_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_certificates_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -16,7 +17,6 @@ from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -33,31 +33,32 @@ def build_list_request( managed_environment_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "managedEnvironmentName": _SERIALIZER.url("managed_environment_name", managed_environment_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -69,10 +70,11 @@ def build_get_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -80,21 +82,21 @@ def build_get_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -109,12 +111,12 @@ def build_create_or_update_request( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -122,23 +124,23 @@ def build_create_or_update_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PUT", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -152,10 +154,11 @@ def build_delete_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -163,21 +166,21 @@ def build_delete_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="DELETE", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -192,12 +195,12 @@ def build_update_request( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -205,23 +208,23 @@ def build_update_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PATCH", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -234,7 +237,7 @@ class CertificatesOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -267,9 +270,11 @@ def list( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either CertificateCollection or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~container_apps_api_client.models.CertificateCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.CertificateCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.CertificateCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -282,6 +287,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) @@ -293,6 +299,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -310,7 +317,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -324,7 +335,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates'} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates"} # type: ignore @distributed_trace def get( @@ -346,7 +357,7 @@ def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: Certificate, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Certificate + :rtype: ~azure.mgmt.app.models.Certificate :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] @@ -355,18 +366,25 @@ def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -381,7 +399,7 @@ def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore @distributed_trace @@ -403,11 +421,11 @@ def create_or_update( :type managed_environment_name: str :param name: Name of the Certificate. :type name: str - :param certificate_envelope: Certificate to be created or updated. - :type certificate_envelope: ~container_apps_api_client.models.Certificate + :param certificate_envelope: Certificate to be created or updated. Default value is None. + :type certificate_envelope: ~azure.mgmt.app.models.Certificate :keyword callable cls: A custom type or function that will be passed the direct response :return: Certificate, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Certificate + :rtype: ~azure.mgmt.app.models.Certificate :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] @@ -416,6 +434,7 @@ def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] if certificate_envelope is not None: @@ -428,6 +447,7 @@ def create_or_update( resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -435,7 +455,11 @@ def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -450,11 +474,11 @@ def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore @distributed_trace - def delete( + def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, managed_environment_name: str, @@ -482,18 +506,25 @@ def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -504,7 +535,7 @@ def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore @distributed_trace @@ -527,10 +558,10 @@ def update( :param name: Name of the Certificate. :type name: str :param certificate_envelope: Properties of a certificate that need to be updated. - :type certificate_envelope: ~container_apps_api_client.models.CertificatePatch + :type certificate_envelope: ~azure.mgmt.app.models.CertificatePatch :keyword callable cls: A custom type or function that will be passed the direct response :return: Certificate, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Certificate + :rtype: ~azure.mgmt.app.models.Certificate :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] @@ -539,6 +570,7 @@ def update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(certificate_envelope, 'CertificatePatch') @@ -548,6 +580,7 @@ def update( resource_group_name=resource_group_name, managed_environment_name=managed_environment_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.update.metadata['url'], @@ -555,7 +588,11 @@ def update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -570,5 +607,5 @@ def update( return deserialized - update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}'} # type: ignore + update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/certificates/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_auth_configs_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_auth_configs_operations.py index 5cf790e91218..04759fe3e6e6 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_auth_configs_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_auth_configs_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -16,7 +17,6 @@ from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -33,31 +33,32 @@ def build_list_by_container_app_request( container_app_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -69,10 +70,11 @@ def build_get_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -80,21 +82,21 @@ def build_get_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -109,12 +111,12 @@ def build_create_or_update_request( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -122,23 +124,23 @@ def build_create_or_update_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PUT", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -152,10 +154,11 @@ def build_delete_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -163,21 +166,21 @@ def build_delete_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="DELETE", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -188,7 +191,7 @@ class ContainerAppsAuthConfigsOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -221,9 +224,11 @@ def list_by_container_app( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AuthConfigCollection or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~container_apps_api_client.models.AuthConfigCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.AuthConfigCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfigCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -236,6 +241,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=self.list_by_container_app.metadata['url'], ) request = _convert_request(request) @@ -247,6 +253,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -264,7 +271,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -278,7 +289,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list_by_container_app.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs'} # type: ignore + list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs"} # type: ignore @distributed_trace def get( @@ -300,7 +311,7 @@ def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: AuthConfig, or the result of cls(response) - :rtype: ~container_apps_api_client.models.AuthConfig + :rtype: ~azure.mgmt.app.models.AuthConfig :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] @@ -309,18 +320,25 @@ def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -335,7 +353,7 @@ def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}"} # type: ignore @distributed_trace @@ -358,10 +376,10 @@ def create_or_update( :param name: Name of the Container App AuthConfig. :type name: str :param auth_config_envelope: Properties used to create a Container App AuthConfig. - :type auth_config_envelope: ~container_apps_api_client.models.AuthConfig + :type auth_config_envelope: ~azure.mgmt.app.models.AuthConfig :keyword callable cls: A custom type or function that will be passed the direct response :return: AuthConfig, or the result of cls(response) - :rtype: ~container_apps_api_client.models.AuthConfig + :rtype: ~azure.mgmt.app.models.AuthConfig :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] @@ -370,6 +388,7 @@ def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(auth_config_envelope, 'AuthConfig') @@ -379,6 +398,7 @@ def create_or_update( resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -386,7 +406,11 @@ def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -401,11 +425,11 @@ def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}"} # type: ignore @distributed_trace - def delete( + def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -433,18 +457,25 @@ def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -455,5 +486,5 @@ def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_operations.py index 84b483c37f78..fc43da8e7eaf 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -18,7 +19,6 @@ from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.arm_polling import ARMPolling -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -33,29 +33,30 @@ def build_list_by_subscription_request( subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps") path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -65,30 +66,31 @@ def build_list_by_resource_group_request( resource_group_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -99,31 +101,32 @@ def build_get_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -137,35 +140,35 @@ def build_create_or_update_request_initial( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PUT", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -178,36 +181,37 @@ def build_delete_request_initial( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="DELETE", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) -def build_update_request( +def build_update_request_initial( subscription_id: str, resource_group_name: str, name: str, @@ -216,35 +220,35 @@ def build_update_request( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PATCH", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -259,33 +263,34 @@ def build_list_custom_host_name_analysis_request( custom_hostname: Optional[str] = None, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] if custom_hostname is not None: - query_parameters['customHostname'] = _SERIALIZER.query("custom_hostname", custom_hostname, 'str') - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters['customHostname'] = _SERIALIZER.query("custom_hostname", custom_hostname, 'str') + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="POST", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -296,31 +301,32 @@ def build_list_secrets_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="POST", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -331,7 +337,7 @@ class ContainerAppsOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -358,9 +364,11 @@ def list_by_subscription( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ContainerAppCollection or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~container_apps_api_client.models.ContainerAppCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.ContainerAppCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -371,6 +379,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=self.list_by_subscription.metadata['url'], ) request = _convert_request(request) @@ -380,6 +389,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -397,7 +407,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -411,7 +425,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps'} # type: ignore + list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace def list_by_resource_group( @@ -428,9 +442,11 @@ def list_by_resource_group( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ContainerAppCollection or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~container_apps_api_client.models.ContainerAppCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.ContainerAppCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -442,6 +458,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=self.list_by_resource_group.metadata['url'], ) request = _convert_request(request) @@ -452,6 +469,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -469,7 +487,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -483,7 +505,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps'} # type: ignore + list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace def get( @@ -502,7 +524,7 @@ def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ContainerApp, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ContainerApp + :rtype: ~azure.mgmt.app.models.ContainerApp :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] @@ -511,17 +533,24 @@ def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -536,7 +565,7 @@ def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore def _create_or_update_initial( @@ -552,6 +581,7 @@ def _create_or_update_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(container_app_envelope, 'ContainerApp') @@ -560,6 +590,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self._create_or_update_initial.metadata['url'], @@ -567,7 +598,11 @@ def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 201]: @@ -585,7 +620,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore @distributed_trace @@ -605,7 +640,7 @@ def begin_create_or_update( :param name: Name of the Container App. :type name: str :param container_app_envelope: Properties used to create a container app. - :type container_app_envelope: ~container_apps_api_client.models.ContainerApp + :type container_app_envelope: ~azure.mgmt.app.models.ContainerApp :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -616,11 +651,12 @@ def begin_create_or_update( Retry-After header is present. :return: An instance of LROPoller that returns either ContainerApp or the result of cls(response) - :rtype: ~azure.core.polling.LROPoller[~container_apps_api_client.models.ContainerApp] + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.app.models.ContainerApp] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.PollingMethod] + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] lro_delay = kwargs.pop( 'polling_interval', @@ -632,6 +668,7 @@ def begin_create_or_update( resource_group_name=resource_group_name, name=name, container_app_envelope=container_app_envelope, + api_version=api_version, content_type=content_type, cls=lambda x,y,z: x, **kwargs @@ -656,12 +693,11 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore - def _delete_initial( + def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -673,17 +709,24 @@ def _delete_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self._delete_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: @@ -693,11 +736,11 @@ def _delete_initial( if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore @distributed_trace - def begin_delete( + def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -723,7 +766,8 @@ def begin_delete( :rtype: ~azure.core.polling.LROPoller[None] :raises: ~azure.core.exceptions.HttpResponseError """ - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.PollingMethod] + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] cls = kwargs.pop('cls', None) # type: ClsType[None] lro_delay = kwargs.pop( 'polling_interval', @@ -734,6 +778,7 @@ def begin_delete( raw_result = self._delete_initial( resource_group_name=resource_group_name, name=name, + api_version=api_version, cls=lambda x,y,z: x, **kwargs ) @@ -754,72 +799,126 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore - @distributed_trace - def update( + def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, - container_app_envelope: "_models.ContainerAppPatch", + container_app_envelope: "_models.ContainerApp", **kwargs: Any - ) -> "_models.ContainerApp": - """Update properties of a Container App. - - Patches a Container App. Currently only patching of tags is supported. - - :param resource_group_name: The name of the resource group. The name is case insensitive. - :type resource_group_name: str - :param name: Name of the Container App. - :type name: str - :param container_app_envelope: Properties of a container app that need to be updated. - :type container_app_envelope: ~container_apps_api_client.models.ContainerAppPatch - :keyword callable cls: A custom type or function that will be passed the direct response - :return: ContainerApp, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ContainerApp - :raises: ~azure.core.exceptions.HttpResponseError - """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] + ) -> None: + cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - _json = self._serialize.body(container_app_envelope, 'ContainerAppPatch') + _json = self._serialize.body(container_app_envelope, 'ContainerApp') - request = build_update_request( + request = build_update_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, - template_url=self.update.metadata['url'], + template_url=self._update_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response - if response.status_code not in [200]: + if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - - deserialized = self._deserialize('ContainerApp', pipeline_response) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, None, {}) - return deserialized + _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore - update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}'} # type: ignore + @distributed_trace + def begin_update( # pylint: disable=inconsistent-return-statements + self, + resource_group_name: str, + name: str, + container_app_envelope: "_models.ContainerApp", + **kwargs: Any + ) -> LROPoller[None]: + """Update properties of a Container App. + + Patches a Container App using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param name: Name of the Container App. + :type name: str + :param container_app_envelope: Properties of a Container App that need to be updated. + :type container_app_envelope: ~azure.mgmt.app.models.ContainerApp + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[None] + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] + cls = kwargs.pop('cls', None) # type: ClsType[None] + lro_delay = kwargs.pop( + 'polling_interval', + self._config.polling_interval + ) + cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + if cont_token is None: + raw_result = self._update_initial( + resource_group_name=resource_group_name, + name=name, + container_app_envelope=container_app_envelope, + api_version=api_version, + content_type=content_type, + cls=lambda x,y,z: x, + **kwargs + ) + kwargs.pop('error_map', None) + + def get_long_running_output(pipeline_response): + if cls: + return cls(pipeline_response, None, {}) + + + if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + if cont_token: + return LROPoller.from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output + ) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + + begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}"} # type: ignore @distributed_trace def list_custom_host_name_analysis( @@ -837,11 +936,11 @@ def list_custom_host_name_analysis( :type resource_group_name: str :param container_app_name: Name of the Container App. :type container_app_name: str - :param custom_hostname: Custom hostname. + :param custom_hostname: Custom hostname. Default value is None. :type custom_hostname: str :keyword callable cls: A custom type or function that will be passed the direct response :return: CustomHostnameAnalysisResult, or the result of cls(response) - :rtype: ~container_apps_api_client.models.CustomHostnameAnalysisResult + :rtype: ~azure.mgmt.app.models.CustomHostnameAnalysisResult :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.CustomHostnameAnalysisResult"] @@ -850,18 +949,25 @@ def list_custom_host_name_analysis( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_custom_host_name_analysis_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, custom_hostname=custom_hostname, template_url=self.list_custom_host_name_analysis.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -876,7 +982,7 @@ def list_custom_host_name_analysis( return deserialized - list_custom_host_name_analysis.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis'} # type: ignore + list_custom_host_name_analysis.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis"} # type: ignore @distributed_trace @@ -896,7 +1002,7 @@ def list_secrets( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: SecretsCollection, or the result of cls(response) - :rtype: ~container_apps_api_client.models.SecretsCollection + :rtype: ~azure.mgmt.app.models.SecretsCollection :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.SecretsCollection"] @@ -905,17 +1011,24 @@ def list_secrets( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_secrets_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self.list_secrets.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -930,5 +1043,5 @@ def list_secrets( return deserialized - list_secrets.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets'} # type: ignore + list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revision_replicas_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revision_replicas_operations.py index 7ed14ea71456..ba80665b6bfd 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revision_replicas_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revision_replicas_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Optional, TypeVar + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse @@ -15,7 +16,6 @@ from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -33,10 +33,11 @@ def build_get_replica_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -45,21 +46,21 @@ def build_get_replica_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -71,10 +72,11 @@ def build_list_replicas_request( revision_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -82,21 +84,21 @@ def build_list_replicas_request( "revisionName": _SERIALIZER.url("revision_name", revision_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -107,7 +109,7 @@ class ContainerAppsRevisionReplicasOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -145,7 +147,7 @@ def get_replica( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: Replica, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Replica + :rtype: ~azure.mgmt.app.models.Replica :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Replica"] @@ -154,6 +156,8 @@ def get_replica( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_replica_request( subscription_id=self._config.subscription_id, @@ -161,12 +165,17 @@ def get_replica( container_app_name=container_app_name, revision_name=revision_name, name=name, + api_version=api_version, template_url=self.get_replica.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -181,7 +190,7 @@ def get_replica( return deserialized - get_replica.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{name}'} # type: ignore + get_replica.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{name}"} # type: ignore @distributed_trace @@ -204,7 +213,7 @@ def list_replicas( :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ReplicaCollection, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ReplicaCollection + :rtype: ~azure.mgmt.app.models.ReplicaCollection :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ReplicaCollection"] @@ -213,18 +222,25 @@ def list_replicas( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_replicas_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + api_version=api_version, template_url=self.list_replicas.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -239,5 +255,5 @@ def list_replicas( return deserialized - list_replicas.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas'} # type: ignore + list_replicas.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revisions_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revisions_operations.py index 55acb0f3d9c7..4a8cbb5f0a1d 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revisions_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_revisions_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -16,7 +17,6 @@ from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -30,33 +30,38 @@ def build_list_revisions_request( subscription_id: str, resource_group_name: str, container_app_name: str, + *, + filter: Optional[str] = None, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + if filter is not None: + _query_parameters['$filter'] = _SERIALIZER.query("filter", filter, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -68,10 +73,11 @@ def build_get_revision_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -79,21 +85,21 @@ def build_get_revision_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -105,10 +111,11 @@ def build_activate_revision_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/activate') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/activate") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -116,21 +123,21 @@ def build_activate_revision_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="POST", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -142,10 +149,11 @@ def build_deactivate_revision_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/deactivate') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/deactivate") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -153,21 +161,21 @@ def build_deactivate_revision_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="POST", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -179,10 +187,11 @@ def build_restart_revision_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/restart') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/restart") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -190,21 +199,21 @@ def build_restart_revision_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="POST", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -215,7 +224,7 @@ class ContainerAppsRevisionsOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -235,6 +244,7 @@ def list_revisions( self, resource_group_name: str, container_app_name: str, + filter: Optional[str] = None, **kwargs: Any ) -> Iterable["_models.RevisionCollection"]: """Get the Revisions for a given Container App. @@ -245,11 +255,15 @@ def list_revisions( :type resource_group_name: str :param container_app_name: Name of the Container App for which Revisions are needed. :type container_app_name: str + :param filter: The filter to apply on the operation. Default value is None. + :type filter: str :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either RevisionCollection or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~container_apps_api_client.models.RevisionCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.RevisionCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.RevisionCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -262,6 +276,8 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, + filter=filter, template_url=self.list_revisions.metadata['url'], ) request = _convert_request(request) @@ -273,6 +289,8 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, + filter=filter, template_url=next_link, ) request = _convert_request(request) @@ -290,7 +308,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -304,7 +326,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list_revisions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions'} # type: ignore + list_revisions.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions"} # type: ignore @distributed_trace def get_revision( @@ -326,7 +348,7 @@ def get_revision( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: Revision, or the result of cls(response) - :rtype: ~container_apps_api_client.models.Revision + :rtype: ~azure.mgmt.app.models.Revision :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.Revision"] @@ -335,18 +357,25 @@ def get_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.get_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -361,11 +390,11 @@ def get_revision( return deserialized - get_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}'} # type: ignore + get_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}"} # type: ignore @distributed_trace - def activate_revision( + def activate_revision( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -393,18 +422,25 @@ def activate_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_activate_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.activate_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -415,11 +451,11 @@ def activate_revision( if cls: return cls(pipeline_response, None, {}) - activate_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/activate'} # type: ignore + activate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/activate"} # type: ignore @distributed_trace - def deactivate_revision( + def deactivate_revision( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -447,18 +483,25 @@ def deactivate_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_deactivate_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.deactivate_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -469,11 +512,11 @@ def deactivate_revision( if cls: return cls(pipeline_response, None, {}) - deactivate_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/deactivate'} # type: ignore + deactivate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/deactivate"} # type: ignore @distributed_trace - def restart_revision( + def restart_revision( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -501,18 +544,25 @@ def restart_revision( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_restart_revision_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.restart_revision.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -523,5 +573,5 @@ def restart_revision( if cls: return cls(pipeline_response, None, {}) - restart_revision.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/restart'} # type: ignore + restart_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/restart"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_source_controls_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_source_controls_operations.py index 840a4c9f6839..f280adc799cf 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_source_controls_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_container_apps_source_controls_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -18,7 +19,6 @@ from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.arm_polling import ARMPolling -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -35,31 +35,32 @@ def build_list_by_container_app_request( container_app_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -71,10 +72,11 @@ def build_get_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -82,21 +84,21 @@ def build_get_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -111,12 +113,12 @@ def build_create_or_update_request_initial( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -124,23 +126,23 @@ def build_create_or_update_request_initial( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PUT", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -154,10 +156,11 @@ def build_delete_request_initial( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -165,21 +168,21 @@ def build_delete_request_initial( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="DELETE", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -190,7 +193,7 @@ class ContainerAppsSourceControlsOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -223,9 +226,11 @@ def list_by_container_app( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either SourceControlCollection or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~container_apps_api_client.models.SourceControlCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.SourceControlCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControlCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -238,6 +243,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=self.list_by_container_app.metadata['url'], ) request = _convert_request(request) @@ -249,6 +255,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -266,7 +273,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -280,7 +291,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list_by_container_app.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols'} # type: ignore + list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols"} # type: ignore @distributed_trace def get( @@ -302,7 +313,7 @@ def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: SourceControl, or the result of cls(response) - :rtype: ~container_apps_api_client.models.SourceControl + :rtype: ~azure.mgmt.app.models.SourceControl :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] @@ -311,18 +322,25 @@ def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -337,7 +355,7 @@ def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore def _create_or_update_initial( @@ -354,6 +372,7 @@ def _create_or_update_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(source_control_envelope, 'SourceControl') @@ -363,6 +382,7 @@ def _create_or_update_initial( resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self._create_or_update_initial.metadata['url'], @@ -370,7 +390,11 @@ def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202]: @@ -388,7 +412,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore @distributed_trace @@ -411,7 +435,7 @@ def begin_create_or_update( :param name: Name of the Container App SourceControl. :type name: str :param source_control_envelope: Properties used to create a Container App SourceControl. - :type source_control_envelope: ~container_apps_api_client.models.SourceControl + :type source_control_envelope: ~azure.mgmt.app.models.SourceControl :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -422,11 +446,12 @@ def begin_create_or_update( Retry-After header is present. :return: An instance of LROPoller that returns either SourceControl or the result of cls(response) - :rtype: ~azure.core.polling.LROPoller[~container_apps_api_client.models.SourceControl] + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.app.models.SourceControl] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.PollingMethod] + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] lro_delay = kwargs.pop( 'polling_interval', @@ -439,6 +464,7 @@ def begin_create_or_update( container_app_name=container_app_name, name=name, source_control_envelope=source_control_envelope, + api_version=api_version, content_type=content_type, cls=lambda x,y,z: x, **kwargs @@ -463,12 +489,11 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore - def _delete_initial( + def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -481,18 +506,25 @@ def _delete_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, template_url=self._delete_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: @@ -502,11 +534,11 @@ def _delete_initial( if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore @distributed_trace - def begin_delete( + def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, @@ -535,7 +567,8 @@ def begin_delete( :rtype: ~azure.core.polling.LROPoller[None] :raises: ~azure.core.exceptions.HttpResponseError """ - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.PollingMethod] + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] cls = kwargs.pop('cls', None) # type: ClsType[None] lro_delay = kwargs.pop( 'polling_interval', @@ -547,6 +580,7 @@ def begin_delete( resource_group_name=resource_group_name, container_app_name=container_app_name, name=name, + api_version=api_version, cls=lambda x,y,z: x, **kwargs ) @@ -567,7 +601,6 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}'} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_dapr_components_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_dapr_components_operations.py index a61679d7fa61..0b959039d526 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_dapr_components_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_dapr_components_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -16,7 +17,6 @@ from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -33,31 +33,32 @@ def build_list_request( environment_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -69,10 +70,11 @@ def build_get_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -80,21 +82,21 @@ def build_get_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -109,12 +111,12 @@ def build_create_or_update_request( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -122,23 +124,23 @@ def build_create_or_update_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PUT", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -152,10 +154,11 @@ def build_delete_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -163,21 +166,59 @@ def build_delete_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="DELETE", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, + **kwargs + ) + + +def build_list_secrets_request( + subscription_id: str, + resource_group_name: str, + environment_name: str, + name: str, + **kwargs: Any +) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + + accept = "application/json" + # Construct URL + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}/listSecrets") # pylint: disable=line-too-long + path_format_arguments = { + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), + "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), + "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "name": _SERIALIZER.url("name", name, 'str'), + } + + _url = _format_url_section(_url, **path_format_arguments) + + # Construct parameters + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + + # Construct headers + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + + return HttpRequest( + method="POST", + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -188,7 +229,7 @@ class DaprComponentsOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -221,10 +262,11 @@ def list( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either DaprComponentsCollection or the result of cls(response) - :rtype: - ~azure.core.paging.ItemPaged[~container_apps_api_client.models.DaprComponentsCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.DaprComponentsCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponentsCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -237,6 +279,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) @@ -248,6 +291,7 @@ def prepare_request(next_link=None): subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -265,7 +309,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -279,7 +327,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents'} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents"} # type: ignore @distributed_trace def get( @@ -301,7 +349,7 @@ def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: DaprComponent, or the result of cls(response) - :rtype: ~container_apps_api_client.models.DaprComponent + :rtype: ~azure.mgmt.app.models.DaprComponent :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] @@ -310,18 +358,25 @@ def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -336,7 +391,7 @@ def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}"} # type: ignore @distributed_trace @@ -359,10 +414,10 @@ def create_or_update( :param name: Name of the Dapr Component. :type name: str :param dapr_component_envelope: Configuration details of the Dapr Component. - :type dapr_component_envelope: ~container_apps_api_client.models.DaprComponent + :type dapr_component_envelope: ~azure.mgmt.app.models.DaprComponent :keyword callable cls: A custom type or function that will be passed the direct response :return: DaprComponent, or the result of cls(response) - :rtype: ~container_apps_api_client.models.DaprComponent + :rtype: ~azure.mgmt.app.models.DaprComponent :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] @@ -371,6 +426,7 @@ def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(dapr_component_envelope, 'DaprComponent') @@ -380,6 +436,7 @@ def create_or_update( resource_group_name=resource_group_name, environment_name=environment_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -387,7 +444,11 @@ def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -402,11 +463,11 @@ def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}"} # type: ignore @distributed_trace - def delete( + def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, environment_name: str, @@ -434,18 +495,25 @@ def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -456,5 +524,70 @@ def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}"} # type: ignore + + + @distributed_trace + def list_secrets( + self, + resource_group_name: str, + environment_name: str, + name: str, + **kwargs: Any + ) -> "_models.DaprSecretsCollection": + """List secrets for a dapr component. + + List secrets for a dapr component. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. + :type environment_name: str + :param name: Name of the Dapr Component. + :type name: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: DaprSecretsCollection, or the result of cls(response) + :rtype: ~azure.mgmt.app.models.DaprSecretsCollection + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprSecretsCollection"] + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } + error_map.update(kwargs.pop('error_map', {})) + + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + + + request = build_list_secrets_request( + subscription_id=self._config.subscription_id, + resource_group_name=resource_group_name, + environment_name=environment_name, + name=name, + api_version=api_version, + template_url=self.list_secrets.metadata['url'], + ) + request = _convert_request(request) + request.url = self._client.format_url(request.url) + + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize('DaprSecretsCollection', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + + list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}/listSecrets"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_operations.py index e9846a028b32..975e29f43dd4 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -18,7 +19,6 @@ from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.arm_polling import ARMPolling -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -33,29 +33,30 @@ def build_list_by_subscription_request( subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments") path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -65,30 +66,31 @@ def build_list_by_resource_group_request( resource_group_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -99,31 +101,32 @@ def build_get_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -137,35 +140,35 @@ def build_create_or_update_request_initial( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PUT", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -178,36 +181,37 @@ def build_delete_request_initial( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="DELETE", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) -def build_update_request( +def build_update_request_initial( subscription_id: str, resource_group_name: str, name: str, @@ -216,35 +220,35 @@ def build_update_request( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PATCH", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -257,7 +261,7 @@ class ManagedEnvironmentsOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -284,10 +288,11 @@ def list_by_subscription( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of cls(response) - :rtype: - ~azure.core.paging.ItemPaged[~container_apps_api_client.models.ManagedEnvironmentsCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.ManagedEnvironmentsCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -298,6 +303,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=self.list_by_subscription.metadata['url'], ) request = _convert_request(request) @@ -307,6 +313,7 @@ def prepare_request(next_link=None): request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -324,7 +331,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -338,7 +349,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments'} # type: ignore + list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace def list_by_resource_group( @@ -355,10 +366,11 @@ def list_by_resource_group( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of cls(response) - :rtype: - ~azure.core.paging.ItemPaged[~container_apps_api_client.models.ManagedEnvironmentsCollection] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.ManagedEnvironmentsCollection] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -370,6 +382,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=self.list_by_resource_group.metadata['url'], ) request = _convert_request(request) @@ -380,6 +393,7 @@ def prepare_request(next_link=None): request = build_list_by_resource_group_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -397,7 +411,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -411,7 +429,7 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments'} # type: ignore + list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace def get( @@ -430,7 +448,7 @@ def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironment, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironment + :rtype: ~azure.mgmt.app.models.ManagedEnvironment :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] @@ -439,17 +457,24 @@ def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -464,7 +489,7 @@ def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore def _create_or_update_initial( @@ -480,6 +505,7 @@ def _create_or_update_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') @@ -488,6 +514,7 @@ def _create_or_update_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self._create_or_update_initial.metadata['url'], @@ -495,7 +522,11 @@ def _create_or_update_initial( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 201]: @@ -513,7 +544,7 @@ def _create_or_update_initial( return deserialized - _create_or_update_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore @distributed_trace @@ -533,7 +564,7 @@ def begin_create_or_update( :param name: Name of the Environment. :type name: str :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~container_apps_api_client.models.ManagedEnvironment + :type environment_envelope: ~azure.mgmt.app.models.ManagedEnvironment :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -544,11 +575,12 @@ def begin_create_or_update( Retry-After header is present. :return: An instance of LROPoller that returns either ManagedEnvironment or the result of cls(response) - :rtype: ~azure.core.polling.LROPoller[~container_apps_api_client.models.ManagedEnvironment] + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.app.models.ManagedEnvironment] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.PollingMethod] + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] lro_delay = kwargs.pop( 'polling_interval', @@ -560,6 +592,7 @@ def begin_create_or_update( resource_group_name=resource_group_name, name=name, environment_envelope=environment_envelope, + api_version=api_version, content_type=content_type, cls=lambda x,y,z: x, **kwargs @@ -584,12 +617,11 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore - def _delete_initial( + def _delete_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -601,17 +633,24 @@ def _delete_initial( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, template_url=self._delete_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: @@ -621,11 +660,11 @@ def _delete_initial( if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore @distributed_trace - def begin_delete( + def begin_delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, @@ -651,7 +690,8 @@ def begin_delete( :rtype: ~azure.core.polling.LROPoller[None] :raises: ~azure.core.exceptions.HttpResponseError """ - polling = kwargs.pop('polling', True) # type: Union[bool, azure.core.polling.PollingMethod] + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] cls = kwargs.pop('cls', None) # type: ClsType[None] lro_delay = kwargs.pop( 'polling_interval', @@ -662,6 +702,7 @@ def begin_delete( raw_result = self._delete_initial( resource_group_name=resource_group_name, name=name, + api_version=api_version, cls=lambda x,y,z: x, **kwargs ) @@ -682,69 +723,123 @@ def get_long_running_output(pipeline_response): client=self._client, deserialization_callback=get_long_running_output ) - else: - return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore - @distributed_trace - def update( + def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, name: str, - environment_envelope: "_models.ManagedEnvironmentPatch", + environment_envelope: "_models.ManagedEnvironment", **kwargs: Any - ) -> "_models.ManagedEnvironment": - """Update Managed Environment's properties. - - Patches a Managed Environment. Only patching of tags is supported currently. - - :param resource_group_name: The name of the resource group. The name is case insensitive. - :type resource_group_name: str - :param name: Name of the Environment. - :type name: str - :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~container_apps_api_client.models.ManagedEnvironmentPatch - :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironment, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironment - :raises: ~azure.core.exceptions.HttpResponseError - """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] + ) -> None: + cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - _json = self._serialize.body(environment_envelope, 'ManagedEnvironmentPatch') + _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') - request = build_update_request( + request = build_update_request_initial( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, name=name, + api_version=api_version, content_type=content_type, json=_json, - template_url=self.update.metadata['url'], + template_url=self._update_initial.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response - if response.status_code not in [200]: + if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) - raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + raise HttpResponseError(response=response, error_format=ARMErrorFormat) if cls: - return cls(pipeline_response, deserialized, {}) + return cls(pipeline_response, None, {}) + + _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore - return deserialized - update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}'} # type: ignore + @distributed_trace + def begin_update( # pylint: disable=inconsistent-return-statements + self, + resource_group_name: str, + name: str, + environment_envelope: "_models.ManagedEnvironment", + **kwargs: Any + ) -> LROPoller[None]: + """Update Managed Environment's properties. + + Patches a Managed Environment using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param name: Name of the Environment. + :type name: str + :param environment_envelope: Configuration details of the Environment. + :type environment_envelope: ~azure.mgmt.app.models.ManagedEnvironment + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[None] + :raises: ~azure.core.exceptions.HttpResponseError + """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] + cls = kwargs.pop('cls', None) # type: ClsType[None] + lro_delay = kwargs.pop( + 'polling_interval', + self._config.polling_interval + ) + cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + if cont_token is None: + raw_result = self._update_initial( + resource_group_name=resource_group_name, + name=name, + environment_envelope=environment_envelope, + api_version=api_version, + content_type=content_type, + cls=lambda x,y,z: x, + **kwargs + ) + kwargs.pop('error_map', None) + + def get_long_running_output(pipeline_response): + if cls: + return cls(pipeline_response, None, {}) + + + if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + if cont_token: + return LROPoller.from_continuation_token( + polling_method=polling_method, + continuation_token=cont_token, + client=self._client, + deserialization_callback=get_long_running_output + ) + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_storages_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_storages_operations.py index 065193077a23..d86735befd91 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_storages_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_managed_environments_storages_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Optional, TypeVar + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.pipeline import PipelineResponse @@ -15,7 +16,6 @@ from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request, _format_url_section @@ -32,31 +32,32 @@ def build_list_request( env_name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), "envName": _SERIALIZER.url("env_name", env_name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -68,10 +69,11 @@ def build_get_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -79,21 +81,21 @@ def build_get_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -108,12 +110,12 @@ def build_create_or_update_request( content: Any = None, **kwargs: Any ) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', None) # type: Optional[str] - api_version = "2022-01-01-preview" accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -121,23 +123,23 @@ def build_create_or_update_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="PUT", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, json=json, content=content, **kwargs @@ -151,10 +153,11 @@ def build_delete_request( name: str, **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}') + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}") # pylint: disable=line-too-long path_format_arguments = { "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), @@ -162,21 +165,21 @@ def build_delete_request( "name": _SERIALIZER.url("name", name, 'str'), } - url = _format_url_section(url, **path_format_arguments) + _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="DELETE", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -187,7 +190,7 @@ class ManagedEnvironmentsStoragesOperations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -219,7 +222,7 @@ def list( :type env_name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironmentStoragesCollection, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironmentStoragesCollection + :rtype: ~azure.mgmt.app.models.ManagedEnvironmentStoragesCollection :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStoragesCollection"] @@ -228,17 +231,24 @@ def list( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_list_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, env_name=env_name, + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -253,7 +263,7 @@ def list( return deserialized - list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages'} # type: ignore + list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages"} # type: ignore @distributed_trace @@ -276,7 +286,7 @@ def get( :type name: str :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironmentStorage, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironmentStorage + :rtype: ~azure.mgmt.app.models.ManagedEnvironmentStorage :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] @@ -285,18 +295,25 @@ def get( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_get_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, env_name=env_name, name=name, + api_version=api_version, template_url=self.get.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -311,7 +328,7 @@ def get( return deserialized - get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}'} # type: ignore + get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}"} # type: ignore @distributed_trace @@ -334,10 +351,10 @@ def create_or_update( :param name: Name of the storage. :type name: str :param storage_envelope: Configuration details of storage. - :type storage_envelope: ~container_apps_api_client.models.ManagedEnvironmentStorage + :type storage_envelope: ~azure.mgmt.app.models.ManagedEnvironmentStorage :keyword callable cls: A custom type or function that will be passed the direct response :return: ManagedEnvironmentStorage, or the result of cls(response) - :rtype: ~container_apps_api_client.models.ManagedEnvironmentStorage + :rtype: ~azure.mgmt.app.models.ManagedEnvironmentStorage :raises: ~azure.core.exceptions.HttpResponseError """ cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] @@ -346,6 +363,7 @@ def create_or_update( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] _json = self._serialize.body(storage_envelope, 'ManagedEnvironmentStorage') @@ -355,6 +373,7 @@ def create_or_update( resource_group_name=resource_group_name, env_name=env_name, name=name, + api_version=api_version, content_type=content_type, json=_json, template_url=self.create_or_update.metadata['url'], @@ -362,7 +381,11 @@ def create_or_update( request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -377,11 +400,11 @@ def create_or_update( return deserialized - create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}'} # type: ignore + create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}"} # type: ignore @distributed_trace - def delete( + def delete( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, env_name: str, @@ -409,18 +432,25 @@ def delete( } error_map.update(kwargs.pop('error_map', {})) + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + request = build_delete_request( subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, env_name=env_name, name=name, + api_version=api_version, template_url=self.delete.metadata['url'], ) request = _convert_request(request) request.url = self._client.format_url(request.url) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -431,5 +461,5 @@ def delete( if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}'} # type: ignore + delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{envName}/storages/{name}"} # type: ignore diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_namespaces_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_namespaces_operations.py new file mode 100644 index 000000000000..dfad81d31d05 --- /dev/null +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_namespaces_operations.py @@ -0,0 +1,160 @@ +# pylint: disable=too-many-lines +# 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 typing import Any, Callable, Dict, Optional, TypeVar + +from msrest import Serializer + +from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.pipeline import PipelineResponse +from azure.core.pipeline.transport import HttpResponse +from azure.core.rest import HttpRequest +from azure.core.tracing.decorator import distributed_trace +from azure.mgmt.core.exceptions import ARMErrorFormat + +from .. import models as _models +from .._vendor import _convert_request, _format_url_section +T = TypeVar('T') +JSONType = Any +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] + +_SERIALIZER = Serializer() +_SERIALIZER.client_side_validation = False + +def build_check_name_availability_request( + subscription_id: str, + resource_group_name: str, + managed_environment_name: str, + *, + json: JSONType = None, + content: Any = None, + **kwargs: Any +) -> HttpRequest: + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + content_type = kwargs.pop('content_type', None) # type: Optional[str] + + accept = "application/json" + # Construct URL + _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/checkNameAvailability") # pylint: disable=line-too-long + path_format_arguments = { + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), + "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), + "managedEnvironmentName": _SERIALIZER.url("managed_environment_name", managed_environment_name, 'str'), + } + + _url = _format_url_section(_url, **path_format_arguments) + + # Construct parameters + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + + # Construct headers + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + if content_type is not None: + _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + + return HttpRequest( + method="POST", + url=_url, + params=_query_parameters, + headers=_header_parameters, + json=json, + content=content, + **kwargs + ) + +class NamespacesOperations(object): + """NamespacesOperations operations. + + You should not instantiate this class directly. Instead, you should create a Client instance that + instantiates it for you and attaches it as an attribute. + + :ivar models: Alias to model classes used in this operation group. + :type models: ~azure.mgmt.app.models + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + """ + + models = _models + + def __init__(self, client, config, serializer, deserializer): + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self._config = config + + @distributed_trace + def check_name_availability( + self, + resource_group_name: str, + managed_environment_name: str, + check_name_availability_request: "_models.CheckNameAvailabilityRequest", + **kwargs: Any + ) -> "_models.CheckNameAvailabilityResponse": + """Checks the resource name availability. + + Checks if resource name is available. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + :type resource_group_name: str + :param managed_environment_name: Name of the Managed Environment. + :type managed_environment_name: str + :param check_name_availability_request: The check name availability request. + :type check_name_availability_request: ~azure.mgmt.app.models.CheckNameAvailabilityRequest + :keyword callable cls: A custom type or function that will be passed the direct response + :return: CheckNameAvailabilityResponse, or the result of cls(response) + :rtype: ~azure.mgmt.app.models.CheckNameAvailabilityResponse + :raises: ~azure.core.exceptions.HttpResponseError + """ + cls = kwargs.pop('cls', None) # type: ClsType["_models.CheckNameAvailabilityResponse"] + error_map = { + 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + } + error_map.update(kwargs.pop('error_map', {})) + + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + + _json = self._serialize.body(check_name_availability_request, 'CheckNameAvailabilityRequest') + + request = build_check_name_availability_request( + subscription_id=self._config.subscription_id, + resource_group_name=resource_group_name, + managed_environment_name=managed_environment_name, + api_version=api_version, + content_type=content_type, + json=_json, + template_url=self.check_name_availability.metadata['url'], + ) + request = _convert_request(request) + request.url = self._client.format_url(request.url) + + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) + response = pipeline_response.http_response + + if response.status_code not in [200]: + map_error(status_code=response.status_code, response=response, error_map=error_map) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) + + deserialized = self._deserialize('CheckNameAvailabilityResponse', pipeline_response) + + if cls: + return cls(pipeline_response, deserialized, {}) + + return deserialized + + check_name_availability.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{managedEnvironmentName}/checkNameAvailability"} # type: ignore + diff --git a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_operations.py b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_operations.py index a998d5f98846..0e381955511b 100644 --- a/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_operations.py +++ b/sdk/app/azure-mgmt-app/azure/mgmt/app/operations/_operations.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-lines # coding=utf-8 # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. @@ -5,9 +6,9 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import functools -from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar -import warnings +from typing import Any, Callable, Dict, Iterable, Optional, TypeVar + +from msrest import Serializer from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error from azure.core.paging import ItemPaged @@ -16,7 +17,6 @@ from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.mgmt.core.exceptions import ARMErrorFormat -from msrest import Serializer from .. import models as _models from .._vendor import _convert_request @@ -29,24 +29,25 @@ def build_list_request( **kwargs: Any ) -> HttpRequest: - api_version = "2022-01-01-preview" + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + accept = "application/json" # Construct URL - url = kwargs.pop("template_url", '/providers/Microsoft.App/operations') + _url = kwargs.pop("template_url", "/providers/Microsoft.App/operations") # Construct parameters - query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] + _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') # Construct headers - header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] + _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') return HttpRequest( method="GET", - url=url, - params=query_parameters, - headers=header_parameters, + url=_url, + params=_query_parameters, + headers=_header_parameters, **kwargs ) @@ -57,7 +58,7 @@ class Operations(object): instantiates it for you and attaches it as an attribute. :ivar models: Alias to model classes used in this operation group. - :type models: ~container_apps_api_client.models + :type models: ~azure.mgmt.app.models :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. @@ -81,9 +82,11 @@ def list( :keyword callable cls: A custom type or function that will be passed the direct response :return: An iterator like instance of either AvailableOperations or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~container_apps_api_client.models.AvailableOperations] + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.app.models.AvailableOperations] :raises: ~azure.core.exceptions.HttpResponseError """ + api_version = kwargs.pop('api_version', "2022-03-01") # type: str + cls = kwargs.pop('cls', None) # type: ClsType["_models.AvailableOperations"] error_map = { 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError @@ -93,6 +96,7 @@ def prepare_request(next_link=None): if not next_link: request = build_list_request( + api_version=api_version, template_url=self.list.metadata['url'], ) request = _convert_request(request) @@ -101,6 +105,7 @@ def prepare_request(next_link=None): else: request = build_list_request( + api_version=api_version, template_url=next_link, ) request = _convert_request(request) @@ -118,7 +123,11 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs) + pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access + request, + stream=False, + **kwargs + ) response = pipeline_response.http_response if response.status_code not in [200]: @@ -132,4 +141,4 @@ def get_next(next_link=None): return ItemPaged( get_next, extract_data ) - list.metadata = {'url': '/providers/Microsoft.App/operations'} # type: ignore + list.metadata = {'url': "/providers/Microsoft.App/operations"} # type: ignore