diff --git a/backend/src/ee/services/dynamic-secret/providers/aws-elasticache.ts b/backend/src/ee/services/dynamic-secret/providers/aws-elasticache.ts index 46360976d..5fd218f19 100644 --- a/backend/src/ee/services/dynamic-secret/providers/aws-elasticache.ts +++ b/backend/src/ee/services/dynamic-secret/providers/aws-elasticache.ts @@ -80,7 +80,7 @@ const ElastiCacheUserManager = (credentials: TBasicAWSCredentials, region: strin } }; - const addUserToInfisicalGroup = async (userId: string) => { + const $addUserToInfisicalGroup = async (userId: string) => { // figure out if the default user is already in the group, if it is, then we shouldn't add it again const addUserToGroupCommand = new ModifyUserGroupCommand({ @@ -96,7 +96,7 @@ const ElastiCacheUserManager = (credentials: TBasicAWSCredentials, region: strin await ensureInfisicalGroupExists(clusterName); await elastiCache.send(new CreateUserCommand(creationInput)); // First create the user - await addUserToInfisicalGroup(creationInput.UserId); // Then add the user to the group. We know the group is already a part of the cluster because of ensureInfisicalGroupExists() + await $addUserToInfisicalGroup(creationInput.UserId); // Then add the user to the group. We know the group is already a part of the cluster because of ensureInfisicalGroupExists() return { userId: creationInput.UserId, diff --git a/backend/src/ee/services/dynamic-secret/providers/aws-iam.ts b/backend/src/ee/services/dynamic-secret/providers/aws-iam.ts index a1aa780f7..64ea6a02e 100644 --- a/backend/src/ee/services/dynamic-secret/providers/aws-iam.ts +++ b/backend/src/ee/services/dynamic-secret/providers/aws-iam.ts @@ -33,7 +33,7 @@ export const AwsIamProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const client = new IAMClient({ region: providerInputs.region, credentials: { @@ -47,7 +47,7 @@ export const AwsIamProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const isConnected = await client.send(new GetUserCommand({})).then(() => true); return isConnected; @@ -55,7 +55,7 @@ export const AwsIamProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = generateUsername(); const { policyArns, userGroups, policyDocument, awsPath, permissionBoundaryPolicyArn } = providerInputs; @@ -118,7 +118,7 @@ export const AwsIamProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = entityId; diff --git a/backend/src/ee/services/dynamic-secret/providers/azure-entra-id.ts b/backend/src/ee/services/dynamic-secret/providers/azure-entra-id.ts index 88d333aad..9e876f616 100644 --- a/backend/src/ee/services/dynamic-secret/providers/azure-entra-id.ts +++ b/backend/src/ee/services/dynamic-secret/providers/azure-entra-id.ts @@ -23,7 +23,7 @@ export const AzureEntraIDProvider = (): TDynamicProviderFns & { return providerInputs; }; - const getToken = async ( + const $getToken = async ( tenantId: string, applicationId: string, clientSecret: string @@ -51,13 +51,13 @@ export const AzureEntraIDProvider = (): TDynamicProviderFns & { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const data = await getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret); + const data = await $getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret); return data.success; }; const create = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const data = await getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret); + const data = await $getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret); if (!data.success) { throw new BadRequestError({ message: "Failed to authorize to Microsoft Entra ID" }); } @@ -93,7 +93,7 @@ export const AzureEntraIDProvider = (): TDynamicProviderFns & { }; const fetchAzureEntraIdUsers = async (tenantId: string, applicationId: string, clientSecret: string) => { - const data = await getToken(tenantId, applicationId, clientSecret); + const data = await $getToken(tenantId, applicationId, clientSecret); if (!data.success) { throw new BadRequestError({ message: "Failed to authorize to Microsoft Entra ID" }); } diff --git a/backend/src/ee/services/dynamic-secret/providers/cassandra.ts b/backend/src/ee/services/dynamic-secret/providers/cassandra.ts index 20e93e927..c030a6813 100644 --- a/backend/src/ee/services/dynamic-secret/providers/cassandra.ts +++ b/backend/src/ee/services/dynamic-secret/providers/cassandra.ts @@ -27,7 +27,7 @@ export const CassandraProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const sslOptions = providerInputs.ca ? { rejectUnauthorized: false, ca: providerInputs.ca } : undefined; const client = new cassandra.Client({ sslOptions, @@ -47,7 +47,7 @@ export const CassandraProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const isConnected = await client.execute("SELECT * FROM system_schema.keyspaces").then(() => true); await client.shutdown(); @@ -56,7 +56,7 @@ export const CassandraProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown, expireAt: number) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = generateUsername(); const password = generatePassword(); @@ -82,7 +82,7 @@ export const CassandraProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = entityId; const { keyspace } = providerInputs; @@ -101,7 +101,7 @@ export const CassandraProvider = (): TDynamicProviderFns => { const providerInputs = await validateProviderInputs(inputs); if (!providerInputs.renewStatement) return { entityId }; - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const expiration = new Date(expireAt).toISOString(); const { keyspace } = providerInputs; 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 18881834d..50ab2c694 100644 --- a/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts +++ b/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts @@ -24,7 +24,7 @@ export const ElasticSearchProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const connection = new ElasticSearchClient({ node: { url: new URL(`${providerInputs.host}:${providerInputs.port}`), @@ -55,7 +55,7 @@ export const ElasticSearchProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const infoResponse = await connection .info() @@ -67,7 +67,7 @@ export const ElasticSearchProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const username = generateUsername(); const password = generatePassword(); @@ -85,7 +85,7 @@ export const ElasticSearchProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); await connection.security.deleteUser({ username: entityId diff --git a/backend/src/ee/services/dynamic-secret/providers/ldap.ts b/backend/src/ee/services/dynamic-secret/providers/ldap.ts index fc1ef01d6..992c9098e 100644 --- a/backend/src/ee/services/dynamic-secret/providers/ldap.ts +++ b/backend/src/ee/services/dynamic-secret/providers/ldap.ts @@ -52,7 +52,7 @@ export const LdapProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer): Promise => { + const $getClient = async (providerInputs: z.infer): Promise => { return new Promise((resolve, reject) => { const client = ldapjs.createClient({ url: providerInputs.url, @@ -83,7 +83,7 @@ export const LdapProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); return client.connected; }; @@ -191,7 +191,7 @@ export const LdapProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); if (providerInputs.credentialType === LdapCredentialType.Static) { const dnMatch = providerInputs.rotationLdif.match(/^dn:\s*(.+)/m); @@ -235,7 +235,7 @@ export const LdapProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); if (providerInputs.credentialType === LdapCredentialType.Static) { const dnMatch = providerInputs.rotationLdif.match(/^dn:\s*(.+)/m); diff --git a/backend/src/ee/services/dynamic-secret/providers/mongo-atlas.ts b/backend/src/ee/services/dynamic-secret/providers/mongo-atlas.ts index 69f54ce77..95d7e590f 100644 --- a/backend/src/ee/services/dynamic-secret/providers/mongo-atlas.ts +++ b/backend/src/ee/services/dynamic-secret/providers/mongo-atlas.ts @@ -22,7 +22,7 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const client = axios.create({ baseURL: "https://cloud.mongodb.com/api/atlas", headers: { @@ -40,7 +40,7 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const isConnected = await client({ method: "GET", @@ -59,7 +59,7 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown, expireAt: number) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = generateUsername(); const password = generatePassword(); @@ -87,7 +87,7 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = entityId; const isExisting = await client({ @@ -114,7 +114,7 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => { const renew = async (inputs: unknown, entityId: string, expireAt: number) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = entityId; const expiration = new Date(expireAt).toISOString(); 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 a50af88bc..5a64e0f7b 100644 --- a/backend/src/ee/services/dynamic-secret/providers/mongo-db.ts +++ b/backend/src/ee/services/dynamic-secret/providers/mongo-db.ts @@ -23,7 +23,7 @@ export const MongoDBProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const isSrv = !providerInputs.port; const uri = isSrv ? `mongodb+srv://${providerInputs.host}` @@ -42,7 +42,7 @@ export const MongoDBProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const isConnected = await client .db(providerInputs.database) @@ -55,7 +55,7 @@ export const MongoDBProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = generateUsername(); const password = generatePassword(); @@ -74,7 +74,7 @@ export const MongoDBProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = entityId; 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 e78fa3725..9647ec6d8 100644 --- a/backend/src/ee/services/dynamic-secret/providers/rabbit-mq.ts +++ b/backend/src/ee/services/dynamic-secret/providers/rabbit-mq.ts @@ -84,7 +84,7 @@ export const RabbitMqProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const axiosInstance = axios.create({ baseURL: `${removeTrailingSlash(providerInputs.host)}:${providerInputs.port}/api`, auth: { @@ -105,7 +105,7 @@ export const RabbitMqProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const infoResponse = await connection.get("/whoami").then(() => true); @@ -114,7 +114,7 @@ export const RabbitMqProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const username = generateUsername(); const password = generatePassword(); @@ -134,7 +134,7 @@ export const RabbitMqProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); await deleteRabbitMqUser({ axiosInstance: connection, usernameToDelete: entityId }); diff --git a/backend/src/ee/services/dynamic-secret/providers/redis.ts b/backend/src/ee/services/dynamic-secret/providers/redis.ts index b08c5d421..92ba1d4f9 100644 --- a/backend/src/ee/services/dynamic-secret/providers/redis.ts +++ b/backend/src/ee/services/dynamic-secret/providers/redis.ts @@ -55,7 +55,7 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { let connection: Redis | null = null; try { connection = new Redis({ @@ -92,7 +92,7 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const pingResponse = await connection .ping() @@ -104,7 +104,7 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown, expireAt: number) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const username = generateUsername(); const password = generatePassword(); @@ -126,7 +126,7 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const username = entityId; @@ -143,7 +143,7 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => { const providerInputs = await validateProviderInputs(inputs); if (!providerInputs.renewStatement) return { entityId }; - const connection = await getClient(providerInputs); + const connection = await $getClient(providerInputs); const username = entityId; const expiration = new Date(expireAt).toISOString(); 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 388994fb4..ecd7ba3d3 100644 --- a/backend/src/ee/services/dynamic-secret/providers/sap-hana.ts +++ b/backend/src/ee/services/dynamic-secret/providers/sap-hana.ts @@ -32,7 +32,7 @@ export const SapHanaProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const client = hdb.createClient({ host: providerInputs.host, port: providerInputs.port, @@ -64,9 +64,9 @@ export const SapHanaProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); - const testResult: boolean = await new Promise((resolve, reject) => { + const testResult = await new Promise((resolve, reject) => { client.exec("SELECT 1 FROM DUMMY;", (err: any) => { if (err) { reject(); @@ -86,7 +86,7 @@ export const SapHanaProvider = (): TDynamicProviderFns => { const password = generatePassword(); const expiration = new Date(expireAt).toISOString(); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const creationStatement = handlebars.compile(providerInputs.creationStatement, { noEscape: true })({ username, password, @@ -114,7 +114,7 @@ export const SapHanaProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, username: string) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const revokeStatement = handlebars.compile(providerInputs.revocationStatement)({ username }); const queries = revokeStatement.toString().split(";").filter(Boolean); for await (const query of queries) { @@ -139,7 +139,7 @@ export const SapHanaProvider = (): TDynamicProviderFns => { const providerInputs = await validateProviderInputs(inputs); if (!providerInputs.renewStatement) return { entityId }; - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); try { const expiration = new Date(expireAt).toISOString(); diff --git a/backend/src/ee/services/dynamic-secret/providers/snowflake.ts b/backend/src/ee/services/dynamic-secret/providers/snowflake.ts index 26e7a590a..1b4376f43 100644 --- a/backend/src/ee/services/dynamic-secret/providers/snowflake.ts +++ b/backend/src/ee/services/dynamic-secret/providers/snowflake.ts @@ -34,7 +34,7 @@ export const SnowflakeProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const client = snowflake.createConnection({ account: `${providerInputs.orgId}-${providerInputs.accountId}`, username: providerInputs.username, @@ -49,7 +49,7 @@ export const SnowflakeProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); let isValidConnection: boolean; @@ -72,7 +72,7 @@ export const SnowflakeProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown, expireAt: number) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); const username = generateUsername(); const password = generatePassword(); @@ -107,7 +107,7 @@ export const SnowflakeProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, username: string) => { const providerInputs = await validateProviderInputs(inputs); - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); try { const revokeStatement = handlebars.compile(providerInputs.revocationStatement)({ username }); @@ -135,7 +135,7 @@ export const SnowflakeProvider = (): TDynamicProviderFns => { const providerInputs = await validateProviderInputs(inputs); if (!providerInputs.renewStatement) return { entityId }; - const client = await getClient(providerInputs); + const client = await $getClient(providerInputs); try { const expiration = getDaysToExpiry(new Date(expireAt)); diff --git a/backend/src/ee/services/dynamic-secret/providers/sql-database.ts b/backend/src/ee/services/dynamic-secret/providers/sql-database.ts index 511017586..835761211 100644 --- a/backend/src/ee/services/dynamic-secret/providers/sql-database.ts +++ b/backend/src/ee/services/dynamic-secret/providers/sql-database.ts @@ -32,7 +32,7 @@ export const SqlDatabaseProvider = (): TDynamicProviderFns => { return providerInputs; }; - const getClient = async (providerInputs: z.infer) => { + const $getClient = async (providerInputs: z.infer) => { const ssl = providerInputs.ca ? { rejectUnauthorized: false, ca: providerInputs.ca } : undefined; const db = knex({ client: providerInputs.client, @@ -52,7 +52,7 @@ export const SqlDatabaseProvider = (): TDynamicProviderFns => { const validateConnection = async (inputs: unknown) => { const providerInputs = await validateProviderInputs(inputs); - const db = await getClient(providerInputs); + const db = await $getClient(providerInputs); // oracle needs from keyword const testStatement = providerInputs.client === SqlProviders.Oracle ? "SELECT 1 FROM DUAL" : "SELECT 1"; @@ -63,7 +63,7 @@ export const SqlDatabaseProvider = (): TDynamicProviderFns => { const create = async (inputs: unknown, expireAt: number) => { const providerInputs = await validateProviderInputs(inputs); - const db = await getClient(providerInputs); + const db = await $getClient(providerInputs); const username = generateUsername(providerInputs.client); const password = generatePassword(providerInputs.client); @@ -90,7 +90,7 @@ export const SqlDatabaseProvider = (): TDynamicProviderFns => { const revoke = async (inputs: unknown, entityId: string) => { const providerInputs = await validateProviderInputs(inputs); - const db = await getClient(providerInputs); + const db = await $getClient(providerInputs); const username = entityId; const { database } = providerInputs; @@ -112,7 +112,7 @@ export const SqlDatabaseProvider = (): TDynamicProviderFns => { const providerInputs = await validateProviderInputs(inputs); if (!providerInputs.renewStatement) return { entityId }; - const db = await getClient(providerInputs); + const db = await $getClient(providerInputs); const expiration = new Date(expireAt).toISOString(); const { database } = providerInputs;