Skip to content

Commit

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



Co-authored-by: Mathieu Leplatre <mathieu@mozilla.com>
  • Loading branch information
bors[bot] and leplatrem committed Dec 2, 2021
2 parents b173d6e + 7f51e02 commit 8f28b52
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
4 changes: 0 additions & 4 deletions normandy/recipes/exports.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ def check_config(self):
if "signer" in capabilities:
signer_config = capabilities["signer"]

# Since we use the rollback feature, make sure it's available.
if signer_config["version"] < "5.1.0":
raise ImproperlyConfigured("kinto-signer 5.1.0+ is required")

normandy_resource = [
r
for r in signer_config["resources"]
Expand Down
12 changes: 0 additions & 12 deletions normandy/recipes/tests/test_exports.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,18 +152,6 @@ def test_check_connection(self, rs_settings, requestsmock):
# restore write permissions
requestsmock.get(collection_url, json=allow_write_payload)

# Signer version should be >= 5.1.0.
requestsmock.get(
f"{rs_settings.REMOTE_SETTINGS_URL}/",
json={
"user": {"id": f"account:{rs_settings.REMOTE_SETTINGS_USERNAME}"},
"capabilities": {"signer": {"version": "5.0.0"}},
},
)
with pytest.raises(ImproperlyConfigured) as exc:
exports.RemoteSettings().check_config()
assert "kinto-signer 5.1.0+ is required" in str(exc.value)

# Capabilities collection review should be explicitly disabled.
requestsmock.get(
f"{rs_settings.REMOTE_SETTINGS_URL}/",
Expand Down

0 comments on commit 8f28b52

Please sign in to comment.