mirror of
https://github.com/github/octodns.git
synced 2024-05-11 05:55:00 +00:00
Merge branch 'master' into route53-hosted-zone-id
This commit is contained in:
@@ -14,8 +14,6 @@ from uuid import uuid4
|
||||
import logging
|
||||
import re
|
||||
|
||||
from six import text_type
|
||||
|
||||
from ..equality import EqualityTupleMixin
|
||||
from ..record import Record, Update
|
||||
from ..record.geo import GeoCodes
|
||||
@@ -1095,8 +1093,8 @@ class Route53Provider(BaseProvider):
|
||||
# for equivalence.
|
||||
# E.g 2001:4860:4860:0:0:0:0:8842 -> 2001:4860:4860::8842
|
||||
if value:
|
||||
value = ip_address(text_type(value))
|
||||
config_ip_address = ip_address(text_type(config['IPAddress']))
|
||||
value = ip_address(str(value))
|
||||
config_ip_address = ip_address(str(config['IPAddress']))
|
||||
else:
|
||||
# No value so give this a None to match value's
|
||||
config_ip_address = None
|
||||
@@ -1121,7 +1119,7 @@ class Route53Provider(BaseProvider):
|
||||
fqdn, record._type, value)
|
||||
|
||||
try:
|
||||
ip_address(text_type(value))
|
||||
ip_address(str(value))
|
||||
# We're working with an IP, host is the Host header
|
||||
healthcheck_host = record.healthcheck_host(value=value)
|
||||
except (AddressValueError, ValueError):
|
||||
|
||||
Reference in New Issue
Block a user