dbt-platform-helper 12.3.0__tar.gz → 12.4.0__tar.gz

{dbt_platform_helper-12.3.0 → dbt_platform_helper-12.4.0}/PKG-INFO

@@ -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 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.4.0/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-12.4.0/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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-12.3.0 → dbt_platform_helper-12.4.0}/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