@dotenvx/dotenvx 1.69.2 → 1.71.0

package/src/lib/services/keypair.js

@@ -5,10 +5,10 @@ const {
 } = require('./../helpers/keyResolution')
 
 class Keypair {
-  constructor (envFile = '.env', envKeysFilepath = null, noVlt = false) {
+  constructor (envFile = '.env', envKeysFilepath = null, noArmor = false) {
     this.envFile = envFile
     this.envKeysFilepath = envKeysFilepath
-    this.noVlt = noVlt
+    this.noArmor = noArmor
   }
 
   runSync () {
@@ -17,7 +17,7 @@ class Keypair {
     const filepaths = this._filepaths()
     for (const filepath of filepaths) {
       const { publicKeyName, privateKeyName } = keyNames(filepath)
-      const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, { keysFilepath: this.envKeysFilepath, noVlt: this.noVlt })
+      const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
 
       out[publicKeyName] = publicKeyValue
       out[privateKeyName] = privateKeyValue
@@ -32,7 +32,7 @@ class Keypair {
     const filepaths = this._filepaths()
     for (const filepath of filepaths) {
       const { publicKeyName, privateKeyName } = keyNames(filepath)
-      const { publicKeyValue, privateKeyValue } = await keyValues(filepath, { keysFilepath: this.envKeysFilepath, noVlt: this.noVlt })
+      const { publicKeyValue, privateKeyValue } = await keyValues(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
 
       out[publicKeyName] = publicKeyValue
       out[privateKeyName] = privateKeyValue

package/src/lib/services/rotate.js

@@ -16,7 +16,7 @@ const {
 } = require('./../helpers/keyResolution')
 
 const {
-  vltKeypair,
+  armorKeypair,
   localKeypair,
   encryptValue,
   decryptKeyValue,
@@ -29,12 +29,12 @@ const dotenvParse = require('./../helpers/dotenvParse')
 const detectEncoding = require('./../helpers/detectEncoding')
 
 class Rotate {
-  constructor (envs = [], key = [], excludeKey = [], envKeysFilepath = null, noVlt = false) {
+  constructor (envs = [], key = [], excludeKey = [], envKeysFilepath = null, noArmor = false) {
     this.envs = determine(envs, process.env)
     this.key = key
     this.excludeKey = excludeKey
     this.envKeysFilepath = envKeysFilepath
-    this.noVlt = noVlt
+    this.noArmor = noArmor
 
     this.processedEnvs = []
     this.changedFilepaths = new Set()
@@ -83,15 +83,15 @@ class Rotate {
       const envParsed = dotenvParse(envSrc, false, false, true)
 
       const { publicKeyName, privateKeyName } = keyNames(envFilepath)
-      const { privateKeyValue } = await keyValues(envFilepath, { keysFilepath: this.envKeysFilepath, noVlt: this.noVlt })
+      const { privateKeyValue } = await keyValues(envFilepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
 
       let newPublicKey
       let newPrivateKey
       let envKeysFilepath
       let envKeysSrc
 
-      if (!this.noVlt) {
-        const kp = await vltKeypair()
+      if (!this.noArmor) {
+        const kp = await armorKeypair()
         newPublicKey = kp.publicKey
         newPrivateKey = kp.privateKey
 
@@ -146,8 +146,8 @@ class Rotate {
       row.privateKeyName = privateKeyName
       row.privateKey = newPrivateKey
 
-      if (this.noVlt) {
-        // keys src only for vlt
+      if (this.noArmor) {
+        // keys src only for local key storage
         envKeysSrc = append(envKeysSrc, privateKeyName, newPrivateKey) // append privateKey
         this.envKeysSources[envKeysFilepath] = envKeysSrc
         row.envKeysSrc = envKeysSrc
@@ -158,7 +158,7 @@ class Rotate {
       if (e.code === 'ENOENT') {
         const missingPath = e.path ? path.resolve(e.path) : null
         const expectedEnvKeysPath = row.envKeysFilepath ? path.resolve(row.envKeysFilepath) : null
-        if (this.noVlt && expectedEnvKeysPath && missingPath === expectedEnvKeysPath) {
+        if (this.noArmor && expectedEnvKeysPath && missingPath === expectedEnvKeysPath) {
           row.error = new Errors({ envKeysFilepath: row.envKeysFilepath }).missingEnvKeysFile()
         } else {
           row.error = new Errors({ envFilepath, filepath }).missingEnvFile()

package/src/lib/services/run.js

@@ -17,13 +17,14 @@ const {
 } = require('./../helpers/keyResolution')
 
 class Run {
-  constructor (envs = [], overload = false, processEnv = process.env, envKeysFilepath = null, noVlt = false, options = {}) {
+  constructor (envs = [], overload = false, processEnv = process.env, envKeysFilepath = null, noArmor = false, options = {}) {
     this.envs = envs
     this.overload = overload
     this.processEnv = processEnv
     this.envKeysFilepath = envKeysFilepath
-    this.noVlt = noVlt
+    this.noArmor = noArmor
     this.noSpinner = options.noSpinner
+    this.token = options.token
     this.keypairHooks = options.keypairHooks
 
     this.processedEnvs = []
@@ -95,7 +96,7 @@ class Run {
         privateKeyName: resolvedPrivateKeyName,
         privateKeyValue,
         privateKeySource
-      } = keyValuesFromEnvSrc(env, privateKeyName, { keysFilepath: this.envKeysFilepath, noVlt: this.noVlt, processEnv: this.processEnv })
+      } = keyValuesFromEnvSrc(env, privateKeyName, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor, processEnv: this.processEnv, token: this.token })
 
       const {
         parsed,
@@ -108,7 +109,7 @@ class Run {
       row.privateKey = privateKeyValue
       if (privateKeySource) {
         row.privateKeySource = privateKeySource
-        row.armoredPrivateKeyUsed = privateKeySource === 'vlt'
+        row.armoredPrivateKeyUsed = privateKeySource === 'armor'
       }
       row.parsed = parsed
       row.errors = errors
@@ -143,8 +144,9 @@ class Run {
       const { privateKeyName } = keyNames(filepath)
       const { privateKeyValue, privateKeySource } = keyValuesSync(filepath, {
         keysFilepath: this.envKeysFilepath,
-        noVlt: this.noVlt,
-        noSpinner: this.noSpinner
+        noArmor: this.noArmor,
+        noSpinner: this.noSpinner,
+        token: this.token
       })
 
       const {
@@ -158,7 +160,7 @@ class Run {
       row.privateKey = privateKeyValue
       if (privateKeySource) {
         row.privateKeySource = privateKeySource
-        row.armoredPrivateKeyUsed = privateKeySource === 'vlt'
+        row.armoredPrivateKeyUsed = privateKeySource === 'armor'
       }
       row.src = src
       row.parsed = parsed
@@ -196,7 +198,8 @@ class Run {
       const { privateKeyName } = keyNames(filepath)
       const { privateKeyValue, privateKeySource } = await keyValues(filepath, {
         keysFilepath: this.envKeysFilepath,
-        noVlt: this.noVlt,
+        noArmor: this.noArmor,
+        token: this.token,
         keypairHooks: this.keypairHooks
       })
 
@@ -211,7 +214,7 @@ class Run {
       row.privateKey = privateKeyValue
       if (privateKeySource) {
         row.privateKeySource = privateKeySource
-        row.armoredPrivateKeyUsed = privateKeySource === 'vlt'
+        row.armoredPrivateKeyUsed = privateKeySource === 'armor'
       }
       row.src = src
       row.parsed = parsed

package/src/lib/services/sets.js

@@ -34,13 +34,13 @@ function allValuesForKey (envSrc, key) {
 }
 
 class Sets {
-  constructor (key, value, envs = [], encrypt = true, envKeysFilepath = null, noVlt = false, noCreate = false) {
+  constructor (key, value, envs = [], encrypt = true, envKeysFilepath = null, noArmor = false, noCreate = false) {
     this.envs = determine(envs, process.env)
     this.key = key
     this.value = value
     this.encrypt = encrypt
     this.envKeysFilepath = envKeysFilepath
-    this.noVlt = noVlt
+    this.noArmor = noArmor
     this.noCreate = noCreate
 
     this.processedEnvs = []
@@ -131,11 +131,11 @@ class Sets {
         let privateKey
 
         const { publicKeyName, privateKeyName } = keyNames(filepath)
-        const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, { keysFilepath: this.envKeysFilepath, noVlt: this.noVlt })
+        const { publicKeyValue, privateKeyValue } = keyValuesSync(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
 
         // first pass - provisionSync
         if (!privateKeyValue && !publicKeyValue) {
-          const prov = provisionSync({ envSrc, envFilepath, keysFilepath: this.envKeysFilepath, noVlt: this.noVlt })
+          const prov = provisionSync({ envSrc, envFilepath, keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
           envSrc = prov.envSrc
           publicKey = prov.publicKey
           privateKey = prov.privateKey
@@ -238,11 +238,11 @@ class Sets {
         let privateKey
 
         const { publicKeyName, privateKeyName } = keyNames(filepath)
-        const { publicKeyValue, privateKeyValue } = await keyValues(filepath, { keysFilepath: this.envKeysFilepath, noVlt: this.noVlt })
+        const { publicKeyValue, privateKeyValue } = await keyValues(filepath, { keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
 
         // first pass - provision
         if (!privateKeyValue && !publicKeyValue) {
-          const prov = await provision({ envSrc, envFilepath, keysFilepath: this.envKeysFilepath, noVlt: this.noVlt })
+          const prov = await provision({ envSrc, envFilepath, keysFilepath: this.envKeysFilepath, noArmor: this.noArmor })
           envSrc = prov.envSrc
           publicKey = prov.publicKey
           privateKey = prov.privateKey

package/src/cli/actions/normalizeVltOptions.js

@@ -1,10 +0,0 @@
-function normalizeVltOptions (options) {
-  if (options.ops === false || options.vlt === false) {
-    options.ops = false
-    options.vlt = false
-  }
-
-  return options
-}
-
-module.exports = normalizeVltOptions

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

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