Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/devcenter/azext_devcenter/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ def validate_repo_git(ado_git, git_hub):


def validate_pool_create(
virtual_network_type, network_connection_name, managed_virtual_network_regions
virtual_network_type, network_connection_name, managed_virtual_network_regions,
devbox_definition_image_reference, devbox_definition_sku, devbox_definition_type, devbox_definition_name
):
if (
not has_value(managed_virtual_network_regions)
Expand All @@ -57,6 +58,18 @@ def validate_pool_create(
error_message = """When virtual-network-type is not used or set to "Unmanaged", \
managed virtual network regions (--managed-virtual-network-regions) should not be set."""
raise RequiredArgumentMissingError(error_message)
if has_value(devbox_definition_type) and devbox_definition_type == "Value" and (
not has_value(devbox_definition_image_reference) or not has_value(devbox_definition_sku)
):
error_message = """When devbox-definition-type is set to "Value", \
dev box definition sku (--devbox-definition-sku) and image reference \
(--devbox-definition-image-reference) should be set."""
raise RequiredArgumentMissingError(error_message)
if (not has_value(devbox_definition_type) or devbox_definition_type == "Reference") and \
not has_value(devbox_definition_name):
error_message = """When devbox-definition-type is set to "Reference" or not provided, \
dev box definition name (--devbox-definition-name) should be set."""
raise RequiredArgumentMissingError(error_message)


# Data plane
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class Create(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -164,7 +164,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down Expand Up @@ -279,4 +279,4 @@ class _CreateHelper:
"""Helper class for Create"""


__all__ = ["Create"]
__all__ = ["Create"]
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ class Delete(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -163,7 +163,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand All @@ -180,4 +180,4 @@ class _DeleteHelper:
"""Helper class for Delete"""


__all__ = ["Delete"]
__all__ = ["Delete"]
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ class List(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/projects/{}/attachednetworks", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks", "2024-10-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/projects/{}/attachednetworks", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -143,7 +143,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down Expand Up @@ -295,7 +295,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ class Show(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/projects/{}/attachednetworks/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/attachednetworks/{}", "2024-10-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/projects/{}/attachednetworks/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -154,7 +154,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down Expand Up @@ -298,7 +298,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class Connect(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/connect", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/connect", "2024-10-01-preview"],
]
}

Expand All @@ -46,7 +46,7 @@ def _build_arguments_schema(cls, *args, **kwargs):

_args_schema = cls._args_schema
_args_schema.catalog_name = AAZStrArg(
options=["-n", "--name", "--catalog-name"],
options=["--catalog-name"],
help="The name of the catalog.",
required=True,
id_part="child_name_1",
Expand Down Expand Up @@ -153,7 +153,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class Create(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -224,7 +224,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ class Delete(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -163,7 +163,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand All @@ -180,4 +180,4 @@ class _DeleteHelper:
"""Helper class for Delete"""


__all__ = ["Delete"]
__all__ = ["Delete"]
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class GetSyncErrorDetail(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/getsyncerrordetails", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/getsyncerrordetails", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -140,7 +140,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class List(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -126,7 +126,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class Show(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -140,7 +140,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class Sync(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/sync", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/sync", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -153,7 +153,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class Update(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -234,7 +234,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down Expand Up @@ -337,7 +337,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Wait(AAZWaitCommand):

_aaz_info = {
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -136,7 +136,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class GetErrorDetail(AAZCommand):
"""

_aaz_info = {
"version": "2024-05-01-preview",
"version": "2024-10-01-preview",
"resources": [
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/tasks/{}/geterrordetails", "2024-05-01-preview"],
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.devcenter/devcenters/{}/catalogs/{}/tasks/{}/geterrordetails", "2024-10-01-preview"],
]
}

Expand Down Expand Up @@ -155,7 +155,7 @@ def url_parameters(self):
def query_parameters(self):
parameters = {
**self.serialize_query_param(
"api-version", "2024-05-01-preview",
"api-version", "2024-10-01-preview",
required=True,
),
}
Expand Down
Loading