dbt-platform-helper 12.2.2__tar.gz → 12.2.4__tar.gz

{dbt_platform_helper-12.2.2 → dbt_platform_helper-12.2.4}/PKG-INFO

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

@@ -71,7 +71,7 @@ def get_vpc_id(session, env_name, vpc_name=None):
     return vpcs[0]["VpcId"]
 
 
-def get_subnet_ids(session, vpc_id):
+def get_subnet_ids(session, vpc_id, environment_name):
     subnets = session.client("ec2").describe_subnets(
         Filters=[{"Name": "vpc-id", "Values": [vpc_id]}]
     )["Subnets"]
@@ -81,11 +81,41 @@ def get_subnet_ids(session, vpc_id):
         raise click.Abort
 
     public_tag = {"Key": "subnet_type", "Value": "public"}
-    public = [subnet["SubnetId"] for subnet in subnets if public_tag in subnet["Tags"]]
+    public_subnets = [subnet["SubnetId"] for subnet in subnets if public_tag in subnet["Tags"]]
     private_tag = {"Key": "subnet_type", "Value": "private"}
-    private = [subnet["SubnetId"] for subnet in subnets if private_tag in subnet["Tags"]]
+    private_subnets = [subnet["SubnetId"] for subnet in subnets if private_tag in subnet["Tags"]]
+
+    # This call and the method declaration can be removed when we stop using AWS Copilot to deploy the services
+    public_subnets, private_subnets = _match_subnet_id_order_to_cloudformation_exports(
+        session,
+        environment_name,
+        public_subnets,
+        private_subnets,
+    )
+
+    return public_subnets, private_subnets
+
+
+def _match_subnet_id_order_to_cloudformation_exports(
+    session, environment_name, public_subnets, private_subnets
+):
+    public_subnet_exports = []
+    private_subnet_exports = []
+    for page in session.client("cloudformation").get_paginator("list_exports").paginate():
+        for export in page["Exports"]:
+            if f"-{environment_name}-" in export["Name"]:
+                if export["Name"].endswith("-PublicSubnets"):
+                    public_subnet_exports = export["Value"].split(",")
+                if export["Name"].endswith("-PrivateSubnets"):
+                    private_subnet_exports = export["Value"].split(",")
+
+    # If the elements match, regardless of order, use the list from the CloudFormation exports
+    if set(public_subnets) == set(public_subnet_exports):
+        public_subnets = public_subnet_exports
+    if set(private_subnets) == set(private_subnet_exports):
+        private_subnets = private_subnet_exports
 
-    return public, private
+    return public_subnets, private_subnets
 
 
 def get_cert_arn(session, application, env_name):
@@ -142,22 +172,26 @@ def generate_terraform(name, terraform_platform_modules_version):
     )
 
 
-def _generate_copilot_environment_manifests(name, application, env_config, session):
+def _generate_copilot_environment_manifests(environment_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, application, name)
+    vpc_id = get_vpc_id(session, environment_name, vpc_name)
+    pub_subnet_ids, priv_subnet_ids = get_subnet_ids(session, vpc_id, environment_name)
+    cert_arn = get_cert_arn(session, application, environment_name)
     contents = env_template.render(
         {
-            "name": name,
+            "name": environment_name,
             "vpc_id": vpc_id,
             "pub_subnet_ids": pub_subnet_ids,
             "priv_subnet_ids": priv_subnet_ids,
             "certificate_arn": cert_arn,
         }
     )
-    click.echo(mkfile(".", f"copilot/environments/{name}/manifest.yml", contents, overwrite=True))
+    click.echo(
+        mkfile(
+            ".", f"copilot/environments/{environment_name}/manifest.yml", contents, overwrite=True
+        )
+    )
 
 
 def _generate_terraform_environment_manifests(

{dbt_platform_helper-12.2.2 → dbt_platform_helper-12.2.4}/dbt_platform_helper/utils/validation.py

@@ -590,13 +590,16 @@ def _validate_extension_supported_versions(
 
         if not isinstance(environments, dict):
             click.secho(
-                "Error: Opensearch extension definition is invalid type, expected dictionary",
+                f"Error: {extension_type} extension definition is invalid type, expected dictionary",
                 fg="red",
             )
             continue
         for environment, env_config in environments.items():
+
+            # An extension version doesn't need to be specified for all environments, provided one is specified under "*".
+            # So check if the version is set before checking if it's supported
             extension_version = env_config.get(version_key)
-            if extension_version not in supported_extension_versions:
+            if extension_version and extension_version not in supported_extension_versions:
                 extensions_with_invalid_version.append(
                     {"environment": environment, "version": extension_version}
                 )

{dbt_platform_helper-12.2.2 → dbt_platform_helper-12.2.4}/pyproject.toml

@@ -3,7 +3,7 @@ line-length = 100
 
 [tool.poetry]
 name = "dbt-platform-helper"
-version = "12.2.2"
+version = "12.2.4"
 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"