presidium 0.26.5 → 0.26.7

package/Archive.test.js

@@ -36,7 +36,7 @@ const test = new Test('Archive', Archive)
 })
 
 .case({
-  Dockerfile: 'FROM busybox:1.32'
+  Dockerfile: 'FROM busybox:1.32',
   '.aws/credentials': '[claimyr]\naccessKeyId\nsecretAccessKey',
 }, async archive => {
   const pack = await archive.tar(`${pathResolve(__dirname, 'internal')}/`, {

package/Dependency.js

@@ -0,0 +1,44 @@
+const DynamoTable = require('./DynamoTable')
+const DynamoStream = require('./DynamoStream')
+const ElasticsearchIndex = require('./ElasticsearchIndex')
+const S3Bucket = require('./S3Bucket')
+const KinesisStream = require('./KinesisStream')
+
+const Dependency = {}
+
+/**
+ * @name Dependency.teardown
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * teardown(
+ *   dependency DynamoTable|DynamoStream
+ *              |ElasticsearchIndex|S3Bucket
+ *              |KinesisStream
+ * ) -> Promise<>
+ * ```
+ */
+Dependency.teardown = async function teardown(dependency) {
+  if (dependency == null) {
+    // noop
+  }
+  else if (dependency.constructor == DynamoTable) {
+    await dependency.delete()
+  }
+  else if (dependency.constructor == DynamoStream) {
+    dependency.close()
+  }
+  else if (dependency.constructor == ElasticsearchIndex) {
+    await dependency.delete()
+  }
+  else if (dependency.constructor == S3Bucket) {
+    await dependency.deleteAllObjects()
+    await dependency.delete()
+  }
+  else if (dependency.constructor == KinesisStream) {
+    dependency.close()
+    await dependency.delete()
+  }
+}
+
+module.exports = Dependency

package/Dependency.test.js

@@ -0,0 +1,63 @@
+const Test = require('thunk-test')
+const DynamoTable = require('./DynamoTable')
+const DynamoStream = require('./DynamoStream')
+const ElasticsearchIndex = require('./ElasticsearchIndex')
+const S3Bucket = require('./S3Bucket')
+const KinesisStream = require('./KinesisStream')
+const Dependency = require('./Dependency')
+
+const test = new Test('Dependency.teardown', async function () {
+  const myDynamoTable = new DynamoTable({
+    name: 'my_dynamo_table',
+    key: [{ a: 'string' }],
+    endpoint: 'http://localhost:8000',
+    region: 'dynamodblocal',
+  })
+  await myDynamoTable.ready
+
+  const myDynamoStream = new DynamoStream({
+    table: 'my_dynamo_table',
+    endpoint: 'http://localhost:8000',
+    region: 'dynamodblocal',
+  })
+  await myDynamoStream.ready
+
+  const myElasticsearchIndex = new ElasticsearchIndex({
+    node: 'http://localhost:9200/',
+    index: 'local_post',
+    mappings: {
+      a: { type: 'keyword' },
+      b: { type: 'keyword' },
+    },
+  })
+  await myElasticsearchIndex.ready
+
+  const myS3Bucket = new S3Bucket({
+    name: 'my-s3-bucket',
+    endpoint: 'http://localhost:9000',
+    region: 'us-west-1',
+    accessKeyId: 'minioadmin',
+    secretAccessKey: 'minioadmin',
+  })
+  await myS3Bucket.ready
+
+  const myKinesisStream = new KinesisStream({
+    name: 'my_kinesis_stream',
+    endpoint: 'http://localhost:4567',
+    shardIteratorType: 'TRIM_HORIZON',
+  })
+  await myKinesisStream.ready
+
+  await Dependency.teardown(null)
+  await Dependency.teardown(myDynamoTable)
+  await Dependency.teardown(myDynamoStream)
+  await Dependency.teardown(myElasticsearchIndex)
+  await Dependency.teardown(myS3Bucket)
+  await Dependency.teardown(myKinesisStream)
+}).case()
+
+if (process.argv[1] == __filename) {
+  test()
+}
+
+module.exports = test

package/Docker.js

@@ -328,6 +328,7 @@ Docker.prototype.removeImage = function dockerRemoveImage(image, options) {
  *   healthStartPeriod: >=1e6, // nanoseconds to wait on container init before starting first healthcheck
  *   memory: number, // memory limit in bytes
  *   cpus: number, // number of cpus
+ *   gpus?: 'all', // expose gpus
  *   mounts: Array<{
  *     source: string, // name of volume
  *     target: string, // mounted path inside container
@@ -468,6 +469,7 @@ Docker.prototype.createContainer = function dockerCreateContainer(
           })(options.restart.split(':')),
         },
         ...options.rm && { AutoRemove: options.rm },
+
       },
     }),
 
@@ -868,6 +870,15 @@ Docker.prototype.createService = function dockerCreateService(service, options)
             ...options.cpus ? {
               NanoCPUs: Number(options.cpus * 1e9),
             } : {},
+
+            ...options.gpus == 'all' ? {
+              GenericResources: [{
+                DiscreteResourceSpec: {
+                  Kind: 'gpu',
+                  Value: 1,
+                },
+              }],
+            } : {},
           }, // bytes
         },
 

package/Docker.test.js

@@ -335,6 +335,7 @@ EXPOSE 8888`,
         }],
         memory: 512e6, // bytes
         cpus: 2,
+        gpus: 'all',
         restart: 'on-failure:5',
 
         healthCmd: ['wget', '--no-verbose', '--tries=1', '--spider', 'localhost:3000'],
@@ -364,6 +365,10 @@ EXPOSE 8888`,
         assert.equal(data.Spec.Labels.foo, 'bar')
         assert.equal(data.Spec.TaskTemplate.Resources.Reservations.NanoCPUs, 2000000000)
         assert.equal(data.Spec.TaskTemplate.Resources.Reservations.MemoryBytes, 512000000)
+        assert.equal(
+          data.Spec.TaskTemplate.Resources.Reservations.GenericResources[0].DiscreteResourceSpec.Kind,
+          'gpu',
+        )
       })
 
       this.serviceId1 = serviceId

package/DockerService.js

@@ -26,7 +26,7 @@ const dockerServiceOptions = [
   'rollbackParallelism', 'rollbackDelay',
   'rollbackFailureAction', 'rollbackMonitor', 'rollbackMaxFailureRatio',
   'username', 'password', 'email', 'serveraddress', 'identitytoken',
-  'network', 'memory', 'cpus',
+  'network', 'memory', 'cpus', 'gpus',
   'force',
 ]
 

package/S3Bucket.js

@@ -357,7 +357,12 @@ S3Bucket.prototype.getObjectStream = async function getObjectStream(
  */
 S3Bucket.prototype.listObjects = async function s3BucketListObjectsV2(options) {
   await this.ready
-  return this.s3.listObjectsV2(this.name, options)
+  return this.s3.listObjectsV2(this.name, options).catch(error => {
+    if (error.retryable) {
+      return this.listObjects(options)
+    }
+    throw error
+  })
 }
 
 module.exports = S3Bucket

package/internal/createUpdateServiceSpec.js

@@ -130,7 +130,7 @@ const createUpdateServiceSpec = function (options) {
   if (options.restartDelay != null) {
     result.TaskTemplate.RestartPolicy.Delay = Number(options.restartDelay)
   }
-  if (or([has('memory'), has('cpus')])(options)) {
+  if (or(options, [has('memory'), has('cpus'), has('gpus')])) {
     result.TaskTemplate.Resources = {}
     result.TaskTemplate.Resources.Reservations = {}
     result.TaskTemplate.Resources.Limits = {}
@@ -147,6 +147,15 @@ const createUpdateServiceSpec = function (options) {
     result.TaskTemplate.Resources.Limits.NanoCPUs =
       Number(options.cpus * 1e9)
   }
+  if (options.gpus != null) {
+    result.TaskTemplate.Resources.Reservations.GenericResources = []
+    result.TaskTemplate.Resources.Reservations.GenericResources.push({
+      DiscreteResourceSpec: {
+        Kind: 'gpu',
+        Value: 1,
+      },
+    })
+  }
   if (or([has('logDriver'), has('logDriverOptions')])(options)) {
     result.TaskTemplate.LogDriver = {}
   }

package/internal/createUpdateServiceSpec.test.js

@@ -241,6 +241,29 @@ const test = new Test('createUpdateServiceSpec', createUpdateServiceSpec)
   },
 })
 
+.case({
+  serviceName: 'my-service',
+  spec: {
+    TaskTemplate: {},
+  },
+  gpus: 'all',
+}, {
+  Name: 'my-service',
+  TaskTemplate: {
+    Resources: {
+      Limits: {},
+      Reservations: {
+        GenericResources: [{
+          DiscreteResourceSpec: {
+            Kind: 'gpu',
+            Value: 1,
+          },
+        }],
+      },
+    },
+  },
+})
+
 .case({
   serviceName: 'my-service',
   spec: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.26.5",
+  "version": "0.26.7",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",

package/teardown.test.js

@@ -60,4 +60,4 @@ if (process.argv[1] == __filename) {
   test()
 }
 
-module.exports = teardown
+module.exports = test