dbt-platform-helper 10.8.1__tar.gz → 10.9.1__tar.gz

{dbt_platform_helper-10.8.1 → dbt_platform_helper-10.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-platform-helper
-Version: 10.8.1
+Version: 10.9.1
 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-10.8.1 → dbt_platform_helper-10.9.1}/dbt_platform_helper/commands/environment.py

@@ -238,15 +238,16 @@ def get_subnet_ids(session, vpc_id):
     return public, private
 
 
-def get_cert_arn(session, env_name):
-    certs = session.client("acm").list_certificates()["CertificateSummaryList"]
-
-    for cert in certs:
-        if env_name in cert["DomainName"]:
-            return cert["CertificateArn"]
+def get_cert_arn(session, application, env_name):
+    try:
+        arn = find_https_certificate(session, application, env_name)
+    except:
+        click.secho(
+            f"No certificate found with domain name matching environment {env_name}.", fg="red"
+        )
+        raise click.Abort
 
-    click.secho(f"No certificate found with domain name matching environment {env_name}.", fg="red")
-    raise click.Abort
+    return arn
 
 
 def get_env_ips(vpc: str, application_environment: Environment):
@@ -284,7 +285,7 @@ def generate(name, vpc_name):
 
     env_config = apply_environment_defaults(conf)["environments"][name]
 
-    _generate_copilot_environment_manifests(name, env_config, session)
+    _generate_copilot_environment_manifests(name, conf["application"], env_config, session)
 
 
 @environment.command(help="Generate terraform manifest for the specified environment.")
@@ -308,12 +309,12 @@ def generate_terraform(name, terraform_platform_modules_version):
     )
 
 
-def _generate_copilot_environment_manifests(name, env_config, session):
+def _generate_copilot_environment_manifests(name, application, env_config, session):
     env_template = setup_templates().get_template("env/manifest.yml")
     vpc_name = env_config.get("vpc", None)
     vpc_id = get_vpc_id(session, name, vpc_name)
     pub_subnet_ids, priv_subnet_ids = get_subnet_ids(session, vpc_id)
-    cert_arn = get_cert_arn(session, name)
+    cert_arn = get_cert_arn(session, application, name)
     contents = env_template.render(
         {
             "name": name,
@@ -398,6 +399,23 @@ def find_https_listener(session: boto3.Session, app: str, env: str) -> str:
     return listener_arn
 
 
+def find_https_certificate(session: boto3.Session, app: str, env: str) -> str:
+    listener_arn = find_https_listener(session, app, env)
+    cert_client = session.client("elbv2")
+    certificates = cert_client.describe_listener_certificates(ListenerArn=listener_arn)[
+        "Certificates"
+    ]
+
+    certificate_arn = None
+
+    try:
+        certificate_arn = next(c["CertificateArn"] for c in certificates if c["IsDefault"])
+    except StopIteration:
+        raise CertificateNotFoundError()
+
+    return certificate_arn
+
+
 def find_target_group(app: str, env: str, svc: str, session: boto3.Session) -> str:
     rg_tagging_client = session.client("resourcegroupstaggingapi")
     response = rg_tagging_client.get_resources(
@@ -650,6 +668,10 @@ def get_maintenance_page_template(template) -> str:
     return re.sub(r"[^\S]\s+", "", template_contents)
 
 
+class CertificateNotFoundError(Exception):
+    pass
+
+
 class LoadBalancerNotFoundError(Exception):
     pass
 

{dbt_platform_helper-10.8.1 → dbt_platform_helper-10.9.1}/dbt_platform_helper/utils/validation.py

@@ -274,6 +274,38 @@ LIFECYCLE_RULE = {
     "enabled": bool,
 }
 
+
+def kms_key_arn_regex(key):
+    return Regex(
+        r"^arn:aws:kms:.*:\d{12}:(key|alias).*",
+        error=f"{key} must contain a valid ARN for a KMS key",
+    )
+
+
+def s3_bucket_arn_regex(key):
+    return Regex(
+        r"^arn:aws:s3::.*",
+        error=f"{key} must contain a valid ARN for an S3 bucket",
+    )
+
+
+def iam_role_arn_regex(key):
+    return Regex(
+        r"^arn:aws:iam::\d{12}:role/.*",
+        error=f"{key} must contain a valid ARN for an IAM role",
+    )
+
+
+DATA_IMPORT = {
+    Optional("source_kms_key_arn"): kms_key_arn_regex("source_kms_key_arn"),
+    "source_bucket_arn": s3_bucket_arn_regex("source_bucket_arn"),
+    "worker_role_arn": iam_role_arn_regex("worker_role_arn"),
+}
+
+DATA_MIGRATION = {
+    "import": DATA_IMPORT,
+}
+
 S3_BASE = {
     Optional("readonly"): bool,
     Optional("services"): Or("__all__", [str]),
@@ -284,6 +316,7 @@ S3_BASE = {
             Optional("retention_policy"): RETENTION_POLICY,
             Optional("versioning"): bool,
             Optional("lifecycle_rules"): [LIFECYCLE_RULE],
+            Optional("data_migration"): DATA_MIGRATION,
         }
     },
 }

{dbt_platform_helper-10.8.1 → dbt_platform_helper-10.9.1}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "dbt-platform-helper"
-version = "10.8.1"
+version = "10.9.1"
 description = "Set of tools to help transfer applications/services from GOV.UK PaaS to DBT PaaS augmenting AWS Copilot."
 authors = ["Department for Business and Trade Platform Team <sre-team@digital.trade.gov.uk>"]
 license = "MIT"