Mpt 14598 api modifier remove validation for cloud providers configuration (#40)

* [WIP] Add initial logic for managing DataSources.
Move the service's APIs and files to the API folder.
Add Custom Exceptions to handle DataSources errors

* [MPT-14598] - Remove verification for Cloud Account conf.
Adjust tests

Author: antoniodimariano

app/api/cloud_account/cloud_accounts_conf/__init__.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
-from pydantic import BaseModel, ConfigDict, EmailStr, constr
+from typing import Annotated
+
+from pydantic import BaseModel, ConfigDict, EmailStr, StringConstraints
 
 
 class RegisterInvitedUser(BaseModel):
     email: EmailStr
     display_name: str
-    password: constr(min_length=8)
+    password: Annotated[str, StringConstraints(min_length=8)]
     model_config = ConfigDict(
         json_schema_extra={
             "example": [

app/api/cloud_account/cloud_accounts_conf/aws.py

@@ -117,17 +117,13 @@ async def link_cloud_account(
     try:
         # here, we need to validate the bearer token to ensure that any authorization
         # related errors will be checked first. In case of an invalid/expired token,
-        # an APIResponseError with a http statu 401 will re raised
+        # an APIResponseError with an http status 401 will be raised
 
         await auth_client.check_user_allowed_to_create_cloud_account(
             bearer_token=user_access_token, org_id=org_id
         )
         response = await link_cloud_account_to_org(
-            name=data.name,
-            type=data.type,
-            config=data.config,
-            process_recommendations=data.process_recommendations,
-            auto_import=data.auto_import,
+            cloud_account_data=data.model_dump(),
             org_id=org_id,
             user_access_token=user_access_token,
         )

app/api/cloud_account/cloud_accounts_conf/azure.py

@@ -1,29 +1,31 @@
 import logging
 
-from app.api.cloud_account.cloud_accounts_manager import (
-    CloudStrategyConfiguration,
-    CloudStrategyManager,
-)
+from app.core.exceptions import CloudAccountNotAllowed
+from app.optscale_api.cloud_accounts import OptScaleCloudAccountAPI
 
 logger = logging.getLogger("__name__")
+ALLOWED_PROVIDERS = ["aws_cnr", "gcp_cnr", "azure_cnr", "azure_tenant"]
 
 
 async def link_cloud_account_to_org(
-    name: str,
-    type: str,
-    config: dict,
-    process_recommendations: bool,
-    auto_import: bool,
+    cloud_account_data: dict,
     org_id: str,
     user_access_token: str,
 ):
     """
 
-    :param name: The name of the Cloud Account
-    :param type:  One of the Cloud Account allowed types
-    :param config: The whole config of the given Cloud Account
-    :param process_recommendations: a value required by OptScale
-    :param auto_import: a value required by OptScale
+    :param cloud_account_data: The whole config of the given Cloud Account
+        {
+          "name":"Test2",
+          "type":"azure_tenasssssssssnt",
+          "config":{
+            "client_id":"cd945f4b-0554-4a16-9a09-96a2f30bc0ef",
+            "tenant":"1dc9b339-fadb-432e-86df-423c38a0fcb8",
+            "secret":"QOt8Q~r.ZkpDN1p2cFsYTCQFDtbB8pzzm6xxydlA"
+          },
+          "auto_import": false,
+          "process_recommendations": false
+        }
     :param org_id: The org ID to link the Cloud Account to
     :param user_access_token: The user's access token the org belongs to
     :return: If the given cloud account is linked, a dict like this one will be returned
@@ -57,23 +59,18 @@ async def link_cloud_account_to_org(
           Rethrow APIResponseError if an error occurred during the communication with the
           OptScale API.
     """
-    # Here the config as received is validated
-    cloud_account_config = CloudStrategyConfiguration(
-        name=name,
-        provider_type=type,
-        config=config,
-        process_recommendations=process_recommendations,
-        auto_import=auto_import,
-    )
 
-    # let's select the correct strategy for the given cloud account
-    cloud_account_strategy = cloud_account_config.select_strategy()
-    strategy_manager = CloudStrategyManager(strategy=cloud_account_strategy)
-    # here the conf will be processed in order to use the OptScale API
-    response = await strategy_manager.add_cloud_account(
-        config=cloud_account_config,
+    if cloud_account_data["type"] not in ALLOWED_PROVIDERS:
+        raise CloudAccountNotAllowed()
+    optscale_cloud_account_api = OptScaleCloudAccountAPI()
+    response = await optscale_cloud_account_api.link_cloud_account_with_org(
+        user_access_token=user_access_token,  # noqa: E501
         org_id=org_id,
-        user_access_token=user_access_token,
+        conf=cloud_account_data,
+    )
+    datasource_type = cloud_account_data["type"]
+
+    logger.info(
+        f"The Cloud Account {datasource_type} has been added to the org {org_id}"
     )
-    logger.info(f"The Cloud Account {type} has been linked to the org {org_id}")
     return response

app/api/cloud_account/cloud_accounts_conf/cloud_config_strategy.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Optional
 
 import jwt
 from fastapi import Request
@@ -26,7 +25,7 @@
 logger = logging.getLogger(__name__)
 
 
-def decode_jwt(token: str) -> Optional[dict]:  # noqa: UP007
+def decode_jwt(token: str) -> dict | None:
     """
     Decodes a JWT token and validates its critical claims,
     including time-based and issuer/audience claims.