Merge branch 'branches/rudder/6.2' into branches/rudder/7.0

ncharles · Apr 12, 2022 · d92e6f2 · d92e6f2
2 parents 9d29df1 + c37822d
commit d92e6f2
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...on/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala b/...on/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala
@@ -1181,13 +1181,14 @@ class FusionInventoryParser(
   }
 
   def processEnvironmentVariable(ev : NodeSeq) : Option[EnvironmentVariable] = {
-    optText(ev\"KEY")  match {
-    case None =>
-      InventoryProcessingLogger.logEffect.debug("Ignoring entry Envs because tag KEY is empty")
-      InventoryProcessingLogger.logEffect.debug(ev.toString())
-      None
-    case Some(key) =>
-      Some (
+    // we need to keep the key exactly as it is, see https://issues.rudder.io/issues/20984
+    (ev\"KEY").text match {
+      case null | "" =>
+        InventoryProcessingLogger.logEffect.debug("Ignoring entry Envs because tag KEY is empty")
+        InventoryProcessingLogger.logEffect.debug(ev.toString())
+        None
+      case key => // even accept only blank key, if the OS accepted it
+        Some (
           EnvironmentVariable (
               name = key
               , value = optText(ev\"VAL")