pass in databricks token for live query (#92)

microsoft · Jun 26, 2019 · 44b01de · 44b01de
1 parent 0aaac6e
commit 44b01de
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 24 deletions.
diff --git a/Website/Packages/datax-common/package.json b/Website/Packages/datax-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datax-common",
-  "version": "1.3.0-SNAPSHOT-5",
+  "version": "1.3.0-SNAPSHOT-6",
   "description": "Common UX, styles, utilities, and modules",
   "author": "Microsoft",
   "license": "MIT",

diff --git a/Website/Packages/datax-home/package.json b/Website/Packages/datax-home/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datax-home",
-  "version": "1.3.0-SNAPSHOT-5",
+  "version": "1.3.0-SNAPSHOT-6",
   "description": "Home page",
   "author": "Microsoft",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "css-loader": "1.0.1",
     "file-loader": "2.0.0",
     "mini-css-extract-plugin": "0.4.4",
-    "datax-common": "1.3.0-SNAPSHOT-5",
+    "datax-common": "1.3.0-SNAPSHOT-6",
     "office-ui-fabric-react": "6.111.2",
     "q": "1.5.1",
     "react": "16.6.3",

diff --git a/Website/Packages/datax-jobs/package.json b/Website/Packages/datax-jobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datax-jobs",
-  "version": "1.3.0-SNAPSHOT-5",
+  "version": "1.3.0-SNAPSHOT-6",
   "description": "Job features",
   "author": "Microsoft",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "css-loader": "1.0.1",
     "file-loader": "2.0.0",
     "mini-css-extract-plugin": "0.4.4",
-    "datax-common": "1.3.0-SNAPSHOT-5",
+    "datax-common": "1.3.0-SNAPSHOT-6",
     "office-ui-fabric-react": "6.111.2",
     "q": "1.5.1",
     "prop-types": "15.6.2",

diff --git a/Website/Packages/datax-metrics/package.json b/Website/Packages/datax-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datax-metrics",
-  "version": "1.3.0-SNAPSHOT-5",
+  "version": "1.3.0-SNAPSHOT-6",
   "description": "Metric features",
   "author": "Microsoft",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "d3": "4.10.2",
     "file-loader": "2.0.0",
     "mini-css-extract-plugin": "0.4.4",
-    "datax-common": "1.3.0-SNAPSHOT-5",
+    "datax-common": "1.3.0-SNAPSHOT-6",
     "office-ui-fabric-react": "6.111.2",
     "q": "1.5.1",
     "plotly.js": "1.44.4",

diff --git a/Website/Packages/datax-pipeline/package.json b/Website/Packages/datax-pipeline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datax-pipeline",
-  "version": "1.3.0-SNAPSHOT-5",
+  "version": "1.3.0-SNAPSHOT-6",
   "description": "Pipeline features",
   "author": "Microsoft",
   "license": "MIT",
@@ -32,8 +32,8 @@
     "css-loader": "1.0.1",
     "file-loader": "2.0.0",
     "mini-css-extract-plugin": "0.4.4",
-    "datax-common": "1.3.0-SNAPSHOT-5",
-    "datax-query": "1.3.0-SNAPSHOT-5",
+    "datax-common": "1.3.0-SNAPSHOT-6",
+    "datax-query": "1.3.0-SNAPSHOT-6",
     "office-ui-fabric-react": "6.111.2",
     "q": "1.5.1",
     "promise-polyfill": "8.1.0",

diff --git a/Website/Packages/datax-pipeline/src/modules/flowDefinition/flowHelpers.js b/Website/Packages/datax-pipeline/src/modules/flowDefinition/flowHelpers.js
@@ -503,21 +503,22 @@ export function convertFlowToQueryMetadata(flow, query) {
     // return query metadata
     let QueryMetadata = {
         name: flow.name,
+        databricksToken: flow.databricksToken,
         displayName: flow.displayName,
         userName: flow.owner,
         refData: flow.referenceData,
         inputSchema: flow.input.properties.inputSchemaFile,
         normalizationSnippet: flow.input.properties.normalizationSnippet,
         outputTemplates: flow.outputTemplates,
-        functions:flow.functions,
+        functions: flow.functions,
         rules: convertFlowToConfigRules(flow.rules),
-        eventhubConnection:flow.input.properties.inputEventhubConnection, 
-        inputResourceGroup: flow.input.properties.inputResourceGroup, 
-        eventhubNames: flow.input.properties.inputEventhubName, 
+        eventhubConnection: flow.input.properties.inputEventhubConnection,
+        inputResourceGroup: flow.input.properties.inputResourceGroup,
+        eventhubNames: flow.input.properties.inputEventhubName,
         inputType: flow.input.type,
         seconds: flow.resamplingInputDuration,
         query: query,
-        inputSubscriptionId: flow.input.properties.inputSubscriptionId,
+        inputSubscriptionId: flow.input.properties.inputSubscriptionId
     };
     return QueryMetadata;
-}
+}
diff --git a/Website/Packages/datax-query/package.json b/Website/Packages/datax-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datax-query",
-  "version": "1.3.0-SNAPSHOT-5",
+  "version": "1.3.0-SNAPSHOT-6",
   "description": "Query features",
   "author": "Microsoft",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "css-loader": "1.0.1",
     "file-loader": "2.0.0",
     "mini-css-extract-plugin": "0.4.4",
-    "datax-common": "1.3.0-SNAPSHOT-5",
+    "datax-common": "1.3.0-SNAPSHOT-6",
     "office-ui-fabric-react": "6.111.2",
     "q": "1.5.1",
     "promise-polyfill": "8.1.0",

diff --git a/Website/Packages/datax-query/src/modules/query/api.js b/Website/Packages/datax-query/src/modules/query/api.js
@@ -27,6 +27,7 @@ export const getCodeGenQuery = queryMetadata =>
 export const getDiagnosticKernel = queryMetadata =>
     servicePostApi(Constants.serviceRouteApi, Constants.serviceApplication, Constants.services.interactiveQuery, 'kernel', {
         name: queryMetadata.name,
+        databricksToken: queryMetadata.databricksToken,
         displayName: queryMetadata.displayName,
         userName: queryMetadata.userName,
         inputSchema: queryMetadata.inputSchema,
@@ -38,6 +39,7 @@ export const getDiagnosticKernel = queryMetadata =>
 export const refreshDiagnosticKernel = (queryMetadata, kernelId) =>
     servicePostApi(Constants.serviceRouteApi, Constants.serviceApplication, Constants.services.interactiveQuery, 'kernel/refresh', {
         kernelId: kernelId,
+        databricksToken: queryMetadata.databricksToken,
         userName: queryMetadata.userName,
         name: queryMetadata.name,
         displayName: queryMetadata.displayName,
@@ -58,6 +60,7 @@ export const deleteDiagnosticKernel = deleteDiagnosticKernelOnUnload;
 export const executeQuery = (queryMetadata, selectedQuery, kernelId) =>
     servicePostApi(Constants.serviceRouteApi, Constants.serviceApplication, Constants.services.interactiveQuery, 'kernel/executequery', {
         name: queryMetadata.name,
+        databricksToken: queryMetadata.databricksToken,
         displayName: queryMetadata.displayName,
         query: selectedQuery,
         kernelId: kernelId,
@@ -74,6 +77,7 @@ export const resampleInput = (queryMetadata, kernelId) =>
         'inputdata/refreshsampleandkernel',
         {
             name: queryMetadata.name,
+            databricksToken: queryMetadata.databricksToken,
             displayName: queryMetadata.displayName,
             userName: queryMetadata.userName,
             kernelId: kernelId,
@@ -86,4 +90,4 @@ export const resampleInput = (queryMetadata, kernelId) =>
             inputType: queryMetadata.inputType,
             seconds: queryMetadata.seconds
         }
-    );
+    );
diff --git a/Website/Website/package.json b/Website/Website/package.json
@@ -63,11 +63,11 @@
     "css-loader": "1.0.1",
     "file-loader": "2.0.0",
     "mini-css-extract-plugin": "0.4.4",
-    "datax-common": "1.3.0-SNAPSHOT-5",
-    "datax-home": "1.3.0-SNAPSHOT-5",
-    "datax-jobs": "1.3.0-SNAPSHOT-5",
-    "datax-metrics": "1.3.0-SNAPSHOT-5",
-    "datax-pipeline": "1.3.0-SNAPSHOT-5",
+    "datax-common": "1.3.0-SNAPSHOT-6",
+    "datax-home": "1.3.0-SNAPSHOT-6",
+    "datax-jobs": "1.3.0-SNAPSHOT-6",
+    "datax-metrics": "1.3.0-SNAPSHOT-6",
+    "datax-pipeline": "1.3.0-SNAPSHOT-6",
     "office-ui-fabric-react": "6.111.2",
     "promise-polyfill": "8.1.0",
     "prop-types": "15.6.2",