presidium 0.25.2 → 0.26.1

package/Archive.test.js

@@ -6,42 +6,53 @@ const pathResolve = require('./internal/pathResolve')
 const map = require('rubico/map')
 const reduce = require('rubico/reduce')
 
-module.exports = Test('Archive', Archive)
-  .case(async archive => {
-    const pack = await archive.tar(pathResolve(__dirname), {
-      ignore: ['Dockerfile', 'node_modules', '.git', '.nyc_output'],
-    })
-    const extracted = await archive.untar(pack)
-    assert(extracted.size > 0)
-    for (const [path, stream] of extracted) {
-      assert('header' in stream)
-      assert(!path.startsWith('/'))
-      assert.equal(typeof path, 'string')
-      assert.equal(typeof stream[Symbol.asyncIterator], 'function')
-    }
-  })
-  .case({
-    Dockerfile: 'FROM node:15-alpine'
-  }, async archive => {
-    const pack = await archive.tar(pathResolve(__dirname, 'internal'))
-    const extracted = await archive.untar(pack)
-    const dir = await fs.readdir(pathResolve(__dirname, 'internal'))
-    assert.equal(extracted.size, dir.length + 1) // extra Dockerfile
-    assert(extracted.has('Dockerfile'))
-    assert.equal(
-      await reduce((a, b) => a + b, '')(extracted.get('Dockerfile')),
-      'FROM node:15-alpine')
+const test = new Test('Archive', Archive)
+
+.case(async archive => {
+  const pack = await archive.tar(pathResolve(__dirname), {
+    ignore: ['Dockerfile', 'node_modules', '.git', '.nyc_output'],
   })
-  .case({
-    Dockerfile: 'FROM busybox:1.32'
-  }, async archive => {
-    const pack = await archive.tar(`${pathResolve(__dirname, 'internal')}/`, {
-      ignore: ['hashJSON.js'],
-    })
-    const extracted = await archive.untar(pack)
-    assert(extracted.size > 0)
-    assert(extracted.has('Dockerfile'))
-    assert.equal(
-      await reduce((a, b) => a + b, '')(extracted.get('Dockerfile')),
-      'FROM busybox:1.32')
+  const extracted = await archive.untar(pack)
+  assert(extracted.size > 0)
+  for (const [path, stream] of extracted) {
+    assert('header' in stream)
+    assert(!path.startsWith('/'))
+    assert.equal(typeof path, 'string')
+    assert.equal(typeof stream[Symbol.asyncIterator], 'function')
+  }
+})
+
+.case({
+  Dockerfile: 'FROM node:15-alpine'
+}, async archive => {
+  const pack = await archive.tar(pathResolve(__dirname, 'internal'))
+  const extracted = await archive.untar(pack)
+  const dir = await fs.readdir(pathResolve(__dirname, 'internal'))
+  assert.equal(extracted.size, dir.length + 1) // extra Dockerfile
+  assert(extracted.has('Dockerfile'))
+  assert.equal(
+    await reduce((a, b) => a + b, '')(extracted.get('Dockerfile')),
+    'FROM node:15-alpine')
+})
+
+.case({
+  Dockerfile: 'FROM busybox:1.32'
+  '.aws/credentials': '[claimyr]\naccessKeyId\nsecretAccessKey',
+}, async archive => {
+  const pack = await archive.tar(`${pathResolve(__dirname, 'internal')}/`, {
+    ignore: ['hashJSON.js'],
   })
+  const extracted = await archive.untar(pack)
+  assert(extracted.size > 0)
+  assert(extracted.has('Dockerfile'))
+  assert(extracted.has('.aws/credentials'))
+  assert.equal(
+    await reduce((a, b) => a + b, '')(extracted.get('Dockerfile')),
+    'FROM busybox:1.32')
+})
+
+if (process.argv[1] == __filename) {
+  test()
+}
+
+module.exports = test

package/Docker.js

@@ -332,6 +332,7 @@ Docker.prototype.removeImage = function dockerRemoveImage(image, options) {
  *     source: string, // name of volume
  *     target: string, // mounted path inside container
  *     readonly: boolean,
+ *     type?: string, // default volume
  *   }>|Array<string>, // '<source>:<target>[:readonly]'
  *
  *   // Dockerfile defaults

package/DockerService.js

@@ -237,6 +237,7 @@ DockerService.prototype.synchronize = function dockerServiceSynchronize() {
  *     source: string, // name of volume
  *     target: string, // mounted path inside container
  *     readonly: boolean,
+ *     type?: string, // default volume
  *   }>|Array<string>, // '<source>:<target>[:readonly]'
  *
  *   cmd: Array<string|number>, // CMD

package/EcrLoginPassword.js

@@ -9,13 +9,27 @@ const streamToString = require('./internal/streamToString')
  * @synopsis
  * ```coffeescript [specscript]
  * EcrLoginPassword(options {
+ *   awsAccessKeyId?: string,
+ *   awsSecretAccessKey?: string,
+ *   awsProfile?: string,
  *   awsRegion: string,
- *   awsProfile: string,
  * }) -> Promise<password string>
  * ```
  */
 
-const EcrLoginPassword = async function ({ awsRegion, awsProfile }) {
+const EcrLoginPassword = async function ({
+  awsAccessKeyId,
+  awsSecretAccessKey,
+  awsRegion,
+  awsProfile,
+}) {
+  if (awsAccessKeyId != null && awsSecretAccessKey != null) {
+    const childprocess = exec(`
+AWS_ACCESS_KEY_ID=${awsAccessKeyId} AWS_SECRET_ACCESS_KEY=${awsSecretAccessKey} aws ecr --region ${awsRegion} get-login-password
+    `.trim())
+    return streamToString(childprocess.stdout).then(callProp('trim'))
+  }
+
   const childprocess = exec(`
 aws ecr --profile ${awsProfile} --region ${awsRegion} get-login-password
   `.trim())

package/internal/pathWalk.js

@@ -1,5 +1,6 @@
 require('rubico/global')
 const fs = require('fs/promises')
+const { minimatch } = require('minimatch')
 const pathResolve = require('./pathResolve')
 const isArray = require('./isArray')
 
@@ -20,29 +21,36 @@ const isArray = require('./isArray')
  * }) // -> Promise<paths Array<string>>
  * ```
  */
-const pathWalk = function (path, options) {
-  const ignore = new Set(get('ignore', [])(options))
-  return pipe([
-    pathResolve,
-    tryCatch(
-      curry.arity(2, fs.readdir, __, { withFileTypes: true }),
-      () => []),
+const pathWalk = async function (path, options = {}) {
+  const { ignore = [] } = options
+  const absPath = pathResolve(path)
+  const dirents = await fs.readdir(absPath, { withFileTypes: true })
+  const result = []
 
-    flatMap(dirent => {
-      const direntName = dirent.name,
-        direntPath = pathResolve(path, direntName)
-      if (
-        ignore.size > 0
-          && (ignore.has(direntName) || ignore.has(direntPath))
-      ) {
-        return []
+  for (const dirent of dirents) {
+    const dirName = dirent.name
+    const dirPath = pathResolve(path, dirName)
+    let shouldIgnore = false
+    for (const pattern of ignore) {
+      if (minimatch(dirPath, pattern) || minimatch(dirName, pattern)) {
+        shouldIgnore = true
+        break
       }
-      if (dirent.isDirectory()) {
-        return pathWalk(direntPath)
-      }
-      return [direntPath]
-    }),
-  ])(path)
+    }
+
+    if (shouldIgnore) {
+      continue
+    }
+
+    if (dirent.isDirectory()) {
+      const subPaths = await pathWalk(dirPath, options)
+      result.push(...subPaths)
+    } else {
+      result.push(dirPath)
+    }
+  }
+
+  return result
 }
 
 module.exports = pathWalk

package/internal/pathWalk.test.js

@@ -3,14 +3,23 @@ const Test = require('thunk-test')
 const pathWalk = require('./pathWalk')
 const pathResolve = require('./pathResolve')
 
-module.exports = Test('pathWalk', pathWalk)
-  .case(__dirname, function (paths) {
-    assert(paths.length > 0)
-    this.allInternalPaths = paths
-  })
-  .case(__dirname, { ignore: ['pathWalk.js'] }, function (paths) {
-    assert.equal(paths.length, this.allInternalPaths.length - 1)
-  })
-  .case(__dirname, { ignore: [pathResolve(__dirname, 'pathWalk.js')] }, function (paths) {
-    assert.equal(paths.length, this.allInternalPaths.length - 1)
-  })
+const test = Test('pathWalk', pathWalk)
+
+.case(__dirname, function (paths) {
+  assert(paths.length > 0)
+  this.allInternalPaths = paths
+})
+
+.case(__dirname, { ignore: ['pathWalk.js'] }, function (paths) {
+  assert.equal(paths.length, this.allInternalPaths.length - 1)
+})
+
+.case(__dirname, { ignore: [pathResolve(__dirname, 'pathWalk.js')] }, function (paths) {
+  assert.equal(paths.length, this.allInternalPaths.length - 1)
+})
+
+if (process.argv[1] == __filename) {
+  test()
+}
+
+module.exports = test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.25.2",
+  "version": "0.26.1",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",
@@ -33,6 +33,7 @@
     "aws-sdk": "^2.1123.0",
     "bcrypt": "^5.1.0",
     "ioredis": "^4.19.0",
+    "minimatch": "^9.0.3",
     "mongodb": "^3.6.3",
     "node-fetch": "^2.6.1",
     "rubico": "latest",