codemie-test-harness 0.1.163__py3-none-any.whl → 0.1.165__py3-none-any.whl

codemie_test_harness/tests/conftest.py

@@ -29,7 +29,7 @@ from codemie_test_harness.tests.test_data.google_datasource_test_data import (
     GOOGLE_DOC_URL,
 )
 from codemie_test_harness.tests.utils.assistant_utils import AssistantUtils
-from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.utils.base_utils import get_random_name, wait_for_entity
 from codemie_test_harness.tests.utils.client_factory import get_client
 from codemie_test_harness.tests.utils.constants import TESTS_PATH
@@ -60,6 +60,33 @@ from codemie_test_harness.tests.utils.env_resolver import (
 logger = setup_logger(__name__)
 
 
+def cleanup_plugin_process(process):
+    """Helper function to cleanly terminate a plugin process.
+
+    Args:
+        process: The subprocess.Popen process to terminate
+    """
+    if process and process.poll() is None:  # Process is still running
+        logger.info(f"Terminating plugin process with PID: {process.pid}")
+        try:
+            process.terminate()
+            process.wait(timeout=10)  # Wait up to 10 seconds for graceful shutdown
+            logger.info(
+                f"Successfully terminated plugin process with PID: {process.pid}"
+            )
+        except subprocess.TimeoutExpired:
+            logger.warning(
+                f"Plugin process {process.pid} did not terminate gracefully, forcing kill"
+            )
+            process.kill()
+            process.wait()
+            logger.info(f"Successfully killed plugin process with PID: {process.pid}")
+        except Exception as e:
+            logger.error(f"Error during plugin process cleanup: {e}")
+    else:
+        logger.info("Plugin process already terminated or not found")
+
+
 def pytest_configure(config):
     """Pytest hook that runs before test collection starts.
 
@@ -200,9 +227,9 @@ def workflow_utils(client):
 def git_utils():
     """Create GitBudUtils instance"""
     return GitBudUtils(
-        url=os.getenv("GITLAB_URL"),
-        token=os.getenv("GITLAB_TOKEN"),
-        project_id=os.getenv("GITLAB_PROJECT_ID"),
+        url=CredentialsManager.get_parameter("GITLAB_URL"),
+        token=CredentialsManager.get_parameter("GITLAB_TOKEN"),
+        project_id=CredentialsManager.get_parameter("GITLAB_PROJECT_ID"),
     )
 
 
@@ -230,7 +257,7 @@ def conversation_utils(client):
 def git_integration(integration_utils):
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.gitlab_credentials(),
+        credential_values=CredentialsManager.gitlab_credentials(),
     )
     yield integration
     if integration:
@@ -241,7 +268,7 @@ def git_integration(integration_utils):
 def github_integration(integration_utils):
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.github_credentials(),
+        credential_values=CredentialsManager.github_credentials(),
     )
     yield integration
     if integration:
@@ -252,7 +279,7 @@ def github_integration(integration_utils):
 def gitlab_integration(integration_utils):
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.gitlab_credentials(),
+        credential_values=CredentialsManager.gitlab_credentials(),
     )
     yield integration
     if integration:
@@ -263,11 +290,7 @@ def gitlab_integration(integration_utils):
 def jira_integration(integration_utils):
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.JIRA,
-        credential_values=[
-            CredentialValues(key="url", value=os.getenv("JIRA_URL")),
-            CredentialValues(key="name", value="test-token-name"),
-            CredentialValues(key="token", value=os.getenv("JIRA_TOKEN")),
-        ],
+        credential_values=CredentialsManager.jira_credentials(),
     )
     yield integration
     if integration:
@@ -278,7 +301,7 @@ def jira_integration(integration_utils):
 def jira_cloud_integration(integration_utils):
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.JIRA,
-        credential_values=CredentialsUtil.jira_cloud_credentials(),
+        credential_values=CredentialsManager.jira_cloud_credentials(),
     )
     yield integration
     if integration:
@@ -289,11 +312,7 @@ def jira_cloud_integration(integration_utils):
 def confluence_integration(integration_utils):
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.CONFLUENCE,
-        credential_values=[
-            CredentialValues(key="url", value=os.getenv("CONFLUENCE_URL")),
-            CredentialValues(key="name", value="test-token-name"),
-            CredentialValues(key="token", value=os.getenv("CONFLUENCE_TOKEN")),
-        ],
+        credential_values=CredentialsManager.confluence_credentials(),
     )
     yield integration
     if integration:
@@ -304,7 +323,7 @@ def confluence_integration(integration_utils):
 def confluence_cloud_integration(integration_utils):
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.CONFLUENCE,
-        credential_values=CredentialsUtil.confluence_cloud_credentials(),
+        credential_values=CredentialsManager.confluence_cloud_credentials(),
     )
     yield integration
     if integration:
@@ -316,7 +335,7 @@ def filesystem_integration(integration_utils):
     """Create Filesystem integration"""
     integration = integration_utils.create_integration(
         credential_type=CredentialTypes.FILESYSTEM,
-        credential_values=CredentialsUtil.file_system_credentials(),
+        credential_values=CredentialsManager.file_system_credentials(),
     )
     yield integration
     if integration:
@@ -325,7 +344,7 @@ def filesystem_integration(integration_utils):
 
 @pytest.fixture(scope="module")
 def open_api_integration(client, integration_utils):
-    credential_values = CredentialsUtil.open_api_credentials(str(client.token))
+    credential_values = CredentialsManager.open_api_credentials(str(client.token))
     integration = integration_utils.create_integration(
         CredentialTypes.OPENAPI, credential_values
     )
@@ -336,7 +355,7 @@ def open_api_integration(client, integration_utils):
 
 @pytest.fixture(scope="module")
 def email_integration(integration_utils):
-    credential_values = CredentialsUtil.gmail_credentials()
+    credential_values = CredentialsManager.gmail_credentials()
     integration = integration_utils.create_integration(
         CredentialTypes.EMAIL, credential_values
     )
@@ -347,7 +366,7 @@ def email_integration(integration_utils):
 
 @pytest.fixture(scope="module")
 def telegram_integration(integration_utils):
-    credential_values = CredentialsUtil.telegram_credentials()
+    credential_values = CredentialsManager.telegram_credentials()
     integration = integration_utils.create_integration(
         CredentialTypes.TELEGRAM, credential_values
     )
@@ -358,7 +377,7 @@ def telegram_integration(integration_utils):
 
 @pytest.fixture(scope="module")
 def service_now_integration(integration_utils):
-    credential_values = CredentialsUtil.servicenow_credentials()
+    credential_values = CredentialsManager.servicenow_credentials()
     integration = integration_utils.create_integration(
         CredentialTypes.SERVICE_NOW, credential_values
     )
@@ -369,7 +388,7 @@ def service_now_integration(integration_utils):
 
 @pytest.fixture(scope="module")
 def keycloak_integration(integration_utils):
-    credential_values = CredentialsUtil.keycloak_credentials()
+    credential_values = CredentialsManager.keycloak_credentials()
     integration = integration_utils.create_integration(
         CredentialTypes.KEYCLOAK, credential_values
     )
@@ -380,7 +399,7 @@ def keycloak_integration(integration_utils):
 
 @pytest.fixture(scope="module")
 def report_portal_integration(integration_utils):
-    credential_values = CredentialsUtil.report_portal_credentials()
+    credential_values = CredentialsManager.report_portal_credentials()
     integration = integration_utils.create_integration(
         CredentialTypes.REPORT_PORTAL, credential_values
     )
@@ -423,14 +442,15 @@ def general_integration(integration_utils):
 def code_datasource(
     datasource_utils, gitlab_integration, github_integration, default_embedding_llm
 ):
+    git_env = CredentialsManager.get_parameter("GIT_ENV", "gitlab")
     datasource = datasource_utils.create_code_datasource(
-        link=os.getenv("GITLAB_PROJECT")
-        if os.getenv("GIT_ENV", "gitlab") == "gitlab"
-        else os.getenv("GITHUB_PROJECT"),
-        branch="main" if os.getenv("GIT_ENV", "gitlab") == "gitlab" else "master",
+        link=CredentialsManager.get_parameter("GITLAB_PROJECT")
+        if git_env == "gitlab"
+        else CredentialsManager.get_parameter("GITHUB_PROJECT"),
+        branch="main" if git_env == "gitlab" else "master",
         embeddings_model=default_embedding_llm.base_name,
         setting_id=gitlab_integration.id
-        if os.getenv("GIT_ENV", "gitlab") == "gitlab"
+        if git_env == "gitlab"
         else github_integration.id,
     )
     yield datasource
@@ -714,7 +734,7 @@ def filesystem_server(integration_utils):
     key = str(uuid.uuid4())
     logger.info(f"Plugin key: {key}")
 
-    credential_values = CredentialsUtil.plugin_credentials(key)
+    credential_values = CredentialsManager.plugin_credentials(key)
     settings = integration_utils.create_integration(
         CredentialTypes.PLUGIN, credential_values
     )
@@ -729,7 +749,7 @@ def filesystem_server(integration_utils):
         "--plugin-key",
         key,
         "--plugin-engine-uri",
-        os.getenv("NATS_URL"),
+        CredentialsManager.get_parameter("NATS_URL"),
         "mcp",
         "run",
         "-s",
@@ -737,9 +757,11 @@ def filesystem_server(integration_utils):
         "-e",
         "filesystem=FILE_PATHS",
     ]
-    subprocess.Popen(command, env=env)
+    process = subprocess.Popen(command, env=env)
+    logger.info(f"Started filesystem server process with PID: {process.pid}")
     sleep(10)
-    return settings
+    yield settings
+    cleanup_plugin_process(process)
 
 
 @pytest.fixture(scope="session")
@@ -747,7 +769,7 @@ def cli_server(integration_utils):
     key = str(uuid.uuid4())
     logger.info(f"Plugin key: {key}")
 
-    credential_values = CredentialsUtil.plugin_credentials(key)
+    credential_values = CredentialsManager.plugin_credentials(key)
     settings = integration_utils.create_integration(
         CredentialTypes.PLUGIN, credential_values
     )
@@ -763,7 +785,7 @@ def cli_server(integration_utils):
         "--plugin-key",
         key,
         "--plugin-engine-uri",
-        os.getenv("NATS_URL"),
+        CredentialsManager.get_parameter("NATS_URL"),
         "mcp",
         "run",
         "-s",
@@ -771,19 +793,23 @@ def cli_server(integration_utils):
         "-e",
         "cli-mcp-server=ALLOWED_DIR",
     ]
-    subprocess.Popen(command, env=env)
+    process = subprocess.Popen(command, env=env)
+    logger.info(f"Started CLI server process with PID: {process.pid}")
     sleep(10)
-    return settings
+    yield settings
+    cleanup_plugin_process(process)
 
 
 @pytest.fixture(scope="session")
 def development_plugin(integration_utils):
     key = str(uuid.uuid4())
+    logger.info(f"Plugin key: {key}")
 
-    credential_values = CredentialsUtil.plugin_credentials(key)
+    credential_values = CredentialsManager.plugin_credentials(key)
     settings = integration_utils.create_integration(
         CredentialTypes.PLUGIN, credential_values
     )
+    logger.info(f"Integration id: {settings.id}")
 
     env = os.environ.copy()
     env["PLUGIN_EXPERIMENTAL_PROTOCOL"] = "true"
@@ -793,15 +819,17 @@ def development_plugin(integration_utils):
         "--plugin-key",
         key,
         "--plugin-engine-uri",
-        os.getenv("NATS_URL"),
+        CredentialsManager.get_parameter("NATS_URL"),
         "development",
         "run",
         "--repo-path",
         str(TESTS_PATH),
     ]
-    subprocess.Popen(command, env=env)
+    process = subprocess.Popen(command, env=env)
+    logger.info(f"Started development plugin process with PID: {process.pid}")
     sleep(10)
-    return settings
+    yield settings
+    cleanup_plugin_process(process)
 
 
 @pytest.fixture(scope="module")
@@ -809,7 +837,7 @@ def ado_integration(integration_utils):
     """Create Azure DevOps integration"""
     integration = integration_utils.create_integration(
         CredentialTypes.AZURE_DEVOPS,
-        CredentialsUtil.azure_devops_credentials(),
+        CredentialsManager.azure_devops_credentials(),
     )
     yield integration
     if integration:
@@ -842,7 +870,7 @@ def cloud_integration(integration_utils):
 def pytest_sessionfinish(session):
     """Run cleanup code after all tests have finished."""
     clean_up_timeout = 1 if EnvironmentResolver.is_production() else 0
-    if os.getenv("CLEANUP_DATA", "true").lower() == "true":
+    if CredentialsManager.get_parameter("CLEANUP_DATA", "true").lower() == "true":
         client = get_client()
         prefix = autotest_entity_prefix
         integrations = client.integrations.list(

codemie_test_harness/tests/e2e/test_e2e.py

@@ -12,7 +12,7 @@ from codemie_test_harness.tests.enums.tools import (
     VcsTool,
 )
 from codemie_sdk.models.integration import CredentialTypes
-from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 
 
 @pytest.fixture(scope="session")
@@ -20,12 +20,12 @@ def git_integration(integration_utils):
     if os.getenv("GIT_ENV", "gitlab") == "gitlab":
         integration = integration_utils.create_integration(
             credential_type=CredentialTypes.GIT,
-            credential_values=CredentialsUtil.gitlab_credentials(),
+            credential_values=CredentialsManager.gitlab_credentials(),
         )
     else:
         integration = integration_utils.create_integration(
             credential_type=CredentialTypes.GIT,
-            credential_values=CredentialsUtil.github_credentials(),
+            credential_values=CredentialsManager.github_credentials(),
         )
     yield integration
     if integration:
@@ -79,7 +79,7 @@ def test_assistant_with_vcs_gitlab_tool(
 
     response = assistant_utils.ask_assistant(
         assistant,
-        f"Run gitlab tool to list branches in the repository for project with ID {os.getenv('GITLAB_PROJECT_ID')}. "
+        f"Run gitlab tool to list branches in the repository for project with ID {CredentialsManager.get_parameter('GITLAB_PROJECT_ID')}. "
         "Do not ask user confirmation to do this. "
         "Do not return branches to user but just confirm if you have an access to repository or not",
     )
@@ -113,7 +113,7 @@ def test_assistant_with_vcs_github_tool(
 
     response = assistant_utils.ask_assistant(
         assistant,
-        f"Run github tool to list branches in the repository for project {os.getenv('GITHUB_PROJECT')}. "
+        f"Run github tool to list branches in the repository for project {CredentialsManager.get_parameter('GITHUB_PROJECT')}. "
         "Do not ask user confirmation to do this. "
         "Do not return branches to user but just confirm if you have an access to repository or not",
     )

codemie_test_harness/tests/integrations/project/test_default_integrations.py

@@ -37,7 +37,7 @@ from codemie_test_harness.tests.test_data.pm_tools_test_data import (
 from codemie_test_harness.tests.test_data.report_portal_tools_test_data import (
     rp_test_data,
 )
-from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.enums.environment import Environment
 from codemie_test_harness.tests.utils.constants import test_project_name
 from codemie_test_harness.tests.utils.env_resolver import get_environment
@@ -120,7 +120,7 @@ def test_assistant_with_default_integration_ado(
     general_integration(
         integration_type=IntegrationType.PROJECT,
         credential_type=CredentialTypes.AZURE_DEVOPS,
-        credential_values=CredentialsUtil.azure_devops_credentials(),
+        credential_values=CredentialsManager.azure_devops_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -206,7 +206,7 @@ def test_assistant_with_default_integration_git(
     _git_integration = general_integration(
         integration_type=IntegrationType.PROJECT,
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.gitlab_credentials(),
+        credential_values=CredentialsManager.gitlab_credentials(),
         project_name=test_project_name,
     )
     # create a new datasource
@@ -252,7 +252,7 @@ def test_assistant_with_default_integration_jira(
     general_integration(
         integration_type=IntegrationType.PROJECT,
         credential_type=CredentialTypes.JIRA,
-        credential_values=CredentialsUtil.jira_credentials(),
+        credential_values=CredentialsManager.jira_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -291,7 +291,7 @@ def test_assistant_with_default_integration_email(
     general_integration(
         integration_type=IntegrationType.PROJECT,
         credential_type=CredentialTypes.EMAIL,
-        credential_values=CredentialsUtil.gmail_credentials(),
+        credential_values=CredentialsManager.gmail_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -326,7 +326,7 @@ def test_assistant_with_default_integration_keycloak(
     general_integration(
         integration_type=IntegrationType.PROJECT,
         credential_type=CredentialTypes.KEYCLOAK,
-        credential_values=CredentialsUtil.keycloak_credentials(),
+        credential_values=CredentialsManager.keycloak_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -366,7 +366,7 @@ def test_assistant_with_default_integration_report_portal(
     general_integration(
         integration_type=IntegrationType.PROJECT,
         credential_type=CredentialTypes.REPORT_PORTAL,
-        credential_values=CredentialsUtil.report_portal_credentials(),
+        credential_values=CredentialsManager.report_portal_credentials(),
         project_name=test_project_name,
     )
     # create an assistant

codemie_test_harness/tests/integrations/user/test_default_integrations.py

@@ -37,7 +37,7 @@ from codemie_test_harness.tests.test_data.pm_tools_test_data import (
 from codemie_test_harness.tests.test_data.report_portal_tools_test_data import (
     rp_test_data,
 )
-from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.enums.environment import Environment
 from codemie_test_harness.tests.utils.constants import test_project_name
 from codemie_test_harness.tests.utils.env_resolver import get_environment
@@ -120,7 +120,7 @@ def test_assistant_with_default_integration_ado(
     general_integration(
         integration_type=IntegrationType.USER,
         credential_type=CredentialTypes.AZURE_DEVOPS,
-        credential_values=CredentialsUtil.azure_devops_credentials(),
+        credential_values=CredentialsManager.azure_devops_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -206,7 +206,7 @@ def test_assistant_with_default_integration_git(
     _git_integration = general_integration(
         integration_type=IntegrationType.USER,
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.gitlab_credentials(),
+        credential_values=CredentialsManager.gitlab_credentials(),
         project_name=test_project_name,
     )
     # create a new datasource
@@ -252,7 +252,7 @@ def test_assistant_with_default_integration_jira(
     general_integration(
         integration_type=IntegrationType.USER,
         credential_type=CredentialTypes.JIRA,
-        credential_values=CredentialsUtil.jira_credentials(),
+        credential_values=CredentialsManager.jira_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -291,7 +291,7 @@ def test_assistant_with_default_integration_email(
     general_integration(
         integration_type=IntegrationType.USER,
         credential_type=CredentialTypes.EMAIL,
-        credential_values=CredentialsUtil.gmail_credentials(),
+        credential_values=CredentialsManager.gmail_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -326,7 +326,7 @@ def test_assistant_with_default_integration_keycloak(
     general_integration(
         integration_type=IntegrationType.USER,
         credential_type=CredentialTypes.KEYCLOAK,
-        credential_values=CredentialsUtil.keycloak_credentials(),
+        credential_values=CredentialsManager.keycloak_credentials(),
         project_name=test_project_name,
     )
     # create an assistant
@@ -366,7 +366,7 @@ def test_assistant_with_default_integration_report_portal(
     general_integration(
         integration_type=IntegrationType.USER,
         credential_type=CredentialTypes.REPORT_PORTAL,
-        credential_values=CredentialsUtil.report_portal_credentials(),
+        credential_values=CredentialsManager.report_portal_credentials(),
         project_name=test_project_name,
     )
     # create an assistant

codemie_test_harness/tests/llm/assistants/test_lite_llm.py

@@ -4,7 +4,7 @@ from hamcrest import assert_that, has_item
 
 from codemie_test_harness.tests.enums.model_types import ModelTypes
 from codemie_test_harness.tests.test_data.llm_test_data import MODEL_RESPONSES
-from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.utils.client_factory import get_client
 from codemie_test_harness.tests.utils.constants import test_project_name
 from codemie_test_harness.tests.utils.env_resolver import get_environment
@@ -13,7 +13,7 @@ from codemie_test_harness.tests.utils.pytest_utils import check_mark
 
 @pytest.fixture(scope="module")
 def lite_llm_integration(integration_utils):
-    credential_values = CredentialsUtil.lite_llm_credentials()
+    credential_values = CredentialsManager.lite_llm_credentials()
     integration = integration_utils.create_user_integration(
         CredentialTypes.LITE_LLM,
         credential_values,
@@ -25,7 +25,7 @@ def lite_llm_integration(integration_utils):
 
 @pytest.fixture(scope="function")
 def invalid_lite_llm_integration(integration_utils):
-    credential_values = CredentialsUtil.invalid_lite_llm_credentials()
+    credential_values = CredentialsManager.invalid_lite_llm_credentials()
     integration = integration_utils.create_user_integration(
         CredentialTypes.LITE_LLM,
         credential_values,

codemie_test_harness/tests/search/test_search_datasource.py

@@ -4,7 +4,7 @@ from hamcrest import assert_that
 from codemie_sdk.models.datasource import DataSourceType, DataSourceStatus
 from codemie_sdk.models.integration import CredentialTypes
 from codemie_test_harness.tests import TEST_USER, PROJECT
-from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.utils.base_utils import get_random_name
 
 ASSERTION_ERROR = "Datasource is not found in search results."
@@ -30,7 +30,7 @@ def datasource(
 ):
     code_integration = integration_utils.create_integration(
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.gitlab_credentials(),
+        credential_values=CredentialsManager.gitlab_credentials(),
     )
 
     datasource = datasource_utils.create_gitlab_datasource(

codemie_test_harness/tests/search/test_search_integration.py

@@ -2,7 +2,7 @@ import pytest
 from hamcrest import assert_that
 
 from codemie_sdk.models.integration import CredentialTypes, IntegrationType
-from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 from codemie_test_harness.tests.utils.base_utils import get_random_name
 
 ASSERTION_ERROR = "Integration is not found in search results."
@@ -26,7 +26,7 @@ def user_integration(integration_utils, user_integration_name):
         setting_type=IntegrationType.USER,
         integration_alias=user_integration_name,
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.gitlab_credentials(),
+        credential_values=CredentialsManager.gitlab_credentials(),
     )
     yield integration
     integration_utils.delete_integration(integration)
@@ -38,7 +38,7 @@ def project_integration(integration_utils, project_integration_name):
         setting_type=IntegrationType.PROJECT,
         integration_alias=project_integration_name,
         credential_type=CredentialTypes.GIT,
-        credential_values=CredentialsUtil.gitlab_credentials(),
+        credential_values=CredentialsManager.gitlab_credentials(),
     )
     yield integration
     if integration:

codemie_test_harness/tests/service/test_datasource_service.py

@@ -1,4 +1,3 @@
-import os
 import pytest
 from hamcrest import (
     assert_that,
@@ -27,6 +26,7 @@ from codemie_sdk.models.integration import (
 )
 from codemie_test_harness.tests import PROJECT
 from codemie_test_harness.tests.utils.base_utils import get_random_name
+from codemie_test_harness.tests.utils.credentials_manager import CredentialsManager
 
 
 @pytest.fixture
@@ -34,19 +34,19 @@ def integration_config():
     """Configuration for different integration types."""
     return {
         CredentialTypes.GIT: {
-            "url": os.getenv("GITLAB_URL"),
+            "url": CredentialsManager.get_parameter("GITLAB_URL"),
             "token_name": "test-token-name",
-            "token": os.getenv("GITLAB_TOKEN"),
+            "token": CredentialsManager.get_parameter("GITLAB_TOKEN"),
         },
         CredentialTypes.CONFLUENCE: {
-            "url": os.getenv("CONFLUENCE_URL"),
+            "url": CredentialsManager.get_parameter("CONFLUENCE_URL"),
             "token_name": "test-token-name",
-            "token": os.getenv("CONFLUENCE_TOKEN"),
+            "token": CredentialsManager.get_parameter("CONFLUENCE_TOKEN"),
         },
         CredentialTypes.JIRA: {
-            "url": os.getenv("JIRA_URL"),
+            "url": CredentialsManager.get_parameter("JIRA_URL"),
             "token_name": "test-token-name",
-            "token": os.getenv("JIRA_TOKEN"),
+            "token": CredentialsManager.get_parameter("JIRA_TOKEN"),
         },
     }
 
@@ -188,7 +188,7 @@ class TestDatasources(TestDatasourceBase):
             "name": integration.alias,
             "project_name": PROJECT,
             "description": "Code datasource description",
-            "link": os.getenv("GITLAB_PROJECT"),
+            "link": CredentialsManager.get_parameter("GITLAB_PROJECT"),
             "branch": "main",
             "index_type": DataSourceType.CODE,
             "embeddings_model": embeddings_model.base_name,
@@ -201,7 +201,7 @@ class TestDatasources(TestDatasourceBase):
         )
 
         update_request_params = {
-            "link": os.getenv("GITHUB_PROJECT"),
+            "link": CredentialsManager.get_parameter("GITHUB_PROJECT"),
             "branch": "master",
             "name": integration.alias,
             "project_name": PROJECT,
@@ -235,7 +235,7 @@ class TestDatasources(TestDatasourceBase):
             "name": integration.alias,
             "project_name": PROJECT,
             "description": "Datasource for KB space",
-            "cql": os.getenv("CQL"),
+            "cql": CredentialsManager.confluence_cql(),
             "setting_id": integration.id,
         }
         created = datasource_utils.create_confluence_datasource(**create_request_params)
@@ -278,7 +278,7 @@ class TestDatasources(TestDatasourceBase):
             "name": integration.alias,
             "project_name": PROJECT,
             "description": "Jira datasource description",
-            "jql": os.getenv("JQL"),
+            "jql": CredentialsManager.jira_jql(),
             "setting_id": integration.id,
         }
         created = datasource_utils.create_jira_datasource(**create_request_params)
@@ -291,7 +291,7 @@ class TestDatasources(TestDatasourceBase):
             "name": integration.alias,
             "project_name": PROJECT,
             "description": "Updated Jira datasource description",
-            "jql": os.getenv("JQL"),
+            "jql": CredentialsManager.jira_jql(),
         }
 
         updated = datasource_utils.update_jira_datasource(