From b3183bab2de74e499e4a9ef8ccab35a8dbbd8d08 Mon Sep 17 00:00:00 2001 From: Bob Gendler Date: Mon, 9 May 2022 16:46:33 -0400 Subject: [PATCH] Combine custom tags with original fix --- scripts/generate_scap.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/generate_scap.py b/scripts/generate_scap.py index bea94d6c..3b6b3a98 100755 --- a/scripts/generate_scap.py +++ b/scripts/generate_scap.py @@ -2584,7 +2584,14 @@ def get_rule_yaml(rule_file, custom=False, baseline_name=""): resulting_yaml['customized'] = ["customized references"] except: pass - + elif yaml_field == "tags": + # try to concatenate tags from both original yaml and custom yaml + if og_rule_yaml["tags"] == rule_yaml["tags"]: + #print("using default data in yaml field {}".format("tags")) + resulting_yaml['tags'] = og_rule_yaml['tags'] + else: + #print("Found custom tags... concatenating them") + resulting_yaml['tags'] = og_rule_yaml['tags'] + rule_yaml['tags'] else: try: if og_rule_yaml[yaml_field] == rule_yaml[yaml_field]: