Skip to content

Commit b15a30a

Browse files
HadrienPatteHadrienPatte
committed
Enforce consistent quoting style for cilium integration
1 parent bfe0e22 commit b15a30a

File tree

9 files changed

+448
-448
lines changed

9 files changed

+448
-448
lines changed

‎cilium/datadog_checks/cilium/check.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
from .metrics import AGENT_V2_METRICS, OPERATOR_V2_METRICS, construct_metrics_config
1010

11-
CILIUM_VERSION = {'cilium_version': {'type': 'metadata', 'label': 'version', 'name': 'version'}}
11+
CILIUM_VERSION = {"cilium_version": {"type": "metadata", "label": "version", "name": "version"}}
1212

1313

1414
class CiliumCheckV2(OpenMetricsBaseCheckV2):
15-
__NAMESPACE__ = 'cilium'
15+
__NAMESPACE__ = "cilium"
1616

1717
DEFAULT_METRIC_LIMIT = 0
1818

@@ -38,8 +38,8 @@ def _generate_config(self, endpoint, metrics):
3838
metrics = construct_metrics_config(metrics)
3939
metrics.append(CILIUM_VERSION)
4040
config = {
41-
'openmetrics_endpoint': endpoint,
42-
'metrics': metrics,
41+
"openmetrics_endpoint": endpoint,
42+
"metrics": metrics,
4343
}
4444
config.update(self.instance)
4545
return config
@@ -48,4 +48,4 @@ def create_scraper(self, config):
4848
return OpenMetricsCompatibilityScraper(self, self.get_config_with_defaults(config))
4949

5050
def get_config_with_defaults(self, config):
51-
return ChainMap(config, {'metrics': config.pop('metrics')})
51+
return ChainMap(config, {"metrics": config.pop("metrics")})

‎cilium/datadog_checks/cilium/cilium.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ class CiliumCheck(OpenMetricsBaseCheck):
1717
def __new__(cls, name, init_config, instances):
1818
instance = instances[0]
1919

20-
if is_affirmative(instance.get('use_openmetrics', False)):
20+
if is_affirmative(instance.get("use_openmetrics", False)):
2121
return CiliumCheckV2(name, init_config, instances)
2222
else:
2323
return super(CiliumCheck, cls).__new__(cls)
2424

2525
def __init__(self, name, init_config, instances):
2626
instance = instances[0]
2727

28-
agent_endpoint = instance.get('agent_endpoint')
29-
operator_endpoint = instance.get('operator_endpoint')
28+
agent_endpoint = instance.get("agent_endpoint")
29+
operator_endpoint = instance.get("operator_endpoint")
3030

3131
# Cannot have both cilium-agent and cilium-operator metrics enabled
3232
if agent_endpoint and operator_endpoint:
@@ -43,15 +43,15 @@ def __init__(self, name, init_config, instances):
4343
endpoint = agent_endpoint
4444
metrics = [AGENT_METRICS]
4545

46-
metrics.extend(instance.get('metrics', []))
46+
metrics.extend(instance.get("metrics", []))
4747
instance.update(
4848
{
49-
'prometheus_url': endpoint,
50-
'namespace': 'cilium',
51-
'metrics': metrics,
52-
'prometheus_timeout': instance.get('timeout', 10),
53-
'metadata_metric_name': 'cilium_version',
54-
'metadata_label_map': {'version': 'version'},
49+
"prometheus_url": endpoint,
50+
"namespace": "cilium",
51+
"metrics": metrics,
52+
"prometheus_timeout": instance.get("timeout", 10),
53+
"metadata_metric_name": "cilium_version",
54+
"metadata_label_map": {"version": "version"},
5555
}
5656
)
5757

‎cilium/datadog_checks/cilium/metrics.py

+187-187
Large diffs are not rendered by default.

‎cilium/tests/common.py

+23-23
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
from datadog_checks.dev.ci import running_on_ci
99

10-
CHECK_NAME = 'cilium'
11-
NAMESPACE = 'cilium.'
12-
CILIUM_VERSION = os.getenv('CILIUM_VERSION')
13-
CILIUM_LEGACY = os.getenv('CILIUM_LEGACY')
10+
CHECK_NAME = "cilium"
11+
NAMESPACE = "cilium."
12+
CILIUM_VERSION = os.getenv("CILIUM_VERSION")
13+
CILIUM_LEGACY = os.getenv("CILIUM_LEGACY")
1414

1515
requires_legacy_environment = pytest.mark.skipif(
16-
CILIUM_LEGACY != 'true', reason='Requires legacy Openmetrics V1 environment'
16+
CILIUM_LEGACY != "true", reason="Requires legacy Openmetrics V1 environment"
1717
)
1818
requires_new_environment = pytest.mark.skipif(
19-
CILIUM_LEGACY != 'false', reason='Requires `use_openmetrics` config environment'
19+
CILIUM_LEGACY != "false", reason="Requires `use_openmetrics` config environment"
2020
)
2121

2222
ON_CI = running_on_ci()
@@ -130,15 +130,15 @@
130130

131131
AGENT_V2_METRICS_1_14 = [
132132
# E2E not updated yet to 1.14+ of Cilium
133-
'cilium.cidrgroup.policies',
134-
'cilium.k8s_client.rate_limiter_duration.seconds.bucket',
135-
'cilium.k8s_client.rate_limiter_duration.seconds.count',
136-
'cilium.k8s_client.rate_limiter_duration.seconds.sum',
137-
'cilium.policy.change.count',
138-
'cilium.services.events.count',
133+
"cilium.cidrgroup.policies",
134+
"cilium.k8s_client.rate_limiter_duration.seconds.bucket",
135+
"cilium.k8s_client.rate_limiter_duration.seconds.count",
136+
"cilium.k8s_client.rate_limiter_duration.seconds.sum",
137+
"cilium.policy.change.count",
138+
"cilium.services.events.count",
139139
# 1.16+
140-
'cilium.fqdn.selectors',
141-
'cilium.identity.label_sources',
140+
"cilium.fqdn.selectors",
141+
"cilium.identity.label_sources",
142142
]
143143

144144
AGENT_V1_METRICS = [
@@ -236,14 +236,14 @@
236236

237237
AGENT_V1_METRICS_1_14 = [
238238
# E2E not updated yet to 1.14+ of Cilium
239-
'cilium.cidrgroup.policies',
240-
'cilium.k8s_client.rate_limiter_duration.seconds.count',
241-
'cilium.k8s_client.rate_limiter_duration.seconds.sum',
242-
'cilium.policy.change.total',
243-
'cilium.services.events.total',
239+
"cilium.cidrgroup.policies",
240+
"cilium.k8s_client.rate_limiter_duration.seconds.count",
241+
"cilium.k8s_client.rate_limiter_duration.seconds.sum",
242+
"cilium.policy.change.total",
243+
"cilium.services.events.total",
244244
# 1.16+
245-
'cilium.fqdn.selectors',
246-
'cilium.identity.label_sources',
245+
"cilium.fqdn.selectors",
246+
"cilium.identity.label_sources",
247247
]
248248

249249
# Some types changed moving from v1 to v2. We keep v2 in the metadata.csv file.
@@ -269,8 +269,8 @@
269269
"cilium.policy.implementation_delay.sum",
270270
"cilium.proxy.upstream_reply.seconds.count",
271271
"cilium.proxy.upstream_reply.seconds.sum",
272-
'cilium.k8s_client.rate_limiter_duration.seconds.count',
273-
'cilium.k8s_client.rate_limiter_duration.seconds.sum',
272+
"cilium.k8s_client.rate_limiter_duration.seconds.count",
273+
"cilium.k8s_client.rate_limiter_duration.seconds.sum",
274274
]
275275

276276
OPERATOR_V2_PROCESS_METRICS = [

‎cilium/tests/conftest.py

+29-29
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
IMAGE_NAME = "quay.io/cilium/cilium:v{}".format(CILIUM_VERSION)
3636
PORTS = [AGENT_PORT, OPERATOR_PORT]
37-
CLUSTER_NAME = 'cluster-{}-{}'.format('cilium', get_active_env())
37+
CLUSTER_NAME = "cluster-{}-{}".format("cilium", get_active_env())
3838

3939

4040
def setup_cilium():
@@ -110,7 +110,7 @@ def setup_cilium():
110110
)
111111
if result.stderr:
112112
raise Exception(result.stderr)
113-
pods = result.stdout.split(' ')
113+
pods = result.stdout.split(" ")
114114

115115
for pod in pods:
116116
result = run_command(
@@ -135,35 +135,35 @@ def setup_cilium():
135135

136136
def get_instances(agent_host, agent_port, operator_host, operator_port, use_openmetrics):
137137
return {
138-
'instances': [
138+
"instances": [
139139
{
140-
'agent_endpoint': 'http://{}:{}/metrics'.format(agent_host, agent_port),
141-
'use_openmetrics': use_openmetrics,
140+
"agent_endpoint": "http://{}:{}/metrics".format(agent_host, agent_port),
141+
"use_openmetrics": use_openmetrics,
142142
},
143143
{
144-
'operator_endpoint': 'http://{}:{}/metrics'.format(operator_host, operator_port),
145-
'use_openmetrics': use_openmetrics,
144+
"operator_endpoint": "http://{}:{}/metrics".format(operator_host, operator_port),
145+
"use_openmetrics": use_openmetrics,
146146
},
147147
]
148148
}
149149

150150

151-
@pytest.fixture(scope='session')
151+
@pytest.fixture(scope="session")
152152
def dd_environment():
153-
use_openmetrics = CILIUM_LEGACY == 'false'
154-
kind_config = os.path.join(HERE, 'kind', 'kind-config.yaml')
155-
with TempDir('helm_dir') as helm_dir:
153+
use_openmetrics = CILIUM_LEGACY == "false"
154+
kind_config = os.path.join(HERE, "kind", "kind-config.yaml")
155+
with TempDir("helm_dir") as helm_dir:
156156
with kind_run(
157157
conditions=[setup_cilium],
158158
kind_config=kind_config,
159159
env_vars={
160-
"HELM_CACHE_HOME": path_join(helm_dir, 'Caches'),
161-
"HELM_CONFIG_HOME": path_join(helm_dir, 'Preferences'),
160+
"HELM_CACHE_HOME": path_join(helm_dir, "Caches"),
161+
"HELM_CONFIG_HOME": path_join(helm_dir, "Preferences"),
162162
},
163163
) as kubeconfig:
164164
with ExitStack() as stack:
165165
ip_ports = [
166-
stack.enter_context(port_forward(kubeconfig, 'cilium', port, 'deployment', 'cilium-operator'))
166+
stack.enter_context(port_forward(kubeconfig, "cilium", port, "deployment", "cilium-operator"))
167167
for port in PORTS
168168
]
169169

@@ -176,50 +176,50 @@ def dd_environment():
176176

177177
@pytest.fixture(scope="session")
178178
def check():
179-
return lambda instance: CiliumCheck('cilium', {}, [instance])
179+
return lambda instance: CiliumCheck("cilium", {}, [instance])
180180

181181

182182
@pytest.fixture(scope="session")
183183
def agent_instance_use_openmetrics():
184184
return lambda use_openmetrics: {
185-
'agent_endpoint': AGENT_URL,
186-
'tags': ['pod_test'],
187-
'use_openmetrics': use_openmetrics,
185+
"agent_endpoint": AGENT_URL,
186+
"tags": ["pod_test"],
187+
"use_openmetrics": use_openmetrics,
188188
}
189189

190190

191191
@pytest.fixture
192192
def operator_instance_use_openmetrics():
193193
return lambda use_openmetrics: {
194-
'operator_endpoint': OPERATOR_URL,
195-
'tags': ['operator_test'],
196-
'use_openmetrics': use_openmetrics,
194+
"operator_endpoint": OPERATOR_URL,
195+
"tags": ["operator_test"],
196+
"use_openmetrics": use_openmetrics,
197197
}
198198

199199

200200
@pytest.fixture()
201201
def mock_agent_data():
202-
f_name = os.path.join(os.path.dirname(__file__), 'fixtures', 'agent_metrics.txt')
203-
with open(f_name, 'r') as f:
202+
f_name = os.path.join(os.path.dirname(__file__), "fixtures", "agent_metrics.txt")
203+
with open(f_name, "r") as f:
204204
text_data = f.read()
205205
with mock.patch(
206-
'requests.get',
206+
"requests.get",
207207
return_value=mock.MagicMock(
208-
status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
208+
status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={"Content-Type": "text/plain"}
209209
),
210210
):
211211
yield
212212

213213

214214
@pytest.fixture()
215215
def mock_operator_data():
216-
f_name = os.path.join(os.path.dirname(__file__), 'fixtures', 'operator_metrics.txt')
217-
with open(f_name, 'r') as f:
216+
f_name = os.path.join(os.path.dirname(__file__), "fixtures", "operator_metrics.txt")
217+
with open(f_name, "r") as f:
218218
text_data = f.read()
219219
with mock.patch(
220-
'requests.get',
220+
"requests.get",
221221
return_value=mock.MagicMock(
222-
status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={'Content-Type': "text/plain"}
222+
status_code=200, iter_lines=lambda **kwargs: text_data.split("\n"), headers={"Content-Type": "text/plain"}
223223
),
224224
):
225225
yield

0 commit comments

Comments
 (0)