fix: don't redact ls_systemd_units to avoid issue#3858 (#3870)

Signed-off-by: Xiangce Liu <[email protected]>
RedHatInsights · Aug 3, 2023 · 0c47aef · 0c47aef
1 parent 2e8b122
commit 0c47aef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/insights/client/data_collector.py b/insights/client/data_collector.py
@@ -458,7 +458,8 @@ def redact(self, rm_conf):
                             'etc/insights-client/machine-id',
                             'etc/insights-client/.exp.sed',  # INSPEC-414
                             'etc/machine-id',
-                            'insights_commands/subscription-manager_identity'
+                            'insights_commands/subscription-manager_identity',
+                            'insights_commands/ls_-lanRL_.etc.systemd_.run.systemd_.usr.lib.systemd_.usr.local.lib.systemd_.usr.local.share.systemd_.usr.share.systemd',  # issue #3858
                         )
                 )):
                     # do not redact the ID files

diff --git a/insights/specs/insights_archive.py b/insights/specs/insights_archive.py
@@ -131,7 +131,10 @@ class InsightsArchiveSpecs(Specs):
     ls_osroot = simple_file("insights_commands/ls_-lan")
     ls_R_var_lib_nova_instances = simple_file("insights_commands/ls_-laR_.var.lib.nova.instances")
     ls_sys_firmware = simple_file("insights_commands/ls_-lanR_.sys.firmware")
-    ls_systemd_units = simple_file("insights_commands/ls_-lanRL_.etc.systemd_.run.systemd_.usr.lib.systemd_.usr.local.lib.systemd")
+    ls_systemd_units = first_file([
+        "insights_commands/ls_-lanRL_.etc.systemd_.run.systemd_.usr.lib.systemd_.usr.local.lib.systemd_.usr.local.share.systemd_.usr.share.systemd",
+        "insights_commands/ls_-lanRL_.etc.systemd_.run.systemd_.usr.lib.systemd_.usr.local.lib.systemd"
+    ])
     ls_tmp = simple_file("insights_commands/ls_-la_.tmp")
     ls_usr_bin = simple_file("insights_commands/ls_-lan_.usr.bin")
     ls_usr_lib64 = simple_file("insights_commands/ls_-lan_.usr.lib64")