Merge pull request #440 from CodeNow/multi-dock

send more data to mavis

Author: cflynn07

lib/models/apis/mavis.js

@@ -6,6 +6,8 @@ var ApiClient = require('simple-api-client');
 var util = require('util');
 var Boom = require('dat-middleware').Boom;
 var debug = require('debug')('runnable-api:mavis:model');
+var isObject = require('101/is-object');
+var isFunction = require('101/is-function');
 
 module.exports = Mavis;
 
@@ -23,7 +25,37 @@ util.inherits(Mavis, ApiClient);
  */
 Mavis.prototype.findDockForNetwork = function (cb) {
   debug('findDockForNetwork', formatArgs(arguments));
-  this.findDock('container_run', cb);
+  this.findDockForContainer({}, cb);
+};
+
+Mavis.prototype.findDockForBuild = function (contextVersion, cb) {
+  debug('findDockForBuild', formatArgs(arguments));
+
+  if (!isObject(contextVersion)) {
+    return cb(new Error('missing contextVersion'));
+  }
+
+  var opts =  {
+    type: 'container_build'
+  };
+  opts.prevDuration = contextVersion.duration || 0;
+  opts.prevImage = contextVersion.dockerTag || null;
+  this.findDock(opts, cb);
+};
+
+Mavis.prototype.findDockForContainer = function (contextVersion, cb) {
+  debug('findDockForContainer', formatArgs(arguments));
+
+  if (!isObject(contextVersion)) {
+    return cb(new Error('missing contextVersion'));
+  }
+
+  var opts =  {
+    type: 'container_run'
+  };
+  // if dockerHost is not an address, its invalid
+  opts.prevDock = contextVersion.dockerHost || null;
+  this.findDock(opts, cb);
 };
 
 /**
@@ -32,23 +64,11 @@ Mavis.prototype.findDockForNetwork = function (cb) {
  * @param prevDock: previous dock this image was run on
  * @param cb: Callback
  */
-Mavis.prototype.findDock = function (taskType, prevDock, cb) {
-  if (typeof prevDock === 'function') {
-    cb = prevDock;
-    prevDock = null;
-  }
-
-  // if prevDock is not an address, its invalid
-  if(prevDock && !~prevDock.indexOf('http')){
-    prevDock = null;
-  }
+Mavis.prototype.findDock = function (opts, cb) {
   // path must have trailing slash to ensure this is a file
   var self = this;
   this.post('dock', {
-    json: {
-      type: taskType,
-      prevDock: prevDock
-    }
+    json: opts
   }, function (err, res) {
     if (err) {
       var boomErr = Boom.create(504, 'Unable to find dock', {
@@ -99,10 +119,6 @@ function responseErr (res) {
   });
 }
 
-// TODO: add all the findDock types
-// Mavis.prototype.findDockForContainerCreate
-
-var isFunction = require('101/is-function');
 function formatArgs (args) {
   return Array.prototype.slice.call(args)
     .map(function (arg) {

lib/routes/builds.js

@@ -239,7 +239,7 @@ app.post('/builds/:id/actions/build',
             }))
         ).else(
           mavis.create(),
-          mavis.model.findDock('container_build'),
+          mavis.model.findDockForBuild('contextVersion'),
           contextVersions.model.setBuildStarted('sessionUser', 'mavisResult', 'body'),
           docker.create('mavisResult'),
           contextVersions.model.populate('infraCodeVersion'),

lib/routes/contexts/versions/index.js

@@ -214,7 +214,7 @@ app.post('/contexts/:contextId/versions/:id/actions/build',
   checkFound('contextVersion'),
   flow.try(
     mavis.create(),
-    mavis.model.findDock('container_build', 'contextVersion.dockerHost'),
+    mavis.model.findDockForContainer('contextVersion'),
     mw.req().set('originalContextVersion', 'contextVersion'),
     contextVersions.model.dedupe(),
     // FIXME: handle errors - bc if buildStarted this falls through to catch

lib/routes/instances/index.js

@@ -122,7 +122,7 @@ var createSaveAndNetworkContainer = flow.series(
       mw.req().set('dockerHost', 'body.forceDock'))
     .else(
       mavis.create(),
-      mavis.model.findDock('container_run', 'contextVersion.dockerHost'),
+      mavis.model.findDockForContainer('contextVersion'),
       mw.req().set('dockerHost', 'mavisResult')),
   flow.try(
     docker.create('dockerHost'),