ar-infra-cli 0.2.0__tar.gz → 0.2.1__tar.gz

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ar-infra-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: Production-ready Spring Boot project generator CLI
 Author-email: Abegà Razafindratelo <a.razafindratelo@gmail.com>
 License: MIT
@@ -35,7 +35,7 @@ Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pathspec>=0.12.1
 Requires-Dist: pathvalidate>=3.3.1
 Provides-Extra: dev
-Requires-Dist: pytest>=9.0.2; extra == "dev"
+Requires-Dist: pytest>=9.0.3; extra == "dev"
 Requires-Dist: pytest-cov>=7.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=1.3.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.15.1; extra == "dev"
@@ -55,14 +55,14 @@ Requires-Dist: safety>=3.7.0; extra == "dev"
 Requires-Dist: pip-audit>=2.10.0; extra == "dev"
 Requires-Dist: coverage[toml]>=7.13.0; extra == "dev"
 Requires-Dist: pre-commit>=4.5.1; extra == "dev"
-Requires-Dist: sphinx>=8.2.3; extra == "dev"
+Requires-Dist: sphinx>=9.1.0; extra == "dev"
 Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Requires-Dist: sphinx-autodoc-typehints>=3.6.0; extra == "dev"
 Requires-Dist: build>=1.4.0; extra == "dev"
 Requires-Dist: setuptools>=80.9.0; extra == "dev"
-Requires-Dist: wheel>=0.45.1; extra == "dev"
+Requires-Dist: wheel>=0.47.0; extra == "dev"
 Requires-Dist: twine>=6.2.0; extra == "dev"
-Requires-Dist: ipython>=9.9.0; extra == "dev"
+Requires-Dist: ipython>=9.10.0; extra == "dev"
 Requires-Dist: lxml>=5.3.0; extra == "dev"
 Requires-Dist: typing-extensions>=4.12.0; extra == "dev"
 Requires-Dist: ipdb>=0.13.13; extra == "dev"

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/ar_infra_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ar-infra-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: Production-ready Spring Boot project generator CLI
 Author-email: Abegà Razafindratelo <a.razafindratelo@gmail.com>
 License: MIT
@@ -35,7 +35,7 @@ Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pathspec>=0.12.1
 Requires-Dist: pathvalidate>=3.3.1
 Provides-Extra: dev
-Requires-Dist: pytest>=9.0.2; extra == "dev"
+Requires-Dist: pytest>=9.0.3; extra == "dev"
 Requires-Dist: pytest-cov>=7.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=1.3.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.15.1; extra == "dev"
@@ -55,14 +55,14 @@ Requires-Dist: safety>=3.7.0; extra == "dev"
 Requires-Dist: pip-audit>=2.10.0; extra == "dev"
 Requires-Dist: coverage[toml]>=7.13.0; extra == "dev"
 Requires-Dist: pre-commit>=4.5.1; extra == "dev"
-Requires-Dist: sphinx>=8.2.3; extra == "dev"
+Requires-Dist: sphinx>=9.1.0; extra == "dev"
 Requires-Dist: sphinx-rtd-theme; extra == "dev"
 Requires-Dist: sphinx-autodoc-typehints>=3.6.0; extra == "dev"
 Requires-Dist: build>=1.4.0; extra == "dev"
 Requires-Dist: setuptools>=80.9.0; extra == "dev"
-Requires-Dist: wheel>=0.45.1; extra == "dev"
+Requires-Dist: wheel>=0.47.0; extra == "dev"
 Requires-Dist: twine>=6.2.0; extra == "dev"
-Requires-Dist: ipython>=9.9.0; extra == "dev"
+Requires-Dist: ipython>=9.10.0; extra == "dev"
 Requires-Dist: lxml>=5.3.0; extra == "dev"
 Requires-Dist: typing-extensions>=4.12.0; extra == "dev"
 Requires-Dist: ipdb>=0.13.13; extra == "dev"

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/ar_infra_cli.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ src/ar_infra/cli/prompt/validator.py
 src/ar_infra/cli/resources/__init__.py
 src/ar_infra/cli/resources/banner.txt
 src/ar_infra/cli/resources/documentation.py
+src/ar_infra/cli/resources/feature-conf.yml
 src/ar_infra/cli/ui/__init__.py
 src/ar_infra/cli/ui/banner.py
 src/ar_infra/cli/ui/color_properties.py
@@ -67,12 +68,14 @@ src/ar_infra/infrastructure/processor/exception.py
 src/ar_infra/infrastructure/processor/format_script_runner.py
 src/ar_infra/infrastructure/processor/github_app.py
 src/ar_infra/infrastructure/processor/package_renamer.py
+src/ar_infra/infrastructure/processor/yaml_processor.py
 src/ar_infra/infrastructure/template/__init__.py
 src/ar_infra/infrastructure/template/development_artifact_remover.py
 src/ar_infra/infrastructure/template/env_handler.py
 src/ar_infra/infrastructure/template/exception.py
 src/ar_infra/infrastructure/template/facadeit_handler.py
 src/ar_infra/infrastructure/template/feature_config.py
+src/ar_infra/infrastructure/template/feature_config_schema.py
 src/ar_infra/infrastructure/template/feature_manager.py
 src/ar_infra/infrastructure/template/github_template_fetcher.py
 src/ar_infra/infrastructure/template/project_signature.py

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/ar_infra_cli.egg-info/requires.txt

@@ -15,7 +15,7 @@ pathspec>=0.12.1
 pathvalidate>=3.3.1
 
 [dev]
-pytest>=9.0.2
+pytest>=9.0.3
 pytest-cov>=7.0.0
 pytest-asyncio>=1.3.0
 pytest-mock>=3.15.1
@@ -35,14 +35,14 @@ safety>=3.7.0
 pip-audit>=2.10.0
 coverage[toml]>=7.13.0
 pre-commit>=4.5.1
-sphinx>=8.2.3
+sphinx>=9.1.0
 sphinx-rtd-theme
 sphinx-autodoc-typehints>=3.6.0
 build>=1.4.0
 setuptools>=80.9.0
-wheel>=0.45.1
+wheel>=0.47.0
 twine>=6.2.0
-ipython>=9.9.0
+ipython>=9.10.0
 lxml>=5.3.0
 typing-extensions>=4.12.0
 ipdb>=0.13.13

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ar-infra-cli"
-version = "0.2.0"
+version = "0.2.1"
 description = "Production-ready Spring Boot project generator CLI"
 authors = [
     {name = "Abegà Razafindratelo", email = "a.razafindratelo@gmail.com"}
@@ -45,7 +45,7 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-    "pytest>=9.0.2",
+    "pytest>=9.0.3",
     "pytest-cov>=7.0.0",
     "pytest-asyncio>=1.3.0",
     "pytest-mock>=3.15.1",
@@ -65,14 +65,14 @@ dev = [
     "pip-audit>=2.10.0",
     "coverage[toml]>=7.13.0",
     "pre-commit>=4.5.1",
-    "sphinx>=8.2.3",
+    "sphinx>=9.1.0",
     "sphinx-rtd-theme",
     "sphinx-autodoc-typehints>=3.6.0",
     "build>=1.4.0",
     "setuptools>=80.9.0",
-    "wheel>=0.45.1",
+    "wheel>=0.47.0",
     "twine>=6.2.0",
-    "ipython>=9.9.0",
+    "ipython>=9.10.0",
     "lxml>=5.3.0",
     "typing-extensions>=4.12.0",
     "ipdb>=0.13.13",

ar_infra_cli-0.2.1/src/ar_infra/cli/resources/feature-conf.yml

@@ -0,0 +1,149 @@
+src_package: "src/main/java/com/example/arinfra/"
+test_package: "src/test/java/com/example/arinfra/"
+
+database_shared:
+  directories:
+    - "{src_package}repository"
+    - "src/main/resources/db"
+  files:
+    - "{src_package}endpoint/rest/controller/health/HealthRepositoryController.java"
+    - "{src_package}service/health/HealthRepositoryService.java"
+    - "{test_package}endpoint/rest/controller/health/HealthRepositoryControllerIT.java"
+  env_variables:
+    - SPRING_DATASOURCE_URL
+    - SPRING_DATASOURCE_USERNAME
+    - SPRING_DATASOURCE_PASSWORD
+  dependencies:
+    - "org.springframework.boot:spring-boot-starter-data-jpa"
+    - "org.flywaydb:flyway-core"
+
+features:
+  POSTGRESQL:
+    files:
+      shared_directories:
+        - "{src_package}repository"
+        - "src/main/resources/db"
+        - "{test_package}conf/db"
+      specific_files:
+        - "{test_package}conf/db/PostgresConf.java"
+      shared_files:
+        - "{src_package}endpoint/rest/controller/health/HealthRepositoryController.java"
+        - "{src_package}service/health/HealthRepositoryService.java"
+        - "{test_package}endpoint/rest/controller/health/HealthRepositoryControllerIT.java"
+      shared_env_variables:
+        - SPRING_DATASOURCE_URL
+        - SPRING_DATASOURCE_USERNAME
+        - SPRING_DATASOURCE_PASSWORD
+    dependencies:
+      shared:
+        - "org.springframework.boot:spring-boot-starter-data-jpa"
+        - "org.flywaydb:flyway-core"
+      specific:
+        - "org.postgresql:postgresql"
+        - "org.flywaydb:flyway-database-postgresql"
+        - "org.testcontainers:postgresql"
+
+  MYSQL:
+    files:
+      shared_directories:
+        - "{src_package}repository"
+        - "src/main/resources/db"
+        - "{test_package}conf/db"
+      shared_files:
+        - "{src_package}endpoint/rest/controller/health/HealthRepositoryController.java"
+        - "{src_package}service/health/HealthRepositoryService.java"
+        - "{test_package}endpoint/rest/controller/health/HealthRepositoryControllerIT.java"
+      specific_files:
+        - "{test_package}conf/db/MysqlConf.java"
+      shared_env_variables:
+        - SPRING_DATASOURCE_URL
+        - SPRING_DATASOURCE_USERNAME
+        - SPRING_DATASOURCE_PASSWORD
+    dependencies:
+      shared:
+        - "org.springframework.boot:spring-boot-starter-data-jpa"
+        - "org.flywaydb:flyway-core"
+      specific:
+        - "com.mysql:mysql-connector-j"
+        - "org.flywaydb:flyway-mysql"
+        - "org.testcontainers:mysql"
+
+  RABBITMQ:
+    files:
+      specific_directories:
+        - "{src_package}event"
+        - "{src_package}datastructure"
+      specific_files:
+        - "{src_package}config/RabbitConf.java"
+        - "{src_package}datastructure/ListGrouper.java"
+        - "{src_package}service/health/HealthEventService.java"
+        - "{src_package}endpoint/rest/controller/health/HealthEventController.java"
+        - "{test_package}conf/RabbitMQConf.java"
+        - "{test_package}service/health/HealthEventServiceIT.java"
+        - "{test_package}endpoint/rest/controller/health/HealthEventControllerIT.java"
+      specific_env_variables:
+        - SPRING_RABBITMQ_HOST
+        - SPRING_RABBITMQ_USERNAME
+        - SPRING_RABBITMQ_PASSWORD
+        - SPRING_RABBITMQ_VHOST
+        - SPRING_RABBITMQ_QUEUE
+        - SPRING_RABBITMQ_EXCHANGE
+        - SPRING_RABBITMQ_ROUTING_KEY
+        - SPRING_RABBITMQ_PORT
+        - APP_RABBITMQ_SSL
+    dependencies:
+      specific:
+        - "org.springframework.boot:spring-boot-starter-amqp"
+        - "org.springframework.amqp:spring-rabbit-test"
+        - "org.testcontainers:rabbitmq"
+
+  S3_BUCKET:
+    files:
+      specific_directories:
+        - "{src_package}exception/bucket"
+      specific_files:
+        - "{src_package}config/BucketConf.java"
+        - "{src_package}file/BucketComponent.java"
+        - "{src_package}endpoint/rest/controller/health/HealthBucketController.java"
+        - "{src_package}service/health/HealthBucketService.java"
+        - "{test_package}conf/BucketConf.java"
+        - "{test_package}file/BucketComponentIT.java"
+        - "{test_package}service/health/HealthBucketServiceIT.java"
+        - "{test_package}endpoint/rest/controller/health/HealthBucketControllerIT.java"
+      specific_env_variables:
+        - CLOUD_STORAGE_KEY_ID
+        - CLOUD_STORAGE_APPLICATION_KEY
+        - CLOUD_STORAGE_BUCKET_NAME
+        - CLOUD_STORAGE_FULL_ENDPOINT
+        - CLOUD_STORAGE_REGION
+    dependencies:
+      specific:
+        - "software.amazon.awssdk:s3"
+        - "software.amazon.awssdk:s3-transfer-manager"
+        - "org.testcontainers:localstack"
+
+  EMAIL:
+    files:
+      specific_directories:
+        - "{src_package}mail"
+        - "{test_package}mail"
+      specific_files:
+        - "{src_package}config/EmailConf.java"
+        - "{src_package}service/health/HealthEmailService.java"
+        - "{src_package}exception/EmailSendException.java"
+        - "{src_package}exception/health/EmailHealthCheckException.java"
+        - "{src_package}endpoint/rest/controller/health/HealthEmailController.java"
+        - "{test_package}conf/EmailConf.java"
+        - "{test_package}service/health/HealthEmailServiceIT.java"
+        - "{test_package}endpoint/rest/controller/health/HealthEmailControllerIT.java"
+      specific_env_variables:
+        - SPRING_MAIL_HOST
+        - SPRING_MAIL_USERNAME
+        - SPRING_MAIL_PASSWORD
+        - SPRING_MAIL_FROM_EMAIL
+        - SPRING_MAIL_PORT
+    dependencies:
+      specific:
+        - "org.springframework.boot:spring-boot-starter-mail"
+        - "com.icegreen:greenmail"
+        - "com.icegreen:greenmail-junit5"

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/src/ar_infra/domain/constant.py

@@ -83,10 +83,10 @@ MALICIOUS_PATTERNS: Final[list[re.Pattern[str]]] = [
     re.compile(r"System\.exit\("),
     re.compile(r"Runtime\.getRuntime\(\)"),
     re.compile(r"ProcessBuilder"),
-    re.compile(r"\.\.\/\.\.\/"),
+    re.compile(r"\.\./\.\./"),
     re.compile(r"exec\("),
     re.compile(r"`[^`]+`"),
-    re.compile(r"\$\([^\)]+\)"),
+    re.compile(r"\$\([^)]+\)"),
 ]
 
 DEPENDENCY_PATTERN: Final[re.Pattern[str]] = re.compile(

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/src/ar_infra/domain/entities/gradle_dependency.py

@@ -1,11 +1,11 @@
 """Gradle dependency entity and configuration enum."""
 
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 from typing import final
 
 
-class GradleConfiguration(str, Enum):
+class GradleConfiguration(StrEnum):
     IMPLEMENTATION = "implementation"
     TEST_IMPLEMENTATION = "testImplementation"
     RUNTIME_ONLY = "runtimeOnly"

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/src/ar_infra/domain/enums/template_feature.py

@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class TemplateFeature(str, Enum):
+class TemplateFeature(StrEnum):
     """Available features in the template."""
 
     POSTGRESQL = "postgresql"

ar_infra_cli-0.2.1/src/ar_infra/infrastructure/processor/yaml_processor.py

@@ -0,0 +1,87 @@
+from importlib.resources.abc import (
+    Traversable,  # nosemgrep: python.lang.compatibility.python37.python37-compatibility-importlib2
+)
+from pathlib import Path
+from typing import Any, TypeVar
+
+import yaml
+from pydantic import BaseModel
+
+from src.ar_infra.domain.entities.path_resolver import PathSecurityValidator
+
+
+T = TypeVar("T", bound=BaseModel)
+
+_ALLOWED_EXTENSIONS: frozenset[str] = frozenset({".yml", ".yaml"})
+_MAX_FILE_SIZE_BYTES: int = 10 * 1024 * 1024  # 10 MB
+
+
+class YamlFileProcessor:
+    def __init__(self, security_validator: PathSecurityValidator | None = None) -> None:
+        self._security_validator = security_validator or PathSecurityValidator()
+
+    def load(self, path: Traversable | Path, model: type[T]) -> T:
+        """
+        Load a YAML file and validate its content against a Pydantic model.
+
+        :param path: Traversable (package resource) or Path (filesystem).
+        :param model: Pydantic BaseModel subclass to validate against.
+        :return: Validated instance of model.
+        :raises ValueError: On security constraint violations.
+        :raises yaml.YAMLError: On malformed YAML.
+        :raises pydantic.ValidationError: On schema mismatch.
+        """
+        safe_path = self._validate_path(path)
+        raw: dict[str, Any] = self._read(safe_path)
+        return self._parse(raw, model)
+
+    def _validate_path(self, path: Traversable | Path) -> Traversable | Path:
+        self._check_extension(path.name)
+        if isinstance(path, Path):
+            return self._validate_filesystem_path(path)
+        return path
+
+    def _check_extension(self, name: str) -> None:
+        suffix = Path(name).suffix.lower()
+        if suffix not in _ALLOWED_EXTENSIONS:
+            raise ValueError(
+                f"Rejected file '{name}': extension '{suffix}' is not allowed. "
+                f"Accepted: {_ALLOWED_EXTENSIONS}"
+            )
+
+    def _validate_filesystem_path(self, path: Path) -> Path:
+        resolved = self._security_validator.validate_destination_path(str(path))
+
+        size = resolved.stat().st_size
+        if size > _MAX_FILE_SIZE_BYTES:
+            raise ValueError(
+                f"Rejected file '{path.name}': size {size} bytes exceeds "
+                f"the limit of {_MAX_FILE_SIZE_BYTES} bytes."
+            )
+
+        return resolved
+
+    def _read(self, path: Traversable | Path) -> dict[str, Any]:
+        # Python objects, enabling RCE.
+        # Reference: https://pyyaml.org/wiki/PyYAMLDocumentation#loading-yaml
+        with path.open("r", encoding="utf-8") as f:
+            # Secondary size guard for Traversable (no stat() available).
+            content = f.read(_MAX_FILE_SIZE_BYTES + 1)
+            if len(content) > _MAX_FILE_SIZE_BYTES:
+                raise ValueError(
+                    f"Rejected file '{path.name}': content exceeds "
+                    f"the limit of {_MAX_FILE_SIZE_BYTES} bytes."
+                )
+            data = yaml.safe_load(content)
+
+        if not isinstance(data, dict):
+            raise TypeError(
+                f"Expected a YAML mapping at the root of '{path.name}', got {type(data).__name__}."
+            )
+
+        return data
+
+    def _parse(self, raw: dict[str, Any], model: type[T]) -> T:
+        result = model.model_validate(raw)
+        assert isinstance(result, model)
+        return result

ar_infra_cli-0.2.1/src/ar_infra/infrastructure/template/feature_config.py

@@ -0,0 +1,107 @@
+import sys
+from dataclasses import dataclass
+from functools import cache
+from pathlib import Path
+from typing import Final
+
+from src.ar_infra.domain.enums.template_feature import TemplateFeature
+from src.ar_infra.infrastructure.processor.yaml_processor import YamlFileProcessor
+from src.ar_infra.infrastructure.template.feature_config_schema import (
+    FeatureConfigSchema,
+    FeatureSchema,
+)
+
+
+@dataclass(frozen=True)
+class FeatureFiles:
+    shared_directories: list[str]
+    specific_directories: list[str]
+    shared_files: list[str]
+    specific_files: list[str]
+    shared_env_variables: list[str]
+    specific_env_variables: list[str]
+
+
+@dataclass(frozen=True)
+class FeatureDependencies:
+    shared: list[str]
+    specific: list[str]
+
+
+_RESOURCES_DIR = Path(__file__).resolve().parents[2] / "cli" / "resources"
+
+
+@cache
+def _load_config() -> FeatureConfigSchema:
+    if getattr(sys, "frozen", False):
+        base = Path(sys._MEIPASS)  # type: ignore[attr-defined] # pylint: disable=protected-access
+        conf = base / "ar_infra" / "cli" / "resources" / "feature-conf.yml"
+    else:
+        conf = _RESOURCES_DIR / "feature-conf.yml"
+    return YamlFileProcessor().load(conf, FeatureConfigSchema)
+
+
+def _resolve(template: str, src: str, test: str) -> str:
+    return template.format(src_package=src, test_package=test)
+
+
+def _resolve_list(items: list[str], src: str, test: str) -> list[str]:
+    return [_resolve(item, src, test) for item in items]
+
+
+def _to_feature_files(schema: FeatureSchema, src: str, test: str) -> FeatureFiles:
+    f = schema.files
+
+    def r(items: list[str]) -> list[str]:
+        return _resolve_list(items, src, test)
+
+    return FeatureFiles(
+        shared_directories=r(f.shared_directories),
+        specific_directories=r(f.specific_directories),
+        shared_files=r(f.shared_files),
+        specific_files=r(f.specific_files),
+        shared_env_variables=f.shared_env_variables,
+        specific_env_variables=f.specific_env_variables,
+    )
+
+
+def _to_feature_dependencies(schema: FeatureSchema) -> FeatureDependencies:
+    return FeatureDependencies(
+        shared=schema.dependencies.shared,
+        specific=schema.dependencies.specific,
+    )
+
+
+def _to_enum(key: str) -> TemplateFeature:
+    return TemplateFeature[key]
+
+
+def _build_feature_files() -> dict[TemplateFeature, FeatureFiles]:
+    cfg = _load_config()
+    return {
+        _to_enum(key): _to_feature_files(schema, cfg.src_package, cfg.test_package)
+        for key, schema in cfg.features.items()
+    }
+
+
+def _build_feature_dependencies() -> dict[TemplateFeature, FeatureDependencies]:
+    cfg = _load_config()
+    return {_to_enum(key): _to_feature_dependencies(schema) for key, schema in cfg.features.items()}
+
+
+FEATURE_FILES: Final[dict[TemplateFeature, FeatureFiles]] = _build_feature_files()
+FEATURE_DEPENDENCIES: Final[dict[TemplateFeature, FeatureDependencies]] = (
+    _build_feature_dependencies()
+)
+
+
+def get_all_dependencies_for_features(enabled_features: set[TemplateFeature]) -> list[str]:
+    all_deps = set()
+
+    for feature in enabled_features:
+        feature_deps = FEATURE_DEPENDENCIES.get(feature)
+        if feature_deps:
+            all_deps.update(feature_deps.shared)
+            all_deps.update(feature_deps.specific)
+
+    return sorted(all_deps)

ar_infra_cli-0.2.1/src/ar_infra/infrastructure/template/feature_config_schema.py

@@ -0,0 +1,34 @@
+from pydantic import BaseModel
+
+
+class FeatureFilesSchema(BaseModel):
+    shared_directories: list[str] = []
+    specific_directories: list[str] = []
+    shared_files: list[str] = []
+    specific_files: list[str] = []
+    shared_env_variables: list[str] = []
+    specific_env_variables: list[str] = []
+
+
+class FeatureDependenciesSchema(BaseModel):
+    shared: list[str] = []
+    specific: list[str] = []
+
+
+class FeatureSchema(BaseModel):
+    files: FeatureFilesSchema = FeatureFilesSchema()
+    dependencies: FeatureDependenciesSchema = FeatureDependenciesSchema()
+
+
+class DatabaseSharedSchema(BaseModel):
+    directories: list[str] = []
+    files: list[str] = []
+    env_variables: list[str] = []
+    dependencies: list[str] = []
+
+
+class FeatureConfigSchema(BaseModel):
+    src_package: str
+    test_package: str
+    database_shared: DatabaseSharedSchema
+    features: dict[str, FeatureSchema]

{ar_infra_cli-0.2.0 → ar_infra_cli-0.2.1}/src/ar_infra/infrastructure/template/feature_manager.py

@@ -39,8 +39,8 @@ class FeatureManager:
         template_dir: Path,
         enabled_features: set[TemplateFeature],
     ) -> None:
-        all_features = set(TemplateFeature)
-        features_to_remove = all_features - enabled_features
+        all_features: set[TemplateFeature] = set(TemplateFeature)
+        features_to_remove: set[TemplateFeature] = all_features - enabled_features
 
         # Remove specific files/directories for disabled features
         for feature in features_to_remove:

ar_infra_cli-0.2.0/src/ar_infra/infrastructure/template/feature_config.py

@@ -1,202 +0,0 @@
-from dataclasses import dataclass
-from typing import Final
-
-from src.ar_infra.domain.enums.template_feature import TemplateFeature
-
-
-SRC_PACKAGE = "src/main/java/com/example/arinfra/"
-TEST_PACKAGE = "src/test/java/com/example/arinfra/"
-
-
-@dataclass(frozen=True)
-class FeatureFiles:
-    shared_directories: list[str]
-    specific_directories: list[str]
-    shared_files: list[str]
-    specific_files: list[str]
-    shared_env_variables: list[str]
-    specific_env_variables: list[str]
-
-
-@dataclass(frozen=True)
-class FeatureDependencies:
-    shared: list[str]
-    specific: list[str]
-
-
-# Database shared resources (common to all database features)
-DATABASE_SHARED_DIRECTORIES: list[str] = [
-    SRC_PACKAGE + "repository",
-    "src/main/resources/db",
-]
-
-DATABASE_SHARED_FILES: list[str] = [
-    SRC_PACKAGE + "endpoint/rest/controller/health/HealthRepositoryController.java",
-    SRC_PACKAGE + "service/health/HealthRepositoryService.java",
-    TEST_PACKAGE + "endpoint/rest/controller/health/HealthRepositoryControllerIT.java",
-]
-
-DATABASE_SHARED_ENV_VARIABLES: list[str] = [
-    "SPRING_DATASOURCE_URL",
-    "SPRING_DATASOURCE_USERNAME",
-    "SPRING_DATASOURCE_PASSWORD",
-]
-
-DATABASE_SHARED_DEPENDENCIES: list[str] = [
-    "org.springframework.boot:spring-boot-starter-data-jpa",
-    "org.flywaydb:flyway-core",
-]
-
-FEATURE_FILES: Final[dict[TemplateFeature, FeatureFiles]] = {
-    TemplateFeature.POSTGRESQL: FeatureFiles(
-        shared_directories=[*DATABASE_SHARED_DIRECTORIES, TEST_PACKAGE + "conf/db"],
-        specific_directories=[],
-        shared_files=DATABASE_SHARED_FILES,
-        specific_files=[TEST_PACKAGE + "conf/db/PostgresConf.java"],
-        shared_env_variables=DATABASE_SHARED_ENV_VARIABLES,
-        specific_env_variables=[],
-    ),
-    TemplateFeature.MYSQL: FeatureFiles(
-        shared_directories=[*DATABASE_SHARED_DIRECTORIES, TEST_PACKAGE + "conf/db"],
-        specific_directories=[],
-        shared_files=DATABASE_SHARED_FILES,
-        specific_files=[TEST_PACKAGE + "conf/db/MysqlConf.java"],
-        shared_env_variables=DATABASE_SHARED_ENV_VARIABLES,
-        specific_env_variables=[],
-    ),
-    TemplateFeature.RABBITMQ: FeatureFiles(
-        shared_directories=[],
-        specific_directories=[
-            SRC_PACKAGE + "event",
-            SRC_PACKAGE + "datastructure",
-        ],
-        shared_files=[],
-        specific_files=[
-            SRC_PACKAGE + "config/RabbitConfig.java",
-            SRC_PACKAGE + "datastructure/ListGrouper.java",
-            SRC_PACKAGE + "service/health/HealthEventService.java",
-            SRC_PACKAGE + "endpoint/rest/controller/health/HealthEventController.java",
-            TEST_PACKAGE + "conf/RabbitMQConf.java",
-            TEST_PACKAGE + "service/health/HealthEventServiceIT.java",
-            TEST_PACKAGE + "endpoint/rest/controller/health/HealthEventControllerIT.java",
-        ],
-        shared_env_variables=[],
-        specific_env_variables=[
-            "SPRING_RABBITMQ_HOST",
-            "SPRING_RABBITMQ_USERNAME",
-            "SPRING_RABBITMQ_PASSWORD",
-            "SPRING_RABBITMQ_VHOST",
-            "SPRING_RABBITMQ_QUEUE",
-            "SPRING_RABBITMQ_EXCHANGE",
-            "SPRING_RABBITMQ_ROUTING_KEY",
-            "SPRING_RABBITMQ_PORT",
-            "APP_RABBITMQ_SSL",
-        ],
-    ),
-    TemplateFeature.S3_BUCKET: FeatureFiles(
-        shared_directories=[],
-        specific_directories=[
-            SRC_PACKAGE + "exception/bucket",
-        ],
-        shared_files=[],
-        specific_files=[
-            SRC_PACKAGE + "config/BucketConf.java",
-            SRC_PACKAGE + "file/BucketComponent.java",
-            SRC_PACKAGE + "endpoint/rest/controller/health/HealthBucketController.java",
-            SRC_PACKAGE + "service/health/HealthBucketService.java",
-            TEST_PACKAGE + "conf/BucketConf.java",
-            TEST_PACKAGE + "file/BucketComponentIT.java",
-            TEST_PACKAGE + "service/health/HealthBucketServiceIT.java",
-            TEST_PACKAGE + "endpoint/rest/controller/health/HealthBucketControllerIT.java",
-        ],
-        shared_env_variables=[],
-        specific_env_variables=[
-            "CLOUD_STORAGE_KEY_ID",
-            "CLOUD_STORAGE_APPLICATION_KEY",
-            "CLOUD_STORAGE_BUCKET_NAME",
-            "CLOUD_STORAGE_FULL_ENDPOINT",
-            "CLOUD_STORAGE_REGION",
-        ],
-    ),
-    TemplateFeature.EMAIL: FeatureFiles(
-        shared_directories=[],
-        specific_directories=[
-            SRC_PACKAGE + "mail",
-            TEST_PACKAGE + "mail",
-        ],
-        shared_files=[],
-        specific_files=[
-            SRC_PACKAGE + "config/EmailConf.java",
-            SRC_PACKAGE + "service/health/HealthEmailService.java",
-            SRC_PACKAGE + "exception/EmailSendException.java",
-            SRC_PACKAGE + "exception/health/EmailHealthCheckException.java",
-            SRC_PACKAGE + "endpoint/rest/controller/health/HealthEmailController.java",
-            TEST_PACKAGE + "conf/EmailConf.java",
-            TEST_PACKAGE + "service/health/HealthEmailServiceIT.java",
-            TEST_PACKAGE + "endpoint/rest/controller/health/HealthEmailControllerIT.java",
-        ],
-        shared_env_variables=[],
-        specific_env_variables=[
-            "SPRING_MAIL_HOST",
-            "SPRING_MAIL_USERNAME",
-            "SPRING_MAIL_PASSWORD",
-            "SPRING_MAIL_FROM_EMAIL",
-            "SPRING_MAIL_PORT",
-        ],
-    ),
-}
-
-FEATURE_DEPENDENCIES: Final[dict[TemplateFeature, FeatureDependencies]] = {
-    TemplateFeature.POSTGRESQL: FeatureDependencies(
-        shared=DATABASE_SHARED_DEPENDENCIES,
-        specific=[
-            "org.postgresql:postgresql",
-            "org.flywaydb:flyway-database-postgresql",
-            "org.testcontainers:postgresql",
-        ],
-    ),
-    TemplateFeature.MYSQL: FeatureDependencies(
-        shared=DATABASE_SHARED_DEPENDENCIES,
-        specific=[
-            "com.mysql:mysql-connector-j",
-            "org.flywaydb:flyway-mysql",
-            "org.testcontainers:mysql",
-        ],
-    ),
-    TemplateFeature.RABBITMQ: FeatureDependencies(
-        shared=[],
-        specific=[
-            "org.springframework.boot:spring-boot-starter-amqp",
-            "org.springframework.amqp:spring-rabbit-test",
-            "org.testcontainers:rabbitmq",
-        ],
-    ),
-    TemplateFeature.S3_BUCKET: FeatureDependencies(
-        shared=[],
-        specific=[
-            "software.amazon.awssdk:s3",
-            "software.amazon.awssdk:s3-transfer-manager",
-            "org.testcontainers:localstack",
-        ],
-    ),
-    TemplateFeature.EMAIL: FeatureDependencies(
-        shared=[],
-        specific=[
-            "org.springframework.boot:spring-boot-starter-mail",
-            "com.icegreen:greenmail",
-            "com.icegreen:greenmail-junit5",
-        ],
-    ),
-}
-
-
-def get_all_dependencies_for_features(enabled_features: set[TemplateFeature]) -> list[str]:
-    all_deps = set()
-
-    for feature in enabled_features:
-        feature_deps = FEATURE_DEPENDENCIES.get(feature)
-        if feature_deps:
-            all_deps.update(feature_deps.shared)
-            all_deps.update(feature_deps.specific)
-
-    return sorted(all_deps)