From de1007a14c40778731f4724423918b52c8ab82c8 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Tue, 12 Dec 2017 16:57:59 -0600 Subject: [PATCH] Move token_formatter to token This change moves the token_formatter under fernet to be located under the token directory. This is to allow for the functionality of token_formatter to be easily used with other token providers. Change-Id: I3a1ee30f69c33c9dd98c7e39e552b7908cc836e1 --- keystone/tests/unit/token/test_fernet_provider.py | 2 +- keystone/token/providers/fernet/core.py | 2 +- keystone/token/{providers/fernet => }/token_formatters.py | 0 releasenotes/notes/token-formatter-ec58aba00fa83706.yaml | 8 ++++++++ 4 files changed, 10 insertions(+), 2 deletions(-) rename keystone/token/{providers/fernet => }/token_formatters.py (100%) create mode 100644 releasenotes/notes/token-formatter-ec58aba00fa83706.yaml diff --git a/keystone/tests/unit/token/test_fernet_provider.py b/keystone/tests/unit/token/test_fernet_provider.py index 655d615399..2bdd979a3d 100644 --- a/keystone/tests/unit/token/test_fernet_provider.py +++ b/keystone/tests/unit/token/test_fernet_provider.py @@ -31,7 +31,7 @@ from keystone.tests.unit import ksfixtures from keystone.tests.unit.ksfixtures import database from keystone.token.providers import common from keystone.token.providers import fernet -from keystone.token.providers.fernet import token_formatters +from keystone.token import token_formatters CONF = keystone.conf.CONF diff --git a/keystone/token/providers/fernet/core.py b/keystone/token/providers/fernet/core.py index 486a94229b..27bc0e81ed 100644 --- a/keystone/token/providers/fernet/core.py +++ b/keystone/token/providers/fernet/core.py @@ -18,7 +18,7 @@ import keystone.conf from keystone.federation import constants as federation_constants from keystone.i18n import _ from keystone.token.providers import common -from keystone.token.providers.fernet import token_formatters as tf +from keystone.token import token_formatters as tf CONF = keystone.conf.CONF diff --git a/keystone/token/providers/fernet/token_formatters.py b/keystone/token/token_formatters.py similarity index 100% rename from keystone/token/providers/fernet/token_formatters.py rename to keystone/token/token_formatters.py diff --git a/releasenotes/notes/token-formatter-ec58aba00fa83706.yaml b/releasenotes/notes/token-formatter-ec58aba00fa83706.yaml new file mode 100644 index 0000000000..e4fd6359b2 --- /dev/null +++ b/releasenotes/notes/token-formatter-ec58aba00fa83706.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + The token_formatter utility class has been moved from under fernet + to the default token directory. This is to allow for the reuse of + functionality with other token providers. Any deployments that are + specifically using the fernet utils may be affected and will need + to adjust accordingly.