misc: revisions to import secret flow

frontend/src/hooks/api/migration/mutations.tsx

@@ -9,7 +9,8 @@ import { externalMigrationQueryKeys } from "./queries";
 import {
   ExternalMigrationProviders,
   TExternalMigrationConfig,
-  TImportVaultSecretsDTO
+  TImportVaultSecretsDTO,
+  VaultImportStatus
 } from "./types";
 
 export const useImportEnvKey = () => {
@@ -100,9 +101,9 @@ export const useUpdateExternalMigrationConfig = (platform: ExternalMigrationProv
 export const useImportVaultSecrets = () => {
   const queryClient = useQueryClient();
 
-  return useMutation<{ message: string }, object, TImportVaultSecretsDTO>({
+  return useMutation<{ status: VaultImportStatus }, object, TImportVaultSecretsDTO>({
     mutationFn: async (dto) => {
-      const { data } = await apiRequest.post<{ message: string }>(
+      const { data } = await apiRequest.post<{ status: VaultImportStatus }>(
         "/api/v3/external-migration/vault/import-secrets",
         dto
       );

frontend/src/hooks/api/migration/types.ts

@@ -3,6 +3,11 @@ export enum ExternalMigrationProviders {
   EnvKey = "env-key"
 }
 
+export enum VaultImportStatus {
+  Imported = "imported",
+  ApprovalRequired = "approval_required"
+}
+
 export type TExternalMigrationConfig = {
   id: string;
   orgId: string;

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

@@ -78,7 +78,7 @@ import {
 } from "@app/hooks/api/dashboard/queries";
 import { UsedBySecretSyncs } from "@app/hooks/api/dashboard/types";
 import { useGetExternalMigrationConfig, useImportVaultSecrets } from "@app/hooks/api/migration";
-import { ExternalMigrationProviders } from "@app/hooks/api/migration/types";
+import { ExternalMigrationProviders, VaultImportStatus } from "@app/hooks/api/migration/types";
 import { secretApprovalRequestKeys } from "@app/hooks/api/secretApprovalRequest/queries";
 import { PendingAction } from "@app/hooks/api/secretFolders/types";
 import { fetchProjectSecrets, secretKeys } from "@app/hooks/api/secrets/queries";
@@ -672,7 +672,7 @@ export const ActionBar = ({
 
   const handleVaultImport = async (vaultPath: string, namespace: string) => {
     try {
-      await importVaultSecrets({
+      const result = await importVaultSecrets({
         projectId,
         environment,
         secretPath,
@@ -680,10 +680,17 @@ export const ActionBar = ({
         vaultSecretPath: vaultPath
       });
 
-      createNotification({
-        type: "success",
-        text: "Successfully imported secrets from HashiCorp Vault"
-      });
+      if (result.status === VaultImportStatus.ApprovalRequired) {
+        createNotification({
+          type: "info",
+          text: "Secret change request created successfully. Awaiting approval."
+        });
+      } else {
+        createNotification({
+          type: "success",
+          text: "Successfully imported secrets from HashiCorp Vault"
+        });
+      }
     } catch (err) {
       console.error("Vault import error:", err);
       const error = err as AxiosError<{ message?: string }>;

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

@@ -88,13 +88,9 @@ const Content = ({ onClose, environment, secretPath, onImport }: ContentProps) =
             <div className="space-y-1.5 text-xs leading-relaxed">
               <p>
                 Select a Vault namespace and secret path to import secrets into the current
-                environment (<code className="text-xs">{environment}</code>) at path{" "}
+                Infisical environment (<code className="text-xs">{environment}</code>) at path{" "}
                 <code className="text-xs">{secretPath}</code>.
               </p>
-              <p>
-                <strong>Note:</strong> Existing secrets with the same key will be overwritten.
-                Secrets will be imported from the selected Vault path.
-              </p>
             </div>
           </div>
         </div>