codemie-test-harness 0.1.158__py3-none-any.whl → 0.1.160__py3-none-any.whl

codemie_test_harness/tests/integrations/project/test_project_integrations.py

@@ -7,7 +7,6 @@ from codemie_sdk.models.integration import (
     Integration,
     IntegrationTestRequest,
     IntegrationTestResponse,
-    CredentialTypes,
 )
 from codemie_test_harness.tests import PROJECT
 from codemie_test_harness.tests.test_data.integrations_test_data import (
@@ -27,30 +26,6 @@ from codemie_test_harness.tests.utils.base_utils import (
 @pytest.mark.parametrize(
     "credential_type, credentials",
     valid_integrations,
-    ids=[
-        f"Project integration: {CredentialTypes.AWS}",
-        f"Project integration: {CredentialTypes.AZURE}",
-        f"Project integration: {CredentialTypes.GCP}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.GIT}",
-        f"Project integration: {CredentialTypes.GIT}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.SQL}",
-        f"Project integration: {CredentialTypes.SQL}",
-        f"Project integration: {CredentialTypes.ELASTIC}",
-        f"Project integration: {CredentialTypes.MCP}",
-        f"Project integration: {CredentialTypes.AZURE_DEVOPS}",
-        f"Project integration: {CredentialTypes.FILESYSTEM}",
-        f"Project integration: {CredentialTypes.EMAIL}",
-        f"Project integration: {CredentialTypes.TELEGRAM}",
-        f"Project integration: {CredentialTypes.SERVICE_NOW}",
-        f"Project integration: {CredentialTypes.KUBERNETES}",
-        f"Project integration: {CredentialTypes.KEYCLOAK}",
-    ],
 )
 def test_integration_created(
     credential_type, credentials, general_integration, integration_utils
@@ -83,20 +58,6 @@ def test_integration_created(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     testable_integrations,
-    ids=[
-        f"Project integration: {CredentialTypes.AWS}",
-        f"Project integration: {CredentialTypes.AZURE}",
-        f"Project integration: {CredentialTypes.GCP}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.EMAIL}",
-        f"Project integration: {CredentialTypes.SERVICE_NOW}",
-        f"Project integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_after_creation(
     credential_type, credentials, general_integration, integration_utils
@@ -135,30 +96,6 @@ def test_integration_after_creation(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     valid_integrations,
-    ids=[
-        f"Project integration: {CredentialTypes.AWS}",
-        f"Project integration: {CredentialTypes.AZURE}",
-        f"Project integration: {CredentialTypes.GCP}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.GIT}",
-        f"Project integration: {CredentialTypes.GIT}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.SQL}",
-        f"Project integration: {CredentialTypes.SQL}",
-        f"Project integration: {CredentialTypes.ELASTIC}",
-        f"Project integration: {CredentialTypes.MCP}",
-        f"Project integration: {CredentialTypes.AZURE_DEVOPS}",
-        f"Project integration: {CredentialTypes.FILESYSTEM}",
-        f"Project integration: {CredentialTypes.EMAIL}",
-        f"Project integration: {CredentialTypes.TELEGRAM}",
-        f"Project integration: {CredentialTypes.SERVICE_NOW}",
-        f"Project integration: {CredentialTypes.KUBERNETES}",
-        f"Project integration: {CredentialTypes.KEYCLOAK}",
-    ],
 )
 def test_update_integration(
     credential_type, credentials, general_integration, integration_utils
@@ -203,18 +140,6 @@ def test_update_integration(
 @pytest.mark.parametrize(
     "credential_type, credentials, error_message",
     invalid_integrations,
-    ids=[
-        f"Project integration: {CredentialTypes.AWS}",
-        f"Project integration: {CredentialTypes.AZURE}",
-        f"Project integration: {CredentialTypes.GCP}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.EMAIL}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.SERVICE_NOW}",
-        f"Project integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_with_invalid_credentials(
     credential_type, credentials, error_message, integration_utils
@@ -256,20 +181,6 @@ def test_integration_with_invalid_credentials(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     testable_integrations,
-    ids=[
-        f"Project integration: {CredentialTypes.AWS}",
-        f"Project integration: {CredentialTypes.AZURE}",
-        f"Project integration: {CredentialTypes.GCP}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.EMAIL}",
-        f"Project integration: {CredentialTypes.SERVICE_NOW}",
-        f"Project integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_during_creation(credential_type, credentials, integration_utils):
     integration_test_model = IntegrationTestRequest(
@@ -294,18 +205,6 @@ def test_integration_during_creation(credential_type, credentials, integration_u
 @pytest.mark.parametrize(
     "credential_type, credentials, error_message",
     invalid_integrations,
-    ids=[
-        f"Project integration: {CredentialTypes.AWS}",
-        f"Project integration: {CredentialTypes.AZURE}",
-        f"Project integration: {CredentialTypes.GCP}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.EMAIL}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.SERVICE_NOW}",
-        f"Project integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_during_creation_with_invalid_credentials(
     credential_type, credentials, error_message, integration_utils
@@ -329,30 +228,6 @@ def test_integration_during_creation_with_invalid_credentials(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     valid_integrations,
-    ids=[
-        f"Project integration: {CredentialTypes.AWS}",
-        f"Project integration: {CredentialTypes.AZURE}",
-        f"Project integration: {CredentialTypes.GCP}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.SONAR}",
-        f"Project integration: {CredentialTypes.GIT}",
-        f"Project integration: {CredentialTypes.GIT}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.CONFLUENCE}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.JIRA}",
-        f"Project integration: {CredentialTypes.SQL}",
-        f"Project integration: {CredentialTypes.SQL}",
-        f"Project integration: {CredentialTypes.ELASTIC}",
-        f"Project integration: {CredentialTypes.MCP}",
-        f"Project integration: {CredentialTypes.AZURE_DEVOPS}",
-        f"Project integration: {CredentialTypes.FILESYSTEM}",
-        f"Project integration: {CredentialTypes.EMAIL}",
-        f"Project integration: {CredentialTypes.TELEGRAM}",
-        f"Project integration: {CredentialTypes.SERVICE_NOW}",
-        f"Project integration: {CredentialTypes.KUBERNETES}",
-        f"Project integration: {CredentialTypes.KEYCLOAK}",
-    ],
 )
 def test_delete_integration(
     credential_type, credentials, general_integration, integration_utils

codemie_test_harness/tests/integrations/user/test_default_integrations.py

@@ -1,5 +1,3 @@
-import os
-
 import pytest
 
 from codemie_sdk.models.integration import (
@@ -11,8 +9,8 @@ from codemie_test_harness.tests.enums.tools import (
     NotificationTool,
     ProjectManagementTool,
     CodeBaseTool,
-    CloudTool,
     AccessManagementTool,
+    ReportPortalTool,
 )
 from codemie_test_harness.tests.test_data.ado_test_plan_tools_test_data import (
     ado_test_plan_get_test_data,
@@ -36,11 +34,16 @@ from codemie_test_harness.tests.test_data.pm_tools_test_data import (
     JIRA_TOOL_PROMPT,
     RESPONSE_FOR_JIRA_TOOL,
 )
+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.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
 
 pytestmark = pytest.mark.skipif(
-    os.getenv("ENV") in ["local", "gcp"],
+    get_environment() in [Environment.LOCALHOST, Environment.GCP],
     reason="Skipping this test on local environment",
 )
 
@@ -55,12 +58,6 @@ pytestmark = pytest.mark.skipif(
 @pytest.mark.parametrize(
     "toolkit, tool_name, credential_type, credentials, prompt, expected_response",
     cloud_test_data,
-    ids=[
-        f"{Toolkit.CLOUD}_{CloudTool.AWS}",
-        f"{Toolkit.CLOUD}_{CloudTool.AZURE}",
-        f"{Toolkit.CLOUD}_{CloudTool.GCP}",
-        f"{Toolkit.CLOUD}_{CloudTool.KUBERNETES}",
-    ],
 )
 def test_assistant_with_default_integration_cloud(
     general_integration,
@@ -143,7 +140,6 @@ def test_assistant_with_default_integration_ado(
 @pytest.mark.parametrize(
     "toolkit, tool_name, credentials, prompt, expected_response",
     sonar_tools_test_data,
-    ids=[f"{row[0]}_{row[1]}" for row in sonar_tools_test_data],
 )
 def test_assistant_with_default_integration_codebase(
     general_integration,
@@ -343,3 +339,43 @@ def test_assistant_with_default_integration_keycloak(
     response = assistant_utils.ask_assistant(keycloak_assistant, KEYCLOAK_TOOL_PROMPT)
 
     similarity_check.check_similarity(response, KEYCLOAK_TOOL_RESPONSE)
+
+
+@pytest.mark.assistant
+@pytest.mark.report_portal
+@pytest.mark.integration
+@pytest.mark.user_integration
+@pytest.mark.default_integration
+@pytest.mark.regression
+def test_assistant_with_default_integration_report_portal(
+    general_integration,
+    integration_utils,
+    assistant,
+    assistant_utils,
+    similarity_check,
+):
+    prompt = rp_test_data[7][2]
+    expected_response = rp_test_data[7][3]
+
+    #  delete existing integrations of the same type
+    for integration_type in IntegrationType:
+        integration_utils.delete_integrations_by_type(
+            integration_type, CredentialTypes.REPORT_PORTAL, test_project_name
+        )
+    # create a new integration
+    general_integration(
+        integration_type=IntegrationType.USER,
+        credential_type=CredentialTypes.REPORT_PORTAL,
+        credential_values=CredentialsUtil.report_portal_credentials(),
+        project_name=test_project_name,
+    )
+    # create an assistant
+    report_portal_assistant = assistant(
+        Toolkit.REPORT_PORTAL,
+        ReportPortalTool.GET_DASHBOARD_DATA,
+        project_name=test_project_name,
+    )
+
+    response = assistant_utils.ask_assistant(report_portal_assistant, prompt)
+
+    similarity_check.check_similarity(response, expected_response)

codemie_test_harness/tests/integrations/user/test_user_integrations.py

@@ -7,7 +7,6 @@ from codemie_sdk.models.integration import (
     Integration,
     IntegrationTestRequest,
     IntegrationTestResponse,
-    CredentialTypes,
 )
 from codemie_test_harness.tests import PROJECT
 from codemie_test_harness.tests.test_data.integrations_test_data import (
@@ -28,30 +27,6 @@ from codemie_test_harness.tests.utils.base_utils import (
 @pytest.mark.parametrize(
     "credential_type, credentials",
     valid_integrations,
-    ids=[
-        f"User integration: {CredentialTypes.AWS}",
-        f"User integration: {CredentialTypes.AZURE}",
-        f"User integration: {CredentialTypes.GCP}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.GIT}",
-        f"User integration: {CredentialTypes.GIT}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.SQL}",
-        f"User integration: {CredentialTypes.SQL}",
-        f"User integration: {CredentialTypes.ELASTIC}",
-        f"User integration: {CredentialTypes.MCP}",
-        f"User integration: {CredentialTypes.AZURE_DEVOPS}",
-        f"User integration: {CredentialTypes.FILESYSTEM}",
-        f"User integration: {CredentialTypes.EMAIL}",
-        f"User integration: {CredentialTypes.TELEGRAM}",
-        f"User integration: {CredentialTypes.SERVICE_NOW}",
-        f"User integration: {CredentialTypes.KUBERNETES}",
-        f"User integration: {CredentialTypes.KEYCLOAK}",
-    ],
 )
 def test_integration_created(
     credential_type, credentials, general_integration, integration_utils
@@ -85,20 +60,6 @@ def test_integration_created(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     testable_integrations,
-    ids=[
-        f"User integration: {CredentialTypes.AWS}",
-        f"User integration: {CredentialTypes.AZURE}",
-        f"User integration: {CredentialTypes.GCP}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.EMAIL}",
-        f"User integration: {CredentialTypes.SERVICE_NOW}",
-        f"User integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_after_creation(
     credential_type, credentials, general_integration, integration_utils
@@ -137,30 +98,6 @@ def test_integration_after_creation(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     valid_integrations,
-    ids=[
-        f"User integration: {CredentialTypes.AWS}",
-        f"User integration: {CredentialTypes.AZURE}",
-        f"User integration: {CredentialTypes.GCP}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.GIT}",
-        f"User integration: {CredentialTypes.GIT}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.SQL}",
-        f"User integration: {CredentialTypes.SQL}",
-        f"User integration: {CredentialTypes.ELASTIC}",
-        f"User integration: {CredentialTypes.MCP}",
-        f"User integration: {CredentialTypes.AZURE_DEVOPS}",
-        f"User integration: {CredentialTypes.FILESYSTEM}",
-        f"User integration: {CredentialTypes.EMAIL}",
-        f"User integration: {CredentialTypes.TELEGRAM}",
-        f"User integration: {CredentialTypes.SERVICE_NOW}",
-        f"User integration: {CredentialTypes.KUBERNETES}",
-        f"User integration: {CredentialTypes.KEYCLOAK}",
-    ],
 )
 def test_update_integration(
     credential_type, credentials, general_integration, integration_utils
@@ -206,18 +143,6 @@ def test_update_integration(
 @pytest.mark.parametrize(
     "credential_type, credentials, error_message",
     invalid_integrations,
-    ids=[
-        f"User integration: {CredentialTypes.AWS}",
-        f"User integration: {CredentialTypes.AZURE}",
-        f"User integration: {CredentialTypes.GCP}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.EMAIL}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.SERVICE_NOW}",
-        f"User integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_with_invalid_credentials(
     credential_type, credentials, error_message, integration_utils
@@ -259,20 +184,6 @@ def test_integration_with_invalid_credentials(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     testable_integrations,
-    ids=[
-        f"User integration: {CredentialTypes.AWS}",
-        f"User integration: {CredentialTypes.AZURE}",
-        f"User integration: {CredentialTypes.GCP}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.EMAIL}",
-        f"User integration: {CredentialTypes.SERVICE_NOW}",
-        f"User integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_during_creation(credential_type, credentials, integration_utils):
     integration_test_model = IntegrationTestRequest(
@@ -297,18 +208,6 @@ def test_integration_during_creation(credential_type, credentials, integration_u
 @pytest.mark.parametrize(
     "credential_type, credentials, error_message",
     invalid_integrations,
-    ids=[
-        f"User integration: {CredentialTypes.AWS}",
-        f"User integration: {CredentialTypes.AZURE}",
-        f"User integration: {CredentialTypes.GCP}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.EMAIL}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.SERVICE_NOW}",
-        f"User integration: {CredentialTypes.KUBERNETES}",
-    ],
 )
 def test_integration_during_creation_with_invalid_credentials(
     credential_type, credentials, error_message, integration_utils
@@ -332,30 +231,6 @@ def test_integration_during_creation_with_invalid_credentials(
 @pytest.mark.parametrize(
     "credential_type, credentials",
     valid_integrations,
-    ids=[
-        f"User integration: {CredentialTypes.AWS}",
-        f"User integration: {CredentialTypes.AZURE}",
-        f"User integration: {CredentialTypes.GCP}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.SONAR}",
-        f"User integration: {CredentialTypes.GIT}",
-        f"User integration: {CredentialTypes.GIT}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.CONFLUENCE}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.JIRA}",
-        f"User integration: {CredentialTypes.SQL}",
-        f"User integration: {CredentialTypes.SQL}",
-        f"User integration: {CredentialTypes.ELASTIC}",
-        f"User integration: {CredentialTypes.MCP}",
-        f"User integration: {CredentialTypes.AZURE_DEVOPS}",
-        f"User integration: {CredentialTypes.FILESYSTEM}",
-        f"User integration: {CredentialTypes.EMAIL}",
-        f"User integration: {CredentialTypes.TELEGRAM}",
-        f"User integration: {CredentialTypes.SERVICE_NOW}",
-        f"User integration: {CredentialTypes.KUBERNETES}",
-        f"User integration: {CredentialTypes.KEYCLOAK}",
-    ],
 )
 def test_delete_integration(
     credential_type, credentials, general_integration, integration_utils

codemie_test_harness/tests/llm/assistants/test_llm.py

@@ -1,9 +1,9 @@
-import os
 import pytest
 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.client_factory import get_client
+from codemie_test_harness.tests.utils.env_resolver import get_environment
 from codemie_test_harness.tests.utils.pytest_utils import check_mark
 
 
@@ -11,7 +11,7 @@ def pytest_generate_tests(metafunc):
     if "model_type" in metafunc.fixturenames:
         is_smoke = check_mark(metafunc, "smoke")
         test_data = []
-        env = os.getenv("ENV")
+        env = get_environment()
         if is_smoke:
             available_models = get_client().llms.list()
             for model in available_models:
@@ -23,7 +23,7 @@ def pytest_generate_tests(metafunc):
                         model_data.model_type,
                         marks=pytest.mark.skipif(
                             env not in model_data.environments,
-                            reason=f"Skip on non {'/'.join(model_data.environments[:-1])} envs",
+                            reason=f"Skip on non {'/'.join(str(env) for env in model_data.environments[:-1])} envs",
                         ),
                     )
                 )

codemie_test_harness/tests/service/test_assistant_service.py

@@ -1,4 +1,3 @@
-import os
 import uuid
 from datetime import datetime
 
@@ -34,6 +33,7 @@ from hamcrest 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.env_resolver import EnvironmentResolver
 
 
 def validate_assistant_full_response(assistant):
@@ -498,7 +498,7 @@ def test_get_prebuilt_assistants(assistant_utils):
 
 
 @pytest.mark.skipif(
-    os.getenv("ENV") != "preview", reason="valid_assistant_id is for preview env"
+    not EnvironmentResolver.is_preview(), reason="valid_assistant_id is for preview env"
 )
 def test_assistant_evaluate(assistant_utils):
     valid_assistant_id = "05959338-06de-477d-9cc3-08369f858057"

codemie_test_harness/tests/test_data/cloud_tools_test_data.py

@@ -1,10 +1,13 @@
-import os
-
 import pytest
 
 from codemie_test_harness.tests.enums.tools import Toolkit, CloudTool
 from codemie_sdk.models.integration import CredentialTypes
 from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.env_resolver import (
+    EnvironmentResolver,
+    get_environment,
+)
+from codemie_test_harness.tests.enums.environment import Environment
 
 cloud_test_data = [
     pytest.param(
@@ -17,15 +20,30 @@ cloud_test_data = [
             Query example: {'query': {'service': 's3', 'method_name': 'list_buckets', 'method_arguments': {}}}
         """,
         """
-            Okay, here are the names of your S3 buckets:
-
-            *   codemie-bucket
-            *   codemie-terraform-states-025066278959
-            *   epam-cloud-s3-access-logs-025066278959-eu-central-1
-            *   epam-cloud-s3-access-logs-025066278959-us-east-1
-            *   terraform-states-025066278959
+            Here are the names of the S3 buckets:
+            
+            - az-codemie-terraform-states-025066278959
+            - codemie-bucket
+            - codemie-terraform-states-025066278959
+            - codemie-terraform-states-da-025066278959
+            - codemie-terraform-states-dar-025066278959
+            - codemie-terraform-states-ihorb-025066278959
+            - codemie-terraform-states-sh-test-025066278959
+            - da-codemie-user-data-025066278959
+            - epam-cloud-s3-access-logs-025066278959-eu-central-1
+            - epam-cloud-s3-access-logs-025066278959-eu-north-1
+            - epam-cloud-s3-access-logs-025066278959-eu-west-2
+            - epam-cloud-s3-access-logs-025066278959-us-east-1
+            - ggg-codemie-terraform-states-025066278959
+            - gggcodemie-user-data-025066278959
+            - pc-codemie-terraform-states-025066278959
+            - pc-codemie-user-data-025066278959
+            - sk-codemie-terraform-states-025066278959
+            - sk-codemie-user-data-025066278959
+            - terraform-states-025066278959
         """,
         marks=pytest.mark.aws,
+        id=CredentialTypes.AWS,
     ),
     pytest.param(
         Toolkit.CLOUD,
@@ -45,6 +63,7 @@ cloud_test_data = [
             Provisioning State: Succeeded
         """,
         marks=pytest.mark.azure,
+        id=CredentialTypes.AZURE,
     ),
     pytest.param(
         Toolkit.CLOUD,
@@ -106,10 +125,11 @@ cloud_test_data = [
         marks=[
             pytest.mark.gcp,
             pytest.mark.skipif(
-                os.getenv("ENV") in ["azure", "gcp"],
+                get_environment() in [Environment.AZURE, Environment.GCP],
                 reason="Still have an issue with encoding long strings",
             ),
         ],
+        id=CredentialTypes.GCP,
     ),
     pytest.param(
         Toolkit.CLOUD,
@@ -134,9 +154,10 @@ cloud_test_data = [
         marks=[
             pytest.mark.kubernetes,
             pytest.mark.skipif(
-                os.getenv("ENV") == "azure",
+                EnvironmentResolver.is_azure(),
                 reason="Still have an issue with encoding long strings",
             ),
         ],
+        id=CredentialTypes.KUBERNETES,
     ),
 ]

codemie_test_harness/tests/test_data/codebase_tools_test_data.py

@@ -57,6 +57,7 @@ sonar_tools_test_data = [
         """,
         "Yes, I have an access to SonarQube",
         marks=pytest.mark.sonar,
+        id=CodeBaseTool.SONAR,
     ),
     pytest.param(
         Toolkit.CODEBASE_TOOLS,
@@ -71,5 +72,6 @@ sonar_tools_test_data = [
         """,
         "Yes, I have an access to SonarCloud",
         marks=pytest.mark.sonar,
+        id=CodeBaseTool.SONAR_CLOUD,
     ),
 ]

codemie_test_harness/tests/test_data/data_management_tools_test_data.py

@@ -1,8 +1,7 @@
-import os
-
 import pytest
 
 from codemie_test_harness.tests.enums.integrations import DataBaseDialect
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 ELASTIC_TOOL_TASK = """
     send the query to Elastic:
@@ -59,8 +58,9 @@ sql_tools_test_data = [
     pytest.param(
         DataBaseDialect.MS_SQL,
         marks=pytest.mark.skipif(
-            os.getenv("ENV") not in ("aws", "azure", "gcp"),
+            not EnvironmentResolver.is_sandbox(),
             reason="MS SQL is only available in staging environments",
         ),
+        id=DataBaseDialect.MS_SQL,
     ),
 ]

codemie_test_harness/tests/test_data/direct_tools/cloud_tools_test_data.py

@@ -1,10 +1,9 @@
-import os
-
 import pytest
 
 from codemie_test_harness.tests.enums.tools import Toolkit, CloudTool
 from codemie_sdk.models.integration import CredentialTypes
 from codemie_test_harness.tests.utils.aws_parameters_store import CredentialsUtil
+from codemie_test_harness.tests.utils.env_resolver import EnvironmentResolver
 
 cloud_test_data = [
     pytest.param(
@@ -100,6 +99,7 @@ cloud_test_data = [
             }
         """,
         marks=pytest.mark.aws,
+        id=CredentialTypes.AWS,
     ),
     pytest.param(
         Toolkit.CLOUD,
@@ -125,6 +125,7 @@ cloud_test_data = [
             }
         """,
         marks=pytest.mark.azure,
+        id=CredentialTypes.AZURE,
     ),
     pytest.param(
         Toolkit.CLOUD,
@@ -170,10 +171,11 @@ cloud_test_data = [
         marks=[
             pytest.mark.gcp,
             pytest.mark.skipif(
-                os.getenv("ENV") == "azure",
+                EnvironmentResolver.is_azure(),
                 reason="Still have an issue with encoding long strings",
             ),
         ],
+        id=CredentialTypes.GCP,
     ),
     pytest.param(
         Toolkit.CLOUD,
@@ -844,9 +846,10 @@ cloud_test_data = [
         marks=[
             pytest.mark.kubernetes,
             pytest.mark.skipif(
-                os.getenv("ENV") == "azure",
+                EnvironmentResolver.is_azure(),
                 reason="Still have an issue with encoding long strings",
             ),
         ],
+        id=CredentialTypes.KUBERNETES,
     ),
 ]