Skip to content

Add eslint rule for object-curly-newline #3406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2023
Merged

Add eslint rule for object-curly-newline #3406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"mocha/no-global-tests": 0,
"mocha/no-exports": 0,
"mocha/no-skipped-tests": 0,
"n/no-restricted-require": [2, ["diagnostics_channel"]]
"n/no-restricted-require": [2, ["diagnostics_channel"]],
"object-curly-newline": ["error", {"multiline": true, "consistent": true }]
}
}
10 changes: 6 additions & 4 deletions benchmark/sirun/get-results.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ const artifactsUrl = num =>

function get (url, headers) {
return new Promise((resolve, reject) => {
https.get(url, { headers: Object.assign({
'user-agent': 'dd-results-retriever',
accept: 'application/json'
}, headers) }, async res => {
https.get(url, {
headers: Object.assign({
'user-agent': 'dd-results-retriever',
accept: 'application/json'
}, headers)
}, async res => {
if (res.statusCode >= 300 && res.statusCode < 400) {
resolve(get(res.headers.location))
return
Expand Down
8 changes: 5 additions & 3 deletions packages/datadog-plugin-elasticsearch/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,11 @@ describe('Plugin', () => {
before(() => {
return agent.load('elasticsearch', {
service: 'custom',
hooks: { query: (span, params) => {
span.addTags({ 'elasticsearch.params': 'foo', 'elasticsearch.method': params.method })
} }
hooks: {
query: (span, params) => {
span.addTags({ 'elasticsearch.params': 'foo', 'elasticsearch.method': params.method })
}
}
})
})

Expand Down
3 changes: 2 additions & 1 deletion packages/datadog-plugin-kafkajs/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,8 @@ describe('Plugin', () => {
await consumer.run({
eachMessage: async ({ topic, partition, message, heartbeat, pause }) => {
expect(setDataStreamsContextSpy.args[0][0].hash).to.equal(expectedConsumerHash)
} })
}
})
setDataStreamsContextSpy.restore()
})
})
Expand Down
159 changes: 106 additions & 53 deletions packages/datadog-plugin-openai/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@ describe('Plugin', () => {
'root': 'babbage',
'parent': null
}
] }, [
]
}, [
'Date', 'Mon, 15 May 2023 23:26:42 GMT',
'Content-Type', 'application/json',
'Content-Length', '63979',
Expand Down Expand Up @@ -1000,51 +1001,74 @@ describe('Plugin', () => {
'status': 'succeeded',
'fine_tuned_model': 'curie:ft-foo:deleteme-2023-05-18-20-44-56',
'events': [
{ 'object': 'fine-tune-event',
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Created fine-tune: ft-10RCfqSvgyEcauomw7VpiYco',
'created_at': 1684442489 },
{ 'object': 'fine-tune-event',
'created_at': 1684442489
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune costs $0.00',
'created_at': 1684442612 },
{ 'object': 'fine-tune-event',
'created_at': 1684442612
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune enqueued. Queue number: 0',
'created_at': 1684442612 },
{ 'object': 'fine-tune-event',
'created_at': 1684442612
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune started',
'created_at': 1684442614 },
{ 'object': 'fine-tune-event',
'created_at': 1684442614
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 1/4',
'created_at': 1684442677 },
{ 'object': 'fine-tune-event',
'created_at': 1684442677
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 2/4',
'created_at': 1684442677 },
{ 'object': 'fine-tune-event',
'created_at': 1684442677
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 3/4',
'created_at': 1684442678 },
{ 'object': 'fine-tune-event',
'created_at': 1684442678
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 4/4',
'created_at': 1684442679 },
{ 'object': 'fine-tune-event',
'created_at': 1684442679
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Uploaded model: curie:ft-foo:deleteme-2023-05-18-20-44-56',
'created_at': 1684442696 },
{ 'object': 'fine-tune-event',
'created_at': 1684442696
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Uploaded result file: file-bJyf8TM0jeSZueBo4jpodZVQ',
'created_at': 1684442697 },
{ 'object': 'fine-tune-event',
'created_at': 1684442697
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune succeeded',
'created_at': 1684442697 }
] }, [
'created_at': 1684442697
}
]
}, [
'Date', 'Thu, 18 May 2023 22:11:53 GMT',
'Content-Type', 'application/json',
'Content-Length', '2727',
Expand Down Expand Up @@ -1177,51 +1201,74 @@ describe('Plugin', () => {
.reply(200, {
'object': 'list',
'data': [
{ 'object': 'fine-tune-event',
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Created fine-tune: ft-10RCfqSvgyEcauomw7VpiYco',
'created_at': 1684442489 },
{ 'object': 'fine-tune-event',
'created_at': 1684442489
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune costs $0.00',
'created_at': 1684442612 },
{ 'object': 'fine-tune-event',
'created_at': 1684442612
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune enqueued. Queue number: 0',
'created_at': 1684442612 },
{ 'object': 'fine-tune-event',
'created_at': 1684442612
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune started',
'created_at': 1684442614 },
{ 'object': 'fine-tune-event',
'created_at': 1684442614
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 1/4',
'created_at': 1684442677 },
{ 'object': 'fine-tune-event',
'created_at': 1684442677
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 2/4',
'created_at': 1684442677 },
{ 'object': 'fine-tune-event',
'created_at': 1684442677
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 3/4',
'created_at': 1684442678 },
{ 'object': 'fine-tune-event',
'created_at': 1684442678
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Completed epoch 4/4',
'created_at': 1684442679 },
{ 'object': 'fine-tune-event',
'created_at': 1684442679
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Uploaded model: curie:ft-foo:deleteme-2023-05-18-20-44-56',
'created_at': 1684442696 },
{ 'object': 'fine-tune-event',
'created_at': 1684442696
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Uploaded result file: file-bJyf8TM0jeSZueBo4jpodZVQ',
'created_at': 1684442697 },
{ 'object': 'fine-tune-event',
'created_at': 1684442697
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune succeeded',
'created_at': 1684442697 }
] }, [
'created_at': 1684442697
}
]
}, [
'Date', 'Thu, 18 May 2023 22:47:17 GMT',
'Content-Type', 'application/json',
'Content-Length', '1718',
Expand Down Expand Up @@ -1341,15 +1388,20 @@ describe('Plugin', () => {
'status': 'cancelled',
'fine_tuned_model': 'idk',
'events': [
{ 'object': 'fine-tune-event',
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Created fine-tune: ft-TVpNqwlvermMegfRVqSOyPyS',
'created_at': 1684452102 },
{ 'object': 'fine-tune-event',
'created_at': 1684452102
},
{
'object': 'fine-tune-event',
'level': 'info',
'message': 'Fine-tune cancelled',
'created_at': 1684452103 }
] }, [
'created_at': 1684452103
}
]
}, [
'Date', 'Thu, 18 May 2023 23:21:43 GMT',
'Content-Type', 'application/json',
'Content-Length', '1042',
Expand Down Expand Up @@ -1985,7 +2037,8 @@ describe('Plugin', () => {
'avg_logprob': -0.7777707236153739,
'compression_ratio': 0.6363636363636364,
'no_speech_prob': 0.043891049921512604,
'transient': false }],
'transient': false
}],
'text': 'Hello, friend.'
}, [
'Date', 'Fri, 19 May 2023 03:19:49 GMT',
Expand Down
8 changes: 5 additions & 3 deletions packages/datadog-plugin-opensearch/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,11 @@ describe('Plugin', () => {
before(() => {
return agent.load('opensearch', {
service: 'custom',
hooks: { query: (span, params) => {
span.addTags({ 'opensearch.params': 'foo', 'opensearch.method': params.method })
} }
hooks: {
query: (span, params) => {
span.addTags({ 'opensearch.params': 'foo', 'opensearch.method': params.method })
}
}
})
})

Expand Down
6 changes: 4 additions & 2 deletions packages/dd-trace/src/appsec/iast/taint-tracking/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
'use strict'

const { enableRewriter, disableRewriter } = require('./rewriter')
const { createTransaction,
const {
createTransaction,
removeTransaction,
setMaxTransactions,
enableTaintOperations,
disableTaintOperations } = require('./operations')
disableTaintOperations
} = require('./operations')

const taintTrackingPlugin = require('./plugin')

Expand Down
3 changes: 2 additions & 1 deletion packages/dd-trace/test/appsec/iast/analyzers/path-traversal-analyzer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ describe('path-traversal-analyzer', () => {

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

Expand Down
18 changes: 12 additions & 6 deletions packages/dd-trace/test/profiling/profilers/wall.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,13 @@ describe('profilers/native/wall', () => {

sinon.assert.calledOnce(pprof.time.start)
sinon.assert.calledWith(pprof.time.start,
{ intervalMicros: 1e6 / 99,
{
intervalMicros: 1e6 / 99,
durationMillis: 60000,
sourceMapper: undefined,
withContexts: false,
lineNumbers: false })
lineNumbers: false
})
})

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

sinon.assert.calledWith(pprof.time.start,
{ intervalMicros: 500,
{
intervalMicros: 500,
durationMillis: 60000,
sourceMapper: undefined,
withContexts: false,
lineNumbers: false })
lineNumbers: false
})
})

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

sinon.assert.calledWith(pprof.time.start,
{ intervalMicros: 1e6 / 99,
{
intervalMicros: 1e6 / 99,
durationMillis: 60000,
sourceMapper: mapper,
withContexts: false,
lineNumbers: false })
lineNumbers: false
})
})
})