From c936aa7157a02af8a2201fea251d9c75523a9b07 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 25 Mar 2025 02:29:50 +0530 Subject: [PATCH] feat: updated all providers --- .../src/ee/services/dynamic-secret/providers/cassandra.ts | 4 ++-- .../ee/services/dynamic-secret/providers/elastic-search.ts | 5 ++--- backend/src/ee/services/dynamic-secret/providers/mongo-db.ts | 4 ++-- .../src/ee/services/dynamic-secret/providers/rabbit-mq.ts | 5 ++--- backend/src/ee/services/dynamic-secret/providers/sap-ase.ts | 4 ++-- backend/src/ee/services/dynamic-secret/providers/sap-hana.ts | 4 ++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/backend/src/ee/services/dynamic-secret/providers/cassandra.ts b/backend/src/ee/services/dynamic-secret/providers/cassandra.ts index 4ec798488..5e4250a35 100644 --- a/backend/src/ee/services/dynamic-secret/providers/cassandra.ts +++ b/backend/src/ee/services/dynamic-secret/providers/cassandra.ts @@ -21,7 +21,7 @@ const generateUsername = () => { export const CassandraProvider = (): TDynamicProviderFns => { const validateProviderInputs = async (inputs: unknown) => { const providerInputs = await DynamicSecretCassandraSchema.parseAsync(inputs); - await verifyHostInputValidity(providerInputs.host); + const [hostIp] = await verifyHostInputValidity(providerInputs.host); validateHandlebarTemplate("Cassandra creation", providerInputs.creationStatement, { allowedExpressions: (val) => ["username", "password", "expiration", "keyspace"].includes(val) }); @@ -34,7 +34,7 @@ export const CassandraProvider = (): TDynamicProviderFns => { allowedExpressions: (val) => ["username"].includes(val) }); - return providerInputs; + return { ...providerInputs, host: hostIp }; }; const $getClient = async (providerInputs: z.infer) => { diff --git a/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts b/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts index d58490f7a..e3ad9c112 100644 --- a/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts +++ b/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts @@ -19,9 +19,8 @@ const generateUsername = () => { export const ElasticSearchProvider = (): TDynamicProviderFns => { const validateProviderInputs = async (inputs: unknown) => { const providerInputs = await DynamicSecretElasticSearchSchema.parseAsync(inputs); - await verifyHostInputValidity(providerInputs.host); - - return providerInputs; + const [hostIp] = await verifyHostInputValidity(providerInputs.host); + return { ...providerInputs, host: hostIp }; }; const $getClient = async (providerInputs: z.infer) => { diff --git a/backend/src/ee/services/dynamic-secret/providers/mongo-db.ts b/backend/src/ee/services/dynamic-secret/providers/mongo-db.ts index 77f8f4f2f..42fea268d 100644 --- a/backend/src/ee/services/dynamic-secret/providers/mongo-db.ts +++ b/backend/src/ee/services/dynamic-secret/providers/mongo-db.ts @@ -19,8 +19,8 @@ const generateUsername = () => { export const MongoDBProvider = (): TDynamicProviderFns => { const validateProviderInputs = async (inputs: unknown) => { const providerInputs = await DynamicSecretMongoDBSchema.parseAsync(inputs); - await verifyHostInputValidity(providerInputs.host); - return providerInputs; + const [hostIp] = await verifyHostInputValidity(providerInputs.host); + return { ...providerInputs, host: hostIp }; }; const $getClient = async (providerInputs: z.infer) => { diff --git a/backend/src/ee/services/dynamic-secret/providers/rabbit-mq.ts b/backend/src/ee/services/dynamic-secret/providers/rabbit-mq.ts index c76e482b3..a259c6bde 100644 --- a/backend/src/ee/services/dynamic-secret/providers/rabbit-mq.ts +++ b/backend/src/ee/services/dynamic-secret/providers/rabbit-mq.ts @@ -79,9 +79,8 @@ async function deleteRabbitMqUser({ axiosInstance, usernameToDelete }: TDeleteRa export const RabbitMqProvider = (): TDynamicProviderFns => { const validateProviderInputs = async (inputs: unknown) => { const providerInputs = await DynamicSecretRabbitMqSchema.parseAsync(inputs); - await verifyHostInputValidity(providerInputs.host); - - return providerInputs; + const [hostIp] = await verifyHostInputValidity(providerInputs.host); + return { ...providerInputs, host: hostIp }; }; const $getClient = async (providerInputs: z.infer) => { diff --git a/backend/src/ee/services/dynamic-secret/providers/sap-ase.ts b/backend/src/ee/services/dynamic-secret/providers/sap-ase.ts index b86d3c423..37e0eb36c 100644 --- a/backend/src/ee/services/dynamic-secret/providers/sap-ase.ts +++ b/backend/src/ee/services/dynamic-secret/providers/sap-ase.ts @@ -28,7 +28,7 @@ export const SapAseProvider = (): TDynamicProviderFns => { const validateProviderInputs = async (inputs: unknown) => { const providerInputs = await DynamicSecretSapAseSchema.parseAsync(inputs); - await verifyHostInputValidity(providerInputs.host); + const [hostIp] = await verifyHostInputValidity(providerInputs.host); validateHandlebarTemplate("SAP ASE creation", providerInputs.creationStatement, { allowedExpressions: (val) => ["username", "password"].includes(val) }); @@ -37,7 +37,7 @@ export const SapAseProvider = (): TDynamicProviderFns => { allowedExpressions: (val) => ["username"].includes(val) }); } - return providerInputs; + return { ...providerInputs, host: hostIp }; }; const $getClient = async (providerInputs: z.infer, useMaster?: boolean) => { diff --git a/backend/src/ee/services/dynamic-secret/providers/sap-hana.ts b/backend/src/ee/services/dynamic-secret/providers/sap-hana.ts index 459b9298b..7ef114c5f 100644 --- a/backend/src/ee/services/dynamic-secret/providers/sap-hana.ts +++ b/backend/src/ee/services/dynamic-secret/providers/sap-hana.ts @@ -29,7 +29,7 @@ export const SapHanaProvider = (): TDynamicProviderFns => { const validateProviderInputs = async (inputs: unknown) => { const providerInputs = await DynamicSecretSapHanaSchema.parseAsync(inputs); - await verifyHostInputValidity(providerInputs.host); + const [hostIp] = await verifyHostInputValidity(providerInputs.host); validateHandlebarTemplate("SAP Hana creation", providerInputs.creationStatement, { allowedExpressions: (val) => ["username", "password", "expiration"].includes(val) }); @@ -41,7 +41,7 @@ export const SapHanaProvider = (): TDynamicProviderFns => { validateHandlebarTemplate("SAP Hana revoke", providerInputs.revocationStatement, { allowedExpressions: (val) => ["username"].includes(val) }); - return providerInputs; + return { ...providerInputs, host: hostIp }; }; const $getClient = async (providerInputs: z.infer) => {