Remove some leftover debugging output

Author: minrk

jupyterhub_traefik_proxy/etcd.py

@@ -98,7 +98,6 @@ def _default_client(self):
             )
         if self.etcd_client_kwargs:
             kwargs.update(self.etcd_client_kwargs)
-        print(f"Creating etcd with {kwargs=}")
         return etcd3.client(**kwargs)
 
     def _cleanup(self):
@@ -168,11 +167,6 @@ def _setup_traefik_static_config(self):
         if url.scheme == "https":
             # If etcd is running over TLS, then traefik needs to know
             etcd_config["tls"] = {}
-            # tls_conf = {}
-            # if self.etcd_client_ca_cert is not None:
-            #     tls_conf["ca"] = self.etcd_client_ca_cert
-            # tls_conf["insecureSkipVerify"] = self.etcd_insecure_skip_verify
-            # self.static_config["providers"]["etcd"]["tls"] = tls_conf
 
         if self.etcd_username and self.etcd_password:
             etcd_config.update(

tests/conftest.py

@@ -17,7 +17,6 @@
 from certipy import Certipy
 from consul.aio import Consul
 from jupyterhub.utils import exponential_backoff
-from passlib.hash import apr_md5_crypt
 from traitlets.log import get_logger
 
 from jupyterhub_traefik_proxy.consul import TraefikConsulProxy
@@ -60,15 +59,6 @@ class Config:
     public_url = "https://127.0.0.1:8000"
 
 
-# initial kv config for the API for external kv-stores
-_kv_config = {
-    "traefik/http/middlewares/auth_api/basicAuth/users/0": f"{Config.traefik_api_user}:{apr_md5_crypt(Config.traefik_api_pass)}",
-    "traefik/http/routers/route_api/entryPoints/0": "auth_api",
-    "traefik/http/routers/route_api/middlewares/0": "auth_api",
-    "traefik/http/routers/route_api/rule": "(Host(`127.0.0.1`) || Host(`localhost`)) && PathPrefix(`/api`)",
-    "traefik/http/routers/route_api/service": "api@internal",
-}
-
 # Define a "slow" test marker so that we can run the slow tests at the end
 
 
@@ -300,16 +290,16 @@ def _check_ssl(proxy, client_ca):
     context.load_cert_chain(proxy.ssl_cert, proxy.ssl_key)
 
     url = urlparse(Config.public_url)
-    cert = ssl.get_server_certificate((url.hostname, url.port))
-    from cryptography import x509
-    from cryptography.hazmat.backends import default_backend
+    ssl.get_server_certificate((url.hostname, url.port))
 
-    certDecoded = x509.load_pem_x509_certificate(str.encode(cert), default_backend())
-    print(certDecoded)
-    print(certDecoded.issuer)
-    print(certDecoded.subject)
-    print(certDecoded.not_valid_after)
-    print(certDecoded.not_valid_before)
+    # from cryptography import x509
+    # from cryptography.hazmat.backends import default_backend
+    # certDecoded = x509.load_pem_x509_certificate(str.encode(cert), default_backend())
+    # print(certDecoded)
+    # print(certDecoded.issuer)
+    # print(certDecoded.subject)
+    # print(certDecoded.not_valid_after)
+    # print(certDecoded.not_valid_before)
 
     conn = context.wrap_socket(
         socket.socket(socket.AF_INET),
@@ -318,9 +308,7 @@ def _check_ssl(proxy, client_ca):
     # 5 second timeout
     conn.settimeout(5.0)
     conn.connect((url.hostname, url.port))
-    ssl_info = conn.getpeercert()
-    print(ssl_info, type(ssl_info))
-    # assert ssl_info == None
+    conn.getpeercert()
 
 
 @pytest.fixture
@@ -553,8 +541,6 @@ def _enable_auth_in_etcd(*common_args):
 @pytest.fixture
 async def launch_etcd_auth(etcd_ssl_key_cert, etcd_client_ca):
     key, cert = etcd_ssl_key_cert
-    print(f"{key=} {cert=}")
-    os.system(f"openssl x509 -nooout -text -in {cert}")
     etcd_proc = subprocess.Popen(
         [
             "etcd",

tests/utils.py

@@ -45,11 +45,10 @@ async def check_host_up_http(url, **req_kwargs):
     A socket listening may not be enough
     """
     u = urlparse(url)
-    # first, check the scket
+    # first, check the socket
     socket_open = is_open(u.hostname, u.port or 80)
     if not socket_open:
         return False
-    # req_kwargs.setdefault("validate_cert", False)
     req = HTTPRequest(url, **req_kwargs)
     print(req)
     try: