Skip to content

Commit 8ae4c98

Browse files
purple4reinapurple4reina
committed
More black.
1 parent 59275c7 commit 8ae4c98

File tree

3 files changed

+129
-145
lines changed

3 files changed

+129
-145
lines changed

‎tests/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from datadog_lambda.config import config
44

5+
56
@pytest.fixture(autouse=True)
67
def reset_config():
78
config.reset()

‎tests/test_config.py

Lines changed: 128 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -10,164 +10,148 @@ def set_env(key, value):
1010
monkeypatch.delenv(key, raising=False)
1111
else:
1212
monkeypatch.setenv(key, value)
13+
1314
return set_env
1415

1516

1617
_test_config_from_environ = (
17-
("AWS_LAMBDA_FUNCTION_NAME", "function_name", None, None),
18-
("AWS_LAMBDA_FUNCTION_NAME", "function_name", "", ""),
19-
("AWS_LAMBDA_FUNCTION_NAME", "function_name", "my_function", "my_function"),
20-
21-
("DD_FLUSH_TO_LOG", "flush_to_log", None, False),
22-
("DD_FLUSH_TO_LOG", "flush_to_log", "", False),
23-
("DD_FLUSH_TO_LOG", "flush_to_log", "true", True),
24-
("DD_FLUSH_TO_LOG", "flush_to_log", "TRUE", True),
25-
("DD_FLUSH_TO_LOG", "flush_to_log", "false", False),
26-
("DD_FLUSH_TO_LOG", "flush_to_log", "FALSE", False),
27-
("DD_FLUSH_TO_LOG", "flush_to_log", "1", True), # CHANGED
28-
("DD_FLUSH_TO_LOG", "flush_to_log", "0", False),
29-
("DD_FLUSH_TO_LOG", "flush_to_log", "purple", False),
30-
31-
("DD_TRACE_ENABLED", "trace_enabled", None, True),
32-
("DD_TRACE_ENABLED", "trace_enabled", "", False),
33-
("DD_TRACE_ENABLED", "trace_enabled", "true", True),
34-
("DD_TRACE_ENABLED", "trace_enabled", "TRUE", True),
35-
("DD_TRACE_ENABLED", "trace_enabled", "false", False),
36-
("DD_TRACE_ENABLED", "trace_enabled", "FALSE", False),
37-
("DD_TRACE_ENABLED", "trace_enabled", "1", True), # CHANGED
38-
("DD_TRACE_ENABLED", "trace_enabled", "0", False),
39-
("DD_TRACE_ENABLED", "trace_enabled", "purple", False),
40-
41-
("DD_COLD_START_TRACING", "cold_start_tracing", None, True),
42-
("DD_COLD_START_TRACING", "cold_start_tracing", "", False),
43-
("DD_COLD_START_TRACING", "cold_start_tracing", "true", True),
44-
("DD_COLD_START_TRACING", "cold_start_tracing", "TRUE", True),
45-
("DD_COLD_START_TRACING", "cold_start_tracing", "false", False),
46-
("DD_COLD_START_TRACING", "cold_start_tracing", "FALSE", False),
47-
("DD_COLD_START_TRACING", "cold_start_tracing", "1", True), # CHANGED
48-
("DD_COLD_START_TRACING", "cold_start_tracing", "0", False),
49-
("DD_COLD_START_TRACING", "cold_start_tracing", "purple", False),
50-
51-
("AWS_REGION", "is_gov_region", None, False),
52-
("AWS_REGION", "is_gov_region", "", False),
53-
("AWS_REGION", "is_gov_region", "us-gov-1", True),
54-
("AWS_REGION", "is_gov_region", "us-est-1", False),
55-
56-
("DD_FLUSH_IN_THREAD", "flush_in_thread", None, False),
57-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "", False),
58-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "true", True),
59-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "TRUE", True),
60-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "false", False),
61-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "FALSE", False),
62-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "1", True), # CHANGED
63-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "0", False),
64-
("DD_FLUSH_IN_THREAD", "flush_in_thread", "purple", False),
65-
66-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", None, True),
67-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "", False),
68-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "true", True),
69-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "TRUE", True),
70-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "false", False),
71-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "FALSE", False),
72-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "1", True), # CHANGED
73-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "0", False),
74-
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "purple", False),
75-
76-
("DD_INTEGRATION_TEST", "is_in_tests", None, False),
77-
("DD_INTEGRATION_TEST", "is_in_tests", "", False),
78-
("DD_INTEGRATION_TEST", "is_in_tests", "true", True),
79-
("DD_INTEGRATION_TEST", "is_in_tests", "TRUE", True),
80-
("DD_INTEGRATION_TEST", "is_in_tests", "false", False),
81-
("DD_INTEGRATION_TEST", "is_in_tests", "FALSE", False),
82-
("DD_INTEGRATION_TEST", "is_in_tests", "1", True), # CHANGED
83-
("DD_INTEGRATION_TEST", "is_in_tests", "0", False),
84-
("DD_INTEGRATION_TEST", "is_in_tests", "purple", False),
85-
86-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", None, True),
87-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "", False),
88-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "true", True),
89-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "TRUE", True),
90-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "false", False),
91-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "FALSE", False),
92-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "1", True),
93-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "0", False),
94-
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "purple", False),
95-
96-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", None, False),
97-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "", False),
98-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "true", True),
99-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "TRUE", True),
100-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "false", False),
101-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "FALSE", False),
102-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "1", True), # CHANGED
103-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "0", False),
104-
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "purple", False),
105-
106-
("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", None, False),
107-
("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", "", False),
108-
("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", "my_function", True),
109-
110-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", None, False),
111-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "", False),
112-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "true", True),
113-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "TRUE", True),
114-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "false", False),
115-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "FALSE", False),
116-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "1", True), # CHANGED
117-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "0", False),
118-
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "purple", False),
18+
("AWS_LAMBDA_FUNCTION_NAME", "function_name", None, None),
19+
("AWS_LAMBDA_FUNCTION_NAME", "function_name", "", ""),
20+
("AWS_LAMBDA_FUNCTION_NAME", "function_name", "my_function", "my_function"),
21+
("DD_FLUSH_TO_LOG", "flush_to_log", None, False),
22+
("DD_FLUSH_TO_LOG", "flush_to_log", "", False),
23+
("DD_FLUSH_TO_LOG", "flush_to_log", "true", True),
24+
("DD_FLUSH_TO_LOG", "flush_to_log", "TRUE", True),
25+
("DD_FLUSH_TO_LOG", "flush_to_log", "false", False),
26+
("DD_FLUSH_TO_LOG", "flush_to_log", "FALSE", False),
27+
("DD_FLUSH_TO_LOG", "flush_to_log", "1", True), # CHANGED
28+
("DD_FLUSH_TO_LOG", "flush_to_log", "0", False),
29+
("DD_FLUSH_TO_LOG", "flush_to_log", "purple", False),
30+
("DD_TRACE_ENABLED", "trace_enabled", None, True),
31+
("DD_TRACE_ENABLED", "trace_enabled", "", False),
32+
("DD_TRACE_ENABLED", "trace_enabled", "true", True),
33+
("DD_TRACE_ENABLED", "trace_enabled", "TRUE", True),
34+
("DD_TRACE_ENABLED", "trace_enabled", "false", False),
35+
("DD_TRACE_ENABLED", "trace_enabled", "FALSE", False),
36+
("DD_TRACE_ENABLED", "trace_enabled", "1", True), # CHANGED
37+
("DD_TRACE_ENABLED", "trace_enabled", "0", False),
38+
("DD_TRACE_ENABLED", "trace_enabled", "purple", False),
39+
("DD_COLD_START_TRACING", "cold_start_tracing", None, True),
40+
("DD_COLD_START_TRACING", "cold_start_tracing", "", False),
41+
("DD_COLD_START_TRACING", "cold_start_tracing", "true", True),
42+
("DD_COLD_START_TRACING", "cold_start_tracing", "TRUE", True),
43+
("DD_COLD_START_TRACING", "cold_start_tracing", "false", False),
44+
("DD_COLD_START_TRACING", "cold_start_tracing", "FALSE", False),
45+
("DD_COLD_START_TRACING", "cold_start_tracing", "1", True), # CHANGED
46+
("DD_COLD_START_TRACING", "cold_start_tracing", "0", False),
47+
("DD_COLD_START_TRACING", "cold_start_tracing", "purple", False),
48+
("AWS_REGION", "is_gov_region", None, False),
49+
("AWS_REGION", "is_gov_region", "", False),
50+
("AWS_REGION", "is_gov_region", "us-gov-1", True),
51+
("AWS_REGION", "is_gov_region", "us-est-1", False),
52+
("DD_FLUSH_IN_THREAD", "flush_in_thread", None, False),
53+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "", False),
54+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "true", True),
55+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "TRUE", True),
56+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "false", False),
57+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "FALSE", False),
58+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "1", True), # CHANGED
59+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "0", False),
60+
("DD_FLUSH_IN_THREAD", "flush_in_thread", "purple", False),
61+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", None, True),
62+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "", False),
63+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "true", True),
64+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "TRUE", True),
65+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "false", False),
66+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "FALSE", False),
67+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "1", True), # CHANGED
68+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "0", False),
69+
("DD_ENHANCED_METRICS", "enhanced_metrics_enabled", "purple", False),
70+
("DD_INTEGRATION_TEST", "is_in_tests", None, False),
71+
("DD_INTEGRATION_TEST", "is_in_tests", "", False),
72+
("DD_INTEGRATION_TEST", "is_in_tests", "true", True),
73+
("DD_INTEGRATION_TEST", "is_in_tests", "TRUE", True),
74+
("DD_INTEGRATION_TEST", "is_in_tests", "false", False),
75+
("DD_INTEGRATION_TEST", "is_in_tests", "FALSE", False),
76+
("DD_INTEGRATION_TEST", "is_in_tests", "1", True), # CHANGED
77+
("DD_INTEGRATION_TEST", "is_in_tests", "0", False),
78+
("DD_INTEGRATION_TEST", "is_in_tests", "purple", False),
79+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", None, True),
80+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "", False),
81+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "true", True),
82+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "TRUE", True),
83+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "false", False),
84+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "FALSE", False),
85+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "1", True),
86+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "0", False),
87+
("DD_BOTOCORE_ADD_SPAN_POINTERS", "add_span_pointers", "purple", False),
88+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", None, False),
89+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "", False),
90+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "true", True),
91+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "TRUE", True),
92+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "false", False),
93+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "FALSE", False),
94+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "1", True), # CHANGED
95+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "0", False),
96+
("DD_TRACE_OTEL_ENABLED", "otel_enabled", "purple", False),
97+
("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", None, False),
98+
("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", "", False),
99+
("AWS_LAMBDA_FUNCTION_NAME", "is_lambda_context", "my_function", True),
100+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", None, False),
101+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "", False),
102+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "true", True),
103+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "TRUE", True),
104+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "false", False),
105+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "FALSE", False),
106+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "1", True), # CHANGED
107+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "0", False),
108+
("DD_INSTRUMENTATION_TELEMETRY_ENABLED", "telemetry_enabled", "purple", False),
119109
)
120110

121-
@pytest.mark.parametrize('env_key,conf_key,env_val,conf_val', _test_config_from_environ)
111+
112+
@pytest.mark.parametrize("env_key,conf_key,env_val,conf_val", _test_config_from_environ)
122113
def test_config_from_environ(env_key, conf_key, env_val, conf_val, setenv):
123114
setenv(env_key, env_val)
124115
assert getattr(config, conf_key) == conf_val
125116

126117

127118
_test_fips_mode_from_environ = (
128-
(None, None, False),
129-
(None, "", False),
130-
(None, "us-gov-1", True),
131-
(None, "us-east-1", False),
132-
133-
("", None, False),
134-
("", "", False),
135-
("", "us-gov-1", False),
136-
("", "us-east-1", False),
137-
138-
("true", None, True),
139-
("true", "", True),
140-
("true", "us-gov-1", True),
141-
("true", "us-east-1", True),
142-
143-
("TRUE", None, True),
144-
("TRUE", "", True),
145-
("TRUE", "us-gov-1", True),
146-
("TRUE", "us-east-1", True),
147-
148-
("false", None, False),
149-
("false", "", False),
150-
("false", "us-gov-1", False),
151-
("false", "us-east-1", False),
152-
153-
("FALSE", None, False),
154-
("FALSE", "", False),
155-
("FALSE", "us-gov-1", False),
156-
("FALSE", "us-east-1", False),
157-
158-
159-
("1", None, False),
160-
("1", "", False),
161-
("1", "us-gov-1", False),
162-
("1", "us-east-1", False),
163-
164-
("0", None, False),
165-
("0", "", False),
166-
("0", "us-gov-1", False),
167-
("0", "us-east-1", False),
119+
(None, None, False),
120+
(None, "", False),
121+
(None, "us-gov-1", True),
122+
(None, "us-east-1", False),
123+
("", None, False),
124+
("", "", False),
125+
("", "us-gov-1", False),
126+
("", "us-east-1", False),
127+
("true", None, True),
128+
("true", "", True),
129+
("true", "us-gov-1", True),
130+
("true", "us-east-1", True),
131+
("TRUE", None, True),
132+
("TRUE", "", True),
133+
("TRUE", "us-gov-1", True),
134+
("TRUE", "us-east-1", True),
135+
("false", None, False),
136+
("false", "", False),
137+
("false", "us-gov-1", False),
138+
("false", "us-east-1", False),
139+
("FALSE", None, False),
140+
("FALSE", "", False),
141+
("FALSE", "us-gov-1", False),
142+
("FALSE", "us-east-1", False),
143+
("1", None, False),
144+
("1", "", False),
145+
("1", "us-gov-1", False),
146+
("1", "us-east-1", False),
147+
("0", None, False),
148+
("0", "", False),
149+
("0", "us-gov-1", False),
150+
("0", "us-east-1", False),
168151
)
169152

170-
@pytest.mark.parametrize('fips_mode,region,conf_val', _test_fips_mode_from_environ)
153+
154+
@pytest.mark.parametrize("fips_mode,region,conf_val", _test_fips_mode_from_environ)
171155
def test_fips_mode_from_environ(fips_mode, region, conf_val, setenv):
172156
setenv("DD_LAMBDA_FIPS_MODE", fips_mode)
173157
setenv("AWS_REGION", region)

‎tests/test_wrapper.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,6 @@ def return_type_test(event, context):
560560

561561

562562
class TestLambdaDecoratorSettings(unittest.TestCase):
563-
564563
@patch("datadog_lambda.config.Config.trace_enabled", False)
565564
def test_some_envs_should_depend_on_dd_tracing_enabled(self):
566565
os.environ[wrapper.DD_TRACE_MANAGED_SERVICES] = "true"

0 commit comments

Comments
 (0)