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

devenv/checks/dockerConfig.py

@@ -32,6 +32,14 @@ def check() -> tuple[bool, str]:
             "cliPluginsExtraDirs exists, which overshadows the default plugin path",
         )
 
+    # Ensure the current context is set to colima
+    current_context = config.get("currentContext", "")
+    if current_context != "colima":
+        return (
+            False,
+            f"currentContext is '{current_context}', should be 'colima'",
+        )
+
     return True, ""
 
 
@@ -43,6 +51,7 @@ def fix() -> tuple[bool, str]:
 
         config.pop("credsStore", None)
         config.pop("cliPluginsExtraDirs", None)
+        config["currentContext"] = "colima"
 
         with open(os.path.expanduser("~/.docker/config.json"), "w") as f:
             json.dump(config, f)

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

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

@@ -13,7 +13,7 @@ devenv/pythons.py,sha256=ZcjBrkfmQEkiMP217VyTG48cyteJdYG_hoQ6oFKx_CU,1252
 devenv/sync.py,sha256=B9bvAuI7K-4SqcfHD4_zwKpozAnHWCNOL-IhVOcc3Zg,1254
 devenv/update.py,sha256=89ovkmUQ9WUNDpKr7GP56w2jTKFSQbfv3PYTBYhj5z4,2403
 devenv/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devenv/checks/dockerConfig.py,sha256=5VExtcarjizPhR7OSdyWhkvzS6zY-6qiefxlwkexQuk,1623
+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
 devenv/checks/test.py,sha256=AvxoA2W5qTO2ZpoXmjScLiJxXD3Y_limYp5yTjGSZ9U,701
@@ -47,7 +47,7 @@ tests/test_pythons.py,sha256=Nepff11shv18irF3EYzf3U6zsRMrpLeS8QfrGJ3bTME,723
 tests/test_sync.py,sha256=ihCYFxscPwbVY_cnFyq2fvYUBc_SyB6gsElz334fmaw,871
 tests/utils.py,sha256=Qr2RM5Vo-14mF8tPSJITiYuhGc6fU9rk-fChxW-lokk,291
 tests/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/checks/test_dockerConfig.py,sha256=wJQ1ADdG4HJCQyiTirUk5VsEAUfhlSDWCJfW_ylH5po,1702
+tests/checks/test_dockerConfig.py,sha256=R9ed7DfYcCn37__98y3itCVG37BCDbJa0gLA9fQTp70,2978
 tests/doctor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/doctor/test_attempt_fix.py,sha256=cGUv7-xRKWCizC9cNNqiCp7aa95k3nHUXvRFFuLfJ34,1075
 tests/doctor/test_filter_failing_checks.py,sha256=5L5XdBSyeySwZtJeAR71lbktt3NxkJdUfncKBJPYdAc,1270
@@ -72,8 +72,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.1.dist-info/METADATA,sha256=UkT76m27R5FvrzZyuewNtQM5iJJSTUpGYF-93--GnYw,15500
-sentry_devenv-1.22.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sentry_devenv-1.22.1.dist-info/entry_points.txt,sha256=StsIuNugcoEU8jsPy6H9ECjzoDzOVKXl1vUaYTIGbzM,44
-sentry_devenv-1.22.1.dist-info/top_level.txt,sha256=dOQExvIA0fj_EQjCrMTS7CCHNH7WZFHxEU0M7LlNcKQ,16
-sentry_devenv-1.22.1.dist-info/RECORD,,
+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,,

tests/checks/test_dockerConfig.py

@@ -24,12 +24,14 @@ def fake_config(tmp_path: pathlib.Path) -> Generator[pathlib.Path]:
 
 
 def test_no_credsStore_ok(fake_config: pathlib.Path) -> None:
-    fake_config.write_text("{}")
+    fake_config.write_text('{"currentContext": "colima"}')
     assert dockerConfig.check() == (True, "")
 
 
 def test_binary_ok(fake_config: pathlib.Path) -> None:
-    fake_config.write_text('{"credsStore": "example"}')
+    fake_config.write_text(
+        '{"credsStore": "example", "currentContext": "colima"}'
+    )
     with mock.patch.object(shutil, "which", return_value="/fake/exe"):
         assert dockerConfig.check() == (True, "")
 
@@ -47,10 +49,45 @@ def test_binary_missing(fake_config: pathlib.Path, name: str) -> None:
 def test_fix_credsStore(fake_config: pathlib.Path) -> None:
     fake_config.write_text('{"credsStore": "bad"}')
     assert dockerConfig.fix() == (True, "")
-    assert fake_config.read_text() == "{}"
+    assert fake_config.read_text() == '{"currentContext": "colima"}'
 
 
 def test_fix_cliPluginsExtraDirs(fake_config: pathlib.Path) -> None:
     fake_config.write_text('{"cliPluginsExtraDirs": ["foo/"]}')
     assert dockerConfig.fix() == (True, "")
-    assert fake_config.read_text() == "{}"
+    assert fake_config.read_text() == '{"currentContext": "colima"}'
+
+
+def test_currentContext_missing(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"auths": {}}')
+    assert dockerConfig.check() == (
+        False,
+        "currentContext is '', should be 'colima'",
+    )
+
+
+def test_currentContext_wrong(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"currentContext": "desktop"}')
+    assert dockerConfig.check() == (
+        False,
+        "currentContext is 'desktop', should be 'colima'",
+    )
+
+
+def test_currentContext_correct(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"currentContext": "colima"}')
+    assert dockerConfig.check() == (True, "")
+
+
+def test_fix_currentContext_missing(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"auths": {}}')
+    assert dockerConfig.fix() == (True, "")
+    assert (
+        fake_config.read_text() == '{"auths": {}, "currentContext": "colima"}'
+    )
+
+
+def test_fix_currentContext_wrong(fake_config: pathlib.Path) -> None:
+    fake_config.write_text('{"currentContext": "docker-desktop"}')
+    assert dockerConfig.fix() == (True, "")
+    assert fake_config.read_text() == '{"currentContext": "colima"}'