Healthcheck gives correct result even behind proxy (#1964)

* Fixed #1962

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update base-notebook/docker_healthcheck.py

Use empty string instead of None

Co-authored-by: Ayaz Salikhov <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ayaz Salikhov <[email protected]>

Author: 3 people

base-notebook/docker_healthcheck.py

@@ -16,6 +16,11 @@
 url = json.loads(json_file.read_bytes())["url"]
 url = url + "api"
 
-r = requests.get(url, verify=False)  # request without SSL verification
+proxies = {
+    "http": "",
+    "https": "",
+}
+
+r = requests.get(url, proxies=proxies, verify=False)  # request without SSL verification
 r.raise_for_status()
 print(r.content)

tests/base-notebook/test_healthcheck.py

@@ -69,6 +69,53 @@ def test_health(
     assert get_health(running_container) == "healthy"
 
 
+@pytest.mark.parametrize(
+    "env,cmd,user",
+    [
+        (
+            ["HTTPS_PROXY=host.docker.internal", "HTTP_PROXY=host.docker.internal"],
+            None,
+            None,
+        ),
+        (
+            [
+                "NB_USER=testuser",
+                "CHOWN_HOME=1",
+                "JUPYTER_PORT=8123",
+                "HTTPS_PROXY=host.docker.internal",
+                "HTTP_PROXY=host.docker.internal",
+            ],
+            ["start-notebook.sh", "--ServerApp.base_url=/test"],
+            "root",
+        ),
+    ],
+)
+def test_health_proxy(
+    container: TrackedContainer,
+    env: Optional[list[str]],
+    cmd: Optional[list[str]],
+    user: Optional[str],
+) -> None:
+    running_container = container.run_detached(
+        tty=True,
+        environment=env,
+        command=cmd,
+        user=user,
+    )
+
+    # sleeping some time to let the server start
+    time_spent = 0.0
+    wait_time = 0.1
+    time_limit = 15
+    while time_spent < time_limit:
+        time.sleep(wait_time)
+        time_spent += wait_time
+        if get_health(running_container) == "healthy":
+            return
+
+    assert get_health(running_container) == "healthy"
+
+
 @pytest.mark.parametrize(
     "env,cmd,user",
     [