From 11411ca4eb3ad17945a724a85a322b891062bfed Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Wed, 4 Sep 2024 13:44:41 +0400 Subject: [PATCH] Requested changes --- .../services/dynamic-secret/providers/elastic-search.ts | 8 ++++---- .../src/ee/services/dynamic-secret/providers/models.ts | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) 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 02fadb5a5..2ead58bef 100644 --- a/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts +++ b/backend/src/ee/services/dynamic-secret/providers/elastic-search.ts @@ -1,4 +1,4 @@ -import { Client as ElasticCacheClient } from "@elastic/elasticsearch"; +import { Client as ElasticSearchClient } from "@elastic/elasticsearch"; import { customAlphabet } from "nanoid"; import { z } from "zod"; @@ -6,7 +6,7 @@ import { getConfig } from "@app/lib/config/env"; import { BadRequestError } from "@app/lib/errors"; import { alphaNumericNanoId } from "@app/lib/nanoid"; -import { DynamicSecretElasticSearchSchema, TDynamicProviderFns } from "./models"; +import { DynamicSecretElasticSearchSchema, ElasticSearchAuthTypes, TDynamicProviderFns } from "./models"; const generatePassword = () => { const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~!*$#"; @@ -41,7 +41,7 @@ export const ElasticSearchDatabaseProvider = (): TDynamicProviderFns => { }; const getClient = async (providerInputs: z.infer) => { - const connection = new ElasticCacheClient({ + const connection = new ElasticSearchClient({ node: { url: new URL(`${providerInputs.host}:${providerInputs.port}`), ...(providerInputs.ca && { @@ -52,7 +52,7 @@ export const ElasticSearchDatabaseProvider = (): TDynamicProviderFns => { }) }, auth: { - ...(providerInputs.auth.type === "api-key" + ...(providerInputs.auth.type === ElasticSearchAuthTypes.ApiKey ? { apiKey: { api_key: providerInputs.auth.apiKey, diff --git a/backend/src/ee/services/dynamic-secret/providers/models.ts b/backend/src/ee/services/dynamic-secret/providers/models.ts index ca360c750..06069c981 100644 --- a/backend/src/ee/services/dynamic-secret/providers/models.ts +++ b/backend/src/ee/services/dynamic-secret/providers/models.ts @@ -7,6 +7,11 @@ export enum SqlProviders { MsSQL = "mssql" } +export enum ElasticSearchAuthTypes { + User = "user", + ApiKey = "api-key" +} + export const DynamicSecretRedisDBSchema = z.object({ host: z.string().trim().toLowerCase(), port: z.number(), @@ -38,12 +43,12 @@ export const DynamicSecretElasticSearchSchema = z.object({ // two auth types "user, apikey" auth: z.discriminatedUnion("type", [ z.object({ - type: z.literal("user"), + type: z.literal(ElasticSearchAuthTypes.User), username: z.string().trim(), password: z.string().trim() }), z.object({ - type: z.literal("api-key"), + type: z.literal(ElasticSearchAuthTypes.ApiKey), apiKey: z.string().trim(), apiKeyId: z.string().trim() })