From 430c184de6f2580f22538d76a187314a1d84d793 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Wed, 14 Aug 2019 22:47:17 +0200 Subject: [PATCH] Revert "agent: redeploy roles when authentic get a new service to manage (#35345)" This reverts commit a1258182235788b7e1a70cbbda5c27775a2dda24. --- hobo/agent/authentic2/management/commands/hobo_deploy.py | 9 --------- tests_authentic/test_hobo_deploy.py | 5 ++--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/hobo/agent/authentic2/management/commands/hobo_deploy.py b/hobo/agent/authentic2/management/commands/hobo_deploy.py index c5dfb5b..4972fe1 100644 --- a/hobo/agent/authentic2/management/commands/hobo_deploy.py +++ b/hobo/agent/authentic2/management/commands/hobo_deploy.py @@ -22,7 +22,6 @@ from django.conf import settings from tenant_schemas.utils import tenant_context from hobo.agent.common.management.commands import hobo_deploy -from hobo.agent.authentic2.provisionning import Provisionning User = get_user_model() @@ -240,14 +239,6 @@ class Command(hobo_deploy.Command): sp_url = service['saml-sp-metadata-url'] self.stderr.write(self.style.WARNING('Error registering %s: %s\n' % (sp_url, last_error))) - if service_created: - # mass provision roles - engine = Provisionning() - roles = get_role_model().objects.all() - ous = {provider.ou.id: provider.ou} - engine.notify_roles(ous, roles, full=True) - - def load_skeleton(self, provider, service_id, template_name, create_ou=False): if not getattr(settings, 'HOBO_SKELETONS_DIR', None): diff --git a/tests_authentic/test_hobo_deploy.py b/tests_authentic/test_hobo_deploy.py index 98b25cb..9762d50 100644 --- a/tests_authentic/test_hobo_deploy.py +++ b/tests_authentic/test_hobo_deploy.py @@ -56,9 +56,9 @@ def test_hobo_deploy(monkeypatch, tenant_base, mocker, skeleton_dir): }, ], roles_json) - # notify_agents is called on service creation, as celery is not running + # As a user is created, notify_agents is called, as celery is not running # we just block it - mock_notify = mocker.patch('hobo.agent.authentic2.provisionning.notify_agents') + mocker.patch('hobo.agent.authentic2.provisionning.notify_agents') requests_get = mocker.patch('requests.get') meta1 = '''