Incorrect hosted zone match

[sridhar562345]

Zappa/zappa/core.py

Lines 3197 to 3208 in 9b2a98c

	def get_best_match_zone(all_zones, domain):
	"""Return zone id which name is closer matched with domain name."""
	# Related: https://github.com/Miserlou/Zappa/issues/459
	public_zones = [zone for zone in all_zones["HostedZones"] if not zone["Config"]["PrivateZone"]]
	zones = {zone["Name"][:-1]: zone["Id"] for zone in public_zones if zone["Name"][:-1] in domain}
	if zones:
	keys = max(zones.keys(), key=lambda a: len(a)) # get longest key -- best match.
	return zones[keys]
	else:
	return None

Suppose there are two hosted zones api.in and beta.api.in and domain name specified is some-beta.api.in

The current logic selects hosted beta.api.in as the hosted zone for the specified domain.

[monkut]

What is the expected result?

[sridhar562345]

What is the expected result?

It should select api.in as the best match zone

[monkut]

@sridhar562345 I attempted an improvement PR, can you check it out and let me know if it meets your expectations?

#1193

[sridhar562345]

@monkut

I was actually working on it as well and I guess I have a better logic to verify this.

Here is my logic

@staticmethod
def get_best_match_zone(all_zones, domain):
    """Return zone id which name is closer matched with domain name."""

    # Related: https://github.com/Miserlou/Zappa/issues/459
    public_zones = [zone for zone in all_zones['HostedZones'] if not zone['Config']['PrivateZone']]

    zones = {zone['Name'][:-1]: zone['Id'] for zone in public_zones if zone['Name'][:-1] == domain}

    if not zones:
        zones = {zone['Name'][:-1]: zone['Id'] for zone in public_zones if '.' + zone['Name'][:-1] in domain}

    if zones:
        keys = max(zones.keys(), key=lambda a: len(a))  # get longest key -- best match.
        return zones[keys]
    else:
        return None

[monkut]

Thanks!

[monkut]

released in 0.56.0, closing.