Skip to content

fix(cim_field_report): adopts new PSA tags parser #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2021
Merged

fix(cim_field_report): adopts new PSA tags parser #484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions pytest_splunk_addon/tools/cim_field_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,22 +498,18 @@ def get_addon_eventtypes(addon_path):
parser = AddonParser(addon_path)

eventtypes = {
eventtype: None for eventtype in parser.eventtype_parser.eventtypes.sects
eventtype: [] for eventtype in parser.eventtype_parser.eventtypes.sects
}

stanza_pattern = re.compile("eventtype\s*=\s*(\w+)")
for stanza, section in parser.tags_parser.tags.sects.items():
match = stanza_pattern.match(stanza)
if match and match.groups():
eventtype = match.groups()[0]
if eventtype in eventtypes:
tags = [
key
for key, option in section.options.items()
if option.value.strip() == "enabled"
]
eventtypes[eventtype] = tags
for item in parser.tags_parser.get_tags():
stanza, tag, enabled = item["stanza"], item["tag"], item["enabled"]
parts = [s.strip().strip('"') for s in stanza.split("=", 1)]
if len(parts) > 1 and parts[0] == "eventtype":
eventtype = parts[1]
if enabled and eventtype in eventtypes and tag not in eventtypes[eventtype]:
eventtypes[eventtype].append(tag)

LOGGER.debug(eventtypes)
return eventtypes


Expand Down