Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be flexible with Route53 Hosted Zone IDs with /hostedzone/ prefix

Browse Source 
We will continue to store just the unique ID, but since the AWS API
returns /hostedzone/<id>, we should accept attempts to pass that back.
For example, both just the ID as well as /hostedzone/<id> work for
specifying the HostedZoneId of a ResourceRecordSet in CloudFormation. So
we should support that too.

Signed-off-by: Scott Greene <scott.greene@getbraintree.com>
This commit is contained in:
Andrew Garrett 2017-03-14 19:52:36 +00:00 committed by Scott Greene
parent b81e427b99
commit 6346e44c9d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/route53/models.py
View File

@ -277,7 +277,7 @@ class Route53Backend(BaseBackend):
return self.zones.values() return self.zones.values()
def get_hosted_zone(self, id_): def get_hosted_zone(self, id_):
return self.zones.get(id_) return self.zones.get(id_.lstrip("/hostedzone/"))
def get_hosted_zone_by_name(self, name): def get_hosted_zone_by_name(self, name):
for zone in self.get_all_hosted_zones(): for zone in self.get_all_hosted_zones():
@ -285,10 +285,7 @@ class Route53Backend(BaseBackend):
return zone return zone
def delete_hosted_zone(self, id_): def delete_hosted_zone(self, id_):
zone = self.zones.get(id_) return self.zones.pop(id_.lstrip("/hostedzone/"), None)
if zone:
del self.zones[id_]
return zone
def create_health_check(self, health_check_args): def create_health_check(self, health_check_args):
health_check_id = str(uuid.uuid4()) health_check_id = str(uuid.uuid4())