From e1769ebfb8b7ffb0681d9bc90f88cbade277a07f Mon Sep 17 00:00:00 2001 From: Harinder Singh Date: Tue, 7 Jan 2025 19:44:26 +0530 Subject: [PATCH] INFRA-4080 | Harinder | Adding database name field in JIT request from when environment is Prod and resourceType is DB --- .../just-in-time-access/JustInTimeAccessPage.tsx | 13 ++++++++++++- .../JustInTimeAccessValidation.tsx | 10 ++++++++++ src/components/just-in-time-access/structs.tsx | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/components/just-in-time-access/JustInTimeAccessPage.tsx b/src/components/just-in-time-access/JustInTimeAccessPage.tsx index 2739fcc..0abc11f 100644 --- a/src/components/just-in-time-access/JustInTimeAccessPage.tsx +++ b/src/components/just-in-time-access/JustInTimeAccessPage.tsx @@ -30,6 +30,7 @@ const JustInTimeAccessPage = () => { vertical: '', environment: '', resourceType: '', + resourceId: '', resourceAction: '', awsResourceType: '', awsResourceNames: [''], @@ -43,6 +44,8 @@ const JustInTimeAccessPage = () => { const classes = useStyles(); let isResourceTypeAWSCustom = false; + let isResourceTypeDB = false; + let isEnvironmentProd = false; let resourceActionList = Array(); let awsCustomResourceTypeList = Array(); @@ -87,7 +90,8 @@ const JustInTimeAccessPage = () => { isResourceTypeAWSCustom = false; } resourceActionList = RESOURCE_ACTION_MAP[values[resourceTypeField]]; - // } + isResourceTypeDB = values[resourceTypeField] === 'DB' ? true : false; + isEnvironmentProd = values['environment'] === 'PROD' ? true : false; } return ( @@ -157,6 +161,13 @@ const JustInTimeAccessPage = () => { list={RESOURCE_TYPE_LIST} style={classes.field} /> + {isResourceTypeDB && isEnvironmentProd ? ( + + ) : null} {isResourceTypeAWSCustom ? ( { + const resourceType = context.parent.resourceType; + const environment = context.parent.environment; + if (resourceType === 'DB' && environment === 'PROD') { + if (value === null || value === undefined || value === '') { + return false; + } + } + return true; + }), resourceAction: yup.string().required('is Required'), justification: yup.string().required('is Required'), grantWindow: yup diff --git a/src/components/just-in-time-access/structs.tsx b/src/components/just-in-time-access/structs.tsx index 55a0e2e..60c79d6 100644 --- a/src/components/just-in-time-access/structs.tsx +++ b/src/components/just-in-time-access/structs.tsx @@ -10,6 +10,7 @@ export type JitRequest = { vertical: string; environment: string; resourceType: string; + resourceId: string; resourceAction: string; awsResourceType: string; awsResourceNames: Array;