Remove hyphen from openid-connect section of the endpoints api

distributed-system-analysis · Feb 9, 2023 · 809b553 · 809b553
1 parent 36cbbd1
commit 809b553
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/pbench/server/api/resources/endpoint_configure.py b/lib/pbench/server/api/resources/endpoint_configure.py
@@ -181,14 +181,14 @@ def get(self):
             secret = self.server_config.get("openid-connect", "secret")
             client = self.server_config.get("openid-connect", "client")
             realm = self.server_config.get("openid-connect", "realm")
-            issuer = self.server_config.get("openid-connect", "server_url")
+            server = self.server_config.get("openid-connect", "server_url")
         except (NoOptionError, NoSectionError):
             pass
         else:
-            endpoints["openid-connect"] = {
+            endpoints["openid"] = {
                 "client": client,
                 "realm": realm,
-                "issuer": issuer,
+                "server": server,
                 "secret": secret,
             }
 

diff --git a/lib/pbench/test/functional/server/test_connect.py b/lib/pbench/test/functional/server/test_connect.py
@@ -28,6 +28,6 @@ def test_connect(self, server_client: PbenchServerClient):
             assert e in endpoints["uri"].keys()
 
         # verify all the required openid-connect fields are present
-        if "openid-connect" in endpoints:
-            expected = {"issuer", "client", "realm", "secret"}
-            assert set(endpoints["openid-connect"]) >= expected
+        if "openid" in endpoints:
+            expected = {"server", "client", "realm", "secret"}
+            assert set(endpoints["openid"]) >= expected
diff --git a/lib/pbench/test/unit/server/test_endpoint_configure.py b/lib/pbench/test/unit/server/test_endpoint_configure.py
@@ -140,15 +140,15 @@ def check_config(self, client, server_config, host, my_headers={}):
 
         try:
             oidc_client = server_config.get("openid-connect", "client")
-            oidc_issuer = server_config.get("openid-connect", "server_url")
+            oidc_server = server_config.get("openid-connect", "server_url")
             oidc_realm = server_config.get("openid-connect", "realm")
             oidc_secret = server_config.get("openid-connect", "secret")
         except (NoOptionError, NoSectionError):
             pass
         else:
             expected_results["openid-connect"] = {
                 "client": oidc_client,
-                "issuer": oidc_issuer,
+                "server": oidc_server,
                 "realm": oidc_realm,
                 "secret": oidc_secret,
             }