Skip to content

Commit bd129c3

Browse files
Merge pull request #196 from alanconway/main
NO-JIRA: chore: Lint formatting of netflow files. No code change.
2 parents dad73c1 + ea53450 commit bd129c3

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

web/src/__tests__/netflow.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ describe('NetflowNode.fromQuery', () => {
4747
url: `netflow-traffic?tenant=network&filters=${encodeURIComponent(
4848
'dst_kind=Pod;src_namespace="openshift-oauth-apiserver","tracing-app-k6"',
4949
)}&startTime=1742896800&endTime=1742940000`,
50-
query: 'netflow:network:{DstK8S_Type="Pod",SrcK8S_Namespace=~"openshift-oauth-apiserver|tracing-app-k6"}',
50+
query:
51+
'netflow:network:{DstK8S_Type="Pod",SrcK8S_Namespace=~"openshift-oauth-apiserver|tracing-app-k6"}',
5152
constraint: {
5253
start: '2025-03-25T10:00:00.000Z',
5354
end: '2025-03-25T22:00:00.000Z',
@@ -77,7 +78,8 @@ describe('NetflowNode.fromURL', () => {
7778
url: `netflow-traffic?tenant=network&filters=${encodeURIComponent(
7879
'dst_kind=Pod;dst_namespace=hostpath-provisioner;src_namespace="openshift-oauth-apiserver","tracing-app-k6"',
7980
)}`,
80-
query: 'netflow:network:{DstK8S_Type="Pod",DstK8S_Namespace="hostpath-provisioner",SrcK8S_Namespace=~"openshift-oauth-apiserver|tracing-app-k6"}',
81+
query:
82+
'netflow:network:{DstK8S_Type="Pod",DstK8S_Namespace="hostpath-provisioner",SrcK8S_Namespace=~"openshift-oauth-apiserver|tracing-app-k6"}',
8183
},
8284
])(`from $url`, ({ query, url }) =>
8385
expect(new NetflowDomain().linkToQuery(new URIRef(url))).toEqual(Query.parse(query)),

web/src/korrel8r/netflow.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class NetflowDomain extends Domain {
4747
const quotedValues = value?.match(/"([^"]+)"/g);
4848
if (quotedValues && quotedValues.length > 1) {
4949
// Extract the actual values (remove quotes)
50-
const values = quotedValues.map(v => v.slice(1, -1));
50+
const values = quotedValues.map((v) => v.slice(1, -1));
5151
// Convert to LogQL regex syntax with OR operator
5252
return `${linkToQueryName[key]}=~"${values.join('|')}"`;
5353
}
@@ -78,7 +78,10 @@ export class NetflowDomain extends Domain {
7878
if (queryToURLName[key]) {
7979
// If operator is =~ and value contains |, convert to comma-separated quoted format
8080
if (operator === '=~' && value.includes('|')) {
81-
const values = value.split('|').map(v => `"${v}"`).join(',');
81+
const values = value
82+
.split('|')
83+
.map((v) => `"${v}"`)
84+
.join(',');
8285
return `${queryToURLName[key]}=${values}`;
8386
}
8487
return `${queryToURLName[key]}${operator}${value}`;

0 commit comments

Comments
 (0)