Wrap url mapping logic in a function

Author: hgreebe

api/PclusterApiHandler.py

@@ -32,14 +32,13 @@
 USER_POOL_ID = os.getenv("USER_POOL_ID")
 AUTH_PATH = os.getenv("AUTH_PATH")
 API_BASE_URL = os.getenv("API_BASE_URL")
-API_VERSION = sorted(os.getenv("API_VERSION", "3.1.0").split(","), key=lambda x: [-int(n) for n in x.split('.')])
+API_VERSION = sorted(os.getenv("API_VERSION", "3.1.0").strip().split(","), key=lambda x: [-int(n) for n in x.split('.')])
 DEFAULT_API_VERSION = API_VERSION[0]
 API_USER_ROLE = os.getenv("API_USER_ROLE")
 OIDC_PROVIDER = os.getenv("OIDC_PROVIDER")
 CLIENT_ID = os.getenv("CLIENT_ID")
 CLIENT_SECRET = os.getenv("CLIENT_SECRET")
 SECRET_ID = os.getenv("SECRET_ID")
-SITE_URL = os.getenv("SITE_URL")
 SCOPES_LIST = os.getenv("SCOPES_LIST")
 REGION = os.getenv("AWS_DEFAULT_REGION")
 TOKEN_URL = os.getenv("TOKEN_URL", f"{AUTH_PATH}/oauth2/token")
@@ -49,6 +48,7 @@
 AUDIENCE = os.getenv("AUDIENCE")
 USER_ROLES_CLAIM = os.getenv("USER_ROLES_CLAIM", "cognito:groups")
 SSM_LOG_GROUP_NAME = os.getenv("SSM_LOG_GROUP_NAME")
+ARG_VERSION="version"
 
 try:
     if (not USER_POOL_ID or USER_POOL_ID == "") and SECRET_ID:
@@ -63,13 +63,18 @@
 if not JWKS_URL:
     JWKS_URL = os.getenv("JWKS_URL",
                          f"https://cognito-idp.{REGION}.amazonaws.com/{USER_POOL_ID}/" ".well-known/jwks.json")
-API_BASE_URL_MAPPING = {}
 
-if API_BASE_URL:
-    for url in API_BASE_URL.split(","):
-        if url:
-            pair=url.split("=")
-            API_BASE_URL_MAPPING[pair[0]] = pair[1]
+def create_url_map(url_list):
+    url_map = {}
+    if url_list:
+        for url in url_list.split(","):
+            if url:
+                pair=url.split("=")
+                url_map[pair[0]] = pair[1]
+    return url_map
+
+API_BASE_URL_MAPPING = create_url_map(API_BASE_URL)
+SITE_URL = os.getenv("SITE_URL", API_BASE_URL_MAPPING.get(DEFAULT_API_VERSION))
 
 
 
@@ -242,9 +247,9 @@ def ec2_action():
 def get_cluster_config_text(cluster_name, region=None):
     url = f"/v3/clusters/{cluster_name}"
     if region:
-        info_resp = sigv4_request("GET", get_base_url(request.args.get("version")), url, params={"region": region})
+        info_resp = sigv4_request("GET", get_base_url(request), url, params={"region": region})
     else:
-        info_resp = sigv4_request("GET", get_base_url(request.args.get("version")), url)
+        info_resp = sigv4_request("GET", get_base_url(request), url)
     if info_resp.status_code != 200:
         abort(info_resp.status_code)
 
@@ -493,7 +498,7 @@ def get_dcv_session():
 
 
 def get_custom_image_config():
-    image_info = sigv4_request("GET", get_base_url(request.args.get("version")), f"/v3/images/custom/{request.args.get('image_id')}").json()
+    image_info = sigv4_request("GET", get_base_url(request), f"/v3/images/custom/{request.args.get('image_id')}").json()
     configuration = requests.get(image_info["imageConfiguration"]["url"])
     return configuration.text
 
@@ -744,9 +749,10 @@ def _get_params(_request):
     params.pop("path")
     return params
 
-def get_base_url(v):
-    if v and str(v) in API_VERSION:
-        return API_BASE_URL_MAPPING[str(v)]
+def get_base_url(request):
+    version = request.args.get(ARG_VERSION)
+    if version and str(version) in API_VERSION:
+        return API_BASE_URL_MAPPING[str(version)]
     return API_BASE_URL_MAPPING[DEFAULT_API_VERSION]
 
 
@@ -756,7 +762,7 @@ def get_base_url(v):
 @authenticated({'admin'})
 @validated(params=PCProxyArgs)
 def pc_proxy_get():
-    response = sigv4_request(request.method, get_base_url(request.args.get("version")), request.args.get("path"), _get_params(request))
+    response = sigv4_request(request.method, get_base_url(request), request.args.get("path"), _get_params(request))
     return response.json(), response.status_code
 
 @pc.route('/', methods=['POST','PUT','PATCH','DELETE'], strict_slashes=False)
@@ -770,5 +776,5 @@ def pc_proxy():
     except:
         pass
 
-    response = sigv4_request(request.method, get_base_url(request.args.get("version")), request.args.get("path"), _get_params(request), body=body)
+    response = sigv4_request(request.method, get_base_url(request), request.args.get("path"), _get_params(request), body=body)
     return response.json(), response.status_code

api/tests/test_pcluster_api_handler.py

@@ -1,5 +1,10 @@
 from unittest import mock
-from api.PclusterApiHandler import login, get_base_url
+from api.PclusterApiHandler import login, get_base_url, create_url_map
+
+class MockRequest:
+    cookies = {'int_value': 100}
+    args = {'version': '3.12.0'}
+    json = {'username': '[email protected]'}
 
 
 @mock.patch("api.PclusterApiHandler.requests.post")
@@ -33,5 +38,8 @@ def test_get_base_url(monkeypatch):
     monkeypatch.setattr('api.PclusterApiHandler.API_BASE_URL', '3.12.0=https://example.com,3.11.0=https://example1.com,')
     monkeypatch.setattr('api.PclusterApiHandler.API_BASE_URL_MAPPING', {'3.12.0': 'https://example.com', '3.11.0': 'https://example1.com'})
 
-    assert 'https://example.com' == get_base_url('3.12.0')
+    assert 'https://example.com' == get_base_url(MockRequest())
+
+def test_create_url_map():
+    assert {'3.12.0': 'https://example.com', '3.11.0': 'https://example1.com'} == create_url_map('3.12.0=https://example.com,3.11.0=https://example1.com,')
 

frontend/locales/en/strings.json

@@ -496,7 +496,7 @@
     "version": {
       "label": "Cluster Version",
       "title": "Version",
-      "placeholder": "Select your cluster version",
+      "placeholder": "Cluster version",
       "description": "Select the AWS ParallelCluster version to use for this cluster.",
       "help": {
         "main": "Choose the version of AWS ParallelCluster to use for creating and managing your cluster."