Skip to content

Commit 9bc2890

Browse files
author
GitHub Copilot
committed
scanner: remove redundant section-config loader partial indirections
1 parent 5b13184 commit 9bc2890

1 file changed

Lines changed: 24 additions & 56 deletions

File tree

src/prism/scanner.py

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -861,57 +861,17 @@ def _load_section_display_titles() -> dict[str, str]:
861861
)
862862

863863

864-
_load_fail_on_unconstrained_dynamic_includes_from_section_config = partial(
865-
_load_fail_on_unconstrained_dynamic_includes,
866-
config_filenames=SECTION_CONFIG_FILENAMES,
867-
default_filename=SECTION_CONFIG_FILENAME,
868-
)
869-
870-
871-
_load_fail_on_yaml_like_task_annotations_from_section_config = partial(
872-
_load_fail_on_yaml_like_task_annotations,
873-
config_filenames=SECTION_CONFIG_FILENAMES,
874-
default_filename=SECTION_CONFIG_FILENAME,
875-
)
876-
877-
878-
_load_ignore_unresolved_internal_underscore_references_from_section_config = partial(
879-
_load_ignore_unresolved_internal_underscore_references,
880-
config_filenames=SECTION_CONFIG_FILENAMES,
881-
default_filename=SECTION_CONFIG_FILENAME,
882-
)
883-
884-
885-
_load_non_authoritative_test_evidence_max_file_bytes_from_section_config = partial(
886-
_load_non_authoritative_test_evidence_max_file_bytes,
887-
config_filenames=SECTION_CONFIG_FILENAMES,
888-
default_filename=SECTION_CONFIG_FILENAME,
889-
)
890-
891-
892-
_load_non_authoritative_test_evidence_max_files_scanned_from_section_config = partial(
893-
_load_non_authoritative_test_evidence_max_files_scanned,
894-
config_filenames=SECTION_CONFIG_FILENAMES,
895-
default_filename=SECTION_CONFIG_FILENAME,
896-
)
897-
898-
899-
_load_non_authoritative_test_evidence_max_total_bytes_from_section_config = partial(
900-
_load_non_authoritative_test_evidence_max_total_bytes,
901-
config_filenames=SECTION_CONFIG_FILENAMES,
902-
default_filename=SECTION_CONFIG_FILENAME,
903-
)
904-
905-
906864
def load_fail_on_unconstrained_dynamic_includes(
907865
role_path: str,
908866
config_path: str | None = None,
909867
default: bool = False,
910868
) -> bool:
911-
return _load_fail_on_unconstrained_dynamic_includes_from_section_config(
869+
return _load_fail_on_unconstrained_dynamic_includes(
912870
role_path,
913871
config_path=config_path,
914872
default=default,
873+
config_filenames=SECTION_CONFIG_FILENAMES,
874+
default_filename=SECTION_CONFIG_FILENAME,
915875
)
916876

917877

@@ -920,10 +880,12 @@ def load_fail_on_yaml_like_task_annotations(
920880
config_path: str | None = None,
921881
default: bool = False,
922882
) -> bool:
923-
return _load_fail_on_yaml_like_task_annotations_from_section_config(
883+
return _load_fail_on_yaml_like_task_annotations(
924884
role_path,
925885
config_path=config_path,
926886
default=default,
887+
config_filenames=SECTION_CONFIG_FILENAMES,
888+
default_filename=SECTION_CONFIG_FILENAME,
927889
)
928890

929891

@@ -932,10 +894,12 @@ def load_ignore_unresolved_internal_underscore_references(
932894
config_path: str | None = None,
933895
default: bool = True,
934896
) -> bool:
935-
return _load_ignore_unresolved_internal_underscore_references_from_section_config(
897+
return _load_ignore_unresolved_internal_underscore_references(
936898
role_path,
937899
config_path=config_path,
938900
default=default,
901+
config_filenames=SECTION_CONFIG_FILENAMES,
902+
default_filename=SECTION_CONFIG_FILENAME,
939903
)
940904

941905

@@ -944,10 +908,12 @@ def load_non_authoritative_test_evidence_max_file_bytes(
944908
config_path: str | None = None,
945909
default: int = NON_AUTHORITATIVE_TEST_EVIDENCE_MAX_FILE_BYTES,
946910
) -> int:
947-
return _load_non_authoritative_test_evidence_max_file_bytes_from_section_config(
911+
return _load_non_authoritative_test_evidence_max_file_bytes(
948912
role_path,
949913
config_path=config_path,
950914
default=default,
915+
config_filenames=SECTION_CONFIG_FILENAMES,
916+
default_filename=SECTION_CONFIG_FILENAME,
951917
)
952918

953919

@@ -956,10 +922,12 @@ def load_non_authoritative_test_evidence_max_files_scanned(
956922
config_path: str | None = None,
957923
default: int = NON_AUTHORITATIVE_TEST_EVIDENCE_MAX_FILES_SCANNED,
958924
) -> int:
959-
return _load_non_authoritative_test_evidence_max_files_scanned_from_section_config(
925+
return _load_non_authoritative_test_evidence_max_files_scanned(
960926
role_path,
961927
config_path=config_path,
962928
default=default,
929+
config_filenames=SECTION_CONFIG_FILENAMES,
930+
default_filename=SECTION_CONFIG_FILENAME,
963931
)
964932

965933

@@ -968,10 +936,12 @@ def load_non_authoritative_test_evidence_max_total_bytes(
968936
config_path: str | None = None,
969937
default: int = NON_AUTHORITATIVE_TEST_EVIDENCE_MAX_TOTAL_BYTES,
970938
) -> int:
971-
return _load_non_authoritative_test_evidence_max_total_bytes_from_section_config(
939+
return _load_non_authoritative_test_evidence_max_total_bytes(
972940
role_path,
973941
config_path=config_path,
974942
default=default,
943+
config_filenames=SECTION_CONFIG_FILENAMES,
944+
default_filename=SECTION_CONFIG_FILENAME,
975945
)
976946

977947

@@ -1161,16 +1131,14 @@ def _apply_readme_section_config(
11611131
_apply_unconstrained_dynamic_include_policy = partial(
11621132
_scan_runtime.apply_unconstrained_dynamic_include_policy,
11631133
load_fail_on_unconstrained_dynamic_includes=(
1164-
_load_fail_on_unconstrained_dynamic_includes_from_section_config
1134+
load_fail_on_unconstrained_dynamic_includes
11651135
),
11661136
)
11671137

11681138

11691139
_apply_yaml_like_task_annotation_policy = partial(
11701140
_scan_runtime.apply_yaml_like_task_annotation_policy,
1171-
load_fail_on_yaml_like_task_annotations=(
1172-
_load_fail_on_yaml_like_task_annotations_from_section_config
1173-
),
1141+
load_fail_on_yaml_like_task_annotations=(load_fail_on_yaml_like_task_annotations),
11741142
)
11751143

11761144

@@ -1217,16 +1185,16 @@ def _apply_readme_section_config(
12171185
scan_context_builder_cls=ScanContextBuilder,
12181186
collect_scan_base_context=_collect_scan_base_context,
12191187
load_ignore_unresolved_internal_underscore_references=(
1220-
_load_ignore_unresolved_internal_underscore_references_from_section_config
1188+
load_ignore_unresolved_internal_underscore_references
12211189
),
12221190
load_non_authoritative_test_evidence_max_file_bytes=(
1223-
_load_non_authoritative_test_evidence_max_file_bytes_from_section_config
1191+
load_non_authoritative_test_evidence_max_file_bytes
12241192
),
12251193
load_non_authoritative_test_evidence_max_files_scanned=(
1226-
_load_non_authoritative_test_evidence_max_files_scanned_from_section_config
1194+
load_non_authoritative_test_evidence_max_files_scanned
12271195
),
12281196
load_non_authoritative_test_evidence_max_total_bytes=(
1229-
_load_non_authoritative_test_evidence_max_total_bytes_from_section_config
1197+
load_non_authoritative_test_evidence_max_total_bytes
12301198
),
12311199
enrich_scan_context_with_insights=_enrich_scan_context_with_insights,
12321200
finalize_scan_context_payload=_finalize_scan_context_payload,

0 commit comments

Comments
 (0)