dbt-platform-helper 12.5.0__py3-none-any.whl → 12.6.0__py3-none-any.whl

dbt_platform_helper/domain/conduit.py

@@ -1,12 +1,10 @@
 import subprocess
-from collections.abc import Callable
-
-import click
 
 from dbt_platform_helper.providers.cloudformation import CloudFormation
 from dbt_platform_helper.providers.copilot import connect_to_addon_client_task
 from dbt_platform_helper.providers.copilot import create_addon_client_task
 from dbt_platform_helper.providers.ecs import ECS
+from dbt_platform_helper.providers.io import ClickIOProvider
 from dbt_platform_helper.providers.secrets import Secrets
 from dbt_platform_helper.utils.application import Application
 
@@ -18,7 +16,7 @@ class Conduit:
         secrets_provider: Secrets,
         cloudformation_provider: CloudFormation,
         ecs_provider: ECS,
-        echo: Callable[[str], str] = click.secho,
+        io: ClickIOProvider = ClickIOProvider(),
         subprocess: subprocess = subprocess,
         connect_to_addon_client_task=connect_to_addon_client_task,
         create_addon_client_task=create_addon_client_task,
@@ -29,7 +27,7 @@ class Conduit:
         self.cloudformation_provider = cloudformation_provider
         self.ecs_provider = ecs_provider
         self.subprocess = subprocess
-        self.echo = echo
+        self.io = io
         self.connect_to_addon_client_task = connect_to_addon_client_task
         self.create_addon_client_task = create_addon_client_task
 
@@ -39,10 +37,10 @@ class Conduit:
             addon_name, access
         )
 
-        self.echo(f"Checking if a conduit task is already running for {addon_type}")
+        self.io.info(f"Checking if a conduit task is already running for {addon_type}")
         task_arns = self.ecs_provider.get_ecs_task_arns(cluster_arn, task_name)
         if not task_arns:
-            self.echo("Creating conduit task")
+            self.io.info("Creating conduit task")
             self.create_addon_client_task(
                 clients["iam"],
                 clients["ssm"],
@@ -55,7 +53,7 @@ class Conduit:
                 access,
             )
 
-            self.echo("Updating conduit task")
+            self.io.info("Updating conduit task")
             self._update_stack_resources(
                 self.application.name,
                 env,
@@ -69,13 +67,13 @@ class Conduit:
             task_arns = self.ecs_provider.get_ecs_task_arns(cluster_arn, task_name)
 
         else:
-            self.echo("Conduit task already running")
+            self.io.info("Conduit task already running")
 
-        self.echo(f"Checking if exec is available for conduit task...")
+        self.io.info(f"Checking if exec is available for conduit task...")
 
         self.ecs_provider.ecs_exec_is_available(cluster_arn, task_arns)
 
-        self.echo("Connecting to conduit task")
+        self.io.info("Connecting to conduit task")
         self.connect_to_addon_client_task(
             clients["ecs"], self.subprocess, self.application.name, env, cluster_arn, task_name
         )
@@ -115,7 +113,7 @@ class Conduit:
             parameter_name,
             access,
         )
-        self.echo("Waiting for conduit task update to complete...")
+        self.io.info("Waiting for conduit task update to complete...")
         self.cloudformation_provider.wait_for_cloudformation_to_reach_status(
             "stack_update_complete", stack_name
         )

dbt_platform_helper/domain/config_validator.py

@@ -1,11 +1,11 @@
 from typing import Callable
 
 import boto3
-import click
 
 from dbt_platform_helper.constants import CODEBASE_PIPELINES_KEY
 from dbt_platform_helper.constants import ENVIRONMENTS_KEY
 from dbt_platform_helper.constants import PLATFORM_CONFIG_FILE
+from dbt_platform_helper.providers.io import ClickIOProvider
 from dbt_platform_helper.providers.opensearch import OpensearchProvider
 from dbt_platform_helper.providers.redis import RedisProvider
 from dbt_platform_helper.utils.messages import abort_with_error
@@ -13,7 +13,9 @@ from dbt_platform_helper.utils.messages import abort_with_error
 
 class ConfigValidator:
 
-    def __init__(self, validations: Callable[[dict], None] = None):
+    def __init__(
+        self, validations: Callable[[dict], None] = None, io: ClickIOProvider = ClickIOProvider()
+    ):
         self.validations = validations or [
             self.validate_supported_redis_versions,
             self.validate_supported_opensearch_versions,
@@ -21,7 +23,9 @@ class ConfigValidator:
             self.validate_codebase_pipelines,
             self.validate_environment_pipelines_triggers,
             self.validate_database_copy_section,
+            self.validate_database_migration_input_sources,
         ]
+        self.io = io
 
     def run_validations(self, config: dict):
         for validation in self.validations:
@@ -48,9 +52,8 @@ class ConfigValidator:
             environments = extension.get("environments", {})
 
             if not isinstance(environments, dict):
-                click.secho(
-                    f"Error: {extension_type} extension definition is invalid type, expected dictionary",
-                    fg="red",
+                self.io.error(
+                    f"{extension_type} extension definition is invalid type, expected dictionary",
                 )
                 continue
             for environment, env_config in environments.items():
@@ -64,9 +67,8 @@ class ConfigValidator:
                     )
 
         for version_failure in extensions_with_invalid_version:
-            click.secho(
+            self.io.error(
                 f"{extension_type} version for environment {version_failure['environment']} is not in the list of supported {extension_type} versions: {supported_extension_versions}. Provided Version: {version_failure['version']}",
-                fg="red",
             )
 
     def validate_supported_redis_versions(self, config):
@@ -240,3 +242,34 @@ class ConfigValidator:
 
         if errors:
             abort_with_error("\n".join(errors))
+
+    def validate_database_migration_input_sources(self, config):
+        extensions = config.get("extensions", {})
+        if not extensions:
+            return
+
+        s3_extensions = {
+            key: ext for key, ext in extensions.items() if ext.get("type", None) == "s3"
+        }
+
+        if not s3_extensions:
+            return
+
+        errors = []
+
+        for extension_name, extension in s3_extensions.items():
+            for env, env_config in extension.get("environments", {}).items():
+                if "data_migration" not in env_config:
+                    continue
+                data_migration = env_config.get("data_migration", {})
+                if "import" in data_migration and "import_sources" in data_migration:
+                    errors.append(
+                        f"Error in '{extension_name}.environments.{env}.data_migration': only the 'import_sources' property is required - 'import' is deprecated."
+                    )
+                if "import" not in data_migration and "import_sources" not in data_migration:
+                    errors.append(
+                        f"Error in '{extension_name}.environments.{env}.data_migration': 'import_sources' property is missing."
+                    )
+
+        if errors:
+            abort_with_error("\n".join(errors))

dbt_platform_helper/domain/copilot_environment.py

@@ -1,162 +1,168 @@
 from collections import defaultdict
 from pathlib import Path
+from typing import Callable
 
-import boto3
 import click
-
-from dbt_platform_helper.platform_exception import PlatformException
-from dbt_platform_helper.providers.load_balancers import find_https_listener
-from dbt_platform_helper.utils.aws import get_aws_session_or_abort
-from dbt_platform_helper.utils.files import mkfile
+from boto3 import Session
+
+from dbt_platform_helper.domain.terraform_environment import (
+    EnvironmentNotFoundException,
+)
+from dbt_platform_helper.providers.cloudformation import CloudFormation
+from dbt_platform_helper.providers.config import ConfigProvider
+from dbt_platform_helper.providers.files import FileProvider
+from dbt_platform_helper.providers.load_balancers import (
+    get_https_certificate_for_application,
+)
+from dbt_platform_helper.providers.vpc import Vpc
+from dbt_platform_helper.providers.vpc import VpcNotFoundForNameException
+from dbt_platform_helper.providers.vpc import VpcProvider
 from dbt_platform_helper.utils.template import S3_CROSS_ACCOUNT_POLICY
 from dbt_platform_helper.utils.template import camel_case
 from dbt_platform_helper.utils.template import setup_templates
 
 
-# TODO - move helper functions into suitable provider classes
-def get_subnet_ids(session, vpc_id, environment_name):
-    subnets = session.client("ec2").describe_subnets(
-        Filters=[{"Name": "vpc-id", "Values": [vpc_id]}]
-    )["Subnets"]
-
-    if not subnets:
-        click.secho(f"No subnets found for VPC with id: {vpc_id}.", fg="red")
-        raise click.Abort
-
-    public_tag = {"Key": "subnet_type", "Value": "public"}
-    public_subnets = [subnet["SubnetId"] for subnet in subnets if public_tag in subnet["Tags"]]
-    private_tag = {"Key": "subnet_type", "Value": "private"}
-    private_subnets = [subnet["SubnetId"] for subnet in subnets if private_tag in subnet["Tags"]]
-
-    # This call and the method declaration can be removed when we stop using AWS Copilot to deploy the services
-    public_subnets, private_subnets = _match_subnet_id_order_to_cloudformation_exports(
-        session,
-        environment_name,
-        public_subnets,
-        private_subnets,
-    )
-
-    return public_subnets, private_subnets
-
-
-def _match_subnet_id_order_to_cloudformation_exports(
-    session, environment_name, public_subnets, private_subnets
-):
-    public_subnet_exports = []
-    private_subnet_exports = []
-    for page in session.client("cloudformation").get_paginator("list_exports").paginate():
-        for export in page["Exports"]:
-            if f"-{environment_name}-" in export["Name"]:
-                if export["Name"].endswith("-PublicSubnets"):
-                    public_subnet_exports = export["Value"].split(",")
-                if export["Name"].endswith("-PrivateSubnets"):
-                    private_subnet_exports = export["Value"].split(",")
-
-    # If the elements match, regardless of order, use the list from the CloudFormation exports
-    if set(public_subnets) == set(public_subnet_exports):
-        public_subnets = public_subnet_exports
-    if set(private_subnets) == set(private_subnet_exports):
-        private_subnets = private_subnet_exports
-
-    return public_subnets, private_subnets
-
-
-def get_cert_arn(session, application, env_name):
-    try:
-        arn = find_https_certificate(session, application, env_name)
-    except:
-        click.secho(
-            f"No certificate found with domain name matching environment {env_name}.", fg="red"
+class CopilotEnvironment:
+    def __init__(
+        self,
+        config_provider: ConfigProvider,
+        vpc_provider: VpcProvider = None,
+        cloudformation_provider: CloudFormation = None,
+        session: Session = None,  # TODO - this is a temporary fix, will fall away once the Loadbalancer provider is in place.
+        copilot_templating=None,
+        echo: Callable[[str], str] = click.secho,
+    ):
+        self.config_provider = config_provider
+        self.vpc_provider = vpc_provider
+        self.copilot_templating = copilot_templating or CopilotTemplating(
+            file_provider=FileProvider(),
         )
-        raise click.Abort
+        self.echo = echo
+        self.session = session
+        self.cloudformation_provider = cloudformation_provider
 
-    return arn
+    def generate(self, environment_name: str) -> None:
 
+        platform_config = self.config_provider.get_enriched_config()
 
-def get_vpc_id(session, env_name, vpc_name=None):
-    if not vpc_name:
-        vpc_name = f"{session.profile_name}-{env_name}"
+        if environment_name not in platform_config.get("environments").keys():
+            raise EnvironmentNotFoundException(
+                f"Error: cannot generate copilot manifests for environment {environment_name}.  It does not exist in your configuration"
+            )
 
-    filters = [{"Name": "tag:Name", "Values": [vpc_name]}]
-    vpcs = session.client("ec2").describe_vpcs(Filters=filters)["Vpcs"]
+        env_config = platform_config["environments"][environment_name]
+        profile_for_environment = env_config.get("accounts", {}).get("deploy", {}).get("name")
+
+        self.echo(f"Using {profile_for_environment} for this AWS session")
 
-    if not vpcs:
-        filters[0]["Values"] = [session.profile_name]
-        vpcs = session.client("ec2").describe_vpcs(Filters=filters)["Vpcs"]
+        app_name = platform_config["application"]
 
-    if not vpcs:
-        click.secho(
-            f"No VPC found with name {vpc_name} in AWS account {session.profile_name}.", fg="red"
+        certificate_arn = get_https_certificate_for_application(
+            self.session, app_name, environment_name
         )
-        raise click.Abort
-
-    return vpcs[0]["VpcId"]
-
-
-def _generate_copilot_environment_manifests(
-    environment_name, application_name, env_config, session
-):
-    env_template = setup_templates().get_template("env/manifest.yml")
-    vpc_name = env_config.get("vpc", None)
-    vpc_id = get_vpc_id(session, environment_name, vpc_name)
-    pub_subnet_ids, priv_subnet_ids = get_subnet_ids(session, vpc_id, environment_name)
-    cert_arn = get_cert_arn(session, application_name, environment_name)
-    contents = env_template.render(
-        {
-            "name": environment_name,
-            "vpc_id": vpc_id,
-            "pub_subnet_ids": pub_subnet_ids,
-            "priv_subnet_ids": priv_subnet_ids,
-            "certificate_arn": cert_arn,
-        }
-    )
-    click.echo(
-        mkfile(
-            ".", f"copilot/environments/{environment_name}/manifest.yml", contents, overwrite=True
+
+        vpc = self._get_environment_vpc(
+            self.session, app_name, environment_name, env_config.get("vpc", None)
         )
-    )
 
+        copilot_environment_manifest = self.copilot_templating.generate_copilot_environment_manifest(
+            environment_name=environment_name,
+            # We need to correct the subnet id order before adding it to the template. See pydoc on below method for details.
+            vpc=self._match_subnet_id_order_to_cloudformation_exports(environment_name, vpc),
+            cert_arn=certificate_arn,
+        )
 
-def find_https_certificate(session: boto3.Session, app: str, env: str) -> str:
-    listener_arn = find_https_listener(session, app, env)
-    cert_client = session.client("elbv2")
-    certificates = cert_client.describe_listener_certificates(ListenerArn=listener_arn)[
-        "Certificates"
-    ]
+        self.echo(
+            self.copilot_templating.write_environment_manifest(
+                environment_name, copilot_environment_manifest
+            )
+        )
 
-    try:
-        certificate_arn = next(c["CertificateArn"] for c in certificates if c["IsDefault"])
-    except StopIteration:
-        raise CertificateNotFoundException()
+    # TODO: There should always be a vpc_name as defaults have been applied to the config.  This function can
+    # probably fall away. We shouldn't need to check 3 different names (vpc_name, session.profile_name, {session.profile_name}-{env_name})
+    # To be checked.
+    def _get_environment_vpc(self, session: Session, app_name, env_name: str, vpc_name: str) -> Vpc:
 
-    return certificate_arn
+        if not vpc_name:
+            vpc_name = f"{session.profile_name}-{env_name}"
 
+        try:
+            vpc = self.vpc_provider.get_vpc(app_name, env_name, vpc_name)
+        except VpcNotFoundForNameException:
+            vpc = self.vpc_provider.get_vpc(app_name, env_name, session.profile_name)
 
-class CertificateNotFoundException(PlatformException):
-    pass
+        if not vpc:
+            raise VpcNotFoundForNameException
 
+        return vpc
 
-class CopilotEnvironment:
-    def __init__(self, config_provider):
-        self.config_provider = config_provider
+    def _match_subnet_id_order_to_cloudformation_exports(
+        self, environment_name: str, vpc: Vpc
+    ) -> Vpc:
+        """
+        Addresses an issue identified in DBTP-1524 'If the order of the subnets
+        in the environment manifest has changed, copilot env deploy tries to do
+        destructive changes.'.
 
-    def generate(self, environment_name):
-        config = self.config_provider.load_and_validate_platform_config()
-        enriched_config = self.config_provider.apply_environment_defaults(config)
+        Takes a Vpc object which has a private and public subnets attribute and
+        sorts them to match the order within cfn exports.
+        """
 
-        env_config = enriched_config["environments"][environment_name]
-        profile_for_environment = env_config.get("accounts", {}).get("deploy", {}).get("name")
-        click.secho(f"Using {profile_for_environment} for this AWS session")
-        session = get_aws_session_or_abort(profile_for_environment)
-
-        _generate_copilot_environment_manifests(
-            environment_name, enriched_config["application"], env_config, session
+        exports = self.cloudformation_provider.get_cloudformation_exports_for_environment(
+            environment_name
         )
 
+        public_subnet_exports = []
+        private_subnet_exports = []
+
+        for export in exports:
+            if export["Name"].endswith("-PublicSubnets"):
+                public_subnet_exports = export["Value"].split(",")
+            elif export["Name"].endswith("-PrivateSubnets"):
+                private_subnet_exports = export["Value"].split(",")
+
+        # If the elements match, regardless of order, use the list from the CloudFormation exports
+        if set(vpc.public_subnets) == set(public_subnet_exports):
+            vpc.public_subnets = public_subnet_exports
+        if set(vpc.private_subnets) == set(private_subnet_exports):
+            vpc.private_subnets = private_subnet_exports
+
+        return vpc
+
 
 class CopilotTemplating:
-    def __init__(self, mkfile_fn=mkfile):
-        self.mkfile_fn = mkfile_fn
+    def __init__(
+        self,
+        file_provider: FileProvider = None,
+        # TODO file_provider can be moved up a layer.  File writing can be the responsibility of CopilotEnvironment generate
+        # Or we align with PlatformTerraformManifestGenerator and rename from Templating to reflect the file writing responsibility
+    ):
+        self.file_provider = file_provider
+        self.templates = setup_templates()
+
+    def generate_copilot_environment_manifest(
+        self, environment_name: str, vpc: Vpc, cert_arn: str
+    ) -> str:
+        env_template = self.templates.get_template("env/manifest.yml")
+
+        return env_template.render(
+            {
+                "name": environment_name,
+                "vpc_id": vpc.id,
+                "pub_subnet_ids": vpc.public_subnets,
+                "priv_subnet_ids": vpc.private_subnets,
+                "certificate_arn": cert_arn,
+            }
+        )
+
+    def write_environment_manifest(self, environment_name: str, manifest_contents: str) -> str:
+
+        return self.file_provider.mkfile(
+            ".",
+            f"copilot/environments/{environment_name}/manifest.yml",
+            manifest_contents,
+            overwrite=True,
+        )
 
     def generate_cross_account_s3_policies(self, environments: dict, extensions):
         resource_blocks = defaultdict(list)
@@ -190,15 +196,13 @@ class CopilotTemplating:
             click.echo("\n>>> No cross-environment S3 policies to create.\n")
             return
 
-        templates = setup_templates()
-
         for service in sorted(resource_blocks.keys()):
             resources = resource_blocks[service]
             click.echo(f"\n>>> Creating S3 cross account policies for {service}.\n")
-            template = templates.get_template(S3_CROSS_ACCOUNT_POLICY)
+            template = self.templates.get_template(S3_CROSS_ACCOUNT_POLICY)
             file_content = template.render({"resources": resources})
             output_dir = Path(".").absolute()
             file_path = f"copilot/{service}/addons/s3-cross-account-policy.yml"
 
-            self.mkfile_fn(output_dir, file_path, file_content, True)
+            self.file_provider.mkfile(output_dir, file_path, file_content, True)
             click.echo(f"File {file_path} created")