Skip to content
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.

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

fix(stage): Typo prioritzed_rulesets => prioritized_rulesets #93

Merged
merged 2 commits into from
Aug 2, 2024
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
16 changes: 8 additions & 8 deletions src/galileo_protect/stage.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def create_stage(
description: Optional[str] = None,
pause: bool = False,
type: StageType = StageType.local,
prioritzed_rulesets: Optional[Sequence[Ruleset]] = None,
prioritized_rulesets: Optional[Sequence[Ruleset]] = None,
) -> StageResponse:
"""
Create a stage.
Expand All @@ -35,7 +35,7 @@ def create_stage(
Pause the stage, by default False, i.e. the stage is not paused.
type : StageType, optional
Stage type, by default StageType.local.
prioritzed_rulesets : Optional[Sequence[Ruleset]], optional
prioritized_rulesets : Optional[Sequence[Ruleset]], optional
Prioritized rulesets, by default None.

Returns
Expand All @@ -50,7 +50,7 @@ def create_stage(
"""
config = Config.get()
project_id = project_id or config.project_id
prioritzed_rulesets = prioritzed_rulesets or list()
prioritized_rulesets = prioritized_rulesets or list()
if project_id is None:
raise ValueError("Project ID must be provided to create a stage.")
name = name or ts_name("stage")
Expand All @@ -65,7 +65,7 @@ def create_stage(
description=description,
paused=pause,
type=type,
prioritzed_rulesets=prioritzed_rulesets,
prioritized_rulesets=prioritized_rulesets,
)
).model_dump(mode="json"),
)
Expand Down Expand Up @@ -144,7 +144,7 @@ def update_stage(
project_name: Optional[str] = None,
stage_id: Optional[UUID4] = None,
stage_name: Optional[str] = None,
prioritzed_rulesets: Optional[Sequence[Ruleset]] = None,
prioritized_rulesets: Optional[Sequence[Ruleset]] = None,
) -> StageResponse:
"""
Update a stage by ID or name to create a new version.
Expand All @@ -163,7 +163,7 @@ def update_stage(
Stage ID, by default we will try to get it from the config.
stage_name : Optional[str], optional
Stage name, by default we will try to get it from the config.
prioritzed_rulesets : Optional[Sequence[Ruleset]], optional
prioritized_rulesets : Optional[Sequence[Ruleset]], optional
Prioritized rulesets, by default None.

Returns
Expand All @@ -188,12 +188,12 @@ def update_stage(
)
project_id = got_stage.project_id
stage_id = got_stage.id
prioritzed_rulesets = prioritzed_rulesets or list()
prioritized_rulesets = prioritized_rulesets or list()
stage = StageResponse.model_validate(
config.api_client.request(
RequestMethod.POST,
Routes.stage.format(project_id=project_id, stage_id=stage_id),
json=RulesetsMixin.model_validate(dict(prioritzed_rulesets=prioritzed_rulesets)).model_dump(mode="json"),
json=RulesetsMixin.model_validate(dict(prioritized_rulesets=prioritized_rulesets)).model_dump(mode="json"),
)
)
config.project_id = project_id
Expand Down
32 changes: 27 additions & 5 deletions tests/test_stage.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from json import loads
from typing import Callable, List, Union
from uuid import uuid4

Expand Down Expand Up @@ -108,24 +109,35 @@ def test_args_central(
) -> None:
config = set_validated_config()
project_id, stage_id = uuid4(), uuid4()
stage_type = StageType.central
response = StageResponse(
id=stage_id,
name=A_STAGE_NAME,
project_id=project_id,
description=description,
paused=pause,
version=0,
type=StageType.central,
type=stage_type,
)
matcher = mock_request(
RequestMethod.POST,
Routes.stages.format(project_id=project_id),
json=response.model_dump(mode="json"),
)
stage = create_stage(
project_id=project_id, name=A_STAGE_NAME, description=description, pause=pause, prioritzed_rulesets=rulesets
project_id=project_id,
name=A_STAGE_NAME,
description=description,
pause=pause,
type=stage_type,
prioritized_rulesets=rulesets,
)
assert matcher.called
request_content = loads(matcher.calls.last.request.content)
assert request_content["name"] == A_STAGE_NAME
assert request_content["description"] == description
assert request_content["type"] == stage_type
assert request_content["rulesets"] == [ruleset.model_dump() for ruleset in rulesets]
# Verify the config.
assert config.project_id == project_id
assert config.stage_id is not None
Expand Down Expand Up @@ -155,6 +167,7 @@ def test_config_central(
rulesets: List[Ruleset],
) -> None:
project_id, stage_id = uuid4(), uuid4()
stage_type = StageType.central
config = set_validated_config(project_id=project_id)
response = StageResponse(
id=stage_id,
Expand All @@ -163,15 +176,22 @@ def test_config_central(
description=description,
paused=pause,
version=0,
type=StageType.central,
type=stage_type,
)
matcher = mock_request(
RequestMethod.POST,
Routes.stages.format(project_id=project_id),
json=response.model_dump(mode="json"),
)
stage = create_stage(name=A_STAGE_NAME, description=description, pause=pause, prioritzed_rulesets=rulesets)
stage = create_stage(
name=A_STAGE_NAME, description=description, pause=pause, prioritized_rulesets=rulesets, type=stage_type
)
assert matcher.called
request_content = loads(matcher.calls.last.request.content)
assert request_content["name"] == A_STAGE_NAME
assert request_content["description"] == description
assert request_content["type"] == stage_type
assert request_content["rulesets"] == [ruleset.model_dump() for ruleset in rulesets]
# Verify the config.
assert config.project_id == project_id
assert config.stage_id is not None
Expand Down Expand Up @@ -318,8 +338,10 @@ def test_simple(self, rulesets: List[Ruleset], set_validated_config: Callable, m
Routes.stage.format(project_id=project_id, stage_id=stage_id),
json=response.model_dump(mode="json"),
)
stage = update_stage(project_id=project_id, stage_id=stage_id, prioritzed_rulesets=rulesets)
stage = update_stage(project_id=project_id, stage_id=stage_id, prioritized_rulesets=rulesets)
assert matcher.called
request_content = loads(matcher.calls.last.request.content)
assert request_content["rulesets"] == [ruleset.model_dump() for ruleset in rulesets]
assert config.project_id == project_id
assert config.stage_id == stage_id
assert config.stage_name == A_STAGE_NAME
Expand Down
Loading