openstack
/
keystonemiddleware
Code Issues Proposed changes

Merge "Expect paste.deploy and gnocchi/panko options"

This commit is contained in:
Zuul 2018-10-26 18:29:26 +00:00 committed by Gerrit Code Review
parent fc51082ef4 0c0eae3b1e
commit 55b6142791
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keystonemiddleware/_common/config.py
View File

@ -49,17 +49,18 @@ def _conf_values_type_convert(group_name, all_options, conf):
for k, v in conf.items():
dest = k
try:
if v is not None:
# 'here' and '__file__' come from paste.deploy
# 'configkey' is added by panko and gnocchi
if v is not None and k not in ['here', '__file__', 'configkey']:
type_, dest = opt_types[k]
v = type_(v)
except KeyError: # nosec
# This option is not known to auth_token. v is not converted.
_LOG.warning(
'The option "%s" in conf is not known to auth_token', k)
'The option "%s" is not known to keystonemiddleware', k)
except ValueError as e:
raise exceptions.ConfigurationError(
_('Unable to convert the value of %(key)s option into correct '
'type: %(ex)s') % {'key': k, 'ex': e})
_('Unable to convert the value of option "%(key)s" into '
'correct type: %(ex)s') % {'key': k, 'ex': e})
opts[dest] = v
return opts

2
keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
View File

@ -514,7 +514,7 @@ class GeneralAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
conf = {
'wrong_key': '123'
}
log = 'The option "wrong_key" in conf is not known to auth_token'
log = 'The option "wrong_key" is not known to keystonemiddleware'
auth_token.AuthProtocol(self.fake_app, conf)
self.assertThat(self.logger.output, matchers.Contains(log))