Improve terraform-cloud secret sync destination variables

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

@@ -39,8 +39,10 @@ export const TerraformCloudSyncFields = () => {
       <SecretSyncConnectionField
         onChange={() => {
           setValue("destinationConfig.org", "");
-          setValue("destinationConfig.destinationId", "");
-          setValue("destinationConfig.destinationName", "");
+          setValue("destinationConfig.variableSetId", "");
+          setValue("destinationConfig.workspaceId", "");
+          setValue("destinationConfig.variableSetName", "");
+          setValue("destinationConfig.workspaceName", "");
         }}
       />
       <Controller
@@ -60,8 +62,10 @@ export const TerraformCloudSyncFields = () => {
                 onChange(
                   (option as SingleValue<TTerraformCloudConnectionOrganization>)?.id ?? null
                 );
-                setValue("destinationConfig.destinationId", "");
-                setValue("destinationConfig.destinationName", "");
+                setValue("destinationConfig.variableSetId", "");
+                setValue("destinationConfig.workspaceId", "");
+                setValue("destinationConfig.variableSetName", "");
+                setValue("destinationConfig.workspaceName", "");
               }}
               options={organizations}
               placeholder="Select an organization..."
@@ -155,8 +159,10 @@ export const TerraformCloudSyncFields = () => {
               value={value}
               onValueChange={(val) => {
                 onChange(val);
-                setValue("destinationConfig.destinationId", "");
-                setValue("destinationConfig.destinationName", "");
+                setValue("destinationConfig.variableSetId", "");
+                setValue("destinationConfig.workspaceId", "");
+                setValue("destinationConfig.variableSetName", "");
+                setValue("destinationConfig.workspaceName", "");
               }}
               className="w-full border border-mineshaft-500 capitalize"
               position="popper"
@@ -174,7 +180,7 @@ export const TerraformCloudSyncFields = () => {
       />
       {currentScope === TerraformCloudSyncScope.VariableSet && (
         <Controller
-          name="destinationConfig.destinationId"
+          name="destinationConfig.variableSetId"
           control={control}
           render={({ field: { value, onChange }, fieldState: { error } }) => (
             <FormControl isError={Boolean(error)} errorText={error?.message} label="Variable Set">
@@ -189,9 +195,9 @@ export const TerraformCloudSyncFields = () => {
                   onChange(selectedOption?.id ?? null);
 
                   if (selectedOption) {
-                    setValue("destinationConfig.destinationName", selectedOption.name);
+                    setValue("destinationConfig.variableSetName", selectedOption.name);
                   } else {
-                    setValue("destinationConfig.destinationName", "");
+                    setValue("destinationConfig.variableSetName", "");
                   }
                 }}
                 options={variableSets}
@@ -205,7 +211,7 @@ export const TerraformCloudSyncFields = () => {
       )}
       {currentScope === TerraformCloudSyncScope.Workspace && (
         <Controller
-          name="destinationConfig.destinationId"
+          name="destinationConfig.workspaceId"
           control={control}
           render={({ field: { value, onChange }, fieldState: { error } }) => (
             <FormControl isError={Boolean(error)} errorText={error?.message} label="Workspace">
@@ -219,9 +225,9 @@ export const TerraformCloudSyncFields = () => {
                   onChange(selectedOption?.id ?? null);
 
                   if (selectedOption) {
-                    setValue("destinationConfig.destinationName", selectedOption.name);
+                    setValue("destinationConfig.workspaceName", selectedOption.name);
                   } else {
-                    setValue("destinationConfig.destinationName", "");
+                    setValue("destinationConfig.workspaceName", "");
                   }
                 }}
                 options={workspaces}

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

@@ -8,7 +8,8 @@ import { SecretSync } from "@app/hooks/api/secretSyncs";
 export const TerraformCloudSyncReviewFields = () => {
   const { watch } = useFormContext<TSecretSyncForm & { destination: SecretSync.TerraformCloud }>();
   const orgId = watch("destinationConfig.org");
-  const destinationName = watch("destinationConfig.destinationName");
+  const variableSetName = watch("destinationConfig.variableSetName");
+  const workspaceName = watch("destinationConfig.workspaceName");
   const scope = watch("destinationConfig.scope");
   const category = watch("destinationConfig.category");
 
@@ -16,10 +17,10 @@ export const TerraformCloudSyncReviewFields = () => {
     <>
       <GenericFieldLabel label="Organization">{orgId}</GenericFieldLabel>
       {scope === TerraformCloudSyncScope.VariableSet && (
-        <GenericFieldLabel label="Variable Set">{destinationName}</GenericFieldLabel>
+        <GenericFieldLabel label="Variable Set">{variableSetName}</GenericFieldLabel>
       )}
       {scope === TerraformCloudSyncScope.Workspace && (
-        <GenericFieldLabel label="Workspace">{destinationName}</GenericFieldLabel>
+        <GenericFieldLabel label="Workspace">{workspaceName}</GenericFieldLabel>
       )}
       <GenericFieldLabel label="Category">{category}</GenericFieldLabel>
     </>

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

@@ -14,15 +14,15 @@ export const TerraformCloudSyncDestinationSchema = BaseSecretSyncSchema().merge(
       z.object({
         scope: z.literal(TerraformCloudSyncScope.VariableSet),
         org: z.string().trim().min(1, "Organization required"),
-        destinationId: z.string().trim().min(1, "Variable Set required"),
-        destinationName: z.string().trim().min(1, "Variable set name 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"),
-        destinationId: z.string().trim().min(1, "Workspace required"),
-        destinationName: z.string().trim().min(1, "Workspace name required"),
+        workspaceId: z.string().trim().min(1, "Workspace required"),
+        workspaceName: z.string().trim().min(1, "Workspace name required"),
         category: z.nativeEnum(TerraformCloudSyncCategory)
       })
     ])

frontend/src/hooks/api/secretSyncs/types/terraform-cloud-sync.ts

@@ -11,15 +11,15 @@ export type TTerraformCloudSync = TRootSecretSync & {
         scope: TerraformCloudSyncScope.VariableSet;
         org: string;
         category: TerraformCloudSyncCategory;
-        destinationId: string;
-        destinationName: string;
+        variableSetId: string;
+        variableSetName: string;
       }
     | {
         scope: TerraformCloudSyncScope.Workspace;
         org: string;
         category: TerraformCloudSyncCategory;
-        destinationId: string;
-        destinationName: string;
+        workspaceId: string;
+        workspaceName: string;
       };
   connection: {
     app: AppConnection.TerraformCloud;

frontend/src/pages/secret-manager/IntegrationsListPage/components/SecretSyncsTab/SecretSyncTable/helpers/index.ts

@@ -1,3 +1,4 @@
+import { TerraformCloudSyncScope } from "@app/hooks/api/appConnections/terraform-cloud";
 import { SecretSync, TSecretSync } from "@app/hooks/api/secretSyncs";
 import {
   GitHubSyncScope,
@@ -75,7 +76,11 @@ export const getSecretSyncDestinationColValues = (secretSync: TSecretSync) => {
       break;
     case SecretSync.TerraformCloud:
       primaryText = destinationConfig.org;
-      secondaryText = destinationConfig.destinationName;
+      if (destinationConfig.scope === TerraformCloudSyncScope.VariableSet) {
+        secondaryText = destinationConfig.variableSetName;
+      } else {
+        secondaryText = destinationConfig.workspaceName;
+      }
       break;
     default:
       throw new Error(`Unhandled Destination Col Values ${destination}`);

frontend/src/pages/secret-manager/SecretSyncDetailsByIDPage/components/SecretSyncDestinationSection/TerraformCloudSyncDestinationCol.tsx

@@ -20,7 +20,7 @@ export const TerraformCloudSyncDestinationSection = ({ secretSync }: Props) => {
         <>
           <GenericFieldLabel label="Organization">{destinationConfig.org}</GenericFieldLabel>
           <GenericFieldLabel label="Variable Set">
-            {destinationConfig.destinationName}
+            {destinationConfig.variableSetName}
           </GenericFieldLabel>
         </>
       );
@@ -29,9 +29,7 @@ export const TerraformCloudSyncDestinationSection = ({ secretSync }: Props) => {
       Components = (
         <>
           <GenericFieldLabel label="Organization">{destinationConfig.org}</GenericFieldLabel>
-          <GenericFieldLabel label="Workspace">
-            {destinationConfig.destinationName}
-          </GenericFieldLabel>
+          <GenericFieldLabel label="Workspace">{destinationConfig.workspaceName}</GenericFieldLabel>
         </>
       );
       break;