Merge branch 'main' into feat/showWarningOnImportedSecretDeletion

2026-10-15 16:52:38 +00:00 · 2025-04-14 09:04:47 -03:00
parent dc219b8e9f 85627eb825
commit 3c58bf890d
423 changed files with 14637 additions and 1130 deletions
@@ -0,0 +1,29 @@
+import { useCamundaConnectionListClusters } from "@app/hooks/api/appConnections/camunda";
+import { TCamundaSync } from "@app/hooks/api/secretSyncs/types/camunda-sync";
+
+import { getSecretSyncDestinationColValues } from "../helpers";
+import { SecretSyncTableCell } from "../SecretSyncTableCell";
+
+type Props = {
+  secretSync: TCamundaSync;
+};
+
+export const CamundaSyncDestinationCol = ({ secretSync }: Props) => {
+  const { data: clusters, isPending } = useCamundaConnectionListClusters(secretSync.connectionId);
+
+  const { primaryText, secondaryText } = getSecretSyncDestinationColValues({
+    ...secretSync,
+    destinationConfig: {
+      ...secretSync.destinationConfig,
+      clusterName: clusters?.find(
+        (cluster) => cluster.uuid === secretSync.destinationConfig.clusterUUID
+      )?.name
+    }
+  });
+
+  if (isPending) {
+    return <SecretSyncTableCell primaryText="Loading cluster info..." secondaryText="Cluster" />;
+  }
+
+  return <SecretSyncTableCell primaryText={primaryText} secondaryText={secondaryText} />;
+};
@@ -4,10 +4,13 @@ import { AwsParameterStoreSyncDestinationCol } from "./AwsParameterStoreSyncDest
 import { AwsSecretsManagerSyncDestinationCol } from "./AwsSecretsManagerSyncDestinationCol";
 import { AzureAppConfigurationDestinationSyncCol } from "./AzureAppConfigurationDestinationSyncCol";
 import { AzureKeyVaultDestinationSyncCol } from "./AzureKeyVaultDestinationSyncCol";
+import { CamundaSyncDestinationCol } from "./CamundaSyncDestinationCol";
 import { DatabricksSyncDestinationCol } from "./DatabricksSyncDestinationCol";
 import { GcpSyncDestinationCol } from "./GcpSyncDestinationCol";
 import { GitHubSyncDestinationCol } from "./GitHubSyncDestinationCol";
 import { HumanitecSyncDestinationCol } from "./HumanitecSyncDestinationCol";
+import { TerraformCloudSyncDestinationCol } from "./TerraformCloudSyncDestinationCol";
+import { VercelSyncDestinationCol } from "./VercelSyncDestinationCol";

 type Props = {
  secretSync: TSecretSync;
@@ -31,6 +34,12 @@ export const SecretSyncDestinationCol = ({ secretSync }: Props) => {
      return <DatabricksSyncDestinationCol secretSync={secretSync} />;
    case SecretSync.Humanitec:
      return <HumanitecSyncDestinationCol secretSync={secretSync} />;
+    case SecretSync.TerraformCloud:
+      return <TerraformCloudSyncDestinationCol secretSync={secretSync} />;
+    case SecretSync.Camunda:
+      return <CamundaSyncDestinationCol secretSync={secretSync} />;
+    case SecretSync.Vercel:
+      return <VercelSyncDestinationCol secretSync={secretSync} />;
    default:
      throw new Error(
        `Unhandled Secret Sync Destination Col: ${(secretSync as TSecretSync).destination}`
@@ -0,0 +1,14 @@
+import { TTerraformCloudSync } from "@app/hooks/api/secretSyncs/types/terraform-cloud-sync";
+
+import { getSecretSyncDestinationColValues } from "../helpers";
+import { SecretSyncTableCell } from "../SecretSyncTableCell";
+
+type Props = {
+  secretSync: TTerraformCloudSync;
+};
+
+export const TerraformCloudSyncDestinationCol = ({ secretSync }: Props) => {
+  const { primaryText, secondaryText } = getSecretSyncDestinationColValues(secretSync);
+
+  return <SecretSyncTableCell primaryText={primaryText} secondaryText={secondaryText} />;
+};
@@ -0,0 +1,14 @@
+import { TVercelSync } from "@app/hooks/api/secretSyncs/types/vercel-sync";
+
+import { getSecretSyncDestinationColValues } from "../helpers";
+import { SecretSyncTableCell } from "../SecretSyncTableCell";
+
+type Props = {
+  secretSync: TVercelSync;
+};
+
+export const VercelSyncDestinationCol = ({ secretSync }: Props) => {
+  const { primaryText, secondaryText } = getSecretSyncDestinationColValues(secretSync);
+
+  return <SecretSyncTableCell primaryText={primaryText} secondaryText={secondaryText} />;
+};
@@ -1,3 +1,4 @@
+import { TerraformCloudSyncScope } from "@app/hooks/api/appConnections/terraform-cloud";
 import { SecretSync, TSecretSync } from "@app/hooks/api/secretSyncs";
 import {
  GitHubSyncScope,
@@ -73,6 +74,22 @@ export const getSecretSyncDestinationColValues = (secretSync: TSecretSync) => {
      }
      secondaryText = `Organization - ${destinationConfig.org}`;
      break;
+    case SecretSync.TerraformCloud:
+      primaryText = destinationConfig.org;
+      if (destinationConfig.scope === TerraformCloudSyncScope.VariableSet) {
+        secondaryText = destinationConfig.variableSetName;
+      } else {
+        secondaryText = destinationConfig.workspaceName;
+      }
+      break;
+    case SecretSync.Camunda:
+      primaryText = destinationConfig.clusterName ?? destinationConfig.clusterUUID;
+      secondaryText = "Cluster";
+      break;
+    case SecretSync.Vercel:
+      primaryText = destinationConfig.appName || destinationConfig.app;
+      secondaryText = destinationConfig.env;
+      break;
    default:
      throw new Error(`Unhandled Destination Col Values ${destination}`);
  }
@@ -64,7 +64,7 @@ export const SecretApprovalsPage = () => {
        <Tabs defaultValue={defaultTab}>
          <TabList>
            <Tab value={TabSection.SecretApprovalRequests}>
-              Secret Requests
+              Change Requests
              {Boolean(secretApprovalReqCount?.open) && (
                <Badge className="ml-2">{secretApprovalReqCount?.open}</Badge>
              )}
@@ -136,6 +136,13 @@ export const ReviewAccessRequestModal = ({
              <span className="font-bold">Access Type: </span>
              <span>{getAccessLabel()}</span>
            </div>
+
+            {request.note && (
+              <div className="mt-1">
+                <span className="font-bold">User Note: </span>
+                <span>{request.note}</span>
+              </div>
+            )}
          </div>

          <div className="space-x-2">
@@ -0,0 +1,21 @@
+import { GenericFieldLabel } from "@app/components/secret-syncs";
+import { useCamundaConnectionListClusters } from "@app/hooks/api/appConnections/camunda";
+import { TCamundaSync } from "@app/hooks/api/secretSyncs/types/camunda-sync";
+
+type Props = {
+  secretSync: TCamundaSync;
+};
+
+export const CamundaSyncDestinationSection = ({ secretSync }: Props) => {
+  const { data: clusters, isPending } = useCamundaConnectionListClusters(secretSync.connectionId);
+  const {
+    destinationConfig: { clusterUUID }
+  } = secretSync;
+
+  if (isPending) {
+    return <GenericFieldLabel label="Cluster">Loading...</GenericFieldLabel>;
+  }
+
+  const clusterName = clusters?.find((cluster) => cluster.uuid === clusterUUID)?.name;
+  return <GenericFieldLabel label="Cluster">{clusterName ?? clusterUUID}</GenericFieldLabel>;
+};
@@ -16,8 +16,11 @@ import { GitHubSyncDestinationSection } from "@app/pages/secret-manager/SecretSy

 import { AzureAppConfigurationSyncDestinationSection } from "./AzureAppConfigurationSyncDestinationSection";
 import { AzureKeyVaultSyncDestinationSection } from "./AzureKeyVaultSyncDestinationSection";
+import { CamundaSyncDestinationSection } from "./CamundaSyncDestinationSection";
 import { GcpSyncDestinationSection } from "./GcpSyncDestinationSection";
 import { HumanitecSyncDestinationSection } from "./HumanitecSyncDestinationSection";
+import { TerraformCloudSyncDestinationSection } from "./TerraformCloudSyncDestinationSection";
+import { VercelSyncDestinationSection } from "./VercelSyncDestinationSection";

 type Props = {
  secretSync: TSecretSync;
@@ -57,6 +60,15 @@ export const SecretSyncDestinationSection = ({ secretSync, onEditDestination }:
    case SecretSync.Humanitec:
      DestinationComponents = <HumanitecSyncDestinationSection secretSync={secretSync} />;
      break;
+    case SecretSync.TerraformCloud:
+      DestinationComponents = <TerraformCloudSyncDestinationSection secretSync={secretSync} />;
+      break;
+    case SecretSync.Camunda:
+      DestinationComponents = <CamundaSyncDestinationSection secretSync={secretSync} />;
+      break;
+    case SecretSync.Vercel:
+      DestinationComponents = <VercelSyncDestinationSection secretSync={secretSync} />;
+      break;
    default:
      throw new Error(`Unhandled Destination Section components: ${destination}`);
  }
@@ -0,0 +1,65 @@
+import { ReactNode } from "react";
+
+import { GenericFieldLabel } from "@app/components/secret-syncs";
+import { TerraformCloudSyncCategory } from "@app/hooks/api/appConnections/terraform-cloud";
+import {
+  TerraformCloudSyncScope,
+  TTerraformCloudSync
+} from "@app/hooks/api/secretSyncs/types/terraform-cloud-sync";
+
+type Props = {
+  secretSync: TTerraformCloudSync;
+};
+
+export const TerraformCloudSyncDestinationSection = ({ secretSync }: Props) => {
+  const { destinationConfig } = secretSync;
+
+  let Components: ReactNode;
+  switch (destinationConfig.scope) {
+    case TerraformCloudSyncScope.VariableSet:
+      Components = (
+        <>
+          <GenericFieldLabel label="Organization">{destinationConfig.org}</GenericFieldLabel>
+          <GenericFieldLabel label="Variable Set">
+            {destinationConfig.variableSetName}
+          </GenericFieldLabel>
+          <GenericFieldLabel label="Category">
+            {Object.keys(TerraformCloudSyncCategory).find(
+              (key) =>
+                TerraformCloudSyncCategory[key as keyof typeof TerraformCloudSyncCategory] ===
+                destinationConfig.category
+            )}
+          </GenericFieldLabel>
+        </>
+      );
+      break;
+    case TerraformCloudSyncScope.Workspace:
+      Components = (
+        <>
+          <GenericFieldLabel label="Organization">{destinationConfig.org}</GenericFieldLabel>
+          <GenericFieldLabel label="Workspace">{destinationConfig.workspaceName}</GenericFieldLabel>
+          <GenericFieldLabel label="Category">
+            {Object.keys(TerraformCloudSyncCategory).find(
+              (key) =>
+                TerraformCloudSyncCategory[key as keyof typeof TerraformCloudSyncCategory] ===
+                destinationConfig.category
+            )}
+          </GenericFieldLabel>
+        </>
+      );
+      break;
+    default:
+      throw new Error(
+        `Unhandled Terraform Cloud Sync Destination Section Scope ${secretSync.destinationConfig.scope}`
+      );
+  }
+
+  return (
+    <>
+      <GenericFieldLabel className="capitalize" label="Scope">
+        {destinationConfig.scope.replace("-", " ")}
+      </GenericFieldLabel>
+      {Components}
+    </>
+  );
+};
@@ -0,0 +1,36 @@
+import { ReactNode } from "react";
+
+import { GenericFieldLabel } from "@app/components/secret-syncs";
+import { TVercelSync, VercelEnvironmentType } from "@app/hooks/api/secretSyncs/types/vercel-sync";
+
+type Props = {
+  secretSync: TVercelSync;
+};
+
+export const VercelSyncDestinationSection = ({ secretSync }: Props) => {
+  const { destinationConfig } = secretSync;
+
+  let Components: ReactNode;
+  if (destinationConfig.env === VercelEnvironmentType.Preview && destinationConfig.branch) {
+    Components = (
+      <>
+        <GenericFieldLabel label="Vercel App">
+          {destinationConfig.appName || destinationConfig.app}
+        </GenericFieldLabel>
+        <GenericFieldLabel label="Environment">{destinationConfig.env}</GenericFieldLabel>
+        <GenericFieldLabel label="Preview Branch">{destinationConfig.branch}</GenericFieldLabel>
+      </>
+    );
+  } else {
+    Components = (
+      <>
+        <GenericFieldLabel label="Vercel App">
+          {destinationConfig.appName || destinationConfig.app}
+        </GenericFieldLabel>
+        <GenericFieldLabel label="Environment">{destinationConfig.env}</GenericFieldLabel>
+      </>
+    );
+  }
+
+  return Components;
+};
@@ -48,6 +48,9 @@ export const SecretSyncOptionsSection = ({ secretSync, onEditOptions }: Props) =
    case SecretSync.AzureAppConfiguration:
    case SecretSync.Databricks:
    case SecretSync.Humanitec:
+    case SecretSync.TerraformCloud:
+    case SecretSync.Camunda:
+    case SecretSync.Vercel:
      AdditionalSyncOptionsComponent = null;
      break;
    default: