@dotenvx/dotenvx 1.69.1 → 1.70.0

package/src/cli/dotenvx.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /* c8 ignore start */
-const { Command } = require('commander')
+const { Command, Option } = require('commander')
 const program = new Command()
 
 const { setLogLevel, logger } = require('../shared/logger')
@@ -43,7 +43,7 @@ program
     setLogLevel(options)
   })
 
-// for dynamic loading of dotenvx-vlt, etc
+// for dynamic loading of dotenvx-armor, etc
 program
   .argument('[command]', 'dynamic command')
   .argument('[args...]', 'dynamic command arguments')
@@ -70,8 +70,9 @@ program.command('run')
   .option('--strict', 'process.exit(1) on any errors', false)
   .option('--convention <name>', 'load a .env convention (available conventions: [\'nextjs\', \'flow\'])')
   .option('--ignore <errorCodes...>', 'error code(s) to ignore (example: --ignore=MISSING_ENV_FILE)')
-  .option('--no-ops', 'disable dotenvx-ops features')
-  .option('--no-vlt', 'disable dotenvx-vlt features')
+  .option('--no-armor', 'disable dotenvx-armor features')
+  .addOption(new Option('--no-vlt', 'disable dotenvx-vlt features (deprecated. use --no-armor)').hideHelp())
+  .addOption(new Option('--no-ops', 'disable dotenvx-ops features (deprecated. use --no-armor)').hideHelp())
   .action(function (...args) {
     this.envs = envs
     return require('./actions/run').apply(this, args)
@@ -93,8 +94,9 @@ program.command('get')
   .option('-pp, --pretty-print', 'pretty print output')
   .option('--pp', 'pretty print output (alias)')
   .option('--format <type>', 'format of the output (json, shell, colon, eval)', 'json')
-  .option('--no-ops', 'disable dotenvx-ops features')
-  .option('--no-vlt', 'disable dotenvx-vlt features')
+  .option('--no-armor', 'disable dotenvx-armor features')
+  .addOption(new Option('--no-vlt', 'disable dotenvx-vlt features (deprecated. use --no-armor)').hideHelp())
+  .addOption(new Option('--no-ops', 'disable dotenvx-ops features (deprecated. use --no-armor)').hideHelp())
   .action(function (...args) {
     this.envs = envs
     return require('./actions/get').apply(this, args)
@@ -113,8 +115,9 @@ program.command('set')
   .option('-c, --encrypt', 'encrypt value', true)
   .option('-p, --plain', 'store value as plain text', false)
   .option('--no-create', 'do not create .env file(s) when missing')
-  .option('--no-ops', 'disable dotenvx-ops features')
-  .option('--no-vlt', 'disable dotenvx-vlt features')
+  .option('--no-armor', 'disable dotenvx-armor features')
+  .addOption(new Option('--no-vlt', 'disable dotenvx-vlt features (deprecated. use --no-armor)').hideHelp())
+  .addOption(new Option('--no-ops', 'disable dotenvx-ops features (deprecated. use --no-armor)').hideHelp())
   .action(function (...args) {
     this.envs = envs
     return require('./actions/set').apply(this, args)
@@ -128,10 +131,11 @@ program.command('encrypt')
   .option('-k, --key <keys...>', 'keys(s) to encrypt (default: all keys in file)')
   .option('-ek, --exclude-key <excludeKeys...>', 'keys(s) to exclude from encryption (default: none)')
   .option('--stdout', 'send to stdout')
-  .option('--token <token>', 'set Vlt Ops token')
+  .option('--token <token>', 'set Armor ⛨ token')
   .option('--no-create', 'do not create .env file(s) when missing')
-  .option('--no-ops', 'disable dotenvx-ops features')
-  .option('--no-vlt', 'disable dotenvx-vlt features')
+  .option('--no-armor', 'disable dotenvx-armor features')
+  .addOption(new Option('--no-vlt', 'disable dotenvx-vlt features (deprecated. use --no-armor)').hideHelp())
+  .addOption(new Option('--no-ops', 'disable dotenvx-ops features (deprecated. use --no-armor)').hideHelp())
   .action(function (...args) {
     this.envs = envs
     return require('./actions/encrypt').apply(this, args)
@@ -144,8 +148,9 @@ program.command('decrypt')
   .option('-fk, --env-keys-file <path>', 'path to your .env.keys file (default: same path as your env file)')
   .option('-k, --key <keys...>', 'keys(s) to decrypt (default: all keys in file)')
   .option('-ek, --exclude-key <excludeKeys...>', 'keys(s) to exclude from decryption (default: none)')
-  .option('--no-ops', 'disable dotenvx-ops features')
-  .option('--no-vlt', 'disable dotenvx-vlt features')
+  .option('--no-armor', 'disable dotenvx-armor features')
+  .addOption(new Option('--no-vlt', 'disable dotenvx-vlt features (deprecated. use --no-armor)').hideHelp())
+  .addOption(new Option('--no-ops', 'disable dotenvx-ops features (deprecated. use --no-armor)').hideHelp())
   .option('--stdout', 'send to stdout')
   .action(function (...args) {
     this.envs = envs
@@ -159,8 +164,9 @@ program.command('rotate')
   .option('-fk, --env-keys-file <path>', 'path to your .env.keys file (default: same path as your env file)')
   .option('-k, --key <keys...>', 'keys(s) to encrypt (default: all keys in file)')
   .option('-ek, --exclude-key <excludeKeys...>', 'keys(s) to exclude from encryption (default: none)')
-  .option('--no-ops', 'disable dotenvx-ops features')
-  .option('--no-vlt', 'disable dotenvx-vlt features')
+  .option('--no-armor', 'disable dotenvx-armor features')
+  .addOption(new Option('--no-vlt', 'disable dotenvx-vlt features (deprecated. use --no-armor)').hideHelp())
+  .addOption(new Option('--no-ops', 'disable dotenvx-ops features (deprecated. use --no-armor)').hideHelp())
   .option('--stdout', 'send to stdout')
   .action(function (...args) {
     this.envs = envs
@@ -174,8 +180,9 @@ program.command('keypair')
   .argument('[KEY]', 'environment variable key name')
   .option('-f, --env-file <paths...>', 'path(s) to your env file(s)')
   .option('-fk, --env-keys-file <path>', 'path to your .env.keys file (default: same path as your env file)')
-  .option('--no-ops', 'disable dotenvx-ops features')
-  .option('--no-vlt', 'disable dotenvx-vlt features')
+  .option('--no-armor', 'disable dotenvx-armor features')
+  .addOption(new Option('--no-vlt', 'disable dotenvx-vlt features (deprecated. use --no-armor)').hideHelp())
+  .addOption(new Option('--no-ops', 'disable dotenvx-ops features (deprecated. use --no-armor)').hideHelp())
   .option('-pp, --pretty-print', 'pretty print output')
   .option('--pp', 'pretty print output (alias)')
   .option('--format <type>', 'format of the output (json, shell, colon)', 'json')
@@ -202,12 +209,12 @@ program.command('doctor', { hidden: true })
   })
 
 // dotenvx login
-program.command('login')
-  .description('log in to unlock ⛨ ARMORED KEYS ✦ BETA')
+program.command('login', { hidden: true })
+  .description('')
   .allowUnknownOption()
   .action(() => {
-    const rawArgs = ['ops', 'login', ...process.argv.slice(3)]
-    executeDynamic(program, 'ops', rawArgs)
+    const rawArgs = ['armor', 'login', ...process.argv.slice(3)]
+    executeDynamic(program, 'armor', rawArgs)
   })
 
 // dotenvx logout
@@ -215,17 +222,8 @@ program.command('logout', { hidden: true })
   .description('log out of your dotenvx account')
   .allowUnknownOption()
   .action(() => {
-    const rawArgs = ['ops', 'logout', ...process.argv.slice(3)]
-    executeDynamic(program, 'ops', rawArgs)
-  })
-
-// dotenvx armor
-program.command('armor', { hidden: true })
-  .description('ARMORED KEYS ⛨')
-  .allowUnknownOption()
-  .action((args) => {
-    const rawArgs = ['ops', 'armor', ...process.argv.slice(3)]
-    executeDynamic(program, 'ops', rawArgs)
+    const rawArgs = ['armor', 'logout', ...process.argv.slice(3)]
+    executeDynamic(program, 'armor', rawArgs)
   })
 
 // dotenvx help
@@ -244,11 +242,11 @@ program.command('help [command]')
     }
   })
 
-// dotenvx vlt ops
+// dotenvx armor
 program.addHelpText('after', ' ')
 program.addHelpText('after', 'Advanced: ')
-program.addHelpText('after', '  vlt                ⛨  Vlt Ops [www.dotenvx.com/vlt]')
-program.addHelpText('after', '  ext                🔌 extensions')
+program.addHelpText('after', '  armor                    ⛨ ARMORED KEYS [www.dotenvx.com/armor]')
+program.addHelpText('after', '  ext                      ⊕ extensions')
 
 // dotenvx ext
 program.addCommand(require('./commands/ext'))

package/src/db/session.js

@@ -1,23 +1,23 @@
-const Vlt = require('./../lib/extensions/vlt')
+const Armor = require('./../lib/extensions/armor')
 const { logger } = require('./../shared/logger')
 
 class Session {
   constructor () {
-    this.vlt = new Vlt()
+    this.armor = new Armor()
   }
 
   //
-  // vlt status helpers
+  // armor status helpers
   //
-  async noVlt () {
-    const status = await this.vlt.status()
-    logger.debug(`vlt: ${status}`)
+  async noArmor () {
+    const status = await this.armor.status()
+    logger.debug(`armor: ${status}`)
     return status === 'off'
   }
 
-  noVltSync () {
-    const status = this.vlt.statusSync()
-    logger.debug(`vlt: ${status}`)
+  noArmorSync () {
+    const status = this.armor.statusSync()
+    logger.debug(`armor: ${status}`)
     return status === 'off'
   }
 }

package/src/lib/extensions/{vlt.js → armor.js}

@@ -4,9 +4,9 @@ const util = require('util')
 const { logger } = require('../../shared/logger')
 
 const execFile = util.promisify(childProcess.execFile)
-const BINARY_NAMES = ['dotenvx-vlt', 'dotenvx-ops']
+const BINARY_NAMES = ['dotenvx-armor', 'dotenvx-vlt', 'dotenvx-ops']
 
-class Vlt {
+class Armor {
   async status () {
     if (this._isForcedOff()) return 'off'
 
@@ -195,8 +195,8 @@ class Vlt {
   }
 
   _isForcedOff () {
-    return process.env.DOTENVX_NO_OPS === 'true' || process.env.DOTENVX_NO_VLT === 'true'
+    return process.env.DOTENVX_NO_ARMOR === 'true' || process.env.DOTENVX_NO_VLT === 'true' || process.env.DOTENVX_NO_OPS === 'true'
   }
 }
 
-module.exports = Vlt
+module.exports = Armor

package/src/lib/helpers/cryptography/{vltKeypair.js → armorKeypair.js}

@@ -1,6 +1,6 @@
-const Vlt = require('../../extensions/vlt')
+const Armor = require('../../extensions/armor')
 
-async function vltKeypair (existingPublicKey, options = {}) {
+async function armorKeypair (existingPublicKey, options = {}) {
   const hooks = options.hooks || {}
   if (hooks.before) await hooks.before()
 
@@ -13,7 +13,7 @@ async function vltKeypair (existingPublicKey, options = {}) {
 
   let kp
   try {
-    kp = await new Vlt().keypair(existingPublicKey, keypairOptions)
+    kp = await new Armor().keypair(existingPublicKey, keypairOptions)
   } finally {
     if (hooks.after) await hooks.after()
   }
@@ -27,4 +27,4 @@ async function vltKeypair (existingPublicKey, options = {}) {
   }
 }
 
-module.exports = vltKeypair
+module.exports = armorKeypair

package/src/lib/helpers/cryptography/armorKeypairSync.js

@@ -0,0 +1,14 @@
+const Armor = require('../../extensions/armor')
+
+function armorKeypairSync (existingPublicKey, options = {}) {
+  const kp = new Armor().keypairSync(existingPublicKey, options)
+  const publicKey = kp.public_key
+  const privateKey = kp.private_key
+
+  return {
+    publicKey,
+    privateKey
+  }
+}
+
+module.exports = armorKeypairSync

package/src/lib/helpers/cryptography/index.js

@@ -1,6 +1,6 @@
 module.exports = {
-  vltKeypair: require('./vltKeypair'),
-  vltKeypairSync: require('./vltKeypairSync'),
+  armorKeypair: require('./armorKeypair'),
+  armorKeypairSync: require('./armorKeypairSync'),
   localKeypair: require('./localKeypair'),
   encryptValue: require('./encryptValue'),
   decryptKeyValue: require('./decryptKeyValue'),

package/src/lib/helpers/cryptography/mutateKeysSrc.js

@@ -2,7 +2,7 @@ const FIRST_TIME_KEYS_SRC = [
   '#/------------------!DOTENV_PRIVATE_KEYS!-------------------/',
   '#/ private decryption keys. DO NOT commit to source control /',
   '#/     [how it works](https://dotenvx.com/encryption)       /',
-  '#/        harden private keys: `dotenvx armor up`           /',
+  '#/          ⛨ ARMORED KEYS: `dotenvx armor up`              /',
   '#/----------------------------------------------------------/'
 ].join('\n')
 
@@ -25,7 +25,7 @@ async function mutateKeysSrc ({ envFilepath, keysFilepath, privateKeyName, priva
   keysSrc = keysSrc.length > 1 ? keysSrc : `${FIRST_TIME_KEYS_SRC}\n`
   keysSrc = `${keysSrc}\n${appendPrivateKey}`
 
-  await fsx.writeFileX(resolvedKeysFilepath, keysSrc) // TODO: don't write if ops
+  await fsx.writeFileX(resolvedKeysFilepath, keysSrc) // TODO: don't write if armor
 
   const envKeysFilepath = keysFilepath || path.join(path.dirname(envFilepath), path.basename(resolvedKeysFilepath))
 

package/src/lib/helpers/cryptography/mutateKeysSrcSync.js

@@ -2,7 +2,7 @@ const FIRST_TIME_KEYS_SRC = [
   '#/------------------!DOTENV_PRIVATE_KEYS!-------------------/',
   '#/ private decryption keys. DO NOT commit to source control /',
   '#/     [how it works](https://dotenvx.com/encryption)       /',
-  '#/        harden private keys: `dotenvx armor up`           /',
+  '#/          ⛨ ARMORED KEYS: `dotenvx armor up`              /',
   '#/----------------------------------------------------------/'
 ].join('\n')
 
@@ -25,7 +25,7 @@ function mutateKeysSrcSync ({ envFilepath, keysFilepath, privateKeyName, private
   keysSrc = keysSrc.length > 1 ? keysSrc : `${FIRST_TIME_KEYS_SRC}\n`
   keysSrc = `${keysSrc}\n${appendPrivateKey}`
 
-  fsx.writeFileXSync(resolvedKeysFilepath, keysSrc) // TODO: don't write if ops
+  fsx.writeFileXSync(resolvedKeysFilepath, keysSrc) // TODO: don't write if armor
 
   const envKeysFilepath = keysFilepath || path.join(path.dirname(envFilepath), path.basename(resolvedKeysFilepath))
 

package/src/lib/helpers/cryptography/provision.js

@@ -1,13 +1,13 @@
 const mutateSrc = require('./mutateSrc')
 const mutateKeysSrc = require('./mutateKeysSrc')
-const vltKeypair = require('./vltKeypair')
+const armorKeypair = require('./armorKeypair')
 const localKeypair = require('./localKeypair')
 const { keyNames } = require('../keyResolution')
 
-async function provision ({ envSrc, envFilepath, keysFilepath, noVlt, token, keypairHooks, selectKeyStorage }) {
-  noVlt = noVlt !== false
-  if (!noVlt && selectKeyStorage) {
-    noVlt = await selectKeyStorage() !== 'armored'
+async function provision ({ envSrc, envFilepath, keysFilepath, noArmor, token, keypairHooks, selectKeyStorage }) {
+  noArmor = noArmor !== false
+  if (!noArmor && selectKeyStorage) {
+    noArmor = await selectKeyStorage() !== 'armored'
   }
 
   const { publicKeyName, privateKeyName } = keyNames(envFilepath)
@@ -19,12 +19,12 @@ async function provision ({ envSrc, envFilepath, keysFilepath, noVlt, token, key
   let localPrivateKeyAdded = false
   let remotePrivateKeyAdded = false
 
-  if (noVlt) {
+  if (noArmor) {
     const kp = localKeypair()
     publicKey = kp.publicKey
     privateKey = kp.privateKey
   } else {
-    const kp = await vltKeypair(undefined, { token, envFilepath, hooks: keypairHooks })
+    const kp = await armorKeypair(undefined, { token, envFilepath, hooks: keypairHooks })
     publicKey = kp.publicKey
     privateKey = kp.privateKey
   }
@@ -32,7 +32,7 @@ async function provision ({ envSrc, envFilepath, keysFilepath, noVlt, token, key
   const mutated = mutateSrc({ envSrc, envFilepath, keysFilepath, publicKeyName, publicKeyValue: publicKey })
   envSrc = mutated.envSrc
 
-  if (noVlt) {
+  if (noArmor) {
     const mutated = await mutateKeysSrc({ envFilepath, keysFilepath, privateKeyName, privateKeyValue: privateKey })
     keysSrc = mutated.keysSrc
     envKeysFilepath = mutated.envKeysFilepath

package/src/lib/helpers/cryptography/provisionSync.js

@@ -1,11 +1,11 @@
 const mutateSrc = require('./mutateSrc')
 const mutateKeysSrcSync = require('./mutateKeysSrcSync')
-const vltKeypairSync = require('./vltKeypairSync')
+const armorKeypairSync = require('./armorKeypairSync')
 const localKeypair = require('./localKeypair')
 const { keyNames } = require('../keyResolution')
 
-function provisionSync ({ envSrc, envFilepath, keysFilepath, noVlt }) {
-  noVlt = noVlt !== false
+function provisionSync ({ envSrc, envFilepath, keysFilepath, noArmor }) {
+  noArmor = noArmor !== false
   const { publicKeyName, privateKeyName } = keyNames(envFilepath)
 
   let publicKey
@@ -15,12 +15,12 @@ function provisionSync ({ envSrc, envFilepath, keysFilepath, noVlt }) {
   let localPrivateKeyAdded = false
   let remotePrivateKeyAdded = false
 
-  if (noVlt) {
+  if (noArmor) {
     const kp = localKeypair()
     publicKey = kp.publicKey
     privateKey = kp.privateKey
   } else {
-    const kp = vltKeypairSync(undefined, { envFilepath })
+    const kp = armorKeypairSync(undefined, { envFilepath })
     publicKey = kp.publicKey
     privateKey = kp.privateKey
   }
@@ -28,7 +28,7 @@ function provisionSync ({ envSrc, envFilepath, keysFilepath, noVlt }) {
   const mutated = mutateSrc({ envSrc, envFilepath, keysFilepath, publicKeyName, publicKeyValue: publicKey })
   envSrc = mutated.envSrc
 
-  if (noVlt) {
+  if (noArmor) {
     const mutated = mutateKeysSrcSync({ envFilepath, keysFilepath, privateKeyName, privateKeyValue: privateKey })
     keysSrc = mutated.keysSrc
     envKeysFilepath = mutated.envKeysFilepath

package/src/lib/helpers/cryptography/provisionWithPrivateKey.js

@@ -3,7 +3,7 @@ const mutateSrc = require('./mutateSrc')
 const localKeypair = require('./localKeypair')
 
 function provisionWithPrivateKey ({ envSrc, envFilepath, keysFilepath, privateKeyValue, publicKeyValue, publicKeyName }) {
-  const { publicKey, privateKey } = localKeypair(privateKeyValue) // noVlt doesn't matter here since privateKeyValue was already discovered prior (via vlt and local) and passed as privateKeyValue
+  const { publicKey, privateKey } = localKeypair(privateKeyValue) // noArmor doesn't matter here since privateKeyValue was already discovered prior (via armor and local) and passed as privateKeyValue
 
   // if derivation doesn't match what's in the file (or preset in env)
   if (publicKeyValue && publicKeyValue !== publicKey) {

package/src/lib/helpers/executeDynamic.js

@@ -2,23 +2,35 @@ const path = require('path')
 const childProcess = require('child_process')
 const { logger } = require('../../shared/logger')
 
-function installCommandForVlt () {
-  return 'curl -sfS https://dotenvx.sh/vlt | sh'
-}
-
-function vltBanner (installCommand) {
+function armorBanner () {
   const lines = [
+    '                      [www.dotenvx.com/armor]',
+    '–––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––',
+    '                            __ ____ __ ',
+    '                           |    ||    |',
+    '                           |  __||__  |',
+    '                           |  ‾‾||‾‾  |',
+    '                           |    ||    |',
+    '                            \\   ||   /',
+    '                              \\ __ /',
+    '',
+    '                          Dotenvx Armor ⛨',
+    '',
+    '                           ARMORED KEYS',
+    '               Private keys. Off device. Under guard.',
     '',
-    '  ██╗   ██╗██╗  ████████╗',
-    '  ██║   ██║██║  ╚══██╔══╝',
-    '  ██║   ██║██║     ██║   ',
-    '  ╚██╗ ██╔╝██║     ██║       [www.dotenvx.com/vlt]',
-    '   ╚████╔╝ ███████╗██║   ',
-    '    ╚═══╝  ╚══════╝╚═╝   ',
+    '                                -',
     '',
-    '  ⛨  ARMORED KEYS: Harden your private keys.',
-    `  ⮕  install [${installCommand}]`,
-    '  ⮕  then run [dotenvx-vlt login]'
+    '                            Install one',
+    '            [curl -sfS https://dotenvx.sh/armor | sh]',
+    '              [npm i @dotenvx/dotenvx-armor --save]',
+    '',
+    '                                -',
+    '',
+    '                              Then',
+    '                       [dotenvx armor up]',
+    '                     (sign in when prompted)',
+    ''
   ]
 
   const innerWidth = Math.max(67, ...lines.map((line) => line.length))
@@ -29,6 +41,26 @@ function vltBanner (installCommand) {
   return `${top}\n${middle}\n${bottom}`
 }
 
+function dynamicAttempts (command, forwardedArgs) {
+  if (command === 'vlt') {
+    return [
+      ['dotenvx-armor', forwardedArgs],
+      ['dotenvx-vlt', forwardedArgs],
+      ['dotenvx-ops', forwardedArgs]
+    ]
+  }
+
+  if (command === 'ops') {
+    return [
+      ['dotenvx-armor', forwardedArgs],
+      ['dotenvx-ops', forwardedArgs],
+      ['dotenvx-vlt', forwardedArgs]
+    ]
+  }
+
+  return [[`dotenvx-${command}`, forwardedArgs]]
+}
+
 function executeDynamic (program, command, rawArgs) {
   if (!command) {
     program.outputHelp()
@@ -47,14 +79,20 @@ function executeDynamic (program, command, rawArgs) {
   const newPath = `${binPath}:${process.env.PATH}`
   const env = { ...process.env, PATH: newPath }
 
-  const result = childProcess.spawnSync(`dotenvx-${command}`, forwardedArgs, { stdio: 'inherit', env })
+  const spawnOptions = { stdio: 'inherit', env }
+  let result
+  for (const [spawnCommand, spawnArgs] of dynamicAttempts(command, forwardedArgs)) {
+    result = childProcess.spawnSync(spawnCommand, spawnArgs, spawnOptions)
+    if (!result.error) break
+  }
+
   if (result.error) {
     if (command === 'vlt') {
-      const installCommand = installCommandForVlt()
-      console.log(vltBanner(installCommand))
+      console.log(armorBanner())
     } else if (command === 'ops') {
-      const installCommand = installCommandForVlt()
-      console.log(vltBanner(installCommand))
+      console.log(armorBanner())
+    } else if (command === 'armor') {
+      console.log(armorBanner())
     } else {
       logger.info(`error: unknown command '${command}'`)
     }

package/src/lib/helpers/keyResolution/keyValues.js

@@ -5,7 +5,7 @@ const dotenvParse = require('./../dotenvParse')
 const keyNames = require('./keyNames')
 const readProcessKey = require('./readProcessKey')
 const readFileKey = require('./readFileKey')
-const vltKeypair = require('../cryptography/vltKeypair')
+const armorKeypair = require('../cryptography/armorKeypair')
 
 async function invertForPrivateKeyName (filepath) {
   const PUBLIC_KEY_SCHEMA = 'DOTENV_PUBLIC_KEY'
@@ -34,13 +34,14 @@ async function invertForPrivateKeyName (filepath) {
 
 async function keyValues (filepath, opts = {}) {
   let keysFilepath = opts.keysFilepath || null
-  const noVlt = opts.noVlt === true
+  const noArmor = opts.noArmor === true
   const names = keyNames(filepath)
   const publicKeyName = names.publicKeyName // DOTENV_PUBLIC_KEY_${ENVIRONMENT}
   let privateKeyName = names.privateKeyName // DOTENV_PRIVATE_KEY_${ENVIRONMENT}
 
   let publicKey = null
   let privateKey = null
+  let privateKeySource = null
 
   // public key: process.env first, then .env*
   publicKey = readProcessKey(publicKeyName)
@@ -70,16 +71,22 @@ async function keyValues (filepath, opts = {}) {
     }
   }
 
-  // vlt
-  if (!noVlt && !privateKey && publicKey && publicKey.length > 0) {
-    const kp = await vltKeypair(publicKey, { envFilepath: filepath, hooks: opts.keypairHooks })
+  // armor
+  if (!noArmor && !privateKey && publicKey && publicKey.length > 0) {
+    const kp = await armorKeypair(publicKey, { envFilepath: filepath, hooks: opts.keypairHooks })
     privateKey = kp.privateKey
+    privateKeySource = 'armor'
   }
 
-  return {
+  const result = {
     publicKeyValue: publicKey || null, // important to make sure name is rendered
     privateKeyValue: privateKey || null // important to make sure name is rendered
   }
+  if (privateKeySource) {
+    result.privateKeySource = privateKeySource
+  }
+
+  return result
 }
 
 module.exports = keyValues

package/src/lib/helpers/keyResolution/keyValuesFromEnvSrc.js

@@ -2,7 +2,7 @@ const path = require('path')
 
 const dotenvParse = require('./../dotenvParse')
 const readFileKeySync = require('./readFileKeySync')
-const vltKeypairSync = require('../cryptography/vltKeypairSync')
+const armorKeypairSync = require('../cryptography/armorKeypairSync')
 
 const PUBLIC_KEY_SCHEMA = 'DOTENV_PUBLIC_KEY'
 const PRIVATE_KEY_SCHEMA = 'DOTENV_PRIVATE_KEY'
@@ -25,7 +25,7 @@ function publicKeyNameFromEnvSrc (envParsed) {
 
 function keyValuesFromEnvSrc (src, privateKeyName = null, opts = {}) {
   let keysFilepath = opts.keysFilepath || null
-  const noVlt = opts.noVlt === true
+  const noArmor = opts.noArmor === true
   const processEnv = opts.processEnv || process.env
   const envParsed = dotenvParse(src)
 
@@ -37,6 +37,7 @@ function keyValuesFromEnvSrc (src, privateKeyName = null, opts = {}) {
   }
 
   let privateKeyValue = null
+  let privateKeySource = null
   if (privateKeyName) {
     privateKeyValue = readProcessKey(processEnv, privateKeyName)
 
@@ -51,16 +52,22 @@ function keyValuesFromEnvSrc (src, privateKeyName = null, opts = {}) {
     }
   }
 
-  if (!noVlt && !privateKeyValue && publicKeyValue && publicKeyValue.length > 0) {
-    const kp = vltKeypairSync(publicKeyValue)
+  if (!noArmor && !privateKeyValue && publicKeyValue && publicKeyValue.length > 0) {
+    const kp = armorKeypairSync(publicKeyValue)
     privateKeyValue = kp.privateKey
+    privateKeySource = 'armor'
   }
 
-  return {
+  const result = {
     publicKeyValue: publicKeyValue || null,
     privateKeyValue: privateKeyValue || null,
     privateKeyName: privateKeyName || null
   }
+  if (privateKeySource) {
+    result.privateKeySource = privateKeySource
+  }
+
+  return result
 }
 
 module.exports = keyValuesFromEnvSrc

package/src/lib/helpers/keyResolution/keyValuesSync.js

@@ -5,7 +5,7 @@ const dotenvParse = require('./../dotenvParse')
 const keyNames = require('./keyNames')
 const readProcessKey = require('./readProcessKey')
 const readFileKeySync = require('./readFileKeySync')
-const vltKeypairSync = require('../cryptography/vltKeypairSync')
+const armorKeypairSync = require('../cryptography/armorKeypairSync')
 
 function invertForPrivateKeyName (filepath) {
   const PUBLIC_KEY_SCHEMA = 'DOTENV_PUBLIC_KEY'
@@ -34,13 +34,14 @@ function invertForPrivateKeyName (filepath) {
 
 function keyValuesSync (filepath, opts = {}) {
   let keysFilepath = opts.keysFilepath || null
-  const noVlt = opts.noVlt === true
+  const noArmor = opts.noArmor === true
   const names = keyNames(filepath)
   const publicKeyName = names.publicKeyName // DOTENV_PUBLIC_KEY_${ENVIRONMENT}
   let privateKeyName = names.privateKeyName // DOTENV_PRIVATE_KEY_${ENVIRONMENT}
 
   let publicKey = null
   let privateKey = null
+  let privateKeySource = null
 
   // public key: process.env first, then .env*
   publicKey = readProcessKey(publicKeyName)
@@ -70,21 +71,27 @@ function keyValuesSync (filepath, opts = {}) {
     }
   }
 
-  // vlt
-  if (!noVlt && !privateKey && publicKey && publicKey.length > 0) {
-    const vltOptions = { envFilepath: filepath }
+  // armor
+  if (!noArmor && !privateKey && publicKey && publicKey.length > 0) {
+    const armorOptions = { envFilepath: filepath }
     if (opts.noSpinner) {
-      vltOptions.noSpinner = true
+      armorOptions.noSpinner = true
     }
 
-    const kp = vltKeypairSync(publicKey, vltOptions)
+    const kp = armorKeypairSync(publicKey, armorOptions)
     privateKey = kp.privateKey
+    privateKeySource = 'armor'
   }
 
-  return {
+  const result = {
     publicKeyValue: publicKey || null, // important to make sure name is rendered
     privateKeyValue: privateKey || null // important to make sure name is rendered
   }
+  if (privateKeySource) {
+    result.privateKeySource = privateKeySource
+  }
+
+  return result
 }
 
 module.exports = keyValuesSync