remove passerelle specific hobo_deploy (#14413)

useless after #12391: passerelle now always trust services from
settings.KNOWN_SERVICES
This commit is contained in:
Thomas NOËL 2016-12-21 15:46:27 +01:00
parent 014ac7597f
commit 3654e88f5b
7 changed files with 0 additions and 55 deletions

View File

@ -1,6 +0,0 @@
from django.apps import AppConfig
class PasserelleAgentConfig(AppConfig):
name = 'hobo.agent.passerelle'
label = 'passerelle_agent'
verbose_name = 'Passerelle Agent'

View File

@ -1,33 +0,0 @@
import urlparse
from tenant_schemas.utils import tenant_context
from hobo.agent.common.management.commands import hobo_deploy
from hobo.multitenant.settings_loaders import KnownServices
from passerelle.base.models import ApiUser
class Command(hobo_deploy.Command):
help = 'Deploy multitenant passerelle service from hobo'
def deploy_specifics(self, hobo_environment, tenant):
super(Command, self).deploy_specifics(hobo_environment, tenant)
with tenant_context(tenant):
services = hobo_environment.get('services')
for service in services:
if service.get('this'):
this = service
break
else:
raise RuntimeError('unable to find this service')
our_key = this['secret_key']
for service in services:
if service.get('this') or not service.get('secret_key'):
continue
domain = urlparse.urlparse(service.get('base_url')).netloc.split(':')[0]
obj, created = ApiUser.objects.get_or_create(username=domain,
keytype='SIGN')
obj.fullname = service.get('title')
their_key = service.get('secret_key')
obj.key = KnownServices.shared_secret(our_key, their_key)
obj.save()

View File

@ -20,6 +20,3 @@ LOGGING['loggers']['suds'] = {
'handlers': ['mail_admins', 'sentry'],
'propagate': True,
}
# Add passerelle hobo agent
INSTALLED_APPS = ('hobo.agent.passerelle',) + INSTALLED_APPS

View File

@ -1,17 +1,12 @@
import json
import sys
import time
from tenant_schemas.utils import tenant_context
from hobo.multitenant.middleware import TenantMiddleware
from django.core.management import call_command
import StringIO
def test_deploy_specifics(db, tenant_base):
from django.conf import settings
from passerelle.base.models import ApiUser
hobo_json = {
'variables': {
'hobo_test_variable': True,
@ -47,11 +42,3 @@ def test_deploy_specifics(db, tenant_base):
sys.stdin = old_stdin
assert len(list(TenantMiddleware.get_tenants())) == 1
tenant = next(TenantMiddleware.get_tenants())
with tenant_context(tenant):
# There is a 3 seconds cache now, hobo.json could be outdated
settings.clear_tenants_settings()
other = settings.KNOWN_SERVICES['wcs']['other']
secret = other['secret']
assert ApiUser.objects.filter(username=other['verif_orig'], keytype='SIGN',
key=secret).count() == 1