Skip to content
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

Jump to bottom

Bug fix: When opening subreports it throws index error #3775

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Bug fix: When opening subreports it throws index error #3775

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d52426
bug fix voor subreports
Rieven Oct 31, 2024
54b4f3f
Merge branch 'main' into fix/subreports-missing-input-data
Rieven Oct 31, 2024
ada2162
fix test
Rieven Oct 31, 2024
60d674b
Merge branch 'main' into fix/subreports-missing-input-data
Rieven Nov 4, 2024
d39460f
Merge branch 'main' into fix/subreports-missing-input-data
Rieven Nov 4, 2024
204a305
fix test
Rieven Nov 5, 2024
52fce58
Merge branch 'fix/subreports-missing-input-data' of github.com:minvws…
Rieven Nov 5, 2024
7a91475
Merge branch 'main' into fix/subreports-missing-input-data
Rieven Nov 11, 2024
dd41e65
Merge branch 'main' into fix/subreports-missing-input-data
Rieven Nov 13, 2024
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
2 changes: 1 addition & 1 deletion rocky/reports/views/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def save_report_data(
]

child_input_data = {
"input_data": {"input_oois": [ooi], "report_types": [report_type_id], "plugins": [child_plugins]}
"input_data": {"input_oois": [ooi], "report_types": [report_type_id], "plugins": child_plugins}
}

raw_id = bytes_client.upload_raw(
Expand Down
14 changes: 5 additions & 9 deletions rocky/tests/integration/test_report_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def test_run_report_task(octopoes_api_connector: OctopoesAPIConnector, report_ru
"input_data": {
"input_oois": ["Hostname|test|example.com", "Hostname|test|a.example.com"],
"report_types": ["dns-report"],
"plugins": {"required": {"dns-sec", "dns-records"}, "optional": ["dns-zone"]},
"plugins": {"required": {"dns-sec", "dns-records"}, "optional": {"dns-zone"}},
}
}

Expand All @@ -56,7 +56,7 @@ def test_run_report_task(octopoes_api_connector: OctopoesAPIConnector, report_ru
"input_data": {
"input_oois": ["Hostname|test|example.com"],
"report_types": ["dns-report"],
"plugins": [{"required": {"dns-sec", "dns-records"}, "optional": ["dns-zone"]}],
"plugins": {"required": {"dns-sec", "dns-records"}, "optional": {"dns-zone"}},
},
},
{
Expand All @@ -69,19 +69,15 @@ def test_run_report_task(octopoes_api_connector: OctopoesAPIConnector, report_ru
"input_data": {
"input_oois": ["Hostname|test|a.example.com"],
"report_types": ["dns-report"],
"plugins": [{"required": {"dns-sec", "dns-records"}, "optional": ["dns-zone"]}],
"plugins": {"required": {"dns-sec", "dns-records"}, "optional": {"dns-zone"}},
},
},
]

data_1 = json.loads(report_runner.bytes_client.upload_raw.mock_calls[1].kwargs["raw"])
data_1["input_data"]["plugins"][0]["required"] = set(
data_1["input_data"]["plugins"][0]["required"]
) # ordering issues
data_1["input_data"]["plugins"]["required"] = set(data_1["input_data"]["plugins"]["required"]) # ordering issues
data_2 = json.loads(report_runner.bytes_client.upload_raw.mock_calls[2].kwargs["raw"])
data_2["input_data"]["plugins"][0]["required"] = set(
data_2["input_data"]["plugins"][0]["required"]
) # ordering issues
data_2["input_data"]["plugins"]["required"] = set(data_2["input_data"]["plugins"]["required"]) # ordering issues

assert data_1 in both_calls
assert data_2 in both_calls
Expand Down
Loading