fix: Fix additional content merged into json even when not required on partial content

Author: g-bougard

Changes

@@ -25,6 +25,7 @@ inventory:
 * fix #1017: Don't cleanup cpu on win32 from (R) trademark to keep cpu naming
   the same between OS
 * fix #1023: Improve iLO ip address resolution on Windows
+* Fix additional content merged into json even when not required on partial content
 
 remoteinventory:
 * fix RedHat RHN systemid set as WINPRODID

lib/GLPI/Agent/Inventory.pm

@@ -297,10 +297,6 @@ sub getContent {
             itemtype    => empty($self->{_itemtype}) ? "Computer" : $self->{_itemtype},
         );
 
-        # Support json file on additional-content with json output
-        $content->mergeContent(content => delete $self->{_json_merge})
-            if $self->{_json_merge};
-
         # Normalize content to follow inventory format specs from https://github.com/glpi-project/inventory_format
         $content->normalize($params{server_version});
 
@@ -335,11 +331,6 @@ sub mergeContent {
 
     die "no content to merge\n" unless $content;
 
-    if ($self->getFormat() eq 'json') {
-        $self->{_json_merge} = $content;
-        return;
-    }
-
     foreach my $section (keys %$content) {
         if (ref $content->{$section} eq 'ARRAY') {
             # a list of entry

lib/GLPI/Agent/Protocol/Message.pm

@@ -88,15 +88,37 @@ sub set {
 }
 
 sub get {
-    my ($self, $what) = @_;
+    my ($self, $what, $transform, $how) = @_;
 
     return unless defined($self->{_message});
 
-    return $self->{_message}->{$what} if defined($what);
+    if (defined($what)) {
+        return _uppercase_keys($self->{_message}->{$what})
+            if $transform && $how && $transform eq "transform" && $how eq "upperkeys";
+
+        return $self->{_message}->{$what};
+    }
 
     return $self->{_message};
 }
 
+sub _uppercase_keys {
+    my ($ref) = shift;
+
+    if (ref($ref) eq "HASH") {
+        my $newref = {};
+        foreach my $key (keys(%{$ref})) {
+            $newref->{uc($key)} = _uppercase_keys($ref->{$key});
+        }
+        return $newref;
+    } elsif (ref($ref) eq "ARRAY") {
+        return [ map { _uppercase_keys($_) } @{$ref} ];
+    }
+
+    # Not a ref, just return unmodified value
+    return $ref;
+}
+
 sub merge {
     my ($self, %params) = @_;
 

lib/GLPI/Agent/Task/Inventory.pm

@@ -595,7 +595,7 @@ sub _injectContent {
         my $json = GLPI::Agent::Protocol::Message->new(
             file => $file,
         );
-        $content = $json->get('content');
+        $content = $json->get('content', transform => "upperkeys");
         unless ($content) {
             $self->{logger}->error(
                 "failing to import $file file content in the inventory"

t/tasks/esx.t

@@ -138,9 +138,7 @@ foreach my $test (keys %tests) {
     } "$test: set json format";
 
     # Fix version client with the test one to avoid false positive while agent version is evolving
-    $inventory->mergeContent({
-        versionclient => $tests{$test}->{client}
-    });
+    $inventory->{content}->{VERSIONCLIENT} = $tests{$test}->{client};
 
     my $content;
     lives_ok {