merge deconflict

frontend/src/components/secret-syncs/CreateSecretSyncModal.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 import { Modal, ModalContent } from "@app/components/v2";
 import { SecretSync, TSecretSync } from "@app/hooks/api/secretSyncs";
@@ -10,6 +10,7 @@ import { SecretSyncSelect } from "./SecretSyncSelect";
 type Props = {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
+  selectSync?: SecretSync | null;
 };
 
 type ContentProps = {
@@ -32,8 +33,12 @@ const Content = ({ onComplete, setSelectedSync, selectedSync }: ContentProps) =>
   return <SecretSyncSelect onSelect={setSelectedSync} />;
 };
 
-export const CreateSecretSyncModal = ({ onOpenChange, ...props }: Props) => {
-  const [selectedSync, setSelectedSync] = useState<SecretSync | null>(null);
+export const CreateSecretSyncModal = ({ onOpenChange, selectSync = null, ...props }: Props) => {
+  const [selectedSync, setSelectedSync] = useState<SecretSync | null>(selectSync);
+
+  useEffect(() => {
+    setSelectedSync(selectSync);
+  }, [selectSync]);
 
   return (
     <Modal

frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/SecretSyncDestinationFields.tsx

@@ -12,6 +12,7 @@ import { DatabricksSyncFields } from "./DatabricksSyncFields";
 import { GcpSyncFields } from "./GcpSyncFields";
 import { GitHubSyncFields } from "./GitHubSyncFields";
 import { HumanitecSyncFields } from "./HumanitecSyncFields";
+import { TerraformCloudSyncFields } from "./TerraformCloudSyncFields";
 import { VercelSyncFields } from "./VercelSyncFields";
 
 export const SecretSyncDestinationFields = () => {
@@ -36,6 +37,8 @@ export const SecretSyncDestinationFields = () => {
       return <DatabricksSyncFields />;
     case SecretSync.Humanitec:
       return <HumanitecSyncFields />;
+    case SecretSync.TerraformCloud:
+      return <TerraformCloudSyncFields />;
     case SecretSync.Camunda:
       return <CamundaSyncFields />;
     case SecretSync.Vercel:

frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/TerraformCloudSyncFields.tsx

@@ -0,0 +1,244 @@
+import { Controller, useFormContext, useWatch } from "react-hook-form";
+import { SingleValue } from "react-select";
+
+import { SecretSyncConnectionField } from "@app/components/secret-syncs/forms/SecretSyncConnectionField";
+import { FilterableSelect, FormControl, Select, SelectItem } from "@app/components/v2";
+import {
+  TERRAFORM_CLOUD_SYNC_SCOPES,
+  TerraformCloudSyncCategory,
+  TerraformCloudSyncScope,
+  TTerraformCloudConnectionOrganization,
+  TTerraformCloudConnectionVariableSet,
+  TTerraformCloudConnectionWorkspace,
+  useTerraformCloudConnectionListOrganizations
+} from "@app/hooks/api/appConnections/terraform-cloud";
+import { SecretSync } from "@app/hooks/api/secretSyncs";
+
+import { TSecretSyncForm } from "../schemas";
+
+export const TerraformCloudSyncFields = () => {
+  const { control, watch, setValue } = useFormContext<
+    TSecretSyncForm & { destination: SecretSync.TerraformCloud }
+  >();
+
+  const connectionId = useWatch({ name: "connection.id", control });
+  const currentOrg = watch("destinationConfig.org");
+  const currentScope = watch("destinationConfig.scope");
+
+  const { data: organizations = [], isPending: isOrganizationsPending } =
+    useTerraformCloudConnectionListOrganizations(connectionId, {
+      enabled: Boolean(connectionId)
+    });
+
+  const selectedOrg = organizations?.find((org) => org.id === currentOrg);
+  const variableSets = selectedOrg?.variableSets || [];
+  const workspaces = selectedOrg?.workspaces || [];
+
+  return (
+    <>
+      <SecretSyncConnectionField
+        onChange={() => {
+          setValue("destinationConfig.org", "");
+          setValue("destinationConfig.variableSetId", "");
+          setValue("destinationConfig.workspaceId", "");
+          setValue("destinationConfig.variableSetName", "");
+          setValue("destinationConfig.workspaceName", "");
+        }}
+      />
+      <Controller
+        name="destinationConfig.org"
+        control={control}
+        render={({ field: { value, onChange }, fieldState: { error } }) => (
+          <FormControl
+            errorText={error?.message}
+            isError={Boolean(error?.message)}
+            label="Organization"
+          >
+            <FilterableSelect
+              isLoading={isOrganizationsPending && Boolean(connectionId)}
+              isDisabled={!connectionId}
+              value={organizations ? (organizations.find((org) => org.id === value) ?? null) : null}
+              onChange={(option) => {
+                onChange(
+                  (option as SingleValue<TTerraformCloudConnectionOrganization>)?.id ?? null
+                );
+                setValue("destinationConfig.variableSetId", "");
+                setValue("destinationConfig.workspaceId", "");
+                setValue("destinationConfig.variableSetName", "");
+                setValue("destinationConfig.workspaceName", "");
+              }}
+              options={organizations}
+              placeholder="Select an organization..."
+              getOptionLabel={(option) => option.name}
+              getOptionValue={(option) => option.id.toString()}
+            />
+          </FormControl>
+        )}
+      />
+      <Controller
+        name="destinationConfig.category"
+        control={control}
+        defaultValue={TerraformCloudSyncCategory.Environment}
+        render={({ field: { value, onChange }, fieldState: { error } }) => (
+          <FormControl
+            errorText={error?.message}
+            isError={Boolean(error?.message)}
+            label="Category"
+            tooltipClassName="max-w-lg py-3"
+            tooltipText={
+              <div className="flex flex-col gap-3">
+                <ul className="flex list-disc flex-col gap-3 pl-4">
+                  <li>
+                    <p className="text-mineshaft-300">
+                      <span className="font-medium text-bunker-200">
+                        Environment variables configure Terraform&apos;s behavior (e.g.,
+                        credentials).
+                      </span>
+                    </p>
+                  </li>
+                  <li>
+                    <p className="text-mineshaft-300">
+                      <span className="font-medium text-bunker-200">
+                        Terraform variables are used as input values in your configuration.
+                      </span>
+                    </p>
+                  </li>
+                </ul>
+              </div>
+            }
+          >
+            <Select
+              value={value}
+              onValueChange={onChange}
+              className="w-full border border-mineshaft-500 capitalize"
+              position="popper"
+              defaultValue={TerraformCloudSyncCategory.Environment}
+              placeholder="Select category..."
+              dropdownContainerClassName="max-w-none"
+            >
+              {Object.entries(TerraformCloudSyncCategory).map(([envKey, envValue]) => (
+                <SelectItem className="capitalize" value={envValue} key={envValue}>
+                  {envKey.replace("-", " ")}
+                </SelectItem>
+              ))}
+            </Select>
+          </FormControl>
+        )}
+      />
+      <Controller
+        name="destinationConfig.scope"
+        control={control}
+        defaultValue={TerraformCloudSyncScope.VariableSet}
+        render={({ field: { value, onChange }, fieldState: { error } }) => (
+          <FormControl
+            errorText={error?.message}
+            isError={Boolean(error?.message)}
+            label="Scope"
+            tooltipClassName="max-w-lg py-3"
+            tooltipText={
+              <div className="flex flex-col gap-3">
+                <p>
+                  Specify how Infisical should manage secrets from Terraform Cloud. The following
+                  options are available:
+                </p>
+                <ul className="flex list-disc flex-col gap-3 pl-4">
+                  {Object.values(TERRAFORM_CLOUD_SYNC_SCOPES).map(({ name, description }) => {
+                    return (
+                      <li key={name}>
+                        <p className="text-mineshaft-300">
+                          <span className="font-medium text-bunker-200">{name}</span>: {description}
+                        </p>
+                      </li>
+                    );
+                  })}
+                </ul>
+              </div>
+            }
+          >
+            <Select
+              value={value}
+              onValueChange={(val) => {
+                onChange(val);
+                setValue("destinationConfig.variableSetId", "");
+                setValue("destinationConfig.workspaceId", "");
+                setValue("destinationConfig.variableSetName", "");
+                setValue("destinationConfig.workspaceName", "");
+              }}
+              className="w-full border border-mineshaft-500 capitalize"
+              position="popper"
+              placeholder="Select a scope..."
+              dropdownContainerClassName="max-w-none"
+            >
+              {Object.values(TerraformCloudSyncScope).map((scope) => (
+                <SelectItem className="capitalize" value={scope} key={scope}>
+                  {scope.replace("-", " ")}
+                </SelectItem>
+              ))}
+            </Select>
+          </FormControl>
+        )}
+      />
+      {currentScope === TerraformCloudSyncScope.VariableSet && (
+        <Controller
+          name="destinationConfig.variableSetId"
+          control={control}
+          render={({ field: { value, onChange }, fieldState: { error } }) => (
+            <FormControl isError={Boolean(error)} errorText={error?.message} label="Variable Set">
+              <FilterableSelect
+                menuPlacement="top"
+                isLoading={isOrganizationsPending && Boolean(connectionId) && Boolean(currentOrg)}
+                isDisabled={!connectionId || !currentOrg}
+                value={variableSets.find((variableSet) => variableSet.id === value) ?? null}
+                onChange={(option) => {
+                  const selectedOption =
+                    option as SingleValue<TTerraformCloudConnectionVariableSet>;
+                  onChange(selectedOption?.id ?? null);
+
+                  if (selectedOption) {
+                    setValue("destinationConfig.variableSetName", selectedOption.name);
+                  } else {
+                    setValue("destinationConfig.variableSetName", "");
+                  }
+                }}
+                options={variableSets}
+                placeholder="Select a variable set..."
+                getOptionLabel={(option) => option.name}
+                getOptionValue={(option) => option.id.toString()}
+              />
+            </FormControl>
+          )}
+        />
+      )}
+      {currentScope === TerraformCloudSyncScope.Workspace && (
+        <Controller
+          name="destinationConfig.workspaceId"
+          control={control}
+          render={({ field: { value, onChange }, fieldState: { error } }) => (
+            <FormControl isError={Boolean(error)} errorText={error?.message} label="Workspace">
+              <FilterableSelect
+                menuPlacement="top"
+                isLoading={isOrganizationsPending && Boolean(connectionId) && Boolean(currentOrg)}
+                isDisabled={!connectionId || !currentOrg}
+                value={workspaces.find((workspace) => workspace.id === value) ?? null}
+                onChange={(option) => {
+                  const selectedOption = option as SingleValue<TTerraformCloudConnectionWorkspace>;
+                  onChange(selectedOption?.id ?? null);
+
+                  if (selectedOption) {
+                    setValue("destinationConfig.workspaceName", selectedOption.name);
+                  } else {
+                    setValue("destinationConfig.workspaceName", "");
+                  }
+                }}
+                options={workspaces}
+                placeholder="Select a workspace..."
+                getOptionLabel={(option) => option.name}
+                getOptionValue={(option) => option.id.toString()}
+              />
+            </FormControl>
+          )}
+        />
+      )}
+    </>
+  );
+};

frontend/src/components/secret-syncs/forms/SecretSyncOptionsFields/SecretSyncOptionsFields.tsx

@@ -39,6 +39,7 @@ export const SecretSyncOptionsFields = ({ hideInitialSync }: Props) => {
     case SecretSync.AzureAppConfiguration:
     case SecretSync.Databricks:
     case SecretSync.Humanitec:
+    case SecretSync.TerraformCloud:
     case SecretSync.Camunda:
     case SecretSync.Vercel:
       AdditionalSyncOptionsFieldsComponent = null;

frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/SecretSyncReviewFields.tsx

@@ -22,6 +22,7 @@ import { DatabricksSyncReviewFields } from "./DatabricksSyncReviewFields";
 import { GcpSyncReviewFields } from "./GcpSyncReviewFields";
 import { GitHubSyncReviewFields } from "./GitHubSyncReviewFields";
 import { HumanitecSyncReviewFields } from "./HumanitecSyncReviewFields";
+import { TerraformCloudSyncReviewFields } from "./TerraformCloudSyncReviewFields";
 import { VercelSyncReviewFields } from "./VercelSyncReviewFields";
 
 export const SecretSyncReviewFields = () => {
@@ -74,6 +75,9 @@ export const SecretSyncReviewFields = () => {
     case SecretSync.Humanitec:
       DestinationFieldsComponent = <HumanitecSyncReviewFields />;
       break;
+    case SecretSync.TerraformCloud:
+      DestinationFieldsComponent = <TerraformCloudSyncReviewFields />;
+      break;
     case SecretSync.Camunda:
       DestinationFieldsComponent = <CamundaSyncReviewFields />;
       break;

frontend/src/components/secret-syncs/forms/SecretSyncReviewFields/TerraformCloudSyncReviewFields.tsx

@@ -0,0 +1,28 @@
+import { useFormContext } from "react-hook-form";
+
+import { GenericFieldLabel } from "@app/components/secret-syncs";
+import { TSecretSyncForm } from "@app/components/secret-syncs/forms/schemas";
+import { TerraformCloudSyncScope } from "@app/hooks/api/appConnections/terraform-cloud";
+import { SecretSync } from "@app/hooks/api/secretSyncs";
+
+export const TerraformCloudSyncReviewFields = () => {
+  const { watch } = useFormContext<TSecretSyncForm & { destination: SecretSync.TerraformCloud }>();
+  const orgId = watch("destinationConfig.org");
+  const variableSetName = watch("destinationConfig.variableSetName");
+  const workspaceName = watch("destinationConfig.workspaceName");
+  const scope = watch("destinationConfig.scope");
+  const category = watch("destinationConfig.category");
+
+  return (
+    <>
+      <GenericFieldLabel label="Organization">{orgId}</GenericFieldLabel>
+      {scope === TerraformCloudSyncScope.VariableSet && (
+        <GenericFieldLabel label="Variable Set">{variableSetName}</GenericFieldLabel>
+      )}
+      {scope === TerraformCloudSyncScope.Workspace && (
+        <GenericFieldLabel label="Workspace">{workspaceName}</GenericFieldLabel>
+      )}
+      <GenericFieldLabel label="Category">{category}</GenericFieldLabel>
+    </>
+  );
+};

frontend/src/components/secret-syncs/forms/schemas/secret-sync-schema.ts

@@ -10,6 +10,7 @@ import { AzureKeyVaultSyncDestinationSchema } from "./azure-key-vault-sync-desti
 import { CamundaSyncDestinationSchema } from "./camunda-sync-destination-schema";
 import { GcpSyncDestinationSchema } from "./gcp-sync-destination-schema";
 import { HumanitecSyncDestinationSchema } from "./humanitec-sync-destination-schema";
+import { TerraformCloudSyncDestinationSchema } from "./terraform-cloud-destination-schema";
 import { VercelSyncDestinationSchema } from "./vercel-sync-destination-schema";
 
 const SecretSyncUnionSchema = z.discriminatedUnion("destination", [
@@ -21,6 +22,7 @@ const SecretSyncUnionSchema = z.discriminatedUnion("destination", [
   AzureAppConfigurationSyncDestinationSchema,
   DatabricksSyncDestinationSchema,
   HumanitecSyncDestinationSchema,
+  TerraformCloudSyncDestinationSchema,
   CamundaSyncDestinationSchema,
   VercelSyncDestinationSchema
 ]);

frontend/src/components/secret-syncs/forms/schemas/terraform-cloud-destination-schema.ts

@@ -0,0 +1,30 @@
+import { z } from "zod";
+
+import { BaseSecretSyncSchema } from "@app/components/secret-syncs/forms/schemas/base-secret-sync-schema";
+import {
+  TerraformCloudSyncCategory,
+  TerraformCloudSyncScope
+} from "@app/hooks/api/appConnections/terraform-cloud";
+import { SecretSync } from "@app/hooks/api/secretSyncs";
+
+export const TerraformCloudSyncDestinationSchema = BaseSecretSyncSchema().merge(
+  z.object({
+    destination: z.literal(SecretSync.TerraformCloud),
+    destinationConfig: z.discriminatedUnion("scope", [
+      z.object({
+        scope: z.literal(TerraformCloudSyncScope.VariableSet),
+        org: z.string().trim().min(1, "Organization required"),
+        variableSetId: z.string().trim().min(1, "Variable Set required"),
+        variableSetName: z.string().trim().min(1, "Variable set name required"),
+        category: z.nativeEnum(TerraformCloudSyncCategory)
+      }),
+      z.object({
+        scope: z.literal(TerraformCloudSyncScope.Workspace),
+        org: z.string().trim().min(1, "Organization required"),
+        workspaceId: z.string().trim().min(1, "Workspace required"),
+        workspaceName: z.string().trim().min(1, "Workspace name required"),
+        category: z.nativeEnum(TerraformCloudSyncCategory)
+      })
+    ])
+  })
+);

frontend/src/components/v2/DeleteActionModal/DeleteActionModal.tsx

@@ -16,7 +16,9 @@ type Props = {
   subTitle?: string;
   onDeleteApproved: () => Promise<void>;
   buttonText?: string;
+  formContent?: ReactNode;
   children?: ReactNode;
+  deletionMessage?: ReactNode;
 };
 
 export const DeleteActionModal = ({
@@ -28,6 +30,8 @@ export const DeleteActionModal = ({
   title,
   subTitle = "This action is irreversible.",
   buttonText = "Delete",
+  formContent,
+  deletionMessage,
   children
 }: Props): JSX.Element => {
   const [inputData, setInputData] = useState("");
@@ -79,6 +83,7 @@ export const DeleteActionModal = ({
         }
         onClose={onClose}
       >
+        {formContent}
         <form
           onSubmit={(evt) => {
             evt.preventDefault();
@@ -88,7 +93,11 @@ export const DeleteActionModal = ({
           <FormControl
             label={
               <div className="break-words pb-2 text-sm">
-                Type <span className="font-bold">{deleteKey}</span> to perform this action
+                {deletionMessage || (
+                  <>
+                    Type <span className="font-bold">{deleteKey}</span> to perform this action
+                  </>
+                )}
               </div>
             }
             className="mb-0"