Merge pull request #867 from 2rs2ts/flexible-route53-hostedzoneid-lookup

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

moto/route53/models.py

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