Skip to content

Fix SSM endpoint for Gov regions #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shreyamalpani merged 4 commits into from
Dec 5, 2025
Merged

Fix SSM endpoint for Gov regions #693

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be4c9fb
only override ssm endpoint url in commercial fips
shreyamalpani Dec 1, 2025
c5da899
lint
shreyamalpani Dec 1, 2025
29a050e
check ssm-fips supported regions
shreyamalpani Dec 5, 2025
e79a3b5
fix
shreyamalpani Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datadog_lambda/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def get_api_key() -> str:
# SSM endpoints: https://docs.aws.amazon.com/general/latest/gr/ssm.html
fips_endpoint = (
f"https://ssm-fips.{LAMBDA_REGION}.amazonaws.com"
if config.fips_mode_enabled
if config.fips_mode_enabled and not config.is_gov_region
else None
)
ssm_client = _boto3_client("ssm", endpoint_url=fips_endpoint)
Expand Down
22 changes: 20 additions & 2 deletions tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,34 @@ def test_ssm_fips_endpoint(self, mock_boto3_client):
}
mock_boto3_client.return_value = mock_client

os.environ["AWS_REGION"] = "us-gov-west-1"
os.environ["AWS_REGION"] = "us-east-1"
os.environ["DD_API_KEY_SSM_NAME"] = "test-ssm-param"

api_key = api.get_api_key()

mock_boto3_client.assert_called_with(
"ssm", endpoint_url="https://ssm-fips.us-gov-west-1.amazonaws.com"
"ssm", endpoint_url="https://ssm-fips.us-east-1.amazonaws.com"
)
self.assertEqual(api_key, "test-api-key")

@patch("datadog_lambda.config.Config.fips_mode_enabled", True)
@patch("datadog_lambda.config.Config.is_gov_region", True)
@patch("botocore.session.Session.create_client")
def test_ssm_gov_endpoint(self, mock_boto3_client):
mock_client = MagicMock()
mock_client.get_parameter.return_value = {
"Parameter": {"Value": "test-api-key"}
}
mock_boto3_client.return_value = mock_client

os.environ["AWS_REGION"] = "us-gov-west-1"
os.environ["DD_API_KEY_SSM_NAME"] = "test-ssm-param"

api_key = api.get_api_key()

mock_boto3_client.assert_called_with("ssm", endpoint_url=None)
self.assertEqual(api_key, "test-api-key")

@patch("datadog_lambda.config.Config.fips_mode_enabled", True)
@patch("botocore.session.Session.create_client")
@patch("datadog_lambda.api.decrypt_kms_api_key")
Expand Down
Loading