Add download of beta_chrome on pinned browsers

Author: aguspe

common/repositories.bzl

@@ -218,7 +218,6 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "mac_chrome",
         url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.49/mac-x64/chrome-mac-x64.zip",
@@ -240,7 +239,6 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "linux_chromedriver",
         url = "https://storage.googleapis.com/chrome-for-testing-public/136.0.7103.49/linux64/chromedriver-linux64.zip",
@@ -270,6 +268,84 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files(["chromedriver"])
 
+js_library(
+    name = "chromedriver-js",
+    data = ["chromedriver"],
+)
+""",
+    )
+
+    http_archive(
+        name = "linux_beta_chrome",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.6/linux64/chrome-linux64.zip",
+        sha256 = "1c304daed9edf8d4b5b57645e6cccf227bcc7664595b369879f89ca34d2509ac",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "files",
+    srcs = glob(["**/*"]),
+)
+
+exports_files(["chrome-linux64/chrome"])
+
+js_library(
+    name = "chrome-js",
+    data = [":files"],
+)
+""",
+    )
+    http_archive(
+        name = "mac_beta_chrome",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.6/mac-x64/chrome-mac-x64.zip",
+        sha256 = "c6f3a04ea911682abcce470310433efb75ef4063ba9f02df0a22df89344947cb",
+        strip_prefix = "chrome-mac-x64",
+        patch_cmds = [
+            "mv 'Google Chrome for Testing.app' Chrome.app",
+            "mv 'Chrome.app/Contents/MacOS/Google Chrome for Testing' Chrome.app/Contents/MacOS/Chrome",
+        ],
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["Chrome.app"])
+
+js_library(
+    name = "chrome-js",
+    data = glob(["Chrome.app/**/*"]),
+)
+""",
+    )
+    http_archive(
+        name = "linux_beta_chromedriver",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.6/linux64/chromedriver-linux64.zip",
+        sha256 = "0d5ba6533e60b44b39f41b4313696b41bb7b466f29aa00cb82df030392559854",
+        strip_prefix = "chromedriver-linux64",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["chromedriver"])
+
+js_library(
+    name = "chromedriver-js",
+    data = ["chromedriver"],
+)
+""",
+    )
+
+    http_archive(
+        name = "mac_beta_chromedriver",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.6/mac-x64/chromedriver-mac-x64.zip",
+        sha256 = "d01e48e534b48ab1f6401642720eec95773b069ad8a3042969d1fd708a4fb6c2",
+        strip_prefix = "chromedriver-mac-x64",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["chromedriver"])
+
 js_library(
     name = "chromedriver-js",
     data = ["chromedriver"],

scripts/pinned_browsers.py

@@ -26,99 +26,115 @@ def calculate_hash(url):
     return h.hexdigest()
 
 
-def get_chrome_milestone():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--chrome_channel', default='Stable', help='Set the Chrome channel')
-    args = parser.parse_args()
-    channel = args.chrome_channel
-
-    r = http.request(
-        "GET", f"https://chromiumdash.appspot.com/fetch_releases?channel={channel}&num=1&platform=Mac,Linux"
-    )
-    all_versions = json.loads(r.data)
-    # use the same milestone for all chrome releases, so pick the lowest
-    milestone = min([version["milestone"] for version in all_versions if version["milestone"]])
-    r = http.request(
-        "GET", "https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json"
-    )
-    versions = json.loads(r.data)["versions"]
+#!/usr/bin/env python
+
+import argparse
+import hashlib
+import json
+import os
+import sys
+from pathlib import Path
+
+import urllib3
+from packaging.version import parse
+
+http = urllib3.PoolManager()
 
-    return sorted(
-        filter(lambda v: v["version"].split(".")[0] == str(milestone), versions), key=lambda v: parse(v["version"])
-    )[-1]
+
+def calculate_hash(url):
+    print("Calculate hash for %s" % url, file=sys.stderr)
+    h = hashlib.sha256()
+    r = http.request("GET", url, preload_content=False)
+    for b in iter(lambda: r.read(4096), b""):
+        h.update(b)
+    return h.hexdigest()
 
 
-def chromedriver(selected_version):
+def get_chrome_versions():
+    channels = ['Stable', 'Beta']
+    versions = {}
+    for channel in channels:
+        r = http.request(
+            "GET", f"https://chromiumdash.appspot.com/fetch_releases?channel={channel}&num=1&platform=Mac,Linux"
+        )
+        all_versions = json.loads(r.data)
+        milestone = min([version["milestone"] for version in all_versions if version["milestone"]])
+        r = http.request(
+            "GET", "https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json"
+        )
+        all_known_versions = json.loads(r.data)["versions"]
+        selected_version = sorted(
+            filter(lambda v: v["version"].split(".")[0] == str(milestone), all_known_versions),
+            key=lambda v: parse(v["version"])
+        )[-1]
+        versions[channel] = selected_version
+    return versions
+
+
+def chromedriver(selected_version, workspace_name=""):
     content = ""
 
     drivers = selected_version["downloads"]["chromedriver"]
 
     linux = [d["url"] for d in drivers if d["platform"] == "linux64"][0]
     sha = calculate_hash(linux)
 
-    content = (
-      content
-      + """    http_archive(
-        name = "linux_chromedriver",
-        url = "%s",
-        sha256 = "%s",
-        strip_prefix = "chromedriver-linux64",
+    content += f"""    http_archive(
+        name = \"linux_{workspace_name}chromedriver\",
+        url = \"{linux}\",
+        sha256 = \"{sha}\",
+        strip_prefix = \"chromedriver-linux64\",
         build_file_content = \"\"\"
-load("@aspect_rules_js//js:defs.bzl", "js_library")
-package(default_visibility = ["//visibility:public"])
+load(\"@aspect_rules_js//js:defs.bzl\", \"js_library\")
+package(default_visibility = [\"//visibility:public\"])
 
-exports_files(["chromedriver"])
+exports_files([\"chromedriver\"])
 
 js_library(
-    name = "chromedriver-js",
-    data = ["chromedriver"],
+    name = \"chromedriver-js\",
+    data = [\"chromedriver\"],
 )
 \"\"\",
     )
 """
-      % (linux, sha)
-    )
 
     mac = [d["url"] for d in drivers if d["platform"] == "mac-x64"][0]
     sha = calculate_hash(mac)
-    content = (
-      content
-      + """
+    content += f"""
     http_archive(
-        name = "mac_chromedriver",
-        url = "%s",
-        sha256 = "%s",
-        strip_prefix = "chromedriver-mac-x64",
+        name = \"mac_{workspace_name}chromedriver\",
+        url = \"{mac}\",
+        sha256 = \"{sha}\",
+        strip_prefix = \"chromedriver-mac-x64\",
         build_file_content = \"\"\"
-load("@aspect_rules_js//js:defs.bzl", "js_library")
-package(default_visibility = ["//visibility:public"])
+load(\"@aspect_rules_js//js:defs.bzl\", \"js_library\")
+package(default_visibility = [\"//visibility:public\"])
 
-exports_files(["chromedriver"])
+exports_files([\"chromedriver\"])
 
 js_library(
-    name = "chromedriver-js",
-    data = ["chromedriver"],
+    name = \"chromedriver-js\",
+    data = [\"chromedriver\"],
 )
 \"\"\",
     )
 """
-      % (mac, sha)
-    )
 
     return content
 
+def chrome(selected_version, workspace_name=""):
+    print(f"Calculating hash for Chrome ({workspace_name or 'stable'}) version {selected_version['version']}", file=sys.stderr)
 
-def chrome(selected_version):
     chrome_downloads = selected_version["downloads"]["chrome"]
 
     linux = [d["url"] for d in chrome_downloads if d["platform"] == "linux64"][0]
     sha = calculate_hash(linux)
 
-    content = """
+    content = f"""
     http_archive(
-        name = "linux_chrome",
-        url = "%s",
-        sha256 = "%s",
+        name = "linux_{workspace_name}chrome",
+        url = "{linux}",
+        sha256 = "{sha}",
         build_file_content = \"\"\"
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -136,19 +152,15 @@ def chrome(selected_version):
 )
 \"\"\",
     )
-
-""" % (
-        linux,
-        sha,
-    )
+"""
 
     mac = [d["url"] for d in chrome_downloads if d["platform"] == "mac-x64"][0]
     sha = calculate_hash(mac)
 
-    content += """    http_archive(
-        name = "mac_chrome",
-        url = "%s",
-        sha256 = "%s",
+    content += f"""    http_archive(
+        name = "mac_{workspace_name}chrome",
+        url = "{mac}",
+        sha256 = "{sha}",
         strip_prefix = "chrome-mac-x64",
         patch_cmds = [
             "mv 'Google Chrome for Testing.app' Chrome.app",
@@ -166,11 +178,7 @@ def chrome(selected_version):
 )
 \"\"\",
     )
-
-""" % (
-        mac,
-        sha,
-    )
+"""
 
     return content
 
@@ -496,13 +504,21 @@ def pin_browsers():
     local_drivers(name = "local_drivers")
 
 """
-    content = content + firefox()
-    content = content + geckodriver()
-    content = content + edge()
-    content = content + edgedriver()
-    chrome_milestone = get_chrome_milestone()
-    content = content + chrome(chrome_milestone)
-    content = content + chromedriver(chrome_milestone)
+    content += firefox()
+    content += geckodriver()
+    content += edge()
+    content += edgedriver()
+
+    chrome_versions = get_chrome_versions()
+    chrome_stable = chrome_versions['Stable']
+    content += chrome(chrome_stable)
+    content += chromedriver(chrome_stable)
+
+    chrome_beta = chrome_versions['Beta']
+    if chrome_stable["version"] != chrome_beta["version"]:
+        content += chrome(chrome_beta, workspace_name="beta_")
+        content += chromedriver(chrome_beta, workspace_name="beta_")
+
     content += """
 def _pin_browsers_extension_impl(_ctx):
     pin_browsers()