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

Compare alias zones content with the one of its parent zone, even if

Browse Source 
there is no changes in the parent zone
This commit is contained in:
Jonathan Leroy
2020-10-31 19:07:34 +01:00
parent a6d8848fad
commit 6b568f5c9d
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
octodns/manager.py
View File

@@ -261,7 +261,8 @@ class Manager(object):
if plan: if plan:
plans.append((target, plan)) plans.append((target, plan))
return plans # Return the zone as it's the desired state
return plans, zone
def sync(self, eligible_zones=[], eligible_sources=[], eligible_targets=[], def sync(self, eligible_zones=[], eligible_sources=[], eligible_targets=[],
dry_run=True, force=False): dry_run=True, force=False):
@@ -281,7 +282,8 @@ class Manager(object):
source_zone = config['alias'] source_zone = config['alias']
# Check that the source zone is defined. # Check that the source zone is defined.
if source_zone not in self.config['zones']: if source_zone not in self.config['zones']:
self.log.exception('Invalid alias zone') self.log.error('Invalid alias zone {}, target {} does '
'not exist'.format(zone_name, source_zone))
raise ManagerException('Invalid alias zone {}: ' raise ManagerException('Invalid alias zone {}: '
'source zone {} does not exist' 'source zone {} does not exist'
.format(zone_name, source_zone)) .format(zone_name, source_zone))
@@ -348,28 +350,32 @@ class Manager(object):
zone_name, sources, zone_name, sources,
targets, lenient=lenient)) targets, lenient=lenient))
# Wait on all results and unpack/flatten them in to a list of target & # Wait on all results and unpack/flatten the plans and store the
# plan pairs. # desired states in case we need them below
plans = [p for f in futures for p in f.result()] plans = []
desired = {}
for future in futures:
ps, d = future.result()
desired[d.name] = d
for plan in ps:
plans.append(plan)
# Populate aliases zones. # Populate aliases zones.
futures = [] futures = []
for zone_name, zone_source in aliased_zones.items(): for zone_name, zone_source in aliased_zones.items():
plan = [p for t, p in plans if p.desired.name == zone_source]
if not plan:
continue
source_config = self.config['zones'][zone_source] source_config = self.config['zones'][zone_source]
futures.append(self._executor.submit( futures.append(self._executor.submit(
self._populate_and_plan, self._populate_and_plan,
zone_name, zone_name,
[], [],
[self.providers[t] for t in source_config['targets']], [self.providers[t] for t in source_config['targets']],
desired=plan[0].desired, desired=desired[zone_source],
lenient=lenient lenient=lenient
)) ))
plans += [p for f in futures for p in f.result()] # Wait on results and unpack/flatten the plans, ignore the desired here
# as these are aliased zones
plans += [p for f in futures for p in f.result()[0]]
# Best effort sort plans children first so that we create/update # Best effort sort plans children first so that we create/update
# children zones before parents which should allow us to more safely # children zones before parents which should allow us to more safely