sentry-devenv 1.17.0__tar.gz → 1.19.0__tar.gz

{sentry_devenv-1.17.0 → sentry_devenv-1.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_devenv
-Version: 1.17.0
+Version: 1.19.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

{sentry_devenv-1.17.0 → sentry_devenv-1.19.0}/devenv/checks/credsStore.py

@@ -8,7 +8,7 @@ from devenv.lib_check.types import checker
 from devenv.lib_check.types import fixer
 
 tags: set[str] = {"builtin"}
-name = "credsStore"
+name = "credsStore fix"
 
 
 @checker

sentry_devenv-1.19.0/devenv/checks/dockerDesktop.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import time
+
+from devenv.lib import proc
+from devenv.lib_check.types import checker
+from devenv.lib_check.types import fixer
+
+tags: set[str] = {"builtin"}
+name = "docker desktop shouldn't be running"
+
+
+def docker_desktop_is_running() -> bool:
+    procs = proc.run(("/bin/ps", "-Ac", "-o", "comm"), stdout=True)
+    return "Docker Desktop" in procs.split("\n")
+
+
+@checker
+def check() -> tuple[bool, str]:
+    if docker_desktop_is_running():
+        return (
+            False,
+            "Docker Desktop is running. We don't support it, and it conflicts with colima.",
+        )
+
+    return True, ""
+
+
+@fixer
+def fix() -> tuple[bool, str]:
+    # regular pkill won't stop the Docker Desktop UI,
+    # it'll just spin. the proper way to terminate it
+    # without SIGKILL is to use osascript.
+    print("Attempting to stop Docker Desktop.")
+    try:
+        proc.run(("osascript", "-e", 'quit app "Docker Desktop"'))
+    except RuntimeError as e:
+        return False, f"failed to quit Docker Desktop:\n{e}\n"
+
+    # osascript doesn't wait to make sure it finishes quitting
+    # so let's block for up to 5 secs
+    for _ in range(10):
+        time.sleep(0.5)
+        if not docker_desktop_is_running():
+            return True, ""
+
+    return False, "Docker Desktop is taking too long to quit... try again?"

sentry_devenv-1.19.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 = "colima's DNS isn't working"
+
+
+@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 running."
+
+    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.17.0 → sentry_devenv-1.19.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.17.0 → sentry_devenv-1.19.0}/devenv/doctor.py

@@ -143,7 +143,7 @@ def run_checks(
     results: dict[Check, tuple[bool, str]] = {}
     for check in checks:
         if check in skip:
-            print(f"\t⏭️  Skipped {check.name}".expandtabs(4))
+            print(f"   ⏭️  Skipped {check.name}")
             continue
         futures[check] = executor.submit(check.check)
     for check, future in futures.items():
@@ -162,9 +162,9 @@ def filter_failing_checks(
     for check, result in results.items():
         ok, msg = result
         if ok:
-            print(f"\t✅ check: {check.name}".expandtabs(4))
+            print(f"   ✅ check: {check.name}")
             continue
-        print(f"\t❌ check: {check.name}{msg}".expandtabs(4))
+        print(f"   ❌ check: {check.name}\n   {msg}")
         failing_checks.append(check)
     return failing_checks
 
@@ -172,7 +172,7 @@ def filter_failing_checks(
 def prompt_for_fix(check: Check) -> bool:
     """Prompt the user to attempt a fix."""
     return input(
-        f"\t\tDo you want to attempt to fix {check.name}? (Y/n): ".expandtabs(4)
+        f"   Do you want to attempt to fix {check.name}? (Y/n): "
     ).lower() in {"y", "yes", ""}
 
 
@@ -229,19 +229,19 @@ def main(context: Context, argv: Sequence[str] | None = None) -> int:
         if args.check_only:
             return 1
 
-    print("\nThe following problems have been identified:")
     skip: list[Check] = []
+    print("\nLet's go through the failures one by one.")
     for check in failing_checks:
-        print(f"\t❌ {check.name}".expandtabs(4))
+        print(f"❌ {check.name}")
         # Prompt for fixes one by one, so the user can decide to skip a fix.
         if prompt_for_fix(check):
             ok, msg = attempt_fix(check, executor)
             if ok:
-                print(f"\t\t✅ fix: {check.name}".expandtabs(4))
+                print(f"✅ fix: {check.name}")
             else:
-                print(f"\t\t❌ fix: {check.name}{msg}".expandtabs(4))
+                print(f"❌ fix: {check.name}{msg}")
         else:
-            print(f"\t\t⏭️  Skipping {check.name}".expandtabs(4))
+            print(f"   ⏭️  Skipping {check.name}")
             skip.append(check)
 
     print("\nChecking that fixes worked as expected...")

{sentry_devenv-1.17.0 → sentry_devenv-1.19.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.17.0 → sentry_devenv-1.19.0}/pyproject.toml

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

{sentry_devenv-1.17.0 → sentry_devenv-1.19.0}/sentry_devenv.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_devenv
-Version: 1.17.0
+Version: 1.19.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

{sentry_devenv-1.17.0 → sentry_devenv-1.19.0}/sentry_devenv.egg-info/SOURCES.txt

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

{sentry_devenv-1.17.0 → sentry_devenv-1.19.0}/tests/doctor/test_run_checks.py

@@ -51,7 +51,7 @@ def test_run_checks_skip(capsys: pytest.CaptureFixture[str]) -> None:
         [first_check, second_check], ThreadPoolExecutor(), skip=[second_check]
     ) == {first_check: (True, "")}
     captured = capsys.readouterr()
-    assert captured.out == "    ⏭️  Skipped failing check\n"
+    assert captured.out == "   ⏭️  Skipped failing check\n"
 
 
 def test_run_checks_multiple_failing_checks() -> None: