Skip to content

fix!: require attribute and amount names to be unique #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crowecawcaw wants to merge 1 commit into
base: mainline
Choose a base branch
from
Open

fix!: require attribute and amount names to be unique #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/openjd/model/v2023_09/_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2579,7 +2579,7 @@ def _validate_amounts(
return v
if len(v) == 0:
raise ValueError("List must contain at least one element or not be defined.")
return v
return validate_unique_elements(v, item_value=lambda v: v.name.lower(), property="name")

@field_validator("attributes")
@classmethod
Expand All @@ -2590,7 +2590,7 @@ def _validate_attributes(
return v
if len(v) == 0:
raise ValueError("List must contain at least one element or not be defined.")
return v
return validate_unique_elements(v, item_value=lambda v: v.name.lower(), property="name")

@model_validator(mode="after")
def _validate(self) -> Self:
Expand Down
70 changes: 61 additions & 9 deletions test/openjd/model/v2023_09/test_step_host_requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,24 +457,26 @@ def test_parse_success(self, data: dict[str, Any]) -> None:
# no exception was raised.

@pytest.mark.parametrize(
"data,error_count",
"data,error_count,error_loc",
[
pytest.param({}, 1, id="missing amounts & attributes"),
pytest.param({"unknown": "value"}, 1, id="unknown field"),
pytest.param({"amounts": []}, 1, id="too few amounts"),
pytest.param({"attributes": []}, 1, id="too few attributes"),
pytest.param({}, 1, (), id="missing amounts & attributes"),
pytest.param({"unknown": "value"}, 1, ("unknown",), id="unknown field"),
pytest.param({"amounts": []}, 1, ("amounts",), id="too few amounts"),
pytest.param({"attributes": []}, 1, ("attributes",), id="too few attributes"),
pytest.param(
{"amounts": [{"name": f"amount.mycap{i}", "min": 1} for i in range(0, 51)]},
1,
(),
id="too many as only amounts",
),
pytest.param(
{
"attributes": [
{"name": f"attr.mycap{i}|", "anyOf": ["foo"]} for i in range(0, 51)
{"name": f"attr.mycap{i}", "anyOf": ["foo"]} for i in range(0, 51)
]
},
1,
(),
id="too many as only attributes",
),
pytest.param(
Expand All @@ -485,16 +487,66 @@ def test_parse_success(self, data: dict[str, Any]) -> None:
],
},
1,
(),
id="too many as combination",
),
pytest.param(
{
"amounts": [
{"name": "amount.mycap", "min": 1},
{"name": "amount.mycap", "min": 2},
]
},
1,
("amounts",),
id="duplicate amount names",
),
pytest.param(
{
"amounts": [
{"name": "amount.mycap", "min": 1},
{"name": "amount.MYCAP", "min": 2},
]
},
1,
("amounts",),
id="duplicate amount names case insensitive",
),
pytest.param(
{
"attributes": [
{"name": "attr.mycap", "anyOf": ["foo"]},
{"name": "attr.mycap", "anyOf": ["bar"]},
]
},
1,
("attributes",),
id="duplicate attribute names",
),
pytest.param(
{
"attributes": [
{"name": "attr.mycap", "anyOf": ["foo"]},
{"name": "attr.MYCAP", "anyOf": ["bar"]},
]
},
1,
("attributes",),
id="duplicate attribute names case insensitive",
),
],
)
def test_parse_fails(self, data: dict[str, Any], error_count: int) -> None:
# Failure case testing for Open Job Description AmountRequirementTemplate.
def test_parse_fails(self, data: dict[str, Any], error_count: int, error_loc: tuple) -> None:
# Failure case testing for Open Job Description HostRequirementsTemplate.

# WHEN
with pytest.raises(ValidationError) as excinfo:
_parse_model(model=AmountRequirementTemplate, obj=data)
_parse_model(model=HostRequirementsTemplate, obj=data)

# THEN
assert len(excinfo.value.errors()) == error_count, str(excinfo.value)
if error_loc:
actual_loc = excinfo.value.errors()[0]["loc"]
assert (
actual_loc[: len(error_loc)] == error_loc
), f"Expected {error_loc}, got {actual_loc}"
Loading