slawek/azure-acme-provisioner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: allow only keyvault name instead of full url.

Browse Source
This commit is contained in:
Sławek Koszewski
2026-05-22 12:17:58 +02:00
parent dea2775dc0
commit 712db1710c
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "azure-acme-provisioner", "name": "azure-acme-provisioner",
"version": "0.4.1", "version": "0.4.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "azure-acme-provisioner", "name": "azure-acme-provisioner",
"version": "0.4.1", "version": "0.4.2",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@azure/arm-authorization": "^9.0.0", "@azure/arm-authorization": "^9.0.0",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "azure-acme-provisioner", "name": "azure-acme-provisioner",
"version": "0.4.1", "version": "0.4.2",
"author": { "author": {
"name": "Sławomir Koszewski", "name": "Sławomir Koszewski",
"url": "https://github.com/skoszewski" "url": "https://github.com/skoszewski"
src/cli.ts
+4 -1
View File
@@ -34,11 +34,14 @@ function applyOverrides(options: Record<string, unknown>): void {
if (options['renewalThreshold']) process.env['ACME_RENEWAL_THRESHOLD_DAYS'] = String(options['renewalThreshold']); if (options['renewalThreshold']) process.env['ACME_RENEWAL_THRESHOLD_DAYS'] = String(options['renewalThreshold']);
if (options['logLevel']) process.env['ACME_LOG_LEVEL'] = String(options['logLevel']); if (options['logLevel']) process.env['ACME_LOG_LEVEL'] = String(options['logLevel']);
if (options['http']) process.env['ACME_HTTP_PORT'] = String(options['http']); if (options['http']) process.env['ACME_HTTP_PORT'] = String(options['http']);
if (options['keyvaultName'] && !options['keyvaultUrl'])
process.env['ACME_KEYVAULT_URL'] = `https://${options['keyvaultName']}.vault.azure.net`;
} }
const sharedOptions = (cmd: Command): Command => const sharedOptions = (cmd: Command): Command =>
cmd cmd
.option('--keyvault-url <url>', 'Azure KeyVault URL') .option('--keyvault-name <name>', 'Azure KeyVault name (constructs https://<name>.vault.azure.net)')
.option('--keyvault-url <url>', 'Azure KeyVault URL (overrides --keyvault-name; use for sovereign clouds)')
.option('--keyvault-resource-group <rg>', 'Resource group containing the Key Vault') .option('--keyvault-resource-group <rg>', 'Resource group containing the Key Vault')
.option('--subscription-id <id>', 'Azure subscription ID') .option('--subscription-id <id>', 'Azure subscription ID')
.option('--resource-group <rg>', 'Resource group to scan (repeatable)', collect, []) .option('--resource-group <rg>', 'Resource group to scan (repeatable)', collect, [])
src/lib/config.ts
+4 -1
View File
@@ -48,7 +48,10 @@ export function loadConfig(): Config {
} }
return { return {
keyVaultUrl: process.env['ACME_KEYVAULT_URL'], keyVaultUrl: process.env['ACME_KEYVAULT_URL'] ??
(process.env['ACME_KEYVAULT_NAME']
? `https://${process.env['ACME_KEYVAULT_NAME']}.vault.azure.net`
: undefined),
acmeDirectoryUrl: optionalEnv( acmeDirectoryUrl: optionalEnv(
'ACME_DIRECTORY_URL', 'ACME_DIRECTORY_URL',
'https://acme-v02.api.letsencrypt.org/directory' 'https://acme-v02.api.letsencrypt.org/directory'