From ee7c1d3ba3aa5fcb57bf30beed53ed5be625c004 Mon Sep 17 00:00:00 2001 From: MichaelClifford Date: Mon, 13 Mar 2023 17:07:13 -0400 Subject: [PATCH] remove hardcoded port 6443 in auth --- src/codeflare_sdk/cluster/auth.py | 4 ++-- tests/unit_test.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/codeflare_sdk/cluster/auth.py b/src/codeflare_sdk/cluster/auth.py index a57abbc34..edf38fde2 100644 --- a/src/codeflare_sdk/cluster/auth.py +++ b/src/codeflare_sdk/cluster/auth.py @@ -65,7 +65,7 @@ def login(self) -> str: Depending on the cluster, a user can choose to login in with "--insecure-skip-tls-verify` by setting `skip_tls` to `True`. """ - args = [f"--token={self.token}", f"--server={self.server}:6443"] + args = [f"--token={self.token}", f"--server={self.server}"] if self.skip_tls: args.append("--insecure-skip-tls-verify") try: @@ -84,7 +84,7 @@ def logout(self) -> str: """ This function is used to logout of an OpenShift cluster. """ - args = [f"--token={self.token}", f"--server={self.server}:6443"] + args = [f"--token={self.token}", f"--server={self.server}"] response = oc.invoke("logout", args) return response.out() diff --git a/tests/unit_test.py b/tests/unit_test.py index 36901b1b1..c6a0041b0 100644 --- a/tests/unit_test.py +++ b/tests/unit_test.py @@ -116,7 +116,7 @@ def test_token_auth_login_logout(mocker): mock_res = mocker.patch.object(openshift.Result, "out") mock_res.side_effect = lambda: att_side_effect(fake_res) - token_auth = TokenAuthentication(token="testtoken", server="testserver") + token_auth = TokenAuthentication(token="testtoken", server="testserver:6443") assert token_auth.login() == ( "login", ["--token=testtoken", "--server=testserver:6443"], @@ -137,7 +137,7 @@ def test_token_auth_login_tls(mocker): # assert token_auth.login() == "Error: certificate auth failure, please set `skip_tls=True` in TokenAuthentication" token_auth = TokenAuthentication( - token="testtoken", server="testserver", skip_tls=True + token="testtoken", server="testserver:6443", skip_tls=True ) assert token_auth.login() == ( "login",