NONE: Re-enable more lint rules (#2596)

atraversatlassian · web-flow · commit 433ada0f036d · 2023-12-05T15:30:55.000+11:00
* NONE: Re-enable more lint rules

* Fix broken lint
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -125,8 +125,7 @@
 			"src/jira/**",
 			"src/models/**",
 			"src/sync/**",
-			"src/transforms/**",
-			"src/util/**"
+			"src/transforms/**"
 		],
 		"rules": {
 			// To be removed later
diff --git a/src/models/subscription.ts b/src/models/subscription.ts
@@ -50,12 +50,12 @@ export class Subscription extends Model {
 	isSecurityPermissionsAccepted: boolean;
 
 	static async getAllForHost(jiraHost: string, gitHubAppId?: number): Promise<Subscription[]> {
-		return this.findAll({
+		return await this.findAll({
 			where: {
 				...(gitHubAppId !== undefined && { gitHubAppId }), // Add gitHubAppId only if passed
 				jiraHost
 			}
-		});
+		}) || [];
 	}
 
 	static getAllForInstallation(
diff --git a/src/routes/jira/jira-delete.test.ts b/src/routes/jira/jira-delete.test.ts
@@ -34,6 +34,7 @@ describe("DELETE /jira/configuration", () => {
 		};
 
 		mocked(Subscription.getSingleInstallation).mockResolvedValue(subscription);
+		mocked(Subscription.getAllForHost).mockResolvedValue([]);
 		mocked(Installation.getForHost).mockResolvedValue(installation);
 	});
 
diff --git a/src/util/axios/url-params-middleware.ts b/src/util/axios/url-params-middleware.ts
@@ -19,7 +19,7 @@ const logger = getLogger("url-params");
 export const urlParamsMiddleware = (config: AxiosRequestConfig): AxiosRequestConfig => {
 	const uri = () => `${config.baseURL || ""}${config.url || ""}`;
 	// If uri is empty and there's no url params, just skip this middleware
-	if (!uri()?.length) {
+	if (!uri().length) {
 		return config;
 	}
 
@@ -35,7 +35,7 @@ export const urlParamsMiddleware = (config: AxiosRequestConfig): AxiosRequestCon
 			}
 			const key = `{${k}}`;
 			const value = encodeURIComponent(String(v));
-			if (!value.length || !uri()?.includes(key)) {
+			if (!value.length || !uri().includes(key)) {
 				logger.error({ key, value, config }, "URL Param doesn't exist in url path - ignoring");
 				return;
 			}
diff --git a/src/util/create-url-with-query-string.ts b/src/util/create-url-with-query-string.ts
@@ -9,6 +9,7 @@ import { Request } from "express";
  */
 export const createUrlWithQueryString = (req: Request, URL: string): string => {
 	let queryString = "";
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	const keys = req.query ? Object.keys(req.query) : [];
 	const queryStrings = keys.reduce((_, current, index, array) => {
 		if (req.query[current]) {
diff --git a/src/util/filtering-http-logs-stream.ts b/src/util/filtering-http-logs-stream.ts
@@ -20,7 +20,7 @@ export const filteringHttpLogsStream = (filteringLoggerName: string, out: Writab
 		write: (chunk: unknown, encoding: BufferEncoding, next) => {
 			//TODO Remove this code when there will be convenient way to do it in Probot.
 			//See https://github.com/probot/probot/issues/1577
-			if (String(chunk)?.match(`${filteringLoggerName}.*(GET|POST|DELETE|PUT|PATCH) /`)) {
+			if (String(chunk).match(`${filteringLoggerName}.*(GET|POST|DELETE|PUT|PATCH) /`)) {
 				out.write(chunk, encoding);
 			}
 			next();
diff --git a/src/util/get-github-client-config.test.ts b/src/util/get-github-client-config.test.ts
@@ -127,15 +127,15 @@ describe("user client", () => {
 		gheApiNock.get("/user")
 			.matchHeader("ApiKeyHeader", "super-key")
 			.reply(200);
-		const client = await createUserClient("MY_TOKEN", jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp?.id);
+		const client = await createUserClient("MY_TOKEN", jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp.id);
 		const response = await client.getUser();
 		expect(response.status).toStrictEqual(200);
 	});
 
 	it("should not inject API key when provided", async () => {
 		gheApiNock.get("/user")
 			.reply(200);
-		const client = await createUserClient("MY_TOKEN", jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp?.id);
+		const client = await createUserClient("MY_TOKEN", jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp.id);
 		const response = await client.getUser();
 		expect(response.status).toStrictEqual(200);
 	});
@@ -161,7 +161,7 @@ describe("installation client", () => {
 		gheApiNock.get("/rate_limit")
 			.matchHeader("ApiKeyHeader", "super-key")
 			.reply(200);
-		const client = await createInstallationClient(subscription!.gitHubInstallationId, jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp?.id);
+		const client = await createInstallationClient(subscription!.gitHubInstallationId, jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp.id);
 		const response = await client.getRateLimit();
 		expect(response.status).toStrictEqual(200);
 	});
@@ -172,7 +172,7 @@ describe("installation client", () => {
 		gheApiNock.get("/rate_limit")
 			.reply(200);
 
-		const client = await createInstallationClient(subscription!.gitHubInstallationId, jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp?.id);
+		const client = await createInstallationClient(subscription!.gitHubInstallationId, jiraHost, { trigger: "test" }, getLogger("test"), gitHubServerApp.id);
 		const response = await client.getRateLimit();
 		expect(response.status).toStrictEqual(200);
 	});
@@ -193,15 +193,15 @@ describe("app client", () => {
 		gheAppTokenNock()
 			.matchHeader("ApiKeyHeader", "super-key");
 
-		const client = await createAppClient(getLogger("test"), jiraHost, gitHubServerApp?.id, { trigger: "test" });
+		const client = await createAppClient(getLogger("test"), jiraHost, gitHubServerApp.id, { trigger: "test" });
 		const response = await client.getApp();
 		expect(response.status).toStrictEqual(200);
 	});
 
 	it("should not inject API key when not provided", async () => {
 		gheAppTokenNock();
 
-		const client = await createAppClient(getLogger("test"), jiraHost, gitHubServerApp?.id, { trigger: "test" });
+		const client = await createAppClient(getLogger("test"), jiraHost, gitHubServerApp.id, { trigger: "test" });
 		const response = await client.getApp();
 		expect(response.status).toStrictEqual(200);
 	});
diff --git a/src/util/github-installations-helper.ts b/src/util/github-installations-helper.ts
@@ -45,7 +45,7 @@ const mapSyncStatus = (syncStatus: SyncStatus = SyncStatus.PENDING): ConnectionS
 export const getInstallations = async (subscriptions: Subscription[], log: Logger, gitHubAppId: number | undefined): Promise<InstallationResults> => {
 	const installations = await Promise.allSettled(subscriptions.map((sub) => getInstallation(sub, gitHubAppId, log)));
 	// Had to add "unknown" in between type as lodash, types is incorrect for groupBy of `installations`
-	const connections = groupBy(installations, "status") as unknown as { fulfilled: PromiseFulfilledResult<AppInstallation>[], rejected: PromiseRejectedResult[] };
+	const connections = groupBy(installations, "status") as unknown as { fulfilled?: PromiseFulfilledResult<AppInstallation>[], rejected?: PromiseRejectedResult[] };
 	const fulfilled = connections.fulfilled?.map(v => v.value) || [];
 	const rejected = connections.rejected?.map(v => v.reason as FailedAppInstallation) || [];
 	return {
@@ -119,8 +119,8 @@ export const getConnectionsAndInstallations = async (subscriptions: Subscription
 };
 
 export const countStatus = (connections: SuccessfulConnection[], syncStatus: string): number =>
-	connections.filter(org => org?.syncStatus === syncStatus).length || 0;
+	connections.filter(org => org.syncStatus === syncStatus).length || 0;
 
 export const countNumberSkippedRepos = (connections: SuccessfulConnection[]): number => {
-	return connections.reduce((acc, obj) => acc + (obj?.totalNumberOfRepos || 0) - (obj?.numberOfSyncedRepos || 0) , 0);
+	return connections.reduce((acc, obj) => acc + (obj.totalNumberOfRepos || 0) - (obj.numberOfSyncedRepos || 0) , 0);
 };
diff --git a/src/util/handlebars/handlebar-helpers.ts b/src/util/handlebars/handlebar-helpers.ts
@@ -3,7 +3,9 @@ import { isPlainObject } from "lodash";
 import { ConnectionSyncStatus } from "utils/github-installations-helper";
 
 export const concatStringHelper = (...strings: string[]) => strings.filter((arg: unknown) => typeof arg !== "object").join(" ");
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 export const toLowercaseHelper = (str?: string) => !isPlainObject(str) && str?.toString?.().toLowerCase() || "";
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 export const replaceSpaceWithHyphenHelper = (str?: string) => !isPlainObject(str) && str?.toString?.().replace(/ /g, "-") || "";
 export const toISOStringHelper = (date?: Date) => date ? date.toISOString() : undefined;
 
@@ -62,7 +64,7 @@ export const registerHandlebarsHelpers = () => {
 	hbs.registerHelper("isModal", (modalId) => modalId === "jiraDomainModal");
 
 
-	hbs.registerHelper("isMissingPermissions", (syncWarning: string) => syncWarning?.includes("Invalid permissions for"));
+	hbs.registerHelper("isMissingPermissions", (syncWarning?: string) => syncWarning?.includes("Invalid permissions for"));
 
 	hbs.registerHelper(
 		"disableDeleteSubscription",
diff --git a/src/util/handlebars/handlebar-partials.ts b/src/util/handlebars/handlebar-partials.ts
@@ -4,7 +4,7 @@ import * as path from "path";
 
 export const registerHandlebarsPartials = (partialPath: string) => {
 	fs.readdirSync(partialPath)
-		?.filter(file => file.endsWith(".hbs"))
+		.filter(file => file.endsWith(".hbs"))
 		.forEach(file => {
 			hbs.registerPartial(
 				file.replace(/\.hbs$/, ""), // removes extension of file
diff --git a/src/util/heap-size-utils.ts b/src/util/heap-size-utils.ts
@@ -20,6 +20,7 @@ export const hasEnoughFreeHeap = (notEnoughHeapPctThreshold: number, logger: Log
 	if (freeHeapPctBeforeGc < notEnoughHeapPctThreshold) {
 		const timestampBeforeGc = Date.now();
 		logger.info(`Free heap size is less than ${notEnoughHeapPctThreshold}. Triggering GC...`);
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		global.gc?.call(global);
 		const timestampAfterGc = Date.now();
 
diff --git a/src/util/is-connected.ts b/src/util/is-connected.ts
@@ -1,7 +1,7 @@
 import { Subscription } from "models/subscription";
 
 export const isConnected = async (jiraHost: string): Promise<boolean> => {
-	const subscriptions = await Subscription.getAllForHost(jiraHost) || [];
+	const subscriptions = await Subscription.getAllForHost(jiraHost);
 
 	return subscriptions.length > 0;
 };
diff --git a/src/util/is-node-env.ts b/src/util/is-node-env.ts
@@ -1,6 +1,6 @@
 import { EnvironmentEnum } from "interfaces/common";
 
-export const getNodeEnv: () => EnvironmentEnum = () => EnvironmentEnum[process.env.NODE_ENV || ""] as EnvironmentEnum || EnvironmentEnum.development;
+export const getNodeEnv: () => EnvironmentEnum = () => EnvironmentEnum[process.env.NODE_ENV || ""] as EnvironmentEnum | undefined || EnvironmentEnum.development;
 export const isNodeEnv = (env: EnvironmentEnum) => getNodeEnv() === env;
 export const isNodeProd = () => isNodeEnv(EnvironmentEnum.production);
 export const isNodeDev = () => isNodeEnv(EnvironmentEnum.development);
diff --git a/src/util/jira-utils.test.ts b/src/util/jira-utils.test.ts
@@ -116,7 +116,7 @@ describe("Jira Utils", () => {
 			["JIRA-123abcd JIRA-456 abcd", "JIRA-456"]
 		])("matching with whole word", (full, ...issueKeys) => {
 			it(`should match "${full}" to "${issueKeys.toString()}"`, () => {
-				expect(jiraIssueKeyParser(full)).toEqual(issueKeys ? issueKeys : []);
+				expect(jiraIssueKeyParser(full)).toEqual(issueKeys);
 			});
 		});
 	});
diff --git a/src/util/preemptive-rate-limit.ts b/src/util/preemptive-rate-limit.ts
@@ -62,6 +62,7 @@ const getRateRateLimitStatus = async (context: SQSMessageContext<BaseMessagePayl
 
 const getRateResetTimeInSeconds = (rateLimitResponse: Octokit.RateLimitGetResponse): number => {
 	// Get the furthest away rate reset to ensure we don't exhaust the other one too quickly
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	const resetEpochDateTimeInSeconds = Math.max(rateLimitResponse?.resources?.core?.reset, rateLimitResponse?.resources?.graphql?.reset);
 	const timeToResetInSeconds = resetEpochDateTimeInSeconds - (Date.now()/1000);
 	//sometimes, possibly a bug in github?, the timeToResetInSeconds is almost 0. To avoid reschdule to task too soon, adding a minimum of 10 minutes.

Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,12 @@ export class Subscription extends Model {`
`50`	`50`	`isSecurityPermissionsAccepted: boolean;`
`51`	`51`
`52`	`52`	`static async getAllForHost(jiraHost: string, gitHubAppId?: number): Promise<Subscription[]> {`
`53`		`- return this.findAll({`
	`53`	`+ return await this.findAll({`
`54`	`54`	`where: {`
`55`	`55`	`...(gitHubAppId !== undefined && { gitHubAppId }), // Add gitHubAppId only if passed`
`56`	`56`	`jiraHost`
`57`	`57`	`}`
`58`		`- });`
	`58`	`+ }) \|\| [];`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`static getAllForInstallation(`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const logger = getLogger("url-params");`
`19`	`19`	`export const urlParamsMiddleware = (config: AxiosRequestConfig): AxiosRequestConfig => {`
`20`	`20`	const uri = () => `${config.baseURL \|\| ""}${config.url \|\| ""}`;
`21`	`21`	`// If uri is empty and there's no url params, just skip this middleware`
`22`		`- if (!uri()?.length) {`
	`22`	`+ if (!uri().length) {`
`23`	`23`	`return config;`
`24`	`24`	`}`
`25`	`25`
`@@ -35,7 +35,7 @@ export const urlParamsMiddleware = (config: AxiosRequestConfig): AxiosRequestCon`
`35`	`35`	`}`
`36`	`36`	const key = `{${k}}`;
`37`	`37`	`const value = encodeURIComponent(String(v));`
`38`		`- if (!value.length \|\| !uri()?.includes(key)) {`
	`38`	`+ if (!value.length \|\| !uri().includes(key)) {`
`39`	`39`	`logger.error({ key, value, config }, "URL Param doesn't exist in url path - ignoring");`
`40`	`40`	`return;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export const filteringHttpLogsStream = (filteringLoggerName: string, out: Writab`
`20`	`20`	`write: (chunk: unknown, encoding: BufferEncoding, next) => {`
`21`	`21`	`//TODO Remove this code when there will be convenient way to do it in Probot.`
`22`	`22`	`//See https://github.com/probot/probot/issues/1577`
`23`		- if (String(chunk)?.match(`${filteringLoggerName}.*(GET\|POST\|DELETE\|PUT\|PATCH) /`)) {
	`23`	+ if (String(chunk).match(`${filteringLoggerName}.*(GET\|POST\|DELETE\|PUT\|PATCH) /`)) {
`24`	`24`	`out.write(chunk, encoding);`
`25`	`25`	`}`
`26`	`26`	`next();`