fix(project-utils): await handlers in dynamodb to elastic simulation (#…

…2002)
webiny · Nov 2, 2021 · 473d1ae · 473d1ae
1 parent 39acd5d
commit 473d1ae
Show file tree

Hide file tree

Showing 13 changed files with 176 additions and 98 deletions.
diff --git a/packages/api-file-manager-ddb-es/__tests__/__api__/environment.js b/packages/api-file-manager-ddb-es/__tests__/__api__/environment.js
@@ -4,7 +4,6 @@ const { DocumentClient } = require("aws-sdk/clients/dynamodb");
 const elasticsearchClientContextPlugin = require("@webiny/api-elasticsearch").default;
 const { createHandler } = require("@webiny/handler-aws");
 const dynamoToElastic = require("@webiny/api-dynamodb-to-elasticsearch/handler").default;
-const { Client } = require("@elastic/elasticsearch");
 const { simulateStream } = require("@webiny/project-utils/testing/dynamodb");
 const NodeEnvironment = require("jest-environment-node");
 const elasticsearchDataGzipCompression =
@@ -13,6 +12,7 @@ const { ContextPlugin } = require("@webiny/handler/plugins/ContextPlugin");
 const {
     elasticIndexManager
 } = require("@webiny/project-utils/testing/helpers/elasticIndexManager");
+const { createElasticsearchClient } = require("@webiny/api-elasticsearch/client");
 /**
  * For this to work it must load plugins that have already been built
  */
@@ -28,8 +28,9 @@ class FileManagerTestEnvironment extends NodeEnvironment {
     async setup() {
         await super.setup();
 
-        const elasticsearchClient = new Client({
-            node: `http://localhost:${ELASTICSEARCH_PORT}`
+        const elasticsearchClient = createElasticsearchClient({
+            node: `http://localhost:${ELASTICSEARCH_PORT}`,
+            auth: {}
         });
         const documentClient = new DocumentClient({
             convertEmptyValues: true,
@@ -39,10 +40,7 @@ class FileManagerTestEnvironment extends NodeEnvironment {
             accessKeyId: "test",
             secretAccessKey: "test"
         });
-        const elasticsearchClientContext = elasticsearchClientContextPlugin({
-            endpoint: `http://localhost:${ELASTICSEARCH_PORT}`,
-            auth: {}
-        });
+        const elasticsearchClientContext = elasticsearchClientContextPlugin(elasticsearchClient);
 
         /**
          * Intercept DocumentClient operations and trigger dynamoToElastic function (almost like a DynamoDB Stream trigger)
@@ -66,7 +64,7 @@ class FileManagerTestEnvironment extends NodeEnvironment {
                     })
                 });
                 return [
-                    elasticsearchDataGzipCompression(),
+                    //elasticsearchDataGzipCompression(),
                     ...pluginsValue,
                     ...dbPluginsValue,
                     elasticsearchClientContext

diff --git a/packages/api-file-manager-ddb-es/__tests__/useGqlHandler.ts b/packages/api-file-manager-ddb-es/__tests__/useGqlHandler.ts
@@ -6,7 +6,6 @@ import { DynamoDbDriver } from "@webiny/db-dynamodb";
 import { DocumentClient } from "aws-sdk/clients/dynamodb";
 import dbPlugins from "@webiny/handler-db";
 import dynamoDbPlugins from "@webiny/db-dynamodb/plugins";
-import { Client } from "@elastic/elasticsearch";
 import { simulateStream } from "@webiny/project-utils/testing/dynamodb";
 import elasticsearchClientContextPlugin from "@webiny/api-elasticsearch";
 import { createHandler } from "@webiny/handler-aws";
@@ -38,6 +37,7 @@ import { until } from "@webiny/project-utils/testing/helpers/until";
 import { FilePhysicalStoragePlugin } from "@webiny/api-file-manager/plugins/definitions/FilePhysicalStoragePlugin";
 import { createTenancyAndSecurity } from "./tenancySecurity";
 import { SecurityIdentity } from "@webiny/api-security/types";
+import { createElasticsearchClient } from "@webiny/api-elasticsearch/client";
 
 type UseGqlHandlerParams = {
     permissions?: SecurityPermission[];
@@ -48,8 +48,9 @@ export default (params?: UseGqlHandlerParams) => {
     const { permissions, identity } = params || {};
 
     const ELASTICSEARCH_PORT = process.env.ELASTICSEARCH_PORT || "9200";
-    const elasticsearchClient = new Client({
-        node: `http://localhost:${ELASTICSEARCH_PORT}`
+    const elasticsearchClient = createElasticsearchClient({
+        node: `http://localhost:${ELASTICSEARCH_PORT}`,
+        auth: {}
     });
     const documentClient = new DocumentClient({
         convertEmptyValues: true,
@@ -59,9 +60,7 @@ export default (params?: UseGqlHandlerParams) => {
         accessKeyId: "test",
         secretAccessKey: "test"
     });
-    const elasticsearchClientContext = elasticsearchClientContextPlugin({
-        endpoint: `http://localhost:${ELASTICSEARCH_PORT}`
-    });
+    const elasticsearchClientContext = elasticsearchClientContextPlugin(elasticsearchClient);
     const clearElasticsearch = async () => {
         return elasticsearchClient.indices.delete({
             index: "_all"

diff --git a/packages/api-headless-cms-ddb-es/__tests__/__api__/environment.js b/packages/api-headless-cms-ddb-es/__tests__/__api__/environment.js
@@ -4,7 +4,6 @@ const { DocumentClient } = require("aws-sdk/clients/dynamodb");
 const elasticsearchClientContextPlugin = require("@webiny/api-elasticsearch").default;
 const { createHandler } = require("@webiny/handler-aws");
 const dynamoToElastic = require("@webiny/api-dynamodb-to-elasticsearch/handler").default;
-const { Client } = require("@elastic/elasticsearch");
 const { simulateStream } = require("@webiny/project-utils/testing/dynamodb");
 const NodeEnvironment = require("jest-environment-node");
 const elasticsearchDataGzipCompression =
@@ -13,6 +12,7 @@ const { ContextPlugin } = require("@webiny/handler/plugins/ContextPlugin");
 const {
     elasticIndexManager
 } = require("@webiny/project-utils/testing/helpers/elasticIndexManager");
+const { createElasticsearchClient } = require("@webiny/api-elasticsearch/client");
 /**
  * For this to work it must load plugins that have already been built
  */
@@ -97,8 +97,9 @@ class CmsTestEnvironment extends NodeEnvironment {
     async setup() {
         await super.setup();
 
-        const elasticsearchClient = new Client({
-            node: `http://localhost:${ELASTICSEARCH_PORT}`
+        const elasticsearchClient = createElasticsearchClient({
+            node: `http://localhost:${ELASTICSEARCH_PORT}`,
+            auth: {}
         });
         const documentClient = new DocumentClient({
             convertEmptyValues: true,
@@ -108,10 +109,7 @@ class CmsTestEnvironment extends NodeEnvironment {
             accessKeyId: "test",
             secretAccessKey: "test"
         });
-        const elasticsearchClientContext = elasticsearchClientContextPlugin({
-            endpoint: `http://localhost:${ELASTICSEARCH_PORT}`,
-            auth: {}
-        });
+        const elasticsearchClientContext = elasticsearchClientContextPlugin(elasticsearchClient);
 
         /**
          * This is a global function that will be called inside the tests to get all relevant plugins, methods and objects.

diff --git a/packages/api-headless-cms-ddb-es/src/operations/entry/CmsContentEntryDynamoElastic.ts b/packages/api-headless-cms-ddb-es/src/operations/entry/CmsContentEntryDynamoElastic.ts
@@ -349,21 +349,13 @@ export default class CmsContentEntryDynamoElastic implements CmsContentEntryStor
         /**
          * Delete records of given entry revision.
          */
-        batch
-            .delete({
-                ...configurations.db(),
-                query: {
-                    PK: primaryKey,
-                    SK: this.getSortKeyRevision(entryToDelete.id)
-                }
-            })
-            .delete({
-                ...configurations.esDb(),
-                query: {
-                    PK: primaryKey,
-                    SK: this.getSortKeyRevision(entryToDelete.id)
-                }
-            });
+        batch.delete({
+            ...configurations.db(),
+            query: {
+                PK: primaryKey,
+                SK: this.getSortKeyRevision(entryToDelete.id)
+            }
+        });
         /**
          * If revision we are deleting is the published one as well, we need to delete those records as well.
          */

diff --git a/packages/api-headless-cms/__tests__/validators/date.test.ts b/packages/api-headless-cms/__tests__/validators/date.test.ts
@@ -34,7 +34,9 @@ describe("date validators", () => {
             const result = await gtePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(true);
         }
@@ -56,7 +58,9 @@ describe("date validators", () => {
             const result = await gtePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(false);
         }
@@ -78,7 +82,9 @@ describe("date validators", () => {
             const result = await ltePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(true);
         }
@@ -100,7 +106,9 @@ describe("date validators", () => {
             const result = await ltePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(false);
         }
@@ -124,7 +132,9 @@ describe("date validators", () => {
             const result = await gtePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(true);
         }
@@ -146,7 +156,9 @@ describe("date validators", () => {
             const result = await gtePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(false);
         }
@@ -170,7 +182,9 @@ describe("date validators", () => {
             const result = await ltePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(true);
         }
@@ -194,7 +208,9 @@ describe("date validators", () => {
             const result = await ltePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(false);
         }

diff --git a/packages/api-headless-cms/__tests__/validators/time.test.ts b/packages/api-headless-cms/__tests__/validators/time.test.ts
@@ -35,7 +35,9 @@ describe("time validators", () => {
         const result = await gtePlugin.validator.validate({
             value,
             validator,
-            context
+            context,
+            field: {} as any,
+            contentModel: {} as any
         });
         expect(result).toEqual(true);
     });
@@ -58,7 +60,9 @@ describe("time validators", () => {
             const result = await gtePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(false);
         }
@@ -83,7 +87,9 @@ describe("time validators", () => {
             const result = await ltePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(true);
         }
@@ -106,7 +112,9 @@ describe("time validators", () => {
             const result = await ltePlugin.validator.validate({
                 value,
                 validator,
-                context
+                context,
+                field: {} as any,
+                contentModel: {} as any
             });
             expect(result).toEqual(false);
         }
@@ -122,12 +130,16 @@ describe("time validators", () => {
         const lteValid = await ltePlugin.validator.validate({
             value,
             validator: lteValidator,
-            context
+            context,
+            field: {} as any,
+            contentModel: {} as any
         });
         const gteValid = await gtePlugin.validator.validate({
             value,
             validator: gteValidator,
-            context
+            context,
+            field: {} as any,
+            contentModel: {} as any
         });
         return lteValid && gteValid;
     };

diff --git a/packages/api-page-builder-so-ddb-es/__tests__/__api__/environment.js b/packages/api-page-builder-so-ddb-es/__tests__/__api__/environment.js
@@ -4,7 +4,7 @@ const { DocumentClient } = require("aws-sdk/clients/dynamodb");
 const elasticsearchClientContextPlugin = require("@webiny/api-elasticsearch").default;
 const { createHandler } = require("@webiny/handler-aws");
 const dynamoToElastic = require("@webiny/api-dynamodb-to-elasticsearch/handler").default;
-const { Client } = require("@elastic/elasticsearch");
+const { createElasticsearchClient } = require("@webiny/api-elasticsearch/client");
 const { simulateStream } = require("@webiny/project-utils/testing/dynamodb");
 const NodeEnvironment = require("jest-environment-node");
 const elasticsearchDataGzipCompression =
@@ -48,8 +48,9 @@ class PageBuilderTestEnvironment extends NodeEnvironment {
     async setup() {
         await super.setup();
 
-        const elasticsearchClient = new Client({
-            node: `http://localhost:${ELASTICSEARCH_PORT}`
+        const elasticsearchClient = createElasticsearchClient({
+            node: `http://localhost:${ELASTICSEARCH_PORT}`,
+            auth: {}
         });
         const documentClient = new DocumentClient({
             convertEmptyValues: true,
@@ -59,10 +60,7 @@ class PageBuilderTestEnvironment extends NodeEnvironment {
             accessKeyId: "test",
             secretAccessKey: "test"
         });
-        const elasticsearchClientContext = elasticsearchClientContextPlugin({
-            endpoint: `http://localhost:${ELASTICSEARCH_PORT}`,
-            auth: {}
-        });
+        const elasticsearchClientContext = elasticsearchClientContextPlugin(elasticsearchClient);
 
         /**
          * Intercept DocumentClient operations and trigger dynamoToElastic function (almost like a DynamoDB Stream trigger)