✨ Add ElasticSearch service

staart · Nov 12, 2020 · 4631bbb · 4631bbb
1 parent 00455f8
commit 4631bbb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/src/app.module.ts b/src/app.module.ts
@@ -32,6 +32,7 @@ import { StripeModule } from './modules/stripe/stripe.module';
 import { TasksModule } from './providers/tasks/tasks.module';
 import { UsersModule } from './modules/users/users.module';
 import { WebhooksModule } from './modules/webhooks/webhooks.module';
+import { ElasticSearchModule } from './providers/elasticsearch/elasticsearch.module';
 
 @Module({
   imports: [
@@ -61,6 +62,7 @@ import { WebhooksModule } from './modules/webhooks/webhooks.module';
     StripeModule,
     AuditLogsModule,
     WebhooksModule,
+    ElasticSearchModule,
   ],
   providers: [
     {

diff --git a/src/config/configuration.interface.ts b/src/config/configuration.interface.ts
@@ -1,3 +1,4 @@
+import { ApiKeyAuth, BasicAuth } from '@elastic/elasticsearch/lib/pool';
 import Stripe from 'stripe';
 
 export interface Configuration {
@@ -49,6 +50,7 @@ export interface Configuration {
   elasticSearch: {
     node: string;
     retries: number;
+    auth?: BasicAuth | ApiKeyAuth;
     aws?: {
       accessKeyId: string;
       secretAccessKey: string;

diff --git a/src/config/configuration.ts b/src/config/configuration.ts
@@ -33,6 +33,21 @@ const configuration: Configuration = {
   elasticSearch: {
     node: process.env.ELASTICSEARCH_NODE,
     retries: int(process.env.ELASTICSEARCH_FAIL_RETRIES, 3),
+    auth: process.env.ELASTICSEARCH_AUTH_USERNAME
+      ? {
+          username: process.env.ELASTICSEARCH_AUTH_USERNAME,
+          password: process.env.ELASTICSEARCH_AUTH_PASSWORD,
+        }
+      : process.env.ELASTICSEARCH_AUTH_API_KEY
+      ? process.env.ELASTICSEARCH_AUTH_API_KEY_ID
+        ? {
+            apiKey: {
+              api_key: process.env.ELASTICSEARCH_AUTH_API_KEY,
+              id: process.env.ELASTICSEARCH_AUTH_API_KEY_ID,
+            },
+          }
+        : { apiKey: process.env.ELASTICSEARCH_AUTH_API_KEY }
+      : undefined,
     aws: {
       accessKeyId: process.env.ELASTICSEARCH_AWS_ACCESS_KEY_ID ?? '',
       secretAccessKey: process.env.ELASTICSEARCH_AWS_SECRET_ACCESS_KEY ?? '',

diff --git a/src/providers/elasticsearch/elasticsearch.service.ts b/src/providers/elasticsearch/elasticsearch.service.ts
@@ -2,6 +2,8 @@ import { Client } from '@elastic/elasticsearch';
 import { Index } from '@elastic/elasticsearch/api/requestParams';
 import { Injectable, Logger } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import createAwsElasticsearchConnector from 'aws-elasticsearch-connector';
+import AWS from 'aws-sdk';
 import PQueue from 'p-queue';
 import pRetry from 'p-retry';
 import { Configuration } from '../../config/configuration.interface';
@@ -16,12 +18,19 @@ export class ElasticSearchService {
     const config = this.configService.get<Configuration['elasticSearch']>(
       'elasticSearch',
     );
-    if (config.aws?.accessKeyId)
+    if (config.aws?.accessKeyId) {
+      AWS.config.update({
+        accessKeyId: config.aws.accessKeyId,
+        secretAccessKey: config.aws.secretAccessKey,
+        region: config.aws.region,
+      });
       this.client = new Client({
+        ...createAwsElasticsearchConnector(AWS.config),
         node: config.node,
       });
-    else
+    } else
       this.client = new Client({
+        auth: config.auth,
         node: config.node,
       });
   }