Skip to content

Commit db8b47f

Browse files
nsavoirensavoire
committed
Add eslint rule for object-curly-newline
1 parent b3413ff commit db8b47f

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
@@ -316,7 +316,8 @@ describe('Plugin', () => {
316316
'root': 'babbage',
317317
'parent': null
318318
}
319-
] }, [
319+
]
320+
}, [
320321
'Date', 'Mon, 15 May 2023 23:26:42 GMT',
321322
'Content-Type', 'application/json',
322323
'Content-Length', '63979',
@@ -1000,51 +1001,74 @@ describe('Plugin', () => {
10001001
'status': 'succeeded',
10011002
'fine_tuned_model': 'curie:ft-foo:deleteme-2023-05-18-20-44-56',
10021003
'events': [
1003-
{ 'object': 'fine-tune-event',
1004+
{
1005+
'object': 'fine-tune-event',
10041006
'level': 'info',
10051007
'message': 'Created fine-tune: ft-10RCfqSvgyEcauomw7VpiYco',
1006-
'created_at': 1684442489 },
1007-
{ 'object': 'fine-tune-event',
1008+
'created_at': 1684442489
1009+
},
1010+
{
1011+
'object': 'fine-tune-event',
10081012
'level': 'info',
10091013
'message': 'Fine-tune costs $0.00',
1010-
'created_at': 1684442612 },
1011-
{ 'object': 'fine-tune-event',
1014+
'created_at': 1684442612
1015+
},
1016+
{
1017+
'object': 'fine-tune-event',
10121018
'level': 'info',
10131019
'message': 'Fine-tune enqueued. Queue number: 0',
1014-
'created_at': 1684442612 },
1015-
{ 'object': 'fine-tune-event',
1020+
'created_at': 1684442612
1021+
},
1022+
{
1023+
'object': 'fine-tune-event',
10161024
'level': 'info',
10171025
'message': 'Fine-tune started',
1018-
'created_at': 1684442614 },
1019-
{ 'object': 'fine-tune-event',
1026+
'created_at': 1684442614
1027+
},
1028+
{
1029+
'object': 'fine-tune-event',
10201030
'level': 'info',
10211031
'message': 'Completed epoch 1/4',
1022-
'created_at': 1684442677 },
1023-
{ 'object': 'fine-tune-event',
1032+
'created_at': 1684442677
1033+
},
1034+
{
1035+
'object': 'fine-tune-event',
10241036
'level': 'info',
10251037
'message': 'Completed epoch 2/4',
1026-
'created_at': 1684442677 },
1027-
{ 'object': 'fine-tune-event',
1038+
'created_at': 1684442677
1039+
},
1040+
{
1041+
'object': 'fine-tune-event',
10281042
'level': 'info',
10291043
'message': 'Completed epoch 3/4',
1030-
'created_at': 1684442678 },
1031-
{ 'object': 'fine-tune-event',
1044+
'created_at': 1684442678
1045+
},
1046+
{
1047+
'object': 'fine-tune-event',
10321048
'level': 'info',
10331049
'message': 'Completed epoch 4/4',
1034-
'created_at': 1684442679 },
1035-
{ 'object': 'fine-tune-event',
1050+
'created_at': 1684442679
1051+
},
1052+
{
1053+
'object': 'fine-tune-event',
10361054
'level': 'info',
10371055
'message': 'Uploaded model: curie:ft-foo:deleteme-2023-05-18-20-44-56',
1038-
'created_at': 1684442696 },
1039-
{ 'object': 'fine-tune-event',
1056+
'created_at': 1684442696
1057+
},
1058+
{
1059+
'object': 'fine-tune-event',
10401060
'level': 'info',
10411061
'message': 'Uploaded result file: file-bJyf8TM0jeSZueBo4jpodZVQ',
1042-
'created_at': 1684442697 },
1043-
{ 'object': 'fine-tune-event',
1062+
'created_at': 1684442697
1063+
},
1064+
{
1065+
'object': 'fine-tune-event',
10441066
'level': 'info',
10451067
'message': 'Fine-tune succeeded',
1046-
'created_at': 1684442697 }
1047-
] }, [
1068+
'created_at': 1684442697
1069+
}
1070+
]
1071+
}, [
10481072
'Date', 'Thu, 18 May 2023 22:11:53 GMT',
10491073
'Content-Type', 'application/json',
10501074
'Content-Length', '2727',
@@ -1177,51 +1201,74 @@ describe('Plugin', () => {
11771201
.reply(200, {
11781202
'object': 'list',
11791203
'data': [
1180-
{ 'object': 'fine-tune-event',
1204+
{
1205+
'object': 'fine-tune-event',
11811206
'level': 'info',
11821207
'message': 'Created fine-tune: ft-10RCfqSvgyEcauomw7VpiYco',
1183-
'created_at': 1684442489 },
1184-
{ 'object': 'fine-tune-event',
1208+
'created_at': 1684442489
1209+
},
1210+
{
1211+
'object': 'fine-tune-event',
11851212
'level': 'info',
11861213
'message': 'Fine-tune costs $0.00',
1187-
'created_at': 1684442612 },
1188-
{ 'object': 'fine-tune-event',
1214+
'created_at': 1684442612
1215+
},
1216+
{
1217+
'object': 'fine-tune-event',
11891218
'level': 'info',
11901219
'message': 'Fine-tune enqueued. Queue number: 0',
1191-
'created_at': 1684442612 },
1192-
{ 'object': 'fine-tune-event',
1220+
'created_at': 1684442612
1221+
},
1222+
{
1223+
'object': 'fine-tune-event',
11931224
'level': 'info',
11941225
'message': 'Fine-tune started',
1195-
'created_at': 1684442614 },
1196-
{ 'object': 'fine-tune-event',
1226+
'created_at': 1684442614
1227+
},
1228+
{
1229+
'object': 'fine-tune-event',
11971230
'level': 'info',
11981231
'message': 'Completed epoch 1/4',
1199-
'created_at': 1684442677 },
1200-
{ 'object': 'fine-tune-event',
1232+
'created_at': 1684442677
1233+
},
1234+
{
1235+
'object': 'fine-tune-event',
12011236
'level': 'info',
12021237
'message': 'Completed epoch 2/4',
1203-
'created_at': 1684442677 },
1204-
{ 'object': 'fine-tune-event',
1238+
'created_at': 1684442677
1239+
},
1240+
{
1241+
'object': 'fine-tune-event',
12051242
'level': 'info',
12061243
'message': 'Completed epoch 3/4',
1207-
'created_at': 1684442678 },
1208-
{ 'object': 'fine-tune-event',
1244+
'created_at': 1684442678
1245+
},
1246+
{
1247+
'object': 'fine-tune-event',
12091248
'level': 'info',
12101249
'message': 'Completed epoch 4/4',
1211-
'created_at': 1684442679 },
1212-
{ 'object': 'fine-tune-event',
1250+
'created_at': 1684442679
1251+
},
1252+
{
1253+
'object': 'fine-tune-event',
12131254
'level': 'info',
12141255
'message': 'Uploaded model: curie:ft-foo:deleteme-2023-05-18-20-44-56',
1215-
'created_at': 1684442696 },
1216-
{ 'object': 'fine-tune-event',
1256+
'created_at': 1684442696
1257+
},
1258+
{
1259+
'object': 'fine-tune-event',
12171260
'level': 'info',
12181261
'message': 'Uploaded result file: file-bJyf8TM0jeSZueBo4jpodZVQ',
1219-
'created_at': 1684442697 },
1220-
{ 'object': 'fine-tune-event',
1262+
'created_at': 1684442697
1263+
},
1264+
{
1265+
'object': 'fine-tune-event',
12211266
'level': 'info',
12221267
'message': 'Fine-tune succeeded',
1223-
'created_at': 1684442697 }
1224-
] }, [
1268+
'created_at': 1684442697
1269+
}
1270+
]
1271+
}, [
12251272
'Date', 'Thu, 18 May 2023 22:47:17 GMT',
12261273
'Content-Type', 'application/json',
12271274
'Content-Length', '1718',
@@ -1341,15 +1388,20 @@ describe('Plugin', () => {
13411388
'status': 'cancelled',
13421389
'fine_tuned_model': 'idk',
13431390
'events': [
1344-
{ 'object': 'fine-tune-event',
1391+
{
1392+
'object': 'fine-tune-event',
13451393
'level': 'info',
13461394
'message': 'Created fine-tune: ft-TVpNqwlvermMegfRVqSOyPyS',
1347-
'created_at': 1684452102 },
1348-
{ 'object': 'fine-tune-event',
1395+
'created_at': 1684452102
1396+
},
1397+
{
1398+
'object': 'fine-tune-event',
13491399
'level': 'info',
13501400
'message': 'Fine-tune cancelled',
1351-
'created_at': 1684452103 }
1352-
] }, [
1401+
'created_at': 1684452103
1402+
}
1403+
]
1404+
}, [
13531405
'Date', 'Thu, 18 May 2023 23:21:43 GMT',
13541406
'Content-Type', 'application/json',
13551407
'Content-Length', '1042',
@@ -1985,7 +2037,8 @@ describe('Plugin', () => {
19852037
'avg_logprob': -0.7777707236153739,
19862038
'compression_ratio': 0.6363636363636364,
19872039
'no_speech_prob': 0.043891049921512604,
1988-
'transient': false }],
2040+
'transient': false
2041+
}],
19892042
'text': 'Hello, friend.'
19902043
}, [
19912044
'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)