re-order variables

Author: npalaska

lib/pbench/server/api/resources/endpoint_configure.py

@@ -178,18 +178,18 @@ def get(self):
         }
 
         try:
-            secret = self.server_config.get("openid-connect", "secret")
             client = self.server_config.get("openid-connect", "client")
             realm = self.server_config.get("openid-connect", "realm")
+            secret = self.server_config.get("openid-connect", "secret")
             server = self.server_config.get("openid-connect", "server_url")
         except (NoOptionError, NoSectionError):
             pass
         else:
             endpoints["openid"] = {
                 "client": client,
                 "realm": realm,
-                "server": server,
                 "secret": secret,
+                "server": server,
             }
 
         try:

lib/pbench/test/unit/server/test_endpoint_configure.py

@@ -140,17 +140,17 @@ def check_config(self, client, server_config, host, my_headers={}):
 
         try:
             oidc_client = server_config.get("openid-connect", "client")
-            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")
+            oidc_server = server_config.get("openid-connect", "server_url")
         except (NoOptionError, NoSectionError):
             pass
         else:
             expected_results["openid-connect"] = {
                 "client": oidc_client,
-                "server": oidc_server,
                 "realm": oidc_realm,
                 "secret": oidc_secret,
+                "server": oidc_server,
             }
 
         response = client.get(f"{server_config.rest_uri}/endpoints", headers=my_headers)