build: Upgrade eslint-config-wikimedia to 0.28.2 and make pass

jdforrester · jdforrester · commit 54e3bb82335e · 2024-06-25T10:59:08.000-04:00
Almost all auto-fixes, with a few manual clean-ups. This is also an
opportunity to commit the result of `npm audit fix`.
diff --git a/lib/base_service.js b/lib/base_service.js
@@ -294,6 +294,7 @@ class BaseService {
 
 	/**
 	 * Get environment variable values or the defaults
+	 *
 	 * @param {Object|string} config configuration
 	 * @return {string} env var value or default
 	 * @private
@@ -317,6 +318,7 @@ class BaseService {
 
 	/**
 	 * Loads the config from file, serialized input or Object
+	 *
 	 * @param {undefined|Object|string} conf a configuration.
 	 *             If undefined - config is loaded from config.yaml file
 	 *             If Object - treated as already parsed configuration
@@ -373,6 +375,7 @@ class BaseService {
 
 	/**
 	 * Updates the config and sets instance properties.
+	 *
 	 * @param {undefined|Object|string} conf a configuration.
 	 *             If undefined - config is loaded from config.yaml file
 	 *             If Object - treated as already parsed configuration
@@ -437,6 +440,7 @@ class BaseService {
 	/**
 	 * Exits the process with a provided exit code with a little delay
 	 * to allow asynchronous logging to complete.
+	 *
 	 * @param {number} [returnCode=0] exit code
 	 * @return {Promise}
 	 * @protected
diff --git a/lib/docker.js b/lib/docker.js
@@ -38,6 +38,7 @@ class SpawnError extends Error {
 /**
  * Wraps a child process spawn in a promise which resolves
  * when the child process exists.
+ *
  * @param {Array}   args     the command and its arguments to run (uses /usr/bin/env)
  * @param {Object}  options  various execution options; attributes:
  *   - {Boolean} capture        whether to capture stdout and return its contents
@@ -104,6 +105,7 @@ function promisedSpawn( args, options ) {
 
 /**
  * Generates the Dockerfile used to build the image and start the container
+ *
  * @return {Promise} the promise which creates the image file
  */
 function createDockerFile() {
@@ -192,8 +194,7 @@ function createDockerFile() {
 	contents += `RUN apt-get update && apt-get install -y ${ extraPkgs.join( ' ' ) } && rm -rf /var/lib/apt/lists/*\n`; /**/
 
 	if ( customSourcePkgs.length ) {
-		contents += `RUN echo > /etc/apt/sources.list && ${ customSourcePkgs.map( ( customSourcePkgSpec ) =>
-			`echo deb "${ customSourcePkgSpec.repo_url } ${ customSourcePkgSpec.release } ${ customSourcePkgSpec.pool }" >> /etc/apt/sources.list` ).join( ' && ' ) }\n`;
+		contents += `RUN echo > /etc/apt/sources.list && ${ customSourcePkgs.map( ( customSourcePkgSpec ) => `echo deb "${ customSourcePkgSpec.repo_url } ${ customSourcePkgSpec.release } ${ customSourcePkgSpec.pool }" >> /etc/apt/sources.list` ).join( ' && ' ) }\n`;
 		contents += `RUN apt-get update && ${ customSourcePkgs.map( ( customSourcePkgSpec ) => `apt-get install -y --force-yes -t ${ customSourcePkgSpec.release } ${ customSourcePkgSpec.packages.join( ' ' ) }` ).join( ' && ' ) } && rm -rf /var/lib/apt/lists/*\n`; /**/
 	}
 
@@ -258,6 +259,7 @@ function createDockerFile() {
 
 /**
  * Spawns a docker process which (re)builds the image
+ *
  * @return {Promise} the promise starting the build
  */
 function buildImg() {
@@ -271,6 +273,7 @@ function buildImg() {
 
 /**
  * Starts the container and returns once it has finished executing
+ *
  * @param {Array} args the array of extra parameters to pass, optional
  * @param {boolean} hidePorts whether to keep the ports hidden inside the container, optional
  * @return {Promise} the promise starting the container
@@ -303,6 +306,7 @@ function startContainer( args, hidePorts ) {
 /**
  * Verify that Docker is installed and that the minimum version is 1.8 (1.12 Mac)
  * or terminate the runner.
+ *
  * @return {boolean} true if Docker is installed and > min version
  */
 function ensureDockerVersion() {
@@ -330,6 +334,7 @@ function ensureDockerVersion() {
  * Updates the deploy repository to current master and
  * rebuilds the node modules, committing and git-review-ing
  * the result
+ *
  * @return {Promise}
  */
 function updateDeploy() {
@@ -450,8 +455,9 @@ function updateDeploy() {
 				opts.submodule_ref,
 				opts.submodule ] );
 		}
-	} ).then( () => // make sure the package.json symlink is in place
-		fs.symlinkAsync( `${ opts.submodule }/package.json`, 'package.json' )
+	} ).then(
+		// make sure the package.json symlink is in place
+		() => fs.symlinkAsync( `${ opts.submodule }/package.json`, 'package.json' )
 			.catch( () => {} ).then( () => promisedGit( [ 'add', 'package.json' ] ) ) ).then( () => {
 		if ( !opts.need_build ) {
 			return;
@@ -490,10 +496,12 @@ function updateDeploy() {
 					];
 				}
 				return promisedSpawn( findAttr, { capture: true, ignoreErr: true } );
-			} ).then( () => // add the built submodules
-				promisedGit( [ 'add', 'node_modules' ] ) );
-	} ).then( () => // commit the changes
-		promisedGit( [ 'commit', '-m', opts.commit_msg ] ) )
+			} ).then( // add the built submodules
+				() => promisedGit( [ 'add', 'node_modules' ] )
+			);
+	} )
+		// commit the changes
+		.then( () => promisedGit( [ 'commit', '-m', opts.commit_msg ] ) )
 		.then( () => {
 			if ( !opts.review ) {
 				console.log( '\n\nChanges are sitting in the sync-repo branch in' );
@@ -516,6 +524,7 @@ function updateDeploy() {
 
 /**
  * Determines the UID and GID to run under in the container
+ *
  * @return {Promise} a promise resolving when the check is done
  */
 function getUid() {
diff --git a/lib/logger.js b/lib/logger.js
@@ -245,6 +245,7 @@ class Logger {
 	 *
 	 * If the message should be logged, returns an object with bunyan log level
 	 * and a specialized logger for the given component, otherwise returns undefined
+	 *
 	 * @param {string} levelPath a logging level + component (e.g. 'warn/component_name')
 	 * @return {Object|undefined} corresponding bunyan log level and a specialized logger
 	 * @private
@@ -268,6 +269,7 @@ class Logger {
 	 *
 	 * If the level is higher than the configured minimal level, returns it,
 	 * Otherwise returns undefined.
+	 *
 	 * @param {string} level a logging level
 	 * @return {string|undefined} corresponding bunyan log level
 	 * @private
@@ -339,6 +341,7 @@ class Logger {
 
 	/**
 	 * Logs and info object with a specified level
+	 *
 	 * @param {string} level Log level and components, for example 'trace/request'
 	 * @param {Object|Function} info log statement object, or a callback to lazily construct
 	 *                               the log statement after we've decided that this particular
diff --git a/lib/master.js b/lib/master.js
@@ -89,9 +89,7 @@ class Master extends BaseService {
 
 	_start() {
 		// Start Prometheus Metrics Endpoint
-		const prometheus_config = this.config.metrics.find( ( o ) => {
-			return o.type === 'prometheus';
-		} );
+		const prometheus_config = this.config.metrics.find( ( o ) => o.type === 'prometheus' );
 		if ( prometheus_config ) {
 			this.prometheusServer = new PrometheusServer(
 				prometheus_config,
@@ -311,6 +309,7 @@ class Master extends BaseService {
 	/**
 	 * Checks times of the heartbeats for each worker
 	 * killing workers that were inactive for too long
+	 *
 	 * @private
 	 */
 	_setupHeartbeatCheck() {
@@ -343,6 +342,7 @@ class Master extends BaseService {
 
 	/**
 	 * Saves the timestamp of a worker heartbeat
+	 *
 	 * @param {Object} worker
 	 * @private
 	 */
diff --git a/lib/metrics/index.js b/lib/metrics/index.js
@@ -64,9 +64,7 @@ class Metrics {
 	}
 
 	fetchClient( name ) {
-		return this.clients.find( ( client ) => {
-			return client.constructor.name === name;
-		} );
+		return this.clients.find( ( client ) => client.constructor.name === name );
 	}
 
 	// Example Options:
diff --git a/lib/ratelimiter.js b/lib/ratelimiter.js
@@ -36,6 +36,7 @@ class RateLimiterMaster {
 
 	/**
 	 * Initialize the internal limiter.
+	 *
 	 * @return {Promise<RateLimiter>}
 	 */
 	setup() {
@@ -96,6 +97,7 @@ class RateLimiterWorker {
 
 	/**
 	 * Synchronous limit check
+	 *
 	 * @param {string} key
 	 * @param {number} limit
 	 * @param {number} increment default 1
@@ -122,6 +124,7 @@ class RateLimiterWorker {
 
 	/**
 	 * Checks whether we're above the limit without updating the counters.
+	 *
 	 * @param {string} key
 	 * @param {number} limit
 	 * @return {boolean} `true` if above the limit
diff --git a/lib/worker.js b/lib/worker.js
@@ -108,9 +108,9 @@ class Worker extends BaseService {
 
 	_start() {
 		if ( cluster.isWorker ) {
-			cluster.worker.on( 'disconnect', () =>
-				this.stop()
-					.then( () => this._exitProcess( 0 ) ) );
+			cluster.worker.on(
+				'disconnect', () => this.stop().then( () => this._exitProcess( 0 ) )
+			);
 		}
 
 		// Enable heap dumps in /tmp on kill -USR2.
@@ -189,10 +189,11 @@ class Worker extends BaseService {
 			};
 
 			return this._requireModule( service.module || service.name )
-				.then( ( svcMod ) => {
-					return service.entrypoint ?
-						svcMod[ service.entrypoint ]( opts ) : svcMod( opts );
-				} );
+				.then(
+					( svcMod ) => service.entrypoint ?
+						svcMod[ service.entrypoint ]( opts ) :
+						svcMod( opts )
+				);
 		} )
 			.then( ( res ) => {
 				let ret = res;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ class Metrics {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`fetchClient( name ) {`
`67`		`- return this.clients.find( ( client ) => {`
`68`		`- return client.constructor.name === name;`
`69`		`- } );`
	`67`	`+ return this.clients.find( ( client ) => client.constructor.name === name );`
`70`	`68`	`}`
`71`	`69`
`72`	`70`	`// Example Options:`