dbt-platform-helper 12.3.0__py3-none-any.whl → 12.4.0__py3-none-any.whl

dbt_platform_helper/COMMANDS.md

@@ -765,6 +765,7 @@ platform-helper database (dump|load|copy)
 ```
 platform-helper database dump --from <from_env> --database <database> 
                               [--app <application>] [--from-vpc <from_vpc>] 
+                              [--filename <filename>] 
 ```
 
 ## Options
@@ -777,6 +778,8 @@ platform-helper database dump --from <from_env> --database <database>
   - The name of the database you are dumping data from
 - `--from-vpc <text>`
   - The vpc the specified environment is running in. Required unless you are running the command from your deploy repo
+- `--filename <text>`
+  - Specify a name for the database dump file. Recommended if the same dump database is being used for multiple load environments
 - `--help <boolean>` _Defaults to False._
   - Show this message and exit.
 
@@ -791,7 +794,7 @@ platform-helper database dump --from <from_env> --database <database>
 ```
 platform-helper database load --to <to_env> --database <database> 
                               [--app <application>] [--to-vpc <to_vpc>] 
-                              [--auto-approve] 
+                              [--filename <filename>] [--auto-approve] 
 ```
 
 ## Options
@@ -806,6 +809,8 @@ platform-helper database load --to <to_env> --database <database>
   - The vpc the specified environment is running in. Required unless you are running the command from your deploy repo
 - `--auto-approve <boolean>` _Defaults to False._
 
+- `--filename <text>`
+  - Specify a name for the database dump file. Recommended if the same dump database is being used for multiple load environments
 - `--help <boolean>` _Defaults to False._
   - Show this message and exit.
 

dbt_platform_helper/commands/codebase.py

@@ -1,7 +1,7 @@
 import click
 
 from dbt_platform_helper.domain.codebase import Codebase
-from dbt_platform_helper.exceptions import PlatformException
+from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.utils.click import ClickDocOptGroup
 from dbt_platform_helper.utils.versioning import (
     check_platform_helper_version_needs_update,

dbt_platform_helper/commands/conduit.py

@@ -1,7 +1,7 @@
 import click
 
 from dbt_platform_helper.domain.conduit import Conduit
-from dbt_platform_helper.exceptions import AWSException
+from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.providers.cloudformation import CloudFormation
 from dbt_platform_helper.providers.ecs import ECS
 from dbt_platform_helper.providers.secrets import Secrets
@@ -53,6 +53,6 @@ def conduit(addon_name: str, app: str, env: str, access: str):
         Conduit(application, secrets_provider, cloudformation_provider, ecs_provider).start(
             env, addon_name, access
         )
-    except AWSException as err:
+    except PlatformException as err:
         click.secho(str(err), fg="red")
         raise click.Abort

dbt_platform_helper/commands/config.py

@@ -8,8 +8,8 @@ import botocore
 import click
 from prettytable import PrettyTable
 
-from dbt_platform_helper.exceptions import IncompatibleMajorVersion
-from dbt_platform_helper.exceptions import ValidationException
+from dbt_platform_helper.providers.validation import IncompatibleMajorVersionException
+from dbt_platform_helper.providers.validation import ValidationException
 from dbt_platform_helper.utils import versioning
 from dbt_platform_helper.utils.click import ClickDocOptGroup
 from dbt_platform_helper.utils.validation import config_file_check
@@ -110,7 +110,7 @@ def deployment():
                 str(template_file.resolve())
             )
             versioning.validate_template_version(local_version, str(template_file.resolve()))
-        except IncompatibleMajorVersion:
+        except IncompatibleMajorVersionException:
             local_compatible_symbol = no
             compatible = False
             recommendations["dbt-platform-helper-upgrade"] = RECOMMENDATIONS[
@@ -134,7 +134,7 @@ def deployment():
                 str(template_file.resolve())
             )
             versioning.validate_template_version(latest_release, str(template_file.resolve()))
-        except IncompatibleMajorVersion:
+        except IncompatibleMajorVersionException:
             latest_compatible_symbol = no
             compatible = False
         except ValidationException:

dbt_platform_helper/commands/copilot.py

@@ -35,6 +35,14 @@ SERVICE_TYPES = [
     "Worker Service",
 ]
 
+ADDON_TEMPLATE_MAP = {
+    "s3": ["addons/svc/s3-policy.yml"],
+    "s3-policy": ["addons/svc/s3-policy.yml"],
+    "appconfig-ipfilter": ["addons/svc/appconfig-ipfilter.yml"],
+    "subscription-filter": ["addons/svc/subscription-filter.yml"],
+    "prometheus-policy": ["addons/svc/prometheus-policy.yml"],
+}
+
 
 def list_copilot_local_environments():
     return [
@@ -248,9 +256,6 @@ def make_addons():
 
     application_name = get_application_name()
 
-    with open(PACKAGE_DIR / "addons-template-map.yml") as fd:
-        addon_template_map = yaml.safe_load(fd)
-
     click.echo("\n>>> Generating Terraform compatible addons CloudFormation\n")
 
     env_path = Path(f"copilot/environments/")
@@ -270,11 +275,6 @@ def make_addons():
         print(f">>>>>>>>> {addon_name}")
         addon_type = addon_config.pop("type")
         environments = addon_config.pop("environments")
-        if addon_template_map[addon_type].get("requires_addons_parameters", False):
-            pass
-        if addon_type in ["postgres"]:
-            pass
-
         environment_addon_config = {
             "addon_type": addon_type,
             "environments": environments,
@@ -309,7 +309,6 @@ def make_addons():
         _generate_service_addons(
             addon_config,
             addon_name,
-            addon_template_map,
             addon_type,
             output_dir,
             service_addon_config,
@@ -339,7 +338,6 @@ def _generate_env_overrides(output_dir):
 def _generate_service_addons(
     addon_config,
     addon_name,
-    addon_template_map,
     addon_type,
     output_dir,
     service_addon_config,
@@ -347,8 +345,8 @@ def _generate_service_addons(
     log_destination_arns,
 ):
     # generate svc addons
-    for addon in addon_template_map[addon_type].get("svc", []):
-        template = templates.get_template(addon["template"])
+    for addon_template in ADDON_TEMPLATE_MAP.get(addon_type, []):
+        template = templates.get_template(addon_template)
 
         for svc in addon_config.get("services", []):
             service_path = Path(f"copilot/{svc}/addons/")
@@ -360,10 +358,10 @@ def _generate_service_addons(
                 }
             )
 
-            filename = addon.get("filename", f"{addon_name}.yml")
-
             (output_dir / service_path).mkdir(parents=True, exist_ok=True)
-            click.echo(mkfile(output_dir, service_path / filename, contents, overwrite=True))
+            click.echo(
+                mkfile(output_dir, service_path / f"{addon_name}.yml", contents, overwrite=True)
+            )
 
 
 def _cleanup_old_files(config, output_dir, env_addons_path, env_overrides_path):

dbt_platform_helper/commands/database.py

@@ -31,10 +31,16 @@ def database():
     type=str,
     help="The vpc the specified environment is running in. Required unless you are running the command from your deploy repo",
 )
-def dump(app, from_env, database, from_vpc):
+@click.option(
+    "--filename",
+    type=str,
+    help="Specify a name for the database dump file. Recommended if the same dump database is being used for multiple load environments",
+)
+def dump(app, from_env, database, from_vpc, filename):
     """Dump a database into an S3 bucket."""
     data_copy = DatabaseCopy(app, database)
-    data_copy.dump(from_env, from_vpc)
+    data_copy.dump(from_env, from_vpc, filename)
+    # Todo: Catch expected errors and output message
 
 
 @database.command(name="load")
@@ -55,10 +61,16 @@ def dump(app, from_env, database, from_vpc):
     help="The vpc the specified environment is running in. Required unless you are running the command from your deploy repo",
 )
 @click.option("--auto-approve/--no-auto-approve", default=False)
-def load(app, to_env, database, to_vpc, auto_approve):
+@click.option(
+    "--filename",
+    type=str,
+    help="Specify a name for the database dump file. Recommended if the same dump database is being used for multiple load environments",
+)
+def load(app, to_env, database, to_vpc, auto_approve, filename):
     """Load a database from an S3 bucket."""
     data_copy = DatabaseCopy(app, database, auto_approve)
-    data_copy.load(to_env, to_vpc)
+    data_copy.load(to_env, to_vpc, filename)
+    # Todo: Catch expected errors and output message
 
 
 @database.command(name="copy")
@@ -110,3 +122,4 @@ def copy(
     """Copy a database between environments."""
     data_copy = DatabaseCopy(app, database, auto_approve)
     data_copy.copy(from_env, to_env, from_vpc, to_vpc, svc, template, no_maintenance_page)
+    # Todo: Catch expected errors and output message

dbt_platform_helper/commands/environment.py

@@ -5,6 +5,7 @@ from schema import SchemaError
 from dbt_platform_helper.constants import DEFAULT_TERRAFORM_PLATFORM_MODULES_VERSION
 from dbt_platform_helper.constants import PLATFORM_CONFIG_FILE
 from dbt_platform_helper.domain.maintenance_page import MaintenancePageProvider
+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.click import ClickDocOptGroup
@@ -238,10 +239,10 @@ def find_https_certificate(session: boto3.Session, app: str, env: str) -> str:
     try:
         certificate_arn = next(c["CertificateArn"] for c in certificates if c["IsDefault"])
     except StopIteration:
-        raise CertificateNotFoundError()
+        raise CertificateNotFoundException()
 
     return certificate_arn
 
 
-class CertificateNotFoundError(Exception):
+class CertificateNotFoundException(PlatformException):
     pass

dbt_platform_helper/domain/codebase.py

@@ -9,10 +9,9 @@ import requests
 import yaml
 from boto3 import Session
 
-from dbt_platform_helper.exceptions import ApplicationDeploymentNotTriggered
-from dbt_platform_helper.exceptions import ApplicationEnvironmentNotFoundError
-from dbt_platform_helper.exceptions import NotInCodeBaseRepositoryError
+from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.utils.application import Application
+from dbt_platform_helper.utils.application import ApplicationException
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.aws import check_codebase_exists
 from dbt_platform_helper.utils.aws import check_image_exists
@@ -68,7 +67,7 @@ class Codebase:
             .removesuffix(".git")
         )
         if repository.endswith("-deploy") or Path("./copilot").exists():
-            raise NotInCodeBaseRepositoryError()
+            raise NotInCodeBaseRepositoryException()
 
         builder_configuration_url = "https://raw.githubusercontent.com/uktrade/ci-image-builder/main/image_builder/configuration/builder_configuration.yml"
         builder_configuration_response = requests.get(builder_configuration_url)
@@ -143,7 +142,7 @@ class Codebase:
 
         application = self.load_application(app, default_session=session)
         if not application.environments.get(env):
-            raise ApplicationEnvironmentNotFoundError(env)
+            raise ApplicationEnvironmentNotFoundException(env)
 
         self.check_codebase_exists(session, application, codebase)
 
@@ -220,3 +219,22 @@ class Codebase:
             build_arn = self.start_build_extraction(codebuild_client, build_options)
             return get_build_url_from_arn(build_arn)
         return None
+
+
+class ApplicationDeploymentNotTriggered(PlatformException):
+    def __init__(self, codebase: str):
+        super().__init__(f"""Your deployment for {codebase} was not triggered.""")
+
+
+class ApplicationEnvironmentNotFoundException(ApplicationException):
+    def __init__(self, environment: str):
+        super().__init__(
+            f"""The environment "{environment}" either does not exist or has not been deployed."""
+        )
+
+
+class NotInCodeBaseRepositoryException(PlatformException):
+    def __init__(self):
+        super().__init__(
+            "You are in the deploy repository; make sure you are in the application codebase repository.",
+        )

dbt_platform_helper/domain/conduit.py

@@ -6,7 +6,6 @@ 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.copilot import create_postgres_admin_task
 from dbt_platform_helper.providers.ecs import ECS
 from dbt_platform_helper.providers.secrets import Secrets
 from dbt_platform_helper.utils.application import Application
@@ -23,7 +22,6 @@ class Conduit:
         subprocess: subprocess = subprocess,
         connect_to_addon_client_task=connect_to_addon_client_task,
         create_addon_client_task=create_addon_client_task,
-        create_postgres_admin_task=create_postgres_admin_task,
     ):
 
         self.application = application
@@ -34,7 +32,6 @@ class Conduit:
         self.echo = echo
         self.connect_to_addon_client_task = connect_to_addon_client_task
         self.create_addon_client_task = create_addon_client_task
-        self.create_postgres_admin_task = create_postgres_admin_task
 
     def start(self, env: str, addon_name: str, access: str = "read"):
         clients = self._initialise_clients(env)
@@ -49,7 +46,6 @@ class Conduit:
             self.create_addon_client_task(
                 clients["iam"],
                 clients["ssm"],
-                clients["secrets_manager"],
                 self.subprocess,
                 self.application,
                 env,
@@ -89,8 +85,6 @@ class Conduit:
             "ecs": self.application.environments[env].session.client("ecs"),
             "iam": self.application.environments[env].session.client("iam"),
             "ssm": self.application.environments[env].session.client("ssm"),
-            "cloudformation": self.application.environments[env].session.client("cloudformation"),
-            "secrets_manager": self.application.environments[env].session.client("secretsmanager"),
         }
 
     def _get_addon_details(self, addon_name, access):

dbt_platform_helper/domain/database_copy.py

@@ -8,9 +8,9 @@ from boto3 import Session
 
 from dbt_platform_helper.constants import PLATFORM_CONFIG_FILE
 from dbt_platform_helper.domain.maintenance_page import MaintenancePageProvider
-from dbt_platform_helper.exceptions import ApplicationNotFoundError
-from dbt_platform_helper.exceptions import AWSException
+from dbt_platform_helper.providers.aws import AWSException
 from dbt_platform_helper.utils.application import Application
+from dbt_platform_helper.utils.application import ApplicationNotFoundException
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.aws import Vpc
 from dbt_platform_helper.utils.aws import get_connection_string
@@ -58,10 +58,10 @@ class DatabaseCopy:
 
         try:
             self.application = load_application(self.app)
-        except ApplicationNotFoundError:
+        except ApplicationNotFoundException:
             abort(f"No such application '{app}'.")
 
-    def _execute_operation(self, is_dump: bool, env: str, vpc_name: str, to_env: str):
+    def _execute_operation(self, is_dump: bool, env: str, vpc_name: str, filename: str):
         vpc_name = self.enrich_vpc_name(env, vpc_name)
 
         environments = self.application.environments
@@ -89,7 +89,7 @@ class DatabaseCopy:
 
         try:
             task_arn = self.run_database_copy_task(
-                env_session, env, vpc_config, is_dump, db_connection_string, to_env
+                env_session, env, vpc_config, is_dump, db_connection_string, filename
             )
         except Exception as exc:
             self.abort(f"{exc} (Account id: {self.account_id(env)})")
@@ -122,14 +122,15 @@ class DatabaseCopy:
         vpc_config: Vpc,
         is_dump: bool,
         db_connection_string: str,
-        to_env: str,
+        filename: str,
     ) -> str:
         client = session.client("ecs")
         action = "dump" if is_dump else "load"
+        dump_file_name = filename if filename else "data_dump"
         env_vars = [
             {"name": "DATA_COPY_OPERATION", "value": action.upper()},
             {"name": "DB_CONNECTION_STRING", "value": db_connection_string},
-            {"name": "TO_ENVIRONMENT", "value": to_env},
+            {"name": "DUMP_FILE_NAME", "value": dump_file_name},
         ]
         if not is_dump:
             env_vars.append({"name": "ECS_CLUSTER", "value": f"{self.app}-{env}"})
@@ -159,12 +160,12 @@ class DatabaseCopy:
 
         return response.get("tasks", [{}])[0].get("taskArn")
 
-    def dump(self, env: str, vpc_name: str, to_env: str):
-        self._execute_operation(True, env, vpc_name, to_env)
+    def dump(self, env: str, vpc_name: str, filename: str = None):
+        self._execute_operation(True, env, vpc_name, filename)
 
-    def load(self, env: str, vpc_name: str):
+    def load(self, env: str, vpc_name: str, filename: str = None):
         if self.is_confirmed_ready_to_load(env):
-            self._execute_operation(False, env, vpc_name, to_env=env)
+            self._execute_operation(False, env, vpc_name, filename)
 
     def copy(
         self,
@@ -179,8 +180,8 @@ class DatabaseCopy:
         to_vpc = self.enrich_vpc_name(to_env, to_vpc)
         if not no_maintenance_page:
             self.maintenance_page_provider.activate(self.app, to_env, services, template, to_vpc)
-        self.dump(from_env, from_vpc, to_env)
-        self.load(to_env, to_vpc)
+        self.dump(from_env, from_vpc, f"data_dump_{to_env}")
+        self.load(to_env, to_vpc, f"data_dump_{to_env}")
         if not no_maintenance_page:
             self.maintenance_page_provider.deactivate(self.app, to_env)
 

dbt_platform_helper/domain/maintenance_page.py

@@ -9,9 +9,9 @@ from typing import Union
 import boto3
 import click
 
-from dbt_platform_helper.providers.load_balancers import ListenerNotFoundError
-from dbt_platform_helper.providers.load_balancers import ListenerRuleNotFoundError
-from dbt_platform_helper.providers.load_balancers import LoadBalancerNotFoundError
+from dbt_platform_helper.providers.load_balancers import ListenerNotFoundException
+from dbt_platform_helper.providers.load_balancers import ListenerRuleNotFoundException
+from dbt_platform_helper.providers.load_balancers import LoadBalancerNotFoundException
 from dbt_platform_helper.providers.load_balancers import find_https_listener
 from dbt_platform_helper.utils.application import Environment
 from dbt_platform_helper.utils.application import Service
@@ -75,13 +75,13 @@ class MaintenancePageProvider:
             else:
                 raise click.Abort
 
-        except LoadBalancerNotFoundError:
+        except LoadBalancerNotFoundException:
             click.secho(
                 f"No load balancer found for environment {env} in the application {app}.", fg="red"
             )
             raise click.Abort
 
-        except ListenerNotFoundError:
+        except ListenerNotFoundException:
             click.secho(
                 f"No HTTPS listener found for environment {env} in the application {app}.", fg="red"
             )
@@ -110,13 +110,13 @@ class MaintenancePageProvider:
                 f"Maintenance page removed from environment {env} in application {app}", fg="green"
             )
 
-        except LoadBalancerNotFoundError:
+        except LoadBalancerNotFoundException:
             click.secho(
                 f"No load balancer found for environment {env} in the application {app}.", fg="red"
             )
             raise click.Abort
 
-        except ListenerNotFoundError:
+        except ListenerNotFoundException:
             click.secho(
                 f"No HTTPS listener found for environment {env} in the application {app}.", fg="red"
             )
@@ -180,7 +180,7 @@ def remove_maintenance_page(session: boto3.Session, listener_arn: str):
         deleted = delete_listener_rule(tag_descriptions, name, lb_client)
 
         if name == "MaintenancePage" and not deleted:
-            raise ListenerRuleNotFoundError()
+            raise ListenerRuleNotFoundException()
 
 
 def get_rules_tag_descriptions(rules: list, lb_client):

dbt_platform_helper/platform_exception.py

@@ -0,0 +1,5 @@
+# This exception exists so that we can easily catch exceptions
+# at the command level where we know we can just output the
+# error and abort.
+class PlatformException(Exception):
+    pass

dbt_platform_helper/providers/aws.py

@@ -0,0 +1,32 @@
+from dbt_platform_helper.platform_exception import PlatformException
+
+
+class AWSException(PlatformException):
+    pass
+
+
+class CreateTaskTimeoutException(AWSException):
+    def __init__(self, addon_name: str, application_name: str, environment: str):
+        super().__init__(
+            f"""Client ({addon_name}) ECS task has failed to start for "{application_name}" in "{environment}" environment."""
+        )
+
+
+class ImageNotFoundException(AWSException):
+    def __init__(self, commit: str):
+        super().__init__(
+            f"""The commit hash "{commit}" has not been built into an image, try the `platform-helper codebase build` command first."""
+        )
+
+
+class LogGroupNotFoundException(AWSException):
+    def __init__(self, log_group_name: str):
+        super().__init__(f"""No log group called "{log_group_name}".""")
+
+
+# Todo: This should probably be in the AWS Copilot provider, but was causing circular import when we tried it pre refactoring the utils/aws.py
+class CopilotCodebaseNotFoundException(PlatformException):
+    def __init__(self, codebase: str):
+        super().__init__(
+            f"""The codebase "{codebase}" either does not exist or has not been deployed."""
+        )

dbt_platform_helper/providers/cloudformation.py

@@ -4,7 +4,7 @@ import botocore
 from cfn_tools import dump_yaml
 from cfn_tools import load_yaml
 
-from dbt_platform_helper.exceptions import CloudFormationException
+from dbt_platform_helper.platform_exception import PlatformException
 
 
 class CloudFormation:
@@ -125,3 +125,10 @@ class CloudFormation:
                 raise CloudFormationException(
                     stack_name, f"Error while waiting for stack status: {str(err)}"
                 )
+
+
+class CloudFormationException(PlatformException):
+    def __init__(self, stack_name: str, current_status: str):
+        super().__init__(
+            f"The CloudFormation stack '{stack_name}' is not in a good state: {current_status}"
+        )

dbt_platform_helper/providers/copilot.py

@@ -4,7 +4,7 @@ import time
 from botocore.exceptions import ClientError
 
 from dbt_platform_helper.constants import CONDUIT_DOCKER_IMAGE_LOCATION
-from dbt_platform_helper.exceptions import CreateTaskTimeoutError
+from dbt_platform_helper.providers.aws import CreateTaskTimeoutException
 from dbt_platform_helper.providers.secrets import Secrets
 from dbt_platform_helper.utils.application import Application
 from dbt_platform_helper.utils.messages import abort_with_error
@@ -13,7 +13,6 @@ from dbt_platform_helper.utils.messages import abort_with_error
 def create_addon_client_task(
     iam_client,
     ssm_client,
-    secrets_manager_client,
     subprocess,
     application: Application,
     env: str,
@@ -32,7 +31,6 @@ def create_addon_client_task(
         elif access == "admin":
             create_postgres_admin_task(
                 ssm_client,
-                secrets_manager_client,
                 subprocess,
                 application,
                 addon_name,
@@ -74,7 +72,6 @@ def create_addon_client_task(
 
 def create_postgres_admin_task(
     ssm_client,
-    secrets_manager_client,
     subprocess,
     app: Application,
     addon_name: str,
@@ -147,7 +144,7 @@ def connect_to_addon_client_task(
         time.sleep(1)
 
     if not running:
-        raise CreateTaskTimeoutError(task_name, application_name, env)
+        raise CreateTaskTimeoutException(task_name, application_name, env)
 
 
 def _normalise_secret_name(addon_name: str) -> str:

dbt_platform_helper/providers/ecs.py

@@ -3,8 +3,7 @@ import string
 import time
 from typing import List
 
-from dbt_platform_helper.exceptions import ECSAgentNotRunning
-from dbt_platform_helper.exceptions import NoClusterError
+from dbt_platform_helper.platform_exception import PlatformException
 
 
 class ECS:
@@ -36,7 +35,7 @@ class ECS:
             if app_key_found and env_key_found and cluster_key_found:
                 return cluster_arn
 
-        raise NoClusterError(self.application_name, self.env)
+        raise NoClusterException(self.application_name, self.env)
 
     def get_or_create_task_name(self, addon_name: str, parameter_name: str) -> str:
         """Fetches the task name from SSM or creates a new one if not found."""
@@ -84,4 +83,20 @@ class ECS:
                 time.sleep(1)
 
         if execute_command_agent_status != "RUNNING":
-            raise ECSAgentNotRunning
+            raise ECSAgentNotRunningException
+
+
+class ECSException(PlatformException):
+    pass
+
+
+class ECSAgentNotRunningException(ECSException):
+    def __init__(self):
+        super().__init__("""ECS exec agent never reached "RUNNING" status""")
+
+
+class NoClusterException(ECSException):
+    def __init__(self, application_name: str, environment: str):
+        super().__init__(
+            f"""No ECS cluster found for "{application_name}" in "{environment}" environment."""
+        )

dbt_platform_helper/providers/load_balancers.py

@@ -1,5 +1,7 @@
 import boto3
 
+from dbt_platform_helper.platform_exception import PlatformException
+
 
 def find_load_balancer(session: boto3.Session, app: str, env: str) -> str:
     lb_client = session.client("elbv2")
@@ -16,7 +18,7 @@ def find_load_balancer(session: boto3.Session, app: str, env: str) -> str:
             load_balancer_arn = lb["ResourceArn"]
 
     if not load_balancer_arn:
-        raise LoadBalancerNotFoundError()
+        raise LoadBalancerNotFoundException()
 
     return load_balancer_arn
 
@@ -34,18 +36,22 @@ def find_https_listener(session: boto3.Session, app: str, env: str) -> str:
         pass
 
     if not listener_arn:
-        raise ListenerNotFoundError()
+        raise ListenerNotFoundException()
 
     return listener_arn
 
 
-class LoadBalancerNotFoundError(Exception):
+class LoadBalancerException(PlatformException):
+    pass
+
+
+class LoadBalancerNotFoundException(LoadBalancerException):
     pass
 
 
-class ListenerNotFoundError(Exception):
+class ListenerNotFoundException(LoadBalancerException):
     pass
 
 
-class ListenerRuleNotFoundError(Exception):
+class ListenerRuleNotFoundException(LoadBalancerException):
     pass

dbt_platform_helper/providers/secrets.py

@@ -2,11 +2,7 @@ import json
 import urllib
 
 from dbt_platform_helper.constants import CONDUIT_ADDON_TYPES
-from dbt_platform_helper.exceptions import AddonNotFoundError
-from dbt_platform_helper.exceptions import AddonTypeMissingFromConfigError
-from dbt_platform_helper.exceptions import InvalidAddonTypeError
-from dbt_platform_helper.exceptions import ParameterNotFoundError
-from dbt_platform_helper.exceptions import SecretNotFoundError
+from dbt_platform_helper.platform_exception import PlatformException
 
 
 class Secrets:
@@ -43,8 +39,9 @@ class Secrets:
         except self.secrets_manager_client.exceptions.ResourceNotFoundException:
             pass
 
-        raise SecretNotFoundError(secret_name)
+        raise SecretNotFoundException(secret_name)
 
+    # Todo: This probably does not belong in the secrets provider. When it moves, take the Todoed exceptions from below
     def get_addon_type(self, addon_name: str) -> str:
         addon_type = None
         try:
@@ -54,19 +51,19 @@ class Secrets:
                 )["Parameter"]["Value"]
             )
         except self.ssm_client.exceptions.ParameterNotFound:
-            raise ParameterNotFoundError(self.application_name, self.env)
+            raise ParameterNotFoundException(self.application_name, self.env)
 
         if addon_name not in addon_config.keys():
-            raise AddonNotFoundError(addon_name)
+            raise AddonNotFoundException(addon_name)
 
         for name, config in addon_config.items():
             if name == addon_name:
                 if not config.get("type"):
-                    raise AddonTypeMissingFromConfigError(addon_name)
+                    raise AddonTypeMissingFromConfigException(addon_name)
                 addon_type = config["type"]
 
         if not addon_type or addon_type not in CONDUIT_ADDON_TYPES:
-            raise InvalidAddonTypeError(addon_type)
+            raise InvalidAddonTypeException(addon_type)
 
         if "postgres" in addon_type:
             addon_type = "postgres"
@@ -83,3 +80,47 @@ class Secrets:
 
     def _normalise_secret_name(self, addon_name: str) -> str:
         return addon_name.replace("-", "_").upper()
+
+
+# Todo: This probably does not belong in the secrets provider. Move it when we find a better home for get_addon_type()
+class AddonException(PlatformException):
+    pass
+
+
+# Todo: This probably does not belong in the secrets provider. Move it when we find a better home for get_addon_type()
+class AddonNotFoundException(AddonException):
+    def __init__(self, addon_name: str):
+        super().__init__(f"""Addon "{addon_name}" does not exist.""")
+
+
+# Todo: This probably does not belong in the secrets provider. Move it when we find a better home for get_addon_type()
+class AddonTypeMissingFromConfigException(AddonException):
+    def __init__(self, addon_name: str):
+        super().__init__(
+            f"""The configuration for the addon {addon_name}, is misconfigured and missing the addon type."""
+        )
+
+
+# Todo: This probably does not belong in the secrets provider. Move it when we find a better home for get_addon_type()
+class InvalidAddonTypeException(AddonException):
+    def __init__(self, addon_type):
+        self.addon_type = addon_type
+        super().__init__(
+            f"""Addon type "{self.addon_type}" is not supported, we support: {", ".join(CONDUIT_ADDON_TYPES)}."""
+        )
+
+
+class SecretException(PlatformException):
+    pass
+
+
+class ParameterNotFoundException(SecretException):
+    def __init__(self, application_name: str, environment: str):
+        super().__init__(
+            f"""No parameter called "/copilot/applications/{application_name}/environments/{environment}/addons". Try deploying the "{application_name}" "{environment}" environment."""
+        )
+
+
+class SecretNotFoundException(SecretException):
+    def __init__(self, secret_name: str):
+        super().__init__(f"""No secret called "{secret_name}".""")

dbt_platform_helper/providers/validation.py

@@ -0,0 +1,19 @@
+from dbt_platform_helper.platform_exception import PlatformException
+
+
+class ValidationException(PlatformException):
+    pass
+
+
+class IncompatibleMajorVersionException(ValidationException):
+    def __init__(self, app_version: str, check_version: str):
+        super().__init__()
+        self.app_version = app_version
+        self.check_version = check_version
+
+
+class IncompatibleMinorVersionException(ValidationException):
+    def __init__(self, app_version: str, check_version: str):
+        super().__init__()
+        self.app_version = app_version
+        self.check_version = check_version

dbt_platform_helper/utils/application.py

@@ -1,4 +1,5 @@
 import json
+import os
 import re
 from pathlib import Path
 from typing import Dict
@@ -8,7 +9,7 @@ import yaml
 from boto3 import Session
 from yaml.parser import ParserError
 
-from dbt_platform_helper.exceptions import ApplicationNotFoundError
+from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.utils.aws import get_aws_session_or_abort
 from dbt_platform_helper.utils.aws import get_profile_name_from_account_id
 from dbt_platform_helper.utils.aws import get_ssm_secrets
@@ -80,7 +81,7 @@ def load_application(app: str = None, default_session: Session = None) -> Applic
             WithDecryption=False,
         )
     except ssm_client.exceptions.ParameterNotFound:
-        raise ApplicationNotFoundError(app)
+        raise ApplicationNotFoundException(app)
 
     path = f"/copilot/applications/{application.name}/environments"
     secrets = get_ssm_secrets(app, None, current_session, path)
@@ -135,3 +136,14 @@ def get_application_name():
         abort_with_error("Cannot get application name. No copilot/.workspace file found")
 
     return app_name
+
+
+class ApplicationException(PlatformException):
+    pass
+
+
+class ApplicationNotFoundException(ApplicationException):
+    def __init__(self, application_name: str):
+        super().__init__(
+            f"""The account "{os.environ.get("AWS_PROFILE")}" does not contain the application "{application_name}"; ensure you have set the environment variable "AWS_PROFILE" correctly."""
+        )

dbt_platform_helper/utils/arn_parser.py

@@ -1,4 +1,4 @@
-from dbt_platform_helper.exceptions import ValidationException
+from dbt_platform_helper.providers.validation import ValidationException
 
 
 class ARN:

dbt_platform_helper/utils/aws.py

@@ -13,11 +13,12 @@ import click
 import yaml
 from boto3 import Session
 
-from dbt_platform_helper.exceptions import AWSException
-from dbt_platform_helper.exceptions import CopilotCodebaseNotFoundError
-from dbt_platform_helper.exceptions import ImageNotFoundError
-from dbt_platform_helper.exceptions import ResourceNotFoundException
-from dbt_platform_helper.exceptions import ValidationException
+from dbt_platform_helper.platform_exception import PlatformException
+from dbt_platform_helper.providers.aws import AWSException
+from dbt_platform_helper.providers.aws import CopilotCodebaseNotFoundException
+from dbt_platform_helper.providers.aws import ImageNotFoundException
+from dbt_platform_helper.providers.aws import LogGroupNotFoundException
+from dbt_platform_helper.providers.validation import ValidationException
 from dbt_platform_helper.utils.files import cache_refresh_required
 from dbt_platform_helper.utils.files import read_supported_versions_from_cache
 from dbt_platform_helper.utils.files import write_to_cache
@@ -95,7 +96,7 @@ def _log_account_info(account_name: list, account_id: str) -> None:
         )
 
 
-class NoProfileForAccountIdError(Exception):
+class NoProfileForAccountIdException(PlatformException):
     def __init__(self, account_id):
         super().__init__(f"No profile found for account {account_id}")
 
@@ -110,7 +111,7 @@ def get_profile_name_from_account_id(account_id: str):
         if account_id == found_account_id:
             return section.removeprefix("profile ")
 
-    raise NoProfileForAccountIdError(account_id)
+    raise NoProfileForAccountIdException(account_id)
 
 
 def get_ssm_secret_names(app, env):
@@ -488,8 +489,10 @@ def start_build_extraction(codebuild_client, build_options):
     return response["build"]["arn"]
 
 
+# Todo: This should probably be in the AWS Copilot provider
 def check_codebase_exists(session: Session, application, codebase: str):
     try:
+        # Todo: Can this leverage dbt_platform_helper.providers.secrets.Secrets.get_connection_secret_arn?
         ssm_client = session.client("ssm")
         json.loads(
             ssm_client.get_parameter(
@@ -502,7 +505,7 @@ def check_codebase_exists(session: Session, application, codebase: str):
         ssm_client.exceptions.ParameterNotFound,
         json.JSONDecodeError,
     ):
-        raise CopilotCodebaseNotFoundError(codebase)
+        raise CopilotCodebaseNotFoundException(codebase)
 
 
 def check_image_exists(session, application, codebase, commit):
@@ -516,7 +519,7 @@ def check_image_exists(session, application, codebase, commit):
         ecr_client.exceptions.RepositoryNotFoundException,
         ecr_client.exceptions.ImageNotFoundException,
     ):
-        raise ImageNotFoundError(commit)
+        raise ImageNotFoundException(commit)
 
 
 def get_build_url_from_arn(build_arn: str) -> str:
@@ -577,4 +580,4 @@ def wait_for_log_group_to_exist(log_client, log_group_name, attempts=30):
         time.sleep(1)
 
     if not log_group_exists:
-        raise ResourceNotFoundException
+        raise LogGroupNotFoundException(log_group_name)

dbt_platform_helper/utils/git.py

@@ -2,7 +2,7 @@ import re
 import subprocess
 
 
-class CommitNotFoundError(Exception):
+class CommitNotFoundException(Exception):
     pass
 
 
@@ -26,4 +26,4 @@ def check_if_commit_exists(commit):
     )
 
     if branches_containing_commit.stderr:
-        raise CommitNotFoundError()
+        raise CommitNotFoundException()

dbt_platform_helper/utils/validation.py

@@ -215,6 +215,7 @@ DATABASE_COPY = {
     "to": ENV_NAME,
     Optional("from_account"): str,
     Optional("to_account"): str,
+    Optional("pipeline"): {Optional("schedule"): str},
 }
 
 POSTGRES_DEFINITION = {
@@ -285,9 +286,19 @@ EXTERNAL_ROLE_ACCESS = {
     "cyber_sign_off_by": dbt_email_address_regex("cyber_sign_off_by"),
 }
 
-EXTERNAL_ROLE_ACCESS_NAME = Regex(
-    r"^([a-z][a-zA-Z0-9_-]*)$",
-    error="External role access block name {} is invalid: names must only contain lowercase alphanumeric characters separated by hypen or underscore",
+CROSS_ENVIRONMENT_SERVICE_ACCESS = {
+    "application": str,
+    "environment": ENV_NAME,
+    "account": str,
+    "service": str,
+    "read": bool,
+    "write": bool,
+    "cyber_sign_off_by": dbt_email_address_regex("cyber_sign_off_by"),
+}
+
+LOWER_ALPHANUMERIC = Regex(
+    r"^([a-z][a-zA-Z0-9_-]*|\*)$",
+    error="{} is invalid: must only contain lowercase alphanumeric characters separated by hyphen or underscore",
 )
 
 DATA_IMPORT = {
@@ -312,7 +323,10 @@ S3_BASE = {
             Optional("versioning"): bool,
             Optional("lifecycle_rules"): [LIFECYCLE_RULE],
             Optional("data_migration"): DATA_MIGRATION,
-            Optional("external_role_access"): {EXTERNAL_ROLE_ACCESS_NAME: EXTERNAL_ROLE_ACCESS},
+            Optional("external_role_access"): {LOWER_ALPHANUMERIC: EXTERNAL_ROLE_ACCESS},
+            Optional("cross_environment_service_access"): {
+                LOWER_ALPHANUMERIC: CROSS_ENVIRONMENT_SERVICE_ACCESS
+            },
         },
     },
 }

dbt_platform_helper/utils/versioning.py

@@ -13,9 +13,9 @@ import requests
 
 from dbt_platform_helper.constants import PLATFORM_CONFIG_FILE
 from dbt_platform_helper.constants import PLATFORM_HELPER_VERSION_FILE
-from dbt_platform_helper.exceptions import IncompatibleMajorVersion
-from dbt_platform_helper.exceptions import IncompatibleMinorVersion
-from dbt_platform_helper.exceptions import ValidationException
+from dbt_platform_helper.providers.validation import IncompatibleMajorVersionException
+from dbt_platform_helper.providers.validation import IncompatibleMinorVersionException
+from dbt_platform_helper.providers.validation import ValidationException
 from dbt_platform_helper.utils.platform_config import load_unvalidated_config_file
 
 VersionTuple = Optional[Tuple[int, int, int]]
@@ -198,13 +198,13 @@ def validate_version_compatibility(
     if (app_major == 0 and check_major == 0) and (
         app_minor != check_minor or app_patch != check_patch
     ):
-        raise IncompatibleMajorVersion(app_version_as_string, check_version_as_string)
+        raise IncompatibleMajorVersionException(app_version_as_string, check_version_as_string)
 
     if app_major != check_major:
-        raise IncompatibleMajorVersion(app_version_as_string, check_version_as_string)
+        raise IncompatibleMajorVersionException(app_version_as_string, check_version_as_string)
 
     if app_minor != check_minor:
-        raise IncompatibleMinorVersion(app_version_as_string, check_version_as_string)
+        raise IncompatibleMinorVersionException(app_version_as_string, check_version_as_string)
 
 
 def check_version_on_file_compatibility(
@@ -248,9 +248,9 @@ def check_platform_helper_version_needs_update():
     )
     try:
         validate_version_compatibility(local_version, latest_release)
-    except IncompatibleMajorVersion:
+    except IncompatibleMajorVersionException:
         click.secho(message, fg="red")
-    except IncompatibleMinorVersion:
+    except IncompatibleMinorVersionException:
         click.secho(message, fg="yellow")
 
 

{dbt_platform_helper-12.3.0.dist-info → dbt_platform_helper-12.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-platform-helper
-Version: 12.3.0
+Version: 12.4.0
 Summary: Set of tools to help transfer applications/services from GOV.UK PaaS to DBT PaaS augmenting AWS Copilot.
 License: MIT
 Author: Department for Business and Trade Platform Team

{dbt_platform_helper-12.3.0.dist-info → dbt_platform_helper-12.4.0.dist-info}/RECORD

@@ -1,16 +1,15 @@
-dbt_platform_helper/COMMANDS.md,sha256=V75r1y9dSDz6s9pshHh79SzEH9MeLMQF3N7KnOOe1YU,21824
+dbt_platform_helper/COMMANDS.md,sha256=6VGkyKa_AB1adSlyhWIKrfDckq2n-xxqnBbBpgO5bnc,22207
 dbt_platform_helper/README.md,sha256=B0qN2_u_ASqqgkGDWY2iwNGZt_9tUgMb9XqtaTuzYjw,1530
 dbt_platform_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt_platform_helper/addon-plans.yml,sha256=O46a_ODsGG9KXmQY_1XbSGqrpSaHSLDe-SdROzHx8Go,4545
-dbt_platform_helper/addons-template-map.yml,sha256=kYv_ZoZGWNeNBCnR_9wSeLhJuWOTHx-vn7ub74MgGb4,546
 dbt_platform_helper/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt_platform_helper/commands/application.py,sha256=eVwCaYuwBlk0zx0xfA6fW7b-S1pl8gkyT1lHKeeh2R0,10147
-dbt_platform_helper/commands/codebase.py,sha256=-R-DaT3TOCRc2f2-0Wy5wg2jBd2m-SLIKk2wMKD25eA,2262
-dbt_platform_helper/commands/conduit.py,sha256=gsiSzimX-pjBr6hegTxuVvwLqxlxGMV67lmnLbgmw4w,2254
-dbt_platform_helper/commands/config.py,sha256=NOHea7OAjrl6XHlW6HMLn0m0T5lFPyNH3HXoyCOWsJk,12070
-dbt_platform_helper/commands/copilot.py,sha256=i7FLSF-p9P5JQ36e_V8THXxdXG_g1hI7fHxemxQG82A,12927
-dbt_platform_helper/commands/database.py,sha256=_HnuOxlfVIFGkDotGv0SGb6oWrnm517FSvLv0aGcLJQ,3542
-dbt_platform_helper/commands/environment.py,sha256=-j-PYLHlrMH4F-DLhCCF3AYKP5z-Tzw7E8SbjMsMPnE,9209
+dbt_platform_helper/commands/codebase.py,sha256=KB8irKyFtb6pKn5cQ0MmTywGW7Vd8SSbWjT2mRnh3JA,2270
+dbt_platform_helper/commands/conduit.py,sha256=KqRWiirl5Xl7qcJXOAsirbTLlV1XquOjddsopuj0Kp4,2272
+dbt_platform_helper/commands/config.py,sha256=LKHPBR0xCPiX_oR2Gtl0_KO9WqABNDF5w_dI7WRxhWk,12117
+dbt_platform_helper/commands/copilot.py,sha256=XizScFxONNB3RLecRfEgCv--TwQ1j2rCUKGCx0nPq4I,12883
+dbt_platform_helper/commands/database.py,sha256=aG3zcMHL5PE96b7LSAu0FGCbgcycQej3AGRcd-bpXUo,4115
+dbt_platform_helper/commands/environment.py,sha256=VNIzuCM6RT-jVMk3Km0d88NEhrkTEWNqscEypVwLSWU,9294
 dbt_platform_helper/commands/generate.py,sha256=YLCPb-xcPapGcsLn-7d1Am7BpGp5l0iecIDTOdNGjHk,722
 dbt_platform_helper/commands/notify.py,sha256=kVJ0s78QMiaEWPVKu_bbMko4DW2uJy2fu8-HNJsglyk,3748
 dbt_platform_helper/commands/pipeline.py,sha256=_52bDSDa8DoyOA4VFxFJhwaiKCPHKqPtK2LWDLFaKlA,9452
@@ -19,18 +18,20 @@ dbt_platform_helper/commands/version.py,sha256=XVfSd53TDti4cceBqTmRfq_yZnvxs14Rb
 dbt_platform_helper/constants.py,sha256=HVaaO7hlQB41GrBBxcgk7hHie9tKbeYhJc-cRyYuIE0,453
 dbt_platform_helper/default-extensions.yml,sha256=SU1ZitskbuEBpvE7efc3s56eAUF11j70brhj_XrNMMo,493
 dbt_platform_helper/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt_platform_helper/domain/codebase.py,sha256=M-Eb7SU1CJpKZcPyu67xXi4Pt3U1WvKHxO6L9RpGnbM,9108
-dbt_platform_helper/domain/conduit.py,sha256=O1GZ_IVXgqefIHWZJ76jQ7HCFQ3fvytCOWkHAr_ThI4,4796
-dbt_platform_helper/domain/database_copy.py,sha256=RLQMAr0hinCFUV0Qa8JfWQSOoGRrMwViFIh_W1AaPsM,8824
-dbt_platform_helper/domain/maintenance_page.py,sha256=NFHN_J0NthhJ1YkcOTJ8c0R8y33TrDZq3ka2fmMRM1g,15708
-dbt_platform_helper/exceptions.py,sha256=LA0tMBncOw0YrmHFspf4C2LVqtRBwbSfaQl_yCB_MKg,4704
+dbt_platform_helper/domain/codebase.py,sha256=vs25ytD0iKwfuX-EoYHwG6qiZAmfvKyQiYT9BeWZ_s4,9688
+dbt_platform_helper/domain/conduit.py,sha256=mvjDzxh-SCUCY5qGL73kG8TT7YqeQR8XtNcHx26SW2w,4344
+dbt_platform_helper/domain/database_copy.py,sha256=m25FA6DkF_yG3lVcbxBEleYxwHA85hQrB5fFeIg6adM,8988
+dbt_platform_helper/domain/maintenance_page.py,sha256=JN1ksJ9viZ8SjPkO48y_GqrqTgR5B3T1aiye0XlUp4I,15740
 dbt_platform_helper/jinja2_tags.py,sha256=jFyN_Sxmko1GSfvrqRIGQ80CCW8EwlCV3su0ahJPfoE,541
+dbt_platform_helper/platform_exception.py,sha256=bheZV9lqGvrCVTNT92349dVntNDEDWTEwciZgC83WzE,187
 dbt_platform_helper/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt_platform_helper/providers/cloudformation.py,sha256=geraDvXZ1UZAYO_hGlNiHbEtcg9JbGdeW9BO5etlnco,4728
-dbt_platform_helper/providers/copilot.py,sha256=-LNOUeOg2lWQ8Ig2himFgYTXGQKP-tjZKMTdi0FzVAA,5330
-dbt_platform_helper/providers/ecs.py,sha256=tgc1HKy5jjt3WBui4HbBGSuoY4GKYO30TgvgPGg3dzQ,3437
-dbt_platform_helper/providers/load_balancers.py,sha256=e1SPrWbBWq95paSVd3Y5yORIrHAZxcVabBYDjPyUTsU,1430
-dbt_platform_helper/providers/secrets.py,sha256=OMRtPNFgBv_aSMDGq-l6TQtE06InOC4U6TNd64NJalg,3634
+dbt_platform_helper/providers/aws.py,sha256=KHgySe6cwEw1wePjw6DL7uSyZRk3DN_Aqqi8KnRoB3M,1208
+dbt_platform_helper/providers/cloudformation.py,sha256=YmeofMMxh9hzhU4Osa1vR41s18jNXzsZdEfpQUk1Lc4,4976
+dbt_platform_helper/providers/copilot.py,sha256=2BkQXn17GC1oGfCSCXXapTqT5OEhpEBeNkQ33g-U6wU,5245
+dbt_platform_helper/providers/ecs.py,sha256=XlQHYhZiLGrqR-1ZWMagGH2R2Hy7mCP6676eZL3YbNQ,3842
+dbt_platform_helper/providers/load_balancers.py,sha256=0tPkuQ_jWfan44HrBA5EMLqrZaYQl-Lw5PavZ1a1iag,1615
+dbt_platform_helper/providers/secrets.py,sha256=6cYIR15dLdHmqxtWQpM6R71e0_Xgsg9V291HBG-0LV0,5272
+dbt_platform_helper/providers/validation.py,sha256=d_YzJZVjGNO65pXcPIcFc9I-FRCESeEC7GvUzP8n-As,596
 dbt_platform_helper/templates/.copilot/config.yml,sha256=J_bA9sCtBdCPBRImpCBRnYvhQd4vpLYIXIU-lq9vbkA,158
 dbt_platform_helper/templates/.copilot/image_build_run.sh,sha256=adYucYXEB-kAgZNjTQo0T6EIAY8sh_xCEvVhWKKQ8mw,164
 dbt_platform_helper/templates/.copilot/phases/build.sh,sha256=umKXePcRvx4XyrRY0fAWIyYFtNjqBI2L8vIJk-V7C60,121
@@ -72,22 +73,22 @@ dbt_platform_helper/templates/svc/manifest-backend.yml,sha256=aAD9ndkbXnF7JBAKS2
 dbt_platform_helper/templates/svc/manifest-public.yml,sha256=6NHVR_onBu5hbwynLrB6roDRce7JcylSc0qeYvzlPdI,3664
 dbt_platform_helper/templates/svc/overrides/cfn.patches.yml,sha256=W7-d017akuUq9kda64DQxazavcRcCPDjaAik6t1EZqM,742
 dbt_platform_helper/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt_platform_helper/utils/application.py,sha256=brEREkgP2QVVS0Id5rApNfKm6UqveQ5LNbvXJNzzzHA,4132
-dbt_platform_helper/utils/arn_parser.py,sha256=1jY0elpAe4YL3ulrrCf1YiKmjI-7YXz4gJASqkIFHTc,1294
-dbt_platform_helper/utils/aws.py,sha256=zmUYOoSM0LphuXPN7Cnf-Lm1_DjFQ_nVn0m_OByHX8s,19465
+dbt_platform_helper/utils/application.py,sha256=ugY3nbUHRNFvJgaD4446EdSvIyILEN6ouuuk7eoyXe8,4538
+dbt_platform_helper/utils/arn_parser.py,sha256=BaXzIxSOLdFmP_IfAxRq-0j-0Re1iCN7L4j2Zi5-CRQ,1304
+dbt_platform_helper/utils/aws.py,sha256=sO5EHTbjzOYc0aPmpRupbcACwIBCHz8YUZfqz0vXydI,19771
 dbt_platform_helper/utils/click.py,sha256=Fx4y4bbve1zypvog_sgK7tJtCocmzheoEFLBRv1lfdM,2943
 dbt_platform_helper/utils/cloudfoundry.py,sha256=GnQ4fVLnDfOdNSrsJjI6ElZHqpgwINeoPn77cUH2UFY,484
 dbt_platform_helper/utils/files.py,sha256=pa5uwwrEFIAgXZUyH2KEr2Yiu6bKuV4EMlhn9BcUMsY,5296
-dbt_platform_helper/utils/git.py,sha256=aI7pCst5hm4XACiubsTpGJV1UEBLnxLpUGXu4h4hofM,696
+dbt_platform_helper/utils/git.py,sha256=7JGZMaI8-cU6-GjXIXjOlsYfKu_RppLOGyAicBd4n_8,704
 dbt_platform_helper/utils/manifests.py,sha256=ji3UYHCxq9tTpkm4MlRa2y0-JOYYqq1pWZ2h_zpj0UU,507
 dbt_platform_helper/utils/messages.py,sha256=aLx6s9utt__IqlDdeIYq4n82ERwludu2Zfqy0Q2t-x8,115
 dbt_platform_helper/utils/platform_config.py,sha256=2RfIxBAT5fv7WR4YuP3yomUK7sKZFL77xevuHnUALdg,676
 dbt_platform_helper/utils/template.py,sha256=raRx4QUCVJtKfvJK08Egg6gwWcs3r3V4nPWcJW4xNhA,574
-dbt_platform_helper/utils/validation.py,sha256=LspCvwuOM1xz9xTy1YEnYBN3gdmwt_Zo53rvKu35jYg,30309
-dbt_platform_helper/utils/versioning.py,sha256=IBxdocJ8ZyJib38d1ja87tTuFE0iJ4npaDcAHQAKQ58,10825
+dbt_platform_helper/utils/validation.py,sha256=ANGIA3k2_ATyZsPs7iqnXMNVjZC6o-rIbONxO9QZ8JU,30701
+dbt_platform_helper/utils/versioning.py,sha256=rLCofLHPXoyc3v9ArDKcjW902p-UX6GCn8n7cjg5I-U,10918
 platform_helper.py,sha256=bly3JkwbfwnWTZSZziu40dbgzQItsK-DIMMvL6ArFDY,1893
-dbt_platform_helper-12.3.0.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
-dbt_platform_helper-12.3.0.dist-info/METADATA,sha256=_Ey-bDTeSkkSz4ozaGGo-ni6dO6gzKSghyFGGediWVY,3212
-dbt_platform_helper-12.3.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-dbt_platform_helper-12.3.0.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
-dbt_platform_helper-12.3.0.dist-info/RECORD,,
+dbt_platform_helper-12.4.0.dist-info/LICENSE,sha256=dP79lN73--7LMApnankTGLqDbImXg8iYFqWgnExGkGk,1090
+dbt_platform_helper-12.4.0.dist-info/METADATA,sha256=UuLXRBbntAkchMbR3jEaD2FCze0dH-3i54tIcpG49mo,3212
+dbt_platform_helper-12.4.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+dbt_platform_helper-12.4.0.dist-info/entry_points.txt,sha256=QhbY8F434A-onsg0-FsdMd2U6HKh6Q7yCFFZrGUh5-M,67
+dbt_platform_helper-12.4.0.dist-info/RECORD,,

dbt_platform_helper/addons-template-map.yml

@@ -1,29 +0,0 @@
-# This file maps addon types to svc level templates
-
-# explanation:
-
-# {addons-type}:
-#   svc:
-#     - template: path/to/template.yml
-
-redis: {}
-postgres: {}
-opensearch: {}
-s3:
-  svc:
-    - template: addons/svc/s3-policy.yml
-s3-policy:
-  svc:
-    - template: addons/svc/s3-policy.yml
-appconfig-ipfilter:
-  svc:
-    - template: addons/svc/appconfig-ipfilter.yml
-subscription-filter:
-  svc:
-    - template: addons/svc/subscription-filter.yml
-monitoring: {}
-vpc: {}
-alb: {}
-prometheus-policy:
-  svc:
-    - template: addons/svc/prometheus-policy.yml

dbt_platform_helper/exceptions.py

@@ -1,147 +0,0 @@
-import os
-
-from dbt_platform_helper.constants import CONDUIT_ADDON_TYPES
-
-
-class ValidationException(Exception):
-    pass
-
-
-class PlatformException(Exception):
-    pass
-
-
-class AWSException(PlatformException):
-    pass
-
-
-class ApplicationException(PlatformException):
-    pass
-
-
-class CloudFormationException(AWSException):
-    def __init__(self, stack_name: str, current_status: str):
-        super().__init__(
-            f"The CloudFormation stack '{stack_name}' is not in a good state: {current_status}"
-        )
-
-
-class CommitNotFoundError:
-    def __init__(self, commit: str):
-        super().__init__(
-            f"""The commit hash "{commit}" either does not exist or you need to run `git fetch`."""
-        )
-
-
-class IncompatibleMajorVersion(ValidationException):
-    def __init__(self, app_version: str, check_version: str):
-        super().__init__()
-        self.app_version = app_version
-        self.check_version = check_version
-
-
-class IncompatibleMinorVersion(ValidationException):
-    def __init__(self, app_version: str, check_version: str):
-        super().__init__()
-        self.app_version = app_version
-        self.check_version = check_version
-
-
-class NoClusterError(AWSException):
-    def __init__(self, application_name: str, environment: str):
-        super().__init__(
-            f"""No ECS cluster found for "{application_name}" in "{environment}" environment."""
-        )
-
-
-class CreateTaskTimeoutError(AWSException):
-    def __init__(self, addon_name: str, application_name: str, environment: str):
-        super().__init__(
-            f"""Client ({addon_name}) ECS task has failed to start for "{application_name}" in "{environment}" environment."""
-        )
-
-
-class ParameterNotFoundError(AWSException):
-    def __init__(self, application_name: str, environment: str):
-        super().__init__(
-            f"""No parameter called "/copilot/applications/{application_name}/environments/{environment}/addons". Try deploying the "{application_name}" "{environment}" environment."""
-        )
-
-
-class AddonNotFoundError(AWSException):
-    def __init__(self, addon_name: str):
-        super().__init__(f"""Addon "{addon_name}" does not exist.""")
-
-
-class InvalidAddonTypeError(AWSException):
-    def __init__(self, addon_type):
-        self.addon_type = addon_type
-        super().__init__(
-            f"""Addon type "{self.addon_type}" is not supported, we support: {", ".join(CONDUIT_ADDON_TYPES)}."""
-        )
-
-
-class AddonTypeMissingFromConfigError(AWSException):
-    def __init__(self, addon_name: str):
-        super().__init__(
-            f"""The configuration for the addon {addon_name}, is misconfigured and missing the addon type."""
-        )
-
-
-class CopilotCodebaseNotFoundError(PlatformException):
-    def __init__(self, codebase: str):
-        super().__init__(
-            f"""The codebase "{codebase}" either does not exist or has not been deployed."""
-        )
-
-
-class NotInCodeBaseRepositoryError(PlatformException):
-    def __init__(self):
-        super().__init__(
-            "You are in the deploy repository; make sure you are in the application codebase repository.",
-        )
-
-
-class NoCopilotCodebasesFoundError(PlatformException):
-    def __init__(self, application_name: str):
-        super().__init__(f"""No codebases found for application "{application_name}".""")
-
-
-class ImageNotFoundError(PlatformException):
-    def __init__(self, commit: str):
-        super().__init__(
-            f"""The commit hash "{commit}" has not been built into an image, try the `platform-helper codebase build` command first."""
-        )
-
-
-class ApplicationDeploymentNotTriggered(PlatformException):
-    def __init__(self, codebase: str):
-        super().__init__(f"""Your deployment for {codebase} was not triggered.""")
-
-
-class ApplicationNotFoundError(ApplicationException):
-    def __init__(self, application_name: str):
-        super().__init__(
-            f"""The account "{os.environ.get("AWS_PROFILE")}" does not contain the application "{application_name}"; ensure you have set the environment variable "AWS_PROFILE" correctly."""
-        )
-
-
-class ApplicationEnvironmentNotFoundError(ApplicationException):
-    def __init__(self, environment: str):
-        super().__init__(
-            f"""The environment "{environment}" either does not exist or has not been deployed."""
-        )
-
-
-class SecretNotFoundError(AWSException):
-    def __init__(self, secret_name: str):
-        super().__init__(f"""No secret called "{secret_name}".""")
-
-
-class ECSAgentNotRunning(AWSException):
-    def __init__(self):
-        super().__init__("""ECS exec agent never reached "RUNNING" status""")
-
-
-class ResourceNotFoundException(AWSException):
-    pass