Skip to content

Commit

Permalink
fix: limit concurrency to avoid Azure AD rate limiting (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielfsousa committed Oct 4, 2019
1 parent e5f1349 commit c5b2aeb
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 17 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
"@azure/identity": "^1.0.0-preview.3",
"@azure/keyvault-secrets": "^4.0.0-preview.5",
"dotenv": "^8.1.0",
"p-limit": "^2.2.1",
"sync-rpc": "^1.3.6"
}
}
36 changes: 20 additions & 16 deletions src/dotenv-azure.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as fs from 'fs'
import pLimit from 'p-limit'
import dotenv, { DotenvParseOptions } from 'dotenv'
import { ManagedIdentityCredential, ClientSecretCredential } from '@azure/identity'
import { SecretsClient } from '@azure/keyvault-secrets'
Expand Down Expand Up @@ -107,7 +108,7 @@ export default class DotenvAzure {
{} as VariablesObject
)
}

console.log('appconfig', vars)
return vars
}

Expand All @@ -116,22 +117,25 @@ export default class DotenvAzure {
vars: VariablesObject
): Promise<VariablesObject> {
const secrets: VariablesObject = {}
// limit requests to avoid Azure AD rate limiting
const limit = pLimit(2)

const getSecret = async (key: string, value: string): Promise<void> => {
const keyVaultUrl = testIfValueIsVaultSecret(value)
if (!keyVaultUrl) return

const [, , secretName, secretVersion] = keyVaultUrl.pathname.split('/')
if (!secretName || !secretVersion) {
throw new InvalidKeyVaultUrlError(key.replace('kv:', ''))
}

const keyVaultClient = this.getKeyVaultClient(credentials, keyVaultUrl.origin)
const response = await keyVaultClient.getSecret(secretName, { version: secretVersion })
secrets[key] = response.value || ''
console.log('kv', secretName, response.value)
}

await Promise.all(
Object.entries(vars).map(async ([key, value]) => {
const keyVaultUrl = testIfValueIsVaultSecret(value)
if (!keyVaultUrl) return

const [, , secretName, secretVersion] = keyVaultUrl.pathname.split('/')
if (!secretName || !secretVersion) {
throw new InvalidKeyVaultUrlError(key.replace('kv:', ''))
}

const keyVaultClient = this.getKeyVaultClient(credentials, keyVaultUrl.origin)
const response = await keyVaultClient.getSecret(secretName, { version: secretVersion })
secrets[key] = response.value || ''
})
)
await Promise.all(Object.entries(vars).map(([key, val]) => limit(() => getSecret(key, val))))

return secrets
}
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6089,7 +6089,7 @@ p-limit@^1.1.0:
dependencies:
p-try "^1.0.0"

p-limit@^2.0.0, p-limit@^2.2.0:
p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
Expand Down

0 comments on commit c5b2aeb

Please sign in to comment.