dbt-platform-helper 13.1.2__py3-none-any.whl → 13.2.0__py3-none-any.whl

dbt_platform_helper/commands/application.py

@@ -10,9 +10,7 @@ from datetime import timedelta
 import click
 from prettytable import PrettyTable
 
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.click import ClickDocOptGroup
 
@@ -141,7 +139,7 @@ def container_stats(env, app, storage, network):
         storage_write = field[6]["value"]
         network_read = field[7]["value"]
         network_write = field[8]["value"]
-        cpu = "%.1f%%" % float(field[9]["value"])
+        cpu = f"{float(field[9]['value']):.1f}%"
         memory = f"{field[10]['value']}M"
 
         # Nothing to compare to at start.

dbt_platform_helper/commands/codebase.py

@@ -1,11 +1,9 @@
 import click
 
 from dbt_platform_helper.domain.codebase import Codebase
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.providers.io import ClickIOProvider
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
 from dbt_platform_helper.utils.click import ClickDocOptGroup
 
 

dbt_platform_helper/commands/conduit.py

@@ -1,13 +1,11 @@
 import click
 
 from dbt_platform_helper.domain.conduit import Conduit
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 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.io import ClickIOProvider
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
 from dbt_platform_helper.providers.secrets import Secrets
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.click import ClickDocOptCommand

dbt_platform_helper/commands/config.py

@@ -14,9 +14,9 @@ from dbt_platform_helper.providers.semantic_version import (
     IncompatibleMajorVersionException,
 )
 from dbt_platform_helper.providers.validation import ValidationException
-from dbt_platform_helper.utils import versioning
+from dbt_platform_helper.utils import tool_versioning
 from dbt_platform_helper.utils.click import ClickDocOptGroup
-from dbt_platform_helper.utils.versioning import get_platform_helper_version_status
+from dbt_platform_helper.utils.tool_versioning import get_platform_helper_version_status
 
 yes = "\033[92m✔\033[0m"
 no = "\033[91m✖\033[0m"
@@ -78,12 +78,12 @@ def deployment():
     compatible = True
     platform_helper_version_status = get_platform_helper_version_status()
     ClickIOProvider().process_messages(platform_helper_version_status.validate())
-    copilot_versions = versioning.get_copilot_versions()
-    aws_versions = versioning.get_aws_versions()
+    copilot_versions = tool_versioning.get_copilot_versions()
+    aws_versions = tool_versioning.get_aws_versions()
     _check_tool_versions(platform_helper_version_status, copilot_versions, aws_versions)
     click.secho("Checking addons templates versions...", fg="blue")
 
-    local_version = platform_helper_version_status.local
+    local_version = platform_helper_version_status.installed
     latest_release = platform_helper_version_status.latest
     addons_templates_table = PrettyTable()
     addons_templates_table.field_names = [
@@ -110,10 +110,10 @@ def deployment():
         latest_compatible_symbol = yes
 
         try:
-            generated_with_version = versioning.get_template_generated_with_version(
+            generated_with_version = tool_versioning.get_template_generated_with_version(
                 str(template_file.resolve())
             )
-            versioning.validate_template_version(local_version, str(template_file.resolve()))
+            tool_versioning.validate_template_version(local_version, str(template_file.resolve()))
         except IncompatibleMajorVersionException:
             local_compatible_symbol = no
             compatible = False
@@ -134,10 +134,10 @@ def deployment():
             ]
 
         try:
-            generated_with_version = versioning.get_template_generated_with_version(
+            generated_with_version = tool_versioning.get_template_generated_with_version(
                 str(template_file.resolve())
             )
-            versioning.validate_template_version(latest_release, str(template_file.resolve()))
+            tool_versioning.validate_template_version(latest_release, str(template_file.resolve()))
         except IncompatibleMajorVersionException:
             latest_compatible_symbol = no
             compatible = False
@@ -164,14 +164,14 @@ def _check_tool_versions(platform_helper_versions, copilot_versions, aws_version
     click.secho("Checking tooling versions...", fg="blue")
     recommendations = {}
 
-    local_copilot_version = copilot_versions.local
+    local_copilot_version = copilot_versions.installed
     copilot_latest_release = copilot_versions.latest
     if local_copilot_version is None:
         recommendations["install-copilot"] = (
             "Install AWS Copilot https://aws.github.io/copilot-cli/"
         )
 
-    if aws_versions.local is None:
+    if aws_versions.installed is None:
         recommendations["install-aws"] = "Install AWS CLI https://aws.amazon.com/cli/"
 
     tool_versions_table = PrettyTable()
@@ -186,7 +186,7 @@ def _check_tool_versions(platform_helper_versions, copilot_versions, aws_version
     tool_versions_table.add_row(
         [
             "aws",
-            str(aws_versions.local),
+            str(aws_versions.installed),
             str(aws_versions.latest),
             no if aws_versions.is_outdated() else yes,
         ]
@@ -194,7 +194,7 @@ def _check_tool_versions(platform_helper_versions, copilot_versions, aws_version
     tool_versions_table.add_row(
         [
             "copilot",
-            str(copilot_versions.local),
+            str(copilot_versions.installed),
             str(copilot_versions.latest),
             no if copilot_versions.is_outdated() else yes,
         ]
@@ -202,7 +202,7 @@ def _check_tool_versions(platform_helper_versions, copilot_versions, aws_version
     tool_versions_table.add_row(
         [
             "dbt-platform-helper",
-            str(platform_helper_versions.local),
+            str(platform_helper_versions.installed),
             str(platform_helper_versions.latest),
             no if platform_helper_versions.is_outdated() else yes,
         ]

dbt_platform_helper/commands/copilot.py

@@ -4,13 +4,13 @@ import click
 
 from dbt_platform_helper.domain.copilot import Copilot
 from dbt_platform_helper.domain.copilot_environment import CopilotTemplating
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.providers.config import ConfigProvider
 from dbt_platform_helper.providers.config_validator import ConfigValidator
 from dbt_platform_helper.providers.files import FileProvider
 from dbt_platform_helper.providers.io import ClickIOProvider
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
+from dbt_platform_helper.providers.kms import KMSProvider
+from dbt_platform_helper.utils.aws import get_aws_session_or_abort
 from dbt_platform_helper.utils.click import ClickDocOptGroup
 
 # TODOs
@@ -27,7 +27,9 @@ def copilot():
 def make_addons():
     """Generate addons CloudFormation for each environment."""
     try:
+        session = get_aws_session_or_abort()
         config_provider = ConfigProvider(ConfigValidator())
-        Copilot(config_provider, FileProvider(), CopilotTemplating()).make_addons()
+        kms_provider = KMSProvider(session.client("kms"))
+        Copilot(config_provider, FileProvider(), CopilotTemplating(), kms_provider).make_addons()
     except Exception as err:
         ClickIOProvider().abort_with_error(str(err))

dbt_platform_helper/commands/environment.py

@@ -4,14 +4,12 @@ from dbt_platform_helper.constants import DEFAULT_TERRAFORM_PLATFORM_MODULES_VER
 from dbt_platform_helper.domain.copilot_environment import CopilotEnvironment
 from dbt_platform_helper.domain.maintenance_page import MaintenancePage
 from dbt_platform_helper.domain.terraform_environment import TerraformEnvironment
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.providers.cloudformation import CloudFormation
 from dbt_platform_helper.providers.config import ConfigProvider
 from dbt_platform_helper.providers.config_validator import ConfigValidator
 from dbt_platform_helper.providers.io import ClickIOProvider
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
 from dbt_platform_helper.providers.vpc import VpcProvider
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.aws import get_aws_session_or_abort
@@ -94,9 +92,11 @@ def generate(name):
     help=f"Override the default version of terraform-platform-modules. (Default version is '{DEFAULT_TERRAFORM_PLATFORM_MODULES_VERSION}').",
 )
 def generate_terraform(name, terraform_platform_modules_version):
-
+    click_io = ClickIOProvider()
     try:
+        # TODO = pass the session to ConfigValidator
+        get_aws_session_or_abort()
         config_provider = ConfigProvider(ConfigValidator())
         TerraformEnvironment(config_provider).generate(name, terraform_platform_modules_version)
     except PlatformException as err:
-        ClickIOProvider().abort_with_error(str(err))
+        click_io.abort_with_error(str(err))

dbt_platform_helper/commands/generate.py

@@ -3,7 +3,7 @@ import click
 
 from dbt_platform_helper.commands.copilot import make_addons
 from dbt_platform_helper.commands.pipeline import generate as pipeline_generate
-from dbt_platform_helper.domain.versioning import RequiredVersion
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.utils.click import ClickDocOptCommand
 
 
@@ -16,7 +16,6 @@ def generate(ctx: click.Context):
 
     Wraps pipeline generate and make-addons.
     """
-
-    RequiredVersion().check_platform_helper_version_mismatch()
+    PlatformHelperVersioning().check_platform_helper_version_mismatch()
     ctx.invoke(pipeline_generate)
     ctx.invoke(make_addons)

dbt_platform_helper/commands/notify.py

@@ -2,9 +2,7 @@ import click
 from slack_sdk import WebClient
 from slack_sdk.models import blocks
 
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.utils.arn_parser import ARN
 from dbt_platform_helper.utils.click import ClickDocOptGroup
 

dbt_platform_helper/commands/pipeline.py

@@ -3,13 +3,11 @@ import click
 
 from dbt_platform_helper.constants import DEFAULT_TERRAFORM_PLATFORM_MODULES_VERSION
 from dbt_platform_helper.domain.pipelines import Pipelines
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.providers.config import ConfigProvider
 from dbt_platform_helper.providers.config_validator import ConfigValidator
 from dbt_platform_helper.providers.ecr import ECRProvider
 from dbt_platform_helper.providers.io import ClickIOProvider
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
 from dbt_platform_helper.providers.terraform_manifest import TerraformManifestProvider
 from dbt_platform_helper.utils.aws import get_codestar_connection_arn
 from dbt_platform_helper.utils.click import ClickDocOptGroup

dbt_platform_helper/commands/secrets.py

@@ -6,9 +6,7 @@ import click
 from botocore.exceptions import ClientError
 from cloudfoundry_client.client import CloudFoundryClient
 
-from dbt_platform_helper.providers.platform_helper_versioning import (
-    PlatformHelperVersioning,
-)
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.utils.application import get_application_name
 from dbt_platform_helper.utils.aws import SSM_BASE_PATH
 from dbt_platform_helper.utils.aws import get_aws_session_or_abort

dbt_platform_helper/commands/version.py

@@ -1,6 +1,6 @@
 import click
 
-from dbt_platform_helper.domain.versioning import RequiredVersion
+from dbt_platform_helper.domain.versioning import PlatformHelperVersioning
 from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.providers.io import ClickIOProvider
 from dbt_platform_helper.utils.click import ClickDocOptGroup
@@ -32,6 +32,6 @@ def get_platform_helper_for_project(pipeline):
         - Fall back on the version in the deprecated '.platform-helper-version' file
     """
     try:
-        RequiredVersion().get_required_version(pipeline)
+        PlatformHelperVersioning().get_required_version(pipeline)
     except PlatformException as err:
         ClickIOProvider().abort_with_error(str(err))

dbt_platform_helper/domain/codebase.py

@@ -20,6 +20,8 @@ from dbt_platform_helper.utils.aws import check_image_exists
 from dbt_platform_helper.utils.aws import get_aws_session_or_abort
 from dbt_platform_helper.utils.aws import get_build_url_from_arn
 from dbt_platform_helper.utils.aws import get_build_url_from_pipeline_execution_id
+from dbt_platform_helper.utils.aws import get_image_build_project
+from dbt_platform_helper.utils.aws import get_manual_release_pipeline
 from dbt_platform_helper.utils.aws import list_latest_images
 from dbt_platform_helper.utils.aws import start_build_extraction
 from dbt_platform_helper.utils.aws import start_pipeline_and_return_execution_id
@@ -34,6 +36,8 @@ class Codebase:
         load_application: Callable[[str], Application] = load_application,
         get_aws_session_or_abort: Callable[[str], Session] = get_aws_session_or_abort,
         check_image_exists: Callable[[str], str] = check_image_exists,
+        get_image_build_project: Callable[[str], str] = get_image_build_project,
+        get_manual_release_pipeline: Callable[[str], str] = get_manual_release_pipeline,
         get_build_url_from_arn: Callable[[str], str] = get_build_url_from_arn,
         get_build_url_from_pipeline_execution_id: Callable[
             [str], str
@@ -50,6 +54,8 @@ class Codebase:
         self.load_application = load_application
         self.get_aws_session_or_abort = get_aws_session_or_abort
         self.check_image_exists = check_image_exists
+        self.get_image_build_project = get_image_build_project
+        self.get_manual_release_pipeline = get_manual_release_pipeline
         self.get_build_url_from_arn = get_build_url_from_arn
         self.get_build_url_from_pipeline_execution_id = get_build_url_from_pipeline_execution_id
         self.list_latest_images = list_latest_images
@@ -126,12 +132,13 @@ class Codebase:
         self.check_if_commit_exists(commit)
 
         codebuild_client = session.client("codebuild")
+        project_name = self.get_image_build_project(codebuild_client, app, codebase)
         build_url = self.__start_build_with_confirmation(
             codebuild_client,
             self.get_build_url_from_arn,
             f'You are about to build "{app}" for "{codebase}" with commit "{commit}". Do you want to continue?',
             {
-                "projectName": f"{app}-{codebase}-codebase-pipeline-image-build",
+                "projectName": project_name,
                 "artifactsOverride": {"type": "NO_ARTIFACTS"},
                 "sourceVersion": commit,
             },
@@ -154,9 +161,10 @@ class Codebase:
 
         self.check_image_exists(session, application, codebase, commit)
 
-        pipeline_name = f"{app}-{codebase}-manual-release-pipeline"
         codepipeline_client = session.client("codepipeline")
 
+        pipeline_name = self.get_manual_release_pipeline(codepipeline_client, app, codebase)
+
         build_url = self.__start_pipeline_execution_with_confirmation(
             codepipeline_client,
             self.get_build_url_from_pipeline_execution_id,

dbt_platform_helper/domain/copilot.py

@@ -13,6 +13,7 @@ from dbt_platform_helper.constants import PLATFORM_CONFIG_FILE
 from dbt_platform_helper.domain.copilot_environment import CopilotTemplating
 from dbt_platform_helper.providers.config import ConfigProvider
 from dbt_platform_helper.providers.files import FileProvider
+from dbt_platform_helper.providers.kms import KMSProvider
 from dbt_platform_helper.utils.application import get_application_name
 from dbt_platform_helper.utils.application import load_application
 from dbt_platform_helper.utils.aws import get_aws_session_or_abort
@@ -43,10 +44,12 @@ class Copilot:
         config_provider: ConfigProvider,
         file_provider: FileProvider,
         copilot_templating: CopilotTemplating,
+        kms_provider: KMSProvider,
     ):
         self.config_provider = config_provider
         self.file_provider = file_provider
         self.copilot_templating = copilot_templating
+        self.kms_provider = kms_provider
 
     def list_copilot_local_environments(self):
         return [

dbt_platform_helper/domain/maintenance_page.py

@@ -38,20 +38,14 @@ class FailedToActivateMaintenancePageException(MaintenancePageException):
         application_name: str,
         env: str,
         original_exception: Exception,
-        rolled_back_rules: dict[str, bool] = {},
     ):
         super().__init__(
             f"Maintenance page failed to activate for the {application_name} application in environment {env}."
         )
         self.orginal_exception = original_exception
-        self.rolled_back_rules = rolled_back_rules
 
     def __str__(self):
-        return (
-            f"{super().__str__()}\n"
-            f"Rolled-back rules: {self.rolled_back_rules }\n"
-            f"Original exception: {self.orginal_exception}"
-        )
+        return f"{super().__str__()}\n" f"Original exception: {self.orginal_exception}"
 
 
 # TODO should this be in its own provider, inside the VPC one, what logic is this sepcific too?
@@ -187,6 +181,15 @@ class MaintenancePage:
                     listener_arn, target_group_arn
                 )
 
+                self.io.debug(
+                    f"""
+#----------------------------------------------------------#
+# Creating listener rules for service {svc.name.ljust(21, " ")}#
+#----------------------------------------------------------#
+
+""",
+                )
+
                 for ip in allowed_ips:
                     self.load_balancer.create_header_rule(
                         listener_arn,
@@ -196,6 +199,7 @@ class MaintenancePage:
                         "AllowedIps",
                         next(rule_priority),
                         service_conditions,
+                        [{"Key": "service", "Value": svc.name}],
                     )
                     self.load_balancer.create_source_ip_rule(
                         listener_arn,
@@ -204,6 +208,7 @@ class MaintenancePage:
                         "AllowedSourceIps",
                         next(rule_priority),
                         service_conditions,
+                        [{"Key": "service", "Value": svc.name}],
                     )
 
                 self.load_balancer.create_header_rule(
@@ -214,6 +219,7 @@ class MaintenancePage:
                     "BypassIpFilter",
                     next(rule_priority),
                     service_conditions,
+                    [{"Key": "service", "Value": svc.name}],
                 )
 
                 # add to accumilating list of conditions for maintenace page rule
@@ -262,27 +268,48 @@ class MaintenancePage:
                 ],
             )
         except Exception as e:
-            deleted_rules = self.__clean_up_maintenance_page_rules(listener_arn)
+            self.__clean_up_maintenance_page_rules(listener_arn)
             raise FailedToActivateMaintenancePageException(
-                app, env, f"{e}:\n {traceback.format_exc()}", deleted_rules
+                app, env, f"{e}:\n {traceback.format_exc()}"
             )
 
     def __clean_up_maintenance_page_rules(
         self, listener_arn: str, fail_when_not_deleted: bool = False
-    ) -> dict[str, bool]:
+    ) -> None:
 
         tag_descriptions = self.load_balancer.get_rules_tag_descriptions_by_listener_arn(
             listener_arn
         )
 
-        deletes = {}
+        # keep track of rules deleted
+        deleted_rules = {"MaintenancePage": 0}
         for name in ["MaintenancePage", "AllowedIps", "BypassIpFilter", "AllowedSourceIps"]:
-            deleted = self.load_balancer.delete_listener_rule_by_tags(tag_descriptions, name)
-            deletes[name] = bool(deleted)
-            if fail_when_not_deleted and name == "MaintenancePage" and not deleted:
+            deleted_list = self.load_balancer.delete_listener_rule_by_tags(tag_descriptions, name)
+
+            # track the rules deleted grouped by service
+            for deleted_rule in deleted_list:
+                tags = {t["Key"]: t["Value"] for t in deleted_rule["Tags"]}
+                if "service" in tags:
+                    if tags["service"] not in deleted_rules:
+                        deleted_rules[tags["service"]] = {
+                            "AllowedIps": 0,
+                            "BypassIpFilter": 0,
+                            "AllowedSourceIps": 0,
+                        }
+                    deleted_rules[tags["service"]][name] += 1
+                elif tags.get("name") == "MaintenancePage":
+                    deleted_rules["MaintenancePage"] += 1
+
+            if (
+                fail_when_not_deleted
+                and name == "MaintenancePage"
+                and deleted_rules["MaintenancePage"] == 0
+            ):
                 raise ListenerRuleNotFoundException()
 
-        return deletes
+        self.io.warn(
+            f"Rules deleted by type and grouped by service: {deleted_rules}",
+        )
 
     def __remove_maintenance_page(self, listener_arn: str) -> dict[str, bool]:
         self.__clean_up_maintenance_page_rules(listener_arn, True)

dbt_platform_helper/domain/pipelines.py

@@ -14,7 +14,7 @@ from dbt_platform_helper.providers.io import ClickIOProvider
 from dbt_platform_helper.providers.terraform_manifest import TerraformManifestProvider
 from dbt_platform_helper.utils.application import get_application_name
 from dbt_platform_helper.utils.template import setup_templates
-from dbt_platform_helper.utils.versioning import (
+from dbt_platform_helper.utils.tool_versioning import (
     get_required_terraform_platform_modules_version,
 )
 

dbt_platform_helper/domain/terraform_environment.py

@@ -1,7 +1,7 @@
 from dbt_platform_helper.platform_exception import PlatformException
 from dbt_platform_helper.providers.io import ClickIOProvider
 from dbt_platform_helper.providers.terraform_manifest import TerraformManifestProvider
-from dbt_platform_helper.utils.versioning import (
+from dbt_platform_helper.utils.tool_versioning import (
     get_required_terraform_platform_modules_version,
 )