fixup! Fix: Rebooting GitLab may trigger ClamAV alarm (#6114)

DataBiosphere · Jul 19, 2024 · 7f5a8b9 · 7f5a8b9
1 parent 39c4aa4
commit 7f5a8b9
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/terraform/shared/shared.tf.json.template.py b/terraform/shared/shared.tf.json.template.py
@@ -514,12 +514,14 @@ def conformance_pack(name: str) -> str:
                     # hours without matching a successful scan. To prevent this
                     # from triggering false positive alarms, we include a
                     # sub-pattern to also match successful power-offs & reboots.
-                    *(
-                        (s,
-                         ' ?"systemd: Starting '.join([f'?"{s} succeeded"', 'Reboot"', 'Power-Off"']))
-                        for s in ('clamscan', 'freshclam')
-                    ),
-                    ('clam_fail', '?"clamscan failed" ?"freshclam failed"'),
+                    ('clamscan', '?"clamscan succeeded" '
+                                 '?"systemd: Starting Reboot" '
+                                 '?"systemd: Starting Power-Off"'),
+                    ('freshclam', '?"freshclam succeeded" '
+                                  '?"systemd: Starting Reboot" '
+                                  '?"systemd: Starting Power-Off"'),
+                    ('clam_fail', '?"clamscan failed" '
+                                  '?"freshclam failed"')
                 ]
             }
         },