Skip to content

Commit

Permalink
Merge #2335
Browse files Browse the repository at this point in the history
2335: Remove check about Remote Settings group_check_enabled r=tiftran a=leplatrem

From kinto-dist >= 27, we don't offer the possibility to disable the group check on a particular collection. Hence, there's no need to check it anymore (the field will always be `true`).

Plus, the check in this code was wrong, it was raising `Review was not disabled ...` when the `group_check_enabled` field was `True`

Co-authored-by: Mathieu Leplatre <mathieu@mozilla.com>
  • Loading branch information
bors[bot] and leplatrem authored Jan 19, 2022
2 parents de9221f + b66fb22 commit 5bc0c21
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
10 changes: 2 additions & 8 deletions normandy/recipes/exports.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,8 @@ def check_config(self):
for r in signer_config["resources"]
if r["source"]["bucket"] == bucket and r["source"]["collection"] == collection
]
review_disabled = (
len(normandy_resource) == 1
and not normandy_resource[0].get(
"to_review_enabled", signer_config["to_review_enabled"]
)
and not normandy_resource[0].get(
"group_check_enabled", signer_config["group_check_enabled"]
)
review_disabled = len(normandy_resource) == 1 and not normandy_resource[0].get(
"to_review_enabled", signer_config["to_review_enabled"]
)
if not review_disabled:
raise ImproperlyConfigured(
Expand Down
1 change: 0 additions & 1 deletion normandy/recipes/tests/test_exports.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ def test_check_connection(self, rs_settings, requestsmock):
"collection": "normandy-recipes-capabilities",
},
"to_review_enabled": False,
"group_check_enabled": False,
},
],
}
Expand Down

0 comments on commit 5bc0c21

Please sign in to comment.