diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts index f3f43ef2c..c2db3e6e7 100644 --- a/backend/src/ee/services/license/license-fns.ts +++ b/backend/src/ee/services/license/license-fns.ts @@ -40,7 +40,7 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ status: null, trial_end: null, has_used_trial: true, - secretApproval: true, + secretApproval: false, secretRotation: false, caCrl: false, instanceUserManagement: false, diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AwsIamInputForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AwsIamInputForm.tsx index 48e942d0a..03db38935 100644 --- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AwsIamInputForm.tsx +++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/AwsIamInputForm.tsx @@ -36,10 +36,13 @@ const formSchema = z.object({ userGroups: z.string().trim().optional(), policyArns: z.string().trim().optional(), tags: z - .array( - z.object({ key: z.string().trim().min(1).max(128), value: z.string().trim().min(1).max(256) }) - ) - .optional() + .array( + z.object({ + key: z.string().trim().min(1).max(128), + value: z.string().trim().min(1).max(256) + }) + ) + .optional() }), z.object({ method: z.literal(DynamicSecretAwsIamAuth.AssumeRole), @@ -51,10 +54,13 @@ const formSchema = z.object({ userGroups: z.string().trim().optional(), policyArns: z.string().trim().optional(), tags: z - .array( - z.object({ key: z.string().trim().min(1).max(128), value: z.string().trim().min(1).max(256) }) - ) - .optional() + .array( + z.object({ + key: z.string().trim().min(1).max(128), + value: z.string().trim().min(1).max(256) + }) + ) + .optional() }) ]), defaultTTL: z.string().superRefine((val, ctx) => { diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/DynamicSecretListView/EditDynamicSecretForm/EditDynamicSecretAwsIamForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/DynamicSecretListView/EditDynamicSecretForm/EditDynamicSecretAwsIamForm.tsx index d28f983da..8572b1a0c 100644 --- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/DynamicSecretListView/EditDynamicSecretForm/EditDynamicSecretAwsIamForm.tsx +++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/DynamicSecretListView/EditDynamicSecretForm/EditDynamicSecretAwsIamForm.tsx @@ -25,8 +25,8 @@ const formSchema = z.object({ userGroups: z.string().trim().optional(), policyArns: z.string().trim().optional(), tags: z - .array(z.object({ key: z.string().trim().min(1), value: z.string().trim().min(1) })) - .optional(), + .array(z.object({ key: z.string().trim().min(1), value: z.string().trim().min(1) })) + .optional() }), z.object({ method: z.literal(DynamicSecretAwsIamAuth.AssumeRole), @@ -38,8 +38,8 @@ const formSchema = z.object({ userGroups: z.string().trim().optional(), policyArns: z.string().trim().optional(), tags: z - .array(z.object({ key: z.string().trim().min(1), value: z.string().trim().min(1) })) - .optional() + .array(z.object({ key: z.string().trim().min(1), value: z.string().trim().min(1) })) + .optional() }) ]), defaultTTL: z.string().superRefine((val, ctx) => { @@ -97,7 +97,7 @@ export const EditDynamicSecretAwsIamForm = ({ usernameTemplate: dynamicSecret?.usernameTemplate || "{{randomUsername}}", inputs: { ...(dynamicSecret.inputs as TForm["inputs"]) - }, + } } }); const isAccessKeyMethod = watch("inputs.method") === DynamicSecretAwsIamAuth.AccessKey; @@ -125,8 +125,7 @@ export const EditDynamicSecretAwsIamForm = ({ defaultTTL, inputs, newName: newName === dynamicSecret.name ? undefined : newName, - usernameTemplate: - !usernameTemplate || isDefaultUsernameTemplate ? null : usernameTemplate + usernameTemplate: !usernameTemplate || isDefaultUsernameTemplate ? null : usernameTemplate } }); onClose();