presidium 0.29.13 → 1.0.0

package/Archive.js

@@ -17,7 +17,7 @@ const pick = require('rubico/pick')
  *
  * @synopsis
  * ```coffeescript [specscript]
- * new Archive(base Object<path=>(content string)>) -> Archive
+ * new Archive(base Object<string>) -> archive Archive
  * ```
  */
 const Archive = function (base) {
@@ -33,9 +33,11 @@ const Archive = function (base) {
  *
  * @synopsis
  * ```coffeescript [specscript]
- * new Archive(base?).tar(path string, options {
+ * module tar 'https://github.com/mafintosh/tar-stream'
+ *
+ * archive.tar(path string, options {
  *   ignore: Array<string>, // paths or names to ignore
- * }) -> HotReadableStream
+ * }) -> pack tar.Pack
  * ```
  *
  * @description
@@ -75,15 +77,17 @@ Archive.prototype.tar = function archiveTar(path, options) {
  *
  * @synopsis
  * ```coffeescript [specscript]
- * new Archive(base?).untar(
- *   archive Archive,
+ * module tar 'https://github.com/mafintosh/tar-stream'
+ *
+ * archive.untar(
+ *   pack tar.Pack,
  *   options {
  *     ignore: Array<string>, // paths or names to ignore
  *   },
  * ) -> Map<(header EntryHeader)=>(stream EntryStream)>
  * ```
  */
-Archive.prototype.untar = function archiveUntar(archive) {
+Archive.prototype.untar = function archiveUntar(pack) {
   const extractStream = tar.extract(),
     extracted = new Map()
   return new Promise((resolve, reject) => {
@@ -94,7 +98,7 @@ Archive.prototype.untar = function archiveUntar(archive) {
     })
     extractStream.on('finish', thunkify(resolve, extracted))
     extractStream.on('error', reject)
-    archive.pipe(extractStream)
+    pack.pipe(extractStream)
   })
 }
 

package/AwsCredentials.js

@@ -1,70 +1,68 @@
 require('rubico/global')
 const fs = require('fs')
-const nodePath = require('path')
-const pathResolve = require('./internal/pathResolve')
+const resolvePath = require('./internal/resolvePath')
 
 /**
  * @name AwsCredentials
  *
  * @synopsis
  * ```coffeescript [specscript]
- * AwsCredentials(options {
- *   profile?: string,
- *   credentialsFileDir?: string,
- * }) -> awsCreds {
+ * AwsCredentials(profile string, options? {
+ *   credentialsFileDirname: string
+ *   credentialsFilename: string,
+ *   recurse: boolean,
+ * }) -> awsCreds Promise<{
  *   accessKeyId: string,
  *   secretAccessKey: string,
- * }
- *
- * AwsCredentials(profile string) -> awsCreds {
- *   accessKeyId: string,
- *   secretAccessKey: string,
- * }
+ *   region: string,
+ * }>
  * ```
  */
 
-const AwsCredentials = async function (options = {}) {
-  if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
-    const awsCreds = {
-      accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-    }
-    if (process.env.AWS_REGION) {
-      awsCreds.region = process.env.AWS_REGION
-    }
-    return awsCreds
+const AwsCredentials = async function (profile, options = {}) {
+  if (profile == null) {
+    profile = 'default'
   }
 
-  const profile = (
-    typeof options == 'string' ? options : options.profile
-  ) ?? 'default'
-
-  let credentialsFileDir =
-    options.credentialsFileDir ?? pathResolve(process.cwd())
+  const recurse = options.recurse ?? true
+  const credentialsFileDirname = options.credentialsFileDirname ?? '.aws'
+  const credentialsFilename = options.credentialsFilename ?? 'credentials'
+  let credentialsFileDir = resolvePath(process.cwd())
   let lines = ''
-  while (credentialsFileDir != '/') {
+  while (recurse && credentialsFileDir != '/') {
     const credentialsFilePath =
-      pathResolve(credentialsFileDir, '.aws/credentials')
+      resolvePath(credentialsFileDir, `${credentialsFileDirname}/${credentialsFilename}`)
     if (fs.existsSync(credentialsFilePath)) {
-      lines = await (
-        fs.promises.readFile(credentialsFilePath)
-        .then(buffer => `${buffer}`.split('\n'))
-      )
+      lines = await fs.promises.readFile(credentialsFilePath)
+        .then(buffer => buffer.toString('utf8').split('\n'))
       break
     }
-    credentialsFileDir = pathResolve(credentialsFileDir, '..')
+    credentialsFileDir = resolvePath(credentialsFileDir, '..')
+  }
+
+  if (lines == '') {
+    throw new Error('Missing .aws/credentials file')
   }
 
   const startingLineNumber = lines.findIndex(line => line == `[${profile}]`)
 
-  const accessKeyId = lines.find(
+  const accessKeyId = startingLineNumber == -1 ? undefined : lines.find(
     (line, index) => index > startingLineNumber
-    && line.startsWith('aws_access_key_id')
-  ).split(' = ')[1]
-  const secretAccessKey = lines.find(
+      && line.startsWith('aws_access_key_id')
+      && index - startingLineNumber < 3
+  )?.split(' = ')[1]
+  const secretAccessKey = startingLineNumber == -1 ? undefined : lines.find(
     (line, index) => index > startingLineNumber
-    && line.startsWith('aws_secret_access_key')
-  ).split(' = ')[1]
+      && line.startsWith('aws_secret_access_key')
+      && index - startingLineNumber < 3
+  )?.split(' = ')[1]
+
+  if (accessKeyId == null) {
+    throw new Error(`unable to find aws_access_key_id for profile ${profile}`)
+  }
+  if (secretAccessKey == null) {
+    throw new Error(`unable to find aws_secret_access_key for profile ${profile}`)
+  }
 
   return { accessKeyId, secretAccessKey }
 }