mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Use null/empty instead of garbage values to invalidate broken dynamic records

Browse Source
This commit is contained in:
Viranch Mehta
2021-10-21 13:24:45 -07:00
parent 6d4461e6d9
commit 5b93048e07
2 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
octodns/provider/azuredns.py
View File

@@ -650,14 +650,12 @@ class AzureProvider(BaseProvider):
if azrecord.a_records is None: if azrecord.a_records is None:
if azrecord.target_resource.id: if azrecord.target_resource.id:
return self._data_for_dynamic(azrecord) return self._data_for_dynamic(azrecord)
else:
# dynamic record alias is broken, return dummy value and apply # dynamic record alias is broken, return dummy value and apply
# will likely overwrite/fix it # will likely overwrite/fix it
self.log.warn('_data_for_A: Missing Traffic Manager ' self.log.warn('_data_for_A: Missing Traffic Manager alias for '
'alias for dynamic A record %s, forcing ' 'dynamic record %s', azrecord.fqdn)
're-link by setting an invalid value', return {'values': []}
azrecord.fqdn)
return {'values': ['255.255.255.255']}
return {'values': [ar.ipv4_address for ar in azrecord.a_records]} return {'values': [ar.ipv4_address for ar in azrecord.a_records]}
@@ -665,14 +663,12 @@ class AzureProvider(BaseProvider):
if azrecord.aaaa_records is None: if azrecord.aaaa_records is None:
if azrecord.target_resource.id: if azrecord.target_resource.id:
return self._data_for_dynamic(azrecord) return self._data_for_dynamic(azrecord)
else:
# dynamic record alias is broken, return dummy value and apply # dynamic record alias is broken, return dummy value and apply
# will likely overwrite/fix it # will likely overwrite/fix it
self.log.warn('_data_for_AAAA: Missing Traffic Manager ' self.log.warn('_data_for_AAAA: Missing Traffic Manager alias for '
'alias for dynamic AAAA record %s, forcing ' 'dynamic record %s', azrecord.fqdn)
're-link by setting an invalid value', return {'values': []}
azrecord.fqdn)
return {'values': ['::1']}
return {'values': [ar.ipv6_address for ar in azrecord.aaaa_records]} return {'values': [ar.ipv6_address for ar in azrecord.aaaa_records]}
@@ -692,14 +688,12 @@ class AzureProvider(BaseProvider):
if azrecord.cname_record is None: if azrecord.cname_record is None:
if azrecord.target_resource.id: if azrecord.target_resource.id:
return self._data_for_dynamic(azrecord) return self._data_for_dynamic(azrecord)
else:
# dynamic record alias is broken, return dummy value and apply # dynamic record alias is broken, return dummy value and apply
# will likely overwrite/fix it # will likely overwrite/fix it
self.log.warn('_data_for_CNAME: Missing Traffic Manager ' self.log.warn('_data_for_CNAME: Missing Traffic Manager alias for '
'alias for dynamic CNAME record %s, forcing ' 'dynamic record %s', azrecord.fqdn)
're-link by setting an invalid value', return {'value': None}
azrecord.fqdn)
return {'value': 'iam.invalid.'}
return {'value': _check_endswith_dot(azrecord.cname_record.cname)} return {'value': _check_endswith_dot(azrecord.cname_record.cname)}

12
tests/test_octodns_provider_azuredns.py
View File

@@ -1934,8 +1934,8 @@ class TestAzureDnsProvider(TestCase):
ttl=60, target_resource=SubResource(id=None)) ttl=60, target_resource=SubResource(id=None))
azrecord.name = record.name or '@' azrecord.name = record.name or '@'
azrecord.type = f'Microsoft.Network/dnszones/{record._type}' azrecord.type = f'Microsoft.Network/dnszones/{record._type}'
record2 = provider._populate_record(zone, azrecord) record2 = provider._populate_record(zone, azrecord, lenient=True)
self.assertEqual(record2.values, ['255.255.255.255']) self.assertEqual(record2.values, [])
# test that same record gets populated back from traffic managers # test that same record gets populated back from traffic managers
tm_list = provider._tm_client.profiles.list_by_resource_group tm_list = provider._tm_client.profiles.list_by_resource_group
@@ -2016,8 +2016,8 @@ class TestAzureDnsProvider(TestCase):
ttl=60, target_resource=SubResource(id=None)) ttl=60, target_resource=SubResource(id=None))
azrecord.name = record.name or '@' azrecord.name = record.name or '@'
azrecord.type = f'Microsoft.Network/dnszones/{record._type}' azrecord.type = f'Microsoft.Network/dnszones/{record._type}'
record2 = provider._populate_record(zone, azrecord) record2 = provider._populate_record(zone, azrecord, lenient=True)
self.assertEqual(record2.values, ['::1']) self.assertEqual(record2.values, [])
# test that same record gets populated back from traffic managers # test that same record gets populated back from traffic managers
tm_list = provider._tm_client.profiles.list_by_resource_group tm_list = provider._tm_client.profiles.list_by_resource_group
@@ -2259,8 +2259,8 @@ class TestAzureDnsProvider(TestCase):
azrecord.name = record1.name or '@' azrecord.name = record1.name or '@'
azrecord.type = f'Microsoft.Network/dnszones/{record1._type}' azrecord.type = f'Microsoft.Network/dnszones/{record1._type}'
record2 = provider._populate_record(zone, azrecord) record2 = provider._populate_record(zone, azrecord, lenient=True)
self.assertEqual(record2.value, 'iam.invalid.') self.assertIsNone(record2.value)
change = Update(record2, record1) change = Update(record2, record1)
provider._apply_Update(change) provider._apply_Update(change)