Merge pull request #399 from pixelart/bugfix/route53-overlapping-zones

[Route53] Make a stricter comparison for matching against zone names

dns_scripts/dns_route53.py

@@ -32,7 +32,7 @@ for zone in response['HostedZones']:
         zone_list[zone['Name']] = zone['Id']
 
 for key in sorted(zone_list.iterkeys(), key=len, reverse=True):
-    if key in "{z}.".format(z=fqdn):
+    if ".{z}".format(z=key) in ".{z}.".format(z=fqdn):
        zone_id = zone_list[key]
 
 if zone_id == "":
@@ -84,4 +84,4 @@ if action == 'UPSERT':
             print("Didn't find {f} entry yet, sleeping... ({w}s)".format(f=challenge_fqdn,
                                                                          w=waiting))
             time.sleep(10)
-            pass
+            pass