From e2bef03d9ec316f7b9b45e44c3d45dbe38640f1e Mon Sep 17 00:00:00 2001 From: Shubham Padkonde Date: Sun, 4 Oct 2026 13:02:43 +0530 Subject: [PATCH] fix: retain secret item across concurrent cache eviction --- .../secret_cache.py | 10 +++-- test/unit/test_aws_secretsmanager_caching.py | 38 +++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/aws_secretsmanager_caching/secret_cache.py b/src/aws_secretsmanager_caching/secret_cache.py index fdc5c3a..f66ff25 100644 --- a/src/aws_secretsmanager_caching/secret_cache.py +++ b/src/aws_secretsmanager_caching/secret_cache.py @@ -61,10 +61,12 @@ def _get_cached_secret(self, secret_id): secret = self._cache.get(secret_id) if secret is not None: return secret - self._cache.put_if_absent( - secret_id, SecretCacheItem(config=self._config, client=self._client, secret_id=secret_id) - ) - return self._cache.get(secret_id) + secret = SecretCacheItem(config=self._config, client=self._client, secret_id=secret_id) + self._cache.put_if_absent(secret_id, secret) + # Another caller may evict the item before this lookup. Keep a usable + # reference while still preferring an item inserted by a concurrent caller. + cached_secret = self._cache.get(secret_id) + return secret if cached_secret is None else cached_secret def get_secret_string(self, secret_id, version_stage=None): """Get the secret string value from the cache. diff --git a/test/unit/test_aws_secretsmanager_caching.py b/test/unit/test_aws_secretsmanager_caching.py index 7fa5762..1f540a0 100644 --- a/test/unit/test_aws_secretsmanager_caching.py +++ b/test/unit/test_aws_secretsmanager_caching.py @@ -14,6 +14,7 @@ Unit test suite for high-level functions in aws_secretsmanager_caching """ import unittest +from unittest.mock import Mock, patch import botocore import pytest @@ -63,6 +64,43 @@ def test_default_session(self): def test_client_stub(self): SecretCache(client=self.get_client()) + def test_secret_evicted_between_insert_and_lookup(self): + # Simulate another caller evicting this item before the final lookup. + for method, field, value in [ + ('get_secret_string', 'SecretString', 'cached value'), + ('get_secret_binary', 'SecretBinary', b'cached value'), + ]: + with self.subTest(method=method): + client = Mock() + client.describe_secret.return_value = {'VersionIdsToStages': {'version': ['AWSCURRENT']}} + client.get_secret_value.return_value = {field: value} + cache = SecretCache(config=SecretCacheConfig(max_cache_size=1), client=client) + put_if_absent = cache._cache.put_if_absent + + def insert_then_evict(key, item): + result = put_if_absent(key, item) + put_if_absent('another-secret', object()) + return result + + with patch.object(cache._cache, 'put_if_absent', side_effect=insert_then_evict): + self.assertEqual(getattr(cache, method)('test'), value) + + self.assertIsNone(cache._cache.get('test')) + client.describe_secret.assert_called_once_with(SecretId='test') + client.get_secret_value.assert_called_once_with(SecretId='test', VersionId='version') + + def test_secret_inserted_by_another_caller_is_reused(self): + cache = SecretCache(client=Mock()) + existing_item = object() + put_if_absent = cache._cache.put_if_absent + + def insert_existing_first(key, item): + put_if_absent(key, existing_item) + return put_if_absent(key, item) + + with patch.object(cache._cache, 'put_if_absent', side_effect=insert_existing_first): + self.assertIs(cache._get_cached_secret('test'), existing_item) + def test_get_secret_string_none(self): cache = SecretCache(client=self.get_client()) self.assertIsNone(cache.get_secret_string('test'))