(airflow) branch main updated: Clean up Breeze output for Docker context (#38857)

[uranusjr]

This is an automated email from the ASF dual-hosted git repository.

uranusjr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 5d10c4ae67 Clean up Breeze output for Docker context (#38857)
5d10c4ae67 is described below

commit 5d10c4ae67d477fb1456aadeed367dd55aa068e3
Author: Tzu-ping Chung <uranu...@gmail.com>
AuthorDate: Tue Apr 9 20:04:29 2024 +0800

    Clean up Breeze output for Docker context (#38857)
---
 dev/breeze/src/airflow_breeze/utils/docker_command_utils.py | 10 ++++------
 dev/breeze/tests/test_docker_command_utils.py               | 10 +++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py 
b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
index ce07977a7b..ef7779afd9 100644
--- a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
+++ b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
@@ -648,7 +648,7 @@ def autodetect_docker_context():
         # On Windows, some contexts are used for WSL2. We don't want to use 
those.
         if context["DockerEndpoint"] == 
"npipe:////./pipe/dockerDesktopLinuxEngine":
             continue
-        get_console().print(f"[info]Using {preferred_context_name} as 
context.[/]")
+        get_console().print(f"[info]Using {preferred_context_name!r} as 
context.[/]")
         return preferred_context_name
     fallback_context = next(iter(known_contexts))
     get_console().print(
@@ -662,11 +662,9 @@ def get_and_use_docker_context(context: str):
     if context == "autodetect":
         context = autodetect_docker_context()
     run_command(["docker", "context", "create", context], check=False)
-    output = run_command(["docker", "context", "use", context], check=False)
-    if output.returncode != 0:
-        get_console().print(
-            f"[warning] Could no use the context {context}. Continuing with 
current context[/]"
-        )
+    output = run_command(["docker", "context", "use", context], check=False, 
stdout=DEVNULL, stderr=DEVNULL)
+    if output.returncode:
+        get_console().print(f"[warning]Could no use context {context!r}. 
Continuing with current context[/]")
     return context
 
 
diff --git a/dev/breeze/tests/test_docker_command_utils.py 
b/dev/breeze/tests/test_docker_command_utils.py
index 55aaadb342..731935ec01 100644
--- a/dev/breeze/tests/test_docker_command_utils.py
+++ b/dev/breeze/tests/test_docker_command_utils.py
@@ -205,7 +205,7 @@ def _fake_ctx_output(*names: str) -> str:
         (
             _fake_ctx_output("default"),
             "default",
-            "[info]Using default as context",
+            "[info]Using 'default' as context",
         ),
         ("\n", "default", "[warning]Could not detect docker builder"),
         (
@@ -216,22 +216,22 @@ def _fake_ctx_output(*names: str) -> str:
         (
             _fake_ctx_output("a", "desktop-linux"),
             "desktop-linux",
-            "[info]Using desktop-linux as context",
+            "[info]Using 'desktop-linux' as context",
         ),
         (
             _fake_ctx_output("a", "default"),
             "default",
-            "[info]Using default as context",
+            "[info]Using 'default' as context",
         ),
         (
             _fake_ctx_output("a", "default", "desktop-linux"),
             "desktop-linux",
-            "[info]Using desktop-linux as context",
+            "[info]Using 'desktop-linux' as context",
         ),
         (
             '[{"Name": "desktop-linux", "DockerEndpoint": 
"unix://desktop-linux"}]',
             "desktop-linux",
-            "[info]Using desktop-linux as context",
+            "[info]Using 'desktop-linux' as context",
         ),
     ],
 )