dbt-platform-helper 15.9.0__tar.gz → 15.10.0__tar.gz

{dbt_platform_helper-15.9.0 → dbt_platform_helper-15.10.0}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: dbt-platform-helper
-Version: 15.9.0
+Version: 15.10.0
 Summary: Set of tools to help transfer applications/services from GOV.UK PaaS to DBT PaaS augmenting AWS Copilot.
 License: MIT
+License-File: LICENSE
 Author: Department for Business and Trade Platform Team
 Author-email: sre-team@digital.trade.gov.uk
 Requires-Python: >3.9.1,<4.0
@@ -12,12 +13,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: Jinja2 (==3.1.6)
 Requires-Dist: boto3 (>=1.35.2,<2.0.0)
 Requires-Dist: botocore (>=1.34.85,<2.0.0)
 Requires-Dist: cfn-flip (>=1.3.0,<2.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
-Requires-Dist: jinja2-simple-tags (>=0.5.0,<0.6.0)
+Requires-Dist: jinja2-simple-tags (>=0.5,<0.7)
 Requires-Dist: prettytable (>=3.9.0,<4.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
 Requires-Dist: pydantic (>=2.11.7,<3.0.0)

{dbt_platform_helper-15.9.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/COMMANDS.md

@@ -22,6 +22,8 @@
         - [platform-helper environment generate](#platform-helper-environment-generate)
         - [platform-helper environment generate-terraform](#platform-helper-environment-generate-terraform)
     - [platform-helper generate](#platform-helper-generate)
+    - [platform-helper internal](#platform-helper-internal)
+        - [platform-helper internal migrate-service-manifests](#platform-helper-internal-migrate-service-manifests)
     - [platform-helper pipeline](#platform-helper-pipeline)
         - [platform-helper pipeline generate](#platform-helper-pipeline-generate)
     - [platform-helper secrets](#platform-helper-secrets)
@@ -65,6 +67,7 @@ platform-helper <command> [--version]
 - [`database` ↪](#platform-helper-database)
 - [`environment` ↪](#platform-helper-environment)
 - [`generate` ↪](#platform-helper-generate)
+- [`internal` ↪](#platform-helper-internal)
 - [`notify` ↪](#platform-helper-notify)
 - [`pipeline` ↪](#platform-helper-pipeline)
 - [`secrets` ↪](#platform-helper-secrets)
@@ -539,6 +542,44 @@ platform-helper generate
 
 ## Options
 
+- `--help <boolean>` _Defaults to False._
+  - Show this message and exit.
+
+# platform-helper internal
+
+[↩ Parent](#platform-helper)
+
+    Internal commands for use within pipelines or by Platform Team.
+
+## Usage
+
+```
+platform-helper internal migrate-service-manifests 
+```
+
+## Options
+
+- `--help <boolean>` _Defaults to False._
+  - Show this message and exit.
+
+## Commands
+
+- [`migrate-service-manifests` ↪](#platform-helper-internal-migrate-service-manifests)
+
+# platform-helper internal migrate-service-manifests
+
+[↩ Parent](#platform-helper-internal)
+
+    Migrate copilot manifests to service manifests.
+
+## Usage
+
+```
+platform-helper internal migrate-service-manifests 
+```
+
+## Options
+
 - `--help <boolean>` _Defaults to False._
   - Show this message and exit.
 

dbt_platform_helper-15.10.0/dbt_platform_helper/commands/internal.py

@@ -0,0 +1,23 @@
+import click
+
+from dbt_platform_helper.domain.service import ServiceManager
+from dbt_platform_helper.platform_exception import PlatformException
+from dbt_platform_helper.providers.io import ClickIOProvider
+from dbt_platform_helper.utils.click import ClickDocOptGroup
+
+
+@click.group(cls=ClickDocOptGroup)
+def internal():
+    """Internal commands for use within pipelines or by Platform Team."""
+
+
+@internal.command()
+def migrate_service_manifests():
+    """Migrate copilot manifests to service manifests."""
+    click_io = ClickIOProvider()
+
+    try:
+        service_manager = ServiceManager()
+        service_manager.migrate_copilot_manifests()
+    except PlatformException as error:
+        click_io.abort_with_error(str(error))

{dbt_platform_helper-15.9.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/domain/service.py

@@ -1,8 +1,12 @@
+import os
+from collections import OrderedDict
+from copy import deepcopy
 from datetime import datetime
 from importlib.metadata import version
 from pathlib import Path
 
 from dbt_platform_helper.constants import IMAGE_TAG_ENV_VAR
+from dbt_platform_helper.constants import PLATFORM_HELPER_PACKAGE_NAME
 from dbt_platform_helper.constants import PLATFORM_HELPER_VERSION_OVERRIDE_KEY
 from dbt_platform_helper.constants import SERVICE_CONFIG_FILE
 from dbt_platform_helper.constants import SERVICE_DIRECTORY
@@ -21,15 +25,18 @@ from dbt_platform_helper.providers.config_validator import ConfigValidator
 from dbt_platform_helper.providers.environment_variable import (
     EnvironmentVariableProvider,
 )
+from dbt_platform_helper.providers.files import FileProvider
 from dbt_platform_helper.providers.io import ClickIOProvider
 from dbt_platform_helper.providers.terraform_manifest import TerraformManifestProvider
+from dbt_platform_helper.providers.version import InstalledVersionProvider
 from dbt_platform_helper.providers.yaml_file import YamlFileProvider
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.deep_merge import deep_merge
 
-# TODO add schema version too service config
+SERVICE_TYPES = ["Load Balanced Web Service", "Backend Service"]
 
 
+# TODO add schema version to service config
 class ServiceManager:
     def __init__(
         self,
@@ -41,6 +48,7 @@ class ServiceManager:
         manifest_provider: TerraformManifestProvider = None,
         platform_helper_version_override: str = None,
         load_application=load_application,
+        installed_version_provider: InstalledVersionProvider = InstalledVersionProvider(),
     ):
 
         self.file_provider = file_provider
@@ -56,6 +64,7 @@ class ServiceManager:
             or self.environment_variable_provider.get(PLATFORM_HELPER_VERSION_OVERRIDE_KEY)
         )
         self.load_application = load_application
+        self.installed_version_provider = installed_version_provider
 
     def generate(self, environments: list[str], services: list[str], image_tag_flag: str = None):
 
@@ -151,3 +160,54 @@ class ServiceManager:
                     config,
                     module_source_override,
                 )
+
+    def migrate_copilot_manifests(self) -> None:
+        service_directory = Path("services/")
+        service_directory.mkdir(parents=True, exist_ok=True)
+
+        for dirname, _, filenames in os.walk("copilot"):
+            if "manifest.yml" in filenames and "environments" not in dirname:
+                copilot_manifest = self.file_provider.load(f"{dirname}/manifest.yml")
+                service_manifest = OrderedDict(deepcopy(copilot_manifest))
+
+                if service_manifest["type"] not in SERVICE_TYPES:
+                    continue
+
+                if "environments" in service_manifest:
+                    for env in service_manifest["environments"]:
+                        env_config = service_manifest["environments"][env]
+                        if "http" in env_config:
+                            if "alb" in env_config["http"]:
+                                del env_config["http"]["alb"]
+
+                service_manifest = self.file_provider.find_and_replace(
+                    service_manifest,
+                    "${COPILOT_APPLICATION_NAME}",
+                    "${PLATFORM_APPLICATION_NAME}",
+                )
+
+                service_manifest = self.file_provider.find_and_replace(
+                    service_manifest,
+                    "${COPILOT_ENVIRONMENT_NAME}",
+                    "${PLATFORM_ENVIRONMENT_NAME}",
+                )
+
+                service_manifest = self.file_provider.remove_empty_keys(service_manifest)
+
+                service_path = service_directory / service_manifest["name"]
+
+                self.io.info(
+                    FileProvider.mkfile(
+                        service_path,
+                        "service-config.yml",
+                        "",
+                        overwrite=True,
+                    )
+                )
+
+                current_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                message = f"# Generated by platform-helper {self.installed_version_provider.get_semantic_version(PLATFORM_HELPER_PACKAGE_NAME)} / {current_date}.\n\n"
+
+                self.file_provider.write(
+                    f"{service_path}/service-config.yml", dict(service_manifest), message
+                )

{dbt_platform_helper-15.9.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/entities/platform_config_schema.py

@@ -114,7 +114,6 @@ class PlatformConfigSchema:
                         Optional("default_waf"): str,
                         Optional("domain_prefix"): str,
                         Optional("enable_logging"): bool,
-                        Optional("env_root"): str,
                         Optional("forwarded_values_forward"): str,
                         Optional("forwarded_values_headers"): [str],
                         Optional("forwarded_values_query_string"): bool,
@@ -293,6 +292,7 @@ class PlatformConfigSchema:
     @staticmethod
     def __postgres_schema() -> dict:
         _valid_postgres_plans = Or(*plan_manager.get_plan_names("postgres"))
+        _valid_postgres_version = Or(int, float)
 
         # TODO: DBTP-1943: Move to Postgres provider?
         _valid_postgres_storage_types = Or("gp2", "gp3", "io1", "io2")
@@ -305,11 +305,13 @@ class PlatformConfigSchema:
 
         return {
             "type": "postgres",
-            "version": (Or(int, float)),
+            Optional("version"): _valid_postgres_version,
             Optional("deletion_policy"): PlatformConfigSchema.__valid_postgres_deletion_policy(),
             Optional("environments"): {
                 PlatformConfigSchema.__valid_environment_name(): {
+                    Optional("apply_immediately"): bool,
                     Optional("plan"): _valid_postgres_plans,
+                    Optional("version"): (Or(int, float)),
                     Optional("volume_size"): PlatformConfigSchema.is_integer_between(20, 10000),
                     Optional("iops"): PlatformConfigSchema.is_integer_between(1000, 9950),
                     Optional("snapshot_id"): str,

{dbt_platform_helper-15.9.0 → dbt_platform_helper-15.10.0}/platform_helper.py

@@ -12,6 +12,7 @@ from dbt_platform_helper.commands.copilot import copilot as copilot_commands
 from dbt_platform_helper.commands.database import database as database_commands
 from dbt_platform_helper.commands.environment import environment as environment_commands
 from dbt_platform_helper.commands.generate import generate as generate_commands
+from dbt_platform_helper.commands.internal import internal as internal_commands
 from dbt_platform_helper.commands.notify import notify as notify_commands
 from dbt_platform_helper.commands.pipeline import pipeline as pipeline_commands
 from dbt_platform_helper.commands.secrets import secrets as secrets_commands
@@ -36,6 +37,7 @@ platform_helper.add_command(config_commands)
 platform_helper.add_command(copilot_commands)
 platform_helper.add_command(environment_commands)
 platform_helper.add_command(generate_commands)
+platform_helper.add_command(internal_commands)
 platform_helper.add_command(pipeline_commands)
 platform_helper.add_command(secrets_commands)
 platform_helper.add_command(service_commands)

{dbt_platform_helper-15.9.0 → dbt_platform_helper-15.10.0}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "dbt-platform-helper"
-version = "15.9.0"
+version = "15.10.0"
 description = "Set of tools to help transfer applications/services from GOV.UK PaaS to DBT PaaS augmenting AWS Copilot."
 authors = ["Department for Business and Trade Platform Team <sre-team@digital.trade.gov.uk>"]
 license = "MIT"
@@ -27,7 +27,7 @@ botocore = "^1.34.85"
 click = "^8.1.3"
 python = ">3.9.1,<4.0"
 schema = "0.7.5"
-jinja2-simple-tags = "^0.5.0"
+jinja2-simple-tags = ">=0.5,<0.7"
 requests = "^2.31.0"
 prettytable = "^3.9.0"
 slack-sdk = "^3.27.1"