Sync: respect null properties on merge

fixes #2623
Icinga · Oct 7, 2022 · 20c3114 · 20c3114
1 parent cf924a2
commit 20c3114
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/library/Director/Import/Sync.php b/library/Director/Import/Sync.php
@@ -46,6 +46,9 @@ class Sync
     /** @var IcingaObject[] Objects to work with */
     protected $objects;
 
+    /** @var array<mixed, array<int, string>> key => [property, property]*/
+    protected $setNull = [];
+
     /** @var bool Whether we already prepared your sync */
     protected $isPrepared = false;
 
@@ -513,7 +516,7 @@ protected function prepareNewObjects()
                 }
 
                 $object = $objects[$key];
-                $this->prepareNewObject($row, $object, $sourceId);
+                $this->prepareNewObject($row, $object, $key, $sourceId);
             }
         }
 
@@ -527,7 +530,7 @@ protected function prepareNewObjects()
      * @throws \Icinga\Exception\NotFoundError
      * @throws \Icinga\Module\Director\Exception\DuplicateKeyException
      */
-    protected function prepareNewObject($row, DbObject $object, $sourceId)
+    protected function prepareNewObject($row, DbObject $object, $objectKey, $sourceId)
     {
         foreach ($this->syncProperties as $propertyKey => $p) {
             if ($p->get('source_id') !== $sourceId) {
@@ -539,7 +542,6 @@ protected function prepareNewObject($row, DbObject $object, $sourceId)
             }
 
             $prop = $p->get('destination_field');
-
             $val = SyncUtils::fillVariables($p->get('source_expression'), $row);
 
             if ($object instanceof IcingaObject) {
@@ -561,15 +563,23 @@ protected function prepareNewObject($row, DbObject $object, $sourceId)
                             $this->wantArray($val)
                         );
                     } else {
-                        $object->vars()->$varName = $val;
+                        if ($val === null) {
+                            $this->setNull[$objectKey][] = $prop;
+                        } else {
+                            $object->vars()->$varName = $val;
+                        }
                     }
                 } else {
-                    if ($val !== null) {
+                    if ($val === null) {
+                        $this->setNull[$objectKey][] = $prop;
+                    } else {
                         $object->set($prop, $val);
                     }
                 }
             } else {
-                if ($val !== null) {
+                if ($val === null) {
+                    $this->setNull[$objectKey][] = $prop;
+                } else {
                     $object->set($prop, $val);
                 }
             }
@@ -776,6 +786,12 @@ protected function refreshObject($key, $object)
                 }
             }
         }
+
+        if (isset($this->setNull[$key])) {
+            foreach ($this->setNull[$key] as $property) {
+                $this->objects[$key]->set($property, null);
+            }
+        }
     }
 
     /**