secret sync + tweaks

2026-10-14 14:34:09 +00:00 · 2025-05-07 17:57:00 -04:00
parent 581840a701
commit 36954a9df9
36 changed files with 799 additions and 28 deletions
@@ -40,7 +40,14 @@ export const SecretSyncStatusBadge = ({ status }: Props) => {

  return (
    <Badge className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap" variant={variant}>
-      <FontAwesomeIcon icon={icon} />
+      <FontAwesomeIcon
+        icon={icon}
+        className={
+          [SecretSyncStatus.Pending, SecretSyncStatus.Running].includes(status)
+            ? "animate-spin"
+            : ""
+        }
+      />
      <span>{text}</span>
    </Badge>
  );
@@ -0,0 +1,179 @@
+import { Controller, useFormContext, useWatch } from "react-hook-form";
+import { SingleValue } from "react-select";
+import { faCircleInfo } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { SecretSyncConnectionField } from "@app/components/secret-syncs/forms/SecretSyncConnectionField";
+import { FilterableSelect, FormControl, Tooltip } from "@app/components/v2";
+import {
+  useOCIConnectionListCompartments,
+  useOCIConnectionListVaultKeys,
+  useOCIConnectionListVaults
+} from "@app/hooks/api/appConnections/oci";
+import { SecretSync } from "@app/hooks/api/secretSyncs";
+
+import { TSecretSyncForm } from "../schemas";
+
+export const OCIVaultSyncFields = () => {
+  const { control, setValue } = useFormContext<
+    TSecretSyncForm & { destination: SecretSync.OCIVault }
+  >();
+
+  const connectionId = useWatch({ name: "connection.id", control });
+
+  // Compartments
+  const { data: compartments, isLoading: isCompartmentsLoading } = useOCIConnectionListCompartments(
+    connectionId,
+    {
+      enabled: Boolean(connectionId)
+    }
+  );
+
+  // Vaults
+  const selectedCompartment = useWatch({ name: "destinationConfig.compartmentOcid", control });
+  const { data: vaults, isLoading: isVaultsLoading } = useOCIConnectionListVaults(
+    { connectionId, compartmentOcid: selectedCompartment },
+    {
+      enabled: Boolean(connectionId)
+    }
+  );
+
+  // Keys
+  const selectedVault = useWatch({ name: "destinationConfig.vaultOcid", control });
+  const { data: keys, isLoading: isKeysLoading } = useOCIConnectionListVaultKeys(
+    { connectionId, compartmentOcid: selectedCompartment, vaultOcid: selectedVault },
+    {
+      enabled: Boolean(connectionId)
+    }
+  );
+
+  return (
+    <>
+      <SecretSyncConnectionField
+        onChange={() => {
+          setValue("destinationConfig.compartmentOcid", "");
+          setValue("destinationConfig.vaultOcid", "");
+          setValue("destinationConfig.keyOcid", "");
+        }}
+      />
+
+      <Controller
+        name="destinationConfig.compartmentOcid"
+        control={control}
+        render={({ field: { value, onChange }, fieldState: { error } }) => (
+          <FormControl
+            isError={Boolean(error)}
+            errorText={error?.message}
+            label="Compartment"
+            helperText={
+              <Tooltip
+                className="max-w-md"
+                content="Ensure the compartment exists and that the connection has permission to view it."
+              >
+                <div>
+                  <span>Don&#39;t see the compartment you&#39;re looking for?</span>{" "}
+                  <FontAwesomeIcon icon={faCircleInfo} className="text-mineshaft-400" />
+                </div>
+              </Tooltip>
+            }
+          >
+            <FilterableSelect
+              menuPlacement="top"
+              isLoading={isCompartmentsLoading && Boolean(connectionId)}
+              isDisabled={!connectionId}
+              value={compartments?.find((c) => c.id === value) ?? null}
+              onChange={(option) => {
+                onChange((option as SingleValue<{ id: string }>)?.id ?? null);
+                setValue("destinationConfig.vaultOcid", "");
+                setValue("destinationConfig.keyOcid", "");
+              }}
+              options={compartments}
+              placeholder="Select a compartment..."
+              getOptionLabel={(option) => option.name}
+              getOptionValue={(option) => option.id}
+            />
+          </FormControl>
+        )}
+      />
+
+      <Controller
+        name="destinationConfig.vaultOcid"
+        control={control}
+        render={({ field: { value, onChange }, fieldState: { error } }) => (
+          <FormControl
+            isError={Boolean(error)}
+            errorText={error?.message}
+            label="Vault"
+            helperText={
+              <Tooltip
+                className="max-w-md"
+                content="Ensure the vault exists in the selected compartment and that the connection has permission to view it."
+              >
+                <div>
+                  <span>Don&#39;t see the vault you&#39;re looking for?</span>{" "}
+                  <FontAwesomeIcon icon={faCircleInfo} className="text-mineshaft-400" />
+                </div>
+              </Tooltip>
+            }
+          >
+            <FilterableSelect
+              menuPlacement="top"
+              isLoading={isVaultsLoading && Boolean(connectionId)}
+              isDisabled={!connectionId || !selectedCompartment || !vaults}
+              value={vaults?.find((v) => v.id === value) ?? null}
+              onChange={(option) => {
+                onChange((option as SingleValue<{ id: string }>)?.id ?? null);
+                setValue("destinationConfig.keyOcid", "");
+              }}
+              options={vaults}
+              isClearable
+              placeholder="Select a vault..."
+              getOptionLabel={(option) => option.displayName}
+              getOptionValue={(option) => option.id}
+            />
+          </FormControl>
+        )}
+      />
+
+      <Controller
+        name="destinationConfig.keyOcid"
+        control={control}
+        render={({ field: { value, onChange }, fieldState: { error } }) => (
+          <FormControl
+            isError={Boolean(error)}
+            errorText={error?.message}
+            label="Encryption Key"
+            helperText={
+              <Tooltip
+                className="max-w-md"
+                content="Ensure the key exists in the selected vault and that the connection has permission to view it."
+              >
+                <div>
+                  <span>Don&#39;t see the key you&#39;re looking for?</span>{" "}
+                  <FontAwesomeIcon icon={faCircleInfo} className="text-mineshaft-400" />
+                </div>
+              </Tooltip>
+            }
+          >
+            <FilterableSelect
+              menuPlacement="top"
+              isLoading={isKeysLoading && Boolean(connectionId)}
+              isDisabled={
+                !connectionId || !selectedCompartment || !selectedVault || !vaults || !keys
+              }
+              value={keys?.find((v) => v.id === value) ?? null}
+              onChange={(option) => {
+                onChange((option as SingleValue<{ id: string }>)?.id ?? null);
+              }}
+              options={keys}
+              isClearable
+              placeholder="Select a key..."
+              getOptionLabel={(option) => option.displayName}
+              getOptionValue={(option) => option.id}
+            />
+          </FormControl>
+        )}
+      />
+    </>
+  );
+};
@@ -13,6 +13,7 @@ import { GcpSyncFields } from "./GcpSyncFields";
 import { GitHubSyncFields } from "./GitHubSyncFields";
 import { HCVaultSyncFields } from "./HCVaultSyncFields";
 import { HumanitecSyncFields } from "./HumanitecSyncFields";
+import { OCIVaultSyncFields } from "./OCIVaultSyncFields";
 import { TeamCitySyncFields } from "./TeamCitySyncFields";
 import { TerraformCloudSyncFields } from "./TerraformCloudSyncFields";
 import { VercelSyncFields } from "./VercelSyncFields";
@@ -52,6 +53,8 @@ export const SecretSyncDestinationFields = () => {
      return <HCVaultSyncFields />;
    case SecretSync.TeamCity:
      return <TeamCitySyncFields />;
+    case SecretSync.OCIVault:
+      return <OCIVaultSyncFields />;
    default:
      throw new Error(`Unhandled Destination Config Field: ${destination}`);
  }
@@ -45,6 +45,7 @@ export const SecretSyncOptionsFields = ({ hideInitialSync }: Props) => {
    case SecretSync.Windmill:
    case SecretSync.HCVault:
    case SecretSync.TeamCity:
+    case SecretSync.OCIVault:
      AdditionalSyncOptionsFieldsComponent = null;
      break;
    default:
@@ -0,0 +1,20 @@
+import { useFormContext } from "react-hook-form";
+
+import { TSecretSyncForm } from "@app/components/secret-syncs/forms/schemas";
+import { GenericFieldLabel } from "@app/components/v2";
+import { SecretSync } from "@app/hooks/api/secretSyncs";
+
+export const OCIVaultSyncReviewFields = () => {
+  const { watch } = useFormContext<TSecretSyncForm & { destination: SecretSync.OCIVault }>();
+  const compartmentOcid = watch("destinationConfig.compartmentOcid");
+  const vaultOcid = watch("destinationConfig.vaultOcid");
+  const keyOcid = watch("destinationConfig.keyOcid");
+
+  return (
+    <>
+      <GenericFieldLabel label="Compartment OCID">{compartmentOcid}</GenericFieldLabel>
+      <GenericFieldLabel label="Vault OCID">{vaultOcid}</GenericFieldLabel>
+      <GenericFieldLabel label="Key OCID">{keyOcid}</GenericFieldLabel>
+    </>
+  );
+};
@@ -23,6 +23,7 @@ import { GcpSyncReviewFields } from "./GcpSyncReviewFields";
 import { GitHubSyncReviewFields } from "./GitHubSyncReviewFields";
 import { HCVaultSyncReviewFields } from "./HCVaultSyncReviewFields";
 import { HumanitecSyncReviewFields } from "./HumanitecSyncReviewFields";
+import { OCIVaultSyncReviewFields } from "./OCIVaultSyncReviewFields";
 import { TeamCitySyncReviewFields } from "./TeamCitySyncReviewFields";
 import { TerraformCloudSyncReviewFields } from "./TerraformCloudSyncReviewFields";
 import { VercelSyncReviewFields } from "./VercelSyncReviewFields";
@@ -96,6 +97,9 @@ export const SecretSyncReviewFields = () => {
    case SecretSync.TeamCity:
      DestinationFieldsComponent = <TeamCitySyncReviewFields />;
      break;
+    case SecretSync.OCIVault:
+      DestinationFieldsComponent = <OCIVaultSyncReviewFields />;
+      break;
    default:
      throw new Error(`Unhandled Destination Review Fields: ${destination}`);
  }
@@ -0,0 +1,15 @@
+import { z } from "zod";
+
+import { BaseSecretSyncSchema } from "@app/components/secret-syncs/forms/schemas/base-secret-sync-schema";
+import { SecretSync } from "@app/hooks/api/secretSyncs";
+
+export const OCIVaultSyncDestinationSchema = BaseSecretSyncSchema().merge(
+  z.object({
+    destination: z.literal(SecretSync.OCIVault),
+    destinationConfig: z.object({
+      compartmentOcid: z.string().trim().min(1, "Compartment OCID required"),
+      vaultOcid: z.string().trim().min(1, "Vault OCID required"),
+      keyOcid: z.string().trim().min(1, "Key OCID required")
+    })
+  })
+);
@@ -10,6 +10,7 @@ import { GcpSyncDestinationSchema } from "./gcp-sync-destination-schema";
 import { GitHubSyncDestinationSchema } from "./github-sync-destination-schema";
 import { HCVaultSyncDestinationSchema } from "./hc-vault-sync-destination-schema";
 import { HumanitecSyncDestinationSchema } from "./humanitec-sync-destination-schema";
+import { OCIVaultSyncDestinationSchema } from "./oci-vault-sync-destination-schema";
 import { TeamCitySyncDestinationSchema } from "./teamcity-sync-destination-schema";
 import { TerraformCloudSyncDestinationSchema } from "./terraform-cloud-destination-schema";
 import { VercelSyncDestinationSchema } from "./vercel-sync-destination-schema";
@@ -29,7 +30,8 @@ const SecretSyncUnionSchema = z.discriminatedUnion("destination", [
  VercelSyncDestinationSchema,
  WindmillSyncDestinationSchema,
  HCVaultSyncDestinationSchema,
-  TeamCitySyncDestinationSchema
+  TeamCitySyncDestinationSchema,
+  OCIVaultSyncDestinationSchema
 ]);

 export const SecretSyncFormSchema = SecretSyncUnionSchema;