diff --git a/package-lock.json b/package-lock.json index e62af53..2dea93a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "azure-acme-provisioner", - "version": "0.2.0", + "version": "0.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "azure-acme-provisioner", - "version": "0.2.0", + "version": "0.3.4", "license": "MIT", "dependencies": { "@azure/arm-dns": "^5.1.0", diff --git a/package.json b/package.json index 273a9dc..3953264 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "azure-acme-provisioner", - "version": "0.3.3", + "version": "0.3.4", "author": { "name": "Sławomir Koszewski", "url": "https://github.com/skoszewski" diff --git a/src/lib/dns.ts b/src/lib/dns.ts index 1f893e8..01475ff 100644 --- a/src/lib/dns.ts +++ b/src/lib/dns.ts @@ -25,18 +25,20 @@ export async function scanDnsZones( if (!zone.name) continue; if (config.dnsZones && !config.dnsZones.includes(zone.name)) continue; + const zoneName = zone.name; + if (isAcmeTagged(zone.tags)) { - addDomain(results, seen, zone.name, rg, false); - addDomain(results, seen, `*.${zone.name}`, rg, true); + addDomain(results, seen, zoneName, rg, false); + addDomain(results, seen, `*.${zoneName}`, rg, true); } - for (const recordType of ['A', 'AAAA', 'CNAME'] as const) { - for await (const record of client.recordSets.listByType(rg, zone.name, recordType)) { - if (!record.name) continue; - if (!isAcmeTagged(record.metadata)) continue; - const fqdn = record.name === '@' ? zone.name : `${record.name}.${zone.name}`; - addDomain(results, seen, fqdn, rg, false); - } + for await (const record of client.recordSets.listByDnsZone(rg, zoneName)) { + if (!record.name) continue; + if (!isAcmeTagged(record.metadata)) continue; + const recordType = record.type?.split('/').pop(); + if (recordType !== 'A' && recordType !== 'AAAA' && recordType !== 'CNAME') continue; + const fqdn = record.name === '@' ? zoneName : `${record.name}.${zoneName}`; + addDomain(results, seen, fqdn, rg, false); } } }