From 0d8d21b967afa5f9dd8e28a1dfc70fe05b054c22 Mon Sep 17 00:00:00 2001 From: Zhe Li Date: Wed, 3 Nov 2021 17:55:02 +0800 Subject: [PATCH] add custom domain --- .../azext_spring_cloud/commands.py | 21 ++- src/spring-cloud/azext_spring_cloud/custom.py | 24 +-- .../azext_spring_cloud/tier_routing_app.py | 65 +++++++- .../tier_routing_certificate.py | 51 ++++++ .../tier_routing_deployment.py | 3 +- .../_app_platform_management_client.py | 150 ++++++------------ .../aio/_app_platform_management_client.py | 150 ++++++------------ .../v2019_05_01_preview/models/_models.py | 4 + .../v2019_05_01_preview/models/_models_py3.py | 5 + .../appplatform/v2020_07_01/models/_models.py | 4 + .../v2020_07_01/models/_models_py3.py | 5 + .../v2020_11_01_preview/models/_models.py | 4 + .../v2020_11_01_preview/models/_models_py3.py | 5 + .../v2021_06_01_preview/models/_models.py | 4 + .../v2021_06_01_preview/models/_models_py3.py | 5 + .../v2021_09_01_preview/models/_models.py | 14 +- .../v2021_09_01_preview/models/_models_py3.py | 20 +-- 17 files changed, 288 insertions(+), 246 deletions(-) create mode 100644 src/spring-cloud/azext_spring_cloud/tier_routing_certificate.py diff --git a/src/spring-cloud/azext_spring_cloud/commands.py b/src/spring-cloud/azext_spring_cloud/commands.py index 2a12efbf180..cc5a8a32a17 100644 --- a/src/spring-cloud/azext_spring_cloud/commands.py +++ b/src/spring-cloud/azext_spring_cloud/commands.py @@ -33,6 +33,11 @@ def load_command_table(self, _): client_factory=cf_spring_cloud_20210901preview ) + certificate_routing_util = CliCommandType( + operations_tmpl='azext_spring_cloud.tier_routing_certificate#{}', + client_factory=cf_spring_cloud_20210901preview + ) + service_registry_cmd_group = CliCommandType( operations_tmpl='azext_spring_cloud.service_registry#{}', client_factory=cf_spring_cloud_enterprise @@ -93,6 +98,7 @@ def load_command_table(self, _): g.custom_command('start', 'app_start', supports_no_wait=True) g.custom_command('stop', 'app_stop', supports_no_wait=True) g.custom_command('restart', 'app_restart', supports_no_wait=True) + g.custom_command('append-loaded-public-certificate', 'app_append_loaded_public_certificate') with self.command_group('spring-cloud app', client_factory=cf_spring_cloud_20210601preview, exception_handler=handle_asc_exception) as g: @@ -103,7 +109,6 @@ def load_command_table(self, _): supports_no_wait=True) g.custom_command('logs', 'app_tail_log') g.custom_command('append-persistent-storage', 'app_append_persistent_storage') - g.custom_command('append-loaded-public-certificate', 'app_append_loaded_public_certificate') with self.command_group('spring-cloud app identity', custom_command_type=app_routing_util, exception_handler=handle_asc_exception) as g: @@ -149,7 +154,7 @@ def load_command_table(self, _): g.custom_command('remove', 'storage_remove') g.custom_command('list-persistent-storage', "storage_list_persistent_storage", table_transformer=transform_app_table_output) - with self.command_group('spring-cloud certificate', client_factory=cf_spring_cloud_20210901preview, + with self.command_group('spring-cloud certificate', custom_command_type=certificate_routing_util, exception_handler=handle_asc_exception) as g: g.custom_command('add', 'certificate_add') g.custom_show_command('show', 'certificate_show', table_transformer=transform_spring_cloud_certificate_output) @@ -157,13 +162,13 @@ def load_command_table(self, _): g.custom_command('remove', 'certificate_remove') g.custom_command('list-reference-app', 'certificate_list_reference_app', table_transformer=transform_app_table_output) - with self.command_group('spring-cloud app custom-domain', client_factory=cf_spring_cloud, + with self.command_group('spring-cloud app custom-domain', custom_command_type=app_routing_util, exception_handler=handle_asc_exception) as g: - g.custom_command('bind', 'domain_bind') - g.custom_show_command('show', 'domain_show', table_transformer=transform_spring_cloud_custom_domain_output) - g.custom_command('list', 'domain_list', table_transformer=transform_spring_cloud_custom_domain_output) - g.custom_command('update', 'domain_update') - g.custom_command('unbind', 'domain_unbind') + g.custom_command('bind', 'app_domain_bind') + g.custom_show_command('show', 'app_domain_show', table_transformer=transform_spring_cloud_custom_domain_output) + g.custom_command('list', 'app_domain_list', table_transformer=transform_spring_cloud_custom_domain_output) + g.custom_command('update', 'app_domain_update') + g.custom_command('unbind', 'app_domain_unbind') with self.command_group('spring-cloud app-insights', client_factory=cf_spring_cloud_20201101preview, diff --git a/src/spring-cloud/azext_spring_cloud/custom.py b/src/spring-cloud/azext_spring_cloud/custom.py index fcc6130d913..4ac1cbd9b35 100644 --- a/src/spring-cloud/azext_spring_cloud/custom.py +++ b/src/spring-cloud/azext_spring_cloud/custom.py @@ -911,7 +911,7 @@ def app_unset_deployment(cmd, client, resource_group, service, name): return client.apps.begin_update(resource_group, service, name, app_resource) -def app_append_loaded_public_certificate(cmd, client, resource_group, service, name, certificate_name, load_trust_store): +def app_append_loaded_public_certificate(cmd, client, resource_group, service, name, certificate_name, load_trust_store, models=None): app_resource = client.apps.get(resource_group, service, name) certificate_resource = client.certificates.get(resource_group, service, certificate_name) certificate_resource_id = certificate_resource.id @@ -925,7 +925,7 @@ def app_append_loaded_public_certificate(cmd, client, resource_group, service, n if loaded_certificate.resource_id == certificate_resource.id: raise ClientRequestError("This certificate has already been loaded.") - loaded_certificates.append(models_20210901preview. + loaded_certificates.append(models. LoadedCertificate(resource_id=certificate_resource_id, load_trust_store=load_trust_store)) @@ -1835,7 +1835,7 @@ def storage_list_persistent_storage(client, resource_group, service, name): return reference_apps -def certificate_add(cmd, client, resource_group, service, name, only_public_cert=None, +def certificate_add(cmd, client, resource_group, service, name, models=None, only_public_cert=None, vault_uri=None, vault_certificate_name=None, public_certificate_file=None): if vault_uri is None and public_certificate_file is None: raise InvalidArgumentValueError("One of --vault-uri and --public-certificate-file should be provided") @@ -1848,7 +1848,7 @@ def certificate_add(cmd, client, resource_group, service, name, only_public_cert if vault_uri is not None: if only_public_cert is None: only_public_cert = False - properties = models_20210901preview.KeyVaultCertificateProperties( + properties = models.KeyVaultCertificateProperties( type="KeyVaultCertificate", vault_uri=vault_uri, key_vault_cert_name=vault_certificate_name, @@ -1864,14 +1864,14 @@ def certificate_add(cmd, client, resource_group, service, name, only_public_cert raise FileOperationError('Failed to decode file {} - unknown decoding'.format(public_certificate_file)) else: raise FileOperationError("public_certificate_file %s could not be found", public_certificate_file) - properties = models_20210901preview.ContentCertificateProperties( + properties = models.ContentCertificateProperties( type="ContentCertificate", content=content ) - certificate_resource = models_20210901preview.CertificateResource(properties=properties) + certificate_resource = models.CertificateResource(properties=properties) def callback(pipeline_response, deserialized, headers): - return models_20210901preview.CertificateResource.deserialize(json.loads(pipeline_response.http_response.text())) + return models.CertificateResource.deserialize(json.loads(pipeline_response.http_response.text())) return client.certificates.begin_create_or_update( resource_group_name=resource_group, @@ -1920,7 +1920,7 @@ def certificate_list_reference_app(cmd, client, resource_group, service, name): return reference_apps -def domain_bind(cmd, client, resource_group, service, app, +def app_domain_bind(cmd, client, models, resource_group, service, app, domain_name, certificate=None, enable_end_to_end_tls=None): @@ -1956,17 +1956,17 @@ def _update_app_e2e_tls(cmd, resource_group, service, app, enable_end_to_end_tls return poller.result() -def domain_show(cmd, client, resource_group, service, app, domain_name): +def app_domain_show(cmd, client, resource_group, service, app, domain_name): _check_active_deployment_exist(client, resource_group, service, app) return client.custom_domains.get(resource_group, service, app, domain_name) -def domain_list(cmd, client, resource_group, service, app): +def app_domain_list(cmd, client, resource_group, service, app): _check_active_deployment_exist(client, resource_group, service, app) return client.custom_domains.list(resource_group, service, app) -def domain_update(cmd, client, resource_group, service, app, +def app_domain_update(cmd, client, models, resource_group, service, app, domain_name, certificate=None, enable_end_to_end_tls=None): @@ -1986,7 +1986,7 @@ def domain_update(cmd, client, resource_group, service, app, domain_name, custom_domain_resource) -def domain_unbind(cmd, client, resource_group, service, app, domain_name): +def app_domain_unbind(cmd, client, resource_group, service, app, domain_name): client.custom_domains.get(resource_group, service, app, domain_name) return client.custom_domains.begin_delete(resource_group, service, app, domain_name) diff --git a/src/spring-cloud/azext_spring_cloud/tier_routing_app.py b/src/spring-cloud/azext_spring_cloud/tier_routing_app.py index 79e6e7f9aec..6f411d3ce6a 100644 --- a/src/spring-cloud/azext_spring_cloud/tier_routing_app.py +++ b/src/spring-cloud/azext_spring_cloud/tier_routing_app.py @@ -15,10 +15,16 @@ app_start as app_start_standard, app_stop as app_stop_standard, app_identity_assign as identity_assign, app_identity_remove as identity_remove, - app_identity_show as identity_show) + app_identity_show as identity_show, + app_domain_bind as domain_bind, + app_domain_show as domain_show, + app_domain_list as domain_list, + app_domain_update as domain_update, + app_domain_unbind as domain_unbind, + app_append_loaded_public_certificate as append_loaded_public_certificate) from knack.log import get_logger from .vendored_sdks.appplatform.v2022_05_01_preview import models as models_20220501preview -from .vendored_sdks.appplatform.v2021_06_01_preview import models as models_20210601preview +from .vendored_sdks.appplatform.v2021_09_01_preview import models as models_20210901preview logger = get_logger(__name__) @@ -143,6 +149,7 @@ def app_scale(cmd, client, resource_group, service, name, def app_deploy(cmd, client, resource_group, service, name, version=None, deployment=None, + disable_validation=None, artifact_path=None, builder=None, target_module=None, @@ -160,12 +167,12 @@ def app_deploy(cmd, client, resource_group, service, name, else: # config_file_patterns not support return app_deploy_standard(cmd, client, resource_group, service, name, - version, deployment, artifact_path, target_module, runtime_version, + version, deployment, disable_validation, artifact_path, target_module, runtime_version, jvm_options, main_entry, env, no_wait) def app_identity_assign(cmd, client, resource_group, service, name, role=None, scope=None): - models = models_20210601preview + models = models_20210901preview if is_enterprise_tier(cmd, resource_group, service): client = get_client(cmd) models = models_20220501preview @@ -173,7 +180,7 @@ def app_identity_assign(cmd, client, resource_group, service, name, role=None, s def app_identity_remove(cmd, client, resource_group, service, name): - models = models_20210601preview + models = models_20210901preview if is_enterprise_tier(cmd, resource_group, service): client = get_client(cmd) models = models_20220501preview @@ -182,4 +189,50 @@ def app_identity_remove(cmd, client, resource_group, service, name): def app_identity_show(cmd, client, resource_group, service, name): client = get_client(cmd) if is_enterprise_tier(cmd, resource_group, service) else client - return identity_show(cmd, client, resource_group, service, name) \ No newline at end of file + return identity_show(cmd, client, resource_group, service, name) + + +def app_domain_bind(cmd, client, resource_group, service, app, domain_name, + certificate=None, + enable_end_to_end_tls=None): + models = models_20210901preview + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + models = models_20220501preview + return domain_bind(cmd, client, models, resource_group, service, app, domain_name, certificate, enable_end_to_end_tls) + + +def app_domain_show(cmd, client, resource_group, service, app, domain_name): + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + return domain_show(cmd, client, resource_group, service, app, domain_name) + + +def app_domain_list(cmd, client, resource_group, service, app): + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + return domain_list(cmd, client, resource_group, service, app) + + +def app_domain_update(cmd, client, resource_group, service, app, domain_name, + certificate=None, + enable_end_to_end_tls=None): + models = models_20210901preview + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + models = models_20220501preview + return domain_update(cmd, client, models, resource_group, service, app, domain_name, certificate, enable_end_to_end_tls) + + +def app_domain_unbind(cmd, client, resource_group, service, app, domain_name): + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + return domain_unbind(cmd, client, resource_group, service, app, domain_name) + + +def app_append_loaded_public_certificate(cmd, client, resource_group, service, name, certificate_name, load_trust_store): + models = models_20210901preview + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + models = models_20220501preview + return append_loaded_public_certificate(cmd, client, resource_group, service, name, certificate_name, load_trust_store, models) diff --git a/src/spring-cloud/azext_spring_cloud/tier_routing_certificate.py b/src/spring-cloud/azext_spring_cloud/tier_routing_certificate.py new file mode 100644 index 00000000000..eee6e82432b --- /dev/null +++ b/src/spring-cloud/azext_spring_cloud/tier_routing_certificate.py @@ -0,0 +1,51 @@ +# -------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for license information. +# -------------------------------------------------------------------------------------------- + +# pylint: disable=wrong-import-order +from ._util_enterprise import (is_enterprise_tier, get_client) +from .custom import (certificate_add as custom_certificate_add, + certificate_show as custom_certificate_show, + certificate_list as custom_certificate_list, + certificate_remove as custom_certificate_remove, + certificate_list_reference_app as custom_certificate_list_reference_app) +from knack.log import get_logger +from .vendored_sdks.appplatform.v2022_05_01_preview import models as models_20220501preview +from .vendored_sdks.appplatform.v2021_09_01_preview import models as models_20210901preview + +logger = get_logger(__name__) + + +def certificate_add(cmd, client, resource_group, service, name, only_public_cert=None, + vault_uri=None, vault_certificate_name=None, public_certificate_file=None): + models = models_20210901preview + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + models = models_20220501preview + return custom_certificate_add(cmd, client, resource_group, service, name, models, only_public_cert, + vault_uri, vault_certificate_name, public_certificate_file) + + +def certificate_show(cmd, client, resource_group, service, name): + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + return custom_certificate_show(cmd, client, resource_group, service, name) + + +def certificate_list(cmd, client, resource_group, service, certificate_type=None): + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + return custom_certificate_list(cmd, client, resource_group, service, certificate_type) + + +def certificate_remove(cmd, client, resource_group, service, name): + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + return custom_certificate_remove(cmd, client, resource_group, service, name) + + +def certificate_list_reference_app(cmd, client, resource_group, service, name): + if is_enterprise_tier(cmd, resource_group, service): + client = get_client(cmd) + return custom_certificate_list_reference_app(cmd, client, resource_group, service, name) diff --git a/src/spring-cloud/azext_spring_cloud/tier_routing_deployment.py b/src/spring-cloud/azext_spring_cloud/tier_routing_deployment.py index d6cf31c22c2..857457e2ba9 100644 --- a/src/spring-cloud/azext_spring_cloud/tier_routing_deployment.py +++ b/src/spring-cloud/azext_spring_cloud/tier_routing_deployment.py @@ -37,6 +37,7 @@ def deployment_delete(cmd, client, resource_group, service, app, name): def deployment_create(cmd, client, resource_group, service, app, name, skip_clone_settings=False, version=None, + disable_validation=None, artifact_path=None, builder=None, target_module=None, @@ -55,5 +56,5 @@ def deployment_create(cmd, client, resource_group, service, app, name, jvm_options, cpu, memory, instance_count, env, config_file_patterns, no_wait) else: return deployment_create_standard(cmd, client, resource_group, service, app, name, - skip_clone_settings, version, artifact_path, target_module, runtime_version, + skip_clone_settings, version, disable_validation, artifact_path, target_module, runtime_version, jvm_options, main_entry, cpu, memory, instance_count, env, no_wait) \ No newline at end of file diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/_app_platform_management_client.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/_app_platform_management_client.py index 6300c4bb258..16c097ec411 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/_app_platform_management_client.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/_app_platform_management_client.py @@ -96,7 +96,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): * 2020-07-01: :mod:`v2020_07_01.models` * 2020-11-01-preview: :mod:`v2020_11_01_preview.models` * 2021-06-01-preview: :mod:`v2021_06_01_preview.models` - * 2022-05-01-preview: :mod:`v2022_05_01_preview.models` + * 2021-09-01-preview: :mod:`v2021_09_01_preview.models` """ if api_version == '2019-05-01-preview': from .v2019_05_01_preview import models @@ -110,8 +110,8 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '2021-06-01-preview': from .v2021_06_01_preview import models return models - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview import models + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview import models return models raise ValueError("API version {} is not available".format(api_version)) @@ -123,7 +123,7 @@ def apps(self): * 2020-07-01: :class:`AppsOperations` * 2020-11-01-preview: :class:`AppsOperations` * 2021-06-01-preview: :class:`AppsOperations` - * 2022-05-01-preview: :class:`AppsOperations` + * 2021-09-01-preview: :class:`AppsOperations` """ api_version = self._get_api_version('apps') if api_version == '2019-05-01-preview': @@ -134,8 +134,8 @@ def apps(self): from .v2020_11_01_preview.operations import AppsOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import AppsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import AppsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import AppsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'apps'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -148,7 +148,7 @@ def bindings(self): * 2020-07-01: :class:`BindingsOperations` * 2020-11-01-preview: :class:`BindingsOperations` * 2021-06-01-preview: :class:`BindingsOperations` - * 2022-05-01-preview: :class:`BindingsOperations` + * 2021-09-01-preview: :class:`BindingsOperations` """ api_version = self._get_api_version('bindings') if api_version == '2019-05-01-preview': @@ -159,38 +159,12 @@ def bindings(self): from .v2020_11_01_preview.operations import BindingsOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import BindingsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import BindingsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import BindingsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'bindings'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property - def build_service(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`BuildServiceOperations` - """ - api_version = self._get_api_version('build_service') - if api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import BuildServiceOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'build_service'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - - @property - def buildpacks_binding(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`BuildpacksBindingOperations` - """ - api_version = self._get_api_version('buildpacks_binding') - if api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import BuildpacksBindingOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'buildpacks_binding'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property def certificates(self): """Instance depends on the API version: @@ -199,7 +173,7 @@ def certificates(self): * 2020-07-01: :class:`CertificatesOperations` * 2020-11-01-preview: :class:`CertificatesOperations` * 2021-06-01-preview: :class:`CertificatesOperations` - * 2022-05-01-preview: :class:`CertificatesOperations` + * 2021-09-01-preview: :class:`CertificatesOperations` """ api_version = self._get_api_version('certificates') if api_version == '2019-05-01-preview': @@ -210,8 +184,8 @@ def certificates(self): from .v2020_11_01_preview.operations import CertificatesOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import CertificatesOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import CertificatesOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import CertificatesOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'certificates'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -223,7 +197,7 @@ def config_servers(self): * 2020-07-01: :class:`ConfigServersOperations` * 2020-11-01-preview: :class:`ConfigServersOperations` * 2021-06-01-preview: :class:`ConfigServersOperations` - * 2022-05-01-preview: :class:`ConfigServersOperations` + * 2021-09-01-preview: :class:`ConfigServersOperations` """ api_version = self._get_api_version('config_servers') if api_version == '2020-07-01': @@ -232,25 +206,12 @@ def config_servers(self): from .v2020_11_01_preview.operations import ConfigServersOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import ConfigServersOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import ConfigServersOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import ConfigServersOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'config_servers'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property - def configuration_services(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`ConfigurationServicesOperations` - """ - api_version = self._get_api_version('configuration_services') - if api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import ConfigurationServicesOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'configuration_services'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property def custom_domains(self): """Instance depends on the API version: @@ -259,7 +220,7 @@ def custom_domains(self): * 2020-07-01: :class:`CustomDomainsOperations` * 2020-11-01-preview: :class:`CustomDomainsOperations` * 2021-06-01-preview: :class:`CustomDomainsOperations` - * 2022-05-01-preview: :class:`CustomDomainsOperations` + * 2021-09-01-preview: :class:`CustomDomainsOperations` """ api_version = self._get_api_version('custom_domains') if api_version == '2019-05-01-preview': @@ -270,8 +231,8 @@ def custom_domains(self): from .v2020_11_01_preview.operations import CustomDomainsOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import CustomDomainsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import CustomDomainsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import CustomDomainsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'custom_domains'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -284,7 +245,7 @@ def deployments(self): * 2020-07-01: :class:`DeploymentsOperations` * 2020-11-01-preview: :class:`DeploymentsOperations` * 2021-06-01-preview: :class:`DeploymentsOperations` - * 2022-05-01-preview: :class:`DeploymentsOperations` + * 2021-09-01-preview: :class:`DeploymentsOperations` """ api_version = self._get_api_version('deployments') if api_version == '2019-05-01-preview': @@ -295,8 +256,8 @@ def deployments(self): from .v2020_11_01_preview.operations import DeploymentsOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import DeploymentsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import DeploymentsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import DeploymentsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'deployments'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -308,7 +269,7 @@ def monitoring_settings(self): * 2020-07-01: :class:`MonitoringSettingsOperations` * 2020-11-01-preview: :class:`MonitoringSettingsOperations` * 2021-06-01-preview: :class:`MonitoringSettingsOperations` - * 2022-05-01-preview: :class:`MonitoringSettingsOperations` + * 2021-09-01-preview: :class:`MonitoringSettingsOperations` """ api_version = self._get_api_version('monitoring_settings') if api_version == '2020-07-01': @@ -317,8 +278,8 @@ def monitoring_settings(self): from .v2020_11_01_preview.operations import MonitoringSettingsOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import MonitoringSettingsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import MonitoringSettingsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import MonitoringSettingsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'monitoring_settings'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -331,7 +292,7 @@ def operations(self): * 2020-07-01: :class:`Operations` * 2020-11-01-preview: :class:`Operations` * 2021-06-01-preview: :class:`Operations` - * 2022-05-01-preview: :class:`Operations` + * 2021-09-01-preview: :class:`Operations` """ api_version = self._get_api_version('operations') if api_version == '2019-05-01-preview': @@ -342,8 +303,8 @@ def operations(self): from .v2020_11_01_preview.operations import Operations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import Operations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import Operations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import Operations as OperationClass else: raise ValueError("API version {} does not have operation group 'operations'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -356,7 +317,7 @@ def runtime_versions(self): * 2020-07-01: :class:`RuntimeVersionsOperations` * 2020-11-01-preview: :class:`RuntimeVersionsOperations` * 2021-06-01-preview: :class:`RuntimeVersionsOperations` - * 2022-05-01-preview: :class:`RuntimeVersionsOperations` + * 2021-09-01-preview: :class:`RuntimeVersionsOperations` """ api_version = self._get_api_version('runtime_versions') if api_version == '2019-05-01-preview': @@ -367,38 +328,12 @@ def runtime_versions(self): from .v2020_11_01_preview.operations import RuntimeVersionsOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import RuntimeVersionsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import RuntimeVersionsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import RuntimeVersionsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'runtime_versions'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property - def service(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`ServiceOperations` - """ - api_version = self._get_api_version('service') - if api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import ServiceOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'service'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - - @property - def service_registries(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`ServiceRegistriesOperations` - """ - api_version = self._get_api_version('service_registries') - if api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import ServiceRegistriesOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'service_registries'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property def services(self): """Instance depends on the API version: @@ -407,7 +342,7 @@ def services(self): * 2020-07-01: :class:`ServicesOperations` * 2020-11-01-preview: :class:`ServicesOperations` * 2021-06-01-preview: :class:`ServicesOperations` - * 2022-05-01-preview: :class:`ServicesOperations` + * 2021-09-01-preview: :class:`ServicesOperations` """ api_version = self._get_api_version('services') if api_version == '2019-05-01-preview': @@ -418,8 +353,8 @@ def services(self): from .v2020_11_01_preview.operations import ServicesOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import ServicesOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import ServicesOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import ServicesOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'services'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -444,7 +379,7 @@ def skus(self): * 2020-07-01: :class:`SkusOperations` * 2020-11-01-preview: :class:`SkusOperations` * 2021-06-01-preview: :class:`SkusOperations` - * 2022-05-01-preview: :class:`SkusOperations` + * 2021-09-01-preview: :class:`SkusOperations` """ api_version = self._get_api_version('skus') if api_version == '2020-07-01': @@ -453,12 +388,25 @@ def skus(self): from .v2020_11_01_preview.operations import SkusOperations as OperationClass elif api_version == '2021-06-01-preview': from .v2021_06_01_preview.operations import SkusOperations as OperationClass - elif api_version == '2022-05-01-preview': - from .v2022_05_01_preview.operations import SkusOperations as OperationClass + elif api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import SkusOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'skus'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property + def storages(self): + """Instance depends on the API version: + + * 2021-09-01-preview: :class:`StoragesOperations` + """ + api_version = self._get_api_version('storages') + if api_version == '2021-09-01-preview': + from .v2021_09_01_preview.operations import StoragesOperations as OperationClass + else: + raise ValueError("API version {} does not have operation group 'storages'".format(api_version)) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + def close(self): self._client.close() def __enter__(self): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/aio/_app_platform_management_client.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/aio/_app_platform_management_client.py index 58cdc2fd941..8449050d7a6 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/aio/_app_platform_management_client.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/aio/_app_platform_management_client.py @@ -94,7 +94,7 @@ def models(cls, api_version=DEFAULT_API_VERSION): * 2020-07-01: :mod:`v2020_07_01.models` * 2020-11-01-preview: :mod:`v2020_11_01_preview.models` * 2021-06-01-preview: :mod:`v2021_06_01_preview.models` - * 2022-05-01-preview: :mod:`v2022_05_01_preview.models` + * 2021-09-01-preview: :mod:`v2021_09_01_preview.models` """ if api_version == '2019-05-01-preview': from ..v2019_05_01_preview import models @@ -108,8 +108,8 @@ def models(cls, api_version=DEFAULT_API_VERSION): elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview import models return models - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview import models + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview import models return models raise ValueError("API version {} is not available".format(api_version)) @@ -121,7 +121,7 @@ def apps(self): * 2020-07-01: :class:`AppsOperations` * 2020-11-01-preview: :class:`AppsOperations` * 2021-06-01-preview: :class:`AppsOperations` - * 2022-05-01-preview: :class:`AppsOperations` + * 2021-09-01-preview: :class:`AppsOperations` """ api_version = self._get_api_version('apps') if api_version == '2019-05-01-preview': @@ -132,8 +132,8 @@ def apps(self): from ..v2020_11_01_preview.aio.operations import AppsOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import AppsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import AppsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import AppsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'apps'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -146,7 +146,7 @@ def bindings(self): * 2020-07-01: :class:`BindingsOperations` * 2020-11-01-preview: :class:`BindingsOperations` * 2021-06-01-preview: :class:`BindingsOperations` - * 2022-05-01-preview: :class:`BindingsOperations` + * 2021-09-01-preview: :class:`BindingsOperations` """ api_version = self._get_api_version('bindings') if api_version == '2019-05-01-preview': @@ -157,38 +157,12 @@ def bindings(self): from ..v2020_11_01_preview.aio.operations import BindingsOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import BindingsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import BindingsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import BindingsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'bindings'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property - def build_service(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`BuildServiceOperations` - """ - api_version = self._get_api_version('build_service') - if api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import BuildServiceOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'build_service'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - - @property - def buildpacks_binding(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`BuildpacksBindingOperations` - """ - api_version = self._get_api_version('buildpacks_binding') - if api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import BuildpacksBindingOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'buildpacks_binding'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property def certificates(self): """Instance depends on the API version: @@ -197,7 +171,7 @@ def certificates(self): * 2020-07-01: :class:`CertificatesOperations` * 2020-11-01-preview: :class:`CertificatesOperations` * 2021-06-01-preview: :class:`CertificatesOperations` - * 2022-05-01-preview: :class:`CertificatesOperations` + * 2021-09-01-preview: :class:`CertificatesOperations` """ api_version = self._get_api_version('certificates') if api_version == '2019-05-01-preview': @@ -208,8 +182,8 @@ def certificates(self): from ..v2020_11_01_preview.aio.operations import CertificatesOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import CertificatesOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import CertificatesOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import CertificatesOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'certificates'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -221,7 +195,7 @@ def config_servers(self): * 2020-07-01: :class:`ConfigServersOperations` * 2020-11-01-preview: :class:`ConfigServersOperations` * 2021-06-01-preview: :class:`ConfigServersOperations` - * 2022-05-01-preview: :class:`ConfigServersOperations` + * 2021-09-01-preview: :class:`ConfigServersOperations` """ api_version = self._get_api_version('config_servers') if api_version == '2020-07-01': @@ -230,25 +204,12 @@ def config_servers(self): from ..v2020_11_01_preview.aio.operations import ConfigServersOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import ConfigServersOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import ConfigServersOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import ConfigServersOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'config_servers'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property - def configuration_services(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`ConfigurationServicesOperations` - """ - api_version = self._get_api_version('configuration_services') - if api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import ConfigurationServicesOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'configuration_services'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property def custom_domains(self): """Instance depends on the API version: @@ -257,7 +218,7 @@ def custom_domains(self): * 2020-07-01: :class:`CustomDomainsOperations` * 2020-11-01-preview: :class:`CustomDomainsOperations` * 2021-06-01-preview: :class:`CustomDomainsOperations` - * 2022-05-01-preview: :class:`CustomDomainsOperations` + * 2021-09-01-preview: :class:`CustomDomainsOperations` """ api_version = self._get_api_version('custom_domains') if api_version == '2019-05-01-preview': @@ -268,8 +229,8 @@ def custom_domains(self): from ..v2020_11_01_preview.aio.operations import CustomDomainsOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import CustomDomainsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import CustomDomainsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import CustomDomainsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'custom_domains'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -282,7 +243,7 @@ def deployments(self): * 2020-07-01: :class:`DeploymentsOperations` * 2020-11-01-preview: :class:`DeploymentsOperations` * 2021-06-01-preview: :class:`DeploymentsOperations` - * 2022-05-01-preview: :class:`DeploymentsOperations` + * 2021-09-01-preview: :class:`DeploymentsOperations` """ api_version = self._get_api_version('deployments') if api_version == '2019-05-01-preview': @@ -293,8 +254,8 @@ def deployments(self): from ..v2020_11_01_preview.aio.operations import DeploymentsOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import DeploymentsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import DeploymentsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import DeploymentsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'deployments'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -306,7 +267,7 @@ def monitoring_settings(self): * 2020-07-01: :class:`MonitoringSettingsOperations` * 2020-11-01-preview: :class:`MonitoringSettingsOperations` * 2021-06-01-preview: :class:`MonitoringSettingsOperations` - * 2022-05-01-preview: :class:`MonitoringSettingsOperations` + * 2021-09-01-preview: :class:`MonitoringSettingsOperations` """ api_version = self._get_api_version('monitoring_settings') if api_version == '2020-07-01': @@ -315,8 +276,8 @@ def monitoring_settings(self): from ..v2020_11_01_preview.aio.operations import MonitoringSettingsOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import MonitoringSettingsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import MonitoringSettingsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import MonitoringSettingsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'monitoring_settings'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -329,7 +290,7 @@ def operations(self): * 2020-07-01: :class:`Operations` * 2020-11-01-preview: :class:`Operations` * 2021-06-01-preview: :class:`Operations` - * 2022-05-01-preview: :class:`Operations` + * 2021-09-01-preview: :class:`Operations` """ api_version = self._get_api_version('operations') if api_version == '2019-05-01-preview': @@ -340,8 +301,8 @@ def operations(self): from ..v2020_11_01_preview.aio.operations import Operations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import Operations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import Operations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import Operations as OperationClass else: raise ValueError("API version {} does not have operation group 'operations'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -354,7 +315,7 @@ def runtime_versions(self): * 2020-07-01: :class:`RuntimeVersionsOperations` * 2020-11-01-preview: :class:`RuntimeVersionsOperations` * 2021-06-01-preview: :class:`RuntimeVersionsOperations` - * 2022-05-01-preview: :class:`RuntimeVersionsOperations` + * 2021-09-01-preview: :class:`RuntimeVersionsOperations` """ api_version = self._get_api_version('runtime_versions') if api_version == '2019-05-01-preview': @@ -365,38 +326,12 @@ def runtime_versions(self): from ..v2020_11_01_preview.aio.operations import RuntimeVersionsOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import RuntimeVersionsOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import RuntimeVersionsOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import RuntimeVersionsOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'runtime_versions'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property - def service(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`ServiceOperations` - """ - api_version = self._get_api_version('service') - if api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import ServiceOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'service'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - - @property - def service_registries(self): - """Instance depends on the API version: - - * 2022-05-01-preview: :class:`ServiceRegistriesOperations` - """ - api_version = self._get_api_version('service_registries') - if api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import ServiceRegistriesOperations as OperationClass - else: - raise ValueError("API version {} does not have operation group 'service_registries'".format(api_version)) - return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property def services(self): """Instance depends on the API version: @@ -405,7 +340,7 @@ def services(self): * 2020-07-01: :class:`ServicesOperations` * 2020-11-01-preview: :class:`ServicesOperations` * 2021-06-01-preview: :class:`ServicesOperations` - * 2022-05-01-preview: :class:`ServicesOperations` + * 2021-09-01-preview: :class:`ServicesOperations` """ api_version = self._get_api_version('services') if api_version == '2019-05-01-preview': @@ -416,8 +351,8 @@ def services(self): from ..v2020_11_01_preview.aio.operations import ServicesOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import ServicesOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import ServicesOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import ServicesOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'services'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) @@ -442,7 +377,7 @@ def skus(self): * 2020-07-01: :class:`SkusOperations` * 2020-11-01-preview: :class:`SkusOperations` * 2021-06-01-preview: :class:`SkusOperations` - * 2022-05-01-preview: :class:`SkusOperations` + * 2021-09-01-preview: :class:`SkusOperations` """ api_version = self._get_api_version('skus') if api_version == '2020-07-01': @@ -451,12 +386,25 @@ def skus(self): from ..v2020_11_01_preview.aio.operations import SkusOperations as OperationClass elif api_version == '2021-06-01-preview': from ..v2021_06_01_preview.aio.operations import SkusOperations as OperationClass - elif api_version == '2022-05-01-preview': - from ..v2022_05_01_preview.aio.operations import SkusOperations as OperationClass + elif api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import SkusOperations as OperationClass else: raise ValueError("API version {} does not have operation group 'skus'".format(api_version)) return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property + def storages(self): + """Instance depends on the API version: + + * 2021-09-01-preview: :class:`StoragesOperations` + """ + api_version = self._get_api_version('storages') + if api_version == '2021-09-01-preview': + from ..v2021_09_01_preview.aio.operations import StoragesOperations as OperationClass + else: + raise ValueError("API version {} does not have operation group 'storages'".format(api_version)) + return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + async def close(self): await self._client.close() async def __aenter__(self): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models.py index 8e0cc5fe573..81e6462e7e0 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models.py @@ -1285,6 +1285,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2019_05_01_preview.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1298,6 +1300,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1315,6 +1318,7 @@ def __init__( self.supported_time_grain_types = kwargs.get('supported_time_grain_types', None) self.fill_gap_with_zero = kwargs.get('fill_gap_with_zero', None) self.dimensions = kwargs.get('dimensions', None) + self.source_mdm_namespace = kwargs.get('source_mdm_namespace', None) class NameAvailability(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models_py3.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models_py3.py index 2538ba5505b..7afe41afaa2 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models_py3.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2019_05_01_preview/models/_models_py3.py @@ -1408,6 +1408,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2019_05_01_preview.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1421,6 +1423,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1436,6 +1439,7 @@ def __init__( supported_time_grain_types: Optional[List[str]] = None, fill_gap_with_zero: Optional[bool] = None, dimensions: Optional[List["MetricDimension"]] = None, + source_mdm_namespace: Optional[str] = None, **kwargs ): super(MetricSpecification, self).__init__(**kwargs) @@ -1449,6 +1453,7 @@ def __init__( self.supported_time_grain_types = supported_time_grain_types self.fill_gap_with_zero = fill_gap_with_zero self.dimensions = dimensions + self.source_mdm_namespace = source_mdm_namespace class NameAvailability(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models.py index 10db354c88f..9428d8d29e6 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models.py @@ -1353,6 +1353,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2020_07_01.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1366,6 +1368,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1383,6 +1386,7 @@ def __init__( self.supported_time_grain_types = kwargs.get('supported_time_grain_types', None) self.fill_gap_with_zero = kwargs.get('fill_gap_with_zero', None) self.dimensions = kwargs.get('dimensions', None) + self.source_mdm_namespace = kwargs.get('source_mdm_namespace', None) class MonitoringSettingProperties(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models_py3.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models_py3.py index 1d9493a9481..b1dad0b57a2 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models_py3.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_07_01/models/_models_py3.py @@ -1482,6 +1482,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2020_07_01.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1495,6 +1497,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1510,6 +1513,7 @@ def __init__( supported_time_grain_types: Optional[List[str]] = None, fill_gap_with_zero: Optional[bool] = None, dimensions: Optional[List["MetricDimension"]] = None, + source_mdm_namespace: Optional[str] = None, **kwargs ): super(MetricSpecification, self).__init__(**kwargs) @@ -1523,6 +1527,7 @@ def __init__( self.supported_time_grain_types = supported_time_grain_types self.fill_gap_with_zero = fill_gap_with_zero self.dimensions = dimensions + self.source_mdm_namespace = source_mdm_namespace class MonitoringSettingProperties(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models.py index 6a3b321f02f..1b64478e417 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models.py @@ -1388,6 +1388,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2020_11_01_preview.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1401,6 +1403,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1418,6 +1421,7 @@ def __init__( self.supported_time_grain_types = kwargs.get('supported_time_grain_types', None) self.fill_gap_with_zero = kwargs.get('fill_gap_with_zero', None) self.dimensions = kwargs.get('dimensions', None) + self.source_mdm_namespace = kwargs.get('source_mdm_namespace', None) class MonitoringSettingProperties(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models_py3.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models_py3.py index ad133e58850..e8b893255fd 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models_py3.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2020_11_01_preview/models/_models_py3.py @@ -1518,6 +1518,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2020_11_01_preview.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1531,6 +1533,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1546,6 +1549,7 @@ def __init__( supported_time_grain_types: Optional[List[str]] = None, fill_gap_with_zero: Optional[bool] = None, dimensions: Optional[List["MetricDimension"]] = None, + source_mdm_namespace: Optional[str] = None, **kwargs ): super(MetricSpecification, self).__init__(**kwargs) @@ -1559,6 +1563,7 @@ def __init__( self.supported_time_grain_types = supported_time_grain_types self.fill_gap_with_zero = fill_gap_with_zero self.dimensions = dimensions + self.source_mdm_namespace = source_mdm_namespace class MonitoringSettingProperties(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models.py index fb280e03553..7b45b3b5041 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models.py @@ -1459,6 +1459,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2021_06_01_preview.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1472,6 +1474,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1489,6 +1492,7 @@ def __init__( self.supported_time_grain_types = kwargs.get('supported_time_grain_types', None) self.fill_gap_with_zero = kwargs.get('fill_gap_with_zero', None) self.dimensions = kwargs.get('dimensions', None) + self.source_mdm_namespace = kwargs.get('source_mdm_namespace', None) class MonitoringSettingProperties(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models_py3.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models_py3.py index 7e160475ded..abec200ca32 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models_py3.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_06_01_preview/models/_models_py3.py @@ -1599,6 +1599,8 @@ class MetricSpecification(msrest.serialization.Model): :type fill_gap_with_zero: bool :param dimensions: Dimensions of the metric. :type dimensions: list[~azure.mgmt.appplatform.v2021_06_01_preview.models.MetricDimension] + :param source_mdm_namespace: Name of the MDM namespace. Optional. + :type source_mdm_namespace: str """ _attribute_map = { @@ -1612,6 +1614,7 @@ class MetricSpecification(msrest.serialization.Model): 'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'}, 'fill_gap_with_zero': {'key': 'fillGapWithZero', 'type': 'bool'}, 'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'}, + 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, } def __init__( @@ -1627,6 +1630,7 @@ def __init__( supported_time_grain_types: Optional[List[str]] = None, fill_gap_with_zero: Optional[bool] = None, dimensions: Optional[List["MetricDimension"]] = None, + source_mdm_namespace: Optional[str] = None, **kwargs ): super(MetricSpecification, self).__init__(**kwargs) @@ -1640,6 +1644,7 @@ def __init__( self.supported_time_grain_types = supported_time_grain_types self.fill_gap_with_zero = fill_gap_with_zero self.dimensions = dimensions + self.source_mdm_namespace = source_mdm_namespace class MonitoringSettingProperties(msrest.serialization.Model): diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models.py index 4205a8c4244..f35ad250814 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models.py @@ -307,8 +307,8 @@ class CustomPersistentDiskProperties(msrest.serialization.Model): :type type: str :param mount_path: Required. The mount path of the persistent disk. :type mount_path: str - :param read_only: Indicates whether the persistent disk is a readOnly one. - :type read_only: bool + :param readonly: Indicates whether the persistent disk is a readonly one. + :type readonly: bool :param mount_options: These are the mount options for a persistent disk. :type mount_options: list[str] """ @@ -321,7 +321,7 @@ class CustomPersistentDiskProperties(msrest.serialization.Model): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, 'mount_path': {'key': 'mountPath', 'type': 'str'}, - 'read_only': {'key': 'readOnly', 'type': 'bool'}, + 'readonly': {'key': 'readonly', 'type': 'bool'}, 'mount_options': {'key': 'mountOptions', 'type': '[str]'}, } @@ -336,7 +336,7 @@ def __init__( super(CustomPersistentDiskProperties, self).__init__(**kwargs) self.type = None # type: Optional[str] self.mount_path = kwargs['mount_path'] - self.read_only = kwargs.get('read_only', None) + self.readonly = kwargs.get('readonly', None) self.mount_options = kwargs.get('mount_options', None) @@ -350,8 +350,8 @@ class AzureFileVolume(CustomPersistentDiskProperties): :type type: str :param mount_path: Required. The mount path of the persistent disk. :type mount_path: str - :param read_only: Indicates whether the persistent disk is a readOnly one. - :type read_only: bool + :param readonly: Indicates whether the persistent disk is a readonly one. + :type readonly: bool :param mount_options: These are the mount options for a persistent disk. :type mount_options: list[str] :param share_name: Required. The share name of the Azure File share. @@ -367,7 +367,7 @@ class AzureFileVolume(CustomPersistentDiskProperties): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, 'mount_path': {'key': 'mountPath', 'type': 'str'}, - 'read_only': {'key': 'readOnly', 'type': 'bool'}, + 'readonly': {'key': 'readonly', 'type': 'bool'}, 'mount_options': {'key': 'mountOptions', 'type': '[str]'}, 'share_name': {'key': 'shareName', 'type': 'str'}, } diff --git a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models_py3.py b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models_py3.py index 39037aa215d..acdab220689 100644 --- a/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models_py3.py +++ b/src/spring-cloud/azext_spring_cloud/vendored_sdks/appplatform/v2021_09_01_preview/models/_models_py3.py @@ -332,8 +332,8 @@ class CustomPersistentDiskProperties(msrest.serialization.Model): :type type: str :param mount_path: Required. The mount path of the persistent disk. :type mount_path: str - :param read_only: Indicates whether the persistent disk is a readOnly one. - :type read_only: bool + :param readonly: Indicates whether the persistent disk is a readonly one. + :type readonly: bool :param mount_options: These are the mount options for a persistent disk. :type mount_options: list[str] """ @@ -346,7 +346,7 @@ class CustomPersistentDiskProperties(msrest.serialization.Model): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, 'mount_path': {'key': 'mountPath', 'type': 'str'}, - 'read_only': {'key': 'readOnly', 'type': 'bool'}, + 'readonly': {'key': 'readonly', 'type': 'bool'}, 'mount_options': {'key': 'mountOptions', 'type': '[str]'}, } @@ -358,14 +358,14 @@ def __init__( self, *, mount_path: str, - read_only: Optional[bool] = None, + readonly: Optional[bool] = None, mount_options: Optional[List[str]] = None, **kwargs ): super(CustomPersistentDiskProperties, self).__init__(**kwargs) self.type = None # type: Optional[str] self.mount_path = mount_path - self.read_only = read_only + self.readonly = readonly self.mount_options = mount_options @@ -379,8 +379,8 @@ class AzureFileVolume(CustomPersistentDiskProperties): :type type: str :param mount_path: Required. The mount path of the persistent disk. :type mount_path: str - :param read_only: Indicates whether the persistent disk is a readOnly one. - :type read_only: bool + :param readonly: Indicates whether the persistent disk is a readonly one. + :type readonly: bool :param mount_options: These are the mount options for a persistent disk. :type mount_options: list[str] :param share_name: Required. The share name of the Azure File share. @@ -396,7 +396,7 @@ class AzureFileVolume(CustomPersistentDiskProperties): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, 'mount_path': {'key': 'mountPath', 'type': 'str'}, - 'read_only': {'key': 'readOnly', 'type': 'bool'}, + 'readonly': {'key': 'readonly', 'type': 'bool'}, 'mount_options': {'key': 'mountOptions', 'type': '[str]'}, 'share_name': {'key': 'shareName', 'type': 'str'}, } @@ -406,11 +406,11 @@ def __init__( *, mount_path: str, share_name: str, - read_only: Optional[bool] = None, + readonly: Optional[bool] = None, mount_options: Optional[List[str]] = None, **kwargs ): - super(AzureFileVolume, self).__init__(mount_path=mount_path, read_only=read_only, mount_options=mount_options, **kwargs) + super(AzureFileVolume, self).__init__(mount_path=mount_path, readonly=readonly, mount_options=mount_options, **kwargs) self.type = 'AzureFileVolume' # type: str self.share_name = share_name