From 0cc6bd82b4f757b7966abd5863fde9fe25de6fb4 Mon Sep 17 00:00:00 2001 From: Wenchong Hu Date: Tue, 18 Mar 2025 01:01:28 -0700 Subject: [PATCH 1/2] Update get_jwks response data structure --- confidant_client/__init__.py | 4 ++-- tests/unit/confidant_client/client_test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/confidant_client/__init__.py b/confidant_client/__init__.py index 9c3f747..f6e70c0 100644 --- a/confidant_client/__init__.py +++ b/confidant_client/__init__.py @@ -529,7 +529,7 @@ def get_jwt(self, environment, resource_id, expiry): return ret def get_jwks(self, environment): - ret = {'result': False, 'keys': {}} + ret = {'result': False} url = '{0}/v1/jwks/public/{1}'.format(self.config['url'], environment) try: @@ -538,7 +538,7 @@ def get_jwks(self, environment): url, ) data = response.json() - ret['keys'] = data + ret.update(data) except RequestExecutionError: logging.exception('Error with executing request') return ret diff --git a/tests/unit/confidant_client/client_test.py b/tests/unit/confidant_client/client_test.py index 6664c81..737f7ad 100644 --- a/tests/unit/confidant_client/client_test.py +++ b/tests/unit/confidant_client/client_test.py @@ -952,7 +952,7 @@ def test_get_jwks(self): self.assertEqual( client.get_jwks('development'), - {'result': True, 'keys': {}} + {'result': True} ) client.request_session.request.assert_called_with( 'GET', From 4d6a77d109603008f2f43fe9c601f4fb4f5f2b63 Mon Sep 17 00:00:00 2001 From: Wenchong Hu Date: Tue, 18 Mar 2025 13:02:29 -0700 Subject: [PATCH 2/2] bump version to 2.7.1 --- CHANGELOG.md | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7efc0b4..e1c7b72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.7.1 + +* Update get_jwks format + ## 2.7.0 * add get_jwks diff --git a/setup.py b/setup.py index 0a2c089..e3d776e 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name="confidant-client", - version="2.7.0", + version="2.7.1", packages=find_packages(exclude=["test*"]), install_requires=[ # Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK)