Skip to content

Commit 51b1e49

Browse files
fix(parameters): raise GetParameterError when GetParameters fails in fail-fast mode (#8616)
get_parameters_by_name(..., raise_on_error=True) returned {} when the underlying GetParameters call failed with InvalidKeyId or InternalServerError, letting Lambdas run without their parameters despite the documented fail-fast behavior. Raise GetParameterError from the caught exception instead; graceful mode still aggregates the names under the _errors key. Fixes #8586 Co-authored-by: Leandro Damascena <lcdama@amazon.pt>
1 parent f94134e commit 51b1e49

2 files changed

Lines changed: 47 additions & 1 deletion

File tree

‎aws_lambda_powertools/utilities/parameters/ssm.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,9 @@ def _get_parameters_by_name(
630630
response = self.client.get_parameters(Names=parameter_names, WithDecryption=True)
631631
else:
632632
response = self.client.get_parameters(Names=parameter_names)
633-
except (self.client.exceptions.InvalidKeyId, self.client.exceptions.InternalServerError):
633+
except (self.client.exceptions.InvalidKeyId, self.client.exceptions.InternalServerError) as exc:
634+
if raise_on_error:
635+
raise GetParameterError(f"Failed to fetch parameters: {parameter_names}") from exc
634636
return ret, parameter_names
635637

636638
batch_errors = self._handle_any_invalid_get_parameter_errors(response, raise_on_error)

‎tests/functional/parameters/_boto3/test_utilities_parameters.py‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,50 @@ def test_ssm_provider_get_parameters_by_name_raise_on_failure(mock_name, mock_va
10841084
stubber.deactivate()
10851085

10861086

1087+
def test_ssm_provider_get_parameters_by_name_raise_on_get_parameters_error(mock_name, config):
1088+
# GIVEN two parameters are requested
1089+
provider = parameters.SSMProvider(boto_config=config)
1090+
params = {f"/dev/{mock_name}": {}, f"/prod/{mock_name}": {}}
1091+
param_names = list(params.keys())
1092+
1093+
expected_stub_params = {"Names": param_names}
1094+
1095+
stubber = stub.Stubber(provider.client)
1096+
stubber.add_client_error("get_parameters", "InvalidKeyId", expected_params=expected_stub_params)
1097+
stubber.activate()
1098+
1099+
# WHEN the GetParameters call itself fails
1100+
# THEN raise GetParameterError instead of returning an empty dict
1101+
with pytest.raises(parameters.exceptions.GetParameterError, match="Failed to fetch parameters"):
1102+
try:
1103+
provider.get_parameters_by_name(parameters=params, raise_on_error=True)
1104+
stubber.assert_no_pending_responses()
1105+
finally:
1106+
stubber.deactivate()
1107+
1108+
1109+
def test_ssm_provider_get_parameters_by_name_raise_on_get_parameters_error_decrypt(mock_name, config):
1110+
# GIVEN two parameters are requested, all with decrypt enabled (GetParameters WithDecryption batch)
1111+
provider = parameters.SSMProvider(boto_config=config)
1112+
params = {f"/dev/{mock_name}": {"decrypt": True}, f"/prod/{mock_name}": {"decrypt": True}}
1113+
param_names = list(params.keys())
1114+
1115+
expected_stub_params = {"Names": param_names, "WithDecryption": True}
1116+
1117+
stubber = stub.Stubber(provider.client)
1118+
stubber.add_client_error("get_parameters", "InternalServerError", expected_params=expected_stub_params)
1119+
stubber.activate()
1120+
1121+
# WHEN the GetParameters call itself fails
1122+
# THEN raise GetParameterError instead of returning an empty dict
1123+
with pytest.raises(parameters.exceptions.GetParameterError, match="Failed to fetch parameters"):
1124+
try:
1125+
provider.get_parameters_by_name(parameters=params, raise_on_error=True)
1126+
stubber.assert_no_pending_responses()
1127+
finally:
1128+
stubber.deactivate()
1129+
1130+
10871131
def test_ssm_provider_get_parameters_by_name_do_not_raise_on_failure(mock_name, mock_value, config):
10881132
# GIVEN two parameters are requested
10891133
success = f"/dev/{mock_name}"

0 commit comments

Comments
 (0)