diff --git a/backend/src/ee/secretRotation/templates/mysql.ts b/backend/src/ee/secretRotation/templates/mysql.ts index fa730b881..b57666596 100644 --- a/backend/src/ee/secretRotation/templates/mysql.ts +++ b/backend/src/ee/secretRotation/templates/mysql.ts @@ -69,6 +69,7 @@ export const MYSQL_TEMPLATE = { host: "${inputs.host}", database: "${inputs.database}", port: "${inputs.port}", + ca: "${inputs.ca}", query: "SELECT NOW()" } } diff --git a/backend/src/ee/secretRotation/templates/postgres.ts b/backend/src/ee/secretRotation/templates/postgres.ts index ca489570b..c4981cf29 100644 --- a/backend/src/ee/secretRotation/templates/postgres.ts +++ b/backend/src/ee/secretRotation/templates/postgres.ts @@ -68,6 +68,7 @@ export const POSTGRES_TEMPLATE = { host: "${inputs.host}", database: "${inputs.database}", port: "${inputs.port}", + ca: "${inputs.ca}", query: "SELECT NOW()" } } diff --git a/frontend/src/views/SecretRotationPage/SecretRotationPage.tsx b/frontend/src/views/SecretRotationPage/SecretRotationPage.tsx index e36f8d791..0cb179db3 100644 --- a/frontend/src/views/SecretRotationPage/SecretRotationPage.tsx +++ b/frontend/src/views/SecretRotationPage/SecretRotationPage.tsx @@ -163,10 +163,10 @@ export const SecretRotationPage = withProjectPermission( }; const handleCreateRotation = async (provider: TSecretRotationProvider) => { - // if (subscription && !subscription?.secretRotation) { - // handlePopUpOpen("upgradePlan"); - // return; - // } + if (subscription && !subscription?.secretRotation) { + handlePopUpOpen("upgradePlan"); + return; + } if (!canCreateRotation) { createNotification({ type: "error", text: "Access permission denied!!" }); return; @@ -392,7 +392,7 @@ export const SecretRotationPage = withProjectPermission( title="Are you sure want to delete this rotation?" subTitle="This will stop the rotation from dynamically changing. Secret won't be deleted" onChange={(isOpen) => handlePopUpToggle("deleteRotation", isOpen)} - deleteKey="confirm" + deleteKey="delete" onDeleteApproved={handleDeleteRotation} />