Skip to content

Commit f7b67c5

Browse files
nsavoireszegedi
nsavoire
authored and
szegedi
committed
Add eslint rule for object-curly-newline (#3406)
1 parent ca809c3 commit f7b67c5

File tree

9 files changed

+144
-74
lines changed

9 files changed

+144
-74
lines changed

‎.eslintrc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"mocha/no-global-tests": 0,
3434
"mocha/no-exports": 0,
3535
"mocha/no-skipped-tests": 0,
36-
"n/no-restricted-require": [2, ["diagnostics_channel"]]
36+
"n/no-restricted-require": [2, ["diagnostics_channel"]],
37+
"object-curly-newline": ["error", {"multiline": true, "consistent": true }]
3738
}
3839
}

‎benchmark/sirun/get-results.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ const artifactsUrl = num =>
2222

2323
function get (url, headers) {
2424
return new Promise((resolve, reject) => {
25-
https.get(url, { headers: Object.assign({
26-
'user-agent': 'dd-results-retriever',
27-
accept: 'application/json'
28-
}, headers) }, async res => {
25+
https.get(url, {
26+
headers: Object.assign({
27+
'user-agent': 'dd-results-retriever',
28+
accept: 'application/json'
29+
}, headers)
30+
}, async res => {
2931
if (res.statusCode >= 300 && res.statusCode < 400) {
3032
resolve(get(res.headers.location))
3133
return

‎packages/datadog-plugin-elasticsearch/test/index.spec.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,11 @@ describe('Plugin', () => {
319319
before(() => {
320320
return agent.load('elasticsearch', {
321321
service: 'custom',
322-
hooks: { query: (span, params) => {
323-
span.addTags({ 'elasticsearch.params': 'foo', 'elasticsearch.method': params.method })
324-
} }
322+
hooks: {
323+
query: (span, params) => {
324+
span.addTags({ 'elasticsearch.params': 'foo', 'elasticsearch.method': params.method })
325+
}
326+
}
325327
})
326328
})
327329

‎packages/datadog-plugin-kafkajs/test/index.spec.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ describe('Plugin', () => {
298298
await consumer.run({
299299
eachMessage: async ({ topic, partition, message, heartbeat, pause }) => {
300300
expect(setDataStreamsContextSpy.args[0][0].hash).to.equal(expectedConsumerHash)
301-
} })
301+
}
302+
})
302303
setDataStreamsContextSpy.restore()
303304
})
304305
})

‎packages/datadog-plugin-openai/test/index.spec.js‎

Lines changed: 106 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ describe('Plugin', () => {
352352
'root': 'babbage',
353353
'parent': null
354354
}
355-
] }, [
355+
]
356+
}, [
356357
'Date', 'Mon, 15 May 2023 23:26:42 GMT',
357358
'Content-Type', 'application/json',
358359
'Content-Length', '63979',
@@ -1036,51 +1037,74 @@ describe('Plugin', () => {
10361037
'status': 'succeeded',
10371038
'fine_tuned_model': 'curie:ft-foo:deleteme-2023-05-18-20-44-56',
10381039
'events': [
1039-
{ 'object': 'fine-tune-event',
1040+
{
1041+
'object': 'fine-tune-event',
10401042
'level': 'info',
10411043
'message': 'Created fine-tune: ft-10RCfqSvgyEcauomw7VpiYco',
1042-
'created_at': 1684442489 },
1043-
{ 'object': 'fine-tune-event',
1044+
'created_at': 1684442489
1045+
},
1046+
{
1047+
'object': 'fine-tune-event',
10441048
'level': 'info',
10451049
'message': 'Fine-tune costs $0.00',
1046-
'created_at': 1684442612 },
1047-
{ 'object': 'fine-tune-event',
1050+
'created_at': 1684442612
1051+
},
1052+
{
1053+
'object': 'fine-tune-event',
10481054
'level': 'info',
10491055
'message': 'Fine-tune enqueued. Queue number: 0',
1050-
'created_at': 1684442612 },
1051-
{ 'object': 'fine-tune-event',
1056+
'created_at': 1684442612
1057+
},
1058+
{
1059+
'object': 'fine-tune-event',
10521060
'level': 'info',
10531061
'message': 'Fine-tune started',
1054-
'created_at': 1684442614 },
1055-
{ 'object': 'fine-tune-event',
1062+
'created_at': 1684442614
1063+
},
1064+
{
1065+
'object': 'fine-tune-event',
10561066
'level': 'info',
10571067
'message': 'Completed epoch 1/4',
1058-
'created_at': 1684442677 },
1059-
{ 'object': 'fine-tune-event',
1068+
'created_at': 1684442677
1069+
},
1070+
{
1071+
'object': 'fine-tune-event',
10601072
'level': 'info',
10611073
'message': 'Completed epoch 2/4',
1062-
'created_at': 1684442677 },
1063-
{ 'object': 'fine-tune-event',
1074+
'created_at': 1684442677
1075+
},
1076+
{
1077+
'object': 'fine-tune-event',
10641078
'level': 'info',
10651079
'message': 'Completed epoch 3/4',
1066-
'created_at': 1684442678 },
1067-
{ 'object': 'fine-tune-event',
1080+
'created_at': 1684442678
1081+
},
1082+
{
1083+
'object': 'fine-tune-event',
10681084
'level': 'info',
10691085
'message': 'Completed epoch 4/4',
1070-
'created_at': 1684442679 },
1071-
{ 'object': 'fine-tune-event',
1086+
'created_at': 1684442679
1087+
},
1088+
{
1089+
'object': 'fine-tune-event',
10721090
'level': 'info',
10731091
'message': 'Uploaded model: curie:ft-foo:deleteme-2023-05-18-20-44-56',
1074-
'created_at': 1684442696 },
1075-
{ 'object': 'fine-tune-event',
1092+
'created_at': 1684442696
1093+
},
1094+
{
1095+
'object': 'fine-tune-event',
10761096
'level': 'info',
10771097
'message': 'Uploaded result file: file-bJyf8TM0jeSZueBo4jpodZVQ',
1078-
'created_at': 1684442697 },
1079-
{ 'object': 'fine-tune-event',
1098+
'created_at': 1684442697
1099+
},
1100+
{
1101+
'object': 'fine-tune-event',
10801102
'level': 'info',
10811103
'message': 'Fine-tune succeeded',
1082-
'created_at': 1684442697 }
1083-
] }, [
1104+
'created_at': 1684442697
1105+
}
1106+
]
1107+
}, [
10841108
'Date', 'Thu, 18 May 2023 22:11:53 GMT',
10851109
'Content-Type', 'application/json',
10861110
'Content-Length', '2727',
@@ -1213,51 +1237,74 @@ describe('Plugin', () => {
12131237
.reply(200, {
12141238
'object': 'list',
12151239
'data': [
1216-
{ 'object': 'fine-tune-event',
1240+
{
1241+
'object': 'fine-tune-event',
12171242
'level': 'info',
12181243
'message': 'Created fine-tune: ft-10RCfqSvgyEcauomw7VpiYco',
1219-
'created_at': 1684442489 },
1220-
{ 'object': 'fine-tune-event',
1244+
'created_at': 1684442489
1245+
},
1246+
{
1247+
'object': 'fine-tune-event',
12211248
'level': 'info',
12221249
'message': 'Fine-tune costs $0.00',
1223-
'created_at': 1684442612 },
1224-
{ 'object': 'fine-tune-event',
1250+
'created_at': 1684442612
1251+
},
1252+
{
1253+
'object': 'fine-tune-event',
12251254
'level': 'info',
12261255
'message': 'Fine-tune enqueued. Queue number: 0',
1227-
'created_at': 1684442612 },
1228-
{ 'object': 'fine-tune-event',
1256+
'created_at': 1684442612
1257+
},
1258+
{
1259+
'object': 'fine-tune-event',
12291260
'level': 'info',
12301261
'message': 'Fine-tune started',
1231-
'created_at': 1684442614 },
1232-
{ 'object': 'fine-tune-event',
1262+
'created_at': 1684442614
1263+
},
1264+
{
1265+
'object': 'fine-tune-event',
12331266
'level': 'info',
12341267
'message': 'Completed epoch 1/4',
1235-
'created_at': 1684442677 },
1236-
{ 'object': 'fine-tune-event',
1268+
'created_at': 1684442677
1269+
},
1270+
{
1271+
'object': 'fine-tune-event',
12371272
'level': 'info',
12381273
'message': 'Completed epoch 2/4',
1239-
'created_at': 1684442677 },
1240-
{ 'object': 'fine-tune-event',
1274+
'created_at': 1684442677
1275+
},
1276+
{
1277+
'object': 'fine-tune-event',
12411278
'level': 'info',
12421279
'message': 'Completed epoch 3/4',
1243-
'created_at': 1684442678 },
1244-
{ 'object': 'fine-tune-event',
1280+
'created_at': 1684442678
1281+
},
1282+
{
1283+
'object': 'fine-tune-event',
12451284
'level': 'info',
12461285
'message': 'Completed epoch 4/4',
1247-
'created_at': 1684442679 },
1248-
{ 'object': 'fine-tune-event',
1286+
'created_at': 1684442679
1287+
},
1288+
{
1289+
'object': 'fine-tune-event',
12491290
'level': 'info',
12501291
'message': 'Uploaded model: curie:ft-foo:deleteme-2023-05-18-20-44-56',
1251-
'created_at': 1684442696 },
1252-
{ 'object': 'fine-tune-event',
1292+
'created_at': 1684442696
1293+
},
1294+
{
1295+
'object': 'fine-tune-event',
12531296
'level': 'info',
12541297
'message': 'Uploaded result file: file-bJyf8TM0jeSZueBo4jpodZVQ',
1255-
'created_at': 1684442697 },
1256-
{ 'object': 'fine-tune-event',
1298+
'created_at': 1684442697
1299+
},
1300+
{
1301+
'object': 'fine-tune-event',
12571302
'level': 'info',
12581303
'message': 'Fine-tune succeeded',
1259-
'created_at': 1684442697 }
1260-
] }, [
1304+
'created_at': 1684442697
1305+
}
1306+
]
1307+
}, [
12611308
'Date', 'Thu, 18 May 2023 22:47:17 GMT',
12621309
'Content-Type', 'application/json',
12631310
'Content-Length', '1718',
@@ -1377,15 +1424,20 @@ describe('Plugin', () => {
13771424
'status': 'cancelled',
13781425
'fine_tuned_model': 'idk',
13791426
'events': [
1380-
{ 'object': 'fine-tune-event',
1427+
{
1428+
'object': 'fine-tune-event',
13811429
'level': 'info',
13821430
'message': 'Created fine-tune: ft-TVpNqwlvermMegfRVqSOyPyS',
1383-
'created_at': 1684452102 },
1384-
{ 'object': 'fine-tune-event',
1431+
'created_at': 1684452102
1432+
},
1433+
{
1434+
'object': 'fine-tune-event',
13851435
'level': 'info',
13861436
'message': 'Fine-tune cancelled',
1387-
'created_at': 1684452103 }
1388-
] }, [
1437+
'created_at': 1684452103
1438+
}
1439+
]
1440+
}, [
13891441
'Date', 'Thu, 18 May 2023 23:21:43 GMT',
13901442
'Content-Type', 'application/json',
13911443
'Content-Length', '1042',
@@ -2021,7 +2073,8 @@ describe('Plugin', () => {
20212073
'avg_logprob': -0.7777707236153739,
20222074
'compression_ratio': 0.6363636363636364,
20232075
'no_speech_prob': 0.043891049921512604,
2024-
'transient': false }],
2076+
'transient': false
2077+
}],
20252078
'text': 'Hello, friend.'
20262079
}, [
20272080
'Date', 'Fri, 19 May 2023 03:19:49 GMT',

‎packages/datadog-plugin-opensearch/test/index.spec.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,11 @@ describe('Plugin', () => {
225225
before(() => {
226226
return agent.load('opensearch', {
227227
service: 'custom',
228-
hooks: { query: (span, params) => {
229-
span.addTags({ 'opensearch.params': 'foo', 'opensearch.method': params.method })
230-
} }
228+
hooks: {
229+
query: (span, params) => {
230+
span.addTags({ 'opensearch.params': 'foo', 'opensearch.method': params.method })
231+
}
232+
}
231233
})
232234
})
233235

‎packages/dd-trace/src/appsec/iast/taint-tracking/index.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
'use strict'
22

33
const { enableRewriter, disableRewriter } = require('./rewriter')
4-
const { createTransaction,
4+
const {
5+
createTransaction,
56
removeTransaction,
67
setMaxTransactions,
78
enableTaintOperations,
8-
disableTaintOperations } = require('./operations')
9+
disableTaintOperations
10+
} = require('./operations')
911

1012
const taintTrackingPlugin = require('./plugin')
1113

‎packages/dd-trace/test/appsec/iast/analyzers/path-traversal-analyzer.spec.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ describe('path-traversal-analyzer', () => {
103103

104104
it('Should report 1st argument', () => {
105105
const proxyPathAnalyzer = proxyquire('../../../../src/appsec/iast/analyzers/path-traversal-analyzer',
106-
{ './injection-analyzer': InjectionAnalyzer,
106+
{
107+
'./injection-analyzer': InjectionAnalyzer,
107108
'../iast-context': { getIastContext: () => iastContext }
108109
})
109110

‎packages/dd-trace/test/profiling/profilers/wall.spec.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ describe('profilers/native/wall', () => {
4848

4949
sinon.assert.calledOnce(pprof.time.start)
5050
sinon.assert.calledWith(pprof.time.start,
51-
{ intervalMicros: 1e6 / 99,
51+
{
52+
intervalMicros: 1e6 / 99,
5253
durationMillis: 60000,
5354
sourceMapper: undefined,
5455
withContexts: false,
55-
lineNumbers: false })
56+
lineNumbers: false
57+
})
5658
})
5759

5860
it('should use the provided configuration options', () => {
@@ -63,11 +65,13 @@ describe('profilers/native/wall', () => {
6365
profiler.stop()
6466

6567
sinon.assert.calledWith(pprof.time.start,
66-
{ intervalMicros: 500,
68+
{
69+
intervalMicros: 500,
6770
durationMillis: 60000,
6871
sourceMapper: undefined,
6972
withContexts: false,
70-
lineNumbers: false })
73+
lineNumbers: false
74+
})
7175
})
7276

7377
it('should not stop when not started', () => {
@@ -134,10 +138,12 @@ describe('profilers/native/wall', () => {
134138
profiler.stop()
135139

136140
sinon.assert.calledWith(pprof.time.start,
137-
{ intervalMicros: 1e6 / 99,
141+
{
142+
intervalMicros: 1e6 / 99,
138143
durationMillis: 60000,
139144
sourceMapper: mapper,
140145
withContexts: false,
141-
lineNumbers: false })
146+
lineNumbers: false
147+
})
142148
})
143149
})

0 commit comments

Comments
 (0)