tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-29 16:54:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync: ignore null for policy = ignore

Browse Source 
fixes #2657
This commit is contained in:
Thomas Gelf 2022-12-05 19:19:41 +01:00
parent e94ad714fb
commit b19c01daef
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/82-Changelog.md
View File

@ -32,6 +32,7 @@ This version hasn't been released yet
* FEATURE: property modifiers can now be applied based on filters (#2756) * FEATURE: property modifiers can now be applied based on filters (#2756)
* FEATURE: CIDR notation (network ranges) is supported in such filters (#2757) * FEATURE: CIDR notation (network ranges) is supported in such filters (#2757)
* FIX: synchronizing Service (and -Set) Templates has been fixed (#2745, #2217) * FIX: synchronizing Service (and -Set) Templates has been fixed (#2745, #2217)
* FIX: null properties with Sync policy "ignore" are now being ignored (#2657)
### REST API ### REST API
* FIX: Commands give 304 w/o ghost changes for same properties (#2660) * FIX: Commands give 304 w/o ghost changes for same properties (#2660)

52
library/Director/Import/Sync.php
View File

@ -49,6 +49,9 @@ class Sync
/** @var array<mixed, array<int, string>> key => [property, property]*/ /** @var array<mixed, array<int, string>> key => [property, property]*/
protected $setNull = []; protected $setNull = [];
/** @var array<mixed, array<string, mixed>> key => [propertyName, newValue]*/
protected $newProperties = [];
/** @var bool Whether we already prepared your sync */ /** @var bool Whether we already prepared your sync */
protected $isPrepared = false; protected $isPrepared = false;
@ -535,6 +538,15 @@ class Sync
*/ */
protected function prepareNewObject($row, DbObject $object, $objectKey, $sourceId) protected function prepareNewObject($row, DbObject $object, $objectKey, $sourceId)
{ {
if (!isset($this->newProperties[$objectKey])) {
$this->newProperties[$objectKey] = [];
}
// TODO: some more improvements are possible here. First, no need to instantiate
// all new objects, we could stick with the newProperties array. Next, we
// should be more correct when respecting sync property order. Right now,
// a property from another Import Source might win, even if property order
// tells something different. This is a very rare case, but still incorrect.
$properties = &$this->newProperties[$objectKey];
foreach ($this->syncProperties as $propertyKey => $p) { foreach ($this->syncProperties as $propertyKey => $p) {
if ($p->get('source_id') !== $sourceId) { if ($p->get('source_id') !== $sourceId) {
continue; continue;
@ -565,30 +577,28 @@ class Sync
(array) $val (array) $val
); );
} else { } else {
if ($val === null) { $this->setPropertyWithNullLogic($object, $objectKey, $prop, $val, $properties);
$this->setNull[$objectKey][$prop] = $prop;
} else {
unset($this->setNull[$objectKey][$prop]);
$object->vars()->$varName = $val;
}
} }
} else { } else {
if ($val === null) { $this->setPropertyWithNullLogic($object, $objectKey, $prop, $val, $properties);
$this->setNull[$objectKey][$prop] = $prop;
} else {
unset($this->setNull[$objectKey][$prop]);
$object->set($prop, $val);
}
} }
} else { } else {
if ($val === null) { $this->setPropertyWithNullLogic($object, $objectKey, $prop, $val, $properties);
$this->setNull[$objectKey][$prop] = $prop; }
}
}
protected function setPropertyWithNullLogic(DbObject $object, $objectKey, $property, $value, &$allProps)
{
if ($value === null) {
if (! array_key_exists($property, $allProps) || $allProps[$property] === null) {
$this->setNull[$objectKey][$property] = $property;
}
} else { } else {
unset($this->setNull[$objectKey][$prop]); unset($this->setNull[$objectKey][$property]);
$object->set($prop, $val); $object->set($property, $value);
}
}
} }
$allProps[$property] = $value;
} }
/** /**
@ -793,7 +803,11 @@ class Sync
} }
} }
if (isset($this->setNull[$key])) { // Hint: in theory, NULL should be set on new objects, but this has no effect
// anyway, and we also do not store vars.something = null, this would
// instead delete the variable. So here we do not need to check for new
// objects, and skip all null values with update policy = 'ignore'
if ($policy !== 'ignore' && isset($this->setNull[$key])) {
foreach ($this->setNull[$key] as $property) { foreach ($this->setNull[$key] as $property) {
$this->objects[$key]->set($property, null); $this->objects[$key]->set($property, null);
} }