[build] Use inlined resolver and drop shared module wiring

Author: titusfortner

scripts/BUILD.bazel

@@ -1,22 +1,11 @@
 load("@py_dev_requirements//:requirements.bzl", "requirement")
-load("@rules_python//python:defs.bzl", "py_binary", "py_library")
+load("@rules_python//python:defs.bzl", "py_binary")
 load("//java:defs.bzl", "artifact", "java_binary")
 
-py_library(
-    name = "chrome_version",
-    srcs = ["chrome_version.py"],
-    imports = ["."],
-    deps = [
-        requirement("packaging"),
-        requirement("urllib3"),
-    ],
-)
-
 py_binary(
     name = "pinned_browsers",
     srcs = ["pinned_browsers.py"],
     deps = [
-        ":chrome_version",
         requirement("packaging"),
         requirement("urllib3"),
     ],
@@ -34,7 +23,7 @@ py_binary(
     name = "update_cdp",
     srcs = ["update_cdp.py"],
     deps = [
-        ":chrome_version",
+        requirement("packaging"),
         requirement("urllib3"),
     ],
 )

scripts/pinned_browsers.py

@@ -7,7 +7,6 @@
 from pathlib import Path
 
 import urllib3
-from chrome_version import latest_for_channel
 from packaging.version import parse
 
 # Find the current stable versions of each browser we
@@ -28,6 +27,22 @@ def calculate_hash(url):
     return h.hexdigest()
 
 
+def latest_for_channel(channel):
+    """Newest Chrome-for-Testing version entry (version + downloads) for a channel.
+
+    Uses Chrome-for-Testing's channel designation, which tracks the latest milestone and is
+    unaffected by N-1 security respins.
+    """
+    r = http.request("GET", "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json")
+    milestone = json.loads(r.data)["channels"][channel]["version"].split(".")[0]
+    r = http.request("GET", "https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json")
+    versions = json.loads(r.data)["versions"]
+    return sorted(
+        filter(lambda v: v["version"].split(".")[0] == str(milestone), versions),
+        key=lambda v: parse(v["version"]),
+    )[-1]
+
+
 def chromedriver(selected_version, workspace_prefix=""):
     content = ""
 

scripts/update_cdp.py

@@ -1,18 +1,35 @@
 #!/usr/bin/env python
 
 import argparse
+import json
 import os
 import re
 import shutil
 from pathlib import Path
 
 import urllib3
-from chrome_version import latest_for_channel
+from packaging.version import parse
 
 http = urllib3.PoolManager()
 root_dir = Path(os.path.realpath(__file__)).parent.parent
 
 
+def latest_for_channel(channel):
+    """Newest Chrome-for-Testing version entry for a channel.
+
+    Uses Chrome-for-Testing's channel designation, which tracks the latest milestone and is
+    unaffected by N-1 security respins.
+    """
+    r = http.request("GET", "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json")
+    milestone = json.loads(r.data)["channels"][channel]["version"].split(".")[0]
+    r = http.request("GET", "https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json")
+    versions = json.loads(r.data)["versions"]
+    return sorted(
+        filter(lambda v: v["version"].split(".")[0] == str(milestone), versions),
+        key=lambda v: parse(v["version"]),
+    )[-1]
+
+
 def fetch_and_save(url, file_path):
     response = http.request("GET", url)
     if response.status != 200: