From c4df65b487ef41604b715502592e09d2d0b5fe61 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 16 Aug 2024 17:17:18 +0900 Subject: [PATCH] s3token: Fix usage of removed Identity v2 API Identity v2 API was removed a long ago, and v3 API should be used instead. Change-Id: I3f9f038a7351166f8c4b188f433b3de8b65535b1 --- keystonemiddleware/s3_token.py | 2 +- keystonemiddleware/tests/unit/test_s3_token_middleware.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keystonemiddleware/s3_token.py b/keystonemiddleware/s3_token.py index cda5dd45..2b2d793c 100644 --- a/keystonemiddleware/s3_token.py +++ b/keystonemiddleware/s3_token.py @@ -118,7 +118,7 @@ class S3Token(object): def _json_request(self, creds_json): headers = {'Content-Type': 'application/json'} try: - response = requests.post('%s/v2.0/s3tokens' % self._request_uri, + response = requests.post('%s/v3/s3tokens' % self._request_uri, headers=headers, data=creds_json, verify=self._verify, timeout=CONF.s3_token.timeout) diff --git a/keystonemiddleware/tests/unit/test_s3_token_middleware.py b/keystonemiddleware/tests/unit/test_s3_token_middleware.py index 35b55625..22d540e7 100644 --- a/keystonemiddleware/tests/unit/test_s3_token_middleware.py +++ b/keystonemiddleware/tests/unit/test_s3_token_middleware.py @@ -42,7 +42,7 @@ class FakeApp(object): class S3TokenMiddlewareTestBase(utils.TestCase): TEST_WWW_AUTHENTICATE_URI = 'https://fakehost/identity' - TEST_URL = '%s/v2.0/s3tokens' % (TEST_WWW_AUTHENTICATE_URI, ) + TEST_URL = '%s/v3/s3tokens' % (TEST_WWW_AUTHENTICATE_URI, ) def setUp(self): super(S3TokenMiddlewareTestBase, self).setUp() @@ -101,7 +101,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase): host = 'fakehost' port = 35357 self.requests_mock.post( - '%s://%s:%s/v2.0/s3tokens' % (protocol, host, port), + '%s://%s:%s/v3/s3tokens' % (protocol, host, port), status_code=201, json=GOOD_RESPONSE) self.middleware = (