From d0197aab15bfb44d5f0a9b5980de156e50e0c00c Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Mon, 7 May 2018 11:23:17 -0700 Subject: [PATCH] Revert "No need to iterate over the hosted zones anymore" This reverts commit e4a70b95f5ca45a805477acc9398bbdecdd62a1d. We will add backward compat route for pre-2.2 cloudrons --- src/dns/route53.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/dns/route53.js b/src/dns/route53.js index 1d1851e8b..fde6f4fbf 100644 --- a/src/dns/route53.js +++ b/src/dns/route53.js @@ -43,9 +43,14 @@ function getZoneByName(dnsConfig, zoneName, callback) { if (error && error.code === 'AccessDenied') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message)); if (error && error.code === 'InvalidClientTokenId') return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message)); if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message)); - if (!result.HostedZones[0]) return callback(new DomainsError(DomainsError.NOT_FOUND, 'no such zone')); - callback(null, result.HostedZones[0]); + var zone = result.HostedZones.filter(function (zone) { + return zone.Name.slice(0, -1) === zoneName; // aws zone name contains a '.' at the end + })[0]; + + if (!zone) return callback(new DomainsError(DomainsError.NOT_FOUND, 'no such zone')); + + callback(null, zone); }); }