Merge pull request #2 from firstandthird/add-message

Update to include error message on wait and scale function

Author: ecwillis

index.js

@@ -74,6 +74,7 @@ class DockerServices {
       envRemove: Joi.array(),
       labels: Joi.object(),
       labelRemove: Joi.array(),
+      replicas: Joi.number(),
       force: Joi.boolean()
     });
     if (validate.error) {
@@ -101,6 +102,12 @@ class DockerServices {
       spec.TaskTemplate.ContainerSpec.Labels = merged;
     }
 
+    if (options.replicas) {
+      spec.Mode = spec.Mode || {};
+      spec.Mode.Replicated = spec.Mode.Replicated || {};
+      spec.Mode.Replicated.Replicas = options.replicas;
+    }
+
     if (options.force) {
       const updateCount = spec.TaskTemplate.ForceUpdate || 0;
       spec.TaskTemplate.ForceUpdate = updateCount + 1;
@@ -109,6 +116,10 @@ class DockerServices {
     return spec;
   }
 
+  scale(name, replicas) {
+     return this.adjust(name, { replicas });
+  }
+
   async remove(name) {
     const service = await this.dockerClient.getService(name);
     return service.remove();
@@ -127,7 +138,8 @@ class DockerServices {
     tasks.forEach(tsk => {
       if (!existing.includes(tsk.ID)) {
         if (tsk.Status.State === 'failed' || tsk.Status.State === 'rejected') {
-          throw new Error(`${tsk.ID} returned status ${tsk.Status.State}`);
+          const errMessage = tsk.Status.Err || null;
+          throw new Error(`${tsk.ID} returned status ${tsk.Status.State} with ${errMessage}`);
         }
         if (tsk.Status.State !== 'running') {
           finished = false;

test/adjust.test.js

@@ -120,6 +120,44 @@ tap.test('adjust service if no env or labels', async (t) => {
   t.end();
 });
 
+tap.test('adjust service replicas', async (t) => {
+  const services = new Services();
+  const name = `dummy-app${Math.floor(Math.random() * 1001)}`;
+  await services.create({
+    Name: name,
+    TaskTemplate: {
+      ContainerSpec: {
+        Image: 'firstandthird/ops'
+      }
+    }
+  });
+  await services.adjust(name, {
+    replicas: 2
+  });
+  const service = await services.get(name);
+  await services.remove(name);
+  t.equals(service.Spec.Mode.Replicated.Replicas, 2);
+  t.end();
+});
+
+tap.test('adjust using scale', async (t) => {
+  const services = new Services();
+  const name = `dummy-app${Math.floor(Math.random() * 1001)}`;
+  await services.create({
+    Name: name,
+    TaskTemplate: {
+      ContainerSpec: {
+        Image: 'firstandthird/ops'
+      }
+    }
+  });
+  await services.scale(name, 3);
+  const service = await services.get(name);
+  await services.remove(name);
+  t.equals(service.Spec.Mode.Replicated.Replicas, 3);
+  t.end();
+});
+
 tap.test('force: true', async (t) => {
   const services = new Services();
   const name = `dummy-app${Math.floor(Math.random() * 1001)}`;

test/adjustSpec.test.js

@@ -69,6 +69,24 @@ tap.test('adjust service', (t) => {
   t.end();
 });
 
+tap.test('adjust replica sizes', (t) => {
+  const services = new Services();
+  const name = `dummy-app${Math.floor(Math.random() * 1001)}`;
+  const spec = {
+    Name: name,
+    TaskTemplate: {
+      ContainerSpec: {
+        Image: 'firstandthird/ops@sha256:b545c3b87e515299f6d6245d5f1eebcf1ed30328dca1e218fc9c6cebc75f9918',
+      }
+    }
+  };
+  const newSpec = services.adjustSpec(spec, {
+    replicas: 3
+  });
+  t.equals(newSpec.Mode.Replicated.Replicas, 3);
+  t.end();
+});
+
 tap.test('remove digest if force', (t) => {
   const services = new Services();
   const name = `dummy-app${Math.floor(Math.random() * 1001)}`;