Revert "Revert "Refactor to allow other call to cohort-middleware service""

Author: k-burt-uch

config.ini

@@ -2,4 +2,4 @@
 ARGO_ACCESS_METHOD = access
 ARGO_HOST = http://argo-argo-workflows-server.argo.svc.cluster.local:2746
 ARGO_NAMESPACE = argo
-COHORT_DEFINITION_BY_SOURCE_AND_TEAM_PROJECT_URL = http://cohort-middleware-service/cohortdefinition-stats/by-source-id/{}/by-team-project?team-project={}
+COHORT_MIDDLEWARE_SERVICE = http://cohort-middleware-service

src/argowrapper/auth/utils.py

@@ -1,15 +1,17 @@
 import requests
 from argowrapper import logger
 from argowrapper.constants import (
-    COHORT_DEFINITION_BY_SOURCE_AND_TEAM_PROJECT_URL,
+    COHORT_MIDDLEWARE_SERVICE,
 )
 
 
 def get_cohort_ids_for_team_project(token, source_id, team_project):
     header = {"Authorization": token, "cookie": "fence={}".format(token)}
-    url = COHORT_DEFINITION_BY_SOURCE_AND_TEAM_PROJECT_URL.format(
-        source_id, team_project
+    api_url = (
+        COHORT_MIDDLEWARE_SERVICE
+        + "/cohortdefinition-stats/by-source-id/{}/by-team-project?team-project={}"
     )
+    url = api_url.format(source_id, team_project)
     try:
         r = requests.get(url=url, headers=header)
         r.raise_for_status()

src/argowrapper/constants.py

@@ -21,9 +21,7 @@
 logger.info(f"Access method: {config['DEFAULT']['ARGO_ACCESS_METHOD']}")
 
 ARGO_HOST: Final = config["DEFAULT"]["ARGO_HOST"]
-COHORT_DEFINITION_BY_SOURCE_AND_TEAM_PROJECT_URL: Final = config["DEFAULT"][
-    "COHORT_DEFINITION_BY_SOURCE_AND_TEAM_PROJECT_URL"
-]
+COHORT_MIDDLEWARE_SERVICE: Final = config["DEFAULT"]["COHORT_MIDDLEWARE_SERVICE"]
 TEST_WF: Final = "test.yaml"
 WF_HEADER: Final = "header.yaml"
 ARGO_NAMESPACE: Final = config["DEFAULT"]["ARGO_NAMESPACE"]