Merge pull request #394 from permitio/ori/per-4256-fixes-to-bundle_ignore

Fixes to bundle ignore feature

Author: Asaf Cohen

packages/opal-common/opal_common/git/commit_viewer.py

@@ -113,15 +113,16 @@ def has_extension(f: VersionedFile, extensions: Optional[List[str]] = None) -> b
 def find_ignore_match(
     maybe_path: Path, bundle_ignore: Optional[List[str]]
 ) -> Optional[str]:
-    """Determines the ignore glob path, if any, which matches the given file's
+    """Determines the ignored glob path, if any, which matches the given file's
     path.
 
     Returns the matched glob path rather than a binary decision of
     whether there is a match to enable better logging in the case of
     matched paths in manifests.
     """
-    if bundle_ignore != None:
+    if bundle_ignore is not None:
         path = Path(maybe_path)
+
         for ignore in bundle_ignore:
             if path.match(ignore):
                 return ignore

packages/opal-server/opal_server/policy/watcher/callbacks.py

@@ -76,7 +76,7 @@ def is_path_affected(path: Path) -> bool:
                 return True
             if not path.suffix in file_extensions:
                 return False
-            return find_ignore_match(path, bundle_ignore)
+            return find_ignore_match(path, bundle_ignore) is None
 
         all_paths = list(viewer.affected_paths(is_path_affected))
         if not all_paths:
@@ -114,4 +114,6 @@ async def publish_changed_directories(
     notification = await create_policy_update(
         old_commit, new_commit, file_extensions, bundle_ignore
     )
-    publisher.publish(topics=notification.topics, data=notification.update.dict())
+
+    if notification:
+        publisher.publish(topics=notification.topics, data=notification.update.dict())

packages/opal-server/opal_server/policy/watcher/factory.py

@@ -73,7 +73,7 @@ def setup_watcher_task(
         policy_bundle_token, opal_server_config.POLICY_BUNDLE_SERVER_TOKEN
     )
     extensions = load_conf_if_none(extensions, opal_server_config.OPA_FILE_EXTENSIONS)
-    bundle_ignore = load_conf_if_none(extensions, opal_server_config.BUNDLE_IGNORE)
+    bundle_ignore = load_conf_if_none(bundle_ignore, opal_server_config.BUNDLE_IGNORE)
     if source_type == PolicySourceTypes.Git:
         remote_source_url = load_conf_if_none(
             remote_source_url, opal_server_config.POLICY_REPO_URL