Merge pull request #31 from softwareone-platform/MPT-7794_consume_optscale_through_k8s_services

MPT-7794 Split OptScale Global URL into Auth and RestAPI services URLs

Author: ffaraone

app/core/config.py

@@ -12,7 +12,8 @@ class Settings(BaseSettings):
     secret: str
     issuer: str
     audience: str
-    opt_scale_api_url: str
+    opt_scale_auth_api_url: str
+    opt_scale_rest_api_url: str
     admin_token: str
     api_v1_prefix: str = "/modifier/v1"
     debug: bool = False

app/optscale_api/auth_api.py

@@ -33,7 +33,7 @@ def build_bearer_token_header(bearer_token: str) -> dict[str, str]:
 
 class OptScaleAuth:
     def __init__(self):
-        self.api_client = APIClient(base_url=settings.opt_scale_api_url)
+        self.api_client = APIClient(base_url=settings.opt_scale_auth_api_url)
 
     async def check_user_allowed_to_create_cloud_account(
         self, bearer_token: str, org_id: str

app/optscale_api/cloud_accounts.py

@@ -15,7 +15,7 @@
 
 class OptScaleCloudAccountAPI:
     def __init__(self):
-        self.api_client = APIClient(base_url=settings.opt_scale_api_url)
+        self.api_client = APIClient(base_url=settings.opt_scale_rest_api_url)
 
     async def link_cloud_account_with_org(
         self, user_access_token: str, org_id: str, conf: dict[str, str]

app/optscale_api/invitation_api.py

@@ -18,7 +18,7 @@
 
 class OptScaleInvitationAPI:
     def __init__(self):
-        self.api_client = APIClient(base_url=settings.opt_scale_api_url)
+        self.api_client = APIClient(base_url=settings.opt_scale_rest_api_url)
 
     async def decline_invitation(self, user_access_token: str, invitation_id: str):
         """

app/optscale_api/orgs_api.py

@@ -27,7 +27,7 @@
 
 class OptScaleOrgAPI:
     def __init__(self):
-        self.api_client = APIClient(base_url=settings.opt_scale_api_url)
+        self.api_client = APIClient(base_url=settings.opt_scale_rest_api_url)
 
     async def get_user_org_list(
         self, user_access_token: str

app/optscale_api/users_api.py

@@ -14,7 +14,7 @@
 
 class OptScaleUserAPI:
     def __init__(self):
-        self.api_client = APIClient(base_url=settings.opt_scale_api_url)
+        self.api_client = APIClient(base_url=settings.opt_scale_auth_api_url)
 
     # todo: check the password lenght and strength
     async def create_user(

env.example

@@ -7,7 +7,8 @@ FFC_MODIFIER_PROJECT_NAME="CloudSpend API Modifier"
 FFC_MODIFIER_VERSION="0.1.0"
 FFC_MODIFIER_DESCRIPTION="Service to provide custom users and org management"
 # CLoudSpend API
-FFC_MODIFIER_OPT_SCALE_API_URL="https://your-optscaledomain.com"
+FFC_MODIFIER_OPT_SCALE_AUTH_API_URL="https://your-optscaledomain.com"
+FFC_MODIFIER_OPT_SCALE_REST_API_URL="https://your-optscaledomain.com"
 # JWT TOKEN
 FFC_MODIFIER_SECRET="my_super_secret_here"
 FFC_MODIFIER_ALGORITHM=HS256