some things i missed

elastic · Nov 16, 2018 · e382cf4 · e382cf4
1 parent 8ef3ea5
commit e382cf4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/core_plugins/interpreter/server/lib/create_handlers.js b/src/core_plugins/interpreter/server/lib/create_handlers.js
@@ -18,8 +18,9 @@
  */
 
 import boom from 'boom';
-import { SECURITY_AUTH_MESSAGE } from '../../../../../x-pack/plugins/canvas/common/lib/constants';
-import { isSecurityEnabled } from '../../../../../x-pack/plugins/canvas/server/lib/feature_check';
+import { isSecurityEnabled } from './feature_check';
+
+const SECURITY_AUTH_MESSAGE = 'Authentication failed';
 
 export const createHandlers = (request, server) => {
   const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');

diff --git a/...lugins/canvas/server/lib/feature_check.js → ...s/interpreter/server/lib/feature_check.js b/...lugins/canvas/server/lib/feature_check.js → ...s/interpreter/server/lib/feature_check.js
diff --git a/.../plugins/canvas/server/lib/get_request.js → ...ins/interpreter/server/lib/get_request.js b/.../plugins/canvas/server/lib/get_request.js → ...ins/interpreter/server/lib/get_request.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import boom from 'boom';
-import { API_ROUTE } from '../../common/lib/constants';
+import { API_ROUTE } from '../../../../../x-pack/plugins/canvas/common/lib/constants';
 
 export function getRequest(server, { headers }) {
   const url = `${API_ROUTE}/ping`;

diff --git a/src/core_plugins/interpreter/server/routes/socket.js b/src/core_plugins/interpreter/server/routes/socket.js
@@ -25,8 +25,9 @@ import { routeExpressionProvider } from '../lib/route_expression/index';
 import { browser } from '../lib/route_expression/browser';
 import { thread } from '../lib/route_expression/thread/index';
 import { server as serverEnv } from '../lib/route_expression/server';
-import { getRequest } from '../../../../../x-pack/plugins/canvas/server/lib/get_request';
-import { API_ROUTE } from '../../../../../x-pack/plugins/canvas/common/lib/constants';
+import { getRequest } from '../lib/get_request';
+
+const API_ROUTE = '/api/canvas';
 
 async function getModifiedRequest(server, socket) {
   try {