vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix main app migration pathway

Browse source
This commit is contained in:
Sam Chow 2018-06-21 14:48:40 -04:00
parent 561522c6d3
commit aff1a08a83
4 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
config_app/config_endpoints/api/suconfig.py
View file

@ -7,7 +7,7 @@ from flask import abort, request
from config_app.config_endpoints.api.suconfig_models_pre_oci import pre_oci_model as model
from config_app.config_endpoints.api import resource, ApiResource, nickname, validate_json_request
from config_app.c_app import app, config_provider, superusers, OVERRIDE_CONFIG_DIRECTORY, ip_resolver
from config_app.c_app import app, config_provider, superusers, OVERRIDE_CONFIG_DIRECTORY, ip_resolver, instance_keys
from auth.auth_context import get_authenticated_user
from data.users import get_federated_service_name, get_users_handler
@ -181,7 +181,7 @@ class SuperUserSetupDatabase(ApiResource):
log_handler = _AlembicLogHandler()
try:
run_alembic_migration(db_uri, log_handler)
run_alembic_migration(db_uri, log_handler, setup_app=False)
except Exception as ex:
return {
'error': str(ex)
@ -296,8 +296,9 @@ class SuperUserConfigValidate(ApiResource):
if not config_provider.config_exists():
config = request.get_json()['config']
validator_context = ValidatorContext.from_app(app, config, request.get_json().get('password', ''),
ip_resolver=ip_resolver,
config_provider=config_provider)
instance_keys=instance_keys,
ip_resolver=ip_resolver,
config_provider=config_provider)
return validate_service_for_config(service, validator_context)