Execute resources tests on cloudformation changes

simonrw · simonrw · commit 4eb28d59e30e · 2025-04-16T16:14:45.000+01:00
diff --git a/localstack-core/localstack/testing/testselection/matching.py b/localstack-core/localstack/testing/testselection/matching.py
@@ -1,4 +1,5 @@
 import fnmatch
+import glob
 import pathlib
 import re
 from collections import defaultdict
@@ -162,6 +163,32 @@ def generic_service_test_matching_rule(
     return set()
 
 
+def cloudformation_resource_provider_rule(
+    changed_file_path: str,
+    search_patterns: Iterable[str] = DEFAULT_SEARCH_PATTERNS,
+    test_dirs: Iterable[str] = ("tests/aws/services",),
+) -> Iterable[str]:
+    root_dir = (pathlib.Path.cwd() / ".." / ".." / ".." / "..").resolve()
+    match = None
+    for pattern in search_patterns:
+        match = re.findall(pattern, changed_file_path)
+        if match:
+            break
+
+    if match:
+        changed_service = match[0]
+        if changed_service != "cloudformation":
+            return []
+
+    out = set()
+    for test_dir in test_dirs:
+        resources_dirs = list(glob.iglob(f"{root_dir / test_dir}/*/resources"))
+        for resource_dir in resources_dirs:
+            out.add(str(pathlib.Path(resource_dir).relative_to(root_dir)))
+
+    return out
+
+
 MatchingRule = Callable[[str], Iterable[str]]
 
 
@@ -206,4 +233,6 @@ def check_rule_has_matches(rule: MatchingRule, files: Iterable[str]) -> bool:
     Matchers.glob(".git-blame-ignore-revs").ignore(),
     # lambda
     Matchers.glob("tests/aws/services/lambda_/functions/**").service_tests(services=["lambda"]),
+    # CloudFormation
+    cloudformation_resource_provider_rule,
 ]
diff --git a/tests/unit/testing/testselection/test_matching.py b/tests/unit/testing/testselection/test_matching.py
@@ -140,15 +140,9 @@ def test_directory_rules_no_match():
     assert selected_tests == [SENTINEL_ALL_TESTS]
 
 
-def test_cloudformation_tests_executed_on_service_changes():
-    selected_tests = get_affected_tests_from_changes(
-        ["localstack/services/lambda_/provider.py"], MATCHING_RULES
-    )
-    assert selected_tests == []
-
-
 def test_service_tests_executed_on_cloudformation_changes():
     selected_tests = get_affected_tests_from_changes(
         ["localstack/services/cloudformation/provider.py"], MATCHING_RULES
     )
-    assert "tests/aws/services/lambda_/resource_providers/" in selected_tests
+    # picking lambda as an example
+    assert "tests/aws/services/lambda_/resources" in selected_tests
