diff options
author | Zuul <zuul@review.openstack.org> | 2018-04-04 19:05:55 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-04-04 19:05:55 +0000 |
commit | 0b02fe90c677adcb477fd2c5491d0a5a5ae32acb (patch) | |
tree | 217b4c2f8e41cbedcd8bed8e50b8de5c4fd0145f | |
parent | a742c2a77aa6fadbce5e1f9ecb897010dc9df40e (diff) | |
parent | 8e9255d56d2da16a7fec4f57e28246bb5b9cb713 (diff) | |
download | keystonemiddleware-0b02fe90c677adcb477fd2c5491d0a5a5ae32acb.tar.gz |
Merge "Remove kwargs_to_fetch_token"
3 files changed, 7 insertions, 19 deletions
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py index 48140b0..09a7803 100644 --- a/keystonemiddleware/auth_token/__init__.py +++ b/keystonemiddleware/auth_token/__init__.py @@ -215,7 +215,6 @@ object is stored. import binascii import copy import datetime -import warnings from keystoneauth1 import access from keystoneauth1 import adapter @@ -309,12 +308,6 @@ class BaseAuthProtocol(object): perform. """ - # NOTE(jamielennox): Default to True and remove in Queens. This is a - # compatibility flag to allow passing **kwargs to fetch_token(). This - # is basically to allow compatibility with keystone's override. We will - # assume all subclasses are ok with this being True in the Queens release. - kwargs_to_fetch_token = False - def __init__(self, app, log=_LOG, @@ -436,14 +429,7 @@ class BaseAuthProtocol(object): # NOTE(edmondsw): strip the token to remove any whitespace that may # have been passed along in the header per bug 1689468 token = token.strip() - if self.kwargs_to_fetch_token: - data = self.fetch_token(token, **kwargs) - else: - m = _('Implementations of auth_token must set ' - 'kwargs_to_fetch_token this will be the required and ' - 'assumed in Queens.') - warnings.warn(m) - data = self.fetch_token(token) + data = self.fetch_token(token, **kwargs) try: return data, access.create(body=data, auth_token=token) @@ -549,8 +535,6 @@ class AuthProtocol(BaseAuthProtocol): _SIGNING_CERT_FILE_NAME = 'signing_cert.pem' _SIGNING_CA_FILE_NAME = 'cacert.pem' - kwargs_to_fetch_token = True - def __init__(self, app, conf): log = logging.getLogger(conf.get('log_name', __name__)) log.info('Starting Keystone auth_token middleware') diff --git a/keystonemiddleware/tests/unit/auth_token/test_base_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_base_middleware.py index 32e4338..a3c06bc 100644 --- a/keystonemiddleware/tests/unit/auth_token/test_base_middleware.py +++ b/keystonemiddleware/tests/unit/auth_token/test_base_middleware.py @@ -31,8 +31,6 @@ class FakeApp(object): class FetchingMiddleware(auth_token.BaseAuthProtocol): - kwargs_to_fetch_token = True - def __init__(self, app, token_dict={}, **kwargs): super(FetchingMiddleware, self).__init__(app, **kwargs) self.token_dict = token_dict diff --git a/releasenotes/notes/remove_kwargs_to_fetch_token-20e3451ed192ab6a.yaml b/releasenotes/notes/remove_kwargs_to_fetch_token-20e3451ed192ab6a.yaml new file mode 100644 index 0000000..147a77b --- /dev/null +++ b/releasenotes/notes/remove_kwargs_to_fetch_token-20e3451ed192ab6a.yaml @@ -0,0 +1,6 @@ +--- +other: + - > + The ``kwargs_to_fetch_token`` setting was removed from the + ``BaseAuthProtocol`` class. Implementations of auth_token now assume kwargs + will be passed to the ``fetch_token`` method. |