Merge branch 'main' into pretty

bin/cli/src/run.ts

@@ -14,7 +14,7 @@ import {
 } from "./commands";
 
 yargs
-  .fail((msg, err, _) => {
+  .fail((msg, err) => {
     if (err) throw err;
     if (msg) console.error(msg);
     process.exit(1);
@@ -32,4 +32,5 @@ yargs
   .command(getCost)
   .strict()
   .scriptName("run")
-  .demandCommand(1, "").argv;
+  .demandCommand(1, "")
+  .parse();

docs/_deploy-metrics/components/CheckboxFilter.tsx

@@ -9,7 +9,7 @@ type CheckboxFilterProps = Omit<UI.CheckboxGroupProps, "onChange"> & {
 };
 
 export const CheckboxFilter = (props: CheckboxFilterProps) => {
-  const { options, label, spacing = "2", showSearch, ...rest } = props;
+  const { options, label, spacing = "2", ...rest } = props;
 
   return (
     <UI.Stack as="fieldset" spacing={spacing}>

docs/_deploy-metrics/components/ResourceTable.tsx

@@ -1,12 +1,14 @@
+/* eslint-disable */
+
 import * as UI from "@chakra-ui/react";
 import { formatDistance } from "date-fns";
 import { Resource } from "../lib/getAwsResources";
 
 const ResourceTypeLabel = ({ type }: { type: string }) => {
-  let iconName = type.split("::")[1];
+  const iconName = type.split("::")[1];
   try {
     var ICON = require(`react-aws-icons/dist/aws/logo/${iconName}`).default;
-  } catch (ex) {
+  } catch {
     var ICON = require(`react-aws-icons/dist/aws/logo/AWS`).default;
   }
 

docs/_deploy-metrics/lib/formData.ts

@@ -1,3 +1,5 @@
+/* eslint no-prototype-builtins: 0 */ // --> OFF
+
 export type FormResult = {
     version: string;
     data: any; // replace 'any' with the actual type of the data returned from the API

docs/_deploy-metrics/next.config.js

@@ -1,3 +1,5 @@
+/* eslint no-undef: 0 */ // --> OFF
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,

eslint.config.mjs

@@ -0,0 +1,60 @@
+// @ts-check
+import react from "eslint-plugin-react";
+import eslintReactHooks from "eslint-plugin-react-hooks";
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+import { fixupPluginRules, includeIgnoreFile } from "@eslint/compat";
+import { fileURLToPath } from "url";
+import path from "path";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const gitignorePath = path.resolve(__dirname, ".gitignore");
+
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  // @ts-expect-error https://github.com/typescript-eslint/typescript-eslint/issues/8522
+  includeIgnoreFile(gitignorePath),
+  {
+    plugins: {
+      react,
+      // @ts-expect-error https://github.com/facebook/react/pull/28773#issuecomment-2147149016
+      "react-hooks": fixupPluginRules(eslintReactHooks),
+    },
+    languageOptions: {
+      ecmaVersion: 2020,
+      sourceType: "module",
+
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+
+    settings: {
+      react: {
+        version: "detect",
+      },
+    },
+
+    rules: {
+      "@typescript-eslint/no-empty-interface": "off",
+      "react/react-in-jsx-scope": "off",
+      "react-hooks/rules-of-hooks": "error",
+      "react-hooks/exhaustive-deps": "warn",
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-non-null-assertion": "off",
+      "@typescript-eslint/ban-ts-comment": [
+        "off",
+        {
+          "ts-ignore": false,
+          "ts-nocheck": false,
+          "ts-check": true,
+          "ts-expect-error": true,
+        },
+      ],
+    },
+  },
+);

lib/lambda/checkConsumerLag.test.ts

@@ -1,10 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { handler } from "./checkConsumerLag";
 import { Kafka } from "kafkajs";
-import {
-  LambdaClient,
-  ListEventSourceMappingsCommand,
-} from "@aws-sdk/client-lambda";
 
 const mockKafkaAdmin = {
   connect: vi.fn(),

lib/lambda/createTriggers.test.ts

@@ -5,7 +5,6 @@ import {
   CreateEventSourceMappingCommand,
   GetEventSourceMappingCommand,
 } from "@aws-sdk/client-lambda";
-import { randomUUID } from "crypto";
 
 vi.mock("@aws-sdk/client-lambda", () => ({
   LambdaClient: vi.fn().mockImplementation(() => ({

lib/lambda/deleteTriggers.test.ts

@@ -1,10 +1,9 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { handler, deleteAllTriggersForFunctions } from "./deleteTriggers";
+import { handler } from "./deleteTriggers";
 import {
   LambdaClient,
   ListEventSourceMappingsCommand,
   DeleteEventSourceMappingCommand,
-  GetEventSourceMappingCommand,
 } from "@aws-sdk/client-lambda";
 
 vi.mock("@aws-sdk/client-lambda", () => ({

lib/lambda/getAttachmentUrl.test.ts

@@ -2,8 +2,6 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { APIGatewayEvent } from "aws-lambda";
 import { handler } from "./getAttachmentUrl";
 import { response } from "libs/handler-lib";
-import { STSClient, AssumeRoleCommand } from "@aws-sdk/client-sts";
-import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { getStateFilter } from "../libs/api/auth/user";
 import { getPackage, getPackageChangelog } from "../libs/api/package";

lib/lambda/getCpocs.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { APIGatewayEvent } from "aws-lambda";
-import { handler, queryCpocs } from "./getCpocs";
+import { handler } from "./getCpocs";
 import { response } from "libs/handler-lib";
 import * as os from "libs/opensearch-lib";
 

lib/lambda/getPackageActions.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { APIGatewayEvent } from "aws-lambda";
-import { handler, getPackageActions } from "./getPackageActions";
+import { handler } from "./getPackageActions";
 import { response } from "libs/handler-lib";
 import { getAvailableActions } from "shared-utils";
 import { getPackage } from "../libs/api/package/getPackage";

lib/lambda/getSubTypes.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { APIGatewayEvent } from "aws-lambda";
-import { handler, querySubTypes } from "./getSubTypes";
+import { handler } from "./getSubTypes";
 import { response } from "libs/handler-lib";
 import * as os from "libs/opensearch-lib";
 

lib/lambda/getTypes.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { APIGatewayEvent } from "aws-lambda";
-import { handler, queryTypes } from "./getTypes";
+import { handler } from "./getTypes";
 import { response } from "libs/handler-lib";
 import * as os from "libs/opensearch-lib";
 

lib/lambda/getUploadUrl.test.ts

@@ -1,11 +1,9 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { describe, it, expect, vi, beforeEach, Mock } from "vitest";
 import { APIGatewayEvent } from "aws-lambda";
 import { handler } from "./getUploadUrl";
 import { response } from "libs/handler-lib";
-import { S3Client, PutObjectCommand } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { v4 as uuidv4 } from "uuid";
-import * as path from "node:path";
 
 vi.mock("libs/handler-lib", () => ({
   response: vi.fn(),
@@ -29,7 +27,7 @@ describe("Handler for generating signed URL", () => {
     vi.clearAllMocks();
     process.env.attachmentsBucketName = "test-bucket";
     process.env.attachmentsBucketRegion = "test-region";
-    (uuidv4 as vi.Mock).mockReturnValue("123e4567-e89b-12d3-a456-426614174000");
+    (uuidv4 as Mock).mockReturnValue("123e4567-e89b-12d3-a456-426614174000");
   });
 
   it("should return 400 if event body is missing", async () => {
@@ -45,7 +43,7 @@ describe("Handler for generating signed URL", () => {
 
   it("should return 200 with signed URL, bucket, and key", async () => {
     const mockUrl = "https://example.com/signed-url";
-    (getSignedUrl as vi.Mock).mockResolvedValueOnce(mockUrl);
+    (getSignedUrl as Mock).mockResolvedValueOnce(mockUrl);
 
     const event = {
       body: JSON.stringify({ fileName: "test-file.pdf" }),
@@ -61,11 +59,11 @@ describe("Handler for generating signed URL", () => {
         key: "123e4567-e89b-12d3-a456-426614174000.pdf",
       },
     });
-    expect(getSignedUrl).toHaveBeenCalled;
+    expect(getSignedUrl).toHaveBeenCalled();
   });
 
   it("should return 500 if an error occurs during processing", async () => {
-    (getSignedUrl as vi.Mock).mockRejectedValueOnce(new Error("Test error"));
+    (getSignedUrl as Mock).mockRejectedValueOnce(new Error("Test error"));
 
     const event = {
       body: JSON.stringify({ fileName: "test-file.pdf" }),
@@ -79,9 +77,14 @@ describe("Handler for generating signed URL", () => {
     });
   });
 
-  it("should throw an error if required environment variables are missing", () => {
+  it("should throw an error if required environment variables are missing", async () => {
     delete process.env.attachmentsBucketName;
 
-    expect(() => handler({} as APIGatewayEvent)).toThrowError;
+    await handler({} as APIGatewayEvent);
+
+    expect(response).toHaveBeenCalledWith({
+      statusCode: 500,
+      body: { message: "Internal server error" },
+    });
   });
 });

lib/lambda/getUploadUrl.ts

@@ -11,9 +11,10 @@ const s3 = new S3Client({
 });
 
 export const handler = async (event: APIGatewayEvent) => {
-  validateEnvVariable("attachmentsBucketName");
-  validateEnvVariable("attachmentsBucketRegion");
   try {
+    validateEnvVariable("attachmentsBucketName");
+    validateEnvVariable("attachmentsBucketRegion");
+
     if (!event.body) {
       return response({
         statusCode: 400,
@@ -48,15 +49,3 @@ export const handler = async (event: APIGatewayEvent) => {
     });
   }
 };
-
-function checkEnvVariables(requiredEnvVariables: string[]) {
-  const missingVariables = requiredEnvVariables.filter(
-    (envVar) => !process.env[envVar],
-  );
-
-  if (missingVariables.length > 0) {
-    throw new Error(
-      `Missing required environment variables: ${missingVariables.join(", ")}`,
-    );
-  }
-}

lib/lambda/mapRole.test.ts

@@ -1,5 +1,4 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { Handler } from "aws-lambda";
 import { send, SUCCESS, FAILED } from "cfn-response-async";
 import { handler } from "./mapRole";
 import * as os from "../libs/opensearch-lib";

lib/lambda/package-actions/withdraw-package/withdraw-package.test.ts

@@ -1,4 +1,4 @@
-import { assert, describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { withdrawPackage } from "./withdraw-package";
 import { generateMock } from "@anatine/zod-mock";
 import { withdrawPackageSchema } from "shared-types";

lib/lambda/package-actions/withdraw-package/withdraw-package.ts

@@ -1,9 +1,4 @@
-import {
-  WithdrawPackage,
-  withdrawPackageSchema,
-  SEATOOL_STATUS,
-  Action,
-} from "shared-types";
+import { withdrawPackageSchema, SEATOOL_STATUS, Action } from "shared-types";
 import { seaToolFriendlyTimestamp } from "shared-utils";
 import { response } from "../../../libs/handler-lib";
 import { TOPIC_NAME } from "../consts";

lib/lambda/postAuth.ts

@@ -10,7 +10,7 @@ import { getSecret } from "shared-utils";
 // Initialize Cognito client
 const client = new CognitoIdentityProviderClient({});
 
-export const handler: Handler = async (event, context) => {
+export const handler: Handler = async (event) => {
   console.log(JSON.stringify(event, null, 2));
 
   // Check if idmInfoSecretArn is provided
@@ -30,7 +30,7 @@ export const handler: Handler = async (event, context) => {
     throw error;
   }
 
-  const { request, response } = event;
+  const { request } = event;
   const { userAttributes } = request;
 
   if (!userAttributes.identities) {
@@ -56,12 +56,12 @@ export const handler: Handler = async (event, context) => {
           `Network response was not ok. Response was ${response.status}: ${response.statusText}`,
         );
       }
-      let data = await response.json();
+      const data = await response.json();
       console.log(JSON.stringify(data, null, 2));
-      let roleArray: string[] = [];
-      let stateArray: string[] = [];
+      const roleArray: string[] = [];
+      const stateArray: string[] = [];
       data.userProfileAppRoles.userRolesInfoList.forEach((element: any) => {
-        let role = element.roleName;
+        const role = element.roleName;
         if (Object.values(UserRoles).includes(role)) {
           roleArray.push(role);
           if (STATE_ROLES.includes(role)) {
@@ -74,7 +74,7 @@ export const handler: Handler = async (event, context) => {
         }
       });
 
-      let attributeData: any = {
+      const attributeData: any = {
         Username: event.userName,
         UserPoolId: event.userPoolId,
         UserAttributes: [
@@ -126,7 +126,7 @@ async function updateUserAttributes(params: any): Promise<void> {
         : [];
 
     // Prepare for updating user attributes
-    let attributeData: any = {
+    const attributeData: any = {
       UserPoolId: params.UserPoolId,
       Username: params.Username,
       UserAttributes: params.UserAttributes,
@@ -139,7 +139,7 @@ async function updateUserAttributes(params: any): Promise<void> {
       );
       if (rolesIndex !== -1) {
         // Only merge if new roles are not empty
-        let newRoles = attributeData.UserAttributes[rolesIndex].Value
+        const newRoles = attributeData.UserAttributes[rolesIndex].Value
           ? new Set(
               attributeData.UserAttributes[rolesIndex].Value.split(",").concat(
                 "onemac-micro-super",
@@ -164,7 +164,7 @@ async function updateUserAttributes(params: any): Promise<void> {
       );
       if (stateIndex !== -1) {
         // Only merge if new states are not empty
-        let newStates = attributeData.UserAttributes[stateIndex].Value
+        const newStates = attributeData.UserAttributes[stateIndex].Value
           ? new Set(
               attributeData.UserAttributes[stateIndex].Value.split(",").concat(
                 "ZZ",

lib/lambda/processEmails.ts

@@ -37,7 +37,7 @@ export const handler = E.emailHandler(
   async (
     record: EmailLib.DecodedRecord,
   ): Promise<EmailLib.LambdaResponse[] | { message: string }> => {
-    const emailBundle = EmailLib.getBundle(record, process.env.STAGE!!) as any;
+    const emailBundle = EmailLib.getBundle(record, process.env.STAGE!) as any;
 
     if (!emailBundle || !!emailBundle?.message || !emailBundle?.emailCommands) {
       return { message: "no eventToEmailMapping found, no email sent" };

lib/lambda/runReindex.test.ts

@@ -1,5 +1,4 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { Handler } from "aws-lambda";
 import { send, SUCCESS, FAILED } from "cfn-response-async";
 import { SFNClient, StartExecutionCommand } from "@aws-sdk/client-sfn";
 import { handler } from "./runReindex";

lib/lambda/search.test.ts

@@ -1,8 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { APIGatewayEvent } from "aws-lambda";
-import { handler, getSearchData } from "./search";
+import { handler } from "./search";
 import { response } from "libs/handler-lib";
-import { getStateFilter } from "../libs/api/auth/user";
+
 import * as os from "../libs/opensearch-lib";
 import { getAppkChildren } from "../libs/api/package";