sentry-devenv 1.16.0__py3-none-any.whl → 1.18.0__py3-none-any.whl

devenv/checks/limaDns.py

@@ -0,0 +1,85 @@
+from __future__ import annotations
+
+import sys
+
+from devenv.lib import colima
+from devenv.lib import proc
+from devenv.lib_check.types import checker
+from devenv.lib_check.types import fixer
+
+tags: set[str] = {"builtin"}
+name = "limaDns"
+
+
+@checker
+def check() -> tuple[bool, str]:
+    # dns resolution can... stop working if colima's running
+    # and wifi changes to some other network that gives macos some
+    # weird nameservers
+
+    status = colima.check()
+    if status != colima.ColimaStatus.UP:
+        return False, "colima isn't up"
+
+    try:
+        proc.run(
+            (
+                "colima",
+                "exec",
+                "--",
+                "python3",
+                "-Su",
+                "-c",
+                """
+import socket
+
+try:
+    socket.getaddrinfo("ghcr.io", None)
+except socket.gaierror as e:
+    raise SystemExit(f"failed to resolve ghcr.io: {e}")
+""",
+            ),
+            stdout=True,
+        )
+    except RuntimeError as e:
+        return False, f"{e}"
+
+    return True, ""
+
+
+@fixer
+def fix() -> tuple[bool, str]:
+    status = colima.start()
+    if status == colima.ColimaStatus.UNHEALTHY:
+        return False, "colima started, but it's unhealthy"
+
+    try:
+        proc.run(
+            (
+                "colima",
+                "exec",
+                "--",
+                "sudo",
+                "systemctl",
+                "restart",
+                "systemd-resolved.service",
+            ),
+            stdout=True,
+        )
+    except RuntimeError as e:
+        print(
+            f"""
+failed to restart the vm's resolved:
+{e}
+
+we're going to try restarting colima
+"""
+        )
+        try:
+            proc.run(
+                (sys.executable, "-P", "-m", "devenv", "colima", "restart")
+            )
+        except RuntimeError as e:
+            return False, f"{e}"
+
+    return True, ""

devenv/colima.py

@@ -18,6 +18,9 @@ def main(context: Context, argv: Sequence[str] | None = None) -> int:
 
     args = parser.parse_args(argv)
 
+    # TODO: in addition to returning 1 we should print colima logs
+    #       (and/or send to sentry)
+
     if args.command == "start":
         status = colima.start()
         if status == colima.ColimaStatus.UNHEALTHY:

devenv/lib/colima.py

@@ -180,6 +180,17 @@ def start(restart: bool = False) -> ColimaStatus:
             "colima",
             "start",
             "--verbose",
+            # this effectively makes the vm's resolvectl status use:
+            # DNS Servers: 8.8.8.8 1.1.1.1 192.168.5.2
+            # https://lima-vm.io/docs/config/network/user/
+            # 192.168.5.2 is the host, accessible from the vm
+            # sometimes using only the host will result in dns breaking
+            # for any number of reasons (public wifi that gives you some weird dns server,
+            # tethering, vpn, what have you)
+            "--dns",
+            "8.8.8.8",
+            "--dns",
+            "1.1.1.1",
             # ideally we keep ~ ro, but currently the "default" vm
             # is shared across repositories, so for ease of use we'll let home rw
             f"--mount=/var/folders:w,/private/tmp/colima:w,{home}:w",

devenv/lib/docker.py

@@ -7,6 +7,7 @@ import subprocess
 import tempfile
 from threading import Thread
 
+from devenv.constants import home
 from devenv.constants import root
 from devenv.constants import SYSTEM_MACHINE
 from devenv.lib import archive
@@ -55,7 +56,10 @@ def check_docker_to_host_connectivity(timeout: int = 3) -> bool:
 
 
 def uninstall(binroot: str) -> None:
-    for fp in (f"{binroot}/docker",):
+    for fp in (
+        f"{binroot}/docker",
+        f"{home}/.docker/cli-plugins/docker-buildx",
+    ):
         try:
             os.remove(fp)
         except FileNotFoundError:
@@ -76,30 +80,81 @@ def _install(url: str, sha256: str, into: str) -> None:
         os.replace(f"{tmpd}/docker", f"{into}/docker")
 
 
+def _install_buildx(url: str, sha256: str, into: str) -> None:
+    archive.download(url, sha256, dest=f"{into}/docker-buildx")
+    os.chmod(f"{into}/docker-buildx", 0o775)
+
+
+def _check_buildx(binroot: str, expected_version: str) -> bool:
+    try:
+        stdout = proc.run(
+            (f"{binroot}/docker", "buildx", "version"), stdout=True
+        )
+    except RuntimeError as e:
+        print(f"failed getting buildx version:\n\n{e}")
+        return False
+
+    # github.com/docker/buildx v0.22.0 Homebrew
+    installed_version = stdout.strip().split()[1]
+
+    if installed_version == expected_version:
+        return True
+
+    print(
+        f"installed docker-buildx {installed_version} is outdated! expected: {expected_version}"
+    )
+    return False
+
+
 def install_global() -> None:
     version = "27.3.1"
     cfg = {
-        "darwin_x86_64": "https://download.docker.com/mac/static/stable/x86_64/docker-27.3.1.tgz",
+        "darwin_x86_64": f"https://download.docker.com/mac/static/stable/x86_64/docker-{version}.tgz",
         "darwin_x86_64_sha256": "1b621d4c9a57ff361811cf29754aafb0c28bc113c70011927af8d73c2c162186",
-        "darwin_arm64": "https://download.docker.com/mac/static/stable/aarch64/docker-27.3.1.tgz",
+        "darwin_arm64": f"https://download.docker.com/mac/static/stable/aarch64/docker-{version}.tgz",
         "darwin_arm64_sha256": "9dae125282116146b06eb777c2125ddda6c0468c0b9ad6c72a82edbc6783a77b",
-        "linux_x86_64": "https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz",
+        "linux_x86_64": f"https://download.docker.com/linux/static/stable/x86_64/docker-{version}.tgz",
         "linux_x86_64_sha256": "9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3",
     }
 
+    version_buildx = "v0.22.0"
+    cfg_buildx = {
+        "darwin_x86_64": f"https://github.com/docker/buildx/releases/download/{version_buildx}/buildx-{version_buildx}.darwin-amd64",
+        "darwin_x86_64_sha256": "5221ad6b8acd2283f8fbbeebc79ae4b657e83519ca1c1e4cfbb9405230b3d933",
+        "darwin_arm64": f"https://github.com/docker/buildx/releases/download/{version_buildx}/buildx-{version_buildx}.darwin-arm64",
+        "darwin_arm64_sha256": "5898c338abb1f673107bc087997dc3cb63b4ea66d304ce4223472f57bd8d616e",
+        "linux_x86_64": f"https://github.com/docker/buildx/releases/download/{version_buildx}/buildx-{version_buildx}.linux-amd64",
+        "linux_x86_64_sha256": "805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f",
+    }
+
     binroot = f"{root}/bin"
 
     if shutil.which("docker", path=binroot) == f"{binroot}/docker":
         stdout = proc.run((f"{binroot}/docker", "--version"), stdout=True)
         installed_version = stdout.strip().split()[2][:-1]
-        if version == installed_version:
-            return
-        print(f"installed docker {installed_version} is outdated!")
-
-    print(f"installing docker (cli, not desktop) {version}...")
-    uninstall(binroot)
-    _install(cfg[SYSTEM_MACHINE], cfg[f"{SYSTEM_MACHINE}_sha256"], binroot)
+        if version != installed_version:
+            print(f"installed docker {installed_version} is outdated!")
+            print(f"installing docker (cli, not desktop) {version}...")
+            uninstall(binroot)
+            _install(
+                cfg[SYSTEM_MACHINE], cfg[f"{SYSTEM_MACHINE}_sha256"], binroot
+            )
+    else:
+        _install(cfg[SYSTEM_MACHINE], cfg[f"{SYSTEM_MACHINE}_sha256"], binroot)
 
     stdout = proc.run((f"{binroot}/docker", "--version"), stdout=True)
     if f"Docker version {version}" not in stdout:
-        raise SystemExit(f"Failed to install docker {version}! Found: {stdout}")
+        raise SystemExit(f"Failed to install docker {version}!\n\n{stdout}")
+
+    if not _check_buildx(binroot, version_buildx):
+        print(f"installing docker buildx {version_buildx}...")
+        _install_buildx(
+            cfg_buildx[SYSTEM_MACHINE],
+            cfg_buildx[f"{SYSTEM_MACHINE}_sha256"],
+            f"{home}/.docker/cli-plugins",
+        )
+
+        if not _check_buildx(binroot, version_buildx):
+            raise SystemExit(
+                f"Failed to install docker buildx {version_buildx}!"
+            )

{sentry_devenv-1.16.0.dist-info → sentry_devenv-1.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sentry_devenv
-Version: 1.16.0
+Version: 1.18.0
 Summary: Utilities for setting up a Sentry development environment
 Author-email: Joshua Li <joshua.li@sentry.io>, Ian Woodard <ian.woodard@sentry.io>, Buck Evan <buck.evan@sentry.io>
 Classifier: Programming Language :: Python :: 3
@@ -16,7 +16,7 @@ Requires-Dist: sentry-sdk
 managing dev environments since '24
 
 `devenv` is an extensible execution framework and library for authoring
-a simple set of high level commands - bootstrap, sync, doctor, nuke - that
+a simple set of high level commands - bootstrap, fetch, sync, doctor - that
 manage a repository's dev environment.
 
 ## prerequisites

{sentry_devenv-1.16.0.dist-info → sentry_devenv-1.18.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ ci/integration/repo/devenv/sync.py,sha256=mZhOcSeA10BQ5DkDBoSbpjc2rHeRVYEZAZ6zse
 devenv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devenv/__main__.py,sha256=O8ROZOx3emX7hhzMD608Ud_Pny_PCy5RsWXwBLhf8Q8,122
 devenv/bootstrap.py,sha256=VSlS1giUv8fE0K5pZgIO-QBKg5PsaWxirF6G9OPUUhE,4047
-devenv/colima.py,sha256=qcmVQUbuxxnB9gxZXZMn7EU6NECCr3t_XfTNAJ9IjWw,1433
+devenv/colima.py,sha256=Dk9t6eu2DEoqqkY8xLmgiB96r-6zi3aXcvON3P8h1JQ,1537
 devenv/constants.py,sha256=wl0sRfkNeJL-sML6MG5nS0zU-dwRo1mDPrhUSHHY1YQ,1498
 devenv/doctor.py,sha256=VZlcX1GgIEUGTT4PX0phyWSx1UfI3uQbXsANpKVDTj0,8782
 devenv/fetch.py,sha256=MbztGFOzBR4KDPG0TVWcQsA4pGXk61zrQXvh-C9xHuk,3904
@@ -14,15 +14,16 @@ devenv/sync.py,sha256=B9bvAuI7K-4SqcfHD4_zwKpozAnHWCNOL-IhVOcc3Zg,1254
 devenv/update.py,sha256=CkshQUvmVVblXdjARgWQKXSe7pwMjSMrPR3gDEesX5c,2402
 devenv/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devenv/checks/credsStore.py,sha256=eUwtoQ8btFsM8Ir-Vla98MEQFQ5o-OyFu--CSnZr3uY,1149
+devenv/checks/limaDns.py,sha256=yX0s63BR9OcX4TWtlywNlaS4NkrlFYj9W_vxX6NAFQg,1860
 devenv/checks/test.py,sha256=AvxoA2W5qTO2ZpoXmjScLiJxXD3Y_limYp5yTjGSZ9U,701
 devenv/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devenv/lib/archive.py,sha256=LlVETRsf3J53yY_8sjL4P8plLNEMKoS9G48kfoVoseA,4503
 devenv/lib/brew.py,sha256=_7recvYh-LnUJC0eKnYK7F8AzGRL5bi_Khv0f_mgrlM,1795
-devenv/lib/colima.py,sha256=fcCnH6H1uZnSPG28tt9dQZXgLZPvKTfiQynw6Ty137M,6840
+devenv/lib/colima.py,sha256=8JSAGC2pXthY_h7-AOsW0xgN-kyZq7_fh63-hhYFCIE,7381
 devenv/lib/config.py,sha256=5eXYwM44AJ3w2VfVbCDqchYOL1zAjazNcirtM6kxxGw,3344
 devenv/lib/context.py,sha256=4EDImK9pvTp3FqeNigevC9lbJsgdDO9D1t2_Y4NyPlc,207
 devenv/lib/direnv.py,sha256=HDRUaIR0PMAQYiiTaw3gEQuh6Tdb7BUJmV7dBZdPztM,1325
-devenv/lib/docker.py,sha256=vfEThxKqQGrGPPUZvw5yo2IZ25XG_HoUYjDyBPHnIN4,3480
+devenv/lib/docker.py,sha256=cOBe9TRzoVkJbYv0g8yqkuyDYyntTasagwBGSiAgijs,5684
 devenv/lib/fs.py,sha256=IBahQ9fB-o9cK9HipK_L0gso2OVinIDTxFWoeMte9ww,2764
 devenv/lib/gcloud.py,sha256=G8rhKC89TqWcFzIVsFd64d4ouD6M6s-TaMX5ZxtKypw,3550
 devenv/lib/github.py,sha256=AMtcz6gTVKy7qvCP1zTUdHQlnSM32TVaji0aOXJ_F9A,3463
@@ -69,8 +70,8 @@ tests/lib/test_github.py,sha256=IMEG2cmRaK_PMJprFE_ZMqPnZ0StwWqgznhhT_zVk3U,4526
 tests/lib/test_proc.py,sha256=XH6OnxKPSSm3HvDjYHApputMKwgOE8lYqDuK2vK0Z0U,2626
 tests/lib/test_repository.py,sha256=gUi1lkY7bha5WwZ5xcnENOlFYboVV8TFW1lCESvS0VA,787
 tests/lib/test_venv.py,sha256=wscU7Enp8fK6o_2HgIT4WwDnvHbKwaKvJhNyJUrDNqk,3262
-sentry_devenv-1.16.0.dist-info/METADATA,sha256=XtKwpwoQvjbWUcMYCrUrhEutRyZWwBV-JP6zJeBV6l4,13621
-sentry_devenv-1.16.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-sentry_devenv-1.16.0.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
-sentry_devenv-1.16.0.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
-sentry_devenv-1.16.0.dist-info/RECORD,,
+sentry_devenv-1.18.0.dist-info/METADATA,sha256=2yYNwF0Iz9QTxXw0dnucRef4B0hIpcil88QzTqs6uf4,13622
+sentry_devenv-1.18.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+sentry_devenv-1.18.0.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
+sentry_devenv-1.18.0.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
+sentry_devenv-1.18.0.dist-info/RECORD,,

{sentry_devenv-1.16.0.dist-info → sentry_devenv-1.18.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any