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

Fix dockerfile being able to pass in params

Browse source 
Change config directory to local config_app one
This commit is contained in:
Sam Chow 2018-06-04 14:14:19 -04:00
parent acf242f241
commit 13293ecdea
14 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
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, verify_not_prod, nickname, validate_json_request
from config_app.c_app import app, config_provider, superusers, OVERRIDE_CONFIG_DIRECTORY
from config_app.c_app import app, config_provider, superusers, OVERRIDE_CONFIG_DIRECTORY, ip_resolver
from auth.auth_context import get_authenticated_user
from data.users import get_federated_service_name, get_users_handler
@ -15,8 +15,7 @@ from data.database import configure
from data.runmigration import run_alembic_migration
from util.config.configutil import add_enterprise_config_defaults
from util.config.database import sync_database_with_config
# TODO(config) re-add this import when we get the app extracted from validators
# from util.config.validator import validate_service_for_config
from util.config.validator import validate_service_for_config, ValidatorContext
logger = logging.getLogger(__name__)
@ -64,9 +63,6 @@ class SuperUserConfig(ApiResource):
def get(self):
""" Returns the currently defined configuration, if any. """
config_object = config_provider.get_config()
logger.debug(config_object)
logger.debug(config_provider)
# Todo: do we even need this endpoint? Since we'll be loading the config in browser
return {
'config': config_object
}
@ -350,6 +346,10 @@ class SuperUserConfigValidate(ApiResource):
# if not config_provider.config_exists() or SuperUserPermission().can():
if not config_provider.config_exists():
config = request.get_json()['config']
return validate_service_for_config(service, config, request.get_json().get('password', ''))
validator_context = ValidatorContext.from_app(app, config, request.get_json().get('password', ''),
ip_resolver=ip_resolver,
config_provider=config_provider)
return validate_service_for_config(service, validator_context)
abort(403)