upgrade eslint, eslint-plugin-n, eslint-config-standard (VULN-5530)

.eslintignore

@@ -6,4 +6,4 @@ node_modules
 versions
 acmeair-nodejs
 vendor
-integration-tests/esbuild/out.js
+integration-tests/esbuild/*out*.js

.eslintrc.json

@@ -16,24 +16,50 @@
     "es2020": true
   },
   "rules": {
+    "array-bracket-spacing": 0,
+    "dot-notation": 0,
+    "handle-callback-err": 0,
     "max-len": [2, 120, 2],
-    "no-var": 2,
+    "multiline-ternary": 0,
     "no-console": 2,
-    "prefer-const": 2,
+    "no-prototype-builtins": 0,
+    "no-var": 2,
+    "no-void": 0,
+    "object-curly-newline": ["error", {"multiline": true, "consistent": true }],
     "object-curly-spacing": [2, "always"],
+    "object-shorthand": 0,
+    "prefer-const": 2,
+    "prefer-regex-literals": 0,
+    "quote-props": 0,
+    "quotes": 0,
+
     "import/no-extraneous-dependencies": 2,
-    "standard/no-callback-literal": 0,
-    "no-prototype-builtins": 0,
+
+    "mocha/max-top-level-suites": 0,
+    "mocha/no-exports": 0,
+    "mocha/no-global-tests": 0,
+    "mocha/no-identical-title": 0,
     "mocha/no-mocha-arrows": 0,
     "mocha/no-setup-in-describe": 0,
     "mocha/no-sibling-hooks": 0,
+    "mocha/no-skipped-tests": 0,
     "mocha/no-top-level-hooks": 0,
+
     "mocha/max-top-level-suites": 0,
-    "mocha/no-identical-title": 0,
-    "mocha/no-global-tests": 0,
     "mocha/no-exports": 0,
+    "mocha/no-global-tests": 0,
+    "mocha/no-identical-title": 0,
+    "mocha/no-mocha-arrows": 0,
+    "mocha/no-setup-in-describe": 0,
+    "mocha/no-sibling-hooks": 0,
     "mocha/no-skipped-tests": 0,
+    "mocha/no-top-level-hooks": 0,
+    "n/handle-callback-err": 0,
+    "n/no-callback-literal": 0,
+    "n/no-deprecated-api": 0,
+    "n/no-path-concat": 0,
     "n/no-restricted-require": [2, ["diagnostics_channel"]],
-    "object-curly-newline": ["error", {"multiline": true, "consistent": true }]
+
+    "standard/no-callback-literal": 0
   }
 }

LICENSE-3rdparty.csv

@@ -48,7 +48,6 @@ dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
 dev,eslint-plugin-mocha,MIT,Copyright 2014 Mathias Schreck
 dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
-dev,eslint-plugin-node,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors
 dev,eslint-plugin-standard,MIT,Copyright 2015 Jamund Ferguson
 dev,express,MIT,Copyright 2009-2014 TJ Holowaychuk 2013-2014 Roman Shtylman 2014-2015 Douglas Christopher Wilson

benchmark/e2e/express-helloworld-manyroutes/app.js

@@ -1,4 +1,3 @@
-
 const crypto = require('crypto')
 const app = require('express')()
 

benchmark/sirun/appsec-iast/insecure-bank.js

@@ -1,4 +1,5 @@
 const http = require('http')
+// eslint-disable-next-line import/no-absolute-path
 const app = require('/opt/insecure-bank-js/app')
 
 const { port } = require('./common')

benchmark/sirun/appsec/insecure-bank.js

@@ -1,4 +1,5 @@
 const http = require('http')
+// eslint-disable-next-line import/no-absolute-path
 const app = require('/opt/insecure-bank-js/app')
 
 const { port } = require('./common')

benchmark/sirun/scope/index.js

@@ -1,4 +1,3 @@
-
 const {
   DD_TRACE_SCOPE,
   COUNT

integration-tests/ci-visibility/features/support/steps.js

@@ -4,12 +4,15 @@ class Greeter {
   sayFarewell () {
     return 'farewell'
   }
+
   sayGreetings () {
     return 'greetings'
   }
+
   sayYo () {
     return 'yo'
   }
+
   sayYeah () {
     return 'yeah whatever'
   }

integration-tests/ci-visibility/jestEnvironmentBadInit.js

@@ -3,4 +3,5 @@ require('dd-trace').init({
   service: 'dd-trace-bad-init'
 })
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 module.exports = require('jest-environment-node')

integration-tests/ci-visibility/run-jest-bad-init.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const jest = require('jest')
 
 const options = {

integration-tests/ci-visibility/run-jest.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 const jest = require('jest')
 
 const options = {

node-upstream-tests/node/run_tests.js

@@ -244,6 +244,7 @@ class TestResult {
     this.isPass = null
     this.isIgnore = null
   }
+
   async init () {
     this.isPass = this.rc === 0
 
@@ -257,6 +258,7 @@ class TestResult {
 
     return this
   }
+
   errorMessage () {
     let message = ''
     message += `Test output: rc ${this.rc}\n`

package.json

@@ -115,12 +115,11 @@
     "cli-table3": "^0.6.3",
     "dotenv": "16.3.1",
     "esbuild": "0.16.12",
-    "eslint": "^8.23.0",
-    "eslint-config-standard": "^11.0.0-beta.0",
+    "eslint": "^8.56.0",
+    "eslint-config-standard": "^17",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
     "express": "^4.18.2",

packages/datadog-instrumentations/src/fs.js

@@ -1,4 +1,3 @@
-
 'use strict'
 
 const {

packages/datadog-plugin-couchbase/src/index.js

@@ -61,6 +61,7 @@ class CouchBasePlugin extends StoragePlugin {
     this._addCommandSubs('append')
     this._addCommandSubs('prepend')
   }
+
   _addCommandSubs (name) {
     this.addSubs(name, ({ bucket, collection, seedNodes }) => {
       const store = storage.getStore()

packages/datadog-plugin-fs/test/index.spec.js

@@ -1348,11 +1348,11 @@ describe('Plugin', () => {
               'file.path': __filename
             }
           })
-          fs.exists(__filename, () => {}) // eslint-disable-line node/no-deprecated-api
+          fs.exists(__filename, () => {}) // eslint-disable-line n/no-deprecated-api
         })
 
         it('should support promisification', () => {
-          const exists = util.promisify(fs.exists) // eslint-disable-line node/no-deprecated-api
+          const exists = util.promisify(fs.exists) // eslint-disable-line n/no-deprecated-api
 
           return exists(__filename)
         })

packages/datadog-plugin-http2/test/server.spec.js

@@ -9,6 +9,7 @@ class MockAbortController {
   constructor () {
     this.signal = new EventEmitter()
   }
+
   abort () {
     this.signal.emit('abort')
   }

packages/datadog-plugin-jest/src/index.js

@@ -46,6 +46,7 @@ class JestPlugin extends CiPlugin {
     }
     return this.unskippableSuites
   }
+
   getForcedToRunSuites (forcedToRunSuitesList) {
     if (!this.forcedToRunSuites) {
       this.forcedToRunSuites = JSON.parse(forcedToRunSuitesList)

packages/datadog-plugin-next/test/integration-test/client.spec.js

@@ -7,6 +7,7 @@ const {
   checkSpansForServiceName,
   spawnPluginIntegrationTestProc
 } = require('../../../../integration-tests/helpers')
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { assert } = require('chai')
 const { NODE_MAJOR } = require('../../../../version')
 

packages/datadog-plugin-next/test/next.config.js

@@ -1,5 +1,6 @@
 // Build config dynamically for ease in testing and modification
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 const { satisfies } = require('semver')
 
 const { VERSION } = process.env // Next.js version to dynamically modify parts

packages/dd-trace/src/appsec/iast/analyzers/cookie-analyzer.js

@@ -34,6 +34,7 @@ class CookieAnalyzer extends Analyzer {
   _getExcludedPaths () {
     return EXCLUDED_PATHS
   }
+
   _checkOCE (context, value) {
     if (value && value.location) {
       return true

packages/dd-trace/src/appsec/iast/analyzers/hsts-header-missing-analyzer.js

@@ -9,6 +9,7 @@ class HstsHeaderMissingAnalyzer extends MissingHeaderAnalyzer {
   constructor () {
     super(HSTS_HEADER_MISSING, HSTS_HEADER_NAME)
   }
+
   _isVulnerableFromRequestAndResponse (req, res) {
     const headerValues = this._getHeaderValues(res, HSTS_HEADER_NAME)
     return this._isHttpsProtocol(req) && (

packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -1,4 +1,3 @@
-
 const fs = require('fs')
 const path = require('path')
 

packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js

@@ -10,6 +10,7 @@ class TestApiManualPlugin extends CiPlugin {
   static get id () {
     return 'test-api-manual'
   }
+
   constructor (...args) {
     super(...args)
     this.sourceRoot = process.cwd()

packages/dd-trace/src/exporters/span-stats/writer.js

@@ -1,4 +1,3 @@
-
 const { SpanStatsEncoder } = require('../../encode/span-stats')
 
 const pkg = require('../../../../../package.json')

packages/dd-trace/src/opentelemetry/span.js

@@ -161,9 +161,11 @@ class Span {
   get resource () {
     return this._parentTracer.resource
   }
+
   get instrumentationLibrary () {
     return this._parentTracer.instrumentationLibrary
   }
+
   get _spanProcessor () {
     return this._parentTracer.getActiveSpanProcessor()
   }

packages/dd-trace/src/plugins/database.js

@@ -20,6 +20,7 @@ class DatabasePlugin extends StoragePlugin {
       encodedDdpv: ''
     }
   }
+
   encodingServiceTags (serviceTag, encodeATag, spanConfig) {
     if (serviceTag !== spanConfig) {
       this.serviceTags[serviceTag] = spanConfig

packages/dd-trace/src/service-naming/schemas/v1/storage.js

@@ -1,4 +1,3 @@
-
 function configWithFallback ({ tracerService, pluginConfig }) {
   return pluginConfig.service || tracerService
 }

packages/dd-trace/src/span_processor.js

@@ -54,6 +54,7 @@ class SpanProcessor {
     }
 
     if (this._killAll) {
+      // eslint-disable-next-line array-callback-return
       started.map(startedSpan => {
         if (!startedSpan._finished) {
           startedSpan.finish()

packages/dd-trace/src/telemetry/dependencies.js

@@ -22,6 +22,7 @@ let updateRetryData
 
 function createBatchPayload (payload) {
   const batchPayload = []
+  // eslint-disable-next-line array-callback-return
   payload.map(item => {
     batchPayload.push({
       request_type: item.reqType,

packages/dd-trace/src/telemetry/index.js

@@ -203,6 +203,7 @@ function getTelemetryData () {
 
 function createBatchPayload (payload) {
   const batchPayload = []
+  // eslint-disable-next-line array-callback-return
   payload.map(item => {
     batchPayload.push({
       request_type: item.reqType,

packages/dd-trace/src/telemetry/send-data.js

@@ -1,4 +1,3 @@
-
 const request = require('../exporters/common/request')
 const log = require('../log')
 const { isTrue } = require('../util')

packages/dd-trace/src/util.js

@@ -32,13 +32,6 @@ function globMatch (pattern, subject) {
     if (px < pattern.length) {
       const c = pattern[px]
       switch (c) {
-        default: // ordinary character
-          if (sx < subject.length && subject[sx] === c) {
-            px++
-            sx++
-            continue
-          }
-          break
         case '?':
           if (sx < subject.length) {
             px++
@@ -51,6 +44,13 @@ function globMatch (pattern, subject) {
           nextSx = sx + 1
           px++
           continue
+        default: // ordinary character
+          if (sx < subject.length && subject[sx] === c) {
+            px++
+            sx++
+            continue
+          }
+          break
       }
     }
     if (nextSx > 0 && nextSx <= subject.length) {

packages/dd-trace/test/appsec/iast/iast-plugin.spec.js

@@ -37,6 +37,7 @@ describe('IAST Plugin', () => {
         addSub (channelName, handler) {
           addSubMock(channelName, handler)
         }
+
         configure (config) {
           configureMock(config)
         }
@@ -191,6 +192,7 @@ describe('IAST Plugin', () => {
         addSub (channelName, handler) {
           addSubMock(channelName, handler)
         }
+
         configure (config) {
           configureMock(config)
         }

packages/dd-trace/test/appsec/iast/path-line.spec.js

@@ -9,12 +9,15 @@ class CallSiteMock {
     this.lineNumber = lineNumber
     this.columnNumber = columnNumber
   }
+
   getLineNumber () {
     return this.lineNumber
   }
+
   getColumnNumber () {
     return this.columnNumber
   }
+
   getFileName () {
     return this.fileName
   }

packages/dd-trace/test/proxy.spec.js

@@ -80,9 +80,11 @@ describe('TracerProxy', () => {
         constructor (cfg) {
           dogstatsdConfig = cfg
         }
+
         increment () {
           dogstatsdIncrements.push(arguments)
         }
+
         flush () {
           dogstatsdFlushes++
         }

scripts/check-proposal-labels.js

@@ -57,6 +57,7 @@ ${withoutExclusionStderr}
         const commitsHashesWithoutExclusions = withoutExclusionStdout.split('\n')
         if (commitsHashesWithExclusions.length !== commitsHashesWithoutExclusions.length) {
           const commitsWithInvalidLabels = []
+          // eslint-disable-next-line array-callback-return
           commitsHashesWithoutExclusions.filter(c1 => {
             if (!commitsHashesWithExclusions.some(c2 => c2 === c1)) {
               commitsWithInvalidLabels.push(c1)