8000 chore: rename enable_fips_mode to fips_mode_enabled · DataDog/datadog-lambda-python@f187a1b · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f187a1b

Browse files
apiarian-datadogapiarian-datadog
committed
chore: rename enable_fips_mode to fips_mode_enabled
1 parent 95e2cbc commit f187a1b

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎datadog_lambda/api.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging
22
import os
33

4-
from datadog_lambda.fips import enable_fips_mode
4+
from datadog_lambda.fips import fips_mode_enabled
55

66
logger = logging.getLogger(__name__)
77
KMS_ENCRYPTION_CONTEXT_KEY = "LambdaFunctionName"
@@ -66,7 +66,7 @@ def get_api_key() -> str:
6666
DD_API_KEY = os.environ.get("DD_API_KEY", os.environ.get("DATADOG_API_KEY", ""))
6767

6868
LAMBDA_REGION = os.environ.get("AWS_REGION", "")
69-
if enable_fips_mode:
69+
if fips_mode_enabled:
7070
logger.debug(
7171
"FIPS mode is enabled, using FIPS endpoints for secrets management."
7272
)
@@ -82,7 +82,7 @@ def get_api_key() -> str:
8282
return ""
8383
endpoint_url = (
8484
f"https://secretsmanager-fips.{secrets_region}.amazonaws.com"
85-
if enable_fips_mode
85+
if fips_mode_enabled
8686
else None
8787
)
8888
secrets_manager_client = _boto3_client(
@@ -95,7 +95,7 @@ def get_api_key() -> str:
9595
# SSM endpoints: https://docs.aws.amazon.com/general/latest/gr/ssm.html
9696
fips_endpoint = (
9797
f"https://ssm-fips.{LAMBDA_REGION}.amazonaws.com"
98-
if enable_fips_mode
98+
if fips_mode_enabled
9999
else None
100100
)
101101
ssm_client = _boto3_client("ssm", endpoint_url=fips_endpoint)
@@ -106,7 +106,7 @@ def get_api_key() -> str:
106106
# KMS endpoints: https://docs.aws.amazon.com/general/latest/gr/kms.html
107107
fips_endpoint = (
108108
f"https://kms-fips.{LAMBDA_REGION}.amazonaws.com"
109-
if enable_fips_mode
109+
if fips_mode_enabled
110110
else None
111111
)
112112
kms_client = _boto3_client("kms", endpoint_url=fips_endpoint)

‎datadog_lambda/fips.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33

44
is_gov_region = os.environ.get("AWS_REGION", "").startswith("us-gov-")
55

6-
enable_fips_mode = (
6+
fips_mode_enabled = (
77
os.environ.get(
88
"DD_LAMBDA_FIPS_MODE",
99
"true" if is_gov_region else "false",
1010
).lower()
1111
== "true"
1212
)
1313

14-
if is_gov_region or enable_fips_mode:
14+
if is_gov_region or fips_mode_enabled:
1515
logger = logging.getLogger(__name__)
1616
logger.debug(
1717
"Python Lambda Layer FIPS mode is %s.",
18-
"enabled" if enable_fips_mode else "not enabled",
18+
"enabled" if fips_mode_enabled else "not enabled",
1919
)

‎datadog_lambda/metric.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import ujson as json
1313

1414
from datadog_lambda.extension import should_use_extension
15-
from datadog_lambda.fips import enable_fips_mode
15+
from datadog_lambda.fips import fips_mode_enabled
1616
from datadog_lambda.tags import dd_lambda_layer_tag, get_enhanced_metrics_tags
1717

1818
logger = logging.getLogger(__name__)
@@ -31,7 +31,7 @@ def _select_metrics_handler():
3131
if os.environ.get("DD_FLUSH_TO_LOG", "").lower() == "true":
3232
return MetricsHandler.FORWARDER
3333

34-
if enable_fips_mode:
34+
if fips_mode_enabled:
3535
logger.debug(
3636
"With FIPS mode enabled, the Datadog API metrics handler is unavailable."
3737
)

‎tests/test_api.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def setUp(self):
2222
)
2323
self.env_patcher.start()
2424

25-
@patch("datadog_lambda.api.enable_fips_mode", True)
25+
@patch("datadog_lambda.api.fips_mode_enabled", True)
2626
@patch("botocore.session.Session.create_client")
2727
def test_secrets_manager_fips_endpoint(self, mock_boto3_client):
2828
mock_client = MagicMock()
@@ -63,7 +63,7 @@ def test_secrets_manager_different_region(self, mock_boto3_client):
6363
)
6464
self.assertEqual(api_key, "test-api-key")
6565

66-
@patch("datadog_lambda.api.enable_fips_mode", True)
66+
@patch("datadog_lambda.api.fips_mode_enabled", True)
6767
@patch("botocore.session.Session.create_client")
6868
def test_secrets_manager_different_region_but_still_fips(self, mock_boto3_client):
6969
mock_client = MagicMock()
@@ -84,7 +84,7 @@ def test_secrets_manager_different_region_but_still_fips(self, mock_boto3_client
8484
)
8585
self.assertEqual(api_key, "test-api-key")
8686

87-
@patch("datadog_lambda.api.enable_fips_mode", True)
87+
@patch("datadog_lambda.api.fips_mode_enabled", True)
8888
@patch("botocore.session.Session.create_client")
8989
def test_ssm_fips_endpoint(self, mock_boto3_client):
9090
mock_client = MagicMock()
@@ -103,7 +103,7 @@ def test_ssm_fips_endpoint(self, mock_boto3_client):
103103
)
104104
self.assertEqual(api_key, "test-api-key")
105105

106-
@patch("datadog_lambda.api.enable_fips_mode", True)
106+
@patch("datadog_lambda.api.fips_mode_enabled", True)
107107
@patch("botocore.session.Session.create_client")
108108
@patch("datadog_lambda.api.decrypt_kms_api_key")
109109
def test_kms_fips_endpoint(self, mock_decrypt_kms, mock_boto3_client):

‎tests/test_metric.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_select_metrics_handler_dd_api_fallback(self):
6262
self.assertEqual(MetricsHandler.DATADOG_API, _select_metrics_handler())
6363
del os.environ["DD_FLUSH_TO_LOG"]
6464

65-
@patch("datadog_lambda.metric.enable_fips_mode", True)
65+
@patch("datadog_lambda.metric.fips_mode_enabled", True)
6666
@patch("datadog_lambda.metric.should_use_extension", False)
6767
def test_select_metrics_handler_has_no_fallback_in_fips_mode(self):
6868
os.environ["DD_FLUSH_TO_LOG"] = "False"

0 commit comments

Comments
 (0)
0