diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py index 67c8202..c740516 100755 --- a/code/ddns-lambda.py +++ b/code/ddns-lambda.py @@ -73,7 +73,7 @@ LOGGER = logging.getLogger() account_id = None region = None -VERSION = '1.2.0b42' +VERSION = '1.2.0b43' # Read Env variables DEBUG_LOG_LEVEL = os.environ.get('DebugLogLevel', 'INFO') @@ -494,21 +494,21 @@ def lambda_handler( return caller_response # These are collections of zones in Route 53. - hosted_zones = new_list_hosted_zones(route53, instance_id) - LOGGER.debug("hosted_zones for vpc_id %s: %s", vpc_id, str(hosted_zones) + lineno()) +## hosted_zones = new_list_hosted_zones(route53, instance_id) +## LOGGER.debug("hosted_zones for vpc_id %s: %s", vpc_id, str(hosted_zones) + lineno()) hosted_zones_by_vpc = new_list_hosted_zones_by_vpc( route53, instance_id, vpc_id, region) LOGGER.debug("hosted_zones_by_vpc for vpc_id %s: %s", vpc_id, str(hosted_zones_by_vpc) + lineno()) - private_hosted_zones = get_private_hosted_zones(hosted_zones) - LOGGER.debug("private_hosted_zones: %s", str(list(private_hosted_zones)) + lineno()) +## private_hosted_zones = get_private_hosted_zones(hosted_zones) +## LOGGER.debug("private_hosted_zones: %s", str(list(private_hosted_zones)) + lineno()) private_hosted_zones_by_vpc = get_private_hosted_zones_by_vpc(hosted_zones_by_vpc) LOGGER.debug("private_hosted_zones_by_vpc: vpc_id: %s, %s", vpc_id, str(list(private_hosted_zones)) + lineno()) - private_hosted_zone_collection = get_private_hosted_zone_collection( - private_hosted_zones) - LOGGER.debug("private_hosted_zone_collection: %s", - str(list(private_hosted_zone_collection)) + lineno()) +# private_hosted_zone_collection = get_private_hosted_zone_collection( +# private_hosted_zones) +# LOGGER.debug("private_hosted_zone_collection: %s", +# str(list(private_hosted_zone_collection)) + lineno()) private_hosted_zone_collection_by_vpc = get_private_hosted_zone_collection_by_vpc( private_hosted_zones_by_vpc) LOGGER.debug("private_hosted_zone_collection_by_vpc: %s", @@ -1721,15 +1721,16 @@ def new_get_resource_record(oclient, instance_id, zone_id, host_name, hosted_zon LOGGER.debug("Getting %s record type for %s", record_type, host_name + lineno()) - if host_name[-1] != '.': - host_name = host_name + '.' +# if host_name[-1] != '.': +# host_name = host_name + '.' LOGGER.debug("list_resource_record_sets looking for record %s in zone %s", str(host_name), str(hosted_zone_name) + lineno()) response = client.list_resource_record_sets( HostedZoneId=zone_id, - StartRecordName=host_name + hosted_zone_name, + # StartRecordName=host_name + hosted_zone_name, + StartRecordName=create_fqdn(host_name, hosted_zone_name), StartRecordType=record_type, MaxItems='1') diff --git a/code/ddns-lambda.zip b/code/ddns-lambda.zip index 1c7cc60..31cad7b 100644 Binary files a/code/ddns-lambda.zip and b/code/ddns-lambda.zip differ