Support exact match syntax for package exclusions

salesforce · Mar 23, 2024 · bbc7c1d · bbc7c1d
1 parent c45c98f
commit bbc7c1d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/common/argsupport.py b/common/argsupport.py
@@ -46,8 +46,13 @@ def get_all_packages(repository_root_path, packages_str, verbose=False):
         packages = bazel.query_all_artifact_packages(repository_root_path, p, verbose)
         for package in packages:
             for exclusion_path in exclusion_paths:
+                prefix_match = True
+                if exclusion_path.endswith("/"):
+                    exclusion_path = exclusion_path[:-1]
+                    prefix_match = False
                 if package.startswith(exclusion_path):
-                    break
+                    if prefix_match or package.endswith(exclusion_path):
+                        break
             else:
                 if not package in all_packages:
                     all_packages.add(package)

diff --git a/tests/argsupporttest.py b/tests/argsupporttest.py
@@ -9,14 +9,18 @@
 from crawl import bazel
 import unittest
 
+
 PASTRY_PACKAGES = ["projects/libs/pastry/abstractions", 
-                  "projects/libs/pastry/pastry-metrics",]
+                   "projects/libs/pastry/pastry-metrics",]
+
 
 ZK_CONNECT_PACKAGES = ["projects/libs/servicelibs/zk-connect",]
 
+
 GRAIL_PACKAGES = ["projects/libs/servicelibs/grail/grail-admin-api",
                   "projects/libs/servicelibs/grail/grail-admin-impl",]
 
+
 ALL_PACKAGES_DICT = {"projects/libs" : PASTRY_PACKAGES + ZK_CONNECT_PACKAGES + GRAIL_PACKAGES,
                      "projects/libs/servicelibs" : ZK_CONNECT_PACKAGES + GRAIL_PACKAGES,
                      "projects/libs/pastry" : PASTRY_PACKAGES,
@@ -108,6 +112,19 @@ def test_get_all_packages__multiple_packages__multiple_exclusions(self):
         self.assertNotIn("projects/libs/servicelibs/grail/grail-admin-api", packages)
         self.assertNotIn("projects/libs/servicelibs/grail/grail-admin-impl", packages)
         self.assertNotIn("projects/libs/servicelibs/zk-connect", packages)
-
+
+
+    def test_exact_match_exclusions(self):
+        packages_str = "projects/libs,-projects/libs/servicelibs/zk,-projects/libs/servicelibs/grail/grail-admin-api/, -projects/libs/servicelibs/grail/"
+
+        packages = argsupport.get_all_packages("root", packages_str)
+
+        self.assertIn("projects/libs/pastry/abstractions", packages)
+        self.assertIn("projects/libs/pastry/pastry-metrics", packages)
+        self.assertNotIn("projects/libs/servicelibs/grail/grail-admin-api", packages)
+        self.assertIn("projects/libs/servicelibs/grail/grail-admin-impl", packages)
+        self.assertNotIn("projects/libs/servicelibs/zk-connect", packages)
+
+
 if __name__ == '__main__':
     unittest.main()