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

{dbt_platform_helper-15.8.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.8.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,28 +13,19 @@ 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: PyYAML (==6.0.2)
-Requires-Dist: aiohttp (>=3.11.16,<4.0.0)
 Requires-Dist: boto3 (>=1.35.2,<2.0.0)
-Requires-Dist: boto3-stubs (>=1.26.148,<2.0.0)
 Requires-Dist: botocore (>=1.34.85,<2.0.0)
-Requires-Dist: certifi (>=2023.7.22,<2025.0.0)
-Requires-Dist: cfn-flip (==1.3.0)
-Requires-Dist: cfn-lint (>=1.4.2,<2.0.0)
-Requires-Dist: checkov (>=3.2.405,<4.0.0)
+Requires-Dist: cfn-flip (>=1.3.0,<2.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
-Requires-Dist: cryptography (>=44.0.1,<45)
-Requires-Dist: jinja2-simple-tags (>=0.5.0,<0.6.0)
-Requires-Dist: jsonschema (>=4.17.0,<4.18.0)
-Requires-Dist: mypy-boto3-codebuild (>=1.26.0.post1,<2.0.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)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: schema (==0.7.5)
-Requires-Dist: semver (>=3.0.2,<4.0.0)
 Requires-Dist: slack-sdk (>=3.27.1,<4.0.0)
-Requires-Dist: tomlkit (>=0.12.2,<0.14.0)
 Requires-Dist: yamllint (>=1.35.1,<2.0.0)
 Description-Content-Type: text/markdown
 

{dbt_platform_helper-15.8.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.8.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/constants.py

@@ -16,8 +16,8 @@ TERRAFORM_ECS_SERVICE_MODULE_SOURCE_OVERRIDE_ENV_VAR = (
 TERRAFORM_MODULE_SOURCE_TYPE_ENV_VAR = "TERRAFORM_MODULE_SOURCE_TYPE"  # "LOCAL", "SSH", "OVERRIDE"
 IMAGE_TAG_ENV_VAR = "IMAGE_TAG"
 PLATFORM_HELPER_PACKAGE_NAME = "dbt-platform-helper"
-SUPPORTED_TERRAFORM_VERSION = "~> 1.8"
-SUPPORTED_AWS_PROVIDER_VERSION = "~> 5"
+SUPPORTED_TERRAFORM_VERSION = "~> 1.11"
+SUPPORTED_AWS_PROVIDER_VERSION = "~> 6"
 FIRST_UPGRADABLE_PLATFORM_HELPER_MAJOR_VERSION = 13
 
 MERGED_TPM_PLATFORM_HELPER_VERSION = 14

{dbt_platform_helper-15.8.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/domain/maintenance_page.py

@@ -199,7 +199,13 @@ class MaintenancePage:
                         "AllowedIps",
                         next(rule_priority),
                         service_conditions,
-                        [{"Key": "service", "Value": svc.name}],
+                        [
+                            {"Key": "application", "Value": app},
+                            {"Key": "environment", "Value": env},
+                            {"Key": "reason", "Value": "MaintenancePage"},
+                            {"Key": "managed-by", "Value": "DBT Platform"},
+                            {"Key": "service", "Value": svc.name},
+                        ],
                     )
                     self.load_balancer.create_source_ip_rule(
                         listener_arn,
@@ -208,7 +214,13 @@ class MaintenancePage:
                         "AllowedSourceIps",
                         next(rule_priority),
                         service_conditions,
-                        [{"Key": "service", "Value": svc.name}],
+                        [
+                            {"Key": "application", "Value": app},
+                            {"Key": "environment", "Value": env},
+                            {"Key": "reason", "Value": "MaintenancePage"},
+                            {"Key": "managed-by", "Value": "DBT Platform"},
+                            {"Key": "service", "Value": svc.name},
+                        ],
                     )
 
                 self.load_balancer.create_header_rule(
@@ -219,7 +231,13 @@ class MaintenancePage:
                     "BypassIpFilter",
                     next(rule_priority),
                     service_conditions,
-                    [{"Key": "service", "Value": svc.name}],
+                    [
+                        {"Key": "application", "Value": app},
+                        {"Key": "environment", "Value": env},
+                        {"Key": "reason", "Value": "MaintenancePage"},
+                        {"Key": "managed-by", "Value": "DBT Platform"},
+                        {"Key": "service", "Value": svc.name},
+                    ],
                 )
 
                 # add to accumilating list of conditions for maintenace page rule
@@ -267,8 +285,12 @@ class MaintenancePage:
                         }
                     ],
                     tags=[
+                        {"Key": "application", "Value": app},
+                        {"Key": "environment", "Value": env},
+                        {"Key": "reason", "Value": "MaintenancePage"},
                         {"Key": "name", "Value": "MaintenancePage"},
                         {"Key": "type", "Value": template},
+                        {"Key": "managed-by", "Value": "DBT Platform"},
                     ],
                 )
         except Exception as e:

{dbt_platform_helper-15.8.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/domain/pipelines.py

@@ -54,6 +54,25 @@ class Pipelines:
             or self.environment_variable_provider.get(PLATFORM_HELPER_VERSION_OVERRIDE_KEY)
         )
 
+    def _map_environment_pipeline_accounts(self, platform_config) -> list[tuple[str, str]]:
+        environment_pipelines_config = platform_config[ENVIRONMENT_PIPELINES_KEY]
+        environment_config = platform_config["environments"]
+
+        account_id_lookup = {
+            env["accounts"]["deploy"]["name"]: env["accounts"]["deploy"]["id"]
+            for env in environment_config.values()
+            if env is not None and "accounts" in env and "deploy" in env["accounts"]
+        }
+
+        accounts = set()
+
+        for config in environment_pipelines_config.values():
+            account = config.get("account")
+            deploy_account_id = account_id_lookup.get(account)
+            accounts.add((account, deploy_account_id))
+
+        return list(accounts)
+
     def generate(
         self,
         deploy_branch: str,
@@ -107,20 +126,16 @@ class Pipelines:
         )
 
         if has_environment_pipelines:
-            environment_pipelines = platform_config[ENVIRONMENT_PIPELINES_KEY]
-            accounts = {
-                config.get("account")
-                for config in environment_pipelines.values()
-                if "account" in config
-            }
+            accounts = self._map_environment_pipeline_accounts(platform_config)
 
-            for account in accounts:
+            for account_name, account_id in accounts:
                 self._generate_terraform_environment_pipeline_manifest(
                     platform_config["application"],
                     deploy_repository,
-                    account,
+                    account_name,
                     env_pipeline_module_source,
                     deploy_branch,
+                    account_id,
                 )
 
         if has_codebase_pipelines:
@@ -163,6 +178,7 @@ class Pipelines:
         aws_account: str,
         module_source: str,
         deploy_branch: str,
+        aws_account_id: str,
     ):
         env_pipeline_template = setup_templates().get_template("environment-pipelines/main.tf")
 
@@ -175,6 +191,7 @@ class Pipelines:
                 "deploy_branch": deploy_branch,
                 "terraform_version": SUPPORTED_TERRAFORM_VERSION,
                 "aws_provider_version": SUPPORTED_AWS_PROVIDER_VERSION,
+                "deploy_account_id": aws_account_id,
             }
         )
 

{dbt_platform_helper-15.8.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.8.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.8.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/entities/service.py

@@ -54,7 +54,7 @@ class SidecarOverride(BaseModel):
 class Image(BaseModel):
     build: Optional[str] = Field(default=None)
     location: Optional[str] = Field(default=None)
-    port: int = Field()
+    port: Optional[int] = Field(default=None)
 
 
 class VPC(BaseModel):

{dbt_platform_helper-15.8.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/providers/terraform_manifest.py

@@ -30,6 +30,7 @@ class TerraformManifestProvider:
         service_dir = f"terraform/services/{environment}/{config_object.name}"
         platform_config = ConfigProvider.apply_environment_defaults(platform_config)
         account = self._get_account_for_env(environment, platform_config)
+        deploy_to_account_id = self._get_account_id_for_account(account, platform_config)
         state_key_suffix = f"{config_object.name}-{environment}"
 
         terraform = {}
@@ -37,7 +38,7 @@ class TerraformManifestProvider:
 
         self._add_service_locals(terraform, environment, image_tag)
 
-        self._add_provider(terraform, account)
+        self._add_provider(terraform, account, deploy_to_account_id)
         self._add_backend(
             terraform, platform_config, account, f"tfstate/services/{state_key_suffix}.tfstate"
         )
@@ -54,11 +55,13 @@ class TerraformManifestProvider:
             "application": '${local.platform_config["application"]}',
             "environments": '${local.platform_config["environments"]}',
             "env_config": '${{for name, config in local.environments: name => merge(lookup(local.environments, "*", {}), config)}}',
-            "service_config": '${yamldecode(templatefile("./service-config.yml", {COPILOT_ENVIRONMENT_NAME = local.environment, IMAGE_TAG = local.image_tag}))}',
+            "service_config": '${yamldecode(templatefile("./service-config.yml", {PLATFORM_ENVIRONMENT_NAME = local.environment, IMAGE_TAG = local.image_tag}))}',
             "raw_env_config": '${local.platform_config["environments"]}',
             "combined_env_config": '${{for name, config in local.raw_env_config: name => merge(lookup(local.raw_env_config, "*", {}), config)}}',
             "service_deployment_mode": '${lookup(local.combined_env_config[local.environment], "service-deployment-mode", "copilot")}',
             "non_copilot_service_deployment_mode": '${local.service_deployment_mode == "dual-deploy-copilot-traffic" || local.service_deployment_mode == "dual-deploy-platform-traffic" || local.service_deployment_mode == "platform" ? 1 : 0}',
+            "custom_iam_policy_path": '${abspath(format("%s/../../../../services/%s/custom-iam-policy/%s.yml", path.module, local.service_config.name, local.environment))}',
+            "custom_iam_policy_json": "${fileexists(local.custom_iam_policy_path) ? jsonencode(yamldecode(file(local.custom_iam_policy_path))) : null}",
         }
 
     def _add_service_module(
@@ -76,6 +79,8 @@ class TerraformManifestProvider:
                 "environment": "${local.environment}",
                 "service_config": "${local.service_config}",
                 "env_config": "${local.env_config}",
+                "platform_extensions": '${local.platform_config["extensions"]}',
+                "custom_iam_policy_json": "${local.custom_iam_policy_json}",
             }
         }
 
@@ -88,12 +93,13 @@ class TerraformManifestProvider:
         module_source: str,
     ):
         default_account = self._get_account_for_env("*", platform_config)
+        deploy_to_account_id = self._get_account_id_for_account(default_account, platform_config)
         state_key_suffix = f"{platform_config['application']}-codebase-pipelines"
 
         terraform = {}
         self._add_header(terraform)
         self._add_codebase_pipeline_locals(terraform)
-        self._add_provider(terraform, default_account)
+        self._add_provider(terraform, default_account, deploy_to_account_id)
         self._add_backend(
             terraform,
             platform_config,
@@ -142,6 +148,16 @@ class TerraformManifestProvider:
         )
         return account
 
+    @staticmethod
+    def _get_account_id_for_account(account_name, platform_config):
+        environment_config = platform_config["environments"]
+        account_id_lookup = {
+            env["accounts"]["deploy"]["name"]: env["accounts"]["deploy"]["id"]
+            for env in environment_config.values()
+            if env is not None and "accounts" in env and "deploy" in env["accounts"]
+        }
+        return account_id_lookup.get(account_name)
+
     @staticmethod
     def _add_header(terraform: dict):
         time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -160,12 +176,11 @@ class TerraformManifestProvider:
         }
 
     @staticmethod
-    def _add_provider(terraform: dict, default_account: str):
+    def _add_provider(terraform: dict, deploy_to_account: str, deploy_to_account_id: str):
         terraform["provider"] = {"aws": {}}
         terraform["provider"]["aws"]["region"] = "eu-west-2"
-        terraform["provider"]["aws"]["profile"] = default_account
-        terraform["provider"]["aws"]["alias"] = default_account
-        terraform["provider"]["aws"]["shared_credentials_files"] = ["~/.aws/config"]
+        terraform["provider"]["aws"]["profile"] = deploy_to_account
+        terraform["provider"]["aws"]["allowed_account_ids"] = [deploy_to_account_id]
 
     @staticmethod
     def _add_backend(terraform: dict, platform_config: dict, account: str, state_key: str):

{dbt_platform_helper-15.8.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/providers/yaml_file.py

@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from pathlib import Path
 
 import yaml
@@ -84,6 +85,32 @@ class YamlFileProvider:
         if duplicate_keys:
             raise DuplicateKeysException(",".join(duplicate_keys))
 
+    @staticmethod
+    def remove_empty_keys(config: (dict, OrderedDict)) -> (dict, OrderedDict):
+        cleaned = config.__class__()
+
+        for k, v in config.items():
+            if isinstance(v, (dict, OrderedDict)):
+                v = YamlFileProvider.remove_empty_keys(v)
+            if v not in ("", None, [], {}, ()):
+                cleaned[k] = v
+
+        return cleaned
+
+    @staticmethod
+    def find_and_replace(config, string: str, replacement: str):
+        if isinstance(config, (dict, OrderedDict)):
+            return {
+                k: YamlFileProvider.find_and_replace(v, string, replacement)
+                for k, v in config.items()
+            }
+        elif isinstance(config, list):
+            return [YamlFileProvider.find_and_replace(item, string, replacement) for item in config]
+        elif isinstance(config, str):
+            return config.replace(string, replacement)
+        else:
+            return replacement if config == string else config
+
 
 def account_number_representer(dumper, data):
     if data.isdigit():

{dbt_platform_helper-15.8.0 → dbt_platform_helper-15.10.0}/dbt_platform_helper/templates/environment-pipelines/main.tf

@@ -10,10 +10,10 @@ locals {
 provider "aws" {
   region                   = "eu-west-2"
   profile                  = "{{ aws_account }}"
-  alias                    = "{{ aws_account }}"
-  shared_credentials_files = ["~/.aws/config"]
+  allowed_account_ids      = ["{{ deploy_account_id }}"]
 }
 
+
 terraform {
   required_version = "{{ terraform_version }}"
   backend "s3" {

{dbt_platform_helper-15.8.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.8.0 → dbt_platform_helper-15.10.0}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "dbt-platform-helper"
-version = "15.8.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"
@@ -21,31 +21,22 @@ platform-helper = "platform_helper:platform_helper"
 
 [tool.poetry.dependencies]
 Jinja2 = "3.1.6"
-PyYAML = "6.0.2"
 yamllint = "^1.35.1"
 boto3 = "^1.35.2"
-boto3-stubs = "^1.26.148"
 botocore = "^1.34.85"
 click = "^8.1.3"
-mypy-boto3-codebuild = "^1.26.0.post1"
 python = ">3.9.1,<4.0"
 schema = "0.7.5"
-cfn-flip = "1.3.0"
-aiohttp = "^3.11.16"
-certifi = ">=2023.7.22,<2025.0.0"
-cryptography = ">=44.0.1, <45"
-jinja2-simple-tags = "^0.5.0"
+jinja2-simple-tags = ">=0.5,<0.7"
 requests = "^2.31.0"
 prettytable = "^3.9.0"
-semver = "^3.0.2"
-tomlkit = ">=0.12.2,<0.14.0"
 slack-sdk = "^3.27.1"
-jsonschema = "~=4.17.0"
-cfn-lint = "^1.4.2"
 psycopg2-binary = "^2.9.9"
-checkov = "^3.2.405"
+pydantic = "^2.11.7"
+cfn-flip = "^1.3.0"
 
 [tool.poetry.group.dev.dependencies]
+checkov = "^3.2.405"
 moto = {extras = ["all"], version = "^5.0.28"}
 pyfakefs = "^5.2.2"
 pytest = "^8.3.5"
@@ -56,6 +47,10 @@ freezegun = "^1.2.2"
 parameterized = "^0.9.0"
 pytest-xdist = "^3.5.0"
 pytest-cov = "^6.0.0"
+mypy-boto3-codebuild = "^1.40.8"
+
+python-hcl2 = "^7.3.1"
+boto3-stubs =  "^1.26.148"
 
 [build-system]
 requires = ["poetry-core"]