Merge branch 'master' of github.com:SyntaxArc/ArchiPy

Author: HosseinNejatiJavaremi

.env.test

@@ -15,14 +15,40 @@ FASTAPI__DOCS_URL="/docs"
 FASTAPI__RE_DOCS_URL="/redoc"
 FASTAPI__SWAGGER_UI_PARAMS={}
 
-KEYCLOAK__SERVER_URL="https://localhost"
-KEYCLOAK__VERIFY_SSL=False
-KEYCLOAK__ADMIN_USERNAME="admin"
-KEYCLOAK__ADMIN_PASSWORD="admin"
-KEYCLOAK__ADMIN_REALM_NAME="master"
+# Redis Configuration (RedisConfig)
+REDIS__MASTER_HOST=localhost:6379
+REDIS__IMAGE=redis:7-alpine
+REDIS__DATABASE=0
+REDIS__PASSWORD=test_password
 
-MINIO__ENDPOINT=localhost:9000
-MINIO__ACCESS_KEY=HWQVccFGoSztcyiEYOqE
-MINIO__SECRET_KEY=XCnmAX8BrlFSK4zLWGSkJuTdZBelrTpnbOTowSUs
+# PostgreSQL Configuration
+POSTGRES__IMAGE=postgres:17
+POSTGRES_SQLALCHEMY__HOST=localhost
+POSTGRES_SQLALCHEMY__PORT=5432
+POSTGRES_SQLALCHEMY__DATABASE=test_db
+POSTGRES_SQLALCHEMY__USERNAME=test_user
+POSTGRES_SQLALCHEMY__PASSWORD=test_password
+
+# Keycloak Configuration (KeycloakConfig)
+KEYCLOAK__SERVER_URL=http://localhost:8080
+KEYCLOAK__IMAGE=quay.io/keycloak/keycloak:23.0
+KEYCLOAK__ADMIN_USERNAME=admin
+KEYCLOAK__ADMIN_PASSWORD=admin
+KEYCLOAK__REALM_NAME=master
+
+# Elasticsearch Configuration (ElasticsearchConfig)
+ELASTIC__HOSTS=["http://localhost:9200"]
+ELASTIC__IMAGE=repo.smartech.ir/elasticsearch/elasticsearch:9.1.0
+ELASTIC__PORT=9200
+ELASTIC__HTTP_USER_NAME=elastic
+ELASTIC__HTTP_PASSWORD=test_password
 
+# Kafka Configuration (KafkaConfig)
+KAFKA__IMAGE=confluentinc/cp-kafka:7.4.0
 KAFKA__BROKERS_LIST=["localhost:9092"]
+
+# MinIO Configuration (MinioConfig)
+MINIO__ENDPOINT=localhost:9000
+MINIO__IMAGE=quay.io/minio/minio:latest
+MINIO__ACCESS_KEY=test_access_key
+MINIO__SECRET_KEY=test_secret_key

.github/workflows/bandit.yml

@@ -33,7 +33,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Bandit Scan
         uses: shundor/python-bandit-scan@ab1d87dfccc5a0ffab88be3aaac6ffe35c10d6cd
         with: # optional arguments

.github/workflows/deploy-docs.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0  # Fetch all history for proper versioning
 

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         fetch-depth: 0
 

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Set up Python
       uses: actions/setup-python@v5

archipy/adapters/elasticsearch/adapters.py

@@ -52,7 +52,7 @@ def _get_client(configs: ElasticsearchConfig) -> Elasticsearch:
         if configs.API_KEY and configs.API_SECRET:
             api_key = ((configs.API_KEY, configs.API_SECRET),)
         elif configs.HTTP_USER_NAME and configs.HTTP_PASSWORD:
-            basic_auth = ((configs.HTTP_USER_NAME, configs.HTTP_PASSWORD.get_secret_value()),)
+            basic_auth = (configs.HTTP_USER_NAME, configs.HTTP_PASSWORD.get_secret_value())
 
         return Elasticsearch(
             hosts=configs.HOSTS,

archipy/helpers/utils/password_utils.py

@@ -161,7 +161,7 @@ def validate_password_history(
         configs = auth_config or BaseConfig.global_config().AUTH
 
         # First validate against password policy
-        cls.validate_password(new_password, configs, lang)
+        cls.validate_password(new_password, configs)
 
         # Check password history
         if any(

features/elastic_adapter.feature

@@ -6,31 +6,34 @@ Feature: Elasticsearch Operations Testing
 
   Background:
     Given an Elasticsearch cluster is running
-    And index "test-index" exists
     And document type "test-doc" is configured for index "test-index"
 
   Scenario: Index a new document synchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     When I index a document with id "1" and content '{"title": "Test Document", "content": "This is a test"}' into "test-index"
     Then the indexing operation should succeed
     And the document should be retrievable by id "1" from "test-index"
 
   Scenario: Search for documents synchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     And a document exists in "test-index" with id "1" and content '{"title": "Test Document", "content": "This is a test"}'
     When I search for "Test Document" in "test-index"
     Then the search should return at least 1 hit
     And the hit should contain field "title" with value "Test Document"
 
   Scenario: Update a document synchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     And a document exists in "test-index" with id "1" and content '{"title": "Test Document", "content": "This is a test"}'
-    When I update document "1" in "test-index" with content '{"title": "Updated Document", "content": "This is an update"}'
+    When I update document "1" in "test-index" with content '{"doc": {"title": "Updated Document", "content": "This is an update"}}'
     Then the update operation should succeed
     And the document should reflect the updated content when retrieved
 
   Scenario: Delete a document synchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     And a document exists in "test-index" with id "1" and content '{"title": "Test Document", "content": "This is a test"}'
     When I delete document "1" from "test-index"
     Then the delete operation should succeed
@@ -51,6 +54,8 @@ Feature: Elasticsearch Operations Testing
 
   Scenario: Perform bulk operations synchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
+    And a document exists in "test-index" with id "1" and content '{"title": "Test Document", "content": "This is a test"}'
     When I perform a bulk operation with:
       | action  | id | index       | document                                  |
       | index   | 2  | test-index  | {"title": "Doc 2", "content": "Second"}  |
@@ -63,13 +68,15 @@ Feature: Elasticsearch Operations Testing
   @async
   Scenario: Index a new document asynchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     When I index a document with id "10" and content '{"title": "Async Doc", "content": "Async test"}' into "test-index"
     Then the indexing operation should succeed
     And the document should be retrievable by id "10" from "test-index"
 
   @async
   Scenario: Search for documents asynchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     And a document exists in "test-index" with id "10" and content '{"title": "Async Doc", "content": "Async test"}'
     When I search for "Async Doc" in "test-index"
     Then the search should return at least 1 hit
@@ -78,14 +85,16 @@ Feature: Elasticsearch Operations Testing
   @async
   Scenario: Update a document asynchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     And a document exists in "test-index" with id "10" and content '{"title": "Async Doc", "content": "Async test"}'
-    When I update document "10" in "test-index" with content '{"title": "Updated Async", "content": "Updated async"}'
+    When I update document "10" in "test-index" with content '{"doc": {"title": "Updated Async", "content": "Updated async"}}'
     Then the update operation should succeed
     And the document should reflect the updated content when retrieved
 
   @async
   Scenario: Delete a document asynchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
     And a document exists in "test-index" with id "10" and content '{"title": "Async Doc", "content": "Async test"}'
     When I delete document "10" from "test-index"
     Then the delete operation should succeed
@@ -109,6 +118,8 @@ Feature: Elasticsearch Operations Testing
   @async
   Scenario: Perform bulk operations asynchronously
     Given a valid Elasticsearch client connection
+    And index "test-index" exists
+    And a document exists in "test-index" with id "10" and content '{"title": "Async Doc", "content": "Async test"}'
     When I perform a bulk operation with:
       | action  | id | index            | document                                  |
       | index   | 20 | test-index       | {"title": "Async 2", "content": "Second"} |
@@ -122,4 +133,4 @@ Feature: Elasticsearch Operations Testing
     Given an Elasticsearch cluster with security enabled
     When I connect with username "elastic-user" and password "elastic-pass"
     Then the connection should be successful
-    And I should be able to perform operations on the cluster
+    And I should be able to perform operations on the cluster

features/environment.py

@@ -5,7 +5,7 @@
 and handling async operations.
 """
 
-import asyncio
+import os
 import logging
 import uuid
 
@@ -17,12 +17,32 @@
 from archipy.adapters.base.sqlalchemy.session_manager_registry import SessionManagerRegistry
 from archipy.configs.base_config import BaseConfig
 
+from features.test_containers import ContainerManager
+
+from testcontainers.core.config import testcontainers_config
 
 class TestConfig(BaseConfig):
     model_config = SettingsConfigDict(
         env_file=".env.test",
     )
 
+    # Test container images
+    REDIS__IMAGE: str = "redis:7-alpine"
+    POSTGRES__IMAGE: str = "postgres:17"
+    ELASTIC__IMAGE: str = "elasticsearch:9.1.0"
+    KAFKA__IMAGE: str = "confluentinc/cp-kafka:7.4.0"
+    MINIO__IMAGE: str = "minio/minio:latest"
+    KEYCLOAK__IMAGE: str = "quay.io/keycloak/keycloak:23.0"
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        # Configure testcontainers to use custom ryuk image
+        ryuk_image = os.getenv("TESTCONTAINERS_RYUK_CONTAINER_IMAGE")
+        if ryuk_image:
+            testcontainers_config.ryuk_image = ryuk_image
+
+
 
 # Initialize global config
 config = TestConfig()
@@ -43,6 +63,10 @@ def before_all(context: Context):
     # Create the scenario context pool manager
     context.scenario_context_pool = ScenarioContextPoolManager()
 
+    # Initialize and start all test containers
+    context.test_containers = ContainerManager
+    context.test_containers.start_all()
+
 
 def before_scenario(context: Context, scenario: Scenario):
     """Setup performed before each scenario runs."""
@@ -62,6 +86,7 @@ def before_scenario(context: Context, scenario: Scenario):
     # Assign test config to scenario context
     try:
         scenario_context.store("test_config", config)
+        scenario_context.store("test_containers", context.test_containers)
     except Exception as e:
         logger.exception(f"Error setting test config: {e}")
 
@@ -85,6 +110,10 @@ def after_scenario(context: Context, scenario: Scenario):
 
 def after_all(context: Context):
     """Cleanup performed after all tests run."""
+    # Stop all test containers
+    if hasattr(context, "test_containers"):
+        context.test_containers.stop_all()
+
     # Clean up any remaining resources
     if hasattr(context, "scenario_context_pool"):
         context.scenario_context_pool.cleanup_all()