SERVER-47004: Properly run eslint on modules

1 files changed, 24 insertions, 3 deletions

diff --git a/buildscripts/eslint.py b/buildscripts/eslint.py
index 2a3eba272ff..220385a1e91 100755
--- a/buildscripts/eslint.py
+++ b/buildscripts/eslint.py
@@ -19,7 +19,7 @@ import sys
 import tarfile
 import tempfile
 import threading
-from typing import Optional
+from typing import Optional, Dict, Tuple, List
 import urllib.error
 import urllib.parse
 import urllib.request
@@ -228,6 +228,26 @@ def lint_patch(eslint, infile):
     return True
 
 
+def get_revision_for_repo(path: str) -> str:
+    """
+    Get the git revision for the given git repository.
+
+    :param path: Path to git repository.
+    :return: Git revision to compare against for given repo.
+    """
+    if "enterprise" in path:
+        return os.environ.get("ENTERPRISE_REV")
+    return os.environ.get("REVISION")
+
+
+def get_repos_and_revisions() -> Tuple[List[Repo], Dict[str, str]]:
+    """Get the repo object and a map of revisions to compare against."""
+    modules = git.get_module_paths()
+    repos = [Repo(path) for path in modules]
+    revision_map = {repo.git_dir: get_revision_for_repo(repo.git_dir) for repo in repos}
+    return repos, revision_map
+
+
 def lint_git_diff(eslint: Optional[str]) -> bool:
     """
     Lint the files that have changes since the last git commit.
@@ -235,8 +255,9 @@ def lint_git_diff(eslint: Optional[str]) -> bool:
     :param eslint: Path to eslint command.
     :return: True if lint was successful.
     """
-    repos = [Repo(path) for path in git.get_module_paths()]
-    candidate_files = find_changed_files_in_repos(repos)
+    repos, revision_map = get_repos_and_revisions()
+    LOGGER.info("revisions", revision=revision_map)
+    candidate_files = find_changed_files_in_repos(repos, revision_map)
     LOGGER.info("Found candidate_files", candidate_files=candidate_files)
     files = [filename for filename in candidate_files if is_interesting_file(filename)]
     LOGGER.info("Found files to lint", files=files)