fix(@cubejs-backend/server-core): orchestratorOptions validation brea…

…ks serverless deployments (#1113)
cube-js · Sep 19, 2020 · 48ca5aa · 48ca5aa
1 parent 98ffad3
commit 48ca5aa
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/packages/cubejs-server-core/core/index.test.js b/packages/cubejs-server-core/core/index.test.js
@@ -48,13 +48,23 @@ describe('index.test', () => {
       .toThrowError(/"compilerCacheSize" must be larger than or equal to 0/);
   });
 
+
+  test('Should create instance of CubejsServerCore, orchestratorOptions as func', () => {
+    const options = { dbType: 'mysql', orchestratorOptions: () => {} };
+
+    expect(new CubejsServerCore(options))
+      .toBeInstanceOf(CubejsServerCore);
+  });
+
   test('Should create instance of CubejsServerCore, pass all options', () => {
     const queueOptions = {
       concurrency: 3,
       continueWaitTimeout: 5,
       executionTimeout: 600,
       orphanedTimeout: 120,
-      heartBeatInterval: 500
+      heartBeatInterval: 500,
+      sendProcessMessageFn: () => {},
+      sendCancelMessageFn: () => {}
     };
 
     const options = {
@@ -87,7 +97,10 @@ describe('index.test', () => {
         queryCacheOptions: {
           refreshKeyRenewalThreshold: 1000,
           backgroundRenew: true,
-          queueOptions
+          queueOptions,
+          externalQueueOptions: {
+            ...queueOptions
+          }
         },
         preAggregationsOptions: {
           queueOptions

diff --git a/packages/cubejs-server-core/core/optionsValidate.js b/packages/cubejs-server-core/core/optionsValidate.js
@@ -7,7 +7,9 @@ const schemaQueueOptions = Joi.object().keys({
   continueWaitTimeout: Joi.number().min(0).integer(),
   executionTimeout: Joi.number().min(0).integer(),
   orphanedTimeout: Joi.number().min(0).integer(),
-  heartBeatInterval: Joi.number().min(0).integer()
+  heartBeatInterval: Joi.number().min(0).integer(),
+  sendProcessMessageFn: Joi.func(),
+  sendCancelMessageFn: Joi.func(),
 });
 
 const dbTypes = Joi.alternatives().try(
@@ -47,17 +49,21 @@ const schemaOptions = Joi.object().keys({
   updateCompilerCacheKeepAlive: Joi.boolean(),
   telemetry: Joi.boolean(),
   allowUngroupedWithoutPrimaryKey: Joi.boolean(),
-  orchestratorOptions: Joi.object().keys({
-    redisPrefix: Joi.string().allow(''),
-    queryCacheOptions: Joi.object().keys({
-      refreshKeyRenewalThreshold: Joi.number().min(0).integer(),
-      backgroundRenew: Joi.boolean(),
-      queueOptions: schemaQueueOptions
-    }),
-    preAggregationsOptions: {
-      queueOptions: schemaQueueOptions
-    }
-  }),
+  orchestratorOptions: Joi.alternatives().try(
+    Joi.func(),
+    Joi.object().keys({
+      redisPrefix: Joi.string().allow(''),
+      queryCacheOptions: Joi.object().keys({
+        refreshKeyRenewalThreshold: Joi.number().min(0).integer(),
+        backgroundRenew: Joi.boolean(),
+        queueOptions: schemaQueueOptions,
+        externalQueueOptions: schemaQueueOptions
+      }),
+      preAggregationsOptions: {
+        queueOptions: schemaQueueOptions
+      }
+    })
+  ),
   allowJsDuplicatePropsInSchema: Joi.boolean(),
   scheduledRefreshContexts: Joi.func()
 });