Add preparation step to compute/storage config. Closes #2013

src/common/compute/backends/ComputeBackend.js

@@ -10,6 +10,7 @@ define([
  this.name = name;
  this.dashboardPath = dashboard;
  this.clientPath = client || './Client';
+ this._metadata = metadata;
  }
 
  getClient (logger, blobClient, config) {
@@ -30,6 +31,13 @@ define([
  }
  }
 
+ async prepareConfig (config) {
+ if (this._metadata.prepare) {
+ return await this._metadata.prepare(config);
+ }
+ return config;
+ }
+
  require (path) { // helper for loading async
  return new Promise((resolve, reject) =>
  require([path], resolve, reject)

src/common/compute/index.js

@@ -39,6 +39,11 @@
  return new ComputeBackend(id, metadata);
  };
 
+ Compute.prepareConfig = async function(id, config) {
+ const backend = this.getBackend(id);
+ return backend.prepareConfig(config);
+ };
+
  Compute.getMetadata = function(id) {
  id = id.toLowerCase();
  if (!COMPUTE_BACKENDS.includes(id)) {

src/common/storage/backends/StorageBackend.js

@@ -8,13 +8,21 @@ define([
  this.id = id;
  this.name = name;
  this.clientPath = client || './Client';
+ this._metadata = metadata;
  };
 
  StorageBackend.prototype.getClient = async function(logger, config) {
  const Client = await this.require(`deepforge/storage/backends/${this.id}/${this.clientPath}`);
  return new Client(this.id, this.name, logger, config);
  };
 
+ StorageBackend.prototype.prepareConfig = async function(config) {
+ if (this._metadata.prepare) {
+ return await this._metadata.prepare(config);
+ }
+ return config;
+ };
+
  StorageBackend.prototype.require = function(path) { // helper for loading async
  return new Promise((resolve, reject) =>
  require([path], resolve, reject)

src/common/storage/index.js

@@ -93,13 +93,29 @@ define([
  return await backend.getClient(logger, config);
  };
 
+ Storage.prepareConfig = async function(id, config) {
+ const backend = this.getBackend(id);
+ return backend.prepareConfig(config);
+ };
+
  Storage.getClient = async function(id, logger, config={}) {
  const backend = this.getBackend(id);
  return await backend.getClient(logger, config);
  };
 
  function deepCopy(obj) {
- return JSON.parse(JSON.stringify(obj));
+ if (Array.isArray(obj)) {
+ return obj.slice();
+ } else if (typeof obj === 'object') {
+ const result = {};
+ Object.entries(obj).forEach(entry => {
+ const [key, val] = entry;
+ result[key] = deepCopy(val);
+ });
+ return result;
+ } else {
+ return obj;
+ }
  }
 
  return Storage;

src/common/viz/Execute.js

@@ -9,6 +9,7 @@ define([
  'deepforge/api/JobOriginClient',
  'deepforge/Constants',
  'panel/FloatingActionButton/styles/Materialize',
+ 'underscore',
 ], function(
  Q,
  Compute,
@@ -18,6 +19,7 @@ define([
  JobOriginClient,
  CONSTANTS,
  Materialize,
+ _,
 ) {
 
  var Execute = function(client, logger) {
@@ -152,6 +154,24 @@ define([
  onPluginInitiated
  );
 
+ // Prepare configurations
+ const inputPairs = await Promise.all(inputConfigs.map(async pair => {
+ const [node] = pair;
+ const {backend} = JSON.parse(node.getAttribute('data'));
+ const config = context.pluginConfig.inputs[node.getId()];
+ return [node.getId(), await Storage.prepareConfig(backend, config)];
+ }));
+ context.pluginConfig.inputs = _.object(inputPairs);
+ context.pluginConfig.storage.config = await Storage.prepareConfig(
+ context.pluginConfig.storage.id,
+ context.pluginConfig.storage.config
+ );
+ context.pluginConfig.compute.config = await Compute.prepareConfig(
+ context.pluginConfig.compute.id,
+ context.pluginConfig.compute.config
+ );
+
+ // Run plugins
  this.client.runServerPlugin(pluginId, context, (err, result) => {
  const name = node.getAttribute('name');
  let msg = err ? `${name} failed!` : `${name} executed successfully!`,

src/visualizers/panels/ArtifactIndex/ArtifactIndexControl.js

@@ -55,7 +55,8 @@ define([
  if (deleteDataFromStorage) {
  const dataInfo = this.getDataInfo(node);
  const {backend} = dataInfo;
- const storage = await Storage.getClient(backend, this._logger, config);
+ const preparedConfig = await Storage.prepareConfig(backend, config);
+ const storage = await Storage.getClient(backend, this._logger, preparedConfig);
  await storage.deleteFile(dataInfo);
  }