Cleanups on how matrix of scenario/weblog functions

tests/test_the_test/test_ci_orchestrator.py

@@ -1,4 +1,7 @@
+from functools import lru_cache
+
 from utils import scenarios
+from utils._context.weblog_metadata import WeblogMetaData
 
 from utils.scripts.ci_orchestrators.workflow_data import (
     _get_endtoend_weblogs,
@@ -7,12 +10,21 @@
 )
 
 
+@lru_cache
+def get_weblogs(library: str) -> dict[str, WeblogMetaData]:
+    return {w.name: w for w in WeblogMetaData.load(library)}
+
+
+def get_weblog(library: str, weblog: str) -> WeblogMetaData:
+    return get_weblogs(library)[weblog]
+
+
 @scenarios.test_the_test
 def test_get_endtoend_definitions():
     scenario_map = {
         "endtoend": [
-            "DEFAULT",
-            "GRAPHQL_APPSEC",
+            scenarios.default,
+            scenarios.graphql_appsec,
         ],
     }
 
@@ -30,9 +42,9 @@ def test_get_endtoend_definitions():
 
 @scenarios.test_the_test
 def test_ipv6_is_not_supported_for_uds_weblogs():
-    assert not _is_supported("dotnet", "uds", "IPV6", "dev")
-    assert not _is_supported("python", "uds-flask", "IPV6", "dev")
-    assert _is_supported("python", "flask-poc", "IPV6", "dev")
+    assert not _is_supported(get_weblog("dotnet", "uds"), scenarios.ipv6, "dev")
+    assert not _is_supported(get_weblog("python", "uds-flask"), scenarios.ipv6, "dev")
+    assert _is_supported(get_weblog("python", "flask-poc"), scenarios.ipv6, "dev")
 
 
 @scenarios.test_the_test
@@ -50,7 +62,7 @@ def test_get_endtoend_definitions_missing_endtoend_key():
 
 @scenarios.test_the_test
 def test_nodejs_weblogs_dont_require_prebuild():
-    scenario_map = {"endtoend": ["DEFAULT"]}
+    scenario_map = {"endtoend": [scenarios.default]}
     defs = get_endtoend_definitions("nodejs", scenario_map, [], "dev", 200000, 256, "123", "")
     # Node.js weblogs use build_mode="local": no dedicated build_end_to_end job
     # (parallel_weblogs lists only "prebuild" weblogs, so it is empty), but the
@@ -80,7 +92,7 @@ def test_weblog_build_mode_is_resolved_from_metadata():
 
 @scenarios.test_the_test
 def test_nodejs_build_base_image():
-    scenario_map = {"endtoend": ["DEFAULT", "INTEGRATION_FRAMEWORKS"]}
+    scenario_map = {"endtoend": [scenarios.default, scenarios.integration_frameworks]}
     defs = get_endtoend_definitions("nodejs", scenario_map, [], "dev", 200000, 256, "123", "", build_base_images=True)
 
     assert defs["endtoend_defs"]["parallel_weblogs"] == []
@@ -96,7 +108,7 @@ def test_nodejs_build_base_image():
 
 @scenarios.test_the_test
 def test_python_build_base_image():
-    scenario_map = {"endtoend": ["DEFAULT", "INTEGRATION_FRAMEWORKS"]}
+    scenario_map = {"endtoend": [scenarios.default, scenarios.integration_frameworks]}
     defs = get_endtoend_definitions("python", scenario_map, [], "dev", 200000, 256, "123", "", build_base_images=True)
 
     # all python weblog has build_mode=prebuild. build_weblog_base_image
@@ -111,7 +123,7 @@ def test_python_build_base_image():
 
 @scenarios.test_the_test
 def test_otel_collector():
-    scenario_map = {"endtoend": ["OTEL_COLLECTOR"]}
+    scenario_map = {"endtoend": [scenarios.otel_collector]}
     defs = get_endtoend_definitions("otel_collector", scenario_map, [], "prod", 200000, 256, "123", "")
 
     assert defs["endtoend_defs"]["parallel_jobs"] == [

tests/test_the_test/test_group_rules.py

@@ -62,6 +62,7 @@ def test_tracer_release():
         scenarios.simple_installer_auto_injection,
         scenarios.multi_installer_auto_injection,
         scenarios.otel_collector_e2e,
+        scenarios.performances,
     ]
 
     for scenario in get_all_scenarios():

utils/_context/_scenarios/__init__.py

@@ -350,7 +350,7 @@ class _Scenarios:
         weblog_volumes={"./tests/appsec/blocking_rule.json": {"bind": "/appsec_blocking_rule.json", "mode": "ro"}},
         doc="AppSec tests for GraphQL integrations",
         github_workflow="endtoend",
-        scenario_groups=[scenario_groups.appsec],
+        scenario_groups=[scenario_groups.appsec, scenario_groups.graphql],
     )
     # This GraphQL scenario can be used for any GraphQL testing, not just AppSec
     graphql_error_tracking = EndToEndScenario(
@@ -362,7 +362,7 @@ class _Scenarios:
         weblog_volumes={"./tests/appsec/blocking_rule.json": {"bind": "/appsec_blocking_rule.json", "mode": "ro"}},
         doc="GraphQL error tracking tests with OpenTelemetry semantics",
         github_workflow="endtoend",
-        scenario_groups=[scenario_groups.appsec],
+        scenario_groups=[scenario_groups.appsec, scenario_groups.graphql],
     )
     appsec_rules_monitoring_with_errors = EndToEndScenario(
         "APPSEC_RULES_MONITORING_WITH_ERRORS",

utils/_context/_scenarios/aws_lambda.py

@@ -33,6 +33,7 @@ def __init__(
             all_scenario_groups.tracer_release,
             all_scenario_groups.end_to_end,
             all_scenario_groups.lambda_end_to_end,
+            all_scenario_groups.all,
         ] + (scenario_groups or [])
 
         super().__init__(name, github_workflow=github_workflow, doc=doc, scenario_groups=scenario_groups)

utils/_context/_scenarios/otel_collector.py

@@ -21,7 +21,7 @@ def __init__(self, name: str, *, use_proxy: bool = True, mocked_backend: bool =
             name,
             github_workflow="endtoend",
             doc="TODO",
-            scenario_groups=[scenario_groups.end_to_end, scenario_groups.all],
+            scenario_groups=[scenario_groups.end_to_end, scenario_groups.all, scenario_groups.open_telemetry],
             use_proxy=use_proxy,
             mocked_backend=mocked_backend,
         )

utils/_context/_scenarios/performance.py

@@ -4,13 +4,15 @@
 import pytest
 
 from .endtoend import EndToEndScenario
+from .core import scenario_groups
 
 
 class PerformanceScenario(EndToEndScenario):
     def __init__(self, name: str, doc: str) -> None:
         super().__init__(
             name, doc=doc, appsec_enabled=self.appsec_enabled, use_proxy_for_agent=False, use_proxy_for_weblog=False
         )
+        self.scenario_groups = [scenario_groups.exotics]
 
     @property
     def appsec_enabled(self):