diff --git a/src/devcenter/HISTORY.rst b/src/devcenter/HISTORY.rst index 049e09df393..78fe7efd13e 100644 --- a/src/devcenter/HISTORY.rst +++ b/src/devcenter/HISTORY.rst @@ -2,7 +2,7 @@ Release History =============== -0.2.0 +1.0.0 ++++++ * Update control plane and data plane APIs to v2023-04-01 * Azure Deployment Environments GA release diff --git a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_create.py b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_create.py index 5612a92cd36..3ce1d7eb5d3 100644 --- a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_create.py +++ b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_create.py @@ -95,6 +95,9 @@ def _build_arguments_schema(cls, *args, **kwargs): options=["--domain-password"], arg_group="Properties", help="The password for the account used to join domain.", + blank=AAZPromptInput( + msg="Domain password:", + ), ) _args_schema.domain_username = AAZStrArg( options=["--domain-username"], @@ -102,7 +105,7 @@ def _build_arguments_schema(cls, *args, **kwargs): help="The username of an Active Directory account (user or service account) that has permissions to create computer objects in Active Directory. Required format: admin@contoso.com.", ) _args_schema.networking_resource_group_name = AAZStrArg( - options=["--networking-resource-group-name", "-r"], + options=["-r", "--networking-resource-group-name"], arg_group="Properties", help="The name for resource group where NICs will be placed.", ) diff --git a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_update.py b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_update.py index 6f32267e887..12d0c4ec48e 100644 --- a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_update.py +++ b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/network_connection/_update.py @@ -80,6 +80,9 @@ def _build_arguments_schema(cls, *args, **kwargs): options=["--domain-password"], arg_group="Properties", help="The password for the account used to join domain.", + blank=AAZPromptInput( + msg="Domain password:", + ), ) _args_schema.domain_username = AAZStrArg( options=["--domain-username"], diff --git a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_create.py b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_create.py index 73fd4ff47b7..ce8258ceb76 100644 --- a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_create.py +++ b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_create.py @@ -106,24 +106,6 @@ def _build_arguments_schema(cls, *args, **kwargs): arg_group="Properties", help="Name of a network connection in parent project of this pool.", ) - - #TODO: Uncomment once idle is ready, uncomment other blocks of code below - # _args_schema.stop_on_disconnect = AAZObjectArg( - # options=["--stop-on-disconnect"], - # arg_group="Properties", - # help="Stop on disconnect configuration settings for dev boxes created in this pool.", - # ) - - # stop_on_disconnect = cls._args_schema.stop_on_disconnect - # stop_on_disconnect.grace_period_minutes = AAZIntArg( - # options=["grace-period-minutes"], - # help="The specified time in minutes to wait before stopping a dev box once disconnect is detected.", - # ) - # stop_on_disconnect.status = AAZStrArg( - # options=["status"], - # help="Whether the feature to stop the dev box on disconnect once the grace period has lapsed is enabled.", - # enum={"Disabled": "Disabled", "Enabled": "Enabled"}, - # ) return cls._args_schema def _execute_operations(self): @@ -246,12 +228,6 @@ def content(self): properties.set_prop("licenseType", AAZStrType, ".license_type", typ_kwargs={"flags": {"required": True}}) properties.set_prop("localAdministrator", AAZStrType, ".local_administrator", typ_kwargs={"flags": {"required": True}}) properties.set_prop("networkConnectionName", AAZStrType, ".network_connection_name", typ_kwargs={"flags": {"required": True}}) - # properties.set_prop("stopOnDisconnect", AAZObjectType, ".stop_on_disconnect") - - # stop_on_disconnect = _builder.get(".properties.stopOnDisconnect") - # if stop_on_disconnect is not None: - # stop_on_disconnect.set_prop("gracePeriodMinutes", AAZIntType, ".grace_period_minutes") - # stop_on_disconnect.set_prop("status", AAZStrType, ".status") tags = _builder.get(".tags") if tags is not None: @@ -326,9 +302,9 @@ def _build_schema_on_200_201(cls): serialized_name="provisioningState", flags={"read_only": True}, ) - # properties.stop_on_disconnect = AAZObjectType( - # serialized_name="stopOnDisconnect", - # ) + properties.stop_on_disconnect = AAZObjectType( + serialized_name="stopOnDisconnect", + ) health_status_details = cls._schema_on_200_201.properties.health_status_details health_status_details.Element = AAZObjectType() @@ -341,11 +317,11 @@ def _build_schema_on_200_201(cls): flags={"read_only": True}, ) - # stop_on_disconnect = cls._schema_on_200_201.properties.stop_on_disconnect - # stop_on_disconnect.grace_period_minutes = AAZIntType( - # serialized_name="gracePeriodMinutes", - # ) - # stop_on_disconnect.status = AAZStrType() + stop_on_disconnect = cls._schema_on_200_201.properties.stop_on_disconnect + stop_on_disconnect.grace_period_minutes = AAZIntType( + serialized_name="gracePeriodMinutes", + ) + stop_on_disconnect.status = AAZStrType() system_data = cls._schema_on_200_201.system_data system_data.created_at = AAZStrType( diff --git a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_update.py b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_update.py index ae9792b787a..3a045b2768c 100644 --- a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_update.py +++ b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/pool/_update.py @@ -98,27 +98,6 @@ def _build_arguments_schema(cls, *args, **kwargs): arg_group="Properties", help="Name of a network connection in parent project of this pool.", ) - - #TODO: Uncomment once idle is ready, uncomment out other blocks of code in this file - # _args_schema.stop_on_disconnect = AAZObjectArg( - # options=["--stop-on-disconnect"], - # arg_group="Properties", - # help="Stop on disconnect configuration settings for dev boxes created in this pool.", - # nullable=True, - # ) - - # stop_on_disconnect = cls._args_schema.stop_on_disconnect - # stop_on_disconnect.grace_period_minutes = AAZIntArg( - # options=["grace-period-minutes"], - # help="The specified time in minutes to wait before stopping a dev box once disconnect is detected.", - # nullable=True, - # ) - # stop_on_disconnect.status = AAZStrArg( - # options=["status"], - # help="Whether the feature to stop the dev box on disconnect once the grace period has lapsed is enabled.", - # nullable=True, - # enum={"Disabled": "Disabled", "Enabled": "Enabled"}, - # ) return cls._args_schema def _execute_operations(self): @@ -372,12 +351,6 @@ def _update_instance(self, instance): properties.set_prop("devBoxDefinitionName", AAZStrType, ".dev_box_definition_name", typ_kwargs={"flags": {"required": True}}) properties.set_prop("localAdministrator", AAZStrType, ".local_administrator", typ_kwargs={"flags": {"required": True}}) properties.set_prop("networkConnectionName", AAZStrType, ".network_connection_name", typ_kwargs={"flags": {"required": True}}) - # properties.set_prop("stopOnDisconnect", AAZObjectType, ".stop_on_disconnect") - - # stop_on_disconnect = _builder.get(".properties.stopOnDisconnect") - # if stop_on_disconnect is not None: - # stop_on_disconnect.set_prop("gracePeriodMinutes", AAZIntType, ".grace_period_minutes") - # stop_on_disconnect.set_prop("status", AAZStrType, ".status") tags = _builder.get(".tags") if tags is not None: @@ -463,9 +436,9 @@ def _build_schema_pool_read(cls, _schema): serialized_name="provisioningState", flags={"read_only": True}, ) - # properties.stop_on_disconnect = AAZObjectType( - # serialized_name="stopOnDisconnect", - # ) + properties.stop_on_disconnect = AAZObjectType( + serialized_name="stopOnDisconnect", + ) health_status_details = _schema_pool_read.properties.health_status_details health_status_details.Element = AAZObjectType() @@ -478,11 +451,11 @@ def _build_schema_pool_read(cls, _schema): flags={"read_only": True}, ) - # stop_on_disconnect = _schema_pool_read.properties.stop_on_disconnect - # stop_on_disconnect.grace_period_minutes = AAZIntType( - # serialized_name="gracePeriodMinutes", - # ) - # stop_on_disconnect.status = AAZStrType() + stop_on_disconnect = _schema_pool_read.properties.stop_on_disconnect + stop_on_disconnect.grace_period_minutes = AAZIntType( + serialized_name="gracePeriodMinutes", + ) + stop_on_disconnect.status = AAZStrType() system_data = _schema_pool_read.system_data system_data.created_at = AAZStrType( diff --git a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/project/_update.py b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/project/_update.py index c0f82f5be68..ecf8a11b01d 100644 --- a/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/project/_update.py +++ b/src/devcenter/azext_devcenter/aaz/latest/devcenter/admin/project/_update.py @@ -82,12 +82,6 @@ def _build_arguments_schema(cls, *args, **kwargs): help="Description of the project.", nullable=True, ) - _args_schema.dev_center_id = AAZStrArg( - options=["--dev-center-id"], - arg_group="Properties", - help="Resource ID of an associated dev center.", - nullable=True, - ) _args_schema.max_dev_boxes_per_user = AAZIntArg( options=["--max-dev-boxes-per-user"], arg_group="Properties", @@ -340,7 +334,6 @@ def _update_instance(self, instance): properties = _builder.get(".properties") if properties is not None: properties.set_prop("description", AAZStrType, ".description") - properties.set_prop("devCenterId", AAZStrType, ".dev_center_id") properties.set_prop("maxDevBoxesPerUser", AAZIntType, ".max_dev_boxes_per_user") tags = _builder.get(".tags") diff --git a/src/devcenter/azext_devcenter/azext_metadata.json b/src/devcenter/azext_devcenter/azext_metadata.json index be5de02d927..9169f76980c 100644 --- a/src/devcenter/azext_devcenter/azext_metadata.json +++ b/src/devcenter/azext_devcenter/azext_metadata.json @@ -1,4 +1,4 @@ { - "azext.isPreview": true, - "azext.minCliCoreVersion": "2.45.0" + "azext.isPreview": false, + "azext.minCliCoreVersion": "2.48.0" } \ No newline at end of file diff --git a/src/devcenter/azext_devcenter/vendored_sdks/devcenter/_configuration.py b/src/devcenter/azext_devcenter/vendored_sdks/devcenter/_configuration.py index 2387aa7fb9c..209795f4a43 100644 --- a/src/devcenter/azext_devcenter/vendored_sdks/devcenter/_configuration.py +++ b/src/devcenter/azext_devcenter/vendored_sdks/devcenter/_configuration.py @@ -47,7 +47,7 @@ def __init__( self.credential = credential self.subscription_id = subscription_id - self.api_version = "2022-11-11-preview" + self.api_version = "2023-04-01" self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) kwargs.setdefault('sdk_moniker', 'devcenter/{}'.format(VERSION)) self._configure(**kwargs) diff --git a/src/devcenter/azext_devcenter/versions/2023-01-01-preview/devcenter-0.1.2-py3-none-any.whl b/src/devcenter/azext_devcenter/versions/2023-01-01-preview/devcenter-0.1.2-py3-none-any.whl deleted file mode 100644 index 9c5d31810c5..00000000000 Binary files a/src/devcenter/azext_devcenter/versions/2023-01-01-preview/devcenter-0.1.2-py3-none-any.whl and /dev/null differ diff --git a/src/devcenter/azext_devcenter/versions/2023-04-01/devcenter-0.2.0-py3-none-any.whl b/src/devcenter/azext_devcenter/versions/2023-04-01/devcenter-0.2.0-py3-none-any.whl deleted file mode 100644 index 05850e4f5f6..00000000000 Binary files a/src/devcenter/azext_devcenter/versions/2023-04-01/devcenter-0.2.0-py3-none-any.whl and /dev/null differ diff --git a/src/devcenter/setup.py b/src/devcenter/setup.py index c0a43f53f95..9431221610f 100644 --- a/src/devcenter/setup.py +++ b/src/devcenter/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '0.2.0' +VERSION = '1.0.0' try: from azext_devcenter.manual.version import VERSION except ImportError: @@ -24,9 +24,10 @@ 'Intended Audience :: System Administrators', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ]