openstack
/
swift
Code Issues Proposed changes

Merge "Fixing S3 credential caching region support" into stable/victoria

This commit is contained in:
Zuul 2020-09-24 04:40:35 +00:00 committed by Gerrit Code Review
parent 3095fb3139 d6a75783b5
commit 2f057ced6b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/s3api/s3token.py
View File

@ -195,7 +195,9 @@ class S3Token(object):
auth = auth_plugin.load_from_options(**auth_options)
session = keystone_session.Session(auth=auth)
self.keystoneclient = keystone_client.Client(session=session)
self.keystoneclient = keystone_client.Client(
session=session,
region_name=conf.get('region_name'))
self._logger.info("Caching s3tokens for %s seconds",
self._secret_cache_duration)
except Exception:

4
test/unit/common/middleware/s3api/test_s3token.py
View File

@ -526,6 +526,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
'project_domain_name': 'default',
})(FakeApp())
self.assertEqual(20, self.middleware._secret_cache_duration)
self.assertIsNone(MOCK_KEYSTONE.mock_calls[0][2]['region_name'])
cache = MOCK_CACHE_FROM_ENV.return_value
@ -562,8 +563,11 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
'project_name': 'service',
'user_domain_name': 'default',
'project_domain_name': 'default',
'region_name': 'some-other-region',
})(FakeApp())
self.assertEqual(20, self.middleware._secret_cache_duration)
self.assertEqual(MOCK_KEYSTONE.mock_calls[0][2]['region_name'],
'some-other-region')
cache = MOCK_CACHE_FROM_ENV.return_value
cache.get.return_value = None