sentry-devenv 1.16.0__tar.gz → 1.18.0__tar.gz

{sentry_devenv-1.16.0 → sentry_devenv-1.18.0}/PKG-INFO

@@ -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 → sentry_devenv-1.18.0}/README.md

@@ -3,7 +3,7 @@
 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.18.0/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, ""

{sentry_devenv-1.16.0 → sentry_devenv-1.18.0}/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:

{sentry_devenv-1.16.0 → sentry_devenv-1.18.0}/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",

sentry_devenv-1.18.0/devenv/lib/docker.py

@@ -0,0 +1,160 @@
+from __future__ import annotations
+
+import os
+import shutil
+import socket
+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
+from devenv.lib import proc
+
+
+def _accept_and_close(sock: socket.socket) -> None:
+    sock.listen()
+    conn, addr = sock.accept()
+    conn.close()
+
+
+def check_docker_to_host_connectivity(timeout: int = 3) -> bool:
+    sock = socket.socket()
+    sock.bind(("127.0.0.1", 0))
+    port = sock.getsockname()[1]
+
+    listener = Thread(target=_accept_and_close, args=(sock,))
+    listener.start()
+
+    rc = subprocess.call(
+        (
+            "docker",
+            "run",
+            "--rm",
+            "--add-host=host.docker.internal:host-gateway",
+            "busybox:1.36.1-musl",
+            "/bin/sh",
+            "-c",
+            f"/bin/echo hi | /bin/nc -w {timeout} host.docker.internal {port}",
+        )
+    )
+
+    if rc != 0:
+        # easiest way to terminate the socket server
+        # (so the thread doesn't indefinitely hang)
+        with socket.socket() as s:
+            s.connect(("127.0.0.1", port))
+            s.send(b"die")
+
+        listener.join()
+        return False
+
+    listener.join()
+    return True
+
+
+def uninstall(binroot: str) -> None:
+    for fp in (
+        f"{binroot}/docker",
+        f"{home}/.docker/cli-plugins/docker-buildx",
+    ):
+        try:
+            os.remove(fp)
+        except FileNotFoundError:
+            # it's better to do this than to guard with
+            # os.path.exists(fp) because if it's an invalid or circular
+            # symlink the result'll be False!
+            pass
+
+
+def _install(url: str, sha256: str, into: str) -> None:
+    os.makedirs(into, exist_ok=True)
+    with tempfile.TemporaryDirectory(dir=into) as tmpd:
+        archive_file = archive.download(url, sha256, dest=f"{tmpd}/download")
+        archive.unpack_strip_n(archive_file, tmpd, n=1)
+
+        # the archive was atomically placed into tmpd so
+        # these are on the same fs and can be atomically moved too
+        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": f"https://download.docker.com/mac/static/stable/x86_64/docker-{version}.tgz",
+        "darwin_x86_64_sha256": "1b621d4c9a57ff361811cf29754aafb0c28bc113c70011927af8d73c2c162186",
+        "darwin_arm64": f"https://download.docker.com/mac/static/stable/aarch64/docker-{version}.tgz",
+        "darwin_arm64_sha256": "9dae125282116146b06eb777c2125ddda6c0468c0b9ad6c72a82edbc6783a77b",
+        "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:
+            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}!\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 → sentry_devenv-1.18.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sentry_devenv"
-version = "1.16.0"
+version = "1.18.0"
 authors = [
   { name="Joshua Li", email="joshua.li@sentry.io" },
   { name="Ian Woodard", email="ian.woodard@sentry.io" },

{sentry_devenv-1.16.0 → sentry_devenv-1.18.0}/sentry_devenv.egg-info/PKG-INFO

@@ -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 → sentry_devenv-1.18.0}/sentry_devenv.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ devenv/sync.py
 devenv/update.py
 devenv/checks/__init__.py
 devenv/checks/credsStore.py
+devenv/checks/limaDns.py
 devenv/checks/test.py
 devenv/lib/__init__.py
 devenv/lib/archive.py

sentry_devenv-1.16.0/devenv/lib/docker.py

@@ -1,105 +0,0 @@
-from __future__ import annotations
-
-import os
-import shutil
-import socket
-import subprocess
-import tempfile
-from threading import Thread
-
-from devenv.constants import root
-from devenv.constants import SYSTEM_MACHINE
-from devenv.lib import archive
-from devenv.lib import proc
-
-
-def _accept_and_close(sock: socket.socket) -> None:
-    sock.listen()
-    conn, addr = sock.accept()
-    conn.close()
-
-
-def check_docker_to_host_connectivity(timeout: int = 3) -> bool:
-    sock = socket.socket()
-    sock.bind(("127.0.0.1", 0))
-    port = sock.getsockname()[1]
-
-    listener = Thread(target=_accept_and_close, args=(sock,))
-    listener.start()
-
-    rc = subprocess.call(
-        (
-            "docker",
-            "run",
-            "--rm",
-            "--add-host=host.docker.internal:host-gateway",
-            "busybox:1.36.1-musl",
-            "/bin/sh",
-            "-c",
-            f"/bin/echo hi | /bin/nc -w {timeout} host.docker.internal {port}",
-        )
-    )
-
-    if rc != 0:
-        # easiest way to terminate the socket server
-        # (so the thread doesn't indefinitely hang)
-        with socket.socket() as s:
-            s.connect(("127.0.0.1", port))
-            s.send(b"die")
-
-        listener.join()
-        return False
-
-    listener.join()
-    return True
-
-
-def uninstall(binroot: str) -> None:
-    for fp in (f"{binroot}/docker",):
-        try:
-            os.remove(fp)
-        except FileNotFoundError:
-            # it's better to do this than to guard with
-            # os.path.exists(fp) because if it's an invalid or circular
-            # symlink the result'll be False!
-            pass
-
-
-def _install(url: str, sha256: str, into: str) -> None:
-    os.makedirs(into, exist_ok=True)
-    with tempfile.TemporaryDirectory(dir=into) as tmpd:
-        archive_file = archive.download(url, sha256, dest=f"{tmpd}/download")
-        archive.unpack_strip_n(archive_file, tmpd, n=1)
-
-        # the archive was atomically placed into tmpd so
-        # these are on the same fs and can be atomically moved too
-        os.replace(f"{tmpd}/docker", f"{into}/docker")
-
-
-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_sha256": "1b621d4c9a57ff361811cf29754aafb0c28bc113c70011927af8d73c2c162186",
-        "darwin_arm64": "https://download.docker.com/mac/static/stable/aarch64/docker-27.3.1.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_sha256": "9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3",
-    }
-
-    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)
-
-    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}")