NONE eslint config util directories (#2470)

* NONE eslint config util directories

* Add middleware directory

Author: atraversatlassian

.eslintrc.json

@@ -120,15 +120,11 @@
 	},
 	{
 		"files": [
-			"src/*.ts",
-			"src/config/**",
 			"src/github/**",
 			"src/jira/**",
-			"src/middleware/**",
 			"src/models/**",
 			"src/sync/**",
-			"src/transforms/**",
-			"src/util/**"
+			"src/transforms/**"
 		],
 		"rules": {
 			// To be removed later

db/config.json

@@ -1,42 +1,63 @@
 {
-  "development": {
-    "dialect": "postgres",
-    "use_env_variable": "DATABASE_URL",
+	"development": {
+		"dialect": "postgres",
+		"use_env_variable": "DATABASE_URL",
+		"disable_sql_logging": false,
+		"ssl": false,
+		"dialectOptions": {
+			"ssl": false
+		},
 		"pool": {
 			"acquire": 60000,
 			"max": 15,
 			"min": 0,
 			"idle": 10000
 		}
-  },
-  "test": {
-    "dialect": "postgres",
-    "use_env_variable": "DATABASE_URL"
-  },
+	},
+	"test": {
+		"dialect": "postgres",
+		"use_env_variable": "DATABASE_URL",
+		"disable_sql_logging": false,
+		"ssl": false,
+		"dialectOptions": {
+			"ssl": false
+		},
+		"pool": {
+			"acquire": 60000,
+			"max": 15,
+			"min": 0,
+			"idle": 10000
+		}
+	},
 	"e2e": {
 		"dialect": "postgres",
 		"use_env_variable": "DATABASE_URL",
+		"disable_sql_logging": false,
+		"ssl": false,
+		"dialectOptions": {
+			"ssl": false
+		},
 		"pool": {
 			"acquire": 60000,
 			"max": 15,
 			"min": 0,
 			"idle": 10000
 		}
 	},
-  "production": {
-    "dialect": "postgres",
-    "use_env_variable": "DATABASE_URL",
-    "disable_sql_logging": true,
-    "ssl": false,
-    "dialectOptions": {
-      "ssl": false
-    },
-    "pool": {
+	"production": {
+		"dialect": "postgres",
+		"use_env_variable": "DATABASE_URL",
+		"disable_sql_logging": true,
+		"ssl": false,
+		"dialectOptions": {
+			"ssl": false
+		},
+		"pool": {
 			"max": 15,
 			"min": 0,
 			"idle": 10000
-    }
-  },
+		}
+	},
 	"production-migrate": {
 		"dialect": "postgres",
 		"use_env_variable": "PG_DATABASE_URL",

package.json

@@ -64,8 +64,12 @@
 		"@octokit/graphql-schema": "^10.73.0",
 		"@sentry/node": "^6.8.0",
 		"@types/event-loop-lag": "^1.0.30",
+		"@types/express-sslify": "^1.2.3",
+		"@types/glob": "^8.1.0",
+		"@types/http-proxy": "^1.17.12",
 		"@types/safe-json-stringify": "^1.1.2",
 		"@types/sanitize-html": "^2.9.0",
+		"@types/throng": "^5.0.5",
 		"@types/yaml": "^1.9.7",
 		"atlassian-jwt": "^2.0.0",
 		"aws-sdk": "^2.1015.0",

src/app.ts

@@ -1,10 +1,12 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import express, { Express, NextFunction, Request, Response } from "express";
 import path from "path";
 import { registerHandlebarsPartials } from "utils/handlebars/handlebar-partials";
 import { registerHandlebarsHelpers } from "utils/handlebars/handlebar-helpers";
 import crypto from "crypto";
 import { elapsedTimeMetrics } from "config/statsd";
-import sslify from "express-sslify";
+import { HTTPS } from "express-sslify";
 import helmet from "helmet";
 import { RootRouter } from "routes/router";
 import { proxyLocalUIForDev } from "~/src/spa-proxy";
@@ -37,16 +39,17 @@ const secureHeaders = (app: Express) => {
 		next();
 	});
 
+	const appUrl = process.env.APP_URL || "";
 	// Content Security Policy
 	app.use(helmet.contentSecurityPolicy({
 		useDefaults: true,
 		directives: {
 			defaultSrc: ["'self'"],
 			// Allow <script> tags hosted by ourselves and from atlassian when inserted into an iframe
-			scriptSrc: ["'self'", process.env.APP_URL, "https://*.atlassian.net", "https://*.jira.com", "https://connect-cdn.atl-paas.net/",
+			scriptSrc: ["'self'", appUrl, "https://*.atlassian.net", "https://*.jira.com", "https://connect-cdn.atl-paas.net/",
 				"'unsafe-inline'", "'strict-dynamic'", (_: Request, res: Response): string => `'nonce-${res.locals.nonce as string}'`],
 			// Allow XMLHttpRequest/fetch requests
-			connectSrc: ["'self'", process.env.APP_URL],
+			connectSrc: ["'self'", appUrl],
 			// Allow <style> tags hosted by ourselves as well as style="" attributes
 			styleSrc: ["'self'", "'unsafe-inline'"],
 			// Allow using github-for-jira pages as iframes only in jira
@@ -89,7 +92,7 @@ export const getFrontendApp = (): Express => {
 	app.use(elapsedTimeMetrics);
 
 	if (process.env.FORCE_HTTPS) {
-		app.use(sslify.HTTPS({ trustProtoHeader: true }));
+		app.use(HTTPS({ trustProtoHeader: true }));
 	}
 
 	setupFrontendApp(app);

src/config/cidr-validator.ts

@@ -11,7 +11,7 @@
  * @param {string} ip - The IP to convert to an integer
  * @returns {number} Integer representation of the IP Address
  */
-const ip4ToInt = (ip) =>
+const ip4ToInt = (ip: string): number =>
 	ip.split(".").reduce((int, oct) => (int << 8) + parseInt(oct, 10), 0) >>> 0;
 
 /**
@@ -20,9 +20,9 @@ const ip4ToInt = (ip) =>
  * @param {string} ip - The IP Address in question
  * @returns {Function} A function to compare an IP to the CIDR
  */
-const isIp4InCidr = (ip) => (cidr) => {
-	const [range, bits = 32] = cidr.split("/");
-	const mask = ~(2 ** (32 - bits) - 1);
+const isIp4InCidr = (ip: string) => (cidr: string) => {
+	const [range, bits = "32"] = cidr.split("/");
+	const mask = ~(2 ** (32 - parseInt(bits)) - 1);
 	return (ip4ToInt(ip) & mask) === (ip4ToInt(range) & mask);
 };
 

src/config/env.ts

@@ -6,7 +6,7 @@ import { getNodeEnv } from "utils/is-node-env";
 import { EnvironmentEnum, MicrosEnvTypeEnum } from "interfaces/common";
 import { envCheck } from "utils/env-utils";
 
-const nodeEnv: EnvironmentEnum = EnvironmentEnum[getNodeEnv()];
+const nodeEnv: EnvironmentEnum = getNodeEnv();
 
 // Load environment files
 [
@@ -23,7 +23,7 @@ type Transforms<T, K extends keyof T = keyof T> = {
 };
 
 const transforms: Transforms<EnvVars> = {
-	MICROS_ENV: (value?: string) => EnvironmentEnum[value || EnvironmentEnum.development],
+	MICROS_ENV: (value?: string) =>  EnvironmentEnum[value || ""] as EnvironmentEnum || EnvironmentEnum.development,
 	MICROS_GROUP: (value?: string) => value || "",
 	NODE_ENV: () => nodeEnv,
 	S3_DUMPS_BUCKET_NAME: (value?: string) => value ?? "",

src/config/feature-flags.ts

@@ -70,7 +70,7 @@ const getLaunchDarklyValue = async <T = boolean | string | number>(flag: Boolean
 	try {
 		await launchdarklyClient.waitForInitialization();
 		const user = createLaunchdarklyUser(key);
-		return launchdarklyClient.variation(flag, user, defaultValue);
+		return launchdarklyClient.variation(flag, user, defaultValue) as Promise<T>;
 	} catch (err: unknown) {
 		logger.error({ flag, err }, "Error resolving value for feature flag");
 		return defaultValue;
@@ -102,7 +102,7 @@ export const shouldSendAll = async (type: ShouldSendAllStringTypes, jiraHost: st
 		// Full set:
 		// ["branches-backfill", "builds-backfill", "commits-backfill", "deployments-backfill", "prs-backfill", "branches", "builds", "commits", "deployments", "prs"]
 		const sendAllString = await stringFlag(StringFlags.SEND_ALL, "[]", jiraHost);
-		const sendAllArray: string[] = JSON.parse(sendAllString);
+		const sendAllArray: string[] = JSON.parse(sendAllString) as string[];
 		return Array.isArray(sendAllArray) && sendAllArray.includes(type);
 	} catch (e: unknown) {
 		logger.error({ err: e, type }, "Cannot define if should send all");
@@ -113,7 +113,7 @@ export const shouldSendAll = async (type: ShouldSendAllStringTypes, jiraHost: st
 export const isBlocked = async (jiraHost: string, installationId: number, logger: Logger): Promise<boolean> => {
 	try {
 		const blockedInstallationsString = await stringFlag(StringFlags.BLOCKED_INSTALLATIONS, "[]", jiraHost);
-		const blockedInstallations: number[] = JSON.parse(blockedInstallationsString);
+		const blockedInstallations: number[] = JSON.parse(blockedInstallationsString) as number[];
 		return Array.isArray(blockedInstallations) && blockedInstallations.includes(installationId);
 	} catch (e: unknown) {
 		logger.error({ err: e, installationId }, "Cannot define if isBlocked");

src/config/logger.ts

@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import Logger, { createLogger, LogLevel, Serializers, Stream } from "bunyan";
 import { isArray, isString, merge, omit, mapKeys } from "lodash";
 import { SafeRawLogStream } from "utils/logger-utils";
@@ -8,7 +13,7 @@ const REPO_URL_REGEX = /^(\/api\/v3)?\/repos\/([^/]+)\/([^/]+)\/(.*)$/;
 
 const maybeRemoveOrgAndRepo = (url: string) => {
 	if (url.match(REPO_URL_REGEX)) {
-		return url.replace(REPO_URL_REGEX, (_, maybeV3Prefix, org, repo, rest) => {
+		return url.replace(REPO_URL_REGEX, (_, maybeV3Prefix: string, org: string, repo: string, rest: string) => {
 			return [
 				maybeV3Prefix,
 				"repos",
@@ -26,7 +31,7 @@ const COMPARE_URL_REGEX = /^(.*)\/compare\/(.*)\.\.\.(.*)$/;
 const isCompareUrl = (url: string) => url.match(COMPARE_URL_REGEX);
 
 const removeBranchesFromCompareUrl = (url: string) =>
-	url.replace(COMPARE_URL_REGEX, (_, prefix, branch1, branch2) => {
+	url.replace(COMPARE_URL_REGEX, (_, prefix: string, branch1: string, branch2: string) => {
 		return [
 			prefix,
 			"compare",
@@ -40,7 +45,7 @@ const GIT_REF_URL_REGEX = /^(.*)\/git\/ref\/([^/]+)$/;
 const isGitRefUrl = (url: string) => url.match(GIT_REF_URL_REGEX);
 
 const removeGitRefFromUrl = (url: string) =>
-	url.replace(GIT_REF_URL_REGEX, (_, prefix: string, gitRef) =>
+	url.replace(GIT_REF_URL_REGEX, (_, prefix: string, gitRef: string) =>
 		`${prefix}/git/ref/${createHashWithSharedSecret(decodeURIComponent(gitRef))}`
 	);
 
@@ -49,7 +54,7 @@ const USERS_URL_REGEX = /^(\/api\/v3)?\/users\/([^/]+)$/;
 const isUsersUrl = (url: string) => url.match(USERS_URL_REGEX);
 
 const removeUserFromUrl = (url: string) =>
-	url.replace(USERS_URL_REGEX, (_, maybeV3Prefix, userName) =>
+	url.replace(USERS_URL_REGEX, (_, maybeV3Prefix: string, userName: string) =>
 		[
 			maybeV3Prefix,
 			"users",
@@ -62,7 +67,7 @@ const REST_DEVINFO_BRANCH_URL_REGEX = /^\/rest\/devinfo\/([^/]+)\/repository\/([
 const isDevInfoBranchUrl = (url: string) => url.match(REST_DEVINFO_BRANCH_URL_REGEX);
 
 const removeBranchFromDevInfoUrl = (url: string) =>
-	url.replace(REST_DEVINFO_BRANCH_URL_REGEX, (_, version, repoNo, branchaName, updateSequenceId: string) =>
+	url.replace(REST_DEVINFO_BRANCH_URL_REGEX, (_, version: string, repoNo: string, branchaName: string, updateSequenceId: string) =>
 		[
 			"/rest/devinfo",
 			version,
@@ -85,26 +90,26 @@ const JIRA_HOST_QUERY_PARAM_REGEX = /jiraHost=(https%3A%2F%2F[\w-]+\.atlassian\.
 
 const maybeCensorJiraHostInQueryParams = (url: string) => {
 	if (url.match(JIRA_HOST_QUERY_PARAM_REGEX)) {
-		return url.replace(JIRA_HOST_QUERY_PARAM_REGEX, (_, jiraHostEncoded) =>
+		return url.replace(JIRA_HOST_QUERY_PARAM_REGEX, (_, jiraHostEncoded: string) =>
 			`jiraHost=${createHashWithSharedSecret(decodeURIComponent(jiraHostEncoded))}`);
 	}
 	return url;
 };
 
 
 const removeOwnersAndReposFromUrl = (url: string) =>
-	url.replace(CREATE_BRANCH_PAGE_BRANCHES_URL_REGEX, (_, prefix, owners, repos, suffix) =>
+	url.replace(CREATE_BRANCH_PAGE_BRANCHES_URL_REGEX, (_, prefix: string, owners: string, repos: string, suffix: string) =>
 		[
 			prefix,
 			"owners",
 			createHashWithSharedSecret(decodeURIComponent(owners)),
 			"repos",
 			createHashWithSharedSecret(decodeURIComponent(repos)),
 			"branches"
-		].join("/") + (suffix as string)
+		].join("/") + suffix
 	);
 
-const censorUrl = (url) => {
+const censorUrl = (url: string): string => {
 	if (!url) {
 		return url;
 	}
@@ -146,13 +151,13 @@ const censorUrl = (url) => {
 
 const MSG_WITH_REPO_NAME_REGEX = /^(.*) Repository with the name '(.*)\/(.*)'.$/;
 
-const censorMessage = (msg) => {
+const censorMessage = (msg: string): string => {
 	if (!msg) {
 		return msg;
 	}
 	if (typeof msg === "string") {
 		if (msg.match(MSG_WITH_REPO_NAME_REGEX)) {
-			return msg.replace(MSG_WITH_REPO_NAME_REGEX, (_, prefix, orgName, repoName) => {
+			return msg.replace(MSG_WITH_REPO_NAME_REGEX, (_, prefix: string, orgName: string, repoName: string) => {
 				return [
 					prefix,
 					"Repository with the name",

src/config/statsd.ts

@@ -103,7 +103,7 @@ export const elapsedTimeMetrics = (
 	res.once("finish", () => {
 		const elapsedTime = elapsedTimeInMs();
 		const statusCode = `${res.statusCode}`;
-		const path = (req.baseUrl || "") + (req.route?.path as string || "/*");
+		const path = (req.baseUrl || "") + ((req.route as { path?: string; })?.path || "/*");
 		const tags = { path, method, statusCode };
 		(req.log || logger).debug(`${method} request executed in ${elapsedTime} with status ${statusCode} path ${path}`);
 

src/main.ts

@@ -95,6 +95,8 @@ if (isNodeProd()) {
 			troubleshootUnresponsiveWorkers_worker();
 		},
 		lifetime: Infinity
+	}).catch((err: unknown) => {
+		getLogger("frontend-app").error({ err }, "Error running frontend-app");
 	});
 } else {
 	// Dev/test single process, don't need clustering