sentry-devenv 1.22.2__py3-none-any.whl → 1.24.0__py3-none-any.whl

devenv/checks/colimaSsh.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+
+import os
+import sys
+
+from devenv import constants
+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 ssh credentials should only be owner rw"
+
+
+def only_owner_can_rw(path: str) -> bool:
+    mode = os.stat(path).st_mode & 0o777
+    return mode == 0o400 or mode == 0o600
+
+
+@checker
+def check() -> tuple[bool, str]:
+    lima_ssh_creds = f"{constants.home}/.colima/_lima/_config/user"
+
+    if not only_owner_can_rw(lima_ssh_creds):
+        return (
+            False,
+            f"Permission bits on {lima_ssh_creds} are too permissive; colima startup will hang on waiting for ssh",
+        )
+
+    return True, ""
+
+
+@fixer
+def fix() -> tuple[bool, str]:
+    lima_ssh_creds = f"{constants.home}/.colima/_lima/_config/user"
+
+    os.chmod(lima_ssh_creds, 0o600)
+
+    try:
+        proc.run((sys.executable, "-P", "-m", "devenv", "colima", "start"))
+    except RuntimeError as e:
+        return (
+            False,
+            f"""Failed to start colima: {e}
+
+
+========================================================================================
+You might want to share the last 100 lines of colima's stderr log in #discuss-dev-infra:
+
+`tail -n 100 ~/.colima/_lima/colima/ha.stderr.log`
+""",
+        )
+
+    return True, ""

devenv/fetch.py

@@ -37,18 +37,23 @@ def main(context: Context, argv: Sequence[str] | None = None) -> ExitCode:
     ]:
         fetch(code_root, "getsentry/sentry", auth=CI is None, sync=False)
 
-        print("Installing sentry's brew dependencies...")
-        if CI:
-            if DARWIN:
+        if DARWIN:
+            print("Installing sentry's brew dependencies...")
+            if CI:
                 # Installing everything from brew takes too much time,
                 # and chromedriver cask flakes occasionally. Really all we need to
                 # set up the devenv is colima and docker-cli.
                 # This is also required for arm64 macOS GHA runners.
                 # We manage colima, so just need to install docker + qemu here.
                 proc.run(("brew", "install", "docker", "qemu"))
+            else:
+                proc.run(
+                    (f"{homebrew_bin}/brew", "bundle"),
+                    cwd=f"{code_root}/sentry",
+                )
         else:
-            proc.run(
-                (f"{homebrew_bin}/brew", "bundle"), cwd=f"{code_root}/sentry"
+            print(
+                "Not on MacOS; assuming you have a docker cli and runtime installed."
             )
 
         proc.run(

devenv/lib/colima.py

@@ -196,7 +196,7 @@ def start(restart: bool = False) -> ColimaStatus:
             "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",
+            f"--mount=/var/folders:w,/private/tmp/colima:w,{home}:w,/tmp/:w",
             *args,
         ),
         pathprepend=f"{root}/bin",

devenv/update.py

@@ -72,6 +72,14 @@ Global devenv at {constants.root}/bin/devenv updated.
 """
         )
 
+    # install-devenv.sh originally creates this symlink
+    # but we should make sure it exists no matter what
+    # in case it's accidentally deleted by the user
+    if not global_devenv_exists:
+        os.symlink(
+            f"{constants.root}/venv/bin/devenv", f"{constants.root}/bin/devenv"
+        )
+
     proc.run((sys.executable, "-P", "-m", "devenv", "update", "--post-update"))
 
     if not is_global_devenv:

{sentry_devenv-1.22.2.dist-info → sentry_devenv-1.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry_devenv
-Version: 1.22.2
+Version: 1.24.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.22.2.dist-info → sentry_devenv-1.24.0.dist-info}/RECORD

@@ -5,14 +5,15 @@ devenv/bootstrap.py,sha256=VSlS1giUv8fE0K5pZgIO-QBKg5PsaWxirF6G9OPUUhE,4047
 devenv/colima.py,sha256=Dk9t6eu2DEoqqkY8xLmgiB96r-6zi3aXcvON3P8h1JQ,1537
 devenv/constants.py,sha256=wl0sRfkNeJL-sML6MG5nS0zU-dwRo1mDPrhUSHHY1YQ,1498
 devenv/doctor.py,sha256=tcwXrE2Y7Ued2gAXCXtfFkyXbG9DOi6jVobbq6DnuZs,8663
-devenv/fetch.py,sha256=MbztGFOzBR4KDPG0TVWcQsA4pGXk61zrQXvh-C9xHuk,3904
+devenv/fetch.py,sha256=adDMbqQF19Q_MmunQMMy6n3rBGpUh3ju1Thrt-5OA4I,4078
 devenv/main.py,sha256=grOHjy0kUJjeGW8STg-WMneVYlkTRVMoFjNdIgt7sjg,3267
 devenv/pin_gha.py,sha256=t7A5CV1bnYRa4SAikuoJeodHuwV6moIePvhQ1Zdc1eE,2187
 devenv/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devenv/pythons.py,sha256=ZcjBrkfmQEkiMP217VyTG48cyteJdYG_hoQ6oFKx_CU,1252
 devenv/sync.py,sha256=B9bvAuI7K-4SqcfHD4_zwKpozAnHWCNOL-IhVOcc3Zg,1254
-devenv/update.py,sha256=89ovkmUQ9WUNDpKr7GP56w2jTKFSQbfv3PYTBYhj5z4,2403
+devenv/update.py,sha256=hkapWwk5L_sHvGSLoXqs0JVRjNfHN80xf5o8W61tOjs,2710
 devenv/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+devenv/checks/colimaSsh.py,sha256=FCF2y-JrCWWyKVDLDddwuOA1J4NQnKIirxBs8EIbRGk,1363
 devenv/checks/dockerConfig.py,sha256=l1xhsN0z3my27_DseXyBq_iVcGSgWKHi6suYOyBoWvo,1929
 devenv/checks/dockerDesktop.py,sha256=ynt8nNQ2DDT2rJDGZ-g7xxc4HErHJV_iqBqYHQtvA7Q,1343
 devenv/checks/limaDns.py,sha256=cHef2czdYYLvQqiM4bxiYtzYw4UVTIXJPwrGW2Kjpxo,1885
@@ -20,7 +21,7 @@ devenv/checks/test.py,sha256=AvxoA2W5qTO2ZpoXmjScLiJxXD3Y_limYp5yTjGSZ9U,701
 devenv/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devenv/lib/archive.py,sha256=75MjlDuwHVaazbNUr8vJmqTyl4Jz6KRd_fUcpwvPwec,4710
 devenv/lib/brew.py,sha256=_7recvYh-LnUJC0eKnYK7F8AzGRL5bi_Khv0f_mgrlM,1795
-devenv/lib/colima.py,sha256=eyGtE5EmkKESwe1dENh5vp8LuuRTJNzP5ikkLv6wk3w,7526
+devenv/lib/colima.py,sha256=xd9EpysU2JlD0mD8rDv78QeetaUs7q4HOJXxXnAb1Mc,7534
 devenv/lib/config.py,sha256=5eXYwM44AJ3w2VfVbCDqchYOL1zAjazNcirtM6kxxGw,3344
 devenv/lib/context.py,sha256=4EDImK9pvTp3FqeNigevC9lbJsgdDO9D1t2_Y4NyPlc,207
 devenv/lib/direnv.py,sha256=HDRUaIR0PMAQYiiTaw3gEQuh6Tdb7BUJmV7dBZdPztM,1325
@@ -72,8 +73,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=3XGpINFBkn6Yq4OycsF-Ki4xMWAINt2g69uOHtkDU6k,3266
-sentry_devenv-1.22.2.dist-info/METADATA,sha256=o0O5ZZOakaOZ_olZE1m_EjgPFJE-OmiZmGBQQiNqHQs,15500
-sentry_devenv-1.22.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sentry_devenv-1.22.2.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
-sentry_devenv-1.22.2.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
-sentry_devenv-1.22.2.dist-info/RECORD,,
+sentry_devenv-1.24.0.dist-info/METADATA,sha256=w5wVhVx5bE8mhGjpkyNegoQxclAtzbdL9zsac6fytew,15500
+sentry_devenv-1.24.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sentry_devenv-1.24.0.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
+sentry_devenv-1.24.0.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
+sentry_devenv-1.24.0.dist-info/RECORD,,