Skip to content
Open
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
1 change: 1 addition & 0 deletions examples/template/otterdog-defaults.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ local newEnvironment(name) = {
name: name,
wait_timer: 0,
reviewers: [],
prevent_self_review: false,
# Can be one of: all, protected_branches, branch_policies
deployment_branch_policy: "all",
branch_policies: [],
Expand Down
1 change: 1 addition & 0 deletions otterdog/models/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Environment(ModelObject):
name: str = dataclasses.field(metadata={"key": True})
wait_timer: int
reviewers: list[str]
prevent_self_review: bool
deployment_branch_policy: str
branch_policies: list[str]

Expand Down
1 change: 1 addition & 0 deletions otterdog/resources/schemas/environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"type": "array",
"items": { "type": "string" }
},
"prevent_self_review": { "type": "boolean" },
"deployment_branch_policy": { "type": "string" },
"branch_policies": {
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions tests/models/resources/github-environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"created_at": "2023-06-13T20:40:38Z",
"updated_at": "2023-06-21T11:58:31Z",
"can_admins_bypass": true,
"prevent_self_review": true,
"protection_rules": [
{
"id": 9174563,
Expand Down
1 change: 1 addition & 0 deletions tests/models/resources/otterdog-environment.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"@netomi",
"@OtterdogTest/eclipsefdn-security"
],
"prevent_self_review": true,
"deployment_branch_policy": "selected",
"branch_policies": [
"main",
Expand Down
5 changes: 4 additions & 1 deletion tests/models/test_environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def test_load_from_model(self):
assert env.name == "linux"
assert env.wait_timer == 15
assert env.reviewers == ["@netomi", "@OtterdogTest/eclipsefdn-security"]
assert env.prevent_self_review is True
assert env.deployment_branch_policy == "selected"
assert env.branch_policies == ["main", "develop/*"]

Expand All @@ -52,6 +53,7 @@ def test_load_from_provider(self):
assert env.name == "linux"
assert env.wait_timer == 15
assert env.reviewers == ["@netomi", "@OtterdogTest/eclipsefdn-security"]
assert env.prevent_self_review is True
assert env.deployment_branch_policy == "selected"
assert env.branch_policies == ["main", "develop/*"]

Expand All @@ -60,8 +62,9 @@ async def test_to_provider(self):

provider_data = await env.to_provider_data(self.org_id, self.provider)

assert len(provider_data) == 5
assert len(provider_data) == 6
assert provider_data["wait_timer"] == 15
assert provider_data["prevent_self_review"] is True

assert query_json("reviewers[0].id", provider_data) == "id_netomi"
assert query_json("reviewers[1].id", provider_data) == "id_OtterdogTest/eclipsefdn-security"
Expand Down