private zone handling is broken

[csrl]

route53-transfer-ng/route53_transfer/app.py

Lines 105 to 109 in 58878d8

	# TODO validate
	z_vpc_id = z.get('HostedZone', {}) \
	.get('VPCs', {}) \
	.get('VPC', {}) \
	.get('VPCId', '')

The actual response contains (amongst other fields):

{'HostedZone': {'Id': '/hostedzone/ASDFASDFASDF', 'Name': 'asdfasdf.', 'Config': {'Comment': 'Internal domains', 'PrivateZone': True}, 'ResourceRecordSetCount': 56}, 'VPCs': [{'VPCRegion': 'us-east-1', 'VPCId': 'vpc-asdf1'}, {'VPCRegion': 'us-west-1', 'VPCId': 'vpc-asdf2'}, {'VPCRegion': 'us-west-1', 'VPCId': 'vpc-asdf3'}, {'VPCRegion': 'us-west-2', 'VPCId': 'vpc-asdf4'}]}

As such, it should iterate for each returned VPC in the list, something like:

    for v in z.get('VPCs', []):
        if requested_vpc_id and v['VPCId'] == requested_vpc_id:
            return data

[csrl]

    paginator = r53_client.get_paginator('list_hosted_zones')
    hosted_zones = []

    for page in paginator.paginate():
        hosted_zones.extend(page['HostedZones'])

    requested_vpc_id = vpc.get('id') if vpc else None
    matching_zones = []

    for zone in hosted_zones:
        if zone['Name'] != zone_name + '.':
            continue

        is_private = zone['Config']['PrivateZone']
        if not requested_vpc_id or is_private:
            matching_zones.append(zone)

    for zone in matching_zones:
        data = {
            'id': zone.get('Id', '').replace('/hostedzone/', ''),
            'name': zone.get('Name'),
        }

        if not requested_vpc_id:
            return data
        else:
            zone_id = data.get('id')
            z = r53_client.get_hosted_zone(Id=zone_id)
            for v in z.get('VPCs', []):
                if v['VPCId'] == requested_vpc_id:
                    return data
    else:
        return None