Merge branch 'main' into feat/remindersImprovement

frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AwsIamInputForm.tsx

@@ -15,6 +15,7 @@ import {
   TextArea
 } from "@app/components/v2";
 import { useCreateDynamicSecret } from "@app/hooks/api";
+import { useGetServerConfig } from "@app/hooks/api/admin";
 import {
   DynamicSecretAwsIamAuth,
   DynamicSecretProviders
@@ -61,6 +62,23 @@ const formSchema = z.object({
           })
         )
         .optional()
+    }),
+    z.object({
+      method: z.literal(DynamicSecretAwsIamAuth.IRSA),
+      region: z.string().trim().min(1),
+      awsPath: z.string().trim().optional(),
+      permissionBoundaryPolicyArn: z.string().trim().optional(),
+      policyDocument: z.string().trim().optional(),
+      userGroups: z.string().trim().optional(),
+      policyArns: z.string().trim().optional(),
+      tags: z
+        .array(
+          z.object({
+            key: z.string().trim().min(1).max(128),
+            value: z.string().trim().min(1).max(256)
+          })
+        )
+        .optional()
     })
   ]),
   defaultTTL: z.string().superRefine((val, ctx) => {
@@ -106,6 +124,8 @@ export const AwsIamInputForm = ({
   projectSlug,
   isSingleEnvironmentMode
 }: Props) => {
+  const { data: serverConfig } = useGetServerConfig();
+
   const {
     control,
     formState: { isSubmitting },
@@ -123,7 +143,7 @@ export const AwsIamInputForm = ({
   });
 
   const createDynamicSecret = useCreateDynamicSecret();
-  const isAccessKeyMethod = watch("provider.method") === DynamicSecretAwsIamAuth.AccessKey;
+  const method = watch("provider.method");
 
   const handleCreateDynamicSecret = async ({
     name,
@@ -237,11 +257,14 @@ export const AwsIamInputForm = ({
                         Assume Role (Recommended)
                       </SelectItem>
                       <SelectItem value={DynamicSecretAwsIamAuth.AccessKey}>Access Key</SelectItem>
+                      {serverConfig?.kubernetesAutoFetchServiceAccountToken && (
+                        <SelectItem value={DynamicSecretAwsIamAuth.IRSA}>IRSA (EKS)</SelectItem>
+                      )}
                     </Select>
                   </FormControl>
                 )}
               />
-              {isAccessKeyMethod ? (
+              {method === DynamicSecretAwsIamAuth.AccessKey && (
                 <div className="flex items-center space-x-2">
                   <Controller
                     control={control}
@@ -274,7 +297,8 @@ export const AwsIamInputForm = ({
                     )}
                   />
                 </div>
-              ) : (
+              )}
+              {method === DynamicSecretAwsIamAuth.AssumeRole && (
                 <div className="flex items-center space-x-2">
                   <Controller
                     control={control}

frontend/src/pages/secret-manager/SecretDashboardPage/components/DynamicSecretListView/EditDynamicSecretForm/EditDynamicSecretAwsIamForm.tsx

@@ -6,7 +6,7 @@ import { z } from "zod";
 import { TtlFormLabel } from "@app/components/features";
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Select, SelectItem, TextArea } from "@app/components/v2";
-import { useUpdateDynamicSecret } from "@app/hooks/api";
+import { useGetServerConfig, useUpdateDynamicSecret } from "@app/hooks/api";
 import { DynamicSecretAwsIamAuth, TDynamicSecret } from "@app/hooks/api/dynamicSecret/types";
 import { slugSchema } from "@app/lib/schemas";
 
@@ -40,6 +40,18 @@ const formSchema = z.object({
       tags: z
         .array(z.object({ key: z.string().trim().min(1), value: z.string().trim().min(1) }))
         .optional()
+    }),
+    z.object({
+      method: z.literal(DynamicSecretAwsIamAuth.IRSA),
+      region: z.string().trim().min(1),
+      awsPath: z.string().trim().optional(),
+      permissionBoundaryPolicyArn: z.string().trim().optional(),
+      policyDocument: z.string().trim().optional(),
+      userGroups: z.string().trim().optional(),
+      policyArns: z.string().trim().optional(),
+      tags: z
+        .array(z.object({ key: z.string().trim().min(1), value: z.string().trim().min(1) }))
+        .optional()
     })
   ]),
   defaultTTL: z.string().superRefine((val, ctx) => {
@@ -83,6 +95,8 @@ export const EditDynamicSecretAwsIamForm = ({
   secretPath,
   projectSlug
 }: Props) => {
+  const { data: serverConfig } = useGetServerConfig();
+
   const {
     control,
     watch,
@@ -100,7 +114,7 @@ export const EditDynamicSecretAwsIamForm = ({
       }
     }
   });
-  const isAccessKeyMethod = watch("inputs.method") === DynamicSecretAwsIamAuth.AccessKey;
+  const method = watch("inputs.method");
 
   const updateDynamicSecret = useUpdateDynamicSecret();
 
@@ -214,11 +228,14 @@ export const EditDynamicSecretAwsIamForm = ({
                       Assume Role (Recommended)
                     </SelectItem>
                     <SelectItem value={DynamicSecretAwsIamAuth.AccessKey}>Access Key</SelectItem>
+                    {serverConfig?.kubernetesAutoFetchServiceAccountToken && (
+                      <SelectItem value={DynamicSecretAwsIamAuth.IRSA}>IRSA (EKS)</SelectItem>
+                    )}
                   </Select>
                 </FormControl>
               )}
             />
-            {isAccessKeyMethod ? (
+            {method === DynamicSecretAwsIamAuth.AccessKey && (
               <div className="flex items-center space-x-2">
                 <Controller
                   control={control}
@@ -251,7 +268,8 @@ export const EditDynamicSecretAwsIamForm = ({
                   )}
                 />
               </div>
-            ) : (
+            )}
+            {method === DynamicSecretAwsIamAuth.AssumeRole && (
               <div className="flex items-center space-x-2">
                 <Controller
                   control={control}

frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretDropzone/SecretDropzone.tsx

@@ -9,7 +9,7 @@ import { twMerge } from "tailwind-merge";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 // TODO:(akhilmhdh) convert all the util functions like this into a lib folder grouped by functionality
-import { parseDotEnv, parseJson } from "@app/components/utilities/parseSecrets";
+import { parseDotEnv, parseJson, parseYaml } from "@app/components/utilities/parseSecrets";
 import { Button, Lottie, Modal, ModalContent } from "@app/components/v2";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
 import { usePopUp, useToggle } from "@app/hooks";
@@ -127,7 +127,7 @@ export const SecretDropzone = ({
     }
   };
 
-  const parseFile = (file?: File, isJson?: boolean) => {
+  const parseFile = (file?: File) => {
     const reader = new FileReader();
     if (!file) {
       createNotification({
@@ -140,10 +140,25 @@ export const SecretDropzone = ({
     setIsLoading.on();
     reader.onload = (event) => {
       if (!event?.target?.result) return;
-      // parse function's argument looks like to be ArrayBuffer
-      const env = isJson
-        ? parseJson(event.target.result as ArrayBuffer)
-        : parseDotEnv(event.target.result as ArrayBuffer);
+
+      let env: TParsedEnv;
+
+      const src = event.target.result as ArrayBuffer;
+
+      switch (file.type) {
+        case "application/json":
+          env = parseJson(src);
+          break;
+        case "text/yaml":
+        case "application/x-yaml":
+        case "application/yaml":
+          env = parseYaml(src);
+          break;
+
+        default:
+          env = parseDotEnv(src);
+          break;
+      }
       setIsLoading.off();
       handleParsedEnv(env);
     };
@@ -165,12 +180,12 @@ export const SecretDropzone = ({
 
     e.dataTransfer.dropEffect = "copy";
     setDragActive.off();
-    parseFile(e.dataTransfer.files[0], e.dataTransfer.files[0].type === "application/json");
+    parseFile(e.dataTransfer.files[0]);
   };
 
   const handleFileUpload = (e: ChangeEvent<HTMLInputElement>) => {
     e.preventDefault();
-    parseFile(e.target?.files?.[0], e.target?.files?.[0]?.type === "application/json");
+    parseFile(e.target?.files?.[0]);
   };
 
   const handleSaveSecrets = async () => {
@@ -253,7 +268,7 @@ export const SecretDropzone = ({
       >
         {isLoading ? (
           <div className="mb-16 flex items-center justify-center pt-16">
-            <Lottie icon="infisical_loading" className="h-32 w-32" />
+            <Lottie isAutoPlay icon="infisical_loading" className="h-32 w-32" />
           </div>
         ) : (
           <div className="flex flex-col items-center justify-center space-y-2">

frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretImportListView/SecretImportItem.tsx

@@ -9,6 +9,7 @@ import {
   faInfoCircle,
   faKey,
   faRotate,
+  faSearch,
   faUpDown,
   faWarning,
   faXmark
@@ -140,6 +141,10 @@ export const SecretImportItem = ({
     }
   };
 
+  const filteredImportedSecrets = importedSecrets.filter((secret) =>
+    secret.key.toUpperCase().includes(searchTerm.toUpperCase())
+  );
+
   return (
     <>
       <div
@@ -305,21 +310,26 @@ export const SecretImportItem = ({
                       </td>
                     </tr>
                   )}
-                  {importedSecrets
-                    .filter((secret) => secret.key.toUpperCase().includes(searchTerm.toUpperCase()))
-                    .map(({ key, value }, index) => (
-                      <tr key={`${id}-${key}-${index + 1}`}>
-                        <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
-                          {key}
-                        </td>
-                        <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
-                          <SecretInput value={value} isReadOnly />
-                        </td>
-                        {/* <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
+                  {filteredImportedSecrets.length === 0 && importedSecrets?.length !== 0 && (
+                    <tr>
+                      <td colSpan={3}>
+                        <EmptyState title="No secrets match search" icon={faSearch} />
+                      </td>
+                    </tr>
+                  )}
+                  {filteredImportedSecrets.map(({ key, value }, index) => (
+                    <tr key={`${id}-${key}-${index + 1}`}>
+                      <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
+                        {key}
+                      </td>
+                      <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
+                        <SecretInput value={value} isReadOnly />
+                      </td>
+                      {/* <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
                           <EnvFolderIcon env={overriden?.env} secretPath={overriden?.secretPath} />
                         </td> */}
-                      </tr>
-                    ))}
+                    </tr>
+                  ))}
                 </tbody>
               </table>
             </TableContainer>